tunnelKitOriginal: replace UInt64 in WireGuardDataCount

minor file consolidation

Sources/TunnelKitWireGuardAppExtension/WireGuardTunnelProvider.swift

@@ -11,11 +11,6 @@ import Foundation
 import NetworkExtension
 import os
 
-
-extension Notification.Name {
-
-}
-
 open class WireGuardTunnelProvider: NEPacketTunnelProvider {
     private var cfg: WireGuard.ProviderConfiguration!
 
@@ -224,36 +219,3 @@ extension WireGuardLogLevel {
         }
     }
 }
-
-private extension WireGuardDataCount {
-    init?(from string: String) {
-        var bytesReceived: UInt64?
-        var bytesSent: UInt64?
-
-        string.enumerateLines { line, stop in
-            if bytesReceived == nil, let value = parseValue("rx_bytes=", in: line) {
-                bytesReceived = value
-            } else if bytesSent == nil, let value = parseValue("tx_bytes=", in: line) {
-                bytesSent = value
-            }
-
-            if bytesReceived != nil, bytesSent != nil {
-                stop = true
-            }
-        }
-
-        guard let bytesReceived, let bytesSent else {
-            return nil
-        }
-
-        self.init(bytesReceived, bytesSent)
-    }
-}
-
-@inline(__always) private func parseValue(_ prefixKey: String, in line: String) -> UInt64? {
-    guard line.hasPrefix(prefixKey) else { return nil }
-
-    let value = line.dropFirst(prefixKey.count)
-
-    return UInt64(value)
-}

Sources/TunnelKitWireGuardManager/WireGuard+ProviderConfiguration.swift

@@ -181,9 +181,9 @@ extension UserDefaults {
         }
     }
 
-    @objc private var wireGuardDataCountArray: [UInt64]? {
+    @objc private var wireGuardDataCountArray: [UInt]? {
         get {
-            return array(forKey: WireGuard.ProviderConfiguration.Keys.dataCount.rawValue) as? [UInt64]
+            return array(forKey: WireGuard.ProviderConfiguration.Keys.dataCount.rawValue) as? [UInt]
         }
         set {
             set(newValue, forKey: WireGuard.ProviderConfiguration.Keys.dataCount.rawValue)
@@ -193,18 +193,3 @@ extension UserDefaults {
         removeObject(forKey: WireGuard.ProviderConfiguration.Keys.dataCount.rawValue)
     }
 }
-
-/// A pair of received/sent bytes count.
-public struct WireGuardDataCount: Equatable {
-
-    /// Received bytes count.
-    public var bytesReceived: UInt64
-
-    /// Sent bytes count.
-    public var bytesSent: UInt64
-
-    public init(_ received: UInt64, _ sent: UInt64) {
-        self.bytesReceived = received
-        self.bytesSent = sent
-    }
-}

Sources/TunnelKitWireGuardManager/WireGuardDataCount.swift

@@ -0,0 +1,55 @@
+//
+//  WireGuardDataCount.swift
+//  
+//
+//  Created by Yevgeny Yezub on 17/11/23.
+//
+
+import Foundation
+/// A pair of received/sent bytes count.
+public struct WireGuardDataCount: Equatable {
+
+    /// Received bytes count.
+    public var bytesReceived: UInt
+
+    /// Sent bytes count.
+    public var bytesSent: UInt
+
+    public init(_ received: UInt, _ sent: UInt) {
+        self.bytesReceived = received
+        self.bytesSent = sent
+    }
+}
+
+extension WireGuardDataCount {
+    public init?(from string: String) {
+        var bytesReceived: UInt?
+        var bytesSent: UInt?
+
+        string.enumerateLines { line, stop in
+            if bytesReceived == nil, let value = parseValue("rx_bytes=", in: line) {
+                bytesReceived = value
+            } else if bytesSent == nil, let value = parseValue("tx_bytes=", in: line) {
+                bytesSent = value
+            }
+
+            if bytesReceived != nil, bytesSent != nil {
+                stop = true
+            }
+        }
+
+        guard let bytesReceived, let bytesSent else {
+            return nil
+        }
+
+        self.init(bytesReceived, bytesSent)
+    }
+}
+
+private func parseValue(_ prefixKey: String, in line: String) -> UInt? {
+    guard line.hasPrefix(prefixKey) else { return nil }
+
+    let value = line.dropFirst(prefixKey.count)
+
+    return UInt(value)
+}