@metamask/snaps-execution-environments 6.8.0 → 6.9.1

package/dist/webworker/pool/WebWorkerPool.mjs

@@ -1,3 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _WebWorkerPool_instances, _WebWorkerPool_poolSize, _WebWorkerPool_stream, _WebWorkerPool_url, _WebWorkerPool_workerSourceURL, _WebWorkerPool_onData, _WebWorkerPool_initializeJob, _WebWorkerPool_terminateJob, _WebWorkerPool_getWorker, _WebWorkerPool_updatePool, _WebWorkerPool_createWorker, _WebWorkerPool_getWorkerURL;
 import $metamaskpostmessagestream from "@metamask/post-message-stream";
 const { WebWorkerParentPostMessageStream, WindowPostMessageStream } = $metamaskpostmessagestream;
 import { logError } from "@metamask/snaps-utils";
@@ -12,12 +24,6 @@ import { nanoid } from "nanoid/non-secure";
  * executing the snap.
  */
 export class WebWorkerPool {
-    #poolSize;
-    #stream;
-    #url;
-    pool = [];
-    jobs = new Map();
-    #workerSourceURL;
     /* istanbul ignore next - Constructor arguments. */
     static initialize(stream = new WindowPostMessageStream({
         name: 'child',
@@ -28,141 +34,132 @@ export class WebWorkerPool {
         return new WebWorkerPool(stream, url, poolSize);
     }
     constructor(stream, url, poolSize = 3) {
-        this.#stream = stream;
-        this.#url = url;
-        this.#poolSize = poolSize;
-        this.#stream.on('data', this.#onData.bind(this));
+        _WebWorkerPool_instances.add(this);
+        _WebWorkerPool_poolSize.set(this, void 0);
+        _WebWorkerPool_stream.set(this, void 0);
+        _WebWorkerPool_url.set(this, void 0);
+        this.pool = [];
+        this.jobs = new Map();
+        _WebWorkerPool_workerSourceURL.set(this, void 0);
+        __classPrivateFieldSet(this, _WebWorkerPool_stream, stream, "f");
+        __classPrivateFieldSet(this, _WebWorkerPool_url, url, "f");
+        __classPrivateFieldSet(this, _WebWorkerPool_poolSize, poolSize, "f");
+        __classPrivateFieldGet(this, _WebWorkerPool_stream, "f").on('data', __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_onData).bind(this));
     }
-    /**
-     * Handle an incoming message from the `WebWorkerExecutionService`. This
-     * assumes that the message contains a `jobId` property, and a JSON-RPC
-     * request in the `data` property.
-     *
-     * @param data - The message data.
-     * @param data.data - The JSON-RPC request.
-     * @param data.jobId - The job ID.
-     */
-    #onData(data) {
-        const { jobId, data: request } = data;
-        const job = this.jobs.get(jobId);
-        if (!job) {
-            // This ensures that a job is initialized before it is used. To avoid
-            // code duplication, we call the `#onData` method again, which will
-            // run the rest of the logic after initialization.
-            this.#initializeJob(jobId)
-                .then(() => {
-                this.#onData(data);
-            })
-                .catch((error) => {
-                logError('[Worker] Error initializing job:', error.toString());
-                this.#stream.write({
-                    jobId,
+}
+_WebWorkerPool_poolSize = new WeakMap(), _WebWorkerPool_stream = new WeakMap(), _WebWorkerPool_url = new WeakMap(), _WebWorkerPool_workerSourceURL = new WeakMap(), _WebWorkerPool_instances = new WeakSet(), _WebWorkerPool_onData = function _WebWorkerPool_onData(data) {
+    const { jobId, data: request } = data;
+    const job = this.jobs.get(jobId);
+    if (!job) {
+        // This ensures that a job is initialized before it is used. To avoid
+        // code duplication, we call the `#onData` method again, which will
+        // run the rest of the logic after initialization.
+        __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_initializeJob).call(this, jobId)
+            .then(() => {
+            __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_onData).call(this, data);
+        })
+            .catch((error) => {
+            logError('[Worker] Error initializing job:', error.toString());
+            __classPrivateFieldGet(this, _WebWorkerPool_stream, "f").write({
+                jobId,
+                data: {
+                    name: 'command',
                     data: {
-                        name: 'command',
-                        data: {
-                            jsonrpc: '2.0',
-                            id: request.id ?? null,
-                            error: {
-                                code: -32000,
-                                message: 'Internal error',
-                            },
+                        jsonrpc: '2.0',
+                        id: request.id ?? null,
+                        error: {
+                            code: -32000,
+                            message: 'Internal error',
                         },
                     },
-                });
+                },
             });
-            return;
-        }
-        // This is a method specific to the `WebWorkerPool`, as the service itself
-        // does not have access to the workers directly.
-        if (request.method === 'terminateJob') {
-            this.#terminateJob(jobId);
-            return;
-        }
-        job.stream.write(request);
-    }
-    /**
-     * Create a new worker and set up a stream to communicate with it.
-     *
-     * @param jobId - The job ID.
-     * @returns The job.
-     */
-    async #initializeJob(jobId) {
-        const worker = await this.#getWorker();
-        const jobStream = new WebWorkerParentPostMessageStream({
-            worker,
-        });
-        // Write messages from the worker to the parent, wrapped with the job ID.
-        jobStream.on('data', (data) => {
-            this.#stream.write({ data, jobId });
         });
-        const job = { id: jobId, worker, stream: jobStream };
-        this.jobs.set(jobId, job);
-        return job;
+        return;
     }
-    /**
-     * Terminate the job with the given ID. This will close the worker and delete
-     * the job from the internal job map.
-     *
-     * @param jobId - The job ID.
-     */
-    #terminateJob(jobId) {
-        const job = this.jobs.get(jobId);
-        assert(job, `Job "${jobId}" not found.`);
-        job.stream.destroy();
-        job.worker.terminate();
-        this.jobs.delete(jobId);
+    // This is a method specific to the `WebWorkerPool`, as the service itself
+    // does not have access to the workers directly.
+    if (request.method === 'terminateJob') {
+        __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_terminateJob).call(this, jobId);
+        return;
     }
-    /**
-     * Get a worker from the pool. A new worker will be created automatically.
-     *
-     * @returns The worker.
-     */
-    async #getWorker() {
-        // Lazily create the pool of workers.
-        if (this.pool.length === 0) {
-            await this.#updatePool();
-        }
-        const worker = this.pool.shift();
-        assert(worker, 'Worker not found.');
-        await this.#updatePool();
-        return worker;
-    }
-    /**
-     * Update the pool of workers. This will create new workers if the pool is
-     * below the minimum size.
-     */
-    async #updatePool() {
-        while (this.pool.length < this.#poolSize) {
-            const worker = await this.#createWorker();
-            this.pool.push(worker);
-        }
+    job.stream.write(request);
+}, _WebWorkerPool_initializeJob = 
+/**
+ * Create a new worker and set up a stream to communicate with it.
+ *
+ * @param jobId - The job ID.
+ * @returns The job.
+ */
+async function _WebWorkerPool_initializeJob(jobId) {
+    const worker = await __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_getWorker).call(this);
+    const jobStream = new WebWorkerParentPostMessageStream({
+        worker,
+    });
+    // Write messages from the worker to the parent, wrapped with the job ID.
+    jobStream.on('data', (data) => {
+        __classPrivateFieldGet(this, _WebWorkerPool_stream, "f").write({ data, jobId });
+    });
+    const job = { id: jobId, worker, stream: jobStream };
+    this.jobs.set(jobId, job);
+    return job;
+}, _WebWorkerPool_terminateJob = function _WebWorkerPool_terminateJob(jobId) {
+    const job = this.jobs.get(jobId);
+    assert(job, `Job "${jobId}" not found.`);
+    job.stream.destroy();
+    job.worker.terminate();
+    this.jobs.delete(jobId);
+}, _WebWorkerPool_getWorker = 
+/**
+ * Get a worker from the pool. A new worker will be created automatically.
+ *
+ * @returns The worker.
+ */
+async function _WebWorkerPool_getWorker() {
+    // Lazily create the pool of workers.
+    if (this.pool.length === 0) {
+        await __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_updatePool).call(this);
     }
