Networking.isConnected -> checkConnected

Author: nodeful

native/app/Source/AppDelegate.swift

@@ -30,7 +30,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, SUUpdaterDelegate {
       Application.start()
     }
 
-    Networking.isConnected { connected in
+    Networking.checkConnected { connected in
       if (connected) {
         self.updater.checkForUpdatesInBackground()
       } else {

native/app/Source/Networking/Networking.swift

@@ -10,49 +10,80 @@ import Foundation
 import Connectivity
 import EmitterKit
 class Networking {
-  static let connectivity = Connectivity()
+  static private let connectivity = Connectivity()
+
+  static var status: ConnectivityStatus = .determining {
+    didSet {
+      if oldValue != status {
+        statusChanged.emit(status)
+      }
+    }
+  }
   static let statusChanged = Event<ConnectivityStatus>()
+
   static func startMonitor () {
     connectivity.whenConnected = { connectivity in
-      Networking.statusChanged.emit(connectivity.status)
+      Networking.status = connectivity.status
     }
-    
+
     connectivity.whenDisconnected = { connectivity in
-      Networking.statusChanged.emit(connectivity.status)
+      Networking.status = connectivity.status
     }
     connectivity.startNotifier()
   }
-  static func isConnected (_ completion: @escaping (Bool) -> Void) {
+
+  static func checkConnected (_ completion: @escaping (Bool) -> Void) {
     if (connectivity.status == .notConnected) {
       return completion(false)
     }
     var returned = false
     connectivity.checkConnectivity { connectivity in
       if (!returned) {
         returned = true
-        let accepted: [ConnectivityStatus] = [
-          .connected,
-          .connectedViaCellular,
-          .connectedViaWiFi
-        ]
-        completion(accepted.contains(connectivity.status))
+
+        completion(statusConsideredConnected(connectivity.status))
       }
     }
-    
-    Utilities.delay(2000) {
+
+    Utilities.delay(1000) {
       if (!returned) {
         returned = true
         completion(false)
       }
     }
   }
-  
+
+  static func whenConnected (_ completion: @escaping () -> Void) {
+    checkConnected { connected in
+      if (connected) { return completion() }
+
+      statusChanged.once { status in
+        if (isConnected) { return completion() }
+        whenConnected(completion)
+      }
+    }
+
+  }
+
+  static var isConnected: Bool {
+    return statusConsideredConnected(status)
+  }
+
+  static func statusConsideredConnected (_ status: ConnectivityStatus) -> Bool {
+    let accepted: [ConnectivityStatus] = [
+      .connected,
+      .connectedViaCellular,
+      .connectedViaWiFi
+    ]
+    return accepted.contains(connectivity.status)
+  }
+
   static func tcpPortIsAvailable(_ port: UInt) -> Bool {
     let socketFileDescriptor = socket(AF_INET, SOCK_STREAM, 0)
     if socketFileDescriptor == -1 {
       return false
     }
-    
+
     var addr = sockaddr_in()
     let sizeOfSockkAddr = MemoryLayout<sockaddr_in>.size
     addr.sin_len = __uint8_t(sizeOfSockkAddr)
@@ -62,7 +93,7 @@ class Networking {
     addr.sin_zero = (0, 0, 0, 0, 0, 0, 0, 0)
     var bind_addr = sockaddr()
     memcpy(&bind_addr, &addr, Int(sizeOfSockkAddr))
-    
+
     if Darwin.bind(socketFileDescriptor, &bind_addr, socklen_t(sizeOfSockkAddr)) == -1 {
       release(socket: socketFileDescriptor)
       return false
@@ -74,15 +105,15 @@ class Networking {
     release(socket: socketFileDescriptor)
     return true
   }
-  
+
   static func getAvailabilePort (_ start: UInt) -> UInt {
     var port = start
     while !tcpPortIsAvailable(port) {
       port += 1
     }
     return port
   }
-  
+
   static func release(socket: Int32) {
     Darwin.shutdown(socket, SHUT_RDWR)
     close(socket)

native/app/Source/UI/UI.swift

@@ -338,7 +338,7 @@ class UI: StoreSubscriber {
 
   private static func remoteIsReachable (_ completion: @escaping (Bool) -> Void) {
     var returned = false
-    Networking.isConnected { reachable in
+    Networking.checkConnected { reachable in
       if (!reachable) {
         returned = true
         return completion(false)