@tokamakdev/plugin-location 0.1.0-beta.104 → 0.1.0-beta.107

package/README.md

@@ -127,9 +127,11 @@ event:
 | `onLocationError` | `{ name, message, id? }` when a background service fails, with the region's `id` when it concerns one. |
 
 `positions` holds the positions that arrived while the Worker handled the
-previous update, oldest first, so a slow Worker never builds a queue. Apple's
-`stationary`, from iOS 18 and macOS 15, is true on the last update before
-updates pause while the device is still.
+previous update, oldest first, so a slow Worker never builds a queue. Each is
+newer than those delivered before it, so a position that both updates and
+significant changes report arrives once. Apple's `stationary`, from iOS 18
+and macOS 15, is true on the last update before updates pause while the
+device is still.
 
 The plugin's `onLocationUpdate`, `onRegionTransition`, `onVisit` and
 `onLocationError` methods receive the same events while the listening page or
@@ -175,7 +177,8 @@ plugin keeps them across launches and restarts.
   macOS 27). It tunes when updates pause and how coordinates follow roads.
 - Updates pause while the device is still and resume when it moves.
 - If iOS ends the app while updates run, it launches the app for the next
-  update, and the plugin resumes them.
+  update, and the plugin resumes them until `stopUpdates()`. With Always
+  permission, swiping the app away does not stop them either.
 - Off screen, updates need Always permission, or the `background-updates`
   build setting, whose background activity session shows the pill.
   `startUpdates` rejects with `NeedsUIError` off screen on iOS.

package/android/LocationEvents.kt

@@ -23,6 +23,9 @@ internal class LocationEvents(private val host: TokamakHost) {
     private val finishes = mutableListOf<() -> Unit>()
     private var updating = false
 
+    /** The time of the newest position delivered, as requests that run together receive the same positions. */
+    private var latest = Long.MIN_VALUE
+
     /** Adds a page's or Worker's listener of [method], returning its removal, or null for another method. */
     fun listen(method: String, reply: TokamakPluginReply): (() -> Unit)? {
         if (method !in LISTENERS) return null
@@ -32,11 +35,14 @@ internal class LocationEvents(private val host: TokamakHost) {
     }
 
     /**
-     * Delivers [received] positions, then calls [finish]. Positions that arrive while the Worker
-     * handles an update reach it together as the next.
+     * Delivers the [received] positions newer than those delivered, then calls [finish]. Positions
+     * that arrive while the Worker handles an update reach it together as the next.
      */
     fun update(received: List<JSONObject>, finish: () -> Unit) {
-        positions += received
+        val newer = received.filter { it.getLong("timestamp") > latest }
+        if (newer.isEmpty()) return finish()
+        latest = newer.maxOf { it.getLong("timestamp") }
+        positions += newer
         finishes += finish
         if (!updating) sendUpdate()
     }

package/android/LocationPlugin.kt

@@ -53,6 +53,9 @@ class TokamakLocationPlugin(
     private val regions = LocationRegions(context)
     private val events = LocationEvents(host)
 
+    /** Whether the provider was on when last reported, as each request reports its changes. */
+    private var providerEnabled = true
+
     /** Whether the app's manifest declares the foreground service, as the `background-updates` build setting does. */
     private val declaresService: Boolean by lazy {
         runCatching { context.packageManager.getServiceInfo(ComponentName(context, TokamakLocationService::class.java), 0) }
@@ -259,12 +262,13 @@ class TokamakLocationPlugin(
     internal fun receive(intent: Intent, finish: () -> Unit) {
         if (intent.action == LocationRegions.REGION_ACTION) return transition(intent, finish)
         if (intent.hasExtra(LocationManager.KEY_PROVIDER_ENABLED)) {
-            if (intent.getBooleanExtra(LocationManager.KEY_PROVIDER_ENABLED, true)) return finish()
+            val enabled = intent.getBooleanExtra(LocationManager.KEY_PROVIDER_ENABLED, true)
+            val turnedOff = providerEnabled && !enabled
+            providerEnabled = enabled
+            if (!turnedOff) return finish()
             return events.fail(TokamakPluginError("NotReadableError", "The location provider was turned off"), finish)
         }
-        val received = locations(intent).map(::position)
-        if (received.isEmpty()) return finish()
-        events.update(received, finish)
+        events.update(locations(intent).map(::position), finish)
     }
 
     /** Delivers a region's entry or exit, when the region reports it. */

package/apple/LocationEvents.swift

@@ -19,6 +19,9 @@ final class TokamakLocationEvents {
   private var positions: [[String: Any]] = []
   private var stationary: Bool?
   private var updating = false
+  /// The time of the newest position delivered, as services that run together
+  /// report the same positions.
+  private var latest = Date.distantPast
   /// The messages of the problems last reported, by region id, or nil for
   /// updates.
   private var problems: [String?: Set<String>] = [:]
@@ -37,11 +40,14 @@ final class TokamakLocationEvents {
     }
   }
 
-  /// Delivers `location`, with Apple's `stationary` flag when the system
-  /// reports it. Positions that arrive while the Worker handles an update
-  /// reach it together as the next.
+  /// Delivers `location` when it is newer than the positions delivered, with
+  /// Apple's `stationary` flag when the system reports it. Positions that
+  /// arrive while the Worker handles an update reach it together as the next.
   func update(_ location: CLLocation?, stationary: Bool? = nil) {
-    positions += location.map { [Self.position($0)] } ?? []
+    if let location, location.timestamp > latest {
+      latest = location.timestamp
+      positions.append(Self.position(location))
+    }
     if let stationary {
       self.stationary = stationary
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/plugin-location",
-  "version": "0.1.0-beta.104",
+  "version": "0.1.0-beta.107",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mantty/tokamak.git",
@@ -12,7 +12,7 @@
     "./events": "./events/index.ts"
   },
   "peerDependencies": {
-    "@tokamakdev/plugin": "0.1.0-beta.104"
+    "@tokamakdev/plugin": "0.1.0-beta.107"
   },
   "files": [
     "android",

package/src/types.ts

@@ -112,11 +112,14 @@ export interface ServiceNotification {
 
 /** Positions from continuous updates or significant changes. */
 export interface LocationUpdate {
-  /** Oldest first: those that arrived while the Worker handled the previous update come together. */
+  /**
+   * Oldest first: those that arrived while the Worker handled the previous update come together. Each
+   * is newer than those delivered before it, so one that several services report arrives once.
+   */
   readonly positions: readonly Position[];
   /**
    * Apple only, from iOS 18 and macOS 15: true on the last update before updates pause while the
-   * device is still. `positions` is empty when the update has no position.
+   * device is still. `positions` is empty when the update has no new position.
    */
   readonly stationary?: boolean;
 }