@spooky-sync/core 0.0.1-canary.281 → 0.0.1-canary.283

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as WebPushSupport, A as RunOptions, At as SealedQuery, B as SyncHealthStatus, Bt as decodeTokenClaims, C as QueryTimeToLive, Ct as AuthEventSystem, D as RecordVersionArray, Dt as RemoteDatabaseService, E as ReconnectConfig, Et as createAuthEventSystem, F as StorageHealth, Ft as ImpersonationTimerHost, G as WebPushDevice, H as UpdateOptions, Ht as renewDelayMs, I as StorageHealthStatus, It as ImpersonationTimers, J as WebPushInfo, K as WebPushError, L as StoreType, Lt as ORIGIN_TOKEN_KEY, M as Sp00kyConfig, Mt as EventSystem, N as Sp00kyQueryResult, Nt as IMPERSONATION_ACCESS, O as RecordVersionDiff, Ot as Logger$1, P as Sp00kyQueryResultPromise, Pt as ImpersonationInfo, Q as WebPushSubscribeOptions, R as SyncHealth, Rt as SESSION_POLL_MS, S as QueryStatusCallback, St as SignOutHook, T as QueryUpdateCallback, Tt as AuthEventTypes, U as PUSH_ENDPOINT_KEY, Ut as sameImpersonation, V as TimingPhase, Vt as impersonationFromToken, W as WebPushConfig, X as WebPushMessageInput, Y as WebPushMessage, Z as WebPushModule, _ as QueryConfig, _t as ActiveImpersonation, a as Level, at as detectWebPushSupport, b as QueryState, bt as SIGN_OUT_HOOK_TIMEOUT_MS, c as MutationCallback, ct as PUSH_PAYLOAD_VERSION, d as PersistenceClient, dt as PushOp, et as WebPushSyncOptions, f as PhaseStat, ft as PushPayload, g as QueryAuthorityCallback, gt as isPushPayload, h as PreloadRefresh, ht as WebPushClientMessage, i as InlineRow, it as WebPushUpdateOptions, j as ServerViewMeta, jt as EventDefinition, k as RegistrationTimings, kt as LocalStore, l as MutationEvent, lt as PushNotification, m as PreloadOptions, mt as PushUrgency, n as DebounceOptions, nt as WebPushUnsubscribeOptions, o as MATERIALIZATION_SAMPLE_WINDOW, ot as BridgeSignOutMessage, p as PinoTransmit, pt as PushPayloadKind, q as WebPushErrorCode, r as EventSubscriptionOptions, rt as WebPushUnsupportedReason, s as MembershipOutcome, st as BridgeTokenMessage, t as ConnectionState, tt as WebPushSyncStatus, u as MutationEventType, ut as PushNotificationAction, v as QueryConfigRecord, vt as AuthService, w as QueryTimings, wt as AuthEventTypeMap, x as QueryStatus, xt as SignOutContext, y as QueryHash, yt as ImpersonationCandidate, z as SyncHealthConfig, zt as TokenClaims } from "./types.js";
+import { $ as WebPushSubscribeOptions, A as RunOptions, At as LocalStore, B as SyncHealthStatus, Bt as TokenClaims, C as QueryTimeToLive, Ct as SignOutHook, D as RecordVersionArray, Dt as createAuthEventSystem, E as ReconnectConfig, Et as AuthEventTypes, F as StorageHealth, Ft as ImpersonationInfo, G as WebPushConfig, H as UpdateOptions, Ht as impersonationFromToken, I as StorageHealthStatus, It as ImpersonationTimerHost, J as WebPushErrorCode, K as WebPushDevice, L as StoreType, Lt as ImpersonationTimers, M as Sp00kyConfig, Mt as EventDefinition, N as Sp00kyQueryResult, Nt as EventSystem, O as RecordVersionDiff, Ot as RemoteDatabaseService, P as Sp00kyQueryResultPromise, Pt as IMPERSONATION_ACCESS, Q as WebPushModule, R as SyncHealth, Rt as ORIGIN_TOKEN_KEY, S as QueryStatusCallback, St as SignOutContext, T as QueryUpdateCallback, Tt as AuthEventTypeMap, U as PUSH_ENDPOINT_KEY, Ut as renewDelayMs, V as TimingPhase, Vt as decodeTokenClaims, W as PushDeviceKind, Wt as sameImpersonation, X as WebPushMessage, Y as WebPushInfo, Z as WebPushMessageInput, _ as QueryConfig, _t as isPushPayload, a as Level, at as WebPushUpdateOptions, b as QueryState, bt as ImpersonationCandidate, c as MutationCallback, ct as BridgeTokenMessage, d as PersistenceClient, dt as PushNotificationAction, et as WebPushSupport, f as PhaseStat, ft as PushOp, g as QueryAuthorityCallback, gt as WebPushClientMessage, h as PreloadRefresh, ht as PushUrgency, i as InlineRow, it as WebPushUnsupportedReason, j as ServerViewMeta, jt as SealedQuery, k as RegistrationTimings, kt as Logger$1, l as MutationEvent, lt as PUSH_PAYLOAD_VERSION, m as PreloadOptions, mt as PushPayloadKind, n as DebounceOptions, nt as WebPushSyncStatus, o as MATERIALIZATION_SAMPLE_WINDOW, ot as detectWebPushSupport, p as PinoTransmit, pt as PushPayload, q as WebPushError, r as EventSubscriptionOptions, rt as WebPushUnsubscribeOptions, s as MembershipOutcome, st as BridgeSignOutMessage, t as ConnectionState, tt as WebPushSyncOptions, u as MutationEventType, ut as PushNotification, v as QueryConfigRecord, vt as ActiveImpersonation, w as QueryTimings, wt as AuthEventSystem, x as QueryStatus, xt as SIGN_OUT_HOOK_TIMEOUT_MS, y as QueryHash, yt as AuthService, z as SyncHealthConfig, zt as SESSION_POLL_MS } from "./types.js";
 import { BackendNames, BackendRoutes, BucketNames, FinalQuery, GetTable, QueryBuilder, QueryOptions, QueryPlan, RecordId, RoutePayload, SchemaStructure, TableModel, TableNames } from "@spooky-sync/query-builder";
 import * as surrealdb0 from "surrealdb";
 import { Duration, RecordId as RecordId$1, Surreal } from "surrealdb";
