Improved on launche behavior, did some cleaning

Author: EllandeVED

NumWorksMac/App/AppController.swift

@@ -21,9 +21,10 @@ final class AppController: NSObject, NSWindowDelegate {
     func start() {
         print("[App] start()")
         OnLaunch.ensureAppSupportExists()
-        let hasSim = OnLaunch.hasInstalledSimulator()
+        let simulatorVersion = EpsilonVersions.currentSimulatorVersionString()
+        let hasSim = simulatorVersion != "00.00.00"
         if hasSim {
-            print("[App] simulator detected in Application Support")
+            print("[App] simulator detected in Application Support version=\(simulatorVersion)")
         }
 
         updateMenuBarIcon()
@@ -38,7 +39,7 @@ final class AppController: NSObject, NSWindowDelegate {
         }
 
         if !hasSim {
-            print("[App] no installed simulator → keeping menu bar icon, blocking calculator window")
+            print("[App] no valid simulator → version=\(simulatorVersion) → keeping menu bar icon, blocking calculator window")
             Preferences.shared.isAppVisible = false
             OnLaunch.requestRequiredSimulatorUpdater()
             return

NumWorksMac/App/AppLifecycle.swift

@@ -27,7 +27,7 @@ enum OnLaunch {
     }
 
     static func hasInstalledSimulator() -> Bool {
-        SimulatorPaths.installedHTMLURLIfPresent() != nil
+        EpsilonVersions.currentSimulatorVersionString() != "00.00.00"
     }
 
     static func requestRequiredSimulatorUpdater() {
@@ -94,10 +94,7 @@ enum OnLaunch {
         do {
             print("[OnLaunch] checking epsilon update")
 
-            // If we are using the bundled simulator, ensure the installed-version marker is cleared.
-            SimulatorUpdater.clearInstalledSimulatorVersionIfUsingBundled()
-
-            let current = SimulatorUpdater.installedSimulatorVersionString()
+            let current = EpsilonVersions.currentSimulatorVersionString()
             let report = try await EpsilonUpdateChecker.checkLatest(currentVersionString: current)
 
             epsilonNeedsUpdate = report.needsUpdate

NumWorksMac/Core/OnLaunch.swift

@@ -1,5 +1,68 @@
 import Foundation
 
 enum EpsilonVersions {
-    static let bundledSimulator = "00.00.0"
+
+    struct SimulatorVersion: Comparable {
+        let major: Int
+        let minor: Int
+        let patch: Int
+
+        var normalizedString: String {
+            "\(String(format: "%02d", major)).\(String(format: "%02d", minor)).\(String(format: "%02d", patch))"
+        }
+
+        static func < (lhs: SimulatorVersion, rhs: SimulatorVersion) -> Bool {
+            if lhs.major != rhs.major { return lhs.major < rhs.major }
+            if lhs.minor != rhs.minor { return lhs.minor < rhs.minor }
+            return lhs.patch < rhs.patch
+        }
+    }
+
+    /// Returns the currently detected simulator version.
+    /// - "NN.NN.NN" if a valid versioned simulator file is detected in Application Support.
+    /// - "00.00.00" if no valid simulator file is detected.
+    static func currentSimulatorVersionString() -> String {
+        bestDetectedSimulator()?.version.normalizedString ?? "00.00.00"
+    }
+
+    /// Returns the URL of the best detected simulator HTML file, or nil if none are valid.
+    static func bestSimulatorHTMLURL() -> URL? {
+        bestDetectedSimulator()?.url
+    }
+
+    // MARK: - Detection
+
+    private static func bestDetectedSimulator() -> (version: SimulatorVersion, url: URL)? {
+        let candidates = SimulatorPaths.simulatorHTMLCandidates()
+        var best: (SimulatorVersion, URL)? = nil
+
+        for url in candidates {
+            guard let v = parseSimulatorVersion(from: url.lastPathComponent) else { continue }
+            if let currentBest = best {
+                if v > currentBest.0 { best = (v, url) }
+            } else {
+                best = (v, url)
+            }
+        }
+
+        return best.map { (version: $0.0, url: $0.1) }
+    }
+
+    /// Accepts filenames like: numworks-simulator-X.Y.Z.html where X/Y/Z are integers.
+    /// Normalization to NN.NN.NN is done via `SimulatorVersion.normalizedString`.
+    private static func parseSimulatorVersion(from filename: String) -> SimulatorVersion? {
+        let prefix = "numworks-simulator-"
+        let suffix = ".html"
+        guard filename.hasPrefix(prefix), filename.hasSuffix(suffix) else { return nil }
+
+        let start = filename.index(filename.startIndex, offsetBy: prefix.count)
+        let end = filename.index(filename.endIndex, offsetBy: -suffix.count)
+        let core = String(filename[start..<end])
+
+        let parts = core.split(separator: ".")
+        guard parts.count == 3 else { return nil }
+        guard let major = Int(parts[0]), let minor = Int(parts[1]), let patch = Int(parts[2]) else { return nil }
+
+        return SimulatorVersion(major: major, minor: minor, patch: patch)
+    }
 }

NumWorksMac/Core/Simulator/EpsilonVersions.swift

@@ -2,10 +2,10 @@ import Foundation
 
 /// Centralized paths for the offline NumWorks simulator assets.
 ///
-/// Design goals:
-/// - The app ships with a bundled default HTML (Resources/DefaultSimulator/numworks-simulator.html)
-/// - If a newer simulator is downloaded, it lives in Application Support/<bundle-id>/Simulator/current
-/// - The app prefers the downloaded simulator when present, otherwise falls back to the bundled default
+/// Notes:
+/// - The app does not ship with any bundled simulator.
+/// - Downloaded simulator assets live in Application Support/<bundle-id>/Simulator/current
+/// - Versioning and selection logic live in `EpsilonVersions`.
 
 enum SimulatorPaths {
 
@@ -34,39 +34,25 @@ enum SimulatorPaths {
         try simulatorDirectory().appendingPathComponent("current", isDirectory: true)
     }
 
-    // MARK: - Entry HTML
+    // MARK: - Simulator entry HTML helpers
 
-    /// Bundled default simulator HTML inside the app.
-    static func bundledHTMLURL() -> URL {
-        guard let url = Bundle.main.url(
-            forResource: "numworks-simulator",
-            withExtension: "html",
-            subdirectory: "DefaultSimulator"
-        ) else {
-            fatalError("Missing bundled DefaultSimulator/numworks-simulator.html")
-        }
-        return url
+    /// Build the expected simulator HTML URL for a given normalized version string (NN.NN.NN).
+    static func simulatorHTMLURL(version: String) throws -> URL {
+        try currentSimulatorDirectory().appendingPathComponent("numworks-simulator-\(version).html", isDirectory: false)
     }
 
-    /// Downloaded simulator HTML if present in Application Support.
-    static func installedHTMLURLIfPresent() -> URL? {
+    /// List all HTML files directly in the current simulator directory.
+    /// Selection/parsing logic is handled elsewhere.
+    static func simulatorHTMLCandidates() -> [URL] {
         do {
-            let url = try currentSimulatorDirectory().appendingPathComponent("numworks-simulator.html", isDirectory: false)
-            if FileManager.default.fileExists(atPath: url.path) {
-                return url
-            }
-            return nil
+            let dir = try currentSimulatorDirectory()
+            let items = (try? FileManager.default.contentsOfDirectory(at: dir, includingPropertiesForKeys: nil)) ?? []
+            return items.filter { $0.pathExtension.lowercased() == "html" }
         } catch {
-            return nil
+            return []
         }
     }
 
-    /// URL the app should load.
-    /// Prefer downloaded simulator; fall back to bundled default.
-    static func urlToLoad() -> URL {
-        installedHTMLURLIfPresent() ?? bundledHTMLURL()
-    }
-
     // MARK: - Ensure directories exist (for updater)
 
     static func ensureDirectoriesExist() throws {

NumWorksMac/Core/Simulator/SimulatorPaths.swift

@@ -2,48 +2,21 @@ import Foundation
 
 /// Resolves which simulator HTML to load.
 ///
-/// Behavior:
-/// - If an installed simulator exists in Application Support (Simulator/current/numworks-simulator.html), load that.
-/// - Otherwise, load the bundled DefaultSimulator directly from the app bundle.
-///
-/// The bundled default is never copied into Application Support.
+/// Notes:
+/// - The app does not ship with any bundled simulator.
+/// - A simulator is considered valid only if `EpsilonVersions` can detect a versioned
+///   `numworks-simulator-X.Y.Z.html` file in Application Support.
 final class SimulatorRuntime {
 
     enum RuntimeError: Error {
-        case bundledHTMLNotFound
+        case noValidSimulatorInstalled
     }
 
     /// Returns the URL that WKWebView should load.
     func urlToLoad() throws -> URL {
-        if let installed = installedSimulatorHTMLURL(), FileManager.default.fileExists(atPath: installed.path) {
-            return installed
-        }
-
-        guard let bundled = bundledDefaultHTMLURL() else {
-            throw RuntimeError.bundledHTMLNotFound
+        guard let url = EpsilonVersions.bestSimulatorHTMLURL() else {
+            throw RuntimeError.noValidSimulatorInstalled
         }
-        return bundled
-    }
-
-    // MARK: - Installed simulator
-
-    private func installedSimulatorHTMLURL() -> URL? {
-        let base = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
-        guard let base else { return nil }
-
-        let id = Bundle.main.bundleIdentifier ?? "NumworksApplication"
-        let currentDir = base
-            .appendingPathComponent(id, isDirectory: true)
-            .appendingPathComponent("Simulator", isDirectory: true)
-            .appendingPathComponent("current", isDirectory: true)
-
-        return currentDir.appendingPathComponent("numworks-simulator.html", isDirectory: false)
-    }
-
-    // MARK: - Bundled default
-
-    private func bundledDefaultHTMLURL() -> URL? {
-        Bundle.main.url(forResource: "numworks-simulator", withExtension: "html", subdirectory: "DefaultSimulator")
-            ?? Bundle.main.url(forResource: "numworks-simulator", withExtension: "html")
+        return url
     }
 }

NumWorksMac/Core/Simulator/SimulatorRuntime.swift

@@ -15,7 +15,7 @@ struct EpsilonUpdateChecker {
         case couldNotExtractRemoteVersion(URL)
     }
 
-    static func check(remoteURL: URL, currentVersionString: String = EpsilonVersions.bundledSimulator) throws -> Report {
+    static func check(remoteURL: URL, currentVersionString: String) throws -> Report {
         guard let current = SemVer(currentVersionString) else {
             throw Error.invalidCurrentVersion(currentVersionString)
         }
@@ -81,7 +81,7 @@ struct EpsilonUpdateChecker {
         return best.url
     }
 
-    static func checkLatest(currentVersionString: String = EpsilonVersions.bundledSimulator) async throws -> Report {
+    static func checkLatest(currentVersionString: String) async throws -> Report {
         let remoteURL = try await fetchLatestRemoteURL()
         return try check(remoteURL: remoteURL, currentVersionString: currentVersionString)
     }

NumWorksMac/Core/Updaters/EpsilonUpdateChecker.swift

@@ -19,7 +19,7 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
     @Published var isPresented = false
     @Published var phase: Phase = .idle
 
-    @Published var fromVersion: String = EpsilonVersions.bundledSimulator
+    @Published var fromVersion: String = EpsilonVersions.currentSimulatorVersionString()
     @Published var toVersion: String = ""
 
     @Published var progress: Double = 0
@@ -57,7 +57,7 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
         restartTimer = nil
         restartSecondsRemaining = 0
         self.remoteURL = remoteURL
-        self.fromVersion = currentInstalledVersion
+        self.fromVersion = EpsilonVersions.currentSimulatorVersionString()
         self.toVersion = remoteVersion
         setProgress(0)
         self.phase = .prompt
@@ -74,7 +74,7 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
         restartTimer = nil
         restartSecondsRemaining = 0
         self.remoteURL = remoteURL
-        self.fromVersion = currentInstalledVersion
+        self.fromVersion = EpsilonVersions.currentSimulatorVersionString()
         self.toVersion = remoteVersion
         setProgress(0)
         self.phase = .prompt
@@ -134,10 +134,8 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
                 try? fm.removeItem(at: currentDir)
             }
             try fm.moveItem(at: stagingDir, to: currentDir)
-            try ensureSimulatorEntryHTML(in: currentDir)
-
-            setInstalledVersion(toVersion)
-            print("[SimulatorUpdater] installed version set to \(toVersion)")
+            let normalizedTo = try normalizeVersionString(toVersion)
+            try ensureSimulatorEntryHTML(in: currentDir, version: normalizedTo)
 
             // cleanup staged artifacts
             try? fm.removeItem(at: zip)
@@ -232,7 +230,7 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
 
     // Added per update prompting fixes and cleanup
     nonisolated static func installedSimulatorVersionString() -> String {
-        UserDefaults.standard.string(forKey: "installedSimulatorVersion") ?? EpsilonVersions.bundledSimulator
+        EpsilonVersions.currentSimulatorVersionString()
     }
 
     nonisolated static func hasInstalledSimulatorInAppSupport() -> Bool {
@@ -331,14 +329,6 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
 
     // MARK: - Paths + versions
 
-    private var currentInstalledVersion: String {
-        UserDefaults.standard.string(forKey: "installedSimulatorVersion") ?? EpsilonVersions.bundledSimulator
-    }
-
-    private func setInstalledVersion(_ v: String) {
-        UserDefaults.standard.set(v, forKey: "installedSimulatorVersion")
-    }
-
     private var appSupportDir: URL {
         let base = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
         let id = Bundle.main.bundleIdentifier ?? "NumworksApplication"
@@ -363,9 +353,9 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
 
     // MARK: - Install helpers
 
-    private func ensureSimulatorEntryHTML(in currentDir: URL) throws {
+    private func ensureSimulatorEntryHTML(in currentDir: URL, version: String) throws {
         let fm = FileManager.default
-        let desired = currentDir.appendingPathComponent("numworks-simulator.html", isDirectory: false)
+        let desired = currentDir.appendingPathComponent("numworks-simulator-\(version).html", isDirectory: false)
         if fm.fileExists(atPath: desired.path) { return }
 
         let index = currentDir.appendingPathComponent("index.html", isDirectory: false)
@@ -382,6 +372,15 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
         }
     }
 
+    private func normalizeVersionString(_ v: String) throws -> String {
+        let parts = v.split(separator: ".")
+        guard parts.count == 3 else { throw NSError(domain: "SimulatorUpdater", code: 1) }
+        guard let major = Int(parts[0]), let minor = Int(parts[1]), let patch = Int(parts[2]) else {
+            throw NSError(domain: "SimulatorUpdater", code: 2)
+        }
+        return String(format: "%02d.%02d.%02d", major, minor, patch)
+    }
+
     private func unzip(zipFile: URL, to dest: URL) throws {
         let p = Process()
         p.executableURL = URL(fileURLWithPath: "/usr/bin/ditto")

NumWorksMac/Core/Updaters/SimulatorUpdater.swift

@@ -18,8 +18,12 @@ struct CalculatorWebView: NSViewRepresentable {
         webView.setValue(false, forKey: "drawsBackground")
         webView.navigationDelegate = context.coordinator
 
-        let url = try! runtime.urlToLoad()
-        webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
+        do {
+            let url = try runtime.urlToLoad()
+            webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
+        } catch {
+            print("[CalculatorWebView] no valid simulator to load: \(error)")
+        }
         return webView
     }