@metamask/snaps-controllers 0.32.2 → 0.33.1-flask.1

package/dist/services/ProxyPostMessageStream.js

@@ -0,0 +1,62 @@
+"use strict";
+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 _ProxyPostMessageStream_instances, _ProxyPostMessageStream_stream, _ProxyPostMessageStream_jobId, _ProxyPostMessageStream_extra, _ProxyPostMessageStream_onData;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyPostMessageStream = void 0;
+const post_message_stream_1 = require("@metamask/post-message-stream");
+/**
+ * A post message stream that wraps messages in a job ID, before sending them
+ * over the underlying stream.
+ */
+class ProxyPostMessageStream extends post_message_stream_1.BasePostMessageStream {
+    /**
+     * Initializes a new `ProxyPostMessageStream` instance.
+     *
+     * @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 }) {
+        super();
+        _ProxyPostMessageStream_instances.add(this);
+        _ProxyPostMessageStream_stream.set(this, void 0);
+        _ProxyPostMessageStream_jobId.set(this, void 0);
+        _ProxyPostMessageStream_extra.set(this, void 0);
+        __classPrivateFieldSet(this, _ProxyPostMessageStream_stream, stream, "f");
+        __classPrivateFieldSet(this, _ProxyPostMessageStream_jobId, jobId, "f");
+        __classPrivateFieldSet(this, _ProxyPostMessageStream_extra, extra, "f");
+        __classPrivateFieldGet(this, _ProxyPostMessageStream_stream, "f").on('data', __classPrivateFieldGet(this, _ProxyPostMessageStream_instances, "m", _ProxyPostMessageStream_onData).bind(this));
+    }
+    /**
+     * Write data to the underlying stream. This wraps the data in an object with
+     * the job ID.
+     *
+     * @param data - The data to write.
+     */
+    _postMessage(data) {
+        __classPrivateFieldGet(this, _ProxyPostMessageStream_stream, "f").write({
+            jobId: __classPrivateFieldGet(this, _ProxyPostMessageStream_jobId, "f"),
+            data,
+            extra: __classPrivateFieldGet(this, _ProxyPostMessageStream_extra, "f"),
+        });
+    }
+}
+exports.ProxyPostMessageStream = ProxyPostMessageStream;
+_ProxyPostMessageStream_stream = new WeakMap(), _ProxyPostMessageStream_jobId = new WeakMap(), _ProxyPostMessageStream_extra = new WeakMap(), _ProxyPostMessageStream_instances = new WeakSet(), _ProxyPostMessageStream_onData = function _ProxyPostMessageStream_onData(data) {
+    if (data.jobId !== __classPrivateFieldGet(this, _ProxyPostMessageStream_jobId, "f")) {
+        return;
+    }
+    this.push(data.data);
+};
+//# sourceMappingURL=ProxyPostMessageStream.js.map

