morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed fetching v4 and v6 IP addresses at the same time (quick fix) (#1109)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-10-09 22:54:54 +02:00
parent ebc548996c
commit f8c5850586
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/Net/readers.swift
View File

@@ -368,15 +368,22 @@ internal class UsageReader: Reader<Network_Usage> {
let ipv6: String?
}
if let url = URL(string: "https://api.serhiy.io/v1/stats/ip"),
let data = try? Data(contentsOf: url),
let addr = try? JSONDecoder().decode(Addr_s.self, from: data) {
if let ip = addr.ipv4, self.isIPv4(ip) {
self.usage.raddr.v4 = ip
DispatchQueue.global(qos: .userInitiated).async {
let response = syncShell("curl -s -4 https://api.serhiy.io/v1/stats/ip")
if !response.isEmpty, let data = response.data(using: .utf8),
let addr = try? JSONDecoder().decode(Addr_s.self, from: data) {
if let ip = addr.ipv4, self.isIPv4(ip) {
self.usage.raddr.v4 = ip
}
}
if let ip = addr.ipv6, !self.isIPv4(ip) {
self.usage.raddr.v6 = ip
}
DispatchQueue.global(qos: .userInitiated).async {
let response = syncShell("curl -s -6 https://api.serhiy.io/v1/stats/ip")
if !response.isEmpty, let data = response.data(using: .utf8),
let addr = try? JSONDecoder().decode(Addr_s.self, from: data) {
if let ip = addr.ipv6, !self.isIPv4(ip) {
self.usage.raddr.v6 = ip
}
}
}
}