@glassly/crust 0.4.0-beta.1025 → 0.4.0-beta.1052

package/ios/Resources/startup.js

@@ -605,7 +605,9 @@
           }
         }
         const sendRequest = g.__sendRequest;
-        const result = await sendRequest("fetch", "request", [{ url, method, headers, body: bodyString, bodyBase64 }]);
+        const result = await sendRequest("fetch", "request", [
+          { url, method, headers, body: bodyString, bodyBase64 }
+        ]);
         const bodyText = typeof result.body === "string" ? result.body : "";
         const responseHeaders = new Map(Object.entries(result.headers ?? {}));
         class ResponseLike {

package/ios/navigation/NavigationManager.swift

@@ -24,10 +24,8 @@ import MapboxNavigationCore
 /// - iOS v3 is **Combine publisher-based**, not observer-based. We hold
 ///   `AnyCancellable`s instead of registering observer objects.
 /// - Routing is `async`: `routingProvider().calculateRoutes(options:)`.
-/// - Simulation is a **CoreConfig location source** (`.simulation`), chosen at
-///   provider-construction time — not a separate replay session object. Because
-///   the source is fixed when the provider is built, switching sim on/off
-///   rebuilds the provider (see `makeProvider`).
+/// - Simulation is a CoreConfig location source. Reconfigure the one retained
+///   provider between trips; Mapbox forbids simultaneous provider instances.
 /// - Mapbox owns off-route detection + auto-reroute on iOS too, same as
 ///   Android — we observe, we don't re-derive.
 ///
@@ -55,19 +53,23 @@ final class NavigationManager: NSObject {
   private var onLocation: LocationCallback?
   private var onRoute: RouteCallback?
 
-  // The Mapbox engine. Rebuilt per-trip because the location source
-  // (live vs simulation) is baked into CoreConfig at construction time.
+  // Mapbox permits exactly one provider, including while old async work unwinds.
+  // Keep it for this singleton's lifetime and reconfigure it between trips.
+  private var tripGeneration = UUID()
+  private var startCompletion: StartCompletion?
   private var provider: MapboxNavigationProvider?
-  private var mapboxNavigation: MapboxNavigation? { provider?.mapboxNavigation }
+  private var mapboxNavigation: MapboxNavigation? {
+    provider?.mapboxNavigation
+  }
 
-  // Combine subscriptions — torn down on stop().
+  /// Combine subscriptions — torn down on stop().
   private var cancellables = Set<AnyCancellable>()
 
-  // First-fix gate. Mapbox has no synchronous "current location" getter; the
-  // device position arrives only via the locationMatching publisher AFTER the
-  // session starts. So we start the session, capture the first fix, THEN
-  // request the route from that real origin. Mirrors Android's
-  // `pendingRouteRequest`. nil once fired (one-shot).
+  /// First-fix gate. Mapbox has no synchronous "current location" getter; the
+  /// device position arrives only via the locationMatching publisher AFTER the
+  /// session starts. So we start the session, capture the first fix, THEN
+  /// request the route from that real origin. Mirrors Android's
+  /// `pendingRouteRequest`. nil once fired (one-shot).
   private var pendingRouteRequest: ((_ originLat: Double, _ originLng: Double) -> Void)?
 
   // Per-trip config captured from start().
@@ -76,18 +78,18 @@ final class NavigationManager: NSObject {
   private var simulating: Bool = false
   private var simulationSpeed: Double = 1.0
 
-  // Dedup the maneuver emission to ~1m granularity (matches Android's
-  // emitManeuverIfChanged so the "In X m" countdown updates ~1 Hz and stays in
-  // lockstep with the trip distance). Key = "type|distM|tripM".
+  /// Dedup the maneuver emission to ~1m granularity (matches Android's
+  /// emitManeuverIfChanged so the "In X m" countdown updates ~1 Hz and stays in
+  /// lockstep with the trip distance). Key = "type|distM|tripM".
   private var lastEmittedManeuverKey: String?
 
-  // Arrival is reported once; the SDK keeps ticking COMPLETE afterwards.
+  /// Arrival is reported once; the SDK keeps ticking COMPLETE afterwards.
   private var arrivedHandled = false
-  // Off-route emitted once per episode (reset on reroute), same as Android.
+  /// Off-route emitted once per episode (reset on reroute), same as Android.
   private var offRouteEmitted = false
-  // The navigationRoutes publisher fires once with the INITIAL route (already
-  // emitted by requestAndStartRoute). We skip that first emission and treat
-  // every subsequent one as a reroute redraw. false until the first fires.
+  /// The navigationRoutes publisher fires once with the INITIAL route (already
+  /// emitted by requestAndStartRoute). We skip that first emission and treat
+  /// every subsequent one as a reroute redraw. false until the first fires.
   private var didEmitInitialRoute = false
 
   // Last two forwarded coords — the Deviate dev walker derives its bearing
@@ -99,9 +101,9 @@ final class NavigationManager: NSObject {
 
   // MARK: - Access token
 
-  // User-supplied Mapbox token (Settings > Keys), pushed from JS via
-  // CrustModule.setMapboxAccessToken. Non-empty wins over the Info.plist
-  // MBXAccessToken the SDK reads at boot; "" means "no override".
+  /// User-supplied Mapbox token (Settings > Keys), pushed from JS via
+  /// CrustModule.setMapboxAccessToken. Non-empty wins over the Info.plist
+  /// MBXAccessToken the SDK reads at boot; "" means "no override".
   private var accessTokenOverride: String = ""
 
   /// Set (or with "" clear) the runtime token override. Applied to the
@@ -115,7 +117,9 @@ final class NavigationManager: NSObject {
   /// The token the next provider build must use: the override when set, else
   /// the baked Info.plist token, else "" (nothing to authenticate with).
   private func resolvedAccessToken() -> String {
-    if !accessTokenOverride.isEmpty { return accessTokenOverride }
+    if !accessTokenOverride.isEmpty {
+      return accessTokenOverride
+    }
     if let baked = Bundle.main.object(forInfoDictionaryKey: "MBXAccessToken") as? String, !baked.isEmpty {
       return baked
     }
@@ -127,7 +131,9 @@ final class NavigationManager: NSObject {
   /// components read it, so keep it in step.
   private func applyAccessToken() {
     let token = resolvedAccessToken()
-    if !token.isEmpty { MapboxOptions.accessToken = token }
+    if !token.isEmpty {
+      MapboxOptions.accessToken = token
+    }
   }
 
   // MARK: - Permissions
@@ -162,73 +168,71 @@ final class NavigationManager: NSObject {
       return
     }
 
+    startCompletion = completion
+    let completion: StartCompletion = { [weak self] success, error in
+      self?.finishStart(success, error)
+    }
     self.onEvent = onEvent
     self.onLocation = onLocation
     self.onRoute = onRoute
-    self.tripStops = stops
-    self.travelMode = mode
-    self.simulating = simulate
-    self.simulationSpeed = max(0.5, min(speedMultiplier, 50))
-    self.arrivedHandled = false
-    self.offRouteEmitted = false
-    self.didEmitInitialRoute = false
-    self.lastEmittedManeuverKey = nil
+    tripStops = stops
+    travelMode = mode
+    simulating = simulate
+    simulationSpeed = max(0.5, min(speedMultiplier, 50))
+    arrivedHandled = false
+    offRouteEmitted = false
+    didEmitInitialRoute = false
+    lastEmittedManeuverKey = nil
     // (missedTurnRerouteMeters is intentionally unused on the Mapbox path —
     // Mapbox owns reroute natively, same decision as Android. Kept in the
     // signature for contract parity with CrustModule.)
     _ = missedTurnRerouteMeters
 
-    DispatchQueue.main.async { [weak self] in
-      guard let self else { return }
-
-      // Token precedence must hold for THIS provider build: user override
-      // when set, else the baked Info.plist token.
-      self.applyAccessToken()
-
-      // Build the provider with the right location source. Simulation is a
-      // CoreConfig choice; `.simulation` drives a synthetic puck along the
-      // active route once one is set.
-      let provider = self.makeProvider(simulate: simulate)
-      self.provider = provider
-
-      // `mapboxNavigation` is non-optional on the provider.
-      let nav = provider.mapboxNavigation
-
-      // Subscribe to the publishers BEFORE starting the session so we don't
-      // miss the first ticks.
-      self.subscribe(nav)
-
-      // Start a free-drive (passive) session so location starts flowing; the
-      // first fix satisfies the gate below, then we request the route and
-      // switch to active guidance.
-      // VERIFY-IN-XCODE: free-drive start method name. v3 examples show
-      // `nav.tripSession().startFreeDrive()`.
-      nav.tripSession().startFreeDrive()
-
-      // First-fix gate: request the route from the device's real origin.
-      self.pendingRouteRequest = { [weak self] originLat, originLng in
-        self?.requestAndStartRoute(
-          nav: nav,
-          originLat: originLat,
-          originLng: originLng,
-          completion: completion
-        )
-      }
+    // Already on the main actor: do not enqueue a second, overlapping start.
+    // Token precedence must hold for THIS provider build: user override
+    // when set, else the baked Info.plist token.
+    applyAccessToken()
 
-      // First-fix TIMEOUT (live AND sim). The gate above waits for Mapbox's
-      // locationMatching publisher to emit the first fix before requesting the
-      // route. On a COLD APP LAUNCH that first fix can be slow or never arrive
-      // until the CLLocationManager fully spins up — which is exactly the
-      // "first nav after launch hangs at Starting…, works on the 2nd try" bug
-      // (the 2nd try has a warm location manager). So we ALWAYS arm a timeout:
-      // if no fix satisfies the gate in time, request the route from a one-shot
-      // CoreLocation fix / last known location so we never hang.
-      self.armFirstFixTimeout(nav: nav, completion: completion)
+    // Reconfigure the shared provider for live or simulated locations.
+    let provider = makeProvider(simulate: simulate)
+    self.provider = provider
+
+    // `mapboxNavigation` is non-optional on the provider.
+    let nav = provider.mapboxNavigation
+
+    // Subscribe to the publishers BEFORE starting the session so we don't
+    // miss the first ticks.
+    subscribe(nav)
+
+    // Start a free-drive (passive) session so location starts flowing; the
+    // first fix satisfies the gate below, then we request the route and
+    // switch to active guidance.
+    // VERIFY-IN-XCODE: free-drive start method name. v3 examples show
+    // `nav.tripSession().startFreeDrive()`.
+    nav.tripSession().startFreeDrive()
+
+    // First-fix gate: request the route from the device's real origin.
+    pendingRouteRequest = { [weak self] originLat, originLng in
+      self?.requestAndStartRoute(
+        nav: nav,
+        originLat: originLat,
+        originLng: originLng,
+        completion: completion
+      )
     }
+
+    // First-fix TIMEOUT (live AND sim). The gate above waits for Mapbox's
+    // locationMatching publisher to emit the first fix before requesting the
+    // route. On a COLD APP LAUNCH that first fix can be slow or never arrive
+    // until the CLLocationManager fully spins up — which is exactly the
+    // "first nav after launch hangs at Starting…, works on the 2nd try" bug
+    // (the 2nd try has a warm location manager). So we ALWAYS arm a timeout:
+    // if no fix satisfies the gate in time, request the route from a one-shot
+    // CoreLocation fix / last known location so we never hang.
+    armFirstFixTimeout(nav: nav, completion: completion)
   }
 
-  /// Build a fresh MapboxNavigationProvider. `.simulation` vs `.live` is fixed
-  /// at construction, which is why a sim toggle rebuilds the provider.
+  /// Reuse the provider even when a previous trip still has routing work in flight.
   private func makeProvider(simulate: Bool) -> MapboxNavigationProvider {
     // Explicit reroute config: native off-route detection + auto-reroute ON
     // (this is the SDK default — detectsReroute defaults to true — but we set it
@@ -254,6 +258,10 @@ final class NavigationManager: NSObject {
       routingConfig: routingConfig,
       locationSource: simulate ? .simulation(initialLocation: nil) : .live
     )
+    if let provider {
+      provider.apply(coreConfig: coreConfig)
+      return provider
+    }
     return MapboxNavigationProvider(coreConfig: coreConfig)
   }
 
@@ -364,10 +372,11 @@ final class NavigationManager: NSObject {
     completion: @escaping StartCompletion,
     attempt: Int = 0
   ) {
-    let maxAttempts = 8        // ~8 × 0.75s ≈ 6s total before giving up
+    let maxAttempts = 8 // ~8 × 0.75s ≈ 6s total before giving up
     let interval: TimeInterval = 0.75
+    let generation = tripGeneration
     DispatchQueue.main.asyncAfter(deadline: .now() + interval) { [weak self] in
-      guard let self else { return }
+      guard let self, self.tripGeneration == generation else { return }
       // Gate already fired (a real fix arrived) — nothing to do.
       guard let pending = self.pendingRouteRequest else { return }
 
@@ -416,24 +425,22 @@ final class NavigationManager: NSObject {
 
     // VERIFY-IN-XCODE: `routingProvider().calculateRoutes(options:)` returns a
     // Task whose `.result` is `Result<NavigationRoutes, Error>` (v3 example).
+    let generation = tripGeneration
     let task = nav.routingProvider().calculateRoutes(options: options)
     Task { [weak self] in
-      guard let self else { return }
-      switch await task.result {
-      case .success(let navigationRoutes):
-        await MainActor.run {
-          // v3 SessionController: startActiveGuidance(with:startLegIndex:).
-          // Off-route detection + auto-reroute only run in ACTIVE GUIDANCE — so
-          // this call (not the earlier free-drive) is what arms rerouting.
-          print("[NavMgr] startActiveGuidance — \(navigationRoutes.mainRoute.route.legs.count) legs, profile=\(self.travelMode)")
-          nav.tripSession().startActiveGuidance(with: navigationRoutes, startLegIndex: 0)
-          self.emitRoute(navigationRoutes)
-          completion(true, nil)
-        }
-      case .failure(let error):
-        await MainActor.run {
-          completion(false, "route request failed: \(error.localizedDescription)")
-        }
+      let result = await task.result
+      guard let self, self.tripGeneration == generation else { return }
+      switch result {
+      case let .success(navigationRoutes):
+        // v3 SessionController: startActiveGuidance(with:startLegIndex:).
+        // Off-route detection + auto-reroute only run in ACTIVE GUIDANCE — so
+        // this call (not the earlier free-drive) is what arms rerouting.
+        print("[NavMgr] startActiveGuidance — \(navigationRoutes.mainRoute.route.legs.count) legs, profile=\(self.travelMode)")
+        nav.tripSession().startActiveGuidance(with: navigationRoutes, startLegIndex: 0)
+        self.emitRoute(navigationRoutes)
+        completion(true, nil)
+      case let .failure(error):
+        completion(false, "route request failed: \(error.localizedDescription)")
       }
     }
   }
@@ -453,12 +460,18 @@ final class NavigationManager: NSObject {
   // MARK: - Stop
 
   func stop() {
-    DispatchQueue.main.async { [weak self] in
-      self?.stopInternal()
-    }
+    stopInternal()
+  }
+
+  private func finishStart(_ success: Bool, _ error: String?) {
+    let completion = startCompletion
+    startCompletion = nil
+    completion?(success, error)
   }
 
   private func stopInternal() {
+    tripGeneration = UUID()
+    finishStart(false, "navigation stopped")
     deviateTimer?.invalidate()
     deviateTimer = nil
     cancellables.forEach { $0.cancel() }
@@ -466,7 +479,6 @@ final class NavigationManager: NSObject {
     // Trip-session stop: SessionController.setToIdle(). `mapboxNavigation` is
     // non-optional, so only `provider?` carries the optional chain.
     provider?.mapboxNavigation.tripSession().setToIdle()
-    provider = nil
     onEvent = nil
     onLocation = nil
     onRoute = nil
@@ -522,7 +534,7 @@ final class NavigationManager: NSObject {
         if simulating {
           // In sim the puck is parked at the destination; nothing more to do
           // on iOS (no replay session to tear back to live). The next start()
-          // rebuilds the provider cleanly.
+          // reconfigures the shared provider.
         }
       }
       return
@@ -592,7 +604,9 @@ final class NavigationManager: NSObject {
     let distBucket = distanceMeters >= 0 ? distanceMeters : -1
     let tripBucket = distanceToDestinationMeters >= 0 ? distanceToDestinationMeters : -1
     let key = "\(maneuverType)|\(distBucket)|\(tripBucket)"
-    if key == lastEmittedManeuverKey { return }
+    if key == lastEmittedManeuverKey {
+      return
+    }
     lastEmittedManeuverKey = key
 
     var payload: [String: Any] = [
@@ -602,9 +616,15 @@ final class NavigationManager: NSObject {
       "distanceToDestinationMeters": distanceToDestinationMeters,
       "timeToDestinationSeconds": timeToDestinationSeconds,
     ]
-    if let fromRoad { payload["fromRoad"] = fromRoad; payload["toRoad"] = fromRoad }
-    if let nextStepRoad { payload["nextStepRoad"] = nextStepRoad }
-    if let instruction { payload["instruction"] = instruction }
+    if let fromRoad {
+      payload["fromRoad"] = fromRoad; payload["toRoad"] = fromRoad
+    }
+    if let nextStepRoad {
+      payload["nextStepRoad"] = nextStepRoad
+    }
+    if let instruction {
+      payload["instruction"] = instruction
+    }
     onEvent?(payload)
   }
 
@@ -647,11 +667,15 @@ final class NavigationManager: NSObject {
           "maneuver": maneuverString(type: step.maneuverType, direction: step.maneuverDirection),
           "distanceMeters": Int(step.distance.rounded()),
         ]
-        if let road = step.names?.first?.nonBlank { entry["road"] = road }
+        if let road = step.names?.first?.nonBlank {
+          entry["road"] = road
+        }
         steps.append(entry)
       }
     }
-    if !steps.isEmpty { payload["steps"] = steps }
+    if !steps.isEmpty {
+      payload["steps"] = steps
+    }
 
     onRoute?(payload)
   }
@@ -663,7 +687,9 @@ final class NavigationManager: NSObject {
       let dx = (p["lat"] ?? 0) - lat
       let dy = (p["lng"] ?? 0) - lng
       let d = dx * dx + dy * dy
-      if d < bestD { bestD = d; best = i }
+      if d < bestD {
+        bestD = d; best = i
+      }
     }
     return best
   }
@@ -685,7 +711,9 @@ final class NavigationManager: NSObject {
       let bearing: Double = {
         if let prev = self.prevReportedCoord, let last = self.lastReportedCoord {
           let d = self.haversineMeters(prev, last)
-          if d > 0.5 { return self.bearingDegrees(from: prev, to: last) }
+          if d > 0.5 {
+            return self.bearingDegrees(from: prev, to: last)
+          }
         }
         return .nan
       }()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/crust",
-  "version": "0.4.0-beta.1025",
+  "version": "0.4.0-beta.1052",
   "description": "Glassly Native Module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -35,7 +35,7 @@
   "license": "MIT",
   "homepage": "https://github.com/fossephate/crust#readme",
   "dependencies": {
-    "@glassly/jspolyfill": "0.4.0-beta.1025"
+    "@glassly/jspolyfill": "0.4.0-beta.1052"
   },
   "devDependencies": {
     "@expo/config-plugins": ">=8.0.0",