custom options + better epsilon update checker

Author: EllandeVED

NumWorksMac/Core/OnLaunch.swift

@@ -46,7 +46,7 @@ enum OnLaunch {
                     ]
                 )
             } catch {
-                print("[OnLaunch] failed to resolve simulator download URL: \(error)")
+                print("[EpsilonUpdateChecker] could not get remote URL: \(error)")
             }
         }
     }
@@ -107,8 +107,7 @@ enum OnLaunch {
                 print("[OnLaunch] epsilon up to date")
             }
         } catch {
-            print("[OnLaunch] epsilon update check failed: \(error)")
-            // ignore
+            print("[EpsilonUpdateChecker] error: \(error)")
         }
 
         guard appNeedsUpdate || epsilonNeedsUpdate else {

NumWorksMac/Core/Preferences.swift

@@ -11,6 +11,8 @@ final class Preferences: ObservableObject {
         static let showPinButtonOnCalculator = "prefs.showPinButtonOnCalculator"
         static let showDockIcon = "prefs.showDockIcon"
         static let isPinned = "prefs.isPinned"
+        static let webInjectionDisabled = "prefs.webInjectionDisabled"
+        static let calculatorImageHidden = "prefs.calculatorImageHidden"
     }
 
     // MARK: - Current settings (persisted)
@@ -40,6 +42,14 @@ final class Preferences: ObservableObject {
         didSet { d.set(isPinned, forKey: Keys.isPinned) }
     }
 
+    @Published var webInjectionDisabled: Bool {
+        didSet { d.set(webInjectionDisabled, forKey: Keys.webInjectionDisabled) }
+    }
+
+    @Published var calculatorImageHidden: Bool {
+        didSet { d.set(calculatorImageHidden, forKey: Keys.calculatorImageHidden) }
+    }
+
     // MARK: - Session-only state (not persisted)
     // These values describe the current runtime state only
     // and are intentionally NOT stored in UserDefaults.
@@ -65,5 +75,7 @@ final class Preferences: ObservableObject {
         showPinButtonOnCalculator = d.object(forKey: Keys.showPinButtonOnCalculator) as? Bool ?? true
         showDockIcon = d.object(forKey: Keys.showDockIcon) as? Bool ?? true
         isPinned = d.object(forKey: Keys.isPinned) as? Bool ?? false
+        webInjectionDisabled = d.object(forKey: Keys.webInjectionDisabled) as? Bool ?? false
+        calculatorImageHidden = d.object(forKey: Keys.calculatorImageHidden) as? Bool ?? false
     }
 }

NumWorksMac/Core/Updaters/EpsilonUpdateChecker.swift

@@ -32,7 +32,8 @@ struct EpsilonUpdateChecker {
         )
     }
 