package/dist/services/ProxyPostMessageStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProxyPostMessageStream.js","sourceRoot":"","sources":["../../src/services/ProxyPostMessageStream.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAAsE;AAetE;;;GAGG;AACH,MAAa,sBAAuB,SAAQ,2CAAqB;IAO/D;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAA8B;QAC9D,KAAK,EAAE,CAAC;;QAfV,iDAAwC;QAExC,gDAAwB;QAExB,gDAA0C;QAaxC,uBAAA,IAAI,kCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,iCAAU,KAAK,MAAA,CAAC;QACpB,uBAAA,IAAI,iCAAU,KAAK,MAAA,CAAC;QAEpB,uBAAA,IAAI,sCAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,uBAAA,IAAI,yEAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IAgBD;;;;;OAKG;IACH,YAAY,CAAC,IAAsB;QACjC,uBAAA,IAAI,sCAAQ,CAAC,KAAK,CAAC;YACjB,KAAK,EAAE,uBAAA,IAAI,qCAAO;YAClB,IAAI;YACJ,KAAK,EAAE,uBAAA,IAAI,qCAAO;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AApDD,wDAoDC;0QArBS,IAAsB;IAC5B,IAAI,IAAI,CAAC,KAAK,KAAK,uBAAA,IAAI,qCAAO,EAAE;QAC9B,OAAO;KACR;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC","sourcesContent":["import { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { 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"]}

package/dist/services/browser.d.ts

@@ -1,4 +1,6 @@
 export * from './AbstractExecutionService';
 export * from './ExecutionService';
+export * from './ProxyPostMessageStream';
 export * from './iframe';
 export * from './offscreen';
+export { WebWorkerExecutionService } from './webworker';

package/dist/services/browser.js

@@ -14,9 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebWorkerExecutionService = void 0;
 // Subset of exports meant for browser environments, omits Node.js services
 __exportStar(require("./AbstractExecutionService"), exports);
 __exportStar(require("./ExecutionService"), exports);
+__exportStar(require("./ProxyPostMessageStream"), exports);
 __exportStar(require("./iframe"), exports);
 __exportStar(require("./offscreen"), exports);
+var webworker_1 = require("./webworker");
+Object.defineProperty(exports, "WebWorkerExecutionService", { enumerable: true, get: function () { return webworker_1.WebWorkerExecutionService; } });
 //# sourceMappingURL=browser.js.map

package/dist/services/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2EAA2E;AAC3E,6DAA2C;AAC3C,qDAAmC;AACnC,2CAAyB;AACzB,8CAA4B","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport * from './AbstractExecutionService';\nexport * from './ExecutionService';\nexport * from './iframe';\nexport * from './offscreen';\n"]}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2EAA2E;AAC3E,6DAA2C;AAC3C,qDAAmC;AACnC,2DAAyC;AACzC,2CAAyB;AACzB,8CAA4B;AAC5B,yCAAwD;AAA/C,sHAAA,yBAAyB,OAAA","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport * from './AbstractExecutionService';\nexport * from './ExecutionService';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './offscreen';\nexport { WebWorkerExecutionService } from './webworker';\n"]}

package/dist/services/index.d.ts

@@ -1,5 +1,7 @@
 export * from './AbstractExecutionService';
 export * from './ExecutionService';
+export * from './ProxyPostMessageStream';
 export * from './iframe';
 export * from './node';
 export * from './offscreen';
+export { WebWorkerExecutionService } from './webworker';

package/dist/services/index.js

@@ -14,9 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebWorkerExecutionService = void 0;
 __exportStar(require("./AbstractExecutionService"), exports);
 __exportStar(require("./ExecutionService"), exports);
+__exportStar(require("./ProxyPostMessageStream"), exports);
 __exportStar(require("./iframe"), exports);
 __exportStar(require("./node"), exports);
 __exportStar(require("./offscreen"), exports);
+var webworker_1 = require("./webworker");
+Object.defineProperty(exports, "WebWorkerExecutionService", { enumerable: true, get: function () { return webworker_1.WebWorkerExecutionService; } });
 //# sourceMappingURL=index.js.map

package/dist/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA2C;AAC3C,qDAAmC;AACnC,2CAAyB;AACzB,yCAAuB;AACvB,8CAA4B","sourcesContent":["export * from './AbstractExecutionService';\nexport * from './ExecutionService';\nexport * from './iframe';\nexport * from './node';\nexport * from './offscreen';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6DAA2C;AAC3C,qDAAmC;AACnC,2DAAyC;AACzC,2CAAyB;AACzB,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAwD;AAA/C,sHAAA,yBAAyB,OAAA","sourcesContent":["export * from './AbstractExecutionService';\nexport * from './ExecutionService';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './node';\nexport * from './offscreen';\nexport { WebWorkerExecutionService } from './webworker';\n"]}

package/dist/services/offscreen/OffscreenExecutionService.d.ts

