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

feat: moved ip request from the ipify service to the own server

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-08-15 16:59:24 +02:00
parent a2b2579454
commit 682b7e1250
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/Net/readers.swift
View File

@@ -354,26 +354,21 @@ internal class UsageReader: Reader<Network_Usage> {
}
private func getPublicIP() {
do {
if let url = URL(string: "https://api.ipify.org") {
let value = try String(contentsOf: url)
if !value.contains("<!DOCTYPE html>") && self.isIPv4(value) {
self.usage.raddr.v4 = value
}
}
} catch let err {
error("get public ipv4: \(err)", log: self.log)
struct Addr_s: Decodable {
let ipv4: String?
let ipv6: String?
}
do {
if let url = URL(string: "https://api64.ipify.org") {
let value = try String(contentsOf: url)
if self.usage.raddr.v4 != value && !self.isIPv4(value) {
self.usage.raddr.v6 = value
}
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
}
if let ip = addr.ipv6, !self.isIPv4(ip) {
self.usage.raddr.v6 = ip
}
} catch let err {
error("get public ipv6: \(err)", log: self.log)
}
}