-    /**
-     * Create a new worker. This will fetch the worker source if it has not
-     * already been fetched.
-     *
-     * @returns The worker.
-     */
-    async #createWorker() {
-        return new Worker(await this.#getWorkerURL(), {
-            name: `worker-${nanoid()}`,
-        });
+    const worker = this.pool.shift();
+    assert(worker, 'Worker not found.');
+    await __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_updatePool).call(this);
+    return worker;
+}, _WebWorkerPool_updatePool = 
+/**
+ * Update the pool of workers. This will create new workers if the pool is
+ * below the minimum size.
+ */
+async function _WebWorkerPool_updatePool() {
+    while (this.pool.length < __classPrivateFieldGet(this, _WebWorkerPool_poolSize, "f")) {
+        const worker = await __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_createWorker).call(this);
+        this.pool.push(worker);
     }
-    /**
-     * Get the URL of the worker source. This will fetch the worker source if it
-     * has not already been fetched.
-     *
-     * @returns The worker source URL, as a `blob:` URL.
-     */
-    async #getWorkerURL() {
-        if (this.#workerSourceURL) {
-            return this.#workerSourceURL;
-        }
-        const blob = await fetch(this.#url)
-            .then(async (response) => response.blob())
-            .then(URL.createObjectURL.bind(URL));
-        this.#workerSourceURL = blob;
-        return blob;
+}, _WebWorkerPool_createWorker = 
+/**
+ * Create a new worker. This will fetch the worker source if it has not
+ * already been fetched.
+ *
+ * @returns The worker.
+ */
+async function _WebWorkerPool_createWorker() {
+    return new Worker(await __classPrivateFieldGet(this, _WebWorkerPool_instances, "m", _WebWorkerPool_getWorkerURL).call(this), {
+        name: `worker-${nanoid()}`,
+    });
+}, _WebWorkerPool_getWorkerURL = 
+/**
+ * Get the URL of the worker source. This will fetch the worker source if it
+ * has not already been fetched.
+ *
+ * @returns The worker source URL, as a `blob:` URL.
+ */
+async function _WebWorkerPool_getWorkerURL() {
+    if (__classPrivateFieldGet(this, _WebWorkerPool_workerSourceURL, "f")) {
+        return __classPrivateFieldGet(this, _WebWorkerPool_workerSourceURL, "f");
     }
-}
+    const blob = await fetch(__classPrivateFieldGet(this, _WebWorkerPool_url, "f"))
+        .then(async (response) => response.blob())
+        .then(URL.createObjectURL.bind(URL));
+    __classPrivateFieldSet(this, _WebWorkerPool_workerSourceURL, blob, "f");
+    return blob;
+};
 //# sourceMappingURL=WebWorkerPool.mjs.map