@@ -1,5 +1,5 @@
 import { AbstractExecutionService, ExecutionServiceArgs, Job } from '../AbstractExecutionService';
-import { OffscreenPostMessageStream } from './OffscreenPostMessageStream';
+import { ProxyPostMessageStream } from '../ProxyPostMessageStream';
 declare type OffscreenExecutionEnvironmentServiceArgs = {
     documentUrl: URL;
     frameUrl: URL;
@@ -37,7 +37,7 @@ export declare class OffscreenExecutionService extends AbstractExecutionService<
      */
     protected initEnvStream(jobId: string): Promise<{
         worker: string;
-        stream: OffscreenPostMessageStream;
+        stream: ProxyPostMessageStream;
     }>;
     /**
      * Creates the offscreen document to be used as the execution environment.

package/dist/services/offscreen/OffscreenExecutionService.js

@@ -16,7 +16,7 @@ exports.OffscreenExecutionService = void 0;
 const post_message_stream_1 = require("@metamask/post-message-stream");
 const nanoid_1 = require("nanoid");
 const AbstractExecutionService_1 = require("../AbstractExecutionService");
-const OffscreenPostMessageStream_1 = require("./OffscreenPostMessageStream");
+const ProxyPostMessageStream_1 = require("../ProxyPostMessageStream");
 class OffscreenExecutionService extends AbstractExecutionService_1.AbstractExecutionService {
     /**
      * Create a new offscreen execution service.
@@ -71,9 +71,14 @@ class OffscreenExecutionService extends AbstractExecutionService_1.AbstractExecu
     async initEnvStream(jobId) {
         // Lazily create the offscreen document.
         await this.createDocument();
-        const stream = new OffscreenPostMessageStream_1.OffscreenPostMessageStream({
+        const stream = new ProxyPostMessageStream_1.ProxyPostMessageStream({
             stream: __classPrivateFieldGet(this, _OffscreenExecutionService_runtimeStream, "f"),
-            frameUrl: this.frameUrl.toString(),
+            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 };

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

@@ -1 +1 @@
-{"version":3,"file":"OffscreenExecutionService.js","sourceRoot":"","sources":["../../../src/services/offscreen/OffscreenExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAAgF;AAChF,mCAAgC;AAEhC,0EAIqC;AACrC,6EAA0E;AAO1E,MAAa,yBAA0B,SAAQ,mDAAgC;IAO7E;;;;;;;;;;;;;OAaG;IACH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,SAAS,EACT,iBAAiB,GACwB;QACzC,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAzBL,2DAAyD;QA2BvD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,uBAAA,IAAI,4CAAkB,IAAI,qDAA+B,CAAC;YACxD,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC,MAAA,CAAC;IACL,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAAgB;QAC3C,0EAA0E;QAC1E,8CAA8C;QAC9C,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;;;;;OAKG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,wCAAwC;QACxC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,MAAM,MAAM,GAAG,IAAI,uDAA0B,CAAC;YAC5C,MAAM,EAAE,uBAAA,IAAI,gDAAe;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YAClC,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,cAAc;QAC1B,wDAAwD;QACxD,IAAI,MAAM,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE;YACxC,OAAO;SACR;QAED,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;YACpC,aAAa,EAAE,sCAAsC;YACrD,OAAO,EAAE,CAAC,kBAAkB,CAAC;YAC7B,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;SACjC,CAAC,CAAC;IACL,CAAC;CACF;AA9FD,8DA8FC","sourcesContent":["import { BrowserRuntimePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport {\n  AbstractExecutionService,\n  ExecutionServiceArgs,\n  Job,\n} from '../AbstractExecutionService';\nimport { OffscreenPostMessageStream } from './OffscreenPostMessageStream';\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 OffscreenPostMessageStream({\n      stream: this.#runtimeStream,\n      frameUrl: this.frameUrl.toString(),\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'],\n      url: this.documentUrl.toString(),\n    });\n  }\n}\n"]}
+{"version":3,"file":"OffscreenExecutionService.js","sourceRoot":"","sources":["../../../src/services/offscreen/OffscreenExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAAgF;AAChF,mCAAgC;AAEhC,0EAIqC;AACrC,sEAAmE;AAOnE,MAAa,yBAA0B,SAAQ,mDAAgC;IAO7E;;;;;;;;;;;;;OAaG;IACH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,SAAS,EACT,iBAAiB,GACwB;QACzC,KAAK,CAAC;YACJ,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QAzBL,2DAAyD;QA2BvD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,uBAAA,IAAI,4CAAkB,IAAI,qDAA+B,CAAC;YACxD,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC,MAAA,CAAC;IACL,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,YAAY,CAAC,GAAgB;QAC3C,0EAA0E;QAC1E,8CAA8C;QAC9C,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;;;;;OAKG;IACO,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,wCAAwC;QACxC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,MAAM,MAAM,GAAG,IAAI,+CAAsB,CAAC;YACxC,MAAM,EAAE,uBAAA,IAAI,gDAAe;YAC3B,KAAK,EAAE;gBACL,oEAAoE;gBACpE,sEAAsE;gBACtE,oDAAoD;gBACpD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACnC;YACD,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,cAAc;QAC1B,wDAAwD;QACxD,IAAI,MAAM,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE;YACxC,OAAO;SACR;QAED,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;YACpC,aAAa,EAAE,sCAAsC;YACrD,OAAO,EAAE,CAAC,kBAAkB,CAAC;YAC7B,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;SACjC,CAAC,CAAC;IACL,CAAC;CACF;AAnGD,8DAmGC","sourcesContent":["import { BrowserRuntimePostMessageStream } from '@metamask/post-message-stream';\nimport { nanoid } from 'nanoid';\n\nimport {\n  AbstractExecutionService,\n  ExecutionServiceArgs,\n  Job,\n} 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'],\n      url: this.documentUrl.toString(),\n    });\n  }\n}\n"]}

package/dist/services/offscreen/index.d.ts

@@ -1,2 +1 @@
 export * from './OffscreenExecutionService';
-export * from './OffscreenPostMessageStream';

package/dist/services/offscreen/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./OffscreenExecutionService"), exports);
-__exportStar(require("./OffscreenPostMessageStream"), exports);
 //# sourceMappingURL=index.js.map

package/dist/services/offscreen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/offscreen/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C;AAC5C,+DAA6C","sourcesContent":["export * from './OffscreenExecutionService';\nexport * from './OffscreenPostMessageStream';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/offscreen/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C","sourcesContent":["export * from './OffscreenExecutionService';\n"]}

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

@@ -0,0 +1,44 @@
+import { AbstractExecutionService, ExecutionServiceArgs, Job } from '../AbstractExecutionService';
+import { ProxyPostMessageStream } from '../ProxyPostMessageStream';
+declare type WebWorkerExecutionEnvironmentServiceArgs = {
+    documentUrl: URL;
+} & ExecutionServiceArgs;
+export declare const WORKER_POOL_ID = "snaps-worker-pool";
+export declare class WebWorkerExecutionService extends AbstractExecutionService<string> {
+    #private;
+    /**
+     * Create a new webworker execution service.
+     *
+     * @param args - The constructor arguments.
+     * @param args.documentUrl - The URL of the worker pool document to use as the
+     * execution environment.
+     * @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, messenger, setupSnapProvider, }: WebWorkerExecutionEnvironmentServiceArgs);
+    /**
+     * Send a termination command to the worker pool document.
+     *
+     * @param job - The job to terminate.
+     */
+    protected terminateJob(job: Job<string>): Promise<void>;
+    /**
+     * Create a new stream for the specified job. This wraps the runtime stream
+     * in a stream specific to the job.
+     *
+     * @param jobId - The job ID.
+     */
+    protected initEnvStream(jobId: string): Promise<{
+        worker: string;
+        stream: ProxyPostMessageStream;
+    }>;
+    /**
+     * Creates the worker pool document to be used as the execution environment.
+     *
+     * If the document already exists, this does nothing.
+     */
+    private createDocument;
+}
+export {};

