@metamask/snaps-controllers 14.0.1 → 14.0.2

package/dist/services/webview/WebViewExecutionService.mjs

@@ -20,6 +20,7 @@ export class WebViewExecutionService extends AbstractExecutionService {
      * @returns An object with the webview and stream.
      */
     async initEnvStream(snapId) {
+        this.setSnapStatus(snapId, 'initializing');
         const webView = await this.#createWebView(snapId);
         const stream = new WebViewMessageStream({
             name: 'parent',

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,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    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,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"]}

package/dist/snaps/SnapController.cjs

@@ -1844,7 +1844,10 @@ class SnapController extends base_controller_1.BaseController {
         try {
             const result = await (0, utils_2.withTimeout)(handleRpcRequestPromise, timer);
             if (result === utils_2.hasTimedOut) {
-                throw new Error(`${snapId} failed to respond to the request in time.`);
+                const stopping = runtime.stopPromise !== null || !this.isRunning(snapId);
+                throw new Error(stopping
+                    ? `${snapId} was stopped and the request was cancelled. This is likely because the Snap crashed.`
+                    : `${snapId} failed to respond to the request in time.`);
             }
             await this.#assertSnapRpcResponse(snapId, handlerType, result);
             const transformedResult = await this.#transformSnapRpcResponse(snapId, handlerType, transformedRequest, result);