@metamask/snaps-controllers 17.2.0 → 18.0.0

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

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;AACA,qEAA8D;AAC9D,8EAAuE;AAWvE,MAAa,uBAAwB,SAAQ,mDAA0C;IAC5E,cAAc,CAAC;IAEf,cAAc,CAAC;IAExB,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,MAAc;QAC1C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,2CAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,YAAY,CAAC,UAA8C;QACnE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF;AA7CD,0DA6CC","sourcesContent":["import type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified Snap. This wraps the runtime stream\n   * in a stream specific to the Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @returns An object with the webview and stream.\n   */\n  protected async initEnvStream(snapId: string) {\n    this.setSnapStatus(snapId, 'initializing');\n\n    const webView = await this.#createWebView(snapId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}
+{"version":3,"file":"WebViewExecutionService.cjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":";;;AACA,qEAA8D;AAC9D,8EAAuE;AAWvE,MAAa,uBAAwB,SAAQ,mDAA0C;IAC5E,cAAc,CAAC;IAEf,cAAc,CAAC;IAExB,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,MAAc;QAC1C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,2CAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,UAA8C;QAE9C,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF;AA/CD,0DA+CC","sourcesContent":["import type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified Snap. This wraps the runtime stream\n   * in a stream specific to the Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @returns An object with the webview and stream.\n   */\n  protected async initEnvStream(snapId: string) {\n    this.setSnapStatus(snapId, 'initializing');\n\n    const webView = await this.#createWebView(snapId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected async terminateJob(\n    jobWrapper: TerminateJobArgs<WebViewInterface>,\n  ): Promise<void> {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}

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

@@ -20,6 +20,6 @@ export declare class WebViewExecutionService extends AbstractExecutionService<We
         worker: WebViewInterface;
         stream: WebViewMessageStream;
     }>;
-    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void;
+    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): Promise<void>;
 }
 //# sourceMappingURL=WebViewExecutionService.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AAErC,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,MAAM,EAAE,MAAM;;;;IAc5C,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,IAAI;CAG7E"}
+{"version":3,"file":"WebViewExecutionService.d.cts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AAErC,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,MAAM,EAAE,MAAM;;;;cAc5B,YAAY,CAC1B,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;CAGjB"}

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

@@ -20,6 +20,6 @@ export declare class WebViewExecutionService extends AbstractExecutionService<We
         worker: WebViewInterface;
         stream: WebViewMessageStream;
     }>;
-    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void;
+    protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): Promise<void>;
 }
 //# sourceMappingURL=WebViewExecutionService.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AAErC,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,MAAM,EAAE,MAAM;;;;IAc5C,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,IAAI;CAG7E"}
+{"version":3,"file":"WebViewExecutionService.d.mts","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mCAA+B;AAC/D,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AACvE,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,wCAAoC;AAErC,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAAG;IAC/D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,uBAAwB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;;gBAKzE,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,EAAE,2BAA2B;IAU9B;;;;;;OAMG;cACa,aAAa,CAAC,MAAM,EAAE,MAAM;;;;cAc5B,YAAY,CAC1B,UAAU,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;CAGjB"}

package/dist/services/webview/WebViewExecutionService.mjs

@@ -29,7 +29,7 @@ export class WebViewExecutionService extends AbstractExecutionService {
         });
         return { worker: webView, stream };
     }