package/dist/services/webworker/WebWorkerExecutionService.js

@@ -0,0 +1,100 @@
+"use strict";
+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 _WebWorkerExecutionService_documentUrl, _WebWorkerExecutionService_runtimeStream;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebWorkerExecutionService = exports.WORKER_POOL_ID = void 0;
+const post_message_stream_1 = require("@metamask/post-message-stream");
+const snaps_utils_1 = require("@metamask/snaps-utils");
+const utils_1 = require("@metamask/utils");
+const nanoid_1 = require("nanoid");
+const AbstractExecutionService_1 = require("../AbstractExecutionService");
+const ProxyPostMessageStream_1 = require("../ProxyPostMessageStream");
+exports.WORKER_POOL_ID = 'snaps-worker-pool';
+class WebWorkerExecutionService extends AbstractExecutionService_1.AbstractExecutionService {
+    /**
+     * Create a new webworker execution service.
+     *
+     * @param args - The constructor arguments.
+     * @param args.documentUrl - The URL of the worker pool document to use as the
+     * execution environment.
+     * @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, messenger, setupSnapProvider, }) {
+        super({
+            messenger,
+            setupSnapProvider,
+        });
+        _WebWorkerExecutionService_documentUrl.set(this, void 0);
+        _WebWorkerExecutionService_runtimeStream.set(this, void 0);
+        __classPrivateFieldSet(this, _WebWorkerExecutionService_documentUrl, documentUrl, "f");
+    }
+    /**
+     * Send a termination command to the worker pool 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.
+        (0, utils_1.assert)(__classPrivateFieldGet(this, _WebWorkerExecutionService_runtimeStream, "f"), 'Runtime stream not initialized.');
+        __classPrivateFieldGet(this, _WebWorkerExecutionService_runtimeStream, "f").write({
+            jobId: job.id,
+            data: {
+                jsonrpc: '2.0',
+                method: 'terminateJob',
+                id: (0, nanoid_1.nanoid)(),
+            },
+        });
+    }
+    /**
+     * Create a new stream for the specified job. This wraps the runtime stream
+     * in a stream specific to the job.
+     *
+     * @param jobId - The job ID.
+     */
+    async initEnvStream(jobId) {
+        // Lazily create the worker pool document.
+        await this.createDocument();
+        // `createDocument` should have initialized the runtime stream.
+        (0, utils_1.assert)(__classPrivateFieldGet(this, _WebWorkerExecutionService_runtimeStream, "f"), 'Runtime stream not initialized.');
+        const stream = new ProxyPostMessageStream_1.ProxyPostMessageStream({
+            stream: __classPrivateFieldGet(this, _WebWorkerExecutionService_runtimeStream, "f"),
+            jobId,
+        });
+        return { worker: jobId, stream };
+    }
+    /**
+     * Creates the worker pool document to be used as the execution environment.
+     *
+     * If the document already exists, this does nothing.
+     */
+    async createDocument() {
+        // We only want to create a single pool.
+        if (document.getElementById(exports.WORKER_POOL_ID)) {
+            return;
+        }
+        const window = await (0, snaps_utils_1.createWindow)(__classPrivateFieldGet(this, _WebWorkerExecutionService_documentUrl, "f").href, exports.WORKER_POOL_ID, false);
+        __classPrivateFieldSet(this, _WebWorkerExecutionService_runtimeStream, new post_message_stream_1.WindowPostMessageStream({
+            name: 'parent',
+            target: 'child',
+            targetWindow: window,
+            targetOrigin: '*',
+        }), "f");
+    }
+}
+exports.WebWorkerExecutionService = WebWorkerExecutionService;
+_WebWorkerExecutionService_documentUrl = new WeakMap(), _WebWorkerExecutionService_runtimeStream = new WeakMap();
+//# sourceMappingURL=WebWorkerExecutionService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WebWorkerExecutionService.js","sourceRoot":"","sources":["../../../src/services/webworker/WebWorkerExecutionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAGuC;AACvC,uDAAqD;AACrD,2CAAyC;AACzC,mCAAgC;AAEhC,0EAIqC;AACrC,sEAAmE;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,GAAgB;QAC3C,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;;;;;OAKG;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;YAC3C,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAY,EAC/B,uBAAA,IAAI,8CAAa,CAAC,IAAI,EACtB,sBAAc,EACd,KAAK,CACN,CAAC;QAEF,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;AA7FD,8DA6FC","sourcesContent":["import {\n  BasePostMessageStream,\n  WindowPostMessageStream,\n} from '@metamask/post-message-stream';\nimport { createWindow } from '@metamask/snaps-utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport {\n  AbstractExecutionService,\n  ExecutionServiceArgs,\n  Job,\n} 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: Job<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   */\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      this.#documentUrl.href,\n      WORKER_POOL_ID,\n      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/index.d.ts

