@metamask/snaps-controllers 9.19.1 → 10.0.0

package/dist/services/proxy/ProxyExecutionService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/proxy/ProxyExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,eAAe;AAMhC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAMnE,MAAM,OAAO,qBAAsB,SAAQ,wBAAgC;IAGzE;;;;;;;;;;OAUG;IACH,YAAY,EACV,MAAM,EACN,SAAS,EACT,iBAAiB,GACoB;QACrC,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAtBI,gDAA+B;QAwBtC,uBAAA,IAAI,iCAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAA6B;QACxD,0EAA0E;QAC1E,8CAA8C;QAC9C,uBAAA,IAAI,qCAAQ,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,cAAc;gBACtB,EAAE,EAAE,MAAM,EAAE;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC;YACxC,MAAM,EAAE,uBAAA,IAAI,qCAAQ;YACpB,KAAK;SACN,CAAC,CAAC;QAEH,0DAA0D;QAC1D,iFAAiF;QACjF,2DAA2D;QAC3D,sFAAsF;QACtF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;aACvD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;CACF","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport { ProxyPostMessageStream } from '../ProxyPostMessageStream';\n\ntype ProxyExecutionEnvironmentServiceArgs = {\n  stream: BasePostMessageStream;\n} & ExecutionServiceArgs;\n\nexport class ProxyExecutionService extends AbstractExecutionService<string> {\n  readonly #stream: BasePostMessageStream;\n\n  /**\n   * Create a new proxy execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger to use for communication with the\n   * `SnapController`.\n   * @param args.setupSnapProvider - The function to use to set up the snap\n   * provider.\n   * @param args.stream - The stream to use for communicating with the proxy\n   * executor.\n   */\n  constructor({\n    stream,\n    messenger,\n    setupSnapProvider,\n  }: ProxyExecutionEnvironmentServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n      usePing: false,\n    });\n\n    this.#stream = stream;\n  }\n\n  /**\n   * Send a termination command to the proxy stream.\n   *\n   * @param job - The job to terminate.\n   */\n  protected async terminateJob(job: TerminateJobArgs<string>) {\n    // The `AbstractExecutionService` will have already closed the job stream,\n    // so we write to the runtime stream directly.\n    this.#stream.write({\n      jobId: job.id,\n      data: {\n        jsonrpc: '2.0',\n        method: 'terminateJob',\n        id: nanoid(),\n      },\n    });\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the root stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    const stream = new ProxyPostMessageStream({\n      stream: this.#stream,\n      jobId,\n    });\n\n    // Send a request and await any response before continuing\n    // This simulates the behaviour of non-proxy environments by effectively awaiting\n    // the load of the environment inside the proxy environment\n    // This assumes the proxy environment is already loaded before this function is called\n    await new Promise((resolve) => {\n      stream.once('data', resolve);\n      stream.write({\n        name: 'command',\n        data: { jsonrpc: '2.0', method: 'ping', id: nanoid() },\n      });\n    });\n\n    return { worker: jobId, stream };\n  }\n}\n"]}
+{"version":3,"file":"ProxyExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/proxy/ProxyExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,eAAe;AAMhC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAMnE,MAAM,OAAO,qBAAsB,SAAQ,wBAAgC;IAGzE;;;;;;;;;;OAUG;IACH,YAAY,EACV,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,GAAG,IAAI,EAC8B;QACrC,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAxBI,gDAA+B;QA0BtC,uBAAA,IAAI,iCAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAA6B;QACxD,0EAA0E;QAC1E,8CAA8C;QAC9C,uBAAA,IAAI,qCAAQ,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,cAAc;gBACtB,EAAE,EAAE,MAAM,EAAE;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC;YACxC,MAAM,EAAE,uBAAA,IAAI,qCAAQ;YACpB,KAAK;SACN,CAAC,CAAC;QAEH,0DAA0D;QAC1D,iFAAiF;QACjF,2DAA2D;QAC3D,sFAAsF;QACtF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;aACvD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;CACF","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport { ProxyPostMessageStream } from '../ProxyPostMessageStream';\n\ntype ProxyExecutionEnvironmentServiceArgs = {\n  stream: BasePostMessageStream;\n} & ExecutionServiceArgs;\n\nexport class ProxyExecutionService extends AbstractExecutionService<string> {\n  readonly #stream: BasePostMessageStream;\n\n  /**\n   * Create a new proxy execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger to use for communication with the\n   * `SnapController`.\n   * @param args.setupSnapProvider - The function to use to set up the snap\n   * provider.\n   * @param args.stream - The stream to use for communicating with the proxy\n   * executor.\n   */\n  constructor({\n    stream,\n    messenger,\n    setupSnapProvider,\n    ...args\n  }: ProxyExecutionEnvironmentServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n      usePing: false,\n    });\n\n    this.#stream = stream;\n  }\n\n  /**\n   * Send a termination command to the proxy stream.\n   *\n   * @param job - The job to terminate.\n   */\n  protected async terminateJob(job: TerminateJobArgs<string>) {\n    // The `AbstractExecutionService` will have already closed the job stream,\n    // so we write to the runtime stream directly.\n    this.#stream.write({\n      jobId: job.id,\n      data: {\n        jsonrpc: '2.0',\n        method: 'terminateJob',\n        id: nanoid(),\n      },\n    });\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the root stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    const stream = new ProxyPostMessageStream({\n      stream: this.#stream,\n      jobId,\n    });\n\n    // Send a request and await any response before continuing\n    // This simulates the behaviour of non-proxy environments by effectively awaiting\n    // the load of the environment inside the proxy environment\n    // This assumes the proxy environment is already loaded before this function is called\n    await new Promise((resolve) => {\n      stream.once('data', resolve);\n      stream.write({\n        name: 'command',\n        data: { jsonrpc: '2.0', method: 'ping', id: nanoid() },\n      });\n    });\n\n    return { worker: jobId, stream };\n  }\n}\n"]}

package/dist/services/webview/WebViewExecutionService.cjs

@@ -10,25 +10,22 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _WebViewExecutionService_instances, _WebViewExecutionService_getWebView, _WebViewExecutionService_ensureWebViewLoaded;
+var _WebViewExecutionService_createWebView, _WebViewExecutionService_removeWebView;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebViewExecutionService = void 0;
-const ProxyExecutionService_1 = require("../proxy/ProxyExecutionService.cjs");
+const AbstractExecutionService_1 = require("../AbstractExecutionService.cjs");
 const WebViewMessageStream_1 = require("./WebViewMessageStream.cjs");
