@glassly/engine 0.1.0-dev.99 → 0.2.8-dev.445

package/build/services/UIRouter.d.ts

@@ -16,7 +16,7 @@
  *      │                                      │
  *      ▼                                      ▼
  *      ──── UIRouter.routeFromWebView   ──── UIRouter.routeFromBackground
- *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript("window.__glassly.recv(...)")
+ *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript("window.__host.recv(...)")
  *                {kind:"bridge", raw: JSON({
  *                  payload:{
  *                    type:"EVENT", streamType:"_ui",
@@ -59,7 +59,7 @@ export declare class UIRouter {
     /**
      * Called when a UI WebView mounts. `injectFn` wraps
      * `webView.injectJavaScript` — the router calls it with prebuilt
-     * `window.__glassly.recv(...)` strings to deliver background-side
+     * `window.__host.recv(...)` strings to deliver background-side
      * frames into the WebView's glassly global.
      *
      * The router also pushes a UI_OPEN envelope to the background side

package/build/services/UIRouter.js

@@ -16,7 +16,7 @@
  *      │                                      │
  *      ▼                                      ▼
  *      ──── UIRouter.routeFromWebView   ──── UIRouter.routeFromBackground
- *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript("window.__glassly.recv(...)")
+ *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript("window.__host.recv(...)")
  *                {kind:"bridge", raw: JSON({
  *                  payload:{
  *                    type:"EVENT", streamType:"_ui",
@@ -51,7 +51,7 @@ export class UIRouter {
     /**
      * Called when a UI WebView mounts. `injectFn` wraps
      * `webView.injectJavaScript` — the router calls it with prebuilt
-     * `window.__glassly.recv(...)` strings to deliver background-side
+     * `window.__host.recv(...)` strings to deliver background-side
      * frames into the WebView's glassly global.
      *
      * The router also pushes a UI_OPEN envelope to the background side
@@ -158,7 +158,7 @@ export class UIRouter {
             const cancel = { type: "cancel", requestId: uiSendPayload.requestId };
             const literal = JSON.stringify(cancel);
             const escaped = JSON.stringify(literal);
-            binding.inject(`if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`);
+            binding.inject(`if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`);
             return;
         }
         const outbound = {
@@ -171,7 +171,7 @@ export class UIRouter {
             outbound.requestId = uiSendPayload.requestId;
         const literal = JSON.stringify(outbound);
         const escaped = JSON.stringify(literal);
-        binding.inject(`if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`);
+        binding.inject(`if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`);
     }
     /**
      * Send a synthetic frame to the WebView. Used for host-initiated
@@ -184,7 +184,7 @@ export class UIRouter {
             return;
         const literal = JSON.stringify(frame);
         const escaped = JSON.stringify(literal);
-        binding.inject(`if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`);
+        binding.inject(`if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`);
     }
     /**
      * Wrap an EVENT envelope and push it to background via the bridge.

package/build/services/UIRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"UIRouter.js","sourceRoot":"","sources":["../../src/services/UIRouter.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * UIRouter — bidirectional bus between a per-miniapp UI WebView\n * and its bound background JSContext.\n *\n * The flow:\n *\n *   WebView (glassly.send/on)                Background (session.ui.send/on)\n *      │                                       │\n *      │   window.ReactNativeWebView          │\n *      │   .postMessage(jsonEnvelope)         │  session.sendOneShot({\n *      │                                      │     type: \"UI_SEND\", channel, payload, seq\n *      │                                      │  })\n *      │                                      │\n *      ▼                                      ▼\n *   MiniappHost.onMessage              JSRouter (recognises payload.type===\"UI_SEND\")\n *      │                                      │\n *      ▼                                      ▼\n *      ──── UIRouter.routeFromWebView   ──── UIRouter.routeFromBackground\n *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript(\"window.__glassly.recv(...)\")\n *                {kind:\"bridge\", raw: JSON({\n *                  payload:{\n *                    type:\"EVENT\", streamType:\"_ui\",\n *                    data:{type:\"UI_MESSAGE\", channel, payload, seq}\n *                  }})}\n *\n * The router is a singleton — one instance for the whole host process —\n * because only one WebView is allowed open at a time per spec. The\n * binding map is therefore N entries (one per \"currently has a UI\n * WebView mounted\" miniapp), but in practice it's 0 or 1.\n *\n * UI_OPEN / UI_CLOSE lifecycle envelopes are pushed by the WebView's\n * `glassly.ready()` and the host's WebView teardown handler; the router\n * forwards them to background via the same EVENT/_ui envelope shape.\n */\n\ninterface UIInjectFn {\n  (jsSource: string): void\n}\n\n/**\n * Subset of the Crust native module that UIRouter touches.\n * Loose binding keeps tests free of Expo imports.\n */\nexport interface UICrustBinding {\n  jsDispatchToJs(packageName: string, envelope: Record<string, unknown>): Promise<void> | void\n}\n\ninterface BoundWebView {\n  inject: UIInjectFn\n}\n\n/**\n * NOTE: the WebView ↔ host heartbeat was removed when the lifecycle\n * inversion landed. The current model is **at most one WebView at a\n * time, foreground UI with an always-on background JSContext** (same\n * shape as the cloud-WebView miniapps). User navigation closes it\n * explicitly and `onContentProcessDidTerminate` catches OS-level\n * crashes, but the host may still re-announce UI_OPEN for an already\n * mounted WebView after app resume/dev respawn so the background can\n * push a fresh authoritative snapshot.\n */\n\nexport class UIRouter {\n  private readonly bindings: Map<string, BoundWebView> = new Map()\n  private readonly crust: UICrustBinding\n\n  constructor(crust: UICrustBinding) {\n    this.crust = crust\n  }\n\n  /**\n   * Called when a UI WebView mounts. `injectFn` wraps\n   * `webView.injectJavaScript` — the router calls it with prebuilt\n   * `window.__glassly.recv(...)` strings to deliver background-side\n   * frames into the WebView's glassly global.\n   *\n   * The router also pushes a UI_OPEN envelope to the background side\n   * once the WebView signals ready (see {@link routeFromWebView}).\n   * Calling bindWebView on a packageName that already has a binding\n   * replaces the previous one (defensive — should not happen in\n   * practice because only one WebView is open at a time).\n   */\n  bindWebView(packageName: string, injectFn: UIInjectFn): void {\n    this.bindings.set(packageName, {inject: injectFn})\n  }\n\n  /**\n   * Called when the WebView unmounts (user navigated away or the host\n   * tore it down on heartbeat timeout). Pushes UI_CLOSE to background\n   * so handlers can flush state, then drops the binding.\n   */\n  unbindWebView(packageName: string): void {\n    if (!this.bindings.has(packageName)) return\n    this.bindings.delete(packageName)\n    this.deliverToBackground(packageName, {type: \"UI_CLOSE\"})\n  }\n\n  /** True iff a WebView is currently bound to the named package. */\n  isBound(packageName: string): boolean {\n    return this.bindings.has(packageName)\n  }\n\n  /**\n   * Re-announce the already-mounted WebView to the background JSContext.\n   * This covers dev background hot-reload, app resume, and thawed WebViews\n   * whose injected UI_SEND frames may have been missed while the host was\n   * suspended. Re-emitting UI_OPEN flips `ui.bound` back to true if needed\n   * and lets background code push a fresh snapshot via session.ui.onOpen.\n   *\n   * No-op if no WebView is currently bound for the package.\n   */\n  notifyReopen(packageName: string): void {\n    if (!this.bindings.has(packageName)) return\n    this.deliverToBackground(packageName, {type: \"UI_OPEN\"})\n  }\n\n  /**\n   * Forward a WebView-originated postMessage envelope to the JSContext.\n   * `rawJson` is the raw string from `event.nativeEvent.data` — the\n   * caller hasn't parsed it yet so the router controls the wire format\n   * end-to-end.\n   *\n   * Recognised envelope types from the WebView shim:\n   *   - {type: \"ready\"}                              → fire UI_OPEN\n   *   - {type: \"msg\", seq, channel, payload}         → fire UI_MESSAGE\n   *   - {type: \"heartbeat\", seq}                     → silently ack\n   */\n  routeFromWebView(packageName: string, rawJson: string): void {\n    let env: {\n      type?: string\n      seq?: number\n      channel?: string\n      payload?: unknown\n      requestId?: string\n    }\n    try {\n      env = JSON.parse(rawJson)\n    } catch {\n      return\n    }\n    if (typeof env.type !== \"string\") return\n\n    if (env.type === \"ready\") {\n      this.deliverToBackground(packageName, {type: \"UI_OPEN\"})\n      return\n    }\n    if (env.type === \"msg\" && typeof env.channel === \"string\") {\n      const out: Record<string, unknown> = {\n        type: \"UI_MESSAGE\",\n        channel: env.channel,\n        payload: env.payload,\n        seq: env.seq,\n      }\n      if (typeof env.requestId === \"string\") out.requestId = env.requestId\n      this.deliverToBackground(packageName, out)\n      return\n    }\n    if (env.type === \"cancel\" && typeof env.requestId === \"string\") {\n      this.deliverToBackground(packageName, {type: \"UI_CANCEL\", requestId: env.requestId})\n      return\n    }\n    // NOTE: console.* logs do NOT come through this router. The\n    // miniappGlobals console-tap shim posts {payload:{type:\"dev_log\"}}\n    // envelopes which LocalMiniappRuntime handles and forwards to the\n    // dev sidecar tagged source:\"ui\". Keeping that path one-way means\n    // we don't have two console-capture pipelines competing.\n    //\n    // Unknown envelope — drop silently.\n  }\n\n  /**\n   * Called by JSRouter when it sees a `__bridge.send` outbound\n   * frame whose parsed payload is a UI_SEND envelope. The router\n   * forwards it as a `msg` frame to the bound WebView (or drops if no\n   * WebView is currently mounted).\n   *\n   * `uiSendPayload` is the raw `{type:\"UI_SEND\", channel, payload, seq}`\n   * shape produced by `session.ui.send` on the background side.\n   */\n  routeFromBackground(\n    packageName: string,\n    uiSendPayload: {\n      type: string\n      channel?: string\n      payload?: unknown\n      seq?: number\n      requestId?: string\n    },\n  ): void {\n    const binding = this.bindings.get(packageName)\n    if (!binding) return\n    if (uiSendPayload.type === \"UI_CANCEL\" && typeof uiSendPayload.requestId === \"string\") {\n      const cancel = {type: \"cancel\", requestId: uiSendPayload.requestId}\n      const literal = JSON.stringify(cancel)\n      const escaped = JSON.stringify(literal)\n      binding.inject(\n        `if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`,\n      )\n      return\n    }\n    const outbound: Record<string, unknown> = {\n      type: \"msg\",\n      seq: uiSendPayload.seq ?? 0,\n      channel: uiSendPayload.channel,\n      payload: uiSendPayload.payload,\n    }\n    if (typeof uiSendPayload.requestId === \"string\") outbound.requestId = uiSendPayload.requestId\n    const literal = JSON.stringify(outbound)\n    const escaped = JSON.stringify(literal)\n    binding.inject(\n      `if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`,\n    )\n  }\n\n  /**\n   * Send a synthetic frame to the WebView. Used for host-initiated\n   * lifecycle events (`open`, `close`, `ack`). The wire shape is the\n   * same as the WebView shim's recv handler expects.\n   */\n  pushLifecycleFrame(packageName: string, frame: {type: \"open\" | \"close\" | \"ack\"; seq?: number}): void {\n    const binding = this.bindings.get(packageName)\n    if (!binding) return\n    const literal = JSON.stringify(frame)\n    const escaped = JSON.stringify(literal)\n    binding.inject(\n      `if (window.__glassly && window.__glassly.recv) window.__glassly.recv(JSON.parse(${escaped})); true;`,\n    )\n  }\n\n  /**\n   * Wrap an EVENT envelope and push it to background via the bridge.\n   * Background's UIModule listens for stream `_ui`. The `type` is the\n   * wire value `miniapp_event` — must match `MiniappResponseType.EVENT`\n   * exactly, otherwise the SDK's session switch falls through and the\n   * `_ui` fan-out never fires (bound stays false; `ui.send` drops).\n   */\n  private deliverToBackground(packageName: string, data: Record<string, unknown>): void {\n    const innerEnvelope = {\n      payload: {\n        type: \"miniapp_event\",\n        streamType: \"_ui\",\n        data,\n      },\n    }\n    void this.crust.jsDispatchToJs(packageName, {\n      kind: \"bridge\",\n      raw: JSON.stringify(innerEnvelope),\n    })\n  }\n}\n"]}
+{"version":3,"file":"UIRouter.js","sourceRoot":"","sources":["../../src/services/UIRouter.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * UIRouter — bidirectional bus between a per-miniapp UI WebView\n * and its bound background JSContext.\n *\n * The flow:\n *\n *   WebView (glassly.send/on)                Background (session.ui.send/on)\n *      │                                       │\n *      │   window.ReactNativeWebView          │\n *      │   .postMessage(jsonEnvelope)         │  session.sendOneShot({\n *      │                                      │     type: \"UI_SEND\", channel, payload, seq\n *      │                                      │  })\n *      │                                      │\n *      ▼                                      ▼\n *   MiniappHost.onMessage              JSRouter (recognises payload.type===\"UI_SEND\")\n *      │                                      │\n *      ▼                                      ▼\n *      ──── UIRouter.routeFromWebView   ──── UIRouter.routeFromBackground\n *           ──► Crust.jsDispatchToJs        ──► webView.injectJavaScript(\"window.__host.recv(...)\")\n *                {kind:\"bridge\", raw: JSON({\n *                  payload:{\n *                    type:\"EVENT\", streamType:\"_ui\",\n *                    data:{type:\"UI_MESSAGE\", channel, payload, seq}\n *                  }})}\n *\n * The router is a singleton — one instance for the whole host process —\n * because only one WebView is allowed open at a time per spec. The\n * binding map is therefore N entries (one per \"currently has a UI\n * WebView mounted\" miniapp), but in practice it's 0 or 1.\n *\n * UI_OPEN / UI_CLOSE lifecycle envelopes are pushed by the WebView's\n * `glassly.ready()` and the host's WebView teardown handler; the router\n * forwards them to background via the same EVENT/_ui envelope shape.\n */\n\ninterface UIInjectFn {\n  (jsSource: string): void\n}\n\n/**\n * Subset of the Crust native module that UIRouter touches.\n * Loose binding keeps tests free of Expo imports.\n */\nexport interface UICrustBinding {\n  jsDispatchToJs(packageName: string, envelope: Record<string, unknown>): Promise<void> | void\n}\n\ninterface BoundWebView {\n  inject: UIInjectFn\n}\n\n/**\n * NOTE: the WebView ↔ host heartbeat was removed when the lifecycle\n * inversion landed. The current model is **at most one WebView at a\n * time, foreground UI with an always-on background JSContext** (same\n * shape as the cloud-WebView miniapps). User navigation closes it\n * explicitly and `onContentProcessDidTerminate` catches OS-level\n * crashes, but the host may still re-announce UI_OPEN for an already\n * mounted WebView after app resume/dev respawn so the background can\n * push a fresh authoritative snapshot.\n */\n\nexport class UIRouter {\n  private readonly bindings: Map<string, BoundWebView> = new Map()\n  private readonly crust: UICrustBinding\n\n  constructor(crust: UICrustBinding) {\n    this.crust = crust\n  }\n\n  /**\n   * Called when a UI WebView mounts. `injectFn` wraps\n   * `webView.injectJavaScript` — the router calls it with prebuilt\n   * `window.__host.recv(...)` strings to deliver background-side\n   * frames into the WebView's glassly global.\n   *\n   * The router also pushes a UI_OPEN envelope to the background side\n   * once the WebView signals ready (see {@link routeFromWebView}).\n   * Calling bindWebView on a packageName that already has a binding\n   * replaces the previous one (defensive — should not happen in\n   * practice because only one WebView is open at a time).\n   */\n  bindWebView(packageName: string, injectFn: UIInjectFn): void {\n    this.bindings.set(packageName, {inject: injectFn})\n  }\n\n  /**\n   * Called when the WebView unmounts (user navigated away or the host\n   * tore it down on heartbeat timeout). Pushes UI_CLOSE to background\n   * so handlers can flush state, then drops the binding.\n   */\n  unbindWebView(packageName: string): void {\n    if (!this.bindings.has(packageName)) return\n    this.bindings.delete(packageName)\n    this.deliverToBackground(packageName, {type: \"UI_CLOSE\"})\n  }\n\n  /** True iff a WebView is currently bound to the named package. */\n  isBound(packageName: string): boolean {\n    return this.bindings.has(packageName)\n  }\n\n  /**\n   * Re-announce the already-mounted WebView to the background JSContext.\n   * This covers dev background hot-reload, app resume, and thawed WebViews\n   * whose injected UI_SEND frames may have been missed while the host was\n   * suspended. Re-emitting UI_OPEN flips `ui.bound` back to true if needed\n   * and lets background code push a fresh snapshot via session.ui.onOpen.\n   *\n   * No-op if no WebView is currently bound for the package.\n   */\n  notifyReopen(packageName: string): void {\n    if (!this.bindings.has(packageName)) return\n    this.deliverToBackground(packageName, {type: \"UI_OPEN\"})\n  }\n\n  /**\n   * Forward a WebView-originated postMessage envelope to the JSContext.\n   * `rawJson` is the raw string from `event.nativeEvent.data` — the\n   * caller hasn't parsed it yet so the router controls the wire format\n   * end-to-end.\n   *\n   * Recognised envelope types from the WebView shim:\n   *   - {type: \"ready\"}                              → fire UI_OPEN\n   *   - {type: \"msg\", seq, channel, payload}         → fire UI_MESSAGE\n   *   - {type: \"heartbeat\", seq}                     → silently ack\n   */\n  routeFromWebView(packageName: string, rawJson: string): void {\n    let env: {\n      type?: string\n      seq?: number\n      channel?: string\n      payload?: unknown\n      requestId?: string\n    }\n    try {\n      env = JSON.parse(rawJson)\n    } catch {\n      return\n    }\n    if (typeof env.type !== \"string\") return\n\n    if (env.type === \"ready\") {\n      this.deliverToBackground(packageName, {type: \"UI_OPEN\"})\n      return\n    }\n    if (env.type === \"msg\" && typeof env.channel === \"string\") {\n      const out: Record<string, unknown> = {\n        type: \"UI_MESSAGE\",\n        channel: env.channel,\n        payload: env.payload,\n        seq: env.seq,\n      }\n      if (typeof env.requestId === \"string\") out.requestId = env.requestId\n      this.deliverToBackground(packageName, out)\n      return\n    }\n    if (env.type === \"cancel\" && typeof env.requestId === \"string\") {\n      this.deliverToBackground(packageName, {type: \"UI_CANCEL\", requestId: env.requestId})\n      return\n    }\n    // NOTE: console.* logs do NOT come through this router. The\n    // miniappGlobals console-tap shim posts {payload:{type:\"dev_log\"}}\n    // envelopes which LocalMiniappRuntime handles and forwards to the\n    // dev sidecar tagged source:\"ui\". Keeping that path one-way means\n    // we don't have two console-capture pipelines competing.\n    //\n    // Unknown envelope — drop silently.\n  }\n\n  /**\n   * Called by JSRouter when it sees a `__bridge.send` outbound\n   * frame whose parsed payload is a UI_SEND envelope. The router\n   * forwards it as a `msg` frame to the bound WebView (or drops if no\n   * WebView is currently mounted).\n   *\n   * `uiSendPayload` is the raw `{type:\"UI_SEND\", channel, payload, seq}`\n   * shape produced by `session.ui.send` on the background side.\n   */\n  routeFromBackground(\n    packageName: string,\n    uiSendPayload: {\n      type: string\n      channel?: string\n      payload?: unknown\n      seq?: number\n      requestId?: string\n    },\n  ): void {\n    const binding = this.bindings.get(packageName)\n    if (!binding) return\n    if (uiSendPayload.type === \"UI_CANCEL\" && typeof uiSendPayload.requestId === \"string\") {\n      const cancel = {type: \"cancel\", requestId: uiSendPayload.requestId}\n      const literal = JSON.stringify(cancel)\n      const escaped = JSON.stringify(literal)\n      binding.inject(\n        `if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`,\n      )\n      return\n    }\n    const outbound: Record<string, unknown> = {\n      type: \"msg\",\n      seq: uiSendPayload.seq ?? 0,\n      channel: uiSendPayload.channel,\n      payload: uiSendPayload.payload,\n    }\n    if (typeof uiSendPayload.requestId === \"string\") outbound.requestId = uiSendPayload.requestId\n    const literal = JSON.stringify(outbound)\n    const escaped = JSON.stringify(literal)\n    binding.inject(\n      `if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`,\n    )\n  }\n\n  /**\n   * Send a synthetic frame to the WebView. Used for host-initiated\n   * lifecycle events (`open`, `close`, `ack`). The wire shape is the\n   * same as the WebView shim's recv handler expects.\n   */\n  pushLifecycleFrame(packageName: string, frame: {type: \"open\" | \"close\" | \"ack\"; seq?: number}): void {\n    const binding = this.bindings.get(packageName)\n    if (!binding) return\n    const literal = JSON.stringify(frame)\n    const escaped = JSON.stringify(literal)\n    binding.inject(\n      `if (window.__host && window.__host.recv) window.__host.recv(JSON.parse(${escaped})); true;`,\n    )\n  }\n\n  /**\n   * Wrap an EVENT envelope and push it to background via the bridge.\n   * Background's UIModule listens for stream `_ui`. The `type` is the\n   * wire value `miniapp_event` — must match `MiniappResponseType.EVENT`\n   * exactly, otherwise the SDK's session switch falls through and the\n   * `_ui` fan-out never fires (bound stays false; `ui.send` drops).\n   */\n  private deliverToBackground(packageName: string, data: Record<string, unknown>): void {\n    const innerEnvelope = {\n      payload: {\n        type: \"miniapp_event\",\n        streamType: \"_ui\",\n        data,\n      },\n    }\n    void this.crust.jsDispatchToJs(packageName, {\n      kind: \"bridge\",\n      raw: JSON.stringify(innerEnvelope),\n    })\n  }\n}\n"]}

package/build/services/asg/galleryPathMigration.js

@@ -18,7 +18,7 @@ export function toPortableGalleryPath(path, documentDirectoryPath) {
     if (!candidate || candidate.includes("\0"))
         return null;
     const segments = candidate.split("/");
-    if (segments[0] !== "GlasslyPhotos" || segments.some((segment) => !segment || segment === "." || segment === "..")) {
+    if (segments[0] !== "Photos" || segments.some((segment) => !segment || segment === "." || segment === "..")) {
         return null;
     }
     return segments.join("/");

package/build/services/asg/galleryPathMigration.js.map

@@ -1 +1 @@
-{"version":3,"file":"galleryPathMigration.js","sourceRoot":"","sources":["../../../src/services/asg/galleryPathMigration.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,qBAA6B;IAC/E,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACxD,IAAI,SAAS,GAAkB,IAAI,CAAA;IACnC,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,CAAC;QAAE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;SACvF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,aAAa,CAAA;QACrC,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QACzD,IAAI,cAAc,IAAI,CAAC;YAAE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IACnG,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IACvD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACrC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,eAAe,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,CAAC,EAAE,CAAC;QACnH,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["/** Convert current or legacy app-container paths into a portable Documents-relative path. */\nexport function toPortableGalleryPath(path: string, documentDirectoryPath: string): string | null {\n  if (!path) return null\n  const cleanPath = path.replace(/^file:\\/\\//, \"\")\n  const docPath = documentDirectoryPath.replace(/\\/$/, \"\")\n  let candidate: string | null = null\n  if (cleanPath.startsWith(`${docPath}/`)) candidate = cleanPath.substring(docPath.length + 1)\n  else if (!cleanPath.startsWith(\"/\")) candidate = cleanPath.replace(/^\\/+/, \"\")\n\n  if (!candidate) {\n    const documentsMarker = \"/Documents/\"\n    const documentsIndex = cleanPath.indexOf(documentsMarker)\n    if (documentsIndex >= 0) candidate = cleanPath.substring(documentsIndex + documentsMarker.length)\n  }\n\n  if (!candidate || candidate.includes(\"\\0\")) return null\n  const segments = candidate.split(\"/\")\n  if (segments[0] !== \"GlasslyPhotos\" || segments.some((segment) => !segment || segment === \".\" || segment === \"..\")) {\n    return null\n  }\n  return segments.join(\"/\")\n}\n"]}
+{"version":3,"file":"galleryPathMigration.js","sourceRoot":"","sources":["../../../src/services/asg/galleryPathMigration.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,qBAA6B;IAC/E,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACxD,IAAI,SAAS,GAAkB,IAAI,CAAA;IACnC,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,CAAC;QAAE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;SACvF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,aAAa,CAAA;QACrC,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QACzD,IAAI,cAAc,IAAI,CAAC;YAAE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IACnG,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IACvD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACrC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5G,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC","sourcesContent":["/** Convert current or legacy app-container paths into a portable Documents-relative path. */\nexport function toPortableGalleryPath(path: string, documentDirectoryPath: string): string | null {\n  if (!path) return null\n  const cleanPath = path.replace(/^file:\\/\\//, \"\")\n  const docPath = documentDirectoryPath.replace(/\\/$/, \"\")\n  let candidate: string | null = null\n  if (cleanPath.startsWith(`${docPath}/`)) candidate = cleanPath.substring(docPath.length + 1)\n  else if (!cleanPath.startsWith(\"/\")) candidate = cleanPath.replace(/^\\/+/, \"\")\n\n  if (!candidate) {\n    const documentsMarker = \"/Documents/\"\n    const documentsIndex = cleanPath.indexOf(documentsMarker)\n    if (documentsIndex >= 0) candidate = cleanPath.substring(documentsIndex + documentsMarker.length)\n  }\n\n  if (!candidate || candidate.includes(\"\\0\")) return null\n  const segments = candidate.split(\"/\")\n  if (segments[0] !== \"Photos\" || segments.some((segment) => !segment || segment === \".\" || segment === \"..\")) {\n    return null\n  }\n  return segments.join(\"/\")\n}\n"]}

package/build/services/asg/gallerySyncService.js

@@ -330,7 +330,7 @@ class GallerySyncService {
         try {
             return await Promise.race([
                 CrustModule.isLocationServicesEnabled(),
-                new Promise((_, reject) => setTimeout(() => reject(new Error("Location services check timed out")), TIMING.LOCATION_SERVICES_CHECK_TIMEOUT_MS)),
+                new Promise((_, reject) => BgTimer.setTimeout(() => reject(new Error("Location services check timed out")), TIMING.LOCATION_SERVICES_CHECK_TIMEOUT_MS)),
             ]);
         }
         catch (error) {
@@ -356,7 +356,7 @@ class GallerySyncService {
                 if (state !== "unknown") {
                     return state === "on";
                 }
-                await new Promise((resolve) => setTimeout(resolve, 50));
+                await new Promise((resolve) => BgTimer.setTimeout(resolve, 50));
             }
             console.warn("[GallerySyncService] Bluetooth state still unknown after 500ms - assuming enabled");
             return true;