@@ -0,0 +1 @@
+export * from './WebWorkerExecutionService';

package/dist/services/webworker/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./WebWorkerExecutionService"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/webworker/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/webworker/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C","sourcesContent":["export * from './WebWorkerExecutionService';\n"]}

package/dist/snaps/SnapController.d.ts

@@ -1,9 +1,8 @@
 import { AddApprovalRequest, UpdateRequestState } from '@metamask/approval-controller';
 import { BaseControllerV2 as BaseController, RestrictedControllerMessenger } from '@metamask/base-controller';
-import { GetEndowments, GetPermissions, GetSubjects, GrantPermissions, HasPermission, HasPermissions, RevokeAllPermissions, RevokePermissionForAllSubjects, RevokePermissions, UpdateCaveat } from '@metamask/permission-controller';
+import { GetEndowments, GetPermissions, GetSubjects, GrantPermissions, HasPermission, HasPermissions, RevokeAllPermissions, RevokePermissionForAllSubjects, RevokePermissions, UpdateCaveat, GetSubjectMetadata } from '@metamask/permission-controller';
 import { BlockReason } from '@metamask/snaps-registry';
 import { InstallSnapsResult, PersistedSnap, RequestedSnapPermissions, Snap, SnapId, SnapRpcHook, SnapRpcHookArgs, SnapStatusEvents, StatusContext, StatusEvents, StatusStates, TruncatedSnap, ValidatedSnapId } from '@metamask/snaps-utils';