-class WebViewExecutionService extends ProxyExecutionService_1.ProxyExecutionService {
-    constructor({ messenger, setupSnapProvider, getWebView, }) {
+class WebViewExecutionService extends AbstractExecutionService_1.AbstractExecutionService {
+    constructor({ messenger, setupSnapProvider, createWebView, removeWebView, ...args }) {
         super({
+            ...args,
             messenger,
             setupSnapProvider,
-            stream: new WebViewMessageStream_1.WebViewMessageStream({
-                name: 'parent',
-                target: 'child',
-                getWebView,
-            }),
         });
-        _WebViewExecutionService_instances.add(this);
-        _WebViewExecutionService_getWebView.set(this, void 0);
-        __classPrivateFieldSet(this, _WebViewExecutionService_getWebView, getWebView, "f");
+        _WebViewExecutionService_createWebView.set(this, void 0);
+        _WebViewExecutionService_removeWebView.set(this, void 0);
+        __classPrivateFieldSet(this, _WebViewExecutionService_createWebView, createWebView, "f");
+        __classPrivateFieldSet(this, _WebViewExecutionService_removeWebView, removeWebView, "f");
     }
     /**
      * Create a new stream for the specified job. This wraps the runtime stream
@@ -38,17 +35,18 @@ class WebViewExecutionService extends ProxyExecutionService_1.ProxyExecutionServ
      * @returns An object with the worker ID and stream.
      */
     async initEnvStream(jobId) {
-        // Ensure that the WebView has been loaded before we proceed.
-        await __classPrivateFieldGet(this, _WebViewExecutionService_instances, "m", _WebViewExecutionService_ensureWebViewLoaded).call(this);
-        return super.initEnvStream(jobId);
+        const webView = await __classPrivateFieldGet(this, _WebViewExecutionService_createWebView, "f").call(this, jobId);
+        const stream = new WebViewMessageStream_1.WebViewMessageStream({
+            name: 'parent',
+            target: 'child',
+            webView,
+        });
+        return { worker: webView, stream };
+    }
+    terminateJob(jobWrapper) {
+        __classPrivateFieldGet(this, _WebViewExecutionService_removeWebView, "f").call(this, jobWrapper.id);
     }
 }
 exports.WebViewExecutionService = WebViewExecutionService;
-_WebViewExecutionService_getWebView = new WeakMap(), _WebViewExecutionService_instances = new WeakSet(), _WebViewExecutionService_ensureWebViewLoaded = 
-/**
- * Ensure that the WebView has been loaded by awaiting the getWebView promise.
- */
-async function _WebViewExecutionService_ensureWebViewLoaded() {
-    await __classPrivateFieldGet(this, _WebViewExecutionService_getWebView, "f").call(this);
-};
+_WebViewExecutionService_createWebView = new WeakMap(), _WebViewExecutionService_removeWebView = new WeakMap();
 //# sourceMappingURL=WebViewExecutionService.cjs.map

package/dist/services/webview/WebViewExecutionService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,8EAAuE;AAEvE,qEAA8D;AAM9D,MAAa,uBAAwB,SAAQ,6CAAqB;IAGhE,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,GACkB;QAC5B,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;YACjB,MAAM,EAAE,IAAI,2CAAoB,CAAC;gBAC/B,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,OAAO;gBACf,UAAU;aACX,CAAC;SACH,CAAC,CAAC;;QAfL,sDAAY;QAgBV,uBAAA,IAAI,uCAAe,UAAU,MAAA,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,6DAA6D;QAC7D,MAAM,uBAAA,IAAI,wFAAqB,MAAzB,IAAI,CAAuB,CAAC;QAElC,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CAQF;AAxCD,0DAwCC;;AANC;;GAEG;AACH,KAAK;IACH,MAAM,uBAAA,IAAI,2CAAY,MAAhB,IAAI,CAAc,CAAC;AAC3B,CAAC","sourcesContent":["import type { ExecutionServiceArgs } from '../AbstractExecutionService';\nimport { ProxyExecutionService } from '../proxy/ProxyExecutionService';\nimport type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  getWebView: () => Promise<WebViewInterface>;\n};\n\nexport class WebViewExecutionService extends ProxyExecutionService {\n  #getWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    getWebView,\n  }: WebViewExecutionServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n      stream: new WebViewMessageStream({\n        name: 'parent',\n        target: 'child',\n        getWebView,\n      }),\n    });\n    this.#getWebView = getWebView;\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    // Ensure that the WebView has been loaded before we proceed.\n    await this.#ensureWebViewLoaded();\n\n    return super.initEnvStream(jobId);\n  }\n\n  /**\n   * Ensure that the WebView has been loaded by awaiting the getWebView promise.\n   */\n  async #ensureWebViewLoaded() {\n    await this.#getWebView();\n  }\n}\n"]}
+{"version":3,"file":"WebViewExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,8EAGqC;AAErC,qEAA8D;AAO9D,MAAa,uBAAwB,SAAQ,mDAA0C;IAKrF,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAfI,yDAAe;QAEf,yDAAe;QActB,uBAAA,IAAI,0CAAkB,aAAa,MAAA,CAAC;QACpC,uBAAA,IAAI,0CAAkB,aAAa,MAAA,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,8CAAe,MAAnB,IAAI,EAAgB,KAAK,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,IAAI,2CAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,YAAY,CAAC,UAA8C;QACnE,uBAAA,IAAI,8CAAe,MAAnB,IAAI,EAAgB,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF;AA3CD,0DA2CC","sourcesContent":["import type { TerminateJobArgs } from '../AbstractExecutionService';\nimport {\n  AbstractExecutionService,\n  type ExecutionServiceArgs,\n} from '../AbstractExecutionService';\nimport type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    const webView = await this.#createWebView(jobId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}

package/dist/services/webview/WebViewExecutionService.d.cts

@@ -1,12 +1,14 @@
-import type { ExecutionServiceArgs } from "../AbstractExecutionService.cjs";
-import { ProxyExecutionService } from "../proxy/ProxyExecutionService.cjs";
+import type { TerminateJobArgs } from "../AbstractExecutionService.cjs";
+import { AbstractExecutionService, type ExecutionServiceArgs } from "../AbstractExecutionService.cjs";
 import type { WebViewInterface } from "./WebViewMessageStream.cjs";
+import { WebViewMessageStream } from "./WebViewMessageStream.cjs";
 export type WebViewExecutionServiceArgs = ExecutionServiceArgs & {
-    getWebView: () => Promise<WebViewInterface>;
+    createWebView: (jobId: string) => Promise<WebViewInterface>;
+    removeWebView: (jobId: string) => void;
 };
-export declare class WebViewExecutionService extends ProxyExecutionService {
+export declare class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {
     #private;
-    constructor({ messenger, setupSnapProvider, getWebView, }: WebViewExecutionServiceArgs);
+    constructor({ messenger, setupSnapProvider, createWebView, removeWebView, ...args }: WebViewExecutionServiceArgs);
     /**
      * Create a new stream for the specified job. This wraps the runtime stream
      * in a stream specific to the job.
@@ -15,8 +17,9 @@ export declare class WebViewExecutionService extends ProxyExecutionService {
      * @returns An object with the worker ID and stream.
      */
     protected initEnvStream(jobId: string): Promise<{
-        worker: string;
-        stream: import("../index.cjs").ProxyPostMessageStream;
+        worker: WebViewInterface;
+        stream: WebViewMessageStream;
     }>;
+    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void;
 }
 //# sourceMappingURL=WebViewExecutionService.d.cts.map

package/dist/services/webview/WebViewExecutionService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,wCAAoC;AACxE,OAAO,EAAE,qBAAqB,EAAE,2CAAuC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAG/D,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,UAAU,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7C,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,qBAAqB;;gBAGpD,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,GACX,EAAE,2BAA2B;IAa9B;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;CAa5C"}
+{"version":3,"file":"WebViewExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAoC;AACpE,OAAO,EACL,wBAAwB,EACxB,KAAK,oBAAoB,EAC1B,wCAAoC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAE9D,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAY3C,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,IAAI;CAG7E"}

package/dist/services/webview/WebViewExecutionService.d.mts

@@ -1,12 +1,14 @@
-import type { ExecutionServiceArgs } from "../AbstractExecutionService.mjs";
-import { ProxyExecutionService } from "../proxy/ProxyExecutionService.mjs";
+import type { TerminateJobArgs } from "../AbstractExecutionService.mjs";
+import { AbstractExecutionService, type ExecutionServiceArgs } from "../AbstractExecutionService.mjs";
 import type { WebViewInterface } from "./WebViewMessageStream.mjs";
+import { WebViewMessageStream } from "./WebViewMessageStream.mjs";
 export type WebViewExecutionServiceArgs = ExecutionServiceArgs & {
-    getWebView: () => Promise<WebViewInterface>;
+    createWebView: (jobId: string) => Promise<WebViewInterface>;
+    removeWebView: (jobId: string) => void;
 };
-export declare class WebViewExecutionService extends ProxyExecutionService {
+export declare class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {
     #private;
-    constructor({ messenger, setupSnapProvider, getWebView, }: WebViewExecutionServiceArgs);
+    constructor({ messenger, setupSnapProvider, createWebView, removeWebView, ...args }: WebViewExecutionServiceArgs);
     /**
      * Create a new stream for the specified job. This wraps the runtime stream
      * in a stream specific to the job.
@@ -15,8 +17,9 @@ export declare class WebViewExecutionService extends ProxyExecutionService {
      * @returns An object with the worker ID and stream.
      */
     protected initEnvStream(jobId: string): Promise<{
-        worker: string;
-        stream: import("../index.mjs").ProxyPostMessageStream;
+        worker: WebViewInterface;
+        stream: WebViewMessageStream;
     }>;
+    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void;
 }
 //# sourceMappingURL=WebViewExecutionService.d.mts.map

package/dist/services/webview/WebViewExecutionService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,wCAAoC;AACxE,OAAO,EAAE,qBAAqB,EAAE,2CAAuC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAG/D,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,UAAU,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7C,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,qBAAqB;;gBAGpD,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,GACX,EAAE,2BAA2B;IAa9B;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;CAa5C"}
+{"version":3,"file":"WebViewExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,wCAAoC;AACpE,OAAO,EACL,wBAAwB,EACxB,KAAK,oBAAoB,EAC1B,wCAAoC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAE9D,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAY3C,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,IAAI;CAG7E"}

package/dist/services/webview/WebViewExecutionService.mjs

@@ -9,23 +9,20 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _WebViewExecutionService_instances, _WebViewExecutionService_getWebView, _WebViewExecutionService_ensureWebViewLoaded;
-import { ProxyExecutionService } from "../proxy/ProxyExecutionService.mjs";
+var _WebViewExecutionService_createWebView, _WebViewExecutionService_removeWebView;
+import { AbstractExecutionService } from "../AbstractExecutionService.mjs";
 import { WebViewMessageStream } from "./WebViewMessageStream.mjs";
-export class WebViewExecutionService extends ProxyExecutionService {
-    constructor({ messenger, setupSnapProvider, getWebView, }) {
+export class WebViewExecutionService extends AbstractExecutionService {
+    constructor({ messenger, setupSnapProvider, createWebView, removeWebView, ...args }) {
         super({
+            ...args,
             messenger,
             setupSnapProvider,
-            stream: new WebViewMessageStream({
-                name: 'parent',
-                target: 'child',
-                getWebView,
-            }),
         });
-        _WebViewExecutionService_instances.add(this);
-        _WebViewExecutionService_getWebView.set(this, void 0);
-        __classPrivateFieldSet(this, _WebViewExecutionService_getWebView, getWebView, "f");
+        _WebViewExecutionService_createWebView.set(this, void 0);
+        _WebViewExecutionService_removeWebView.set(this, void 0);
+        __classPrivateFieldSet(this, _WebViewExecutionService_createWebView, createWebView, "f");
+        __classPrivateFieldSet(this, _WebViewExecutionService_removeWebView, removeWebView, "f");
     }
     /**
      * Create a new stream for the specified job. This wraps the runtime stream
@@ -35,16 +32,17 @@ export class WebViewExecutionService extends ProxyExecutionService {
      * @returns An object with the worker ID and stream.
      */
     async initEnvStream(jobId) {
-        // Ensure that the WebView has been loaded before we proceed.
-        await __classPrivateFieldGet(this, _WebViewExecutionService_instances, "m", _WebViewExecutionService_ensureWebViewLoaded).call(this);
-        return super.initEnvStream(jobId);
+        const webView = await __classPrivateFieldGet(this, _WebViewExecutionService_createWebView, "f").call(this, jobId);
+        const stream = new WebViewMessageStream({
+            name: 'parent',
+            target: 'child',
+            webView,
+        });
+        return { worker: webView, stream };
+    }
+    terminateJob(jobWrapper) {
+        __classPrivateFieldGet(this, _WebViewExecutionService_removeWebView, "f").call(this, jobWrapper.id);
     }
 }
-_WebViewExecutionService_getWebView = new WeakMap(), _WebViewExecutionService_instances = new WeakSet(), _WebViewExecutionService_ensureWebViewLoaded = 
-/**
- * Ensure that the WebView has been loaded by awaiting the getWebView promise.
- */
-async function _WebViewExecutionService_ensureWebViewLoaded() {
-    await __classPrivateFieldGet(this, _WebViewExecutionService_getWebView, "f").call(this);
-};
+_WebViewExecutionService_createWebView = new WeakMap(), _WebViewExecutionService_removeWebView = new WeakMap();
 //# sourceMappingURL=WebViewExecutionService.mjs.map

package/dist/services/webview/WebViewExecutionService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,qBAAqB,EAAE,2CAAuC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAM9D,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAGhE,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,GACkB;QAC5B,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;YACjB,MAAM,EAAE,IAAI,oBAAoB,CAAC;gBAC/B,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,OAAO;gBACf,UAAU;aACX,CAAC;SACH,CAAC,CAAC;;QAfL,sDAAY;QAgBV,uBAAA,IAAI,uCAAe,UAAU,MAAA,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,6DAA6D;QAC7D,MAAM,uBAAA,IAAI,wFAAqB,MAAzB,IAAI,CAAuB,CAAC;QAElC,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CAQF;;AANC;;GAEG;AACH,KAAK;IACH,MAAM,uBAAA,IAAI,2CAAY,MAAhB,IAAI,CAAc,CAAC;AAC3B,CAAC","sourcesContent":["import type { ExecutionServiceArgs } from '../AbstractExecutionService';\nimport { ProxyExecutionService } from '../proxy/ProxyExecutionService';\nimport type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  getWebView: () => Promise<WebViewInterface>;\n};\n\nexport class WebViewExecutionService extends ProxyExecutionService {\n  #getWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    getWebView,\n  }: WebViewExecutionServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n      stream: new WebViewMessageStream({\n        name: 'parent',\n        target: 'child',\n        getWebView,\n      }),\n    });\n    this.#getWebView = getWebView;\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    // Ensure that the WebView has been loaded before we proceed.\n    await this.#ensureWebViewLoaded();\n\n    return super.initEnvStream(jobId);\n  }\n\n  /**\n   * Ensure that the WebView has been loaded by awaiting the getWebView promise.\n   */\n  async #ensureWebViewLoaded() {\n    await this.#getWebView();\n  }\n}\n"]}
+{"version":3,"file":"WebViewExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EACL,wBAAwB,EAEzB,wCAAoC;AAErC,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAO9D,MAAM,OAAO,uBAAwB,SAAQ,wBAA0C;IAKrF,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAfI,yDAAe;QAEf,yDAAe;QActB,uBAAA,IAAI,0CAAkB,aAAa,MAAA,CAAC;QACpC,uBAAA,IAAI,0CAAkB,aAAa,MAAA,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,8CAAe,MAAnB,IAAI,EAAgB,KAAK,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,YAAY,CAAC,UAA8C;QACnE,uBAAA,IAAI,8CAAe,MAAnB,IAAI,EAAgB,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF","sourcesContent":["import type { TerminateJobArgs } from '../AbstractExecutionService';\nimport {\n  AbstractExecutionService,\n  type ExecutionServiceArgs,\n} from '../AbstractExecutionService';\nimport type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    const webView = await this.#createWebView(jobId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}

package/dist/services/webview/WebViewMessageStream.cjs

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebViewMessageStream = void 0;
 const post_message_stream_1 = require("@metamask/post-message-stream");
 const utils_1 = require("@metamask/post-message-stream/dist/utils.js");
-const snaps_utils_1 = require("@metamask/snaps-utils");
 const utils_2 = require("@metamask/utils");
 /**
  * A special postMessage stream used to interface with a WebView.
@@ -28,9 +27,9 @@ class WebViewMessageStream extends post_message_stream_1.BasePostMessageStream {
      * @param args.name - The name of the stream. Used to differentiate between
      * multiple streams sharing the same window object.
      * @param args.target - The name of the stream to exchange messages with.
-     * @param args.getWebView - A asynchronous getter for the webview.
+     * @param args.webView - A reference to the WebView.
      */
-    constructor({ name, target, getWebView }) {
+    constructor({ name, target, webView }) {
         super();
         _WebViewMessageStream_name.set(this, void 0);
         _WebViewMessageStream_target.set(this, void 0);
@@ -38,19 +37,11 @@ class WebViewMessageStream extends post_message_stream_1.BasePostMessageStream {
         __classPrivateFieldSet(this, _WebViewMessageStream_name, name, "f");
         __classPrivateFieldSet(this, _WebViewMessageStream_target, target, "f");
         this._onMessage = this._onMessage.bind(this);
-        // This is a bit atypical from other post-message streams.
-        // We have to wait for the WebView to fully load before we can continue using the stream.
-        getWebView()
-            .then((webView) => {
-            __classPrivateFieldSet(this, _WebViewMessageStream_webView, webView, "f");
-            // This method is already bound.
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            webView.registerMessageListener(this._onMessage);
-            this._handshake();
-        })
-            .catch((error) => {
-            (0, snaps_utils_1.logError)(error);
-        });
+        __classPrivateFieldSet(this, _WebViewMessageStream_webView, webView, "f");
+        // This method is already bound.
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").registerMessageListener(this._onMessage);
+        this._handshake();
     }
     _postMessage(data) {
         (0, utils_2.assert)(__classPrivateFieldGet(this, _WebViewMessageStream_webView, "f"));
@@ -58,12 +49,10 @@ class WebViewMessageStream extends post_message_stream_1.BasePostMessageStream {
             target: __classPrivateFieldGet(this, _WebViewMessageStream_target, "f"),
             data,
         });
-        // To prevent XSS, we base64 encode the message before injecting it.
-        // This adds significant performance overhead.
-        // TODO: Should we use mobile native base64 here?
-        const bytes = (0, utils_2.stringToBytes)(json);
-        const base64 = (0, utils_2.bytesToBase64)(bytes);
-        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").injectJavaScript(`window.postMessage('${base64}')`);
+        // To prevent XSS, we encode the message before injecting it.
+        // This adds significant performance overhead for larger messages.
+        const bytes = new Uint8Array((0, utils_2.stringToBytes)(json));
+        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").injectJavaScript(`window.postMessage([${bytes.toString()}])`);
     }
     _onMessage(event) {
         if (typeof event.data !== 'string') {

package/dist/services/webview/WebViewMessageStream.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewMessageStream.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAAsE;AACtE,uEAAgF;AAChF,uDAAiD;AACjD,2CAAuE;AAcvE;;GAEG;AACH,MAAa,oBAAqB,SAAQ,2CAAqB;IAO7D;;;;;;;;OAQG;IACH,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAqB;QACzD,KAAK,EAAE,CAAC;QAhBV,6CAAM;QAEN,+CAAQ;QAER,gDAAuC;QAcrC,uBAAA,IAAI,8BAAS,IAAI,MAAA,CAAC;QAClB,uBAAA,IAAI,gCAAW,MAAM,MAAA,CAAC;QAEtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,0DAA0D;QAC1D,yFAAyF;QACzF,UAAU,EAAE;aACT,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,uBAAA,IAAI,iCAAY,OAAO,MAAA,CAAC;YACxB,gCAAgC;YAChC,6DAA6D;YAC7D,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,IAAA,cAAM,EAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,uBAAA,IAAI,oCAAQ;YACpB,IAAI;SACL,CAAC,CAAC;QAEH,oEAAoE;QACpE,8CAA8C;QAC9C,iDAAiD;QACjD,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,IAAI,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QACpC,uBAAA,IAAI,qCAAS,CAAC,gBAAgB,CAAC,uBAAuB,MAAM,IAAI,CAAC,CAAC;IACpE,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,gEAAgE;QAChE,0CAA0C;QAC1C,IAAI,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,uBAAA,IAAI,kCAAM,EAAE,CAAC;YACpE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,IAAA,cAAM,EAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;CACF;AA5ED,oDA4EC","sourcesContent":["import type { PostMessageEvent } from '@metamask/post-message-stream';\nimport { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils';\nimport { logError } from '@metamask/snaps-utils';\nimport { assert, bytesToBase64, stringToBytes } from '@metamask/utils';\n\nexport type WebViewInterface = {\n  injectJavaScript(js: string): void;\n  registerMessageListener(listener: (event: PostMessageEvent) => void): void;\n  unregisterMessageListener(listener: (event: PostMessageEvent) => void): void;\n};\n\nexport type WebViewStreamArgs = {\n  name: string;\n  target: string;\n  getWebView: () => Promise<WebViewInterface>;\n};\n\n/**\n * A special postMessage stream used to interface with a WebView.\n */\nexport class WebViewMessageStream extends BasePostMessageStream {\n  #name;\n\n  #target;\n\n  #webView: WebViewInterface | undefined;\n\n  /**\n   * Creates a stream for communicating with other streams inside a WebView.\n   *\n   * @param args - Options bag.\n   * @param args.name - The name of the stream. Used to differentiate between\n   * multiple streams sharing the same window object.\n   * @param args.target - The name of the stream to exchange messages with.\n   * @param args.getWebView - A asynchronous getter for the webview.\n   */\n  constructor({ name, target, getWebView }: WebViewStreamArgs) {\n    super();\n\n    this.#name = name;\n    this.#target = target;\n\n    this._onMessage = this._onMessage.bind(this);\n\n    // This is a bit atypical from other post-message streams.\n    // We have to wait for the WebView to fully load before we can continue using the stream.\n    getWebView()\n      .then((webView) => {\n        this.#webView = webView;\n        // This method is already bound.\n        // eslint-disable-next-line @typescript-eslint/unbound-method\n        webView.registerMessageListener(this._onMessage);\n        this._handshake();\n      })\n      .catch((error) => {\n        logError(error);\n      });\n  }\n\n  protected _postMessage(data: unknown): void {\n    assert(this.#webView);\n    const json = JSON.stringify({\n      target: this.#target,\n      data,\n    });\n\n    // To prevent XSS, we base64 encode the message before injecting it.\n    // This adds significant performance overhead.\n    // TODO: Should we use mobile native base64 here?\n    const bytes = stringToBytes(json);\n    const base64 = bytesToBase64(bytes);\n    this.#webView.injectJavaScript(`window.postMessage('${base64}')`);\n  }\n\n  private _onMessage(event: PostMessageEvent): void {\n    if (typeof event.data !== 'string') {\n      return;\n    }\n\n    const message = JSON.parse(event.data);\n\n    // Notice that we don't check targetWindow or targetOrigin here.\n    // This doesn't seem possible to do in RN.\n    if (!isValidStreamMessage(message) || message.target !== this.#name) {\n      return;\n    }\n\n    this._onData(message.data);\n  }\n\n  _destroy() {\n    assert(this.#webView);\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.unregisterMessageListener(this._onMessage);\n  }\n}\n"]}
+{"version":3,"file":"WebViewMessageStream.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAAsE;AACtE,uEAAgF;AAChF,2CAAwD;AAcxD;;GAEG;AACH,MAAa,oBAAqB,SAAQ,2CAAqB;IAO7D;;;;;;;;OAQG;IACH,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAqB;QACtD,KAAK,EAAE,CAAC;QAhBV,6CAAM;QAEN,+CAAQ;QAER,gDAAuC;QAcrC,uBAAA,IAAI,8BAAS,IAAI,MAAA,CAAC;QAClB,uBAAA,IAAI,gCAAW,MAAM,MAAA,CAAC;QAEtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,uBAAA,IAAI,iCAAY,OAAO,MAAA,CAAC;QACxB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,IAAA,cAAM,EAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,uBAAA,IAAI,oCAAQ;YACpB,IAAI;SACL,CAAC,CAAC;QAEH,6DAA6D;QAC7D,kEAAkE;QAClE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAA,qBAAa,EAAC,IAAI,CAAC,CAAC,CAAC;QAElD,uBAAA,IAAI,qCAAS,CAAC,gBAAgB,CAAC,uBAAuB,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,gEAAgE;QAChE,0CAA0C;QAC1C,IAAI,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,uBAAA,IAAI,kCAAM,EAAE,CAAC;YACpE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,IAAA,cAAM,EAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;CACF;AAnED,oDAmEC","sourcesContent":["import type { PostMessageEvent } from '@metamask/post-message-stream';\nimport { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils';\nimport { assert, stringToBytes } from '@metamask/utils';\n\nexport type WebViewInterface = {\n  injectJavaScript(js: string): void;\n  registerMessageListener(listener: (event: PostMessageEvent) => void): void;\n  unregisterMessageListener(listener: (event: PostMessageEvent) => void): void;\n};\n\nexport type WebViewStreamArgs = {\n  name: string;\n  target: string;\n  webView: WebViewInterface;\n};\n\n/**\n * A special postMessage stream used to interface with a WebView.\n */\nexport class WebViewMessageStream extends BasePostMessageStream {\n  #name;\n\n  #target;\n\n  #webView: WebViewInterface | undefined;\n\n  /**\n   * Creates a stream for communicating with other streams inside a WebView.\n   *\n   * @param args - Options bag.\n   * @param args.name - The name of the stream. Used to differentiate between\n   * multiple streams sharing the same window object.\n   * @param args.target - The name of the stream to exchange messages with.\n   * @param args.webView - A reference to the WebView.\n   */\n  constructor({ name, target, webView }: WebViewStreamArgs) {\n    super();\n\n    this.#name = name;\n    this.#target = target;\n\n    this._onMessage = this._onMessage.bind(this);\n\n    this.#webView = webView;\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.registerMessageListener(this._onMessage);\n    this._handshake();\n  }\n\n  protected _postMessage(data: unknown): void {\n    assert(this.#webView);\n    const json = JSON.stringify({\n      target: this.#target,\n      data,\n    });\n\n    // To prevent XSS, we encode the message before injecting it.\n    // This adds significant performance overhead for larger messages.\n    const bytes = new Uint8Array(stringToBytes(json));\n\n    this.#webView.injectJavaScript(`window.postMessage([${bytes.toString()}])`);\n  }\n\n  private _onMessage(event: PostMessageEvent): void {\n    if (typeof event.data !== 'string') {\n      return;\n    }\n\n    const message = JSON.parse(event.data);\n\n    // Notice that we don't check targetWindow or targetOrigin here.\n    // This doesn't seem possible to do in RN.\n    if (!isValidStreamMessage(message) || message.target !== this.#name) {\n      return;\n    }\n\n    this._onData(message.data);\n  }\n\n  _destroy() {\n    assert(this.#webView);\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.unregisterMessageListener(this._onMessage);\n  }\n}\n"]}

package/dist/services/webview/WebViewMessageStream.d.cts

@@ -8,7 +8,7 @@ export type WebViewInterface = {
 export type WebViewStreamArgs = {
     name: string;
     target: string;
-    getWebView: () => Promise<WebViewInterface>;
+    webView: WebViewInterface;
 };
 /**
  * A special postMessage stream used to interface with a WebView.
@@ -22,9 +22,9 @@ export declare class WebViewMessageStream extends BasePostMessageStream {
      * @param args.name - The name of the stream. Used to differentiate between
      * multiple streams sharing the same window object.
      * @param args.target - The name of the stream to exchange messages with.
-     * @param args.getWebView - A asynchronous getter for the webview.
+     * @param args.webView - A reference to the WebView.
      */
-    constructor({ name, target, getWebView }: WebViewStreamArgs);
+    constructor({ name, target, webView }: WebViewStreamArgs);
     protected _postMessage(data: unknown): void;
     private _onMessage;
     _destroy(): void;

package/dist/services/webview/WebViewMessageStream.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewMessageStream.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sCAAsC;AACtE,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AAKtE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,uBAAuB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3E,yBAAyB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;;IAO7D;;;;;;;;OAQG;gBACS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB;IAuB3D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAe3C,OAAO,CAAC,UAAU;IAgBlB,QAAQ;CAMT"}
+{"version":3,"file":"WebViewMessageStream.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sCAAsC;AACtE,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AAItE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,uBAAuB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3E,yBAAyB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;;IAO7D;;;;;;;;OAQG;gBACS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,iBAAiB;IAexD,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAc3C,OAAO,CAAC,UAAU;IAgBlB,QAAQ;CAMT"}

package/dist/services/webview/WebViewMessageStream.d.mts

@@ -8,7 +8,7 @@ export type WebViewInterface = {
 export type WebViewStreamArgs = {
     name: string;
     target: string;
-    getWebView: () => Promise<WebViewInterface>;
+    webView: WebViewInterface;
 };
 /**
  * A special postMessage stream used to interface with a WebView.
@@ -22,9 +22,9 @@ export declare class WebViewMessageStream extends BasePostMessageStream {
      * @param args.name - The name of the stream. Used to differentiate between
      * multiple streams sharing the same window object.
      * @param args.target - The name of the stream to exchange messages with.
-     * @param args.getWebView - A asynchronous getter for the webview.
+     * @param args.webView - A reference to the WebView.
      */
-    constructor({ name, target, getWebView }: WebViewStreamArgs);
+    constructor({ name, target, webView }: WebViewStreamArgs);
     protected _postMessage(data: unknown): void;
     private _onMessage;
     _destroy(): void;

package/dist/services/webview/WebViewMessageStream.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewMessageStream.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sCAAsC;AACtE,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AAKtE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,uBAAuB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3E,yBAAyB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;;IAO7D;;;;;;;;OAQG;gBACS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB;IAuB3D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAe3C,OAAO,CAAC,UAAU;IAgBlB,QAAQ;CAMT"}
+{"version":3,"file":"WebViewMessageStream.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sCAAsC;AACtE,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AAItE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,uBAAuB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3E,yBAAyB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;;IAO7D;;;;;;;;OAQG;gBACS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,iBAAiB;IAexD,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAc3C,OAAO,CAAC,UAAU;IAgBlB,QAAQ;CAMT"}

package/dist/services/webview/WebViewMessageStream.mjs

@@ -12,8 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _WebViewMessageStream_name, _WebViewMessageStream_target, _WebViewMessageStream_webView;
 import { BasePostMessageStream } from "@metamask/post-message-stream";
 import { isValidStreamMessage } from "@metamask/post-message-stream/dist/utils.js";
-import { logError } from "@metamask/snaps-utils";
-import { assert, bytesToBase64, stringToBytes } from "@metamask/utils";
+import { assert, stringToBytes } from "@metamask/utils";
 /**
  * A special postMessage stream used to interface with a WebView.
  */
@@ -25,9 +24,9 @@ export class WebViewMessageStream extends BasePostMessageStream {
      * @param args.name - The name of the stream. Used to differentiate between
      * multiple streams sharing the same window object.
      * @param args.target - The name of the stream to exchange messages with.
-     * @param args.getWebView - A asynchronous getter for the webview.
+     * @param args.webView - A reference to the WebView.
      */
-    constructor({ name, target, getWebView }) {
+    constructor({ name, target, webView }) {
         super();
         _WebViewMessageStream_name.set(this, void 0);
         _WebViewMessageStream_target.set(this, void 0);
@@ -35,19 +34,11 @@ export class WebViewMessageStream extends BasePostMessageStream {
         __classPrivateFieldSet(this, _WebViewMessageStream_name, name, "f");
         __classPrivateFieldSet(this, _WebViewMessageStream_target, target, "f");
         this._onMessage = this._onMessage.bind(this);
-        // This is a bit atypical from other post-message streams.
-        // We have to wait for the WebView to fully load before we can continue using the stream.
-        getWebView()
-            .then((webView) => {
-            __classPrivateFieldSet(this, _WebViewMessageStream_webView, webView, "f");
-            // This method is already bound.
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            webView.registerMessageListener(this._onMessage);
-            this._handshake();
-        })
-            .catch((error) => {
-            logError(error);
-        });
+        __classPrivateFieldSet(this, _WebViewMessageStream_webView, webView, "f");
+        // This method is already bound.
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").registerMessageListener(this._onMessage);
+        this._handshake();
     }
     _postMessage(data) {
         assert(__classPrivateFieldGet(this, _WebViewMessageStream_webView, "f"));
@@ -55,12 +46,10 @@ export class WebViewMessageStream extends BasePostMessageStream {
             target: __classPrivateFieldGet(this, _WebViewMessageStream_target, "f"),
             data,
         });
-        // To prevent XSS, we base64 encode the message before injecting it.
-        // This adds significant performance overhead.
-        // TODO: Should we use mobile native base64 here?
-        const bytes = stringToBytes(json);
-        const base64 = bytesToBase64(bytes);
-        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").injectJavaScript(`window.postMessage('${base64}')`);
+        // To prevent XSS, we encode the message before injecting it.
+        // This adds significant performance overhead for larger messages.
+        const bytes = new Uint8Array(stringToBytes(json));
+        __classPrivateFieldGet(this, _WebViewMessageStream_webView, "f").injectJavaScript(`window.postMessage([${bytes.toString()}])`);
     }
     _onMessage(event) {
         if (typeof event.data !== 'string') {

package/dist/services/webview/WebViewMessageStream.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebViewMessageStream.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AACtE,OAAO,EAAE,oBAAoB,EAAE,oDAAiD;AAChF,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AACjD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,wBAAwB;AAcvE;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,qBAAqB;IAO7D;;;;;;;;OAQG;IACH,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAqB;QACzD,KAAK,EAAE,CAAC;QAhBV,6CAAM;QAEN,+CAAQ;QAER,gDAAuC;QAcrC,uBAAA,IAAI,8BAAS,IAAI,MAAA,CAAC;QAClB,uBAAA,IAAI,gCAAW,MAAM,MAAA,CAAC;QAEtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,0DAA0D;QAC1D,yFAAyF;QACzF,UAAU,EAAE;aACT,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,uBAAA,IAAI,iCAAY,OAAO,MAAA,CAAC;YACxB,gCAAgC;YAChC,6DAA6D;YAC7D,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,MAAM,CAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,uBAAA,IAAI,oCAAQ;YACpB,IAAI;SACL,CAAC,CAAC;QAEH,oEAAoE;QACpE,8CAA8C;QAC9C,iDAAiD;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,uBAAA,IAAI,qCAAS,CAAC,gBAAgB,CAAC,uBAAuB,MAAM,IAAI,CAAC,CAAC;IACpE,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,gEAAgE;QAChE,0CAA0C;QAC1C,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,uBAAA,IAAI,kCAAM,EAAE,CAAC;YACpE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,MAAM,CAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;CACF","sourcesContent":["import type { PostMessageEvent } from '@metamask/post-message-stream';\nimport { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils';\nimport { logError } from '@metamask/snaps-utils';\nimport { assert, bytesToBase64, stringToBytes } from '@metamask/utils';\n\nexport type WebViewInterface = {\n  injectJavaScript(js: string): void;\n  registerMessageListener(listener: (event: PostMessageEvent) => void): void;\n  unregisterMessageListener(listener: (event: PostMessageEvent) => void): void;\n};\n\nexport type WebViewStreamArgs = {\n  name: string;\n  target: string;\n  getWebView: () => Promise<WebViewInterface>;\n};\n\n/**\n * A special postMessage stream used to interface with a WebView.\n */\nexport class WebViewMessageStream extends BasePostMessageStream {\n  #name;\n\n  #target;\n\n  #webView: WebViewInterface | undefined;\n\n  /**\n   * Creates a stream for communicating with other streams inside a WebView.\n   *\n   * @param args - Options bag.\n   * @param args.name - The name of the stream. Used to differentiate between\n   * multiple streams sharing the same window object.\n   * @param args.target - The name of the stream to exchange messages with.\n   * @param args.getWebView - A asynchronous getter for the webview.\n   */\n  constructor({ name, target, getWebView }: WebViewStreamArgs) {\n    super();\n\n    this.#name = name;\n    this.#target = target;\n\n    this._onMessage = this._onMessage.bind(this);\n\n    // This is a bit atypical from other post-message streams.\n    // We have to wait for the WebView to fully load before we can continue using the stream.\n    getWebView()\n      .then((webView) => {\n        this.#webView = webView;\n        // This method is already bound.\n        // eslint-disable-next-line @typescript-eslint/unbound-method\n        webView.registerMessageListener(this._onMessage);\n        this._handshake();\n      })\n      .catch((error) => {\n        logError(error);\n      });\n  }\n\n  protected _postMessage(data: unknown): void {\n    assert(this.#webView);\n    const json = JSON.stringify({\n      target: this.#target,\n      data,\n    });\n\n    // To prevent XSS, we base64 encode the message before injecting it.\n    // This adds significant performance overhead.\n    // TODO: Should we use mobile native base64 here?\n    const bytes = stringToBytes(json);\n    const base64 = bytesToBase64(bytes);\n    this.#webView.injectJavaScript(`window.postMessage('${base64}')`);\n  }\n\n  private _onMessage(event: PostMessageEvent): void {\n    if (typeof event.data !== 'string') {\n      return;\n    }\n\n    const message = JSON.parse(event.data);\n\n    // Notice that we don't check targetWindow or targetOrigin here.\n    // This doesn't seem possible to do in RN.\n    if (!isValidStreamMessage(message) || message.target !== this.#name) {\n      return;\n    }\n\n    this._onData(message.data);\n  }\n\n  _destroy() {\n    assert(this.#webView);\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.unregisterMessageListener(this._onMessage);\n  }\n}\n"]}
+{"version":3,"file":"WebViewMessageStream.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewMessageStream.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,qBAAqB,EAAE,sCAAsC;AACtE,OAAO,EAAE,oBAAoB,EAAE,oDAAiD;AAChF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,wBAAwB;AAcxD;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,qBAAqB;IAO7D;;;;;;;;OAQG;IACH,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAqB;QACtD,KAAK,EAAE,CAAC;QAhBV,6CAAM;QAEN,+CAAQ;QAER,gDAAuC;QAcrC,uBAAA,IAAI,8BAAS,IAAI,MAAA,CAAC;QAClB,uBAAA,IAAI,gCAAW,MAAM,MAAA,CAAC;QAEtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,uBAAA,IAAI,iCAAY,OAAO,MAAA,CAAC;QACxB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,MAAM,CAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,uBAAA,IAAI,oCAAQ;YACpB,IAAI;SACL,CAAC,CAAC;QAEH,6DAA6D;QAC7D,kEAAkE;QAClE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAElD,uBAAA,IAAI,qCAAS,CAAC,gBAAgB,CAAC,uBAAuB,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,gEAAgE;QAChE,0CAA0C;QAC1C,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,uBAAA,IAAI,kCAAM,EAAE,CAAC;YACpE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,MAAM,CAAC,uBAAA,IAAI,qCAAS,CAAC,CAAC;QACtB,gCAAgC;QAChC,6DAA6D;QAC7D,uBAAA,IAAI,qCAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;CACF","sourcesContent":["import type { PostMessageEvent } from '@metamask/post-message-stream';\nimport { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils';\nimport { assert, stringToBytes } from '@metamask/utils';\n\nexport type WebViewInterface = {\n  injectJavaScript(js: string): void;\n  registerMessageListener(listener: (event: PostMessageEvent) => void): void;\n  unregisterMessageListener(listener: (event: PostMessageEvent) => void): void;\n};\n\nexport type WebViewStreamArgs = {\n  name: string;\n  target: string;\n  webView: WebViewInterface;\n};\n\n/**\n * A special postMessage stream used to interface with a WebView.\n */\nexport class WebViewMessageStream extends BasePostMessageStream {\n  #name;\n\n  #target;\n\n  #webView: WebViewInterface | undefined;\n\n  /**\n   * Creates a stream for communicating with other streams inside a WebView.\n   *\n   * @param args - Options bag.\n   * @param args.name - The name of the stream. Used to differentiate between\n   * multiple streams sharing the same window object.\n   * @param args.target - The name of the stream to exchange messages with.\n   * @param args.webView - A reference to the WebView.\n   */\n  constructor({ name, target, webView }: WebViewStreamArgs) {\n    super();\n\n    this.#name = name;\n    this.#target = target;\n\n    this._onMessage = this._onMessage.bind(this);\n\n    this.#webView = webView;\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.registerMessageListener(this._onMessage);\n    this._handshake();\n  }\n\n  protected _postMessage(data: unknown): void {\n    assert(this.#webView);\n    const json = JSON.stringify({\n      target: this.#target,\n      data,\n    });\n\n    // To prevent XSS, we encode the message before injecting it.\n    // This adds significant performance overhead for larger messages.\n    const bytes = new Uint8Array(stringToBytes(json));\n\n    this.#webView.injectJavaScript(`window.postMessage([${bytes.toString()}])`);\n  }\n\n  private _onMessage(event: PostMessageEvent): void {\n    if (typeof event.data !== 'string') {\n      return;\n    }\n\n    const message = JSON.parse(event.data);\n\n    // Notice that we don't check targetWindow or targetOrigin here.\n    // This doesn't seem possible to do in RN.\n    if (!isValidStreamMessage(message) || message.target !== this.#name) {\n      return;\n    }\n\n    this._onData(message.data);\n  }\n\n  _destroy() {\n    assert(this.#webView);\n    // This method is already bound.\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    this.#webView.unregisterMessageListener(this._onMessage);\n  }\n}\n"]}

package/dist/services/webworker/WebWorkerExecutionService.cjs

@@ -32,8 +32,9 @@ class WebWorkerExecutionService extends AbstractExecutionService_1.AbstractExecu
      * @param args.setupSnapProvider - The function to use to set up the snap
      * provider.
      */
-    constructor({ documentUrl, messenger, setupSnapProvider, }) {
+    constructor({ documentUrl, messenger, setupSnapProvider, ...args }) {
         super({
+            ...args,
             messenger,
             setupSnapProvider,
         });

package/dist/services/webworker/WebWorkerExecutionService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebWorkerExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAAwE;AACxE,uDAAqD;AACrD,2CAAyC;AACzC,mCAAgC;AAMhC,8EAAuE;AACvE,0EAAmE;AAMtD,QAAA,cAAc,GAAG,mBAAmB,CAAC;AAElD,MAAa,yBAA0B,SAAQ,mDAAgC;IAK7E;;;;;;;;;;OAUG;IACH,YAAY,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,GACwB;QACzC,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAvBL,yDAAkB;QAElB,2DAAuC;QAuBrC,uBAAA,IAAI,0CAAgB,WAAW,MAAA,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAA6B;QACxD,0EAA0E;QAC1E,8CAA8C;QAC9C,IAAA,cAAM,EAAC,uBAAA,IAAI,gDAAe,EAAE,iCAAiC,CAAC,CAAC;QAC/D,uBAAA,IAAI,gDAAe,CAAC,KAAK,CAAC;YACxB,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,cAAc;gBACtB,EAAE,EAAE,IAAA,eAAM,GAAE;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,0CAA0C;QAC1C,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,+DAA+D;QAC/D,IAAA,cAAM,EAAC,uBAAA,IAAI,gDAAe,EAAE,iCAAiC,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,IAAI,+CAAsB,CAAC;YACxC,MAAM,EAAE,uBAAA,IAAI,gDAAe;YAC3B,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,cAAc;QAC1B,wCAAwC;QACxC,IAAI,QAAQ,CAAC,cAAc,CAAC,sBAAc,CAAC,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAY,EAAC;YAChC,GAAG,EAAE,uBAAA,IAAI,8CAAa,CAAC,IAAI;YAC3B,EAAE,EAAE,sBAAc;YAClB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,uBAAA,IAAI,4CAAkB,IAAI,6CAAuB,CAAC;YAChD,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,GAAG;SAClB,CAAC,MAAA,CAAC;IACL,CAAC;CACF;AA9FD,8DA8FC","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { WindowPostMessageStream } from '@metamask/post-message-stream';\nimport { createWindow } from '@metamask/snaps-utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport { ProxyPostMessageStream } from '../ProxyPostMessageStream';\n\ntype WebWorkerExecutionEnvironmentServiceArgs = {\n  documentUrl: URL;\n} & ExecutionServiceArgs;\n\nexport const WORKER_POOL_ID = 'snaps-worker-pool';\n\nexport class WebWorkerExecutionService extends AbstractExecutionService<string> {\n  #documentUrl: URL;\n\n  #runtimeStream?: BasePostMessageStream;\n\n  /**\n   * Create a new webworker execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.documentUrl - The URL of the worker pool document to use as the\n   * execution environment.\n   * @param args.messenger - The messenger to use for communication with the\n   * `SnapController`.\n   * @param args.setupSnapProvider - The function to use to set up the snap\n   * provider.\n   */\n  constructor({\n    documentUrl,\n    messenger,\n    setupSnapProvider,\n  }: WebWorkerExecutionEnvironmentServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n    });\n\n    this.#documentUrl = documentUrl;\n  }\n\n  /**\n   * Send a termination command to the worker pool document.\n   *\n   * @param job - The job to terminate.\n   */\n  protected async terminateJob(job: TerminateJobArgs<string>) {\n    // The `AbstractExecutionService` will have already closed the job stream,\n    // so we write to the runtime stream directly.\n    assert(this.#runtimeStream, 'Runtime stream not initialized.');\n    this.#runtimeStream.write({\n      jobId: job.id,\n      data: {\n        jsonrpc: '2.0',\n        method: 'terminateJob',\n        id: nanoid(),\n      },\n    });\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    // Lazily create the worker pool document.\n    await this.createDocument();\n\n    // `createDocument` should have initialized the runtime stream.\n    assert(this.#runtimeStream, 'Runtime stream not initialized.');\n\n    const stream = new ProxyPostMessageStream({\n      stream: this.#runtimeStream,\n      jobId,\n    });\n\n    return { worker: jobId, stream };\n  }\n\n  /**\n   * Creates the worker pool document to be used as the execution environment.\n   *\n   * If the document already exists, this does nothing.\n   */\n  private async createDocument() {\n    // We only want to create a single pool.\n    if (document.getElementById(WORKER_POOL_ID)) {\n      return;\n    }\n\n    const window = await createWindow({\n      uri: this.#documentUrl.href,\n      id: WORKER_POOL_ID,\n      sandbox: false,\n    });\n\n    this.#runtimeStream = new WindowPostMessageStream({\n      name: 'parent',\n      target: 'child',\n      targetWindow: window,\n      targetOrigin: '*',\n    });\n  }\n}\n"]}
+{"version":3,"file":"WebWorkerExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAAwE;AACxE,uDAAqD;AACrD,2CAAyC;AACzC,mCAAgC;AAMhC,8EAAuE;AACvE,0EAAmE;AAMtD,QAAA,cAAc,GAAG,mBAAmB,CAAC;AAElD,MAAa,yBAA0B,SAAQ,mDAAgC;IAK7E;;;;;;;;;;OAUG;IACH,YAAY,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,GAAG,IAAI,EACkC;QACzC,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAzBL,yDAAkB;QAElB,2DAAuC;QAyBrC,uBAAA,IAAI,0CAAgB,WAAW,MAAA,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAA6B;QACxD,0EAA0E;QAC1E,8CAA8C;QAC9C,IAAA,cAAM,EAAC,uBAAA,IAAI,gDAAe,EAAE,iCAAiC,CAAC,CAAC;QAC/D,uBAAA,IAAI,gDAAe,CAAC,KAAK,CAAC;YACxB,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,cAAc;gBACtB,EAAE,EAAE,IAAA,eAAM,GAAE;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,0CAA0C;QAC1C,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,+DAA+D;QAC/D,IAAA,cAAM,EAAC,uBAAA,IAAI,gDAAe,EAAE,iCAAiC,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,IAAI,+CAAsB,CAAC;YACxC,MAAM,EAAE,uBAAA,IAAI,gDAAe;YAC3B,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,cAAc;QAC1B,wCAAwC;QACxC,IAAI,QAAQ,CAAC,cAAc,CAAC,sBAAc,CAAC,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAY,EAAC;YAChC,GAAG,EAAE,uBAAA,IAAI,8CAAa,CAAC,IAAI;YAC3B,EAAE,EAAE,sBAAc;YAClB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,uBAAA,IAAI,4CAAkB,IAAI,6CAAuB,CAAC;YAChD,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,GAAG;SAClB,CAAC,MAAA,CAAC;IACL,CAAC;CACF;AAhGD,8DAgGC","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { WindowPostMessageStream } from '@metamask/post-message-stream';\nimport { createWindow } from '@metamask/snaps-utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport { ProxyPostMessageStream } from '../ProxyPostMessageStream';\n\ntype WebWorkerExecutionEnvironmentServiceArgs = {\n  documentUrl: URL;\n} & ExecutionServiceArgs;\n\nexport const WORKER_POOL_ID = 'snaps-worker-pool';\n\nexport class WebWorkerExecutionService extends AbstractExecutionService<string> {\n  #documentUrl: URL;\n\n  #runtimeStream?: BasePostMessageStream;\n\n  /**\n   * Create a new webworker execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.documentUrl - The URL of the worker pool document to use as the\n   * execution environment.\n   * @param args.messenger - The messenger to use for communication with the\n   * `SnapController`.\n   * @param args.setupSnapProvider - The function to use to set up the snap\n   * provider.\n   */\n  constructor({\n    documentUrl,\n    messenger,\n    setupSnapProvider,\n    ...args\n  }: WebWorkerExecutionEnvironmentServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n\n    this.#documentUrl = documentUrl;\n  }\n\n  /**\n   * Send a termination command to the worker pool document.\n   *\n   * @param job - The job to terminate.\n   */\n  protected async terminateJob(job: TerminateJobArgs<string>) {\n    // The `AbstractExecutionService` will have already closed the job stream,\n    // so we write to the runtime stream directly.\n    assert(this.#runtimeStream, 'Runtime stream not initialized.');\n    this.#runtimeStream.write({\n      jobId: job.id,\n      data: {\n        jsonrpc: '2.0',\n        method: 'terminateJob',\n        id: nanoid(),\n      },\n    });\n  }\n\n  /**\n   * Create a new stream for the specified job. This wraps the runtime stream\n   * in a stream specific to the job.\n   *\n   * @param jobId - The job ID.\n   * @returns An object with the worker ID and stream.\n   */\n  protected async initEnvStream(jobId: string) {\n    // Lazily create the worker pool document.\n    await this.createDocument();\n\n    // `createDocument` should have initialized the runtime stream.\n    assert(this.#runtimeStream, 'Runtime stream not initialized.');\n\n    const stream = new ProxyPostMessageStream({\n      stream: this.#runtimeStream,\n      jobId,\n    });\n\n    return { worker: jobId, stream };\n  }\n\n  /**\n   * Creates the worker pool document to be used as the execution environment.\n   *\n   * If the document already exists, this does nothing.\n   */\n  private async createDocument() {\n    // We only want to create a single pool.\n    if (document.getElementById(WORKER_POOL_ID)) {\n      return;\n    }\n\n    const window = await createWindow({\n      uri: this.#documentUrl.href,\n      id: WORKER_POOL_ID,\n      sandbox: false,\n    });\n\n    this.#runtimeStream = new WindowPostMessageStream({\n      name: 'parent',\n      target: 'child',\n      targetWindow: window,\n      targetOrigin: '*',\n    });\n  }\n}\n"]}

package/dist/services/webworker/WebWorkerExecutionService.d.cts

@@ -18,7 +18,7 @@ export declare class WebWorkerExecutionService extends AbstractExecutionService<
      * @param args.setupSnapProvider - The function to use to set up the snap
      * provider.
      */
-    constructor({ documentUrl, messenger, setupSnapProvider, }: WebWorkerExecutionEnvironmentServiceArgs);
+    constructor({ documentUrl, messenger, setupSnapProvider, ...args }: WebWorkerExecutionEnvironmentServiceArgs);
     /**
      * Send a termination command to the worker pool document.
      *

package/dist/services/webworker/WebWorkerExecutionService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"WebWorkerExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AACrC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAEnE,KAAK,wCAAwC,GAAG;IAC9C,WAAW,EAAE,GAAG,CAAC;CAClB,GAAG,oBAAoB,CAAC;AAEzB,eAAO,MAAM,cAAc,sBAAsB,CAAC;AAElD,qBAAa,yBAA0B,SAAQ,wBAAwB,CAAC,MAAM,CAAC;;IAK7E;;;;;;;;;;OAUG;gBACS,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,GAClB,EAAE,wCAAwC;IAS3C;;;;OAIG;cACa,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAc1D;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAe3C;;;;OAIG;YACW,cAAc;CAmB7B"}
+{"version":3,"file":"WebWorkerExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AACrC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAEnE,KAAK,wCAAwC,GAAG;IAC9C,WAAW,EAAE,GAAG,CAAC;CAClB,GAAG,oBAAoB,CAAC;AAEzB,eAAO,MAAM,cAAc,sBAAsB,CAAC;AAElD,qBAAa,yBAA0B,SAAQ,wBAAwB,CAAC,MAAM,CAAC;;IAK7E;;;;;;;;;;OAUG;gBACS,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,GAAG,IAAI,EACR,EAAE,wCAAwC;IAU3C;;;;OAIG;cACa,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAc1D;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAe3C;;;;OAIG;YACW,cAAc;CAmB7B"}

package/dist/services/webworker/WebWorkerExecutionService.d.mts

@@ -18,7 +18,7 @@ export declare class WebWorkerExecutionService extends AbstractExecutionService<
      * @param args.setupSnapProvider - The function to use to set up the snap
      * provider.
      */
-    constructor({ documentUrl, messenger, setupSnapProvider, }: WebWorkerExecutionEnvironmentServiceArgs);
+    constructor({ documentUrl, messenger, setupSnapProvider, ...args }: WebWorkerExecutionEnvironmentServiceArgs);
     /**
      * Send a termination command to the worker pool document.
      *

package/dist/services/webworker/WebWorkerExecutionService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"WebWorkerExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AACrC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAEnE,KAAK,wCAAwC,GAAG;IAC9C,WAAW,EAAE,GAAG,CAAC;CAClB,GAAG,oBAAoB,CAAC;AAEzB,eAAO,MAAM,cAAc,sBAAsB,CAAC;AAElD,qBAAa,yBAA0B,SAAQ,wBAAwB,CAAC,MAAM,CAAC;;IAK7E;;;;;;;;;;OAUG;gBACS,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,GAClB,EAAE,wCAAwC;IAS3C;;;;OAIG;cACa,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAc1D;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAe3C;;;;OAIG;YACW,cAAc;CAmB7B"}
+{"version":3,"file":"WebWorkerExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AACrC,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AAEnE,KAAK,wCAAwC,GAAG;IAC9C,WAAW,EAAE,GAAG,CAAC;CAClB,GAAG,oBAAoB,CAAC;AAEzB,eAAO,MAAM,cAAc,sBAAsB,CAAC;AAElD,qBAAa,yBAA0B,SAAQ,wBAAwB,CAAC,MAAM,CAAC;;IAK7E;;;;;;;;;;OAUG;gBACS,EACV,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,GAAG,IAAI,EACR,EAAE,wCAAwC;IAU3C;;;;OAIG;cACa,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAc1D;;;;;;OAMG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM;;;;IAe3C;;;;OAIG;YACW,cAAc;CAmB7B"}

package/dist/services/webworker/WebWorkerExecutionService.mjs

@@ -29,8 +29,9 @@ export class WebWorkerExecutionService extends AbstractExecutionService {
      * @param args.setupSnapProvider - The function to use to set up the snap
      * provider.
      */
-    constructor({ documentUrl, messenger, setupSnapProvider, }) {
+    constructor({ documentUrl, messenger, setupSnapProvider, ...args }) {
         super({
+            ...args,
             messenger,
             setupSnapProvider,
         });