@@ -2135,4 +2135,4 @@ declare function textToHtml(text: string): string;
  */
 
 //#endregion
-export { ActiveImpersonation, AppReleaseHandle, AppReleaseModule, type AppReleaseOptions, type AppReleaseSnapshot, AuthEventSystem, AuthEventTypeMap, AuthEventTypes, AuthService, BLURHASH_IMAGE_EXTENSIONS, type BlobCacheStats, type BlobEntry, type BlobKey, type BlobReadOptions, type BlobUrlLease, type BlurhashEncodeOptions, type BlurhashSetting, type BridgeSignOutMessage, type BridgeTokenMessage, BucketHandle, BucketPutOptions, BucketPutResult, CURSOR_COLORS, ConnectionState, CrdtField, CrdtManager, DEFAULT_LOCAL_OP_TIMEOUT_MS, DebounceOptions, EventSubscriptionOptions, type FailedMutationRow as FailedMutation, FeatureFlagHandle, FeatureFlagModule, type FeatureFlagOptions, type FeatureFlagOverride, type FeatureFlagSnapshot, IMPERSONATION_ACCESS, ImpersonationCandidate, ImpersonationInfo, ImpersonationTimerHost, ImpersonationTimers, InlineRow, Level, LocalOpTimeoutError, MATERIALIZATION_SAMPLE_WINDOW, MembershipOutcome, MutationCallback, MutationEvent, MutationEventType, ORIGIN_TOKEN_KEY, PUSH_ENDPOINT_KEY, PUSH_PAYLOAD_VERSION, PersistenceClient, PhaseStat, PinoTransmit, PreloadOptions, PreloadRefresh, type PushNotification, type PushNotificationAction, type PushOp, type PushPayload, type PushPayloadKind, type PushUrgency, QueryAuthorityCallback, QueryConfig, QueryConfigRecord, QueryHash, QueryState, QueryStatus, QueryStatusCallback, QueryTimeToLive, QueryTimings, QueryUpdateCallback, ReconnectConfig, RecordVersionArray, RecordVersionDiff, RegistrationTimings, RunOptions, SESSION_POLL_MS, SIGN_OUT_HOOK_TIMEOUT_MS, ServerViewMeta, SignOutContext, SignOutHook, Sp00kyClient, Sp00kyClientDeps, Sp00kyConfig, Sp00kyQueryResult, Sp00kyQueryResultPromise, StorageHealth, StorageHealthStatus, StoreType, SyncHealth, SyncHealthConfig, SyncHealthStatus, TimingPhase, TokenClaims, UpdateOptions, type WebPushClientMessage, type WebPushConfig, type WebPushDevice, WebPushError, type WebPushErrorCode, type WebPushInfo, type WebPushMessage, type WebPushMessageInput, WebPushModule, type WebPushSubscribeOptions, type WebPushSupport, type WebPushSyncOptions, type WebPushSyncStatus, type WebPushUnsubscribeOptions, type WebPushUnsupportedReason, type WebPushUpdateOptions, blurhashSidecarPath, bucketContentToBlob, createAuthEventSystem, cursorColorFromName, decode as decodeBlurhash, decodeTokenClaims, detectWebPushSupport, encode as encodeBlurhash, encodeImageToBlurhash, fileToUint8Array, impersonationFromToken, isBlurhashValid, isImagePath, isPushPayload, renewDelayMs, sameImpersonation, semverGt, textToHtml };
+export { ActiveImpersonation, AppReleaseHandle, AppReleaseModule, type AppReleaseOptions, type AppReleaseSnapshot, AuthEventSystem, AuthEventTypeMap, AuthEventTypes, AuthService, BLURHASH_IMAGE_EXTENSIONS, type BlobCacheStats, type BlobEntry, type BlobKey, type BlobReadOptions, type BlobUrlLease, type BlurhashEncodeOptions, type BlurhashSetting, type BridgeSignOutMessage, type BridgeTokenMessage, BucketHandle, BucketPutOptions, BucketPutResult, CURSOR_COLORS, ConnectionState, CrdtField, CrdtManager, DEFAULT_LOCAL_OP_TIMEOUT_MS, DebounceOptions, EventSubscriptionOptions, type FailedMutationRow as FailedMutation, FeatureFlagHandle, FeatureFlagModule, type FeatureFlagOptions, type FeatureFlagOverride, type FeatureFlagSnapshot, IMPERSONATION_ACCESS, ImpersonationCandidate, ImpersonationInfo, ImpersonationTimerHost, ImpersonationTimers, InlineRow, Level, LocalOpTimeoutError, MATERIALIZATION_SAMPLE_WINDOW, MembershipOutcome, MutationCallback, MutationEvent, MutationEventType, ORIGIN_TOKEN_KEY, PUSH_ENDPOINT_KEY, PUSH_PAYLOAD_VERSION, PersistenceClient, PhaseStat, PinoTransmit, PreloadOptions, PreloadRefresh, type PushDeviceKind, type PushNotification, type PushNotificationAction, type PushOp, type PushPayload, type PushPayloadKind, type PushUrgency, QueryAuthorityCallback, QueryConfig, QueryConfigRecord, QueryHash, QueryState, QueryStatus, QueryStatusCallback, QueryTimeToLive, QueryTimings, QueryUpdateCallback, ReconnectConfig, RecordVersionArray, RecordVersionDiff, RegistrationTimings, RunOptions, SESSION_POLL_MS, SIGN_OUT_HOOK_TIMEOUT_MS, ServerViewMeta, SignOutContext, SignOutHook, Sp00kyClient, Sp00kyClientDeps, Sp00kyConfig, Sp00kyQueryResult, Sp00kyQueryResultPromise, StorageHealth, StorageHealthStatus, StoreType, SyncHealth, SyncHealthConfig, SyncHealthStatus, TimingPhase, TokenClaims, UpdateOptions, type WebPushClientMessage, type WebPushConfig, type WebPushDevice, WebPushError, type WebPushErrorCode, type WebPushInfo, type WebPushMessage, type WebPushMessageInput, WebPushModule, type WebPushSubscribeOptions, type WebPushSupport, type WebPushSyncOptions, type WebPushSyncStatus, type WebPushUnsubscribeOptions, type WebPushUnsupportedReason, type WebPushUpdateOptions, blurhashSidecarPath, bucketContentToBlob, createAuthEventSystem, cursorColorFromName, decode as decodeBlurhash, decodeTokenClaims, detectWebPushSupport, encode as encodeBlurhash, encodeImageToBlurhash, fileToUint8Array, impersonationFromToken, isBlurhashValid, isImagePath, isPushPayload, renewDelayMs, sameImpersonation, semverGt, textToHtml };