-    terminateJob(jobWrapper) {
+    async terminateJob(jobWrapper) {
         this.#removeWebView(jobWrapper.id);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"WebViewExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AAWvE,MAAM,OAAO,uBAAwB,SAAQ,wBAA0C;IAC5E,cAAc,CAAC;IAEf,cAAc,CAAC;IAExB,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,MAAc;QAC1C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,YAAY,CAAC,UAA8C;QACnE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF","sourcesContent":["import type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified Snap. This wraps the runtime stream\n   * in a stream specific to the Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @returns An object with the webview and stream.\n   */\n  protected async initEnvStream(snapId: string) {\n    this.setSnapStatus(snapId, 'initializing');\n\n    const webView = await this.#createWebView(snapId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected terminateJob(jobWrapper: TerminateJobArgs<WebViewInterface>): void {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}
+{"version":3,"file":"WebViewExecutionService.mjs","sourceRoot":"","sources":["../../../src/services/webview/WebViewExecutionService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,mCAA+B;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wCAAoC;AAWvE,MAAM,OAAO,uBAAwB,SAAQ,wBAA0C;IAC5E,cAAc,CAAC;IAEf,cAAc,CAAC;IAExB,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACqB;QAC5B,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,SAAS;YACT,iBAAiB;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,aAAa,CAAC,MAAc;QAC1C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC;YACtC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,UAA8C;QAE9C,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACF","sourcesContent":["import type { WebViewInterface } from './WebViewMessageStream';\nimport { WebViewMessageStream } from './WebViewMessageStream';\nimport { AbstractExecutionService } from '../AbstractExecutionService';\nimport type {\n  ExecutionServiceArgs,\n  TerminateJobArgs,\n} from '../AbstractExecutionService';\n\nexport type WebViewExecutionServiceArgs = ExecutionServiceArgs & {\n  createWebView: (jobId: string) => Promise<WebViewInterface>;\n  removeWebView: (jobId: string) => void;\n};\n\nexport class WebViewExecutionService extends AbstractExecutionService<WebViewInterface> {\n  readonly #createWebView;\n\n  readonly #removeWebView;\n\n  constructor({\n    messenger,\n    setupSnapProvider,\n    createWebView,\n    removeWebView,\n    ...args\n  }: WebViewExecutionServiceArgs) {\n    super({\n      ...args,\n      messenger,\n      setupSnapProvider,\n    });\n    this.#createWebView = createWebView;\n    this.#removeWebView = removeWebView;\n  }\n\n  /**\n   * Create a new stream for the specified Snap. This wraps the runtime stream\n   * in a stream specific to the Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @returns An object with the webview and stream.\n   */\n  protected async initEnvStream(snapId: string) {\n    this.setSnapStatus(snapId, 'initializing');\n\n    const webView = await this.#createWebView(snapId);\n\n    const stream = new WebViewMessageStream({\n      name: 'parent',\n      target: 'child',\n      webView,\n    });\n\n    return { worker: webView, stream };\n  }\n\n  protected async terminateJob(\n    jobWrapper: TerminateJobArgs<WebViewInterface>,\n  ): Promise<void> {\n    this.#removeWebView(jobWrapper.id);\n  }\n}\n"]}

package/dist/snaps/SnapController.cjs

@@ -61,7 +61,6 @@ function truncateSnap(snap) {
  * - Start: Initializes the snap in its SES realm with the authorized permissions.
  */
 class SnapController extends base_controller_1.BaseController {
-    #closeAllConnections;
     #dynamicPermissions;
     #environmentEndowmentPermissions;
     #excludedPermissions;
@@ -85,7 +84,12 @@ class SnapController extends base_controller_1.BaseController {
     #trackEvent;
     #trackSnapExport;
     #ensureOnboardingComplete;
-    constructor({ closeAllConnections, messenger, state, dynamicPermissions = ['endowment:caip25', 'wallet_snap'], environmentEndowmentPermissions = [], excludedPermissions = {}, idleTimeCheckInterval = (0, utils_1.inMilliseconds)(5, utils_1.Duration.Second), maxIdleTime = (0, utils_1.inMilliseconds)(30, utils_1.Duration.Second), maxRequestTime = (0, utils_1.inMilliseconds)(60, utils_1.Duration.Second), fetchFunction = globalThis.fetch.bind(undefined), featureFlags = {}, detectSnapLocation: detectSnapLocationFunction = location_1.detectSnapLocation, preinstalledSnaps = null, encryptor, getMnemonicSeed, getFeatureFlags = () => ({}), clientCryptography, trackEvent, ensureOnboardingComplete, }) {
+    // A promise that resolves when the controller has finished setting up.
+    // This is used to ensure that the controller is ready to be used.
+    // It is resolved when the controller has finished setting up and the platform is ready.
+    // It is rejected if there is an error during setup.
+    #controllerSetup = (0, utils_1.createDeferredPromise)();
+    constructor({ messenger, state, dynamicPermissions = ['endowment:caip25', 'wallet_snap'], environmentEndowmentPermissions = [], excludedPermissions = {}, idleTimeCheckInterval = (0, utils_1.inMilliseconds)(5, utils_1.Duration.Second), maxIdleTime = (0, utils_1.inMilliseconds)(30, utils_1.Duration.Second), maxRequestTime = (0, utils_1.inMilliseconds)(60, utils_1.Duration.Second), fetchFunction = globalThis.fetch.bind(undefined), featureFlags = {}, detectSnapLocation: detectSnapLocationFunction = location_1.detectSnapLocation, preinstalledSnaps = null, encryptor, getMnemonicSeed, getFeatureFlags = () => ({}), clientCryptography, trackEvent, ensureOnboardingComplete, }) {
         super({
             messenger,
             metadata: {
@@ -112,7 +116,6 @@ class SnapController extends base_controller_1.BaseController {
                         // Delete larger snap properties
                         return Object.values(snaps).reduce((acc, snap) => {
                             const snapCopy = { ...snap };
-                            delete snapCopy.sourceCode;
                             delete snapCopy.auxiliaryFiles;
                             acc[snap.id] = snapCopy;
                             return acc;
@@ -147,7 +150,6 @@ class SnapController extends base_controller_1.BaseController {
                 ...state,
             },
         });
-        this.#closeAllConnections = closeAllConnections;
         this.#dynamicPermissions = dynamicPermissions;
         this.#environmentEndowmentPermissions = environmentEndowmentPermissions;
         this.#excludedPermissions = excludedPermissions;
@@ -186,12 +188,14 @@ class SnapController extends base_controller_1.BaseController {
             });
         });
         this.messenger.subscribe('KeyringController:lock', this.#handleLock.bind(this));
+        this.messenger.subscribe('SnapsRegistry:stateChange', () => {
+            this.#handleRegistryUpdate().catch((error) => {
+                (0, snaps_utils_1.logError)(`Error when processing Snaps registry update: ${(0, snaps_sdk_1.getErrorMessage)(error)}`);
+            });
+        }, ({ database }) => database);
         this.#initializeStateMachine();
         this.#registerMessageHandlers();
         Object.values(this.state?.snaps ?? {}).forEach((snap) => this.#setupRuntime(snap.id));
-        if (this.#preinstalledSnaps) {
-            this.#handlePreinstalledSnaps(this.#preinstalledSnaps);
-        }
         this.#trackSnapExport = (0, utils_2.throttleTracking)((snapId, handler, success, origin) => {
             const snapMetadata = this.messenger.call('SnapsRegistry:getMetadata', snapId);
             this.#trackEvent({
@@ -276,7 +280,7 @@ class SnapController extends base_controller_1.BaseController {
      * actions.
      */
     #registerMessageHandlers() {
-        this.messenger.registerActionHandler(`${exports.controllerName}:init`, (...args) => this.init(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:init`, async (...args) => this.init(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:clearSnapState`, (...args) => this.clearSnapState(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:get`, (...args) => this.get(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:getSnapState`, async (...args) => this.getSnapState(...args));
@@ -303,15 +307,25 @@ class SnapController extends base_controller_1.BaseController {
     /**
      * Initialise the SnapController.
      *
-     * Currently this method calls the `onStart` lifecycle hook for all
+     * Currently this method sets up the controller and calls the `onStart` lifecycle hook for all
      * runnable Snaps.
      */
-    init() {
-        // Lazily populate the `isReady` state.
-        this.#ensureCanUsePlatform().catch(snaps_utils_1.logWarning);
-        this.#callLifecycleHooks(constants_1.METAMASK_ORIGIN, snaps_utils_1.HandlerType.OnStart);
+    async init() {
+        try {
+            if (this.#preinstalledSnaps) {
+                await this.#handlePreinstalledSnaps(this.#preinstalledSnaps);
+            }
+            this.#controllerSetup.resolve();
+            // Populate the `isReady` state.
+            await this.#ensureCanUsePlatform();
+            this.#callLifecycleHooks(constants_1.METAMASK_ORIGIN, snaps_utils_1.HandlerType.OnStart);
+        }
+        catch (error) {
+            this.#controllerSetup.reject(error);
+            (0, snaps_utils_1.logWarning)('Error during SnapController initialization.', error);
+        }
     }
-    #handlePreinstalledSnaps(preinstalledSnaps) {
+    async #handlePreinstalledSnaps(preinstalledSnaps) {
         for (const { snapId, manifest, files, removable, hidden, hideSnapBranding, } of preinstalledSnaps) {
             const existingSnap = this.get(snapId);
             const isAlreadyInstalled = existingSnap !== undefined;
@@ -346,7 +360,7 @@ class SnapController extends base_controller_1.BaseController {
                 localizationFiles: validatedLocalizationFiles,
             };
             // Add snap to the SnapController state
-            this.#set({
+            await this.#set({
                 id: snapId,
                 origin: constants_1.METAMASK_ORIGIN,
                 files: filesObject,
@@ -419,15 +433,22 @@ class SnapController extends base_controller_1.BaseController {
         }, this.#idleTimeCheckInterval);
     }
     /**
-     * Checks all installed snaps against the block list and
-     * blocks/unblocks snaps as appropriate. See {@link SnapController.blockSnap}
-     * for more information.
+     * Trigger an update of the registry.
      *
-     * Also updates any preinstalled Snaps to the latest allowlisted version.
+     * As a side-effect of this, preinstalled Snaps may be updated and Snaps may be blocked/unblocked.
      */
     async updateRegistry() {
         await this.#ensureCanUsePlatform();
         await this.messenger.call('SnapsRegistry:update');
+    }
+    /**
+     * Checks all installed Snaps against the blocklist and
+     * blocks/unblocks Snaps as appropriate. See {@link SnapController.blockSnap}
+     * for more information.
+     *
+     * Also updates any preinstalled Snaps to the latest allowlisted version.
+     */
+    async #handleRegistryUpdate() {
         const blockedSnaps = await this.messenger.call('SnapsRegistry:get', Object.values(this.state.snaps).reduce((blockListArg, snap) => {
             blockListArg[snap.id] = {
                 version: snap.version,
@@ -535,6 +556,8 @@ class SnapController extends base_controller_1.BaseController {
      * Waits for onboarding and then asserts whether the Snaps platform is allowed to run.
      */
     async #ensureCanUsePlatform() {
+        // Ensure the controller has finished setting up.
+        await this.#controllerSetup.promise;
         // Ensure the user has onboarded before allowing access to Snaps.
         await this.#ensureOnboardingComplete();
         const flags = this.#getFeatureFlags();
@@ -616,9 +639,10 @@ class SnapController extends base_controller_1.BaseController {
         if (!snap.enabled) {
             throw new Error(`Snap "${snapId}" is disabled.`);
         }
+        const sourceCode = await this.#getSourceCode(snapId);
         await this.#startSnap({
             snapId,
-            sourceCode: snap.sourceCode,
+            sourceCode,
         });
     }
     /**
@@ -679,7 +703,6 @@ class SnapController extends base_controller_1.BaseController {
         runtime.stopPromise = promise;
         try {
             if (this.isRunning(snapId)) {
-                this.#closeAllConnections?.(snapId);
                 await this.#terminateSnap(snapId);
             }
         }
@@ -1063,9 +1086,10 @@ class SnapController extends base_controller_1.BaseController {
         });
         this.#snapsRuntimeData.clear();
         this.#rollbackSnapshots.clear();
+        await this.#clearStorageService();
         // We want to remove all snaps & permissions, except for preinstalled snaps
         if (this.#preinstalledSnaps) {
-            this.#handlePreinstalledSnaps(this.#preinstalledSnaps);
+            await this.#handlePreinstalledSnaps(this.#preinstalledSnaps);
         }
     }
     /**
@@ -1107,6 +1131,7 @@ class SnapController extends base_controller_1.BaseController {
                 delete state.snapStates[snapId];
                 delete state.unencryptedSnapStates[snapId];
             });
+            await this.#removeSourceCode(snapId);
             // If the snap has been fully installed before, also emit snapUninstalled.
             if (snap.status !== snaps_utils_1.SnapStatus.Installing) {
                 this.messenger.publish(`SnapController:snapUninstalled`, truncated);
@@ -1532,7 +1557,7 @@ class SnapController extends base_controller_1.BaseController {
                 await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
             }
             this.#transition(snapId, snaps_utils_1.SnapStatusEvents.Update);
-            this.#set({
+            await this.#set({
                 origin,
                 id: snapId,
                 files: newSnap,
@@ -1719,7 +1744,7 @@ class SnapController extends base_controller_1.BaseController {
      * @param args - The add snap args.
      * @returns The resulting snap object.
      */
-    #set(args) {
+    async #set(args) {
         const { id: snapId, origin, files, isUpdate = false, removable, preinstalled, hidden, hideSnapBranding, } = args;
         const { manifest, sourceCode: sourceCodeFile, svgIcon, auxiliaryFiles: rawAuxiliaryFiles, localizationFiles, } = files;
         (0, snaps_utils_1.assertIsSnapManifest)(manifest.result);
@@ -1761,7 +1786,6 @@ class SnapController extends base_controller_1.BaseController {
             initialPermissions: manifest.result.initialPermissions,
             manifest: manifest.result,
             status: this.#statusMachine.config.initial,
-            sourceCode,
             version,
             versionHistory,
             auxiliaryFiles,
@@ -1778,9 +1802,14 @@ class SnapController extends base_controller_1.BaseController {
         if (isUpdate) {
             const rollbackSnapshot = this.#getRollbackSnapshot(snapId);
             if (rollbackSnapshot !== undefined) {
+                // Save statePatches first, before any async operations that might throw.
+                // This ensures rollback can revert state changes even if subsequent operations fail.
                 rollbackSnapshot.statePatches = inversePatches;
+                const previousSourceCode = await this.#getSourceCode(snapId);
+                rollbackSnapshot.previousSourceCode = previousSourceCode;
             }
         }
+        await this.#setSourceCode(snapId, sourceCode);
         // In case the Snap uses a localized manifest, we need to get the
         // proposed name from the localized manifest.
         const { proposedName } = (0, snaps_utils_1.getLocalizedSnapManifest)(manifest.result, 'en', localizedFiles);
@@ -2291,10 +2320,15 @@ class SnapController extends base_controller_1.BaseController {
         if (this.get(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
             this.#transition(snapId, snaps_utils_1.SnapStatusEvents.Stop);
         }
-        const { statePatches, permissions, previousInitialConnections, newInitialConnections, } = rollbackSnapshot;
+        const { statePatches, permissions, previousInitialConnections, newInitialConnections, previousSourceCode, } = rollbackSnapshot;
         if (statePatches?.length) {
             this.applyPatches(statePatches);
         }
+        // If the snap has a previous source code, set it back to the previous source code.
+        // If it doesn't, we don't need to set it back to the previous source code because it means we haven't updated the source code.
+        if (previousSourceCode) {
+            await this.#setSourceCode(snapId, previousSourceCode);
+        }
         // Reset snap status, as we may have been in another state when we stored state patches
         // But now we are 100% in a stopped state
         if (this.get(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
@@ -2531,6 +2565,57 @@ class SnapController extends base_controller_1.BaseController {
             runtime.state = undefined;
         }
     }
+    /**
+     * Retrieve the source code for a Snap from storage.
+     *
+     * @param snapId - The Snap ID.
+     * @returns The source code for the Snap.
+     */
+    async #getSourceCode(snapId) {
+        const storage = await this.#getStorage(snapId);
+        (0, utils_1.assert)(storage?.sourceCode, `Source code for Snap "${snapId}" not found.`);
+        return storage.sourceCode;
+    }
+    /**
+     * Retrieve the storage for a Snap from the StorageService.
+     *
+     * @param snapId - The Snap ID.
+     * @returns The storage for the Snap.
+     */
+    async #getStorage(snapId) {
+        const { result, error } = await this.messenger.call('StorageService:getItem', this.name, snapId);
+        (0, utils_1.assert)(!error, `Error retrieving storage for snap "${snapId}": ${error}`);
+        return result;
+    }
+    /**
+     * Store the source code for a Snap in storage.
+     * For now we call the StorageService with just the source code
+     * since that's all we store.
+     *
+     * @param snapId - The Snap ID.
+     * @param sourceCode - The source code for the Snap.
+     */
+    async #setSourceCode(snapId, sourceCode) {
+        await this.messenger.call('StorageService:setItem', this.name, snapId, {
+            sourceCode,
+        });
+    }
+    /**
+     * Remove the source code for a Snap from storage.
+     * Since we only store source code, this effectively
+     * removes all data for the Snap for now.
+     *
+     * @param snapId - The Snap ID.
+     */
+    async #removeSourceCode(snapId) {
+        await this.messenger.call('StorageService:removeItem', this.name, snapId);
+    }
+    /**
+     * Clear all Snap data from the StorageService.
+     */
+    async #clearStorageService() {
+        await this.messenger.call('StorageService:clear', this.name);
+    }
 }
 exports.SnapController = SnapController;
 //# sourceMappingURL=SnapController.cjs.map