-import { GetSubjectMetadata } from '@metamask/subject-metadata-controller';
 import { Json } from '@metamask/utils';
 import { StateMachine } from '@xstate/fsm';
 import type { Patch } from 'immer';
@@ -175,7 +174,11 @@ export declare type GetRegistryMetadata = {
     type: `${typeof controllerName}:getRegistryMetadata`;
     handler: SnapController['getRegistryMetadata'];
 };
-export declare type SnapControllerActions = ClearSnapState | GetSnap | GetSnapState | HandleSnapRequest | HasSnap | UpdateBlockedSnaps | UpdateSnapState | EnableSnap | DisableSnap | RemoveSnap | GetPermittedSnaps | InstallSnaps | RemoveSnapError | GetAllSnaps | IncrementActiveReferences | DecrementActiveReferences | GetRegistryMetadata;
+export declare type DisconnectOrigin = {
+    type: `${typeof controllerName}:disconnectOrigin`;
+    handler: SnapController['removeSnapFromSubject'];
+};
+export declare type SnapControllerActions = ClearSnapState | GetSnap | GetSnapState | HandleSnapRequest | HasSnap | UpdateBlockedSnaps | UpdateSnapState | EnableSnap | DisableSnap | RemoveSnap | GetPermittedSnaps | InstallSnaps | RemoveSnapError | GetAllSnaps | IncrementActiveReferences | DecrementActiveReferences | GetRegistryMetadata | DisconnectOrigin;
 export declare type SnapStateChange = {
     type: `${typeof controllerName}:stateChange`;
     payload: [SnapControllerState, Patch[]];
@@ -466,6 +469,13 @@ export declare class SnapController extends BaseController<string, SnapControlle
      * @param snapIds - The ids of the Snaps.
      */
     removeSnaps(snapIds: string[]): Promise<void>;
+    /**
+     * Removes a snap's permission (caveat) from the specified subject.
+     *
+     * @param origin - The origin from which to remove the snap.
+     * @param snapId - The id of the snap to remove.
+     */
+    removeSnapFromSubject(origin: string, snapId: SnapId): void;
     /**
      * Safely revokes all permissions granted to a Snap.
      *

package/dist/snaps/SnapController.js

@@ -14,9 +14,9 @@ var _SnapController_instances, _SnapController_closeAllConnections, _SnapControl
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapController = exports.SNAP_APPROVAL_RESULT = exports.SNAP_APPROVAL_UPDATE = exports.SNAP_APPROVAL_INSTALL = exports.controllerName = void 0;
 const base_controller_1 = require("@metamask/base-controller");
+const permission_controller_1 = require("@metamask/permission-controller");
 const rpc_methods_1 = require("@metamask/rpc-methods");
 const snaps_utils_1 = require("@metamask/snaps-utils");
-const subject_metadata_controller_1 = require("@metamask/subject-metadata-controller");
 const utils_1 = require("@metamask/utils");
 const fsm_1 = require("@xstate/fsm");
 const eth_rpc_errors_1 = require("eth-rpc-errors");
@@ -469,6 +469,34 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             this.messagingSystem.publish(`SnapController:snapRemoved`, truncated);
         }));
     }
+    /**
+     * Removes a snap's permission (caveat) from the specified subject.
+     *
+     * @param origin - The origin from which to remove the snap.
+     * @param snapId - The id of the snap to remove.
+     */
+    removeSnapFromSubject(origin, snapId) {
+        const subjectPermissions = this.messagingSystem.call('PermissionController:getPermissions', origin);
+        const snapIdsCaveat = subjectPermissions?.[rpc_methods_1.WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === snaps_utils_1.SnapCaveatType.SnapIds);
+        if (!snapIdsCaveat) {
+            return;
+        }
+        const caveatHasSnap = Boolean(snapIdsCaveat.value?.[snapId]);
+        if (caveatHasSnap) {
+            const newCaveatValue = {
+                ...snapIdsCaveat.value,
+            };
+            delete newCaveatValue[snapId];
+            if (Object.keys(newCaveatValue).length > 0) {
+                this.messagingSystem.call('PermissionController:updateCaveat', origin, rpc_methods_1.WALLET_SNAP_PERMISSION_KEY, snaps_utils_1.SnapCaveatType.SnapIds, newCaveatValue);
+            }
+            else {
+                this.messagingSystem.call('PermissionController:revokePermissions', {
+                    [origin]: [rpc_methods_1.WALLET_SNAP_PERMISSION_KEY],
+                });
+            }
+        }
+    }
     /**
      * Safely revokes all permissions granted to a Snap.
      *
@@ -645,7 +673,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             return truncated;
         }
         catch (error) {
-            (0, snaps_utils_1.logError)(`Error when adding snap.`, error);
+            (0, snaps_utils_1.logError)(`Error when adding ${snapId}.`, error);
             __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
                 loading: false,
                 type: exports.SNAP_APPROVAL_INSTALL,
@@ -762,7 +790,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             return truncatedSnap;
         }
         catch (error) {
-            (0, snaps_utils_1.logError)(`Error when updating snap,`, error);
+            (0, snaps_utils_1.logError)(`Error when updating ${snapId},`, error);
             __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
                 loading: false,
                 error: error instanceof Error ? error.message : error.toString(),
@@ -846,7 +874,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         }
         if (permissionName === endowments_1.SnapEndowments.Rpc) {
             const subject = this.messagingSystem.call('SubjectMetadataController:getSubjectMetadata', origin);
-            const isSnap = subject?.subjectType === subject_metadata_controller_1.SubjectType.Snap;
+            const isSnap = subject?.subjectType === permission_controller_1.SubjectType.Snap;
             const permissions = this.messagingSystem.call('PermissionController:getPermissions', snapId);
             const rpcPermission = permissions?.[endowments_1.SnapEndowments.Rpc];
             (0, utils_1.assert)(rpcPermission);
@@ -934,6 +962,7 @@ _SnapController_closeAllConnections = new WeakMap(), _SnapController_environment
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:incrementActiveReferences`, (...args) => this.incrementActiveReferences(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:decrementActiveReferences`, (...args) => this.decrementActiveReferences(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:getRegistryMetadata`, async (...args) => this.getRegistryMetadata(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:disconnectOrigin`, (...args) => this.removeSnapFromSubject(...args));
 }, _SnapController_pollForLastRequestStatus = function _SnapController_pollForLastRequestStatus() {
     __classPrivateFieldSet(this, _SnapController_timeoutForLastRequestStatus, setTimeout(() => {
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_stopSnapsLastRequestPastMax).call(this).catch((error) => {
@@ -1014,24 +1043,7 @@ async function _SnapController_terminateSnap(snapId) {
 }, _SnapController_removeSnapFromSubjects = function _SnapController_removeSnapFromSubjects(snapId) {
     const subjects = this.messagingSystem.call('PermissionController:getSubjectNames');
     for (const subject of subjects) {
-        const subjectPermissions = this.messagingSystem.call('PermissionController:getPermissions', subject);
-        const snapIdsCaveat = (subjectPermissions?.[rpc_methods_1.WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === snaps_utils_1.SnapCaveatType.SnapIds) ??
-            {});
-        const caveatHasSnap = Boolean(snapIdsCaveat.value?.[snapId]);
-        if (caveatHasSnap) {
-            const newCaveatValue = {
-                ...snapIdsCaveat.value,
-            };
-            delete newCaveatValue[snapId];
-            if (Object.keys(newCaveatValue).length > 0) {
-                this.messagingSystem.call('PermissionController:updateCaveat', subject, rpc_methods_1.WALLET_SNAP_PERMISSION_KEY, snaps_utils_1.SnapCaveatType.SnapIds, newCaveatValue);
-            }
-            else {
-                this.messagingSystem.call('PermissionController:revokePermissions', {
-                    [subject]: [rpc_methods_1.WALLET_SNAP_PERMISSION_KEY],
-                });
-            }
-        }
+        this.removeSnapFromSubject(subject, snapId);
     }
 }, _SnapController_createApproval = function _SnapController_createApproval({ origin, snapId, type, }) {
     const id = (0, nanoid_1.nanoid)();
@@ -1156,7 +1168,7 @@ async function _SnapController_getEndowments(snapId) {
         // This is a bug in TypeScript: https://github.com/microsoft/TypeScript/issues/48313
         // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
         snaps_utils_1.DEFAULT_ENDOWMENTS.length + allEndowments.length) {
-        (0, snaps_utils_1.logError)('Duplicate endowments found. Default endowments should not be requested.', allEndowments);
+        (0, snaps_utils_1.logError)(`Duplicate endowments found for ${snapId}. Default endowments should not be requested.`, allEndowments);
     }
     return dedupedEndowments;
 }, _SnapController_set = function _SnapController_set(args) {