fixes to UI offline caching

Author: nodeful

native/app/Embedded/ui.zip

@@ -11,16 +11,19 @@ import Reachability
 
 class Networking {
   static func isReachable (_ host: String, _ callback: @escaping (Bool) -> Void) {
-    let ping = try! SwiftyPing(
+    if let ping = try? SwiftyPing(
       host: host,
       configuration: PingConfiguration(interval: 0.1, with: 5),
       queue: DispatchQueue.global()
-    )
-    ping.observer = { (response) in
-      callback(response.error == nil)
+      ) {
+      ping.observer = { (response) in
+        callback(response.error == nil)
+        ping.stopPinging()
+      }
+      ping.startPinging()
+    } else {
+      callback(false)
     }
-    ping.targetCount = 1
-    ping.startPinging()
   }
 
   static func tcpPortIsAvailable(_ port: UInt) -> Bool {

native/app/Source/Helpers/Networking.swift

@@ -29,22 +29,33 @@ extension UIMode {
 
 class UI: StoreSubscriber {
   static var domain = Constants.UI_ENDPOINT_URL.host!
-  static func unarchiveLocal () {
+
+  static func unarchiveZip () {
     // Unpack Archive
     let file = FileManager.default
-        
-    if !file.fileExists(atPath: appSupportUIZipPath.path) {
-      Console.log("\(appSupportUIZipPath.path) doesnt exist")
-      let bundleUIZipPath = Bundle.main.url(forResource: "ui", withExtension: "zip")!
-      try! file.copyItem(at: bundleUIZipPath, to: appSupportUIZipPath)
-    }
 
-    try! Zip.unzipFile(appSupportUIZipPath, destination: localPath, overwrite: true, password: nil) // Unzip
+    if file.fileExists(atPath: remoteZipPath.path) {
+      try! Zip.unzipFile(remoteZipPath, destination: localPath, overwrite: true, password: nil) // Unzip
+    } else {
+      if !file.fileExists(atPath: localZipPath.path) {
+        Console.log("\(localZipPath.path) doesnt exist")
+        let bundleUIZipPath = Bundle.main.url(forResource: "ui", withExtension: "zip")!
+        try! file.copyItem(at: bundleUIZipPath, to: localZipPath)
+      }
+      try! Zip.unzipFile(localZipPath, destination: localPath, overwrite: true, password: nil) // Unzip
+    }
+  }
+  
+  static var localZipPath: URL {
+    return Application.supportPath.appendingPathComponent(
+      "ui-\(Application.version) (Local).zip",
+      isDirectory: false
+    )
   }
 
-  static var appSupportUIZipPath: URL {
+  static var remoteZipPath: URL {
     return Application.supportPath.appendingPathComponent(
-      "ui-\(Application.version).zip",
+      "ui-\(Application.version) (Remote).zip",
       isDirectory: false
     )
   }
@@ -247,7 +258,7 @@ class UI: StoreSubscriber {
         self.cacheRemote()
       } else {
         Console.log("Loading Local UI")
-        UI.unarchiveLocal()
+        UI.unarchiveZip()
         let url = URL(string: "\(UI.localPath)/index.html")!
         UI.viewController.load(url)
       }
@@ -259,7 +270,7 @@ class UI: StoreSubscriber {
     // Only download ui.zip when UI endpoint is remote
     if Constants.UI_ENDPOINT_URL.absoluteString.contains(Constants.DOMAIN) {
       let destination: DownloadRequest.Destination = { _, _ in
-        return (UI.appSupportUIZipPath, [.removePreviousFile, .createIntermediateDirectories])
+        return (UI.remoteZipPath, [.removePreviousFile, .createIntermediateDirectories])
       }
       AF.download("\(Constants.UI_ENDPOINT_URL)/ui.zip", to: destination).response { resp in
         if resp.error == nil {

native/app/Source/UI/UI.swift

@@ -1038,7 +1038,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.2.2;
+				CURRENT_PROJECT_VERSION = 0.2.3;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = JZA6C97KJA;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1074,7 +1074,7 @@
 					"$(PROJECT_DIR)/Source/Vendor",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = v0.2.2;
+				MARKETING_VERSION = v0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1098,7 +1098,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.2.2;
+				CURRENT_PROJECT_VERSION = 0.2.3;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = JZA6C97KJA;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1134,7 +1134,7 @@
 					"$(PROJECT_DIR)/Source/Vendor",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = v0.2.2;
+				MARKETING_VERSION = v0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

native/app/eqMac.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 {
   "name": "eqmac",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "scripts": {
     "start": "ng serve",
     "build": "rm -rf dist/ && ng build --prod && cd dist/ && zip -r -D ui.zip * -x '*.DS_Store' && cp ui.zip ../../native/app/Embedded",

ui/package.json

@@ -3,6 +3,7 @@ import { Option, Options } from 'src/app/components/options/options.component'
 import { ApplicationService, MacInfo } from 'src/app/services/app.service'
 import { ConstantsService } from 'src/app/services/constants.service'
 import { version } from '../../../../package.json'
+import { UIService } from '../../services/ui.service.js'
 
 @Component({
   selector: 'eqm-help',
@@ -26,9 +27,13 @@ export class HelpComponent implements OnInit {
     ]
   ]
 
-  constructor (public app: ApplicationService, public CONST: ConstantsService) {}
+  constructor (
+    public app: ApplicationService,
+    public CONST: ConstantsService,
+    private ui: UIService
+  ) {}
 
-  uiVersion = version
+  uiVersion = `${version} (${this.ui.isLocal ? 'Local' : 'Remote'})`
   info: MacInfo
   ngOnInit () {
     this.fetchInfo()

ui/src/app/sections/help/help.component.ts

@@ -23,6 +23,14 @@ export class UIService extends DataService {
   dimensionsChanged = new Subject<UIDimensions>()
   settingsChanged = new Subject<UISettings>()
 
+  get isLocal () {
+    return window.location.href.includes('file://')
+  }
+
+  get isRemote () {
+    return !this.isLocal
+  }
+
   async getWidth () {
     const { width } = await this.request({ method: 'GET', endpoint: '/width' })
     return width