package/dist/index.js

@@ -705,6 +705,10 @@ function toDevice(row, thisEndpoint) {
 	return {
 		id: recordIdString(row.id),
 		endpoint: String(row.endpoint ?? ""),
+		kind: row.kind === "apns" || row.kind === "fcm" ? row.kind : "web",
+		platform: row.platform ?? void 0,
+		appId: row.app_id ?? void 0,
+		environment: row.environment ?? void 0,
 		kid: typeof row.kid === "string" ? row.kid : "",
 		label: row.label ?? void 0,
 		userAgent: row.user_agent ?? void 0,
@@ -874,10 +878,12 @@ var WebPushModule = class {
 	info(options = {}) {
 		if (!this.infoCache || options.refresh) {
 			const pending = this.call("RETURN fn::push::info()").then((r) => {
+				const providers = Array.isArray(r?.providers) ? r.providers.filter((p) => p === "web" || p === "apns" || p === "fcm") : void 0;
 				const info = dropUndefined({
 					enabled: r?.enabled === true && typeof r.publicKey === "string",
 					publicKey: typeof r?.publicKey === "string" ? r.publicKey : void 0,
-					kid: typeof r?.kid === "string" ? r.kid : void 0
+					kid: typeof r?.kid === "string" ? r.kid : void 0,
+					providers
 				});
 				this.lastInfo = info;
 				return info;
@@ -1718,8 +1724,8 @@ function selfAllowlistedVariant(flag, userId) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.281";
-const WASM_VERSION = "0.0.1-canary.281";
+const CORE_VERSION = "0.0.1-canary.283";
+const WASM_VERSION = "0.0.1-canary.283";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class DevToolsService {
 	eventsHistory = [];
@@ -13752,7 +13758,7 @@ function createTabsCoordinator(config, s, host) {
 	return new TabsCoordinator({
 		tabId: s.tabId,
 		fingerprint: computeTabsFingerprint({
-			coreVersion: "0.0.1-canary.281",
+			coreVersion: "0.0.1-canary.283",
 			schemaHash: hash53(config.schemaSurql),
 			endpoint: config.database.endpoint ?? "",
 			namespace: config.database.namespace,

package/dist/types.d.ts

@@ -989,12 +989,28 @@ interface WebPushInfo {
   publicKey?: string;
   /** Id of that key. */
   kid?: string;
+  /**
+   * Every kind of device the project reaches: `web` once a VAPID key is
+   * published, `apns` / `fcm` when `push.apns` / `push.fcm` are configured.
+   */
+  providers?: PushDeviceKind[];
 }
+/** How a device is reached: a browser (Web Push), APNs or FCM. */
+type PushDeviceKind = 'web' | 'apns' | 'fcm';
 interface WebPushDevice {
   /** `_00_push_subscription:<id>` */
   id: string;
+  /** Web: the push service URL. Native: `<kind>:<token>`. */
   endpoint: string;
-  /** Key id the device subscribed under. */
+  /** Rows the Flutter / native side registered are `apns` or `fcm`. */
+  kind: PushDeviceKind;
+  /** `web`, `ios`, `android` or `macos`. */
+  platform?: string;
+  /** Native: bundle id / package name. */
+  appId?: string;
+  /** APNs: `sandbox` or `production`. */
+  environment?: string;
+  /** Key id a web device subscribed under (empty for native ones). */
   kid: string;
   label?: string;
   userAgent?: string;
@@ -1988,4 +2004,4 @@ interface DebounceOptions {
   delay?: number;
 }
 //#endregion
-export { WebPushSupport as $, RunOptions as A, SealedQuery as At, SyncHealthStatus as B, decodeTokenClaims as Bt, QueryTimeToLive as C, AuthEventSystem as Ct, RecordVersionArray as D, RemoteDatabaseService as Dt, ReconnectConfig as E, createAuthEventSystem as Et, StorageHealth as F, ImpersonationTimerHost as Ft, WebPushDevice as G, UpdateOptions as H, renewDelayMs as Ht, StorageHealthStatus as I, ImpersonationTimers as It, WebPushInfo as J, WebPushError as K, StoreType as L, ORIGIN_TOKEN_KEY as Lt, Sp00kyConfig as M, EventSystem as Mt, Sp00kyQueryResult as N, IMPERSONATION_ACCESS as Nt, RecordVersionDiff as O, Logger$1 as Ot, Sp00kyQueryResultPromise as P, ImpersonationInfo as Pt, WebPushSubscribeOptions as Q, SyncHealth as R, SESSION_POLL_MS as Rt, QueryStatusCallback as S, SignOutHook as St, QueryUpdateCallback as T, AuthEventTypes as Tt, PUSH_ENDPOINT_KEY as U, sameImpersonation as Ut, TimingPhase as V, impersonationFromToken as Vt, WebPushConfig as W, WebPushMessageInput as X, WebPushMessage as Y, WebPushModule as Z, QueryConfig as _, ActiveImpersonation as _t, Level$1 as a, detectWebPushSupport as at, QueryState as b, SIGN_OUT_HOOK_TIMEOUT_MS as bt, MutationCallback as c, PUSH_PAYLOAD_VERSION as ct, PersistenceClient as d, PushOp as dt, WebPushSyncOptions as et, PhaseStat as f, PushPayload as ft, QueryAuthorityCallback as g, isPushPayload as gt, PreloadRefresh as h, WebPushClientMessage as ht, InlineRow as i, WebPushUpdateOptions as it, ServerViewMeta as j, EventDefinition as jt, RegistrationTimings as k, LocalStore as kt, MutationEvent as l, PushNotification as lt, PreloadOptions as m, PushUrgency as mt, DebounceOptions as n, WebPushUnsubscribeOptions as nt, MATERIALIZATION_SAMPLE_WINDOW as o, BridgeSignOutMessage as ot, PinoTransmit as p, PushPayloadKind as pt, WebPushErrorCode as q, EventSubscriptionOptions as r, WebPushUnsupportedReason as rt, MembershipOutcome as s, BridgeTokenMessage as st, ConnectionState as t, WebPushSyncStatus as tt, MutationEventType as u, PushNotificationAction as ut, QueryConfigRecord as v, AuthService as vt, QueryTimings as w, AuthEventTypeMap as wt, QueryStatus as x, SignOutContext as xt, QueryHash as y, ImpersonationCandidate as yt, SyncHealthConfig as z, TokenClaims as zt };
+export { WebPushSubscribeOptions as $, RunOptions as A, LocalStore as At, SyncHealthStatus as B, TokenClaims as Bt, QueryTimeToLive as C, SignOutHook as Ct, RecordVersionArray as D, createAuthEventSystem as Dt, ReconnectConfig as E, AuthEventTypes as Et, StorageHealth as F, ImpersonationInfo as Ft, WebPushConfig as G, UpdateOptions as H, impersonationFromToken as Ht, StorageHealthStatus as I, ImpersonationTimerHost as It, WebPushErrorCode as J, WebPushDevice as K, StoreType as L, ImpersonationTimers as Lt, Sp00kyConfig as M, EventDefinition as Mt, Sp00kyQueryResult as N, EventSystem as Nt, RecordVersionDiff as O, RemoteDatabaseService as Ot, Sp00kyQueryResultPromise as P, IMPERSONATION_ACCESS as Pt, WebPushModule as Q, SyncHealth as R, ORIGIN_TOKEN_KEY as Rt, QueryStatusCallback as S, SignOutContext as St, QueryUpdateCallback as T, AuthEventTypeMap as Tt, PUSH_ENDPOINT_KEY as U, renewDelayMs as Ut, TimingPhase as V, decodeTokenClaims as Vt, PushDeviceKind as W, sameImpersonation as Wt, WebPushMessage as X, WebPushInfo as Y, WebPushMessageInput as Z, QueryConfig as _, isPushPayload as _t, Level$1 as a, WebPushUpdateOptions as at, QueryState as b, ImpersonationCandidate as bt, MutationCallback as c, BridgeTokenMessage as ct, PersistenceClient as d, PushNotificationAction as dt, WebPushSupport as et, PhaseStat as f, PushOp as ft, QueryAuthorityCallback as g, WebPushClientMessage as gt, PreloadRefresh as h, PushUrgency as ht, InlineRow as i, WebPushUnsupportedReason as it, ServerViewMeta as j, SealedQuery as jt, RegistrationTimings as k, Logger$1 as kt, MutationEvent as l, PUSH_PAYLOAD_VERSION as lt, PreloadOptions as m, PushPayloadKind as mt, DebounceOptions as n, WebPushSyncStatus as nt, MATERIALIZATION_SAMPLE_WINDOW as o, detectWebPushSupport as ot, PinoTransmit as p, PushPayload as pt, WebPushError as q, EventSubscriptionOptions as r, WebPushUnsubscribeOptions as rt, MembershipOutcome as s, BridgeSignOutMessage as st, ConnectionState as t, WebPushSyncOptions as tt, MutationEventType as u, PushNotification as ut, QueryConfigRecord as v, ActiveImpersonation as vt, QueryTimings as w, AuthEventSystem as wt, QueryStatus as x, SIGN_OUT_HOOK_TIMEOUT_MS as xt, QueryHash as y, AuthService as yt, SyncHealthConfig as z, SESSION_POLL_MS as zt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.281",
+  "version": "0.0.1-canary.283",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -75,8 +75,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.281",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.281",
+    "@spooky-sync/query-builder": "0.0.1-canary.283",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.283",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "blurhash": "^2.0.5",

package/src/index.ts

@@ -25,6 +25,7 @@ export {
   type WebPushUnsupportedReason,
   type WebPushInfo,
   type WebPushDevice,
+  type PushDeviceKind,
   type WebPushSubscribeOptions,
   type WebPushUnsubscribeOptions,
   type WebPushSyncOptions,

package/src/modules/web-push/index.test.ts

@@ -37,6 +37,10 @@ interface Row {
   failures?: number;
   current?: boolean;
   disabled_at?: Date;
+  kind?: string;
+  platform?: string;
+  app_id?: string;
+  environment?: string;
 }
 
 function harness(
@@ -780,6 +784,29 @@ describe('WebPushModule devices and direct messages', () => {
     await expect(h.mod.test()).rejects.toMatchObject({ code: 'server' });
   });
 
+  it('lists native devices (APNs / FCM) with their kind, never as this browser', async () => {
+    const h = harness({ permission: 'granted' });
+    h.server.info = { enabled: true, publicKey: KEY, kid: 'kid1', providers: ['web', 'apns', 'bogus'] };
+    h.server.rows.push({
+      id: new RecordId('_00_push_subscription', 'phone'),
+      endpoint: 'apns:ab12',
+      kind: 'apns',
+      platform: 'ios',
+      app_id: 'im.app',
+      environment: 'sandbox',
+      kid: '',
+      current: true,
+    });
+    expect((await h.mod.info({ refresh: true })).providers).toEqual(['web', 'apns']);
+    await h.mod.subscribe({ label: 'Laptop' });
+    const devices = await h.mod.devices();
+    const phone = devices.find((d) => d.endpoint === 'apns:ab12')!;
+    expect(phone).toMatchObject({ kind: 'apns', platform: 'ios', appId: 'im.app', environment: 'sandbox', thisDevice: false });
+    expect(devices.find((d) => d.thisDevice)?.kind).toBe('web');
+    // A native row never makes the browser resubscribe.
+    expect(await h.mod.sync()).toBe('ok');
+  });
+
   it('caches info until refreshed; a failed read is not cached', async () => {
     const h = harness();
     expect(await h.mod.info()).toEqual({ enabled: true, publicKey: KEY, kid: 'kid1' });

package/src/modules/web-push/index.ts

@@ -77,13 +77,30 @@ export interface WebPushInfo {
   publicKey?: string;
   /** Id of that key. */
   kid?: string;
+  /**
+   * Every kind of device the project reaches: `web` once a VAPID key is
+   * published, `apns` / `fcm` when `push.apns` / `push.fcm` are configured.
+   */
+  providers?: PushDeviceKind[];
 }
 
+/** How a device is reached: a browser (Web Push), APNs or FCM. */
+export type PushDeviceKind = 'web' | 'apns' | 'fcm';
+
 export interface WebPushDevice {
   /** `_00_push_subscription:<id>` */
   id: string;
+  /** Web: the push service URL. Native: `<kind>:<token>`. */
   endpoint: string;
-  /** Key id the device subscribed under. */
+  /** Rows the Flutter / native side registered are `apns` or `fcm`. */
+  kind: PushDeviceKind;
+  /** `web`, `ios`, `android` or `macos`. */
+  platform?: string;
+  /** Native: bundle id / package name. */
+  appId?: string;
+  /** APNs: `sandbox` or `production`. */
+  environment?: string;
+  /** Key id a web device subscribed under (empty for native ones). */
   kid: string;
   label?: string;
   userAgent?: string;
@@ -260,6 +277,10 @@ interface StoredEndpoint {
 interface DeviceRow {
   id?: unknown;
   endpoint?: string;
+  kind?: string | null;
+  platform?: string | null;
+  app_id?: string | null;
+  environment?: string | null;
   kid?: string;
   label?: string | null;
   user_agent?: string | null;
@@ -309,6 +330,10 @@ function toDevice(row: DeviceRow, thisEndpoint: string | null): WebPushDevice {
   return {
     id: recordIdString(row.id),
     endpoint: String(row.endpoint ?? ''),
+    kind: row.kind === 'apns' || row.kind === 'fcm' ? row.kind : 'web',
+    platform: row.platform ?? undefined,
+    appId: row.app_id ?? undefined,
+    environment: row.environment ?? undefined,
     kid: typeof row.kid === 'string' ? row.kid : '',
     label: row.label ?? undefined,
     userAgent: row.user_agent ?? undefined,
@@ -489,11 +514,16 @@ export class WebPushModule {
         enabled?: boolean;
         publicKey?: string | null;
         kid?: string | null;
+        providers?: unknown;
       } | null>('RETURN fn::push::info()').then((r) => {
+        const providers = Array.isArray(r?.providers)
+          ? (r.providers.filter((p) => p === 'web' || p === 'apns' || p === 'fcm') as PushDeviceKind[])
+          : undefined;
         const info: WebPushInfo = dropUndefined({
           enabled: r?.enabled === true && typeof r.publicKey === 'string',
           publicKey: typeof r?.publicKey === 'string' ? r.publicKey : undefined,
           kid: typeof r?.kid === 'string' ? r.kid : undefined,
+          providers,
         });
         this.lastInfo = info;
         return info;