@wayq/beekon-rn 0.0.1 → 0.0.3

package/ios/BeekonRn.swift

@@ -7,78 +7,74 @@ import BeekonKit
 /// (resolver/rejecter) and dictionaries so they can be invoked from `.mm`.
 ///
 /// Event delivery: `BeekonRn.mm` constructs this with two closures that call
-/// the codegen-generated `emitOnState:` / `emitOnPosition:` ObjC methods on
-/// the spec; the closures are invoked from the per-stream `Task`s started
-/// during `initialize`.
-@objc public final class BeekonRnImpl: NSObject {
+/// the codegen-generated `emitOnState:` / `emitOnLocation:` ObjC methods on
+/// the spec; the closures are invoked from per-stream `Task`s started during
+/// init.
+// `@unchecked Sendable` is correct here: `onStateCb`/`onLocationCb` are
+// immutable closures, and `stateTask`/`locationsTask` are mutated only from
+// init/stopCollectors which run sequentially. NSObject can't be auto-Sendable
+// and `@objc` rules out `actor`, so this is the path.
+@objc public final class BeekonRnImpl: NSObject, @unchecked Sendable {
 
   private let onStateCb: (NSDictionary) -> Void
-  private let onPositionCb: (NSDictionary) -> Void
+  private let onLocationCb: (NSDictionary) -> Void
 
   private var stateTask: Task<Void, Never>?
-  private var positionsTask: Task<Void, Never>?
+  private var locationsTask: Task<Void, Never>?
 
   @objc public init(
     onState: @escaping (NSDictionary) -> Void,
-    onPosition: @escaping (NSDictionary) -> Void
+    onLocation: @escaping (NSDictionary) -> Void
   ) {
     self.onStateCb = onState
-    self.onPositionCb = onPosition
+    self.onLocationCb = onLocation
     super.init()
-  }
-
-  // MARK: - Lifecycle
-
-  @objc public func initializeWithResolver(
-    _ resolve: @escaping (Any?) -> Void,
-    rejecter reject: @escaping (String?, String?, Error?) -> Void
-  ) {
-    Task { [weak self] in
+    self.stateTask = Task { [weak self] in
       guard let self = self else { return }
-      do {
-        try await Beekon.shared.initialize()
-        // Idempotent: cancel any prior collectors before starting new ones.
-        self.stateTask?.cancel()
-        self.positionsTask?.cancel()
-        self.stateTask = Task { [weak self] in
-          guard let self = self else { return }
-          for await state in await Beekon.shared.state {
-            self.onStateCb(self.stateToWire(state))
-          }
-        }
-        self.positionsTask = Task { [weak self] in
-          guard let self = self else { return }
-          for await pos in await Beekon.shared.positions {
-            self.onPositionCb(self.positionToWire(pos))
-          }
-        }
-        resolve(nil)
-      } catch {
-        reject(self.errorCode(error), error.localizedDescription, error)
+      for await state in await Beekon.shared.state {
+        self.onStateCb(self.stateToWire(state))
+      }
+    }
+    self.locationsTask = Task { [weak self] in
+      guard let self = self else { return }
+      for await loc in await Beekon.shared.locations {
+        self.onLocationCb(self.locationToWire(loc))
       }
     }
   }
 
+  @objc public func invalidate() {
+    stateTask?.cancel()
+    locationsTask?.cancel()
+    stateTask = nil
+    locationsTask = nil
+  }
+
+  // MARK: - Lifecycle
+
   @objc public func configure(
     _ config: NSDictionary,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    resolver resolve: @escaping @Sendable (Any?) -> Void,
+    rejecter reject: @escaping @Sendable (String?, String?, Error?) -> Void
   ) {
-    Task { [weak self] in
-      guard let self = self else { return }
-      do {
-        let cfg = try self.wireToConfig(config)
-        await Beekon.shared.configure(cfg)
-        resolve(nil)
-      } catch {
-        reject(self.errorCode(error), error.localizedDescription, error)
-      }
+    // Convert the non-Sendable NSDictionary to a Sendable BeekonConfig before
+    // crossing into the Task closure.
+    let cfg: BeekonConfig
+    do {
+      cfg = try wireToConfig(config)
+    } catch {
+      reject(errorCode(error), error.localizedDescription, error)
+      return
+    }
+    Task {
+      await Beekon.shared.configure(cfg)
+      resolve(nil)
     }
   }
 
   @objc public func startWithResolver(
-    _ resolve: @escaping (Any?) -> Void,
-    rejecter reject: @escaping (String?, String?, Error?) -> Void
+    _ resolve: @escaping @Sendable (Any?) -> Void,
+    rejecter reject: @escaping @Sendable (String?, String?, Error?) -> Void
   ) {
     Task { [weak self] in
       guard let self = self else { return }
@@ -92,42 +88,31 @@ import BeekonKit
   }
 
   @objc public func stopWithResolver(
-    _ resolve: @escaping (Any?) -> Void,
-    rejecter reject: @escaping (String?, String?, Error?) -> Void
+    _ resolve: @escaping @Sendable (Any?) -> Void,
+    rejecter reject: @escaping @Sendable (String?, String?, Error?) -> Void
   ) {
-    Task { [weak self] in
-      guard let self = self else { return }
+    Task {
       await Beekon.shared.stop()
       resolve(nil)
     }
   }
 
-  @objc public func shutdownWithResolver(
-    _ resolve: @escaping (Any?) -> Void,
-    rejecter reject: @escaping (String?, String?, Error?) -> Void
-  ) {
-    Task { [weak self] in
-      guard let self = self else { return }
-      self.stateTask?.cancel()
-      self.positionsTask?.cancel()
-      await Beekon.shared.shutdown()
-      resolve(nil)
-    }
-  }
-
   @objc public func historyFromMs(
     _ fromMs: Double,
     toMs: Double,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    resolver resolve: @escaping @Sendable (Any?) -> Void,
+    rejecter reject: @escaping @Sendable (String?, String?, Error?) -> Void
   ) {
     Task { [weak self] in
       guard let self = self else { return }
       do {
         let from = Date(timeIntervalSince1970: fromMs / 1000.0)
         let to = Date(timeIntervalSince1970: toMs / 1000.0)
-        let positions = try await Beekon.shared.history(from: from, to: to)
-        let arr = positions.map { self.positionToWire($0) }
+        // Function-form overload of `locations` — the property is the live
+        // stream, the function is the historical fetch. Swift resolves on
+        // signature.
+        let locations = try await Beekon.shared.locations(from: from, to: to)
+        let arr = locations.map { self.locationToWire($0) }
         resolve(arr)
       } catch {
         reject(self.errorCode(error), error.localizedDescription, error)
@@ -138,58 +123,55 @@ import BeekonKit
   // MARK: - Mappers
 
   private func wireToConfig(_ d: NSDictionary) throws -> BeekonConfig {
-    let presetStr = (d["preset"] as? String) ?? "balanced"
-    let preset: Preset
-    switch presetStr {
-    case "saver": preset = .saver
-    case "precision": preset = .precision
-    default: preset = .balanced
-    }
-
-    let distanceFilterMeters = d["distanceFilterMeters"] as? Double
-    // JS sends millis; iOS BeekonConfig wants seconds. Normalize here.
-    let intervalSeconds: Double?
-    if let ms = d["intervalMillis"] as? Double {
-      intervalSeconds = ms / 1000.0
-    } else {
-      intervalSeconds = nil
+    // Wire defaults are applied by the TS facade — both fields are required at
+    // the wire level, so missing keys are a programmer error.
+    guard
+      let intervalSeconds = (d["intervalSeconds"] as? NSNumber)?.doubleValue,
+      let distanceMeters = (d["distanceMeters"] as? NSNumber)?.doubleValue
+    else {
+      throw NSError(
+        domain: "BeekonRn",
+        code: -1,
+        userInfo: [NSLocalizedDescriptionKey: "intervalSeconds/distanceMeters missing"]
+      )
     }
-    let licenseKey = d["licenseKey"] as? String
-
     return BeekonConfig(
-      preset: preset,
-      distanceFilterMeters: distanceFilterMeters,
       intervalSeconds: intervalSeconds,
-      licenseKey: licenseKey
+      distanceMeters: distanceMeters
     )
+    // androidNotification ignored on iOS.
   }
 
-  private func positionToWire(_ p: Position) -> NSDictionary {
-    return [
-      "lat": p.lat,
-      "lng": p.lng,
-      "accuracy": p.accuracy,
-      "speed": p.speed,
-      "bearing": p.bearing,
-      "altitude": p.altitude,
-      "timestampMs": p.timestamp.timeIntervalSince1970 * 1000.0,
-    ]
+  private func locationToWire(_ loc: Location) -> NSDictionary {
+    // NSDictionary literals can't carry `nil` values, so optionals collapse
+    // to `NSNull` — the JS Codegen layer translates that back to `null`.
+    let d = NSMutableDictionary()
+    d["lat"] = loc.lat
+    d["lng"] = loc.lng
+    d["timestampMs"] = loc.timestamp.timeIntervalSince1970 * 1000.0
+    d["accuracy"] = loc.accuracy.map { $0 as Any } ?? NSNull()
+    d["speed"] = loc.speed.map { $0 as Any } ?? NSNull()
+    d["bearing"] = loc.bearing.map { $0 as Any } ?? NSNull()
+    d["altitude"] = loc.altitude.map { $0 as Any } ?? NSNull()
+    return d
   }
 
   private func stateToWire(_ s: BeekonState) -> NSDictionary {
     switch s {
-    case .idle: return ["type": "idle"]
-    case .starting: return ["type": "starting"]
-    case .tracking: return ["type": "tracking"]
-    case .stopped: return ["type": "stopped"]
-    case .paused(let reason):
-      let r: String
-      switch reason {
-      case .permissionRevoked: r = "permissionRevoked"
-      case .locationDisabled: r = "locationDisabled"
-      case .unknown: r = "unknown"
-      }
-      return ["type": "paused", "pauseReason": r]
+    case .idle:
+      return ["type": "idle"]
+    case .tracking:
+      return ["type": "tracking"]
+    case .stopped(let reason):
+      return ["type": "stopped", "stopReason": stopReasonToWire(reason)]
+    }
+  }
+
+  private func stopReasonToWire(_ r: StopReason) -> String {
+    switch r {
+    case .user: return "user"
+    case .permissionDenied: return "permissionDenied"
+    case .locationServicesDisabled: return "locationServicesDisabled"
     }
   }
 
@@ -201,9 +183,7 @@ import BeekonKit
       switch be {
       case .permissionDenied: return "PERMISSION_DENIED"
       case .locationServicesDisabled: return "LOCATION_SERVICES_DISABLED"
-      case .notConfigured: return "NOT_CONFIGURED"
-      case .notInitialised: return "NOT_INITIALISED"
-      case .internalError: return "INTERNAL_ERROR"
+      case .storageFailure: return "STORAGE_FAILURE"
       }
     }
     return "INTERNAL_ERROR"

package/ios/Frameworks/BeekonKit.xcframework/_CodeSignature/CodeResources

@@ -10,45 +10,77 @@
 		</data>
 		<key>ios-arm64/BeekonKit.framework/BeekonKit</key>
 		<data>
-		SyrIBjwS5o/8csiCfKIXmBtvzio=
+		+naAIv6MaKzUx2+ey3MVX1DIjx8=
 		</data>
 		<key>ios-arm64/BeekonKit.framework/Info.plist</key>
 		<data>
-		3d/2OPEwv55L8dW+0woT9NRCNi0=
+		J2Q8IsOOK4KAiFaP40/M4N6vym0=
+		</data>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.abi.json</key>
+		<data>
+		g3XuCRuM2juW8XYn4Y2Xe208MbM=
+		</data>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<data>
+		GYBAar6iPnb1XJGupWqUhKVBjKU=
+		</data>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.swiftinterface</key>
+		<data>
+		v4db5W67RIw4bayliPlZv35/sFU=
 		</data>
 		<key>ios-arm64/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
 		<data>
-		+Hzj9e+o3dYoDboCDA7ofM2a0kc=
+		9ZHPJ6MUYP0Ios5LKP+bfuWVxJk=
 		</data>
 		<key>ios-arm64/BeekonKit.framework/_CodeSignature/CodeResources</key>
 		<data>
-		iZuijJG0soEo1jfi0V3NeqZXX4s=
+		qVAi0E8MUwJOhDlgAXFRDX/3vgQ=
 		</data>
 		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/BeekonKit</key>
 		<data>
-		cEmeEm6qJLQueaJja0nxBKt+nEA=
+		FjUHhPklgfj60f3nqZyzCz/MPWQ=
 		</data>
 		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Info.plist</key>
 		<data>
-		w9rsPHfS6nhyFAFD48jpWHGzYuc=
+		uIBZEl29bIa6BD82AJqNnqxItQ8=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<data>
+		VX3G5xWaHufjuctExyD3KxnvPKo=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		N69rpbNFqxF9nC3LxN0wVnxXtGI=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		OwWAJveN4oSVFdX/aWzFdGsMh5s=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<data>
+		VX3G5xWaHufjuctExyD3KxnvPKo=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		jNcXtOMMcpL2++xWcYLei9tqS5w=
+		</data>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		aX58esTNE/RvDF6suImnsEDQMTM=
 		</data>
 		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
 		<data>
-		+Hzj9e+o3dYoDboCDA7ofM2a0kc=
+		9ZHPJ6MUYP0Ios5LKP+bfuWVxJk=
 		</data>
 		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/_CodeSignature/CodeResources</key>
 		<data>
-		hbmbyZ85ag/7tawlrdWmUyumzVo=
+		EBmJZa5BQFnAnSPP6dz5anbVsTo=
 		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
 		<key>LICENSE.txt</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			Cd50llceWtwBPWNSIAJRdTfQQiE=
-			</data>
 			<key>hash2</key>
 			<data>
 			PDylgJZfZxoKTHUmgv6aK1hRYtMtH4titPlIb7e5iRY=
@@ -56,90 +88,121 @@
 		</dict>
 		<key>ios-arm64/BeekonKit.framework/BeekonKit</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			SyrIBjwS5o/8csiCfKIXmBtvzio=
+			W7xcJOc7VsRvMXihdfEUxGsTpBfHxH1gPbjRVtI8kEM=
 			</data>
+		</dict>
+		<key>ios-arm64/BeekonKit.framework/Info.plist</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			sJNDsLwayhdCOxwHz2nvh5hWAy7aH+1xYTklkXYLTVo=
+			igGx9bEJCs/Wm2r/0fm1xWlHDmA9Yd/HN+S1eNuxziU=
 			</data>
 		</dict>
-		<key>ios-arm64/BeekonKit.framework/Info.plist</key>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.abi.json</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			3d/2OPEwv55L8dW+0woT9NRCNi0=
+			vc71j/YWrI9vpX+HcsT84p2Mh+AIR7i4y90BFkENP3w=
 			</data>
+		</dict>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			pwRHyHj1JmPCiUn+GAAwVdCWQOj+rrrs7WDjyfqTwcE=
+			gKcGwL/AcvR3lotu9XY2suukPsj+jWsSJvD7sm2jQXw=
 			</data>
 		</dict>
-		<key>ios-arm64/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
+		<key>ios-arm64/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios.swiftinterface</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			+Hzj9e+o3dYoDboCDA7ofM2a0kc=
+			mitVvWaJ1tpzwgWCfcEIK3u3ybZ7hSpmykZJnK8vf00=
 			</data>
+		</dict>
+		<key>ios-arm64/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			E3plr2RiT1CPWdLg5VfDUw1k7yShykpszuDqfKG4YYw=
+			KNi008FJ9ZF/nLOH4DadbEUqysKXh/HjMAmdLdidn4c=
 			</data>
 		</dict>
 		<key>ios-arm64/BeekonKit.framework/_CodeSignature/CodeResources</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			iZuijJG0soEo1jfi0V3NeqZXX4s=
+			biAvH5F300CuORBO8PAXwbaZrvFJ6IKpJ03mwqoa9pw=
 			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/BeekonKit</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			qgFb+LKTIRzW2w+dr7F9VFD6m1FpP0HSjHBtgwKpkxk=
+			hn5zblRjRXs8jCxlS5BGNLVmLw5QciKIbrNDMVj7aZQ=
 			</data>
 		</dict>
-		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/BeekonKit</key>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Info.plist</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			cEmeEm6qJLQueaJja0nxBKt+nEA=
+			n7FykM0hwZBYpdOmRZVNIhq+yVw0D05HUv4gQvp3a+o=
 			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			1OteRVaQF1w/938f/tCgu7XydD6pJkclY8MQ8rUpc4c=
+			9WWtJ/SunDN+RNh+QhuE+dUtw0x58nNbt9gYBn3XlBE=
 			</data>
 		</dict>
-		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Info.plist</key>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			kiW5NMFrXxi4aekbMu1hT1jL4NsFbUsT5gwvjIUim48=
+			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			w9rsPHfS6nhyFAFD48jpWHGzYuc=
+			v/Cfl3tF13LG5nhjGFypVGQvacvwZ+VAdyy0Iy6c994=
 			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			Yr1G0VwEkAQ7fULqXaAcgXxuiXyV2ANn7hepvYQTcDo=
+			9WWtJ/SunDN+RNh+QhuE+dUtw0x58nNbt9gYBn3XlBE=
 			</data>
 		</dict>
-		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			+Hzj9e+o3dYoDboCDA7ofM2a0kc=
+			GMOMoBM3ikrulB6x4+R3kPTTGUXqZ5eueJPYsJ4NkaU=
 			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/Modules/BeekonKit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			E3plr2RiT1CPWdLg5VfDUw1k7yShykpszuDqfKG4YYw=
+			cP2NWEZSOyc/7TF6zwN7la0671FBm2P9UHwb1WLWAog=
 			</data>
 		</dict>
-		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/_CodeSignature/CodeResources</key>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/PrivacyInfo.xcprivacy</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			hbmbyZ85ag/7tawlrdWmUyumzVo=
+			KNi008FJ9ZF/nLOH4DadbEUqysKXh/HjMAmdLdidn4c=
 			</data>
+		</dict>
+		<key>ios-arm64_x86_64-simulator/BeekonKit.framework/_CodeSignature/CodeResources</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			wi0JVImM9cRW0rzNqoJGY96gS/irH4VrWsZvyoVDhZE=
+			AaRejSOyW3Vcnyr0w4kXJi9QuAwGpM4D9yxdKsJMrlk=
 			</data>
 		</dict>
 	</dict>