@tokamakdev/plugin-location 0.1.0-beta.142 → 0.1.0-beta.144

package/android/LocationPlugin.kt

@@ -14,11 +14,9 @@ import com.tokamak.runtime.TokamakHost
 import com.tokamak.runtime.TokamakPlugin
 import com.tokamak.runtime.TokamakPluginError
 import kotlin.coroutines.cancellation.CancellationException
-import kotlin.coroutines.resume
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.suspendCancellableCoroutine
 
 class TokamakLocationPlugin(
     private val host: TokamakHost,
@@ -105,9 +103,9 @@ class TokamakLocationPlugin(
             throw TokamakPluginError.notSupported("backgroundAlways needs the location plugin's background-always build setting")
         }
         val asked = if (request?.precision == Precision.Approximate) setOf(COARSE) else foreground
-        val allowed = ask(asked).containsValue(true)
+        val allowed = host.requestPermissions(asked).containsValue(true)
         if (allowed) restore(updatesRemoved = false)
-        if (background && allowed) ask(setOf(BACKGROUND))
+        if (background && allowed) host.requestPermissions(setOf(BACKGROUND))
         return permission()
     }
 
@@ -157,10 +155,6 @@ class TokamakLocationPlugin(
 
     fun onLocationError(): Flow<LocationErrorEvent> = events.errors.stream()
 
-    /** Asks the user for [permissions], returning whether each is granted. */
-    private suspend fun ask(permissions: Set<String>): Map<String, Boolean> =
-        suspendCancellableCoroutine { continuation -> host.requestPermissions(permissions) { continuation.resume(it) } }
-
     private fun granted(permission: String): Boolean =
         context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
 

package/android/LocationService.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.IBinder
+import com.tokamak.runtime.tokamakNotificationIcon
 import com.tokamak.runtime.tokamakPlugin
 
 private const val CHANNEL = "tokamak.location"
@@ -44,7 +45,7 @@ class TokamakLocationService : Service() {
                 PendingIntent.getActivity(this, 0, it, PendingIntent.FLAG_IMMUTABLE)
             }
         return Notification.Builder(this, CHANNEL)
-            .setSmallIcon(icon())
+            .setSmallIcon(tokamakNotificationIcon())
             .setContentTitle(content.title)
             .setContentText(content.body)
             .setContentIntent(open)
@@ -52,12 +53,6 @@ class TokamakLocationService : Service() {
             .build()
     }
 
-    /** The app's monochrome `drawable/tokamak_notification`, or its launcher icon. */
-    private fun icon(): Int =
-        resources.getIdentifier("tokamak_notification", "drawable", packageName).takeIf { it != 0 }
-            ?: applicationInfo.icon.takeIf { it != 0 }
-            ?: android.R.drawable.sym_def_app_icon
-
     companion object {
         /** The start intent's notification: its title, body and channel. */
         private const val NOTIFICATION_EXTRA = "com.tokamak.plugins.location.NOTIFICATION"

package/android/LocationTypes.kt

@@ -1,6 +1,7 @@
 package com.tokamak.plugins.location
 
 import android.location.Location
+import android.location.LocationRequest
 
 data class Coordinates(
     val latitude: Double,
@@ -45,8 +46,12 @@ data class PermissionRequest(val backgroundAlways: Boolean?, val precision: Prec
 
 data class SetupConfig(val significantChanges: Boolean?)
 
-/** The request's quality, precision traded against battery use. */
-enum class Accuracy { High, Balanced, Low }
+/** The request's quality, precision traded against battery use, as `LocationRequest.QUALITY_*` [quality] gives it. */
+enum class Accuracy(val quality: Int) {
+    High(LocationRequest.QUALITY_HIGH_ACCURACY),
+    Balanced(LocationRequest.QUALITY_BALANCED_POWER_ACCURACY),
+    Low(LocationRequest.QUALITY_LOW_POWER),
+}
 
 /** The foreground service's notification, set from JavaScript so apps can translate it. */
 data class ServiceNotification(val title: String, val body: String, val channel: String)

package/android/LocationUpdates.kt

@@ -14,13 +14,6 @@ import org.json.JSONObject
 private const val PREFERENCES = "tokamak.location"
 private const val DEFAULT_INTERVAL_MILLIS = 10_000L
 
-private val QUALITIES =
-    mapOf(
-        Accuracy.High to LocationRequest.QUALITY_HIGH_ACCURACY,
-        Accuracy.Balanced to LocationRequest.QUALITY_BALANCED_POWER_ACCURACY,
-        Accuracy.Low to LocationRequest.QUALITY_LOW_POWER,
-    )
-
 /**
  * Location updates of one kind, [name]: `startUpdates`' or significant changes'. `LocationManager`
  * sends them to [TokamakLocationReceiver] through a `PendingIntent`, starting the app's process when
@@ -82,7 +75,7 @@ internal class LocationUpdates(private val host: TokamakHost, private val name:
         val accuracy = options.accuracy ?: Accuracy.High
         val request =
             LocationRequest.Builder(options.interval ?: DEFAULT_INTERVAL_MILLIS)
-                .setQuality(QUALITIES.getValue(accuracy))
+                .setQuality(accuracy.quality)
                 .setMinUpdateDistanceMeters((options.distance ?: 0.0).toFloat())
                 .build()
         val updates = checkNotNull(pendingIntent(PendingIntent.FLAG_UPDATE_CURRENT))

package/package.json

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

package/src/index.ts

@@ -2,7 +2,6 @@ import { capabilitiesOf, lifecycleStage, platformApi, type JsonStream, type Toka
 
 import { android } from "./android.generated.js";
 import { apple } from "./apple.generated.js";
-import { backgroundDenied, permissionDenied, timedOut, unavailable } from "./errors.js";
 import type {
   LocationErrorEvent,
   LocationPermission,
@@ -25,10 +24,10 @@ export function location(ctx: TokamakContext) {
 
   /** Requires location services and in-use permission, asking for it where the user has not answered. */
   async function authorize(): Promise<void> {
-    if (!await native.servicesEnabled()) throw unavailable("Location services are disabled");
+    if (!await native.servicesEnabled()) throw new DOMException("Location services are disabled", "NotReadableError");
     let { inUse } = await native.permission();
     if (inUse === "prompt") ({ inUse } = await native.requestPermission());
-    if (inUse !== "granted") throw permissionDenied();
+    if (inUse !== "granted") throw new DOMException("Location permission was denied", "NotAllowedError");
   }
 
   return {
@@ -56,13 +55,18 @@ export function location(ctx: TokamakContext) {
       const recent = await native.recentPosition(Math.min(maximumAge, Number.MAX_VALUE));
       if (recent) return recent;
       const located = new AbortController();
-      const timer = timeout === undefined ? undefined : setTimeout(() => { located.abort(timedOut()); }, timeout);
+      const timer = timeout === undefined ? undefined : setTimeout(() => {
+        located.abort(new DOMException("Location was not found in time", "TimeoutError"));
+      }, timeout);
       const position = await platformApi(ctx, { apple, android }, located.signal).currentPosition()
         .finally(() => { clearTimeout(timer); });
       if (position) return position;
       // Android finds no position in the background without permission at all times.
       const background = await lifecycleStage(ctx) === "background";
-      throw background && (await native.permission()).backgroundAlways !== "granted" ? backgroundDenied() : unavailable("Location is unavailable");
+      if (background && (await native.permission()).backgroundAlways !== "granted") {
+        throw new DOMException("Location permission does not cover the background", "NotAllowedError");
+      }
+      throw new DOMException("Location is unavailable", "NotReadableError");
     },
 
     /**

package/web/index.ts

@@ -47,10 +47,6 @@ export async function permission(): Promise<LocationPermission> {
   return { inUse: state, backgroundAlways: "denied", precision: "precise" };
 }
 
-/** Rejects as the web does for what only native apps have. */
-export function unsupported(): Promise<never> {
-  return Promise.reject(new DOMException("Native location is unavailable", "NotSupportedError"));
-}
 
 function browserLocationApi(): Geolocation {
   const root: { navigator?: { geolocation?: Geolocation } } = globalThis;

package/src/errors.ts

@@ -1,17 +0,0 @@
-/** The errors location operations reject with. */
-
-export function permissionDenied(): DOMException {
-  return new DOMException("Location permission was denied", "NotAllowedError");
-}
-
-export function backgroundDenied(): DOMException {
-  return new DOMException("Location permission does not cover the background", "NotAllowedError");
-}
-
-export function timedOut(): DOMException {
-  return new DOMException("Location was not found in time", "TimeoutError");
-}
-
-export function unavailable(message: string): DOMException {
-  return new DOMException(message, "NotReadableError");
-}