package/dist/webworker/pool/WebWorkerPool.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebWorkerPool.mjs","sourceRoot":"","sources":["../../../src/webworker/pool/WebWorkerPool.ts"],"names":[],"mappings":";;AAKA,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AAEjD,OAAO,EAAE,MAAM,EAAE,wBAAwB;AACzC,OAAO,EAAE,MAAM,EAAE,0BAA0B;AAQ3C;;;;;;;GAOG;AACH,MAAM,OAAO,aAAa;IACf,SAAS,CAAC;IAEV,OAAO,CAAwB;IAE/B,IAAI,CAAS;IAEb,IAAI,GAAa,EAAE,CAAC;IAEpB,IAAI,GAA6B,IAAI,GAAG,EAAE,CAAC;IAEpD,gBAAgB,CAAU;IAE1B,mDAAmD;IACnD,MAAM,CAAC,UAAU,CACf,SAAgC,IAAI,uBAAuB,CAAC;QAC1D,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,QAAQ;QAChB,YAAY,EAAE,IAAI,CAAC,MAAM;QACzB,YAAY,EAAE,GAAG;KAClB,CAAC,EACF,GAAG,GAAG,uBAAuB,EAC7B,QAAiB;QAEjB,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,MAA6B,EAAE,GAAW,EAAE,QAAQ,GAAG,CAAC;QAClE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;OAQG;IACH,OAAO,CAAC,IAA6C;QACnD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEtC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,qEAAqE;YACrE,mEAAmE;YACnE,kDAAkD;YAClD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;iBACvB,IAAI,CAAC,GAAG,EAAE;gBACT,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,QAAQ,CAAC,kCAAkC,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE/D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;oBACjB,KAAK;oBACL,IAAI,EAAE;wBACJ,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE;4BACJ,OAAO,EAAE,KAAK;4BACd,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,IAAI;4BACtB,KAAK,EAAE;gCACL,IAAI,EAAE,CAAC,KAAK;gCACZ,OAAO,EAAE,gBAAgB;6BAC1B;yBACF;qBACF;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEL,OAAO;QACT,CAAC;QAED,0EAA0E;QAC1E,gDAAgD;QAChD,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACtC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,gCAAgC,CAAC;YACrD,MAAM;SACP,CAAC,CAAC;QAEH,yEAAyE;QACzE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1B,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,KAAa;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,EAAE,QAAQ,KAAK,cAAc,CAAC,CAAC;QAEzC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACrB,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU;QACd,qCAAqC;QACrC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QAEpC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa;QACjB,OAAO,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE;YAC5C,IAAI,EAAE,UAAU,MAAM,EAAE,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAC/B,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;aAChC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;aACzC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;CACF","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport {\n  WebWorkerParentPostMessageStream,\n  WindowPostMessageStream,\n} from '@metamask/post-message-stream';\nimport { logError } from '@metamask/snaps-utils';\nimport type { JsonRpcRequest } from '@metamask/utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid/non-secure';\n\ntype ExecutorJob = {\n  id: string;\n  worker: Worker;\n  stream: WebWorkerParentPostMessageStream;\n};\n\n/**\n * A snap executor using the WebWorker API.\n *\n * This is not a traditional snap executor, as it does not execute snaps itself.\n * Instead, it creates a pool of webworkers for each snap execution, and sends\n * the snap execution request to the webworker. The webworker is responsible for\n * executing the snap.\n */\nexport class WebWorkerPool {\n  readonly #poolSize;\n\n  readonly #stream: BasePostMessageStream;\n\n  readonly #url: string;\n\n  readonly pool: Worker[] = [];\n\n  readonly jobs: Map<string, ExecutorJob> = new Map();\n\n  #workerSourceURL?: string;\n\n  /* istanbul ignore next - Constructor arguments. */\n  static initialize(\n    stream: BasePostMessageStream = new WindowPostMessageStream({\n      name: 'child',\n      target: 'parent',\n      targetWindow: self.parent,\n      targetOrigin: '*',\n    }),\n    url = '../executor/bundle.js',\n    poolSize?: number,\n  ) {\n    return new WebWorkerPool(stream, url, poolSize);\n  }\n\n  constructor(stream: BasePostMessageStream, url: string, poolSize = 3) {\n    this.#stream = stream;\n    this.#url = url;\n    this.#poolSize = poolSize;\n\n    this.#stream.on('data', this.#onData.bind(this));\n  }\n\n  /**\n   * Handle an incoming message from the `WebWorkerExecutionService`. This\n   * assumes that the message contains a `jobId` property, and a JSON-RPC\n   * request in the `data` property.\n   *\n   * @param data - The message data.\n   * @param data.data - The JSON-RPC request.\n   * @param data.jobId - The job ID.\n   */\n  #onData(data: { data: JsonRpcRequest; jobId: string }) {\n    const { jobId, data: request } = data;\n\n    const job = this.jobs.get(jobId);\n    if (!job) {\n      // This ensures that a job is initialized before it is used. To avoid\n      // code duplication, we call the `#onData` method again, which will\n      // run the rest of the logic after initialization.\n      this.#initializeJob(jobId)\n        .then(() => {\n          this.#onData(data);\n        })\n        .catch((error) => {\n          logError('[Worker] Error initializing job:', error.toString());\n\n          this.#stream.write({\n            jobId,\n            data: {\n              name: 'command',\n              data: {\n                jsonrpc: '2.0',\n                id: request.id ?? null,\n                error: {\n                  code: -32000,\n                  message: 'Internal error',\n                },\n              },\n            },\n          });\n        });\n\n      return;\n    }\n\n    // This is a method specific to the `WebWorkerPool`, as the service itself\n    // does not have access to the workers directly.\n    if (request.method === 'terminateJob') {\n      this.#terminateJob(jobId);\n      return;\n    }\n\n    job.stream.write(request);\n  }\n\n  /**\n   * Create a new worker and set up a stream to communicate with it.\n   *\n   * @param jobId - The job ID.\n   * @returns The job.\n   */\n  async #initializeJob(jobId: string): Promise<ExecutorJob> {\n    const worker = await this.#getWorker();\n    const jobStream = new WebWorkerParentPostMessageStream({\n      worker,\n    });\n\n    // Write messages from the worker to the parent, wrapped with the job ID.\n    jobStream.on('data', (data) => {\n      this.#stream.write({ data, jobId });\n    });\n\n    const job = { id: jobId, worker, stream: jobStream };\n    this.jobs.set(jobId, job);\n    return job;\n  }\n\n  /**\n   * Terminate the job with the given ID. This will close the worker and delete\n   * the job from the internal job map.\n   *\n   * @param jobId - The job ID.\n   */\n  #terminateJob(jobId: string) {\n    const job = this.jobs.get(jobId);\n    assert(job, `Job \"${jobId}\" not found.`);\n\n    job.stream.destroy();\n    job.worker.terminate();\n\n    this.jobs.delete(jobId);\n  }\n\n  /**\n   * Get a worker from the pool. A new worker will be created automatically.\n   *\n   * @returns The worker.\n   */\n  async #getWorker() {\n    // Lazily create the pool of workers.\n    if (this.pool.length === 0) {\n      await this.#updatePool();\n    }\n\n    const worker = this.pool.shift();\n    assert(worker, 'Worker not found.');\n\n    await this.#updatePool();\n\n    return worker;\n  }\n\n  /**\n   * Update the pool of workers. This will create new workers if the pool is\n   * below the minimum size.\n   */\n  async #updatePool() {\n    while (this.pool.length < this.#poolSize) {\n      const worker = await this.#createWorker();\n      this.pool.push(worker);\n    }\n  }\n\n  /**\n   * Create a new worker. This will fetch the worker source if it has not\n   * already been fetched.\n   *\n   * @returns The worker.\n   */\n  async #createWorker() {\n    return new Worker(await this.#getWorkerURL(), {\n      name: `worker-${nanoid()}`,\n    });\n  }\n\n  /**\n   * Get the URL of the worker source. This will fetch the worker source if it\n   * has not already been fetched.\n   *\n   * @returns The worker source URL, as a `blob:` URL.\n   */\n  async #getWorkerURL() {\n    if (this.#workerSourceURL) {\n      return this.#workerSourceURL;\n    }\n\n    const blob = await fetch(this.#url)\n      .then(async (response) => response.blob())\n      .then(URL.createObjectURL.bind(URL));\n\n    this.#workerSourceURL = blob;\n    return blob;\n  }\n}\n"]}
+{"version":3,"file":"WebWorkerPool.mjs","sourceRoot":"","sources":["../../../src/webworker/pool/WebWorkerPool.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport {\n  WebWorkerParentPostMessageStream,\n  WindowPostMessageStream,\n} from '@metamask/post-message-stream';\nimport { logError } from '@metamask/snaps-utils';\nimport type { JsonRpcRequest } from '@metamask/utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid/non-secure';\n\ntype ExecutorJob = {\n  id: string;\n  worker: Worker;\n  stream: WebWorkerParentPostMessageStream;\n};\n\n/**\n * A snap executor using the WebWorker API.\n *\n * This is not a traditional snap executor, as it does not execute snaps itself.\n * Instead, it creates a pool of webworkers for each snap execution, and sends\n * the snap execution request to the webworker. The webworker is responsible for\n * executing the snap.\n */\nexport class WebWorkerPool {\n  readonly #poolSize;\n\n  readonly #stream: BasePostMessageStream;\n\n  readonly #url: string;\n\n  readonly pool: Worker[] = [];\n\n  readonly jobs: Map<string, ExecutorJob> = new Map();\n\n  #workerSourceURL?: string;\n\n  /* istanbul ignore next - Constructor arguments. */\n  static initialize(\n    stream: BasePostMessageStream = new WindowPostMessageStream({\n      name: 'child',\n      target: 'parent',\n      targetWindow: self.parent,\n      targetOrigin: '*',\n    }),\n    url = '../executor/bundle.js',\n    poolSize?: number,\n  ) {\n    return new WebWorkerPool(stream, url, poolSize);\n  }\n\n  constructor(stream: BasePostMessageStream, url: string, poolSize = 3) {\n    this.#stream = stream;\n    this.#url = url;\n    this.#poolSize = poolSize;\n\n    this.#stream.on('data', this.#onData.bind(this));\n  }\n\n  /**\n   * Handle an incoming message from the `WebWorkerExecutionService`. This\n   * assumes that the message contains a `jobId` property, and a JSON-RPC\n   * request in the `data` property.\n   *\n   * @param data - The message data.\n   * @param data.data - The JSON-RPC request.\n   * @param data.jobId - The job ID.\n   */\n  #onData(data: { data: JsonRpcRequest; jobId: string }) {\n    const { jobId, data: request } = data;\n\n    const job = this.jobs.get(jobId);\n    if (!job) {\n      // This ensures that a job is initialized before it is used. To avoid\n      // code duplication, we call the `#onData` method again, which will\n      // run the rest of the logic after initialization.\n      this.#initializeJob(jobId)\n        .then(() => {\n          this.#onData(data);\n        })\n        .catch((error) => {\n          logError('[Worker] Error initializing job:', error.toString());\n\n          this.#stream.write({\n            jobId,\n            data: {\n              name: 'command',\n              data: {\n                jsonrpc: '2.0',\n                id: request.id ?? null,\n                error: {\n                  code: -32000,\n                  message: 'Internal error',\n                },\n              },\n            },\n          });\n        });\n\n      return;\n    }\n\n    // This is a method specific to the `WebWorkerPool`, as the service itself\n    // does not have access to the workers directly.\n    if (request.method === 'terminateJob') {\n      this.#terminateJob(jobId);\n      return;\n    }\n\n    job.stream.write(request);\n  }\n\n  /**\n   * Create a new worker and set up a stream to communicate with it.\n   *\n   * @param jobId - The job ID.\n   * @returns The job.\n   */\n  async #initializeJob(jobId: string): Promise<ExecutorJob> {\n    const worker = await this.#getWorker();\n    const jobStream = new WebWorkerParentPostMessageStream({\n      worker,\n    });\n\n    // Write messages from the worker to the parent, wrapped with the job ID.\n    jobStream.on('data', (data) => {\n      this.#stream.write({ data, jobId });\n    });\n\n    const job = { id: jobId, worker, stream: jobStream };\n    this.jobs.set(jobId, job);\n    return job;\n  }\n\n  /**\n   * Terminate the job with the given ID. This will close the worker and delete\n   * the job from the internal job map.\n   *\n   * @param jobId - The job ID.\n   */\n  #terminateJob(jobId: string) {\n    const job = this.jobs.get(jobId);\n    assert(job, `Job \"${jobId}\" not found.`);\n\n    job.stream.destroy();\n    job.worker.terminate();\n\n    this.jobs.delete(jobId);\n  }\n\n  /**\n   * Get a worker from the pool. A new worker will be created automatically.\n   *\n   * @returns The worker.\n   */\n  async #getWorker() {\n    // Lazily create the pool of workers.\n    if (this.pool.length === 0) {\n      await this.#updatePool();\n    }\n\n    const worker = this.pool.shift();\n    assert(worker, 'Worker not found.');\n\n    await this.#updatePool();\n\n    return worker;\n  }\n\n  /**\n   * Update the pool of workers. This will create new workers if the pool is\n   * below the minimum size.\n   */\n  async #updatePool() {\n    while (this.pool.length < this.#poolSize) {\n      const worker = await this.#createWorker();\n      this.pool.push(worker);\n    }\n  }\n\n  /**\n   * Create a new worker. This will fetch the worker source if it has not\n   * already been fetched.\n   *\n   * @returns The worker.\n   */\n  async #createWorker() {\n    return new Worker(await this.#getWorkerURL(), {\n      name: `worker-${nanoid()}`,\n    });\n  }\n\n  /**\n   * Get the URL of the worker source. This will fetch the worker source if it\n   * has not already been fetched.\n   *\n   * @returns The worker source URL, as a `blob:` URL.\n   */\n  async #getWorkerURL() {\n    if (this.#workerSourceURL) {\n      return this.#workerSourceURL;\n    }\n\n    const blob = await fetch(this.#url)\n      .then(async (response) => response.blob())\n      .then(URL.createObjectURL.bind(URL));\n\n    this.#workerSourceURL = blob;\n    return blob;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/snaps-execution-environments",
-  "version": "6.8.0",
+  "version": "6.9.1",
   "description": "Snap sandbox environments for executing SES javascript",
   "keywords": [
     "MetaMask",
@@ -69,8 +69,8 @@
     "@metamask/post-message-stream": "^8.1.1",
     "@metamask/providers": "^17.1.2",
     "@metamask/rpc-errors": "^6.3.1",
-    "@metamask/snaps-sdk": "^6.6.0",
-    "@metamask/snaps-utils": "^8.2.0",
+    "@metamask/snaps-sdk": "^6.8.0",
+    "@metamask/snaps-utils": "^8.4.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^9.2.1",
     "nanoid": "^3.1.31",