-    // Parses NumWorks' official download page, finds all simulator zip URLs, and returns the highest version.
+    // Parses NumWorks' download page for cdn.numworks.com zip URLs (e.g. numworks-simulator-*.zip or numworks-graphing-emulator-*.zip).
+    // Picks the URL whose filename contains the highest X.Y.Z version.
     static func fetchLatestRemoteURL() async throws -> URL {
         let page = URL(string: "https://www.numworks.com/simulator/download/")!
         var req = URLRequest(url: page)
@@ -48,24 +49,19 @@ struct EpsilonUpdateChecker {
             throw Error.invalidResponse
         }
 
-        let pattern = #"https:\/\/cdn\.numworks\.com\/[A-Za-z0-9_-]+\/numworks-simulator-(\d+\.\d+\.\d+)\.zip"#
-        let r = try NSRegularExpression(pattern: pattern)
+        // Match any cdn.numworks.com ... .zip URL (e.g. .../numworks-graphing-emulator-25.2.2.zip or .../26.1.zip).
+        let urlPattern = #"https://cdn\.numworks\.com/[^"'\s<>]+\.zip"#
+        let urlRegex = try NSRegularExpression(pattern: urlPattern)
         let range = NSRange(html.startIndex..<html.endIndex, in: html)
-        let matches = r.matches(in: html, range: range)
-        guard !matches.isEmpty else {
-            throw Error.couldNotExtractRemoteURL
-        }
+        let urlMatches = urlRegex.matches(in: html, range: range)
 
         var best: (url: URL, ver: SemVer)?
 
-        for m in matches {
+        for m in urlMatches {
             guard let urlRange = Range(m.range(at: 0), in: html) else { continue }
             let urlString = String(html[urlRange])
             guard let url = URL(string: urlString) else { continue }
-
-            guard let verRange = Range(m.range(at: 1), in: html) else { continue }
-            let verString = String(html[verRange])
-            guard let ver = SemVer(verString) else { continue }
+            guard let ver = parseVersionFromFilename(url.lastPathComponent) else { continue }
 
             if let currentBest = best {
                 if ver > currentBest.ver { best = (url, ver) }
@@ -90,13 +86,34 @@ struct EpsilonUpdateChecker {
         extractVersionString(from: url.lastPathComponent)
     }
 
+    /// Extracts a version string (X.Y or X.Y.Z) from a filename and normalizes to X.Y.Z for SemVer.
     static func extractVersionString(from filename: String) -> String? {
-        let pattern = #"(\d+)\.(\d+)\.(\d+)"#
-        guard let r = try? NSRegularExpression(pattern: pattern) else { return nil }
+        parseVersionFromFilename(filename)?.string
+    }
+
+    /// Parses X.Y or X.Y.Z from a filename (e.g. "26.1.zip" or "numworks-simulator-25.2.2.zip"). Returns nil if no valid version.
+    private static func parseVersionFromFilename(_ filename: String) -> SemVer? {
+        // Prefer X.Y.Z then X.Y (treat as X.Y.0).
+        let threePart = #"(\d+)\.(\d+)\.(\d+)"#
+        // X.Y only when not part of X.Y.Z (e.g. 26.1 in "26.1.zip" yes; 26.1 in "26.1.2.zip" no)
+        let twoPart = #"(\d+)\.(\d+)(?=\.zip|[^.\d]|$)"#
         let range = NSRange(filename.startIndex..<filename.endIndex, in: filename)
-        guard let m = r.firstMatch(in: filename, range: range) else { return nil }
-        guard let rr = Range(m.range(at: 0), in: filename) else { return nil }
-        return String(filename[rr])
+        if let r3 = try? NSRegularExpression(pattern: threePart),
+           let m3 = r3.firstMatch(in: filename, range: range),
+           let rr = Range(m3.range(at: 0), in: filename) {
+            let s = String(filename[rr])
+            return SemVer(s)
+        }
+        if let r2 = try? NSRegularExpression(pattern: twoPart),
+           let m2 = r2.firstMatch(in: filename, range: range),
+           let r0 = Range(m2.range(at: 0), in: filename),
+           let r1 = Range(m2.range(at: 1), in: filename),
+           let r2g = Range(m2.range(at: 2), in: filename) {
+            let major = Int(filename[r1]) ?? 0
+            let minor = Int(filename[r2g]) ?? 0
+            return SemVer("\(major).\(minor).0")
+        }
+        return nil
     }
 }
 

NumWorksMac/Core/Updaters/SimulatorUpdater.swift

@@ -390,6 +390,11 @@ final class SimulatorUpdater: NSObject, ObservableObject, URLSessionDownloadDele
     }
 
     private func restartApp() {
+        Self.relaunchApplication()
+    }
+
+    /// Use when a settings change requires an app restart (e.g. disable web injection, hide calculator image).
+    static func relaunchApplication() {
         let appURL = Bundle.main.bundleURL
         let appPath = appURL.path
         let pid = ProcessInfo.processInfo.processIdentifier

NumWorksMac/UI/Calculator/CalculatorView.swift

@@ -44,10 +44,12 @@ struct CalculatorView: View {
     var body: some View {
         ZStack(alignment: .topTrailing) {
             GeometryReader { geo in
-                Image("CalculatorImage")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: geo.size.width, height: geo.size.height)
+                if !prefs.calculatorImageHidden {
+                    Image("CalculatorImage")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: geo.size.width, height: geo.size.height)
+                }
 
                 if OnLaunch.hasInstalledSimulator() {
                     CalculatorWebView(

NumWorksMac/UI/Calculator/CalculatorWebView.swift

@@ -11,7 +11,9 @@ struct CalculatorWebView: NSViewRepresentable {
 
     func makeNSView(context: Context) -> WKWebView {
         let config = WKWebViewConfiguration()
-        WebInjection.scripts().forEach { config.userContentController.addUserScript($0) }
+        if !Preferences.shared.webInjectionDisabled {
+            WebInjection.scripts().forEach { config.userContentController.addUserScript($0) }
+        }
         config.userContentController.add(context.coordinator, name: "nwSize")
 
         let webView = WKWebView(frame: .zero, configuration: config)

NumWorksMac/UI/Settings/SettingsView.swift

@@ -252,11 +252,24 @@ private struct AppUpdateSettingsPane: View {
     }
 }
 
+private enum RelaunchSetting {
+    case webInjection
+    case calculatorImage
+}
+
 private struct EpsilonUpdateSettingsPane: View {
+    @ObservedObject private var prefs = Preferences.shared
     @State private var currentSimulatorVersion: String = ""
     @State private var isChecking = false
     @State private var showNoUpdatesAlert = false
 
+    @State private var webInjectionDisabledLocal: Bool = false
+    @State private var calculatorImageHiddenLocal: Bool = false
+    @State private var showRelaunchAlert = false
+    @State private var pendingRelaunchSetting: RelaunchSetting?
+    @State private var isReverting = false
+    @State private var isSyncingFromPrefs = false
+
     var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             Text("Epsilon Update")
@@ -283,6 +296,24 @@ private struct EpsilonUpdateSettingsPane: View {
             }
             .disabled(isChecking)
 
+            Text("Simulator")
+                .fontWeight(.bold)
+                .padding(.top, 8)
+
+            Toggle("Disable web injection", isOn: $webInjectionDisabledLocal)
+                .onChange(of: webInjectionDisabledLocal) { _, _ in
+                    guard !isReverting, !isSyncingFromPrefs else { return }
+                    pendingRelaunchSetting = .webInjection
+                    showRelaunchAlert = true
+                }
+
+            Toggle("Disable calculator image", isOn: $calculatorImageHiddenLocal)
+                .onChange(of: calculatorImageHiddenLocal) { _, _ in
+                    guard !isReverting, !isSyncingFromPrefs else { return }
+                    pendingRelaunchSetting = .calculatorImage
+                    showRelaunchAlert = true
+                }
+
             Spacer()
         }
         .frame(maxWidth: .infinity, alignment: .leading)
@@ -298,6 +329,37 @@ private struct EpsilonUpdateSettingsPane: View {
         }
         .onAppear {
             currentSimulatorVersion = simulatorVersionString()
+            isSyncingFromPrefs = true
+            webInjectionDisabledLocal = prefs.webInjectionDisabled
+            calculatorImageHiddenLocal = prefs.calculatorImageHidden
+            DispatchQueue.main.async {
+                isSyncingFromPrefs = false
+            }
+        }
+        .alert("The app needs to relaunch", isPresented: $showRelaunchAlert) {
+            Button("Undo") {
+                isReverting = true
+                if let pending = pendingRelaunchSetting {
+                    switch pending {
+                    case .webInjection: webInjectionDisabledLocal = prefs.webInjectionDisabled
+                    case .calculatorImage: calculatorImageHiddenLocal = prefs.calculatorImageHidden
+                    }
+                }
+                pendingRelaunchSetting = nil
+                isReverting = false
+            }
+            Button("Relaunch") {
+                if let pending = pendingRelaunchSetting {
+                    switch pending {
+                    case .webInjection: prefs.webInjectionDisabled = webInjectionDisabledLocal
+                    case .calculatorImage: prefs.calculatorImageHidden = calculatorImageHiddenLocal
+                    }
+                }
+                pendingRelaunchSetting = nil
+                SimulatorUpdater.relaunchApplication()
+            }
+        } message: {
+            Text("Your change will take effect after the app restarts.")
         }
         .alert("No updates available", isPresented: $showNoUpdatesAlert) {
             Button("OK") {}
@@ -336,7 +398,7 @@ private struct EpsilonUpdateSettingsPane: View {
 
                 currentSimulatorVersion = simulatorVersionString()
             } catch {
-                print("[Settings] epsilon update check failed: \(error)")
+                print("[EpsilonUpdateChecker] error: \(error)")
             }
         }
     }