@metamask/snaps-controllers 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.1.0]
+### Added
+- Add support for signature insights ([#2074](https://github.com/MetaMask/snaps/pull/2074))
+- Add support for initial connections ([#2048](https://github.com/MetaMask/snaps/pull/2048))
+- Add support for preinstalled snaps ([#2008](https://github.com/MetaMask/snaps/pull/2008))
+- Add additional install events ([#2087](https://github.com/MetaMask/snaps/pull/2087))
+
+### Changed
+- Bump several MetaMask dependencies ([#2086](https://github.com/MetaMask/snaps/pull/2086), [#2100](https://github.com/MetaMask/snaps/pull/2100))
+
 ## [4.0.0]
 ### Changed
 - **BREAKING:** Remove `:snapAdded` event ([#2073](https://github.com/MetaMask/snaps/pull/2073))
@@ -158,7 +168,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@4.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@4.1.0...HEAD
+[4.1.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@4.0.0...@metamask/snaps-controllers@4.1.0
 [4.0.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.6.0...@metamask/snaps-controllers@4.0.0
 [3.6.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.5.1...@metamask/snaps-controllers@3.6.0
 [3.5.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@3.5.0...@metamask/snaps-controllers@3.5.1

package/dist/cjs/services/ProxyPostMessageStream.js

@@ -59,7 +59,7 @@ function _class_private_method_init(obj, privateSet) {
     _check_private_redeclaration(obj, privateSet);
     privateSet.add(obj);
 }
-var _stream = /*#__PURE__*/ new WeakMap(), _jobId = /*#__PURE__*/ new WeakMap(), _extra = /*#__PURE__*/ new WeakMap(), /**
+var _stream = /*#__PURE__*/ new WeakMap(), _jobId = /*#__PURE__*/ new WeakMap(), /**
    * Handle incoming data from the underlying stream. This checks that the job
    * ID matches the expected job ID, and pushes the data to the stream if so.
    *
@@ -74,8 +74,7 @@ class ProxyPostMessageStream extends _postmessagestream.BasePostMessageStream {
    */ _postMessage(data) {
         _class_private_field_get(this, _stream).write({
             jobId: _class_private_field_get(this, _jobId),
-            data,
-            extra: _class_private_field_get(this, _extra)
+            data
         });
     }
     /**
@@ -84,8 +83,7 @@ class ProxyPostMessageStream extends _postmessagestream.BasePostMessageStream {
    * @param args - The constructor arguments.
    * @param args.stream - The underlying stream to use for communication.
    * @param args.jobId - The ID of the job this stream is associated with.
-   * @param args.extra - Extra data to include in the post message.
-   */ constructor({ stream, jobId, extra }){
+   */ constructor({ stream, jobId }){
         super();
         _class_private_method_init(this, _onData);
         _class_private_field_init(this, _stream, {
@@ -96,13 +94,8 @@ class ProxyPostMessageStream extends _postmessagestream.BasePostMessageStream {
             writable: true,
             value: void 0
         });
-        _class_private_field_init(this, _extra, {
-            writable: true,
-            value: void 0
-        });
         _class_private_field_set(this, _stream, stream);
         _class_private_field_set(this, _jobId, jobId);
-        _class_private_field_set(this, _extra, extra);
         _class_private_field_get(this, _stream).on('data', _class_private_method_get(this, _onData, onData).bind(this));
     }
 }

package/dist/cjs/services/ProxyPostMessageStream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/ProxyPostMessageStream.ts"],"sourcesContent":["import { BasePostMessageStream } from '@metamask/post-message-stream';\nimport type { JsonRpcRequest } from '@metamask/utils';\n\nexport type ProxyPostMessageStreamArgs = {\n  stream: BasePostMessageStream;\n  jobId: string;\n  extra?: Record<string, unknown>;\n};\n\nexport type ProxyPostMessage = {\n  jobId: string;\n  data: JsonRpcRequest;\n  extra?: Record<string, unknown>;\n};\n\n/**\n * A post message stream that wraps messages in a job ID, before sending them\n * over the underlying stream.\n */\nexport class ProxyPostMessageStream extends BasePostMessageStream {\n  readonly #stream: BasePostMessageStream;\n\n  readonly #jobId: string;\n\n  readonly #extra?: Record<string, unknown>;\n\n  /**\n   * Initializes a new `ProxyPostMessageStream` instance.\n   *\n   * @param args - The constructor arguments.\n   * @param args.stream - The underlying stream to use for communication.\n   * @param args.jobId - The ID of the job this stream is associated with.\n   * @param args.extra - Extra data to include in the post message.\n   */\n  constructor({ stream, jobId, extra }: ProxyPostMessageStreamArgs) {\n    super();\n\n    this.#stream = stream;\n    this.#jobId = jobId;\n    this.#extra = extra;\n\n    this.#stream.on('data', this.#onData.bind(this));\n  }\n\n  /**\n   * Handle incoming data from the underlying stream. This checks that the job\n   * ID matches the expected job ID, and pushes the data to the stream if so.\n   *\n   * @param data - The data to handle.\n   */\n  #onData(data: ProxyPostMessage) {\n    if (data.jobId !== this.#jobId) {\n      return;\n    }\n\n    this.push(data.data);\n  }\n\n  /**\n   * Write data to the underlying stream. This wraps the data in an object with\n   * the job ID.\n   *\n   * @param data - The data to write.\n   */\n  _postMessage(data: ProxyPostMessage) {\n    this.#stream.write({\n      jobId: this.#jobId,\n      data,\n      extra: this.#extra,\n    });\n  }\n}\n"],"names":["ProxyPostMessageStream","BasePostMessageStream","_postMessage","data","stream","write","jobId","extra","constructor","on","onData","bind","push"],"mappings":";;;;+BAmBaA;;;eAAAA;;;mCAnByB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoB3B,uCAEA,sCAEA,sCAoBT;;;;;GAKC,GACD;AA/BK,MAAMA,+BAA+BC,wCAAqB;IAuC/D;;;;;GAKC,GACDC,aAAaC,IAAsB,EAAE;QACnC,yBAAA,IAAI,EAAEC,SAAOC,KAAK,CAAC;YACjBC,KAAK,2BAAE,IAAI,EAAEA;YACbH;YACAI,KAAK,2BAAE,IAAI,EAAEA;QACf;IACF;IA5CA;;;;;;;GAOC,GACDC,YAAY,EAAEJ,MAAM,EAAEE,KAAK,EAAEC,KAAK,EAA8B,CAAE;QAChE,KAAK;QAeP,iCAAA;QA9BA,gCAAS;;mBAAT,KAAA;;QAEA,gCAAS;;mBAAT,KAAA;;QAEA,gCAAS;;mBAAT,KAAA;;uCAaQH,SAASA;uCACTE,QAAQA;uCACRC,QAAQA;QAEd,yBAAA,IAAI,EAAEH,SAAOK,EAAE,CAAC,QAAQ,0BAAA,IAAI,EAAEC,SAAAA,QAAOC,IAAI,CAAC,IAAI;IAChD;AA6BF;AArBE,SAAA,OAAQR,IAAsB;IAC5B,IAAIA,KAAKG,KAAK,8BAAK,IAAI,EAAEA,SAAO;QAC9B;IACF;IAEA,IAAI,CAACM,IAAI,CAACT,KAAKA,IAAI;AACrB"}
+{"version":3,"sources":["../../../src/services/ProxyPostMessageStream.ts"],"sourcesContent":["import { BasePostMessageStream } from '@metamask/post-message-stream';\nimport type { JsonRpcRequest } from '@metamask/utils';\n\nexport type ProxyPostMessageStreamArgs = {\n  stream: BasePostMessageStream;\n  jobId: string;\n  extra?: Record<string, unknown>;\n};\n\nexport type ProxyPostMessage = {\n  jobId: string;\n  data: JsonRpcRequest;\n  extra?: Record<string, unknown>;\n};\n\n/**\n * A post message stream that wraps messages in a job ID, before sending them\n * over the underlying stream.\n */\nexport class ProxyPostMessageStream extends BasePostMessageStream {\n  readonly #stream: BasePostMessageStream;\n\n  readonly #jobId: string;\n\n  /**\n   * Initializes a new `ProxyPostMessageStream` instance.\n   *\n   * @param args - The constructor arguments.\n   * @param args.stream - The underlying stream to use for communication.\n   * @param args.jobId - The ID of the job this stream is associated with.\n   */\n  constructor({ stream, jobId }: ProxyPostMessageStreamArgs) {\n    super();\n\n    this.#stream = stream;\n    this.#jobId = jobId;\n\n    this.#stream.on('data', this.#onData.bind(this));\n  }\n\n  /**\n   * Handle incoming data from the underlying stream. This checks that the job\n   * ID matches the expected job ID, and pushes the data to the stream if so.\n   *\n   * @param data - The data to handle.\n   */\n  #onData(data: ProxyPostMessage) {\n    if (data.jobId !== this.#jobId) {\n      return;\n    }\n\n    this.push(data.data);\n  }\n\n  /**\n   * Write data to the underlying stream. This wraps the data in an object with\n   * the job ID.\n   *\n   * @param data - The data to write.\n   */\n  _postMessage(data: ProxyPostMessage) {\n    this.#stream.write({\n      jobId: this.#jobId,\n      data,\n    });\n  }\n}\n"],"names":["ProxyPostMessageStream","BasePostMessageStream","_postMessage","data","stream","write","jobId","constructor","on","onData","bind","push"],"mappings":";;;;+BAmBaA;;;eAAAA;;;mCAnByB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoB3B,uCAEA,sCAkBT;;;;;GAKC,GACD;AA3BK,MAAMA,+BAA+BC,wCAAqB;IAmC/D;;;;;GAKC,GACDC,aAAaC,IAAsB,EAAE;QACnC,yBAAA,IAAI,EAAEC,SAAOC,KAAK,CAAC;YACjBC,KAAK,2BAAE,IAAI,EAAEA;YACbH;QACF;IACF;IAzCA;;;;;;GAMC,GACDI,YAAY,EAAEH,MAAM,EAAEE,KAAK,EAA8B,CAAE;QACzD,KAAK;QAcP,iCAAA;QA1BA,gCAAS;;mBAAT,KAAA;;QAEA,gCAAS;;mBAAT,KAAA;;uCAYQF,SAASA;uCACTE,QAAQA;QAEd,yBAAA,IAAI,EAAEF,SAAOI,EAAE,CAAC,QAAQ,0BAAA,IAAI,EAAEC,SAAAA,QAAOC,IAAI,CAAC,IAAI;IAChD;AA4BF;AApBE,SAAA,OAAQP,IAAsB;IAC5B,IAAIA,KAAKG,KAAK,8BAAK,IAAI,EAAEA,SAAO;QAC9B;IACF;IAEA,IAAI,CAACK,IAAI,CAACR,KAAKA,IAAI;AACrB"}

package/dist/cjs/services/node/NodeProcessExecutionService.js

@@ -13,7 +13,19 @@ const _child_process = require("child_process");
 const _ = require("..");
 class NodeProcessExecutionService extends _.AbstractExecutionService {
     async initEnvStream() {
-        const worker = (0, _child_process.fork)(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js'));
+        const worker = (0, _child_process.fork)(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js'), {
+            stdio: 'pipe'
+        });
+        // Capturing `stdout` and `stderr` from the worker prevents the worker from
+        // writing to them directly, making it easier to capture them Jest.
+        worker.stdout?.on('data', (data)=>{
+            // eslint-disable-next-line no-console
+            console.log(data.toString());
+        });
+        worker.stderr?.on('data', (data)=>{
+            // eslint-disable-next-line no-console
+            console.error(data.toString());
+        });
         const stream = new _postmessagestream.ProcessParentMessageStream({
             process: worker
         });

package/dist/cjs/services/node/NodeProcessExecutionService.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/node/NodeProcessExecutionService.ts"],"sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { ProcessParentMessageStream } from '@metamask/post-message-stream';\nimport type { ChildProcess } from 'child_process';\nimport { fork } from 'child_process';\n\nimport type { Job } from '..';\nimport { AbstractExecutionService } from '..';\n\nexport class NodeProcessExecutionService extends AbstractExecutionService<ChildProcess> {\n  protected async initEnvStream(): Promise<{\n    worker: ChildProcess;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = fork(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js',\n      ),\n    );\n\n    const stream = new ProcessParentMessageStream({ process: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected terminateJob(jobWrapper: Job<ChildProcess>): void {\n    jobWrapper.worker.kill();\n  }\n}\n"],"names":["NodeProcessExecutionService","AbstractExecutionService","initEnvStream","worker","fork","require","resolve","stream","ProcessParentMessageStream","process","Promise","terminateJob","jobWrapper","kill"],"mappings":";;;;+BAQaA;;;eAAAA;;;mCAP8B;+BAEtB;kBAGoB;AAElC,MAAMA,oCAAoCC,0BAAwB;IACvE,MAAgBC,gBAGb;QACD,MAAMC,SAASC,IAAAA,mBAAI,EACjBC,QAAQC,OAAO,CACb;QAIJ,MAAMC,SAAS,IAAIC,6CAA0B,CAAC;YAAEC,SAASN;QAAO;QAChE,OAAOO,QAAQJ,OAAO,CAAC;YAAEH;YAAQI;QAAO;IAC1C;IAEUI,aAAaC,UAA6B,EAAQ;QAC1DA,WAAWT,MAAM,CAACU,IAAI;IACxB;AACF"}
+{"version":3,"sources":["../../../../src/services/node/NodeProcessExecutionService.ts"],"sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { ProcessParentMessageStream } from '@metamask/post-message-stream';\nimport type { ChildProcess } from 'child_process';\nimport { fork } from 'child_process';\n\nimport type { Job } from '..';\nimport { AbstractExecutionService } from '..';\n\nexport class NodeProcessExecutionService extends AbstractExecutionService<ChildProcess> {\n  protected async initEnvStream(): Promise<{\n    worker: ChildProcess;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = fork(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js',\n      ),\n      {\n        stdio: 'pipe',\n      },\n    );\n\n    // Capturing `stdout` and `stderr` from the worker prevents the worker from\n    // writing to them directly, making it easier to capture them Jest.\n    worker.stdout?.on('data', (data) => {\n      // eslint-disable-next-line no-console\n      console.log(data.toString());\n    });\n\n    worker.stderr?.on('data', (data) => {\n      // eslint-disable-next-line no-console\n      console.error(data.toString());\n    });\n\n    const stream = new ProcessParentMessageStream({ process: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected terminateJob(jobWrapper: Job<ChildProcess>): void {\n    jobWrapper.worker.kill();\n  }\n}\n"],"names":["NodeProcessExecutionService","AbstractExecutionService","initEnvStream","worker","fork","require","resolve","stdio","stdout","on","data","console","log","toString","stderr","error","stream","ProcessParentMessageStream","process","Promise","terminateJob","jobWrapper","kill"],"mappings":";;;;+BAQaA;;;eAAAA;;;mCAP8B;+BAEtB;kBAGoB;AAElC,MAAMA,oCAAoCC,0BAAwB;IACvE,MAAgBC,gBAGb;QACD,MAAMC,SAASC,IAAAA,mBAAI,EACjBC,QAAQC,OAAO,CACb,kFAEF;YACEC,OAAO;QACT;QAGF,2EAA2E;QAC3E,mEAAmE;QACnEJ,OAAOK,MAAM,EAAEC,GAAG,QAAQ,CAACC;YACzB,sCAAsC;YACtCC,QAAQC,GAAG,CAACF,KAAKG,QAAQ;QAC3B;QAEAV,OAAOW,MAAM,EAAEL,GAAG,QAAQ,CAACC;YACzB,sCAAsC;YACtCC,QAAQI,KAAK,CAACL,KAAKG,QAAQ;QAC7B;QAEA,MAAMG,SAAS,IAAIC,6CAA0B,CAAC;YAAEC,SAASf;QAAO;QAChE,OAAOgB,QAAQb,OAAO,CAAC;YAAEH;YAAQa;QAAO;IAC1C;IAEUI,aAAaC,UAA6B,EAAQ;QAC1DA,WAAWlB,MAAM,CAACmB,IAAI;IACxB;AACF"}

package/dist/cjs/services/node/NodeThreadExecutionService.js

@@ -13,7 +13,20 @@ const _worker_threads = require("worker_threads");
 const _ = require("..");
 class NodeThreadExecutionService extends _.AbstractExecutionService {
     async initEnvStream() {
-        const worker = new _worker_threads.Worker(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js'));
+        const worker = new _worker_threads.Worker(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js'), {
+            stdout: true,
+            stderr: true
+        });
+        // Capturing `stdout` and `stderr` from the worker prevents the worker from
+        // writing to them directly, making it easier to capture them Jest.
+        worker.stdout.on('data', (data)=>{
+            // eslint-disable-next-line no-console
+            console.log(data.toString());
+        });
+        worker.stderr.on('data', (data)=>{
+            // eslint-disable-next-line no-console
+            console.error(data.toString());
+        });
         const stream = new _postmessagestream.ThreadParentMessageStream({
             thread: worker
         });

package/dist/cjs/services/node/NodeThreadExecutionService.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/node/NodeThreadExecutionService.ts"],"sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { ThreadParentMessageStream } from '@metamask/post-message-stream';\n// eslint-disable-next-line @typescript-eslint/no-shadow\nimport { Worker } from 'worker_threads';\n\nimport type { Job } from '..';\nimport { AbstractExecutionService } from '..';\n\nexport class NodeThreadExecutionService extends AbstractExecutionService<Worker> {\n  protected async initEnvStream(): Promise<{\n    worker: Worker;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = new Worker(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js',\n      ),\n    );\n    const stream = new ThreadParentMessageStream({ thread: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected async terminateJob(jobWrapper: Job<Worker>): Promise<void> {\n    await jobWrapper.worker.terminate();\n  }\n}\n"],"names":["NodeThreadExecutionService","AbstractExecutionService","initEnvStream","worker","Worker","require","resolve","stream","ThreadParentMessageStream","thread","Promise","terminateJob","jobWrapper","terminate"],"mappings":";;;;+BAQaA;;;eAAAA;;;mCAP6B;gCAEnB;kBAGkB;AAElC,MAAMA,mCAAmCC,0BAAwB;IACtE,MAAgBC,gBAGb;QACD,MAAMC,SAAS,IAAIC,sBAAM,CACvBC,QAAQC,OAAO,CACb;QAGJ,MAAMC,SAAS,IAAIC,4CAAyB,CAAC;YAAEC,QAAQN;QAAO;QAC9D,OAAOO,QAAQJ,OAAO,CAAC;YAAEH;YAAQI;QAAO;IAC1C;IAEA,MAAgBI,aAAaC,UAAuB,EAAiB;QACnE,MAAMA,WAAWT,MAAM,CAACU,SAAS;IACnC;AACF"}
+{"version":3,"sources":["../../../../src/services/node/NodeThreadExecutionService.ts"],"sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { ThreadParentMessageStream } from '@metamask/post-message-stream';\n// eslint-disable-next-line @typescript-eslint/no-shadow\nimport { Worker } from 'worker_threads';\n\nimport type { Job } from '..';\nimport { AbstractExecutionService } from '..';\n\nexport class NodeThreadExecutionService extends AbstractExecutionService<Worker> {\n  protected async initEnvStream(): Promise<{\n    worker: Worker;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = new Worker(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js',\n      ),\n      {\n        stdout: true,\n        stderr: true,\n      },\n    );\n\n    // Capturing `stdout` and `stderr` from the worker prevents the worker from\n    // writing to them directly, making it easier to capture them Jest.\n    worker.stdout.on('data', (data) => {\n      // eslint-disable-next-line no-console\n      console.log(data.toString());\n    });\n\n    worker.stderr.on('data', (data) => {\n      // eslint-disable-next-line no-console\n      console.error(data.toString());\n    });\n\n    const stream = new ThreadParentMessageStream({ thread: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected async terminateJob(jobWrapper: Job<Worker>): Promise<void> {\n    await jobWrapper.worker.terminate();\n  }\n}\n"],"names":["NodeThreadExecutionService","AbstractExecutionService","initEnvStream","worker","Worker","require","resolve","stdout","stderr","on","data","console","log","toString","error","stream","ThreadParentMessageStream","thread","Promise","terminateJob","jobWrapper","terminate"],"mappings":";;;;+BAQaA;;;eAAAA;;;mCAP6B;gCAEnB;kBAGkB;AAElC,MAAMA,mCAAmCC,0BAAwB;IACtE,MAAgBC,gBAGb;QACD,MAAMC,SAAS,IAAIC,sBAAM,CACvBC,QAAQC,OAAO,CACb,iFAEF;YACEC,QAAQ;YACRC,QAAQ;QACV;QAGF,2EAA2E;QAC3E,mEAAmE;QACnEL,OAAOI,MAAM,CAACE,EAAE,CAAC,QAAQ,CAACC;YACxB,sCAAsC;YACtCC,QAAQC,GAAG,CAACF,KAAKG,QAAQ;QAC3B;QAEAV,OAAOK,MAAM,CAACC,EAAE,CAAC,QAAQ,CAACC;YACxB,sCAAsC;YACtCC,QAAQG,KAAK,CAACJ,KAAKG,QAAQ;QAC7B;QAEA,MAAME,SAAS,IAAIC,4CAAyB,CAAC;YAAEC,QAAQd;QAAO;QAC9D,OAAOe,QAAQZ,OAAO,CAAC;YAAEH;YAAQY;QAAO;IAC1C;IAEA,MAAgBI,aAAaC,UAAuB,EAAiB;QACnE,MAAMA,WAAWjB,MAAM,CAACkB,SAAS;IACnC;AACF"}

package/dist/cjs/services/offscreen/OffscreenExecutionService.js

@@ -9,48 +9,21 @@ Object.defineProperty(exports, "OffscreenExecutionService", {
     }
 });
 const _postmessagestream = require("@metamask/post-message-stream");
-const _nanoid = require("nanoid");
-const _AbstractExecutionService = require("../AbstractExecutionService");
-const _ProxyPostMessageStream = require("../ProxyPostMessageStream");
+const _ProxyExecutionService = require("../proxy/ProxyExecutionService");
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) {
         throw new TypeError("Cannot initialize the same private elements twice on an object");
     }
 }
-function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
+function _class_private_method_get(receiver, privateSet, fn) {
+    if (!privateSet.has(receiver)) {
+        throw new TypeError("attempted to get private field on non-instance");
     }
-    return descriptor.value;
+    return fn;
 }
-function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
-        if (!descriptor.writable) {
-            throw new TypeError("attempted to set read only private field");
-        }
-        descriptor.value = value;
-    }
-}
-function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
-    return privateMap.get(receiver);
-}
-function _class_private_field_get(receiver, privateMap) {
-    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
-    return _class_apply_descriptor_get(receiver, descriptor);
-}
-function _class_private_field_init(obj, privateMap, value) {
-    _check_private_redeclaration(obj, privateMap);
-    privateMap.set(obj, value);
-}
-function _class_private_field_set(receiver, privateMap, value) {
-    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
-    _class_apply_descriptor_set(receiver, descriptor, value);
-    return value;
+function _class_private_method_init(obj, privateSet) {
+    _check_private_redeclaration(obj, privateSet);
+    privateSet.add(obj);
 }
 function _define_property(obj, key, value) {
     if (key in obj) {
@@ -65,24 +38,8 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-var _runtimeStream = /*#__PURE__*/ new WeakMap();
-class OffscreenExecutionService extends _AbstractExecutionService.AbstractExecutionService {
-    /**
-   * Send a termination command to the offscreen document.
-   *
-   * @param job - The job to terminate.
-   */ async terminateJob(job) {
-        // The `AbstractExecutionService` will have already closed the job stream,
-        // so we write to the runtime stream directly.
-        _class_private_field_get(this, _runtimeStream).write({
-            jobId: job.id,
-            data: {
-                jsonrpc: '2.0',
-                method: 'terminateJob',
-                id: (0, _nanoid.nanoid)()
-            }
-        });
-    }
+var _createDocument = /*#__PURE__*/ new WeakSet();
+class OffscreenExecutionService extends _ProxyExecutionService.ProxyExecutionService {
     /**
    * Create a new stream for the specified job. This wraps the runtime stream
    * in a stream specific to the job.
@@ -90,38 +47,8 @@ class OffscreenExecutionService extends _AbstractExecutionService.AbstractExecut
    * @param jobId - The job ID.
    */ async initEnvStream(jobId) {
         // Lazily create the offscreen document.
-        await this.createDocument();
-        const stream = new _ProxyPostMessageStream.ProxyPostMessageStream({
-            stream: _class_private_field_get(this, _runtimeStream),
-            extra: {
-                // TODO: Rather than injecting the frame URL here, we should come up
-                // with a better way to do this. The frame URL is needed to avoid hard
-                // coding it in the offscreen execution environment.
-                frameUrl: this.frameUrl.toString()
-            },
-            jobId
-        });
-        return {
-            worker: jobId,
-            stream
-        };
-    }
-    /**
-   * Creates the offscreen document to be used as the execution environment.
-   *
-   * If the document already exists, this does nothing.
-   */ async createDocument() {
-        // Extensions can only have a single offscreen document.
-        if (await chrome.offscreen.hasDocument()) {
-            return;
-        }
-        await chrome.offscreen.createDocument({
-            justification: 'MetaMask Snaps Execution Environment',
-            reasons: [
-                'IFRAME_SCRIPTING'
-            ],
-            url: this.documentUrl.toString()
-        });
+        await _class_private_method_get(this, _createDocument, createDocument).call(this);
+        return super.initEnvStream(jobId);
     }
     /**
    * Create a new offscreen execution service.
@@ -130,30 +57,40 @@ class OffscreenExecutionService extends _AbstractExecutionService.AbstractExecut
    * @param args.documentUrl - The URL of the offscreen document to use as the
    * execution environment. This must be a URL relative to the location where
    * this is called. This cannot be a public (http(s)) URL.
-   * @param args.frameUrl - The URL of the iframe to load inside the offscreen
-   * document.
    * @param args.messenger - The messenger to use for communication with the
    * `SnapController`.
    * @param args.setupSnapProvider - The function to use to set up the snap
    * provider.
-   */ constructor({ documentUrl, frameUrl, messenger, setupSnapProvider }){
+   */ constructor({ documentUrl, messenger, setupSnapProvider }){
         super({
             messenger,
-            setupSnapProvider
+            setupSnapProvider,
+            stream: new _postmessagestream.BrowserRuntimePostMessageStream({
+                name: 'parent',
+                target: 'child'
+            })
         });
+        /**
+   * Creates the offscreen document to be used as the execution environment.
+   *
+   * If the document already exists, this does nothing.
+   */ _class_private_method_init(this, _createDocument);
         _define_property(this, "documentUrl", void 0);
-        _define_property(this, "frameUrl", void 0);
-        _class_private_field_init(this, _runtimeStream, {
-            writable: true,
-            value: void 0
-        });
         this.documentUrl = documentUrl;
-        this.frameUrl = frameUrl;
-        _class_private_field_set(this, _runtimeStream, new _postmessagestream.BrowserRuntimePostMessageStream({
-            name: 'parent',
-            target: 'child'
-        }));
     }
 }
+async function createDocument() {
+    // Extensions can only have a single offscreen document.
+    if (await chrome.offscreen.hasDocument()) {
+        return;
+    }
+    await chrome.offscreen.createDocument({
+        justification: 'MetaMask Snaps Execution Environment',
+        reasons: [
+            'IFRAME_SCRIPTING'
+        ],
+        url: this.documentUrl.toString()
+    });
+}
 
 //# sourceMappingURL=OffscreenExecutionService.js.map

package/dist/cjs/services/offscreen/OffscreenExecutionService.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/offscreen/OffscreenExecutionService.ts"],"sourcesContent":["import { BrowserRuntimePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport type { ExecutionServiceArgs, Job } from '../AbstractExecutionService';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport { ProxyPostMessageStream } from '../ProxyPostMessageStream';\n\ntype OffscreenExecutionEnvironmentServiceArgs = {\n  documentUrl: URL;\n  frameUrl: URL;\n} & ExecutionServiceArgs;\n\nexport class OffscreenExecutionService extends AbstractExecutionService<string> {\n  public readonly documentUrl: URL;\n\n  public readonly frameUrl: URL;\n\n  readonly #runtimeStream: BrowserRuntimePostMessageStream;\n\n  /**\n   * Create a new offscreen execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.documentUrl - The URL of the offscreen document to use as the\n   * execution environment. This must be a URL relative to the location where\n   * this is called. This cannot be a public (http(s)) URL.\n   * @param args.frameUrl - The URL of the iframe to load inside the offscreen\n   * document.\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    frameUrl,\n    messenger,\n    setupSnapProvider,\n  }: OffscreenExecutionEnvironmentServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n    });\n\n    this.documentUrl = documentUrl;\n    this.frameUrl = frameUrl;\n    this.#runtimeStream = new BrowserRuntimePostMessageStream({\n      name: 'parent',\n      target: 'child',\n    });\n  }\n\n  /**\n   * Send a termination command to the offscreen document.\n   *\n   * @param job - The job to terminate.\n   */\n  protected async terminateJob(job: Job<string>) {\n    // The `AbstractExecutionService` will have already closed the job stream,\n    // so we write to the runtime stream directly.\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   */\n  protected async initEnvStream(jobId: string) {\n    // Lazily create the offscreen document.\n    await this.createDocument();\n\n    const stream = new ProxyPostMessageStream({\n      stream: this.#runtimeStream,\n      extra: {\n        // TODO: Rather than injecting the frame URL here, we should come up\n        // with a better way to do this. The frame URL is needed to avoid hard\n        // coding it in the offscreen execution environment.\n        frameUrl: this.frameUrl.toString(),\n      },\n      jobId,\n    });\n\n    return { worker: jobId, stream };\n  }\n\n  /**\n   * Creates the offscreen document to be used as the execution environment.\n   *\n   * If the document already exists, this does nothing.\n   */\n  private async createDocument() {\n    // Extensions can only have a single offscreen document.\n    if (await chrome.offscreen.hasDocument()) {\n      return;\n    }\n\n    await chrome.offscreen.createDocument({\n      justification: 'MetaMask Snaps Execution Environment',\n      reasons: ['IFRAME_SCRIPTING' as chrome.offscreen.Reason],\n      url: this.documentUrl.toString(),\n    });\n  }\n}\n"],"names":["OffscreenExecutionService","AbstractExecutionService","terminateJob","job","runtimeStream","write","jobId","id","data","jsonrpc","method","nanoid","initEnvStream","createDocument","stream","ProxyPostMessageStream","extra","frameUrl","toString","worker","chrome","offscreen","hasDocument","justification","reasons","url","documentUrl","constructor","messenger","setupSnapProvider","BrowserRuntimePostMessageStream","name","target"],"mappings":";;;;+BAYaA;;;eAAAA;;;mCAZmC;wBACzB;0CAGkB;wCACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAY5B;AALJ,MAAMA,kCAAkCC,kDAAwB;IAwCrE;;;;GAIC,GACD,MAAgBC,aAAaC,GAAgB,EAAE;QAC7C,0EAA0E;QAC1E,8CAA8C;QAC9C,yBAAA,IAAI,EAAEC,gBAAcC,KAAK,CAAC;YACxBC,OAAOH,IAAII,EAAE;YACbC,MAAM;gBACJC,SAAS;gBACTC,QAAQ;gBACRH,IAAII,IAAAA,cAAM;YACZ;QACF;IACF;IAEA;;;;;GAKC,GACD,MAAgBC,cAAcN,KAAa,EAAE;QAC3C,wCAAwC;QACxC,MAAM,IAAI,CAACO,cAAc;QAEzB,MAAMC,SAAS,IAAIC,8CAAsB,CAAC;YACxCD,MAAM,2BAAE,IAAI,EAAEV;YACdY,OAAO;gBACL,oEAAoE;gBACpE,sEAAsE;gBACtE,oDAAoD;gBACpDC,UAAU,IAAI,CAACA,QAAQ,CAACC,QAAQ;YAClC;YACAZ;QACF;QAEA,OAAO;YAAEa,QAAQb;YAAOQ;QAAO;IACjC;IAEA;;;;GAIC,GACD,MAAcD,iBAAiB;QAC7B,wDAAwD;QACxD,IAAI,MAAMO,OAAOC,SAAS,CAACC,WAAW,IAAI;YACxC;QACF;QAEA,MAAMF,OAAOC,SAAS,CAACR,cAAc,CAAC;YACpCU,eAAe;YACfC,SAAS;gBAAC;aAA8C;YACxDC,KAAK,IAAI,CAACC,WAAW,CAACR,QAAQ;QAChC;IACF;IA3FA;;;;;;;;;;;;;GAaC,GACDS,YAAY,EACVD,WAAW,EACXT,QAAQ,EACRW,SAAS,EACTC,iBAAiB,EACwB,CAAE;QAC3C,KAAK,CAAC;YACJD;YACAC;QACF;QA7BF,uBAAgBH,eAAhB,KAAA;QAEA,uBAAgBT,YAAhB,KAAA;QAEA,gCAAS;;mBAAT,KAAA;;QA2BE,IAAI,CAACS,WAAW,GAAGA;QACnB,IAAI,CAACT,QAAQ,GAAGA;uCACVb,gBAAgB,IAAI0B,kDAA+B,CAAC;YACxDC,MAAM;YACNC,QAAQ;QACV;IACF;AA6DF"}
+{"version":3,"sources":["../../../../src/services/offscreen/OffscreenExecutionService.ts"],"sourcesContent":["import { BrowserRuntimePostMessageStream } from '@metamask/post-message-stream';\n\nimport type { ExecutionServiceArgs } from '../AbstractExecutionService';\nimport { ProxyExecutionService } from '../proxy/ProxyExecutionService';\n\ntype OffscreenExecutionEnvironmentServiceArgs = {\n  documentUrl: URL;\n} & ExecutionServiceArgs;\n\nexport class OffscreenExecutionService extends ProxyExecutionService {\n  public readonly documentUrl: URL;\n\n  /**\n   * Create a new offscreen execution service.\n   *\n   * @param args - The constructor arguments.\n   * @param args.documentUrl - The URL of the offscreen document to use as the\n   * execution environment. This must be a URL relative to the location where\n   * this is called. This cannot be a public (http(s)) URL.\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  }: OffscreenExecutionEnvironmentServiceArgs) {\n    super({\n      messenger,\n      setupSnapProvider,\n      stream: new BrowserRuntimePostMessageStream({\n        name: 'parent',\n        target: 'child',\n      }),\n    });\n\n    this.documentUrl = documentUrl;\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   */\n  protected async initEnvStream(jobId: string) {\n    // Lazily create the offscreen document.\n    await this.#createDocument();\n\n    return super.initEnvStream(jobId);\n  }\n\n  /**\n   * Creates the offscreen document to be used as the execution environment.\n   *\n   * If the document already exists, this does nothing.\n   */\n  async #createDocument() {\n    // Extensions can only have a single offscreen document.\n    if (await chrome.offscreen.hasDocument()) {\n      return;\n    }\n\n    await chrome.offscreen.createDocument({\n      justification: 'MetaMask Snaps Execution Environment',\n      reasons: ['IFRAME_SCRIPTING' as chrome.offscreen.Reason],\n      url: this.documentUrl.toString(),\n    });\n  }\n}\n"],"names":["OffscreenExecutionService","ProxyExecutionService","initEnvStream","jobId","createDocument","constructor","documentUrl","messenger","setupSnapProvider","stream","BrowserRuntimePostMessageStream","name","target","chrome","offscreen","hasDocument","justification","reasons","url","toString"],"mappings":";;;;+BASaA;;;eAAAA;;;mCATmC;uCAGV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAwD9B;AAlDD,MAAMA,kCAAkCC,4CAAqB;IAgClE;;;;;GAKC,GACD,MAAgBC,cAAcC,KAAa,EAAE;QAC3C,wCAAwC;QACxC,MAAM,0BAAA,IAAI,EAAEC,iBAAAA,qBAAN,IAAI;QAEV,OAAO,KAAK,CAACF,cAAcC;IAC7B;IAxCA;;;;;;;;;;;GAWC,GACDE,YAAY,EACVC,WAAW,EACXC,SAAS,EACTC,iBAAiB,EACwB,CAAE;QAC3C,KAAK,CAAC;YACJD;YACAC;YACAC,QAAQ,IAAIC,kDAA+B,CAAC;gBAC1CC,MAAM;gBACNC,QAAQ;YACV;QACF;QAkBF;;;;GAIC,GACD,iCAAM;QAjDN,uBAAgBN,eAAhB,KAAA;QA4BE,IAAI,CAACA,WAAW,GAAGA;IACrB;AAgCF;AAZE,eAAA;IACE,wDAAwD;IACxD,IAAI,MAAMO,OAAOC,SAAS,CAACC,WAAW,IAAI;QACxC;IACF;IAEA,MAAMF,OAAOC,SAAS,CAACV,cAAc,CAAC;QACpCY,eAAe;QACfC,SAAS;YAAC;SAA8C;QACxDC,KAAK,IAAI,CAACZ,WAAW,CAACa,QAAQ;IAChC;AACF"}

package/dist/cjs/services/proxy/ProxyExecutionService.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ProxyExecutionService", {
+    enumerable: true,
+    get: function() {
+        return ProxyExecutionService;
+    }
+});
+const _nanoid = require("nanoid");
+const _AbstractExecutionService = require("../AbstractExecutionService");
+const _ProxyPostMessageStream = require("../ProxyPostMessageStream");
+function _check_private_redeclaration(obj, privateCollection) {
+    if (privateCollection.has(obj)) {
+        throw new TypeError("Cannot initialize the same private elements twice on an object");
+    }
+}
+function _class_apply_descriptor_get(receiver, descriptor) {
+    if (descriptor.get) {
+        return descriptor.get.call(receiver);
+    }
+    return descriptor.value;
+}
+function _class_apply_descriptor_set(receiver, descriptor, value) {
+    if (descriptor.set) {
+        descriptor.set.call(receiver, value);
+    } else {
+        if (!descriptor.writable) {
+            throw new TypeError("attempted to set read only private field");
+        }
+        descriptor.value = value;
+    }
+}
+function _class_extract_field_descriptor(receiver, privateMap, action) {
+    if (!privateMap.has(receiver)) {
+        throw new TypeError("attempted to " + action + " private field on non-instance");
+    }
+    return privateMap.get(receiver);
+}
+function _class_private_field_get(receiver, privateMap) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
+    return _class_apply_descriptor_get(receiver, descriptor);
+}
+function _class_private_field_init(obj, privateMap, value) {
+    _check_private_redeclaration(obj, privateMap);
+    privateMap.set(obj, value);
+}
+function _class_private_field_set(receiver, privateMap, value) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
+    _class_apply_descriptor_set(receiver, descriptor, value);
+    return value;
+}
+var _stream = /*#__PURE__*/ new WeakMap();
+class ProxyExecutionService extends _AbstractExecutionService.AbstractExecutionService {
+    /**
+   * Send a termination command to the proxy stream.
+   *
+   * @param job - The job to terminate.
+   */ async terminateJob(job) {
+        // The `AbstractExecutionService` will have already closed the job stream,
+        // so we write to the runtime stream directly.
+        _class_private_field_get(this, _stream).write({
+            jobId: job.id,
+            data: {
+                jsonrpc: '2.0',
+                method: 'terminateJob',
+                id: (0, _nanoid.nanoid)()
+            }
+        });
+    }
+    /**
+   * Create a new stream for the specified job. This wraps the root stream
+   * in a stream specific to the job.
+   *
+   * @param jobId - The job ID.
+   */ async initEnvStream(jobId) {
+        const stream = new _ProxyPostMessageStream.ProxyPostMessageStream({
+            stream: _class_private_field_get(this, _stream),
+            jobId
+        });
+        return {
+            worker: jobId,
+            stream
+        };
+    }
+    /**
+   * Create a new proxy execution service.
+   *
+   * @param args - The constructor arguments.
+   * @param args.messenger - The messenger to use for communication with the
+   * `SnapController`.
+   * @param args.setupSnapProvider - The function to use to set up the snap
+   * provider.
+   * @param args.stream - The stream to use for communicating with the proxy
+   * executor.
+   */ constructor({ stream, messenger, setupSnapProvider }){
+        super({
+            messenger,
+            setupSnapProvider
+        });
+        _class_private_field_init(this, _stream, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_set(this, _stream, stream);
+    }
+}
+
+//# sourceMappingURL=ProxyExecutionService.js.map

package/dist/cjs/services/proxy/ProxyExecutionService.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/proxy/ProxyExecutionService.ts"],"sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport type { ExecutionServiceArgs, Job } 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    });\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: Job<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   */\n  protected async initEnvStream(jobId: string) {\n    const stream = new ProxyPostMessageStream({\n      stream: this.#stream,\n      jobId,\n    });\n\n    return { worker: jobId, stream };\n  }\n}\n"],"names":["ProxyExecutionService","AbstractExecutionService","terminateJob","job","stream","write","jobId","id","data","jsonrpc","method","nanoid","initEnvStream","ProxyPostMessageStream","worker","constructor","messenger","setupSnapProvider"],"mappings":";;;;+BAWaA;;;eAAAA;;;wBAVU;0CAGkB;wCACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAO5B;AADJ,MAAMA,8BAA8BC,kDAAwB;IA2BjE;;;;GAIC,GACD,MAAgBC,aAAaC,GAAgB,EAAE;QAC7C,0EAA0E;QAC1E,8CAA8C;QAC9C,yBAAA,IAAI,EAAEC,SAAOC,KAAK,CAAC;YACjBC,OAAOH,IAAII,EAAE;YACbC,MAAM;gBACJC,SAAS;gBACTC,QAAQ;gBACRH,IAAII,IAAAA,cAAM;YACZ;QACF;IACF;IAEA;;;;;GAKC,GACD,MAAgBC,cAAcN,KAAa,EAAE;QAC3C,MAAMF,SAAS,IAAIS,8CAAsB,CAAC;YACxCT,MAAM,2BAAE,IAAI,EAAEA;YACdE;QACF;QAEA,OAAO;YAAEQ,QAAQR;YAAOF;QAAO;IACjC;IAvDA;;;;;;;;;;GAUC,GACDW,YAAY,EACVX,MAAM,EACNY,SAAS,EACTC,iBAAiB,EACoB,CAAE;QACvC,KAAK,CAAC;YACJD;YACAC;QACF;QArBF,gCAAS;;mBAAT,KAAA;;uCAuBQb,SAASA;IACjB;AAkCF"}