@metamask/snaps-controllers 7.0.1 → 8.0.0

package/dist/{chunk-WVGK5B5P.mjs → chunk-IRVUYBSV.mjs}

@@ -4,7 +4,10 @@ import {
 import {
   hasTimedOut,
   withTimeout
-} from "./chunk-36YC4Z3T.mjs";
+} from "./chunk-GTDDODNP.mjs";
+import {
+  Timer
+} from "./chunk-XO7KDFBY.mjs";
 import {
   __privateAdd,
   __privateGet,
@@ -28,11 +31,12 @@ import {
 import { nanoid } from "nanoid";
 import { pipeline } from "readable-stream";
 var controllerName = "ExecutionService";
-var _snapRpcHooks, _snapToJobMap, _jobToSnapMap, _messenger, _pingTimeout, _terminationTimeout, _removeSnapHooks, removeSnapHooks_fn, _createSnapHooks, createSnapHooks_fn, _mapSnapAndJob, mapSnapAndJob_fn, _removeSnapAndJobMapping, removeSnapAndJobMapping_fn;
+var _snapRpcHooks, _snapToJobMap, _jobToSnapMap, _messenger, _initTimeout, _pingTimeout, _terminationTimeout, _removeSnapHooks, removeSnapHooks_fn, _createSnapHooks, createSnapHooks_fn, _mapSnapAndJob, mapSnapAndJob_fn, _removeSnapAndJobMapping, removeSnapAndJobMapping_fn;
 var AbstractExecutionService = class {
   constructor({
     setupSnapProvider,
     messenger,
+    initTimeout = inMilliseconds(60, Duration.Second),
     pingTimeout = inMilliseconds(2, Duration.Second),
     terminationTimeout = inMilliseconds(1, Duration.Second)
   }) {
@@ -44,6 +48,7 @@ var AbstractExecutionService = class {
     __privateAdd(this, _snapToJobMap, void 0);
     __privateAdd(this, _jobToSnapMap, void 0);
     __privateAdd(this, _messenger, void 0);
+    __privateAdd(this, _initTimeout, void 0);
     __privateAdd(this, _pingTimeout, void 0);
     __privateAdd(this, _terminationTimeout, void 0);
     __privateSet(this, _snapRpcHooks, /* @__PURE__ */ new Map());
@@ -52,6 +57,7 @@ var AbstractExecutionService = class {
     __privateSet(this, _snapToJobMap, /* @__PURE__ */ new Map());
     __privateSet(this, _jobToSnapMap, /* @__PURE__ */ new Map());
     __privateSet(this, _messenger, messenger);
+    __privateSet(this, _initTimeout, initTimeout);
     __privateSet(this, _pingTimeout, pingTimeout);
     __privateSet(this, _terminationTimeout, terminationTimeout);
     this.registerMessageHandlers();
@@ -67,7 +73,7 @@ var AbstractExecutionService = class {
     );
     __privateGet(this, _messenger).registerActionHandler(
       `${controllerName}:executeSnap`,
-      async (snapData) => this.executeSnap(snapData)
+      async (data) => this.executeSnap(data)
     );
     __privateGet(this, _messenger).registerActionHandler(
       `${controllerName}:terminateSnap`,
@@ -91,17 +97,20 @@ var AbstractExecutionService = class {
     if (!jobWrapper) {
       throw new Error(`Job with id "${jobId}" not found.`);
     }
-    const result = await withTimeout(
-      this.command(jobId, {
-        jsonrpc: "2.0",
-        method: "terminate",
-        params: [],
-        id: nanoid()
-      }),
-      __privateGet(this, _terminationTimeout)
-    );
-    if (result === hasTimedOut || result !== "OK") {
-      logError(`Job "${jobId}" failed to terminate gracefully.`, result);
+    try {
+      const result = await withTimeout(
+        this.command(jobId, {
+          jsonrpc: "2.0",
+          method: "terminate",
+          params: [],
+          id: nanoid()
+        }),
+        __privateGet(this, _terminationTimeout)
+      );
+      if (result === hasTimedOut || result !== "OK") {
+        logError(`Job "${jobId}" failed to terminate gracefully.`, result);
+      }
+    } catch {
     }
     Object.values(jobWrapper.streams).forEach((stream) => {
       try {
@@ -112,20 +121,20 @@ var AbstractExecutionService = class {
       }
     });
     this.terminateJob(jobWrapper);
-    __privateMethod(this, _removeSnapAndJobMapping, removeSnapAndJobMapping_fn).call(this, jobId);
     this.jobs.delete(jobId);
+    __privateMethod(this, _removeSnapAndJobMapping, removeSnapAndJobMapping_fn).call(this, jobId);
     log(`Job "${jobId}" terminated.`);
   }
   /**
    * Initiates a job for a snap.
    *
-   * Depending on the execution environment, this may run forever if the Snap fails to start up properly, therefore any call to this function should be wrapped in a timeout.
-   *
+   * @param jobId - The ID of the job to initiate.
+   * @param timer - The timer to use for timeouts.
    * @returns Information regarding the created job.
+   * @throws If the execution service returns an error or execution times out.
    */
-  async initJob() {
-    const jobId = nanoid();
-    const { streams, worker } = await this.initStreams(jobId);
+  async initJob(jobId, timer) {
+    const { streams, worker } = await this.initStreams(jobId, timer);
     const rpcEngine = new JsonRpcEngine();
     const jsonRpcConnection = createStreamMiddleware();
     pipeline(
@@ -151,13 +160,18 @@ var AbstractExecutionService = class {
   /**
    * Sets up the streams for an initiated job.
    *
-   * Depending on the execution environment, this may run forever if the Snap fails to start up properly, therefore any call to this function should be wrapped in a timeout.
-   *
    * @param jobId - The id of the job.
+   * @param timer - The timer to use for timeouts.
    * @returns The streams to communicate with the worker and the worker itself.
+   * @throws If the execution service returns an error or execution times out.
    */
-  async initStreams(jobId) {
-    const { worker, stream: envStream } = await this.initEnvStream(jobId);
+  async initStreams(jobId, timer) {
+    const result = await withTimeout(this.initEnvStream(jobId), timer);
+    if (result === hasTimedOut) {
+      this.terminateJob({ id: jobId });
+      throw new Error("The Snaps execution environment failed to start.");
+    }
+    const { worker, stream: envStream } = result;
     const mux = setupMultiplex(envStream, `Job: "${jobId}"`);
     const commandStream = mux.createStream(SNAP_STREAM_NAMES.COMMAND);
     const notificationHandler = (message) => {
@@ -235,18 +249,25 @@ var AbstractExecutionService = class {
   /**
    * Initializes and executes a snap, setting up the communication channels to the snap etc.
    *
-   * Depending on the execution environment, this may run forever if the Snap fails to start up properly, therefore any call to this function should be wrapped in a timeout.
-   *
    * @param snapData - Data needed for Snap execution.
+   * @param snapData.snapId - The ID of the Snap to execute.
+   * @param snapData.sourceCode - The source code of the Snap to execute.
+   * @param snapData.endowments - The endowments available to the executing Snap.
    * @returns A string `OK` if execution succeeded.
-   * @throws If the execution service returns an error.
+   * @throws If the execution service returns an error or execution times out.
    */
-  async executeSnap(snapData) {
-    if (__privateGet(this, _snapToJobMap).has(snapData.snapId)) {
-      throw new Error(`Snap "${snapData.snapId}" is already being executed.`);
+  async executeSnap({
+    snapId,
+    sourceCode,
+    endowments
+  }) {
+    if (__privateGet(this, _snapToJobMap).has(snapId)) {
+      throw new Error(`Snap "${snapId}" is already being executed.`);
     }
-    const job = await this.initJob();
-    __privateMethod(this, _mapSnapAndJob, mapSnapAndJob_fn).call(this, snapData.snapId, job.id);
+    const jobId = nanoid();
+    const timer = new Timer(__privateGet(this, _initTimeout));
+    const job = await this.initJob(jobId, timer);
+    __privateMethod(this, _mapSnapAndJob, mapSnapAndJob_fn).call(this, snapId, job.id);
     const pingResult = await withTimeout(
       this.command(job.id, {
         jsonrpc: "2.0",
@@ -259,14 +280,21 @@ var AbstractExecutionService = class {
       throw new Error("The Snaps execution environment failed to start.");
     }
     const rpcStream = job.streams.rpc;
-    this.setupSnapProvider(snapData.snapId, rpcStream);
-    const result = await this.command(job.id, {
-      jsonrpc: "2.0",
-      method: "executeSnap",
-      params: snapData,
-      id: nanoid()
-    });
-    __privateMethod(this, _createSnapHooks, createSnapHooks_fn).call(this, snapData.snapId, job.id);
+    this.setupSnapProvider(snapId, rpcStream);
+    const remainingTime = timer.remaining;
+    const result = await withTimeout(
+      this.command(job.id, {
+        jsonrpc: "2.0",
+        method: "executeSnap",
+        params: { snapId, sourceCode, endowments },
+        id: nanoid()
+      }),
+      remainingTime
+    );
+    if (result === hasTimedOut) {
+      throw new Error(`${snapId} failed to start.`);
+    }
+    __privateMethod(this, _createSnapHooks, createSnapHooks_fn).call(this, snapId, job.id);
     return result;
   }
   // Cannot be hash private yet because of tests.
@@ -310,6 +338,7 @@ _snapRpcHooks = new WeakMap();
 _snapToJobMap = new WeakMap();
 _jobToSnapMap = new WeakMap();
 _messenger = new WeakMap();
+_initTimeout = new WeakMap();
 _pingTimeout = new WeakMap();
 _terminationTimeout = new WeakMap();
 _removeSnapHooks = new WeakSet();
@@ -362,4 +391,4 @@ export {
   AbstractExecutionService,
   setupMultiplex
 };
-//# sourceMappingURL=chunk-WVGK5B5P.mjs.map
+//# sourceMappingURL=chunk-IRVUYBSV.mjs.map

package/dist/chunk-IRVUYBSV.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/services/AbstractExecutionService.ts"],"sourcesContent":["import { JsonRpcEngine } from '@metamask/json-rpc-engine';\nimport { createStreamMiddleware } from '@metamask/json-rpc-middleware-stream';\nimport ObjectMultiplex from '@metamask/object-multiplex';\nimport type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type { SnapRpcHook, SnapRpcHookArgs } from '@metamask/snaps-utils';\nimport { SNAP_STREAM_NAMES, logError } from '@metamask/snaps-utils';\nimport type {\n  Json,\n  JsonRpcNotification,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport {\n  Duration,\n  assertIsJsonRpcRequest,\n  inMilliseconds,\n  isJsonRpcNotification,\n  isObject,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\nimport { pipeline } from 'readable-stream';\nimport type { Duplex } from 'readable-stream';\n\nimport { log } from '../logging';\nimport { Timer } from '../snaps/Timer';\nimport { hasTimedOut, withTimeout } from '../utils';\nimport type {\n  ExecutionService,\n  ExecutionServiceMessenger,\n  SnapErrorJson,\n  SnapExecutionData,\n} from './ExecutionService';\n\nconst controllerName = 'ExecutionService';\n\nexport type SetupSnapProvider = (snapId: string, stream: Duplex) => void;\n\nexport type ExecutionServiceArgs = {\n  setupSnapProvider: SetupSnapProvider;\n  messenger: ExecutionServiceMessenger;\n  initTimeout?: number;\n  pingTimeout?: number;\n  terminationTimeout?: number;\n};\n\nexport type JobStreams = {\n  command: Duplex;\n  rpc: Duplex;\n  _connection: BasePostMessageStream;\n};\n\nexport type Job<WorkerType> = {\n  id: string;\n  streams: JobStreams;\n  rpcEngine: JsonRpcEngine;\n  worker: WorkerType;\n};\n\nexport type TerminateJobArgs<WorkerType> = Partial<Job<WorkerType>> &\n  Pick<Job<WorkerType>, 'id'>;\n\nexport abstract class AbstractExecutionService<WorkerType>\n  implements ExecutionService\n{\n  #snapRpcHooks: Map<string, SnapRpcHook>;\n\n  // Cannot be hash private yet because of tests.\n  protected jobs: Map<string, Job<WorkerType>>;\n\n  // Cannot be hash private yet because of tests.\n  private readonly setupSnapProvider: SetupSnapProvider;\n\n  #snapToJobMap: Map<string, string>;\n\n  #jobToSnapMap: Map<string, string>;\n\n  #messenger: ExecutionServiceMessenger;\n\n  #initTimeout: number;\n\n  #pingTimeout: number;\n\n  #terminationTimeout: number;\n\n  constructor({\n    setupSnapProvider,\n    messenger,\n    initTimeout = inMilliseconds(60, Duration.Second),\n    pingTimeout = inMilliseconds(2, Duration.Second),\n    terminationTimeout = inMilliseconds(1, Duration.Second),\n  }: ExecutionServiceArgs) {\n    this.#snapRpcHooks = new Map();\n    this.jobs = new Map();\n    this.setupSnapProvider = setupSnapProvider;\n    this.#snapToJobMap = new Map();\n    this.#jobToSnapMap = new Map();\n    this.#messenger = messenger;\n    this.#initTimeout = initTimeout;\n    this.#pingTimeout = pingTimeout;\n    this.#terminationTimeout = terminationTimeout;\n\n    this.registerMessageHandlers();\n  }\n\n  /**\n   * Constructor helper for registering the controller's messaging system\n   * actions.\n   */\n  private registerMessageHandlers(): void {\n    this.#messenger.registerActionHandler(\n      `${controllerName}:handleRpcRequest`,\n      async (snapId: string, options: SnapRpcHookArgs) =>\n        this.handleRpcRequest(snapId, options),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${controllerName}:executeSnap`,\n      async (data: SnapExecutionData) => this.executeSnap(data),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${controllerName}:terminateSnap`,\n      async (snapId: string) => this.terminateSnap(snapId),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${controllerName}:terminateAllSnaps`,\n      async () => this.terminateAllSnaps(),\n    );\n  }\n\n  /**\n   * Performs additional necessary work during job termination. **MUST** be\n   * implemented by concrete implementations. See\n   * {@link AbstractExecutionService.terminate} for details.\n   *\n   * @param job - The object corresponding to the job to be terminated.\n   */\n  protected abstract terminateJob(job: TerminateJobArgs<WorkerType>): void;\n\n  /**\n   * Terminates the job with the specified ID and deletes all its associated\n   * data. Any subsequent messages targeting the job will fail with an error.\n   * Throws an error if the specified job does not exist, or if termination\n   * fails unexpectedly.\n   *\n   * @param jobId - The id of the job to be terminated.\n   */\n  public async terminate(jobId: string): Promise<void> {\n    const jobWrapper = this.jobs.get(jobId);\n    if (!jobWrapper) {\n      throw new Error(`Job with id \"${jobId}\" not found.`);\n    }\n\n    try {\n      // Ping worker and tell it to run teardown, continue with termination if it takes too long\n      const result = await withTimeout(\n        this.command(jobId, {\n          jsonrpc: '2.0',\n          method: 'terminate',\n          params: [],\n          id: nanoid(),\n        }),\n        this.#terminationTimeout,\n      );\n\n      if (result === hasTimedOut || result !== 'OK') {\n        // We tried to shutdown gracefully but failed. This probably means the Snap is in infinite loop and\n        // hogging down the whole JS process.\n        // TODO(ritave): It might be doing weird things such as posting a lot of setTimeouts. Add a test to ensure that this behaviour\n        //               doesn't leak into other workers. Especially important in IframeExecutionEnvironment since they all share the same\n        //               JS process.\n        logError(`Job \"${jobId}\" failed to terminate gracefully.`, result);\n      }\n    } catch {\n      // Ignore\n    }\n\n    Object.values(jobWrapper.streams).forEach((stream) => {\n      try {\n        !stream.destroyed && stream.destroy();\n        stream.removeAllListeners();\n      } catch (error) {\n        logError('Error while destroying stream', error);\n      }\n    });\n\n    this.terminateJob(jobWrapper);\n\n    this.jobs.delete(jobId);\n    this.#removeSnapAndJobMapping(jobId);\n    log(`Job \"${jobId}\" terminated.`);\n  }\n\n  /**\n   * Initiates a job for a snap.\n   *\n   * @param jobId - The ID of the job to initiate.\n   * @param timer - The timer to use for timeouts.\n   * @returns Information regarding the created job.\n   * @throws If the execution service returns an error or execution times out.\n   */\n  protected async initJob(\n    jobId: string,\n    timer: Timer,\n  ): Promise<Job<WorkerType>> {\n    const { streams, worker } = await this.initStreams(jobId, timer);\n    const rpcEngine = new JsonRpcEngine();\n\n    const jsonRpcConnection = createStreamMiddleware();\n\n    pipeline(\n      jsonRpcConnection.stream,\n      streams.command,\n      jsonRpcConnection.stream,\n      (error) => {\n        if (error) {\n          logError(`Command stream failure.`, error);\n        }\n      },\n    );\n\n    rpcEngine.push(jsonRpcConnection.middleware);\n\n    const envMetadata = {\n      id: jobId,\n      streams,\n      rpcEngine,\n      worker,\n    };\n    this.jobs.set(jobId, envMetadata);\n\n    return envMetadata;\n  }\n\n  /**\n   * Sets up the streams for an initiated job.\n   *\n   * @param jobId - The id of the job.\n   * @param timer - The timer to use for timeouts.\n   * @returns The streams to communicate with the worker and the worker itself.\n   * @throws If the execution service returns an error or execution times out.\n   */\n  protected async initStreams(\n    jobId: string,\n    timer: Timer,\n  ): Promise<{ streams: JobStreams; worker: WorkerType }> {\n    const result = await withTimeout(this.initEnvStream(jobId), timer);\n\n    if (result === hasTimedOut) {\n      // For certain environments, such as the iframe we may have already created the worker and wish to terminate it.\n      this.terminateJob({ id: jobId });\n      throw new Error('The Snaps execution environment failed to start.');\n    }\n\n    const { worker, stream: envStream } = result;\n    const mux = setupMultiplex(envStream, `Job: \"${jobId}\"`);\n    const commandStream = mux.createStream(SNAP_STREAM_NAMES.COMMAND);\n\n    // Handle out-of-band errors, i.e. errors thrown from the snap outside of the req/res cycle.\n    // Also keep track of outbound request/responses\n    const notificationHandler = (\n      message:\n        | JsonRpcRequest\n        | JsonRpcNotification<Json[] | Record<string, Json>>,\n    ) => {\n      if (!isJsonRpcNotification(message)) {\n        return;\n      }\n\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      const snapId = this.#jobToSnapMap.get(jobId)!;\n      if (message.method === 'OutboundRequest') {\n        this.#messenger.publish('ExecutionService:outboundRequest', snapId);\n      } else if (message.method === 'OutboundResponse') {\n        this.#messenger.publish('ExecutionService:outboundResponse', snapId);\n      } else if (message.method === 'UnhandledError') {\n        if (isObject(message.params) && message.params.error) {\n          this.#messenger.publish(\n            'ExecutionService:unhandledError',\n            snapId,\n            message.params.error as SnapErrorJson,\n          );\n          commandStream.removeListener('data', notificationHandler);\n        } else {\n          logError(\n            new Error(\n              `Received malformed \"${message.method}\" command stream notification.`,\n            ),\n          );\n        }\n      } else {\n        logError(\n          new Error(\n            `Received unexpected command stream notification \"${message.method}\".`,\n          ),\n        );\n      }\n    };\n\n    commandStream.on('data', notificationHandler);\n    const rpcStream = mux.createStream(SNAP_STREAM_NAMES.JSON_RPC);\n\n    // Typecast: stream type mismatch\n    return {\n      streams: {\n        command: commandStream,\n        rpc: rpcStream,\n        // eslint-disable-next-line @typescript-eslint/naming-convention\n        _connection: envStream,\n      },\n      worker,\n    };\n  }\n\n  /**\n   * Abstract function implemented by implementing class that spins up a new worker for a job.\n   *\n   * Depending on the execution environment, this may run forever if the Snap fails to start up properly, therefore any call to this function should be wrapped in a timeout.\n   */\n  protected abstract initEnvStream(jobId: string): Promise<{\n    worker: WorkerType;\n    stream: BasePostMessageStream;\n  }>;\n\n  /**\n   * Terminates the Snap with the specified ID. May throw an error if\n   * termination unexpectedly fails, but will not fail if no job for the snap\n   * with the specified ID is found.\n   *\n   * @param snapId - The ID of the snap to terminate.\n   */\n  async terminateSnap(snapId: string) {\n    const jobId = this.#snapToJobMap.get(snapId);\n    if (jobId) {\n      await this.terminate(jobId);\n    }\n  }\n\n  async terminateAllSnaps() {\n    await Promise.all(\n      [...this.jobs.keys()].map(async (jobId) => this.terminate(jobId)),\n    );\n    this.#snapRpcHooks.clear();\n  }\n\n  /**\n   * Gets the RPC request handler for the given snap.\n   *\n   * @param snapId - The id of the Snap whose message handler to get.\n   * @returns The RPC request handler for the snap.\n   */\n  private getRpcRequestHandler(snapId: string) {\n    return this.#snapRpcHooks.get(snapId);\n  }\n\n  /**\n   * Initializes and executes a snap, setting up the communication channels to the snap etc.\n   *\n   * @param snapData - Data needed for Snap execution.\n   * @param snapData.snapId - The ID of the Snap to execute.\n   * @param snapData.sourceCode - The source code of the Snap to execute.\n   * @param snapData.endowments - The endowments available to the executing Snap.\n   * @returns A string `OK` if execution succeeded.\n   * @throws If the execution service returns an error or execution times out.\n   */\n  async executeSnap({\n    snapId,\n    sourceCode,\n    endowments,\n  }: SnapExecutionData): Promise<string> {\n    if (this.#snapToJobMap.has(snapId)) {\n      throw new Error(`Snap \"${snapId}\" is already being executed.`);\n    }\n\n    const jobId = nanoid();\n    const timer = new Timer(this.#initTimeout);\n\n    // This may resolve even if the environment has failed to start up fully\n    const job = await this.initJob(jobId, timer);\n\n    this.#mapSnapAndJob(snapId, job.id);\n\n    // Ping the worker to ensure that it started up\n    const pingResult = await withTimeout(\n      this.command(job.id, {\n        jsonrpc: '2.0',\n        method: 'ping',\n        id: nanoid(),\n      }),\n      this.#pingTimeout,\n    );\n\n    if (pingResult === hasTimedOut) {\n      throw new Error('The Snaps execution environment failed to start.');\n    }\n\n    const rpcStream = job.streams.rpc;\n\n    this.setupSnapProvider(snapId, rpcStream);\n\n    const remainingTime = timer.remaining;\n\n    const result = await withTimeout(\n      this.command(job.id, {\n        jsonrpc: '2.0',\n        method: 'executeSnap',\n        params: { snapId, sourceCode, endowments },\n        id: nanoid(),\n      }),\n      remainingTime,\n    );\n\n    if (result === hasTimedOut) {\n      throw new Error(`${snapId} failed to start.`);\n    }\n\n    this.#createSnapHooks(snapId, job.id);\n    return result as string;\n  }\n\n  // Cannot be hash private yet because of tests.\n  private async command(\n    jobId: string,\n    message: JsonRpcRequest,\n  ): Promise<Json | undefined> {\n    assertIsJsonRpcRequest(message);\n\n    const job = this.jobs.get(jobId);\n    if (!job) {\n      throw new Error(`Job with id \"${jobId}\" not found.`);\n    }\n\n    log('Parent: Sending Command', message);\n    const response: PendingJsonRpcResponse<Json> = await job.rpcEngine.handle(\n      message,\n    );\n\n    if (response.error) {\n      throw new JsonRpcError(\n        response.error.code,\n        response.error.message,\n        response.error.data,\n      );\n    }\n\n    return response.result;\n  }\n\n  #removeSnapHooks(snapId: string) {\n    this.#snapRpcHooks.delete(snapId);\n  }\n\n  #createSnapHooks(snapId: string, workerId: string) {\n    const rpcHook = async ({ origin, handler, request }: SnapRpcHookArgs) => {\n      return await this.command(workerId, {\n        id: nanoid(),\n        jsonrpc: '2.0',\n        method: 'snapRpc',\n        params: {\n          origin,\n          handler,\n          request: request as JsonRpcRequest,\n          target: snapId,\n        },\n      });\n    };\n\n    this.#snapRpcHooks.set(snapId, rpcHook);\n  }\n\n  #mapSnapAndJob(snapId: string, jobId: string): void {\n    this.#snapToJobMap.set(snapId, jobId);\n    this.#jobToSnapMap.set(jobId, snapId);\n  }\n\n  #removeSnapAndJobMapping(jobId: string): void {\n    const snapId = this.#jobToSnapMap.get(jobId);\n    if (!snapId) {\n      throw new Error(`job: \"${jobId}\" has no mapped snap.`);\n    }\n\n    this.#jobToSnapMap.delete(jobId);\n    this.#snapToJobMap.delete(snapId);\n    this.#removeSnapHooks(snapId);\n  }\n\n  /**\n   * Handle RPC request.\n   *\n   * @param snapId - The ID of the recipient snap.\n   * @param options - Bag of options to pass to the RPC handler.\n   * @returns Promise that can handle the request.\n   */\n  public async handleRpcRequest(\n    snapId: string,\n    options: SnapRpcHookArgs,\n  ): Promise<unknown> {\n    const rpcRequestHandler = this.getRpcRequestHandler(snapId);\n\n    if (!rpcRequestHandler) {\n      throw new Error(\n        `Snap execution service returned no RPC handler for running snap \"${snapId}\".`,\n      );\n    }\n\n    return rpcRequestHandler(options);\n  }\n}\n\n/**\n * Sets up stream multiplexing for the given stream.\n *\n * @param connectionStream - The stream to mux.\n * @param streamName - The name of the stream, for identification in errors.\n * @returns The multiplexed stream.\n */\nexport function setupMultiplex(\n  connectionStream: Duplex,\n  streamName: string,\n): ObjectMultiplex {\n  const mux = new ObjectMultiplex();\n  pipeline(connectionStream, mux, connectionStream, (error) => {\n    if (error) {\n      streamName\n        ? logError(`\"${streamName}\" stream failure.`, error)\n        : logError(error);\n    }\n  });\n  return mux;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAS,qBAAqB;AAC9B,SAAS,8BAA8B;AACvC,OAAO,qBAAqB;AAE5B,SAAS,oBAAoB;AAE7B,SAAS,mBAAmB,gBAAgB;AAO5C;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,gBAAgB;AAazB,IAAM,iBAAiB;AAlCvB;AA8DO,IAAe,2BAAf,MAEP;AAAA,EAqBE,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA,cAAc,eAAe,IAAI,SAAS,MAAM;AAAA,IAChD,cAAc,eAAe,GAAG,SAAS,MAAM;AAAA,IAC/C,qBAAqB,eAAe,GAAG,SAAS,MAAM;AAAA,EACxD,GAAyB;AAuWzB;AAIA;AAkBA;AAKA;AA5ZA;AAQA;AAEA;AAEA;AAEA;AAEA;AAEA;AASE,uBAAK,eAAgB,oBAAI,IAAI;AAC7B,SAAK,OAAO,oBAAI,IAAI;AACpB,SAAK,oBAAoB;AACzB,uBAAK,eAAgB,oBAAI,IAAI;AAC7B,uBAAK,eAAgB,oBAAI,IAAI;AAC7B,uBAAK,YAAa;AAClB,uBAAK,cAAe;AACpB,uBAAK,cAAe;AACpB,uBAAK,qBAAsB;AAE3B,SAAK,wBAAwB;AAAA,EAC/B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,0BAAgC;AACtC,uBAAK,YAAW;AAAA,MACd,GAAG,cAAc;AAAA,MACjB,OAAO,QAAgB,YACrB,KAAK,iBAAiB,QAAQ,OAAO;AAAA,IACzC;AAEA,uBAAK,YAAW;AAAA,MACd,GAAG,cAAc;AAAA,MACjB,OAAO,SAA4B,KAAK,YAAY,IAAI;AAAA,IAC1D;AAEA,uBAAK,YAAW;AAAA,MACd,GAAG,cAAc;AAAA,MACjB,OAAO,WAAmB,KAAK,cAAc,MAAM;AAAA,IACrD;AAEA,uBAAK,YAAW;AAAA,MACd,GAAG,cAAc;AAAA,MACjB,YAAY,KAAK,kBAAkB;AAAA,IACrC;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAmBA,MAAa,UAAU,OAA8B;AACnD,UAAM,aAAa,KAAK,KAAK,IAAI,KAAK;AACtC,QAAI,CAAC,YAAY;AACf,YAAM,IAAI,MAAM,gBAAgB,KAAK,cAAc;AAAA,IACrD;AAEA,QAAI;AAEF,YAAM,SAAS,MAAM;AAAA,QACnB,KAAK,QAAQ,OAAO;AAAA,UAClB,SAAS;AAAA,UACT,QAAQ;AAAA,UACR,QAAQ,CAAC;AAAA,UACT,IAAI,OAAO;AAAA,QACb,CAAC;AAAA,QACD,mBAAK;AAAA,MACP;AAEA,UAAI,WAAW,eAAe,WAAW,MAAM;AAM7C,iBAAS,QAAQ,KAAK,qCAAqC,MAAM;AAAA,MACnE;AAAA,IACF,QAAQ;AAAA,IAER;AAEA,WAAO,OAAO,WAAW,OAAO,EAAE,QAAQ,CAAC,WAAW;AACpD,UAAI;AACF,SAAC,OAAO,aAAa,OAAO,QAAQ;AACpC,eAAO,mBAAmB;AAAA,MAC5B,SAAS,OAAO;AACd,iBAAS,iCAAiC,KAAK;AAAA,MACjD;AAAA,IACF,CAAC;AAED,SAAK,aAAa,UAAU;AAE5B,SAAK,KAAK,OAAO,KAAK;AACtB,0BAAK,sDAAL,WAA8B;AAC9B,QAAI,QAAQ,KAAK,eAAe;AAAA,EAClC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAgB,QACd,OACA,OAC0B;AAC1B,UAAM,EAAE,SAAS,OAAO,IAAI,MAAM,KAAK,YAAY,OAAO,KAAK;AAC/D,UAAM,YAAY,IAAI,cAAc;AAEpC,UAAM,oBAAoB,uBAAuB;AAEjD;AAAA,MACE,kBAAkB;AAAA,MAClB,QAAQ;AAAA,MACR,kBAAkB;AAAA,MAClB,CAAC,UAAU;AACT,YAAI,OAAO;AACT,mBAAS,2BAA2B,KAAK;AAAA,QAC3C;AAAA,MACF;AAAA,IACF;AAEA,cAAU,KAAK,kBAAkB,UAAU;AAE3C,UAAM,cAAc;AAAA,MAClB,IAAI;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACA,SAAK,KAAK,IAAI,OAAO,WAAW;AAEhC,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAgB,YACd,OACA,OACsD;AACtD,UAAM,SAAS,MAAM,YAAY,KAAK,cAAc,KAAK,GAAG,KAAK;AAEjE,QAAI,WAAW,aAAa;AAE1B,WAAK,aAAa,EAAE,IAAI,MAAM,CAAC;AAC/B,YAAM,IAAI,MAAM,kDAAkD;AAAA,IACpE;AAEA,UAAM,EAAE,QAAQ,QAAQ,UAAU,IAAI;AACtC,UAAM,MAAM,eAAe,WAAW,SAAS,KAAK,GAAG;AACvD,UAAM,gBAAgB,IAAI,aAAa,kBAAkB,OAAO;AAIhE,UAAM,sBAAsB,CAC1B,YAGG;AACH,UAAI,CAAC,sBAAsB,OAAO,GAAG;AACnC;AAAA,MACF;AAGA,YAAM,SAAS,mBAAK,eAAc,IAAI,KAAK;AAC3C,UAAI,QAAQ,WAAW,mBAAmB;AACxC,2BAAK,YAAW,QAAQ,oCAAoC,MAAM;AAAA,MACpE,WAAW,QAAQ,WAAW,oBAAoB;AAChD,2BAAK,YAAW,QAAQ,qCAAqC,MAAM;AAAA,MACrE,WAAW,QAAQ,WAAW,kBAAkB;AAC9C,YAAI,SAAS,QAAQ,MAAM,KAAK,QAAQ,OAAO,OAAO;AACpD,6BAAK,YAAW;AAAA,YACd;AAAA,YACA;AAAA,YACA,QAAQ,OAAO;AAAA,UACjB;AACA,wBAAc,eAAe,QAAQ,mBAAmB;AAAA,QAC1D,OAAO;AACL;AAAA,YACE,IAAI;AAAA,cACF,uBAAuB,QAAQ,MAAM;AAAA,YACvC;AAAA,UACF;AAAA,QACF;AAAA,MACF,OAAO;AACL;AAAA,UACE,IAAI;AAAA,YACF,oDAAoD,QAAQ,MAAM;AAAA,UACpE;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,kBAAc,GAAG,QAAQ,mBAAmB;AAC5C,UAAM,YAAY,IAAI,aAAa,kBAAkB,QAAQ;AAG7D,WAAO;AAAA,MACL,SAAS;AAAA,QACP,SAAS;AAAA,QACT,KAAK;AAAA;AAAA,QAEL,aAAa;AAAA,MACf;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAmBA,MAAM,cAAc,QAAgB;AAClC,UAAM,QAAQ,mBAAK,eAAc,IAAI,MAAM;AAC3C,QAAI,OAAO;AACT,YAAM,KAAK,UAAU,KAAK;AAAA,IAC5B;AAAA,EACF;AAAA,EAEA,MAAM,oBAAoB;AACxB,UAAM,QAAQ;AAAA,MACZ,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,EAAE,IAAI,OAAO,UAAU,KAAK,UAAU,KAAK,CAAC;AAAA,IAClE;AACA,uBAAK,eAAc,MAAM;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQQ,qBAAqB,QAAgB;AAC3C,WAAO,mBAAK,eAAc,IAAI,MAAM;AAAA,EACtC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,MAAM,YAAY;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAuC;AACrC,QAAI,mBAAK,eAAc,IAAI,MAAM,GAAG;AAClC,YAAM,IAAI,MAAM,SAAS,MAAM,8BAA8B;AAAA,IAC/D;AAEA,UAAM,QAAQ,OAAO;AACrB,UAAM,QAAQ,IAAI,MAAM,mBAAK,aAAY;AAGzC,UAAM,MAAM,MAAM,KAAK,QAAQ,OAAO,KAAK;AAE3C,0BAAK,kCAAL,WAAoB,QAAQ,IAAI;AAGhC,UAAM,aAAa,MAAM;AAAA,MACvB,KAAK,QAAQ,IAAI,IAAI;AAAA,QACnB,SAAS;AAAA,QACT,QAAQ;AAAA,QACR,IAAI,OAAO;AAAA,MACb,CAAC;AAAA,MACD,mBAAK;AAAA,IACP;AAEA,QAAI,eAAe,aAAa;AAC9B,YAAM,IAAI,MAAM,kDAAkD;AAAA,IACpE;AAEA,UAAM,YAAY,IAAI,QAAQ;AAE9B,SAAK,kBAAkB,QAAQ,SAAS;AAExC,UAAM,gBAAgB,MAAM;AAE5B,UAAM,SAAS,MAAM;AAAA,MACnB,KAAK,QAAQ,IAAI,IAAI;AAAA,QACnB,SAAS;AAAA,QACT,QAAQ;AAAA,QACR,QAAQ,EAAE,QAAQ,YAAY,WAAW;AAAA,QACzC,IAAI,OAAO;AAAA,MACb,CAAC;AAAA,MACD;AAAA,IACF;AAEA,QAAI,WAAW,aAAa;AAC1B,YAAM,IAAI,MAAM,GAAG,MAAM,mBAAmB;AAAA,IAC9C;AAEA,0BAAK,sCAAL,WAAsB,QAAQ,IAAI;AAClC,WAAO;AAAA,EACT;AAAA;AAAA,EAGA,MAAc,QACZ,OACA,SAC2B;AAC3B,2BAAuB,OAAO;AAE9B,UAAM,MAAM,KAAK,KAAK,IAAI,KAAK;AAC/B,QAAI,CAAC,KAAK;AACR,YAAM,IAAI,MAAM,gBAAgB,KAAK,cAAc;AAAA,IACrD;AAEA,QAAI,2BAA2B,OAAO;AACtC,UAAM,WAAyC,MAAM,IAAI,UAAU;AAAA,MACjE;AAAA,IACF;AAEA,QAAI,SAAS,OAAO;AAClB,YAAM,IAAI;AAAA,QACR,SAAS,MAAM;AAAA,QACf,SAAS,MAAM;AAAA,QACf,SAAS,MAAM;AAAA,MACjB;AAAA,IACF;AAEA,WAAO,SAAS;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA+CA,MAAa,iBACX,QACA,SACkB;AAClB,UAAM,oBAAoB,KAAK,qBAAqB,MAAM;AAE1D,QAAI,CAAC,mBAAmB;AACtB,YAAM,IAAI;AAAA,QACR,oEAAoE,MAAM;AAAA,MAC5E;AAAA,IACF;AAEA,WAAO,kBAAkB,OAAO;AAAA,EAClC;AACF;AA5bE;AAQA;AAEA;AAEA;AAEA;AAEA;AAEA;AA+WA;AAAA,qBAAgB,SAAC,QAAgB;AAC/B,qBAAK,eAAc,OAAO,MAAM;AAClC;AAEA;AAAA,qBAAgB,SAAC,QAAgB,UAAkB;AACjD,QAAM,UAAU,OAAO,EAAE,QAAQ,SAAS,QAAQ,MAAuB;AACvE,WAAO,MAAM,KAAK,QAAQ,UAAU;AAAA,MAClC,IAAI,OAAO;AAAA,MACX,SAAS;AAAA,MACT,QAAQ;AAAA,MACR,QAAQ;AAAA,QACN;AAAA,QACA;AAAA,QACA;AAAA,QACA,QAAQ;AAAA,MACV;AAAA,IACF,CAAC;AAAA,EACH;AAEA,qBAAK,eAAc,IAAI,QAAQ,OAAO;AACxC;AAEA;AAAA,mBAAc,SAAC,QAAgB,OAAqB;AAClD,qBAAK,eAAc,IAAI,QAAQ,KAAK;AACpC,qBAAK,eAAc,IAAI,OAAO,MAAM;AACtC;AAEA;AAAA,6BAAwB,SAAC,OAAqB;AAC5C,QAAM,SAAS,mBAAK,eAAc,IAAI,KAAK;AAC3C,MAAI,CAAC,QAAQ;AACX,UAAM,IAAI,MAAM,SAAS,KAAK,uBAAuB;AAAA,EACvD;AAEA,qBAAK,eAAc,OAAO,KAAK;AAC/B,qBAAK,eAAc,OAAO,MAAM;AAChC,wBAAK,sCAAL,WAAsB;AACxB;AAgCK,SAAS,eACd,kBACA,YACiB;AACjB,QAAM,MAAM,IAAI,gBAAgB;AAChC,WAAS,kBAAkB,KAAK,kBAAkB,CAAC,UAAU;AAC3D,QAAI,OAAO;AACT,mBACI,SAAS,IAAI,UAAU,qBAAqB,KAAK,IACjD,SAAS,KAAK;AAAA,IACpB;AAAA,EACF,CAAC;AACD,SAAO;AACT;","names":[]}

package/dist/{chunk-CJN25EXL.js → chunk-JMP6XYRL.js}

@@ -19,10 +19,11 @@ var _chunkNXZVKBSVjs = require('./chunk-NXZVKBSV.js');
 
 
 
-var _chunkXE5IWVNVjs = require('./chunk-XE5IWVNV.js');
 
+var _chunk4DPX4O3Tjs = require('./chunk-4DPX4O3T.js');
 
-var _chunkNOLPMHXSjs = require('./chunk-NOLPMHXS.js');
+
+var _chunkBOFPNIRXjs = require('./chunk-BOFPNIRX.js');
 
 
 
@@ -116,7 +117,7 @@ function truncateSnap(snap) {
   return truncatedSnap;
 }
 var name = "SnapController";
-var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _maxInitTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
+var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _encryptor, _getMnemonic, _detectSnapLocation, _snapsRuntimeData, _rollbackSnapshots, _timeoutForLastRequestStatus, _statusMachine, _initializeStateMachine, initializeStateMachine_fn, _registerMessageHandlers, registerMessageHandlers_fn, _handlePreinstalledSnaps, handlePreinstalledSnaps_fn, _pollForLastRequestStatus, pollForLastRequestStatus_fn, _blockSnap, blockSnap_fn, _unblockSnap, unblockSnap_fn, _assertIsInstallAllowed, assertIsInstallAllowed_fn, _stopSnapsLastRequestPastMax, stopSnapsLastRequestPastMax_fn, _transition, transition_fn, _terminateSnap, terminateSnap_fn, _getSnapEncryptionKey, getSnapEncryptionKey_fn, _decryptSnapState, decryptSnapState_fn, _encryptSnapState, encryptSnapState_fn, _handleInitialConnections, handleInitialConnections_fn, _addSnapToSubject, addSnapToSubject_fn, _removeSnapFromSubjects, removeSnapFromSubjects_fn, _revokeAllSnapPermissions, revokeAllSnapPermissions_fn, _createApproval, createApproval_fn, _updateApproval, updateApproval_fn, _resolveAllowlistVersion, resolveAllowlistVersion_fn, _add, add_fn, _startSnap, startSnap_fn, _getEndowments, getEndowments_fn, _set, set_fn, _validateSnapPermissions, validateSnapPermissions_fn, _getExecutionTimeout, getExecutionTimeout_fn, _getRpcRequestHandler, getRpcRequestHandler_fn, _createInterface, createInterface_fn, _assertInterfaceExists, assertInterfaceExists_fn, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn, _getRollbackSnapshot, getRollbackSnapshot_fn, _createRollbackSnapshot, createRollbackSnapshot_fn, _rollbackSnap, rollbackSnap_fn, _rollbackSnaps, rollbackSnaps_fn, _getRuntime, getRuntime_fn, _getRuntimeExpect, getRuntimeExpect_fn, _setupRuntime, setupRuntime_fn, _calculatePermissionsChange, calculatePermissionsChange_fn, _updatePermissions, updatePermissions_fn, _isValidUpdate, isValidUpdate_fn, _callLifecycleHook, callLifecycleHook_fn;
 var SnapController = class extends _basecontroller.BaseController {
   constructor({
     closeAllConnections,
@@ -128,7 +129,6 @@ var SnapController = class extends _basecontroller.BaseController {
     idleTimeCheckInterval = _utils.inMilliseconds.call(void 0, 5, _utils.Duration.Second),
     maxIdleTime = _utils.inMilliseconds.call(void 0, 30, _utils.Duration.Second),
     maxRequestTime = _utils.inMilliseconds.call(void 0, 60, _utils.Duration.Second),
-    maxInitTime = _utils.inMilliseconds.call(void 0, 60, _utils.Duration.Second),
     fetchFunction = globalThis.fetch.bind(globalThis),
     featureFlags = {},
     detectSnapLocation: detectSnapLocationFunction = _chunkPT22IXNSjs.detectSnapLocation,
@@ -418,7 +418,7 @@ var SnapController = class extends _basecontroller.BaseController {
      * to return false in that scenario.
      *
      * @param snapId - The snap id.
-     * @param newVersionRange - The new version range being requsted.
+     * @param newVersionRange - The new version range being requested.
      * @returns `true` if validation checks pass and `false` if they do not.
      */
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _isValidUpdate);
@@ -441,7 +441,6 @@ var SnapController = class extends _basecontroller.BaseController {
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _fetchFunction, void 0);
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _idleTimeCheckInterval, void 0);
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _maxIdleTime, void 0);
-    _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _maxInitTime, void 0);
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _encryptor, void 0);
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _getMnemonic, void 0);
     _chunkEXN2TFDJjs.__privateAdd.call(void 0, this, _detectSnapLocation, void 0);
@@ -458,7 +457,6 @@ var SnapController = class extends _basecontroller.BaseController {
     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _idleTimeCheckInterval, idleTimeCheckInterval);
     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _maxIdleTime, maxIdleTime);
     this.maxRequestTime = maxRequestTime;
-    _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _maxInitTime, maxInitTime);
     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _detectSnapLocation, detectSnapLocationFunction);
     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _encryptor, encryptor);
     _chunkEXN2TFDJjs.__privateSet.call(void 0, this, _getMnemonic, getMnemonic);
@@ -625,15 +623,20 @@ var SnapController = class extends _basecontroller.BaseController {
     if (!runtime) {
       throw new Error(`The snap "${snapId}" is not running.`);
     }
-    runtime.lastRequest = null;
-    runtime.pendingInboundRequests = [];
-    runtime.pendingOutboundRequests = 0;
+    if (runtime.stopping) {
+      return;
+    }
+    runtime.stopping = true;
     try {
       if (this.isRunning(snapId)) {
         (_a = _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _closeAllConnections)) == null ? void 0 : _a.call(this, snapId);
         await _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _terminateSnap, terminateSnap_fn).call(this, snapId);
       }
     } finally {
+      runtime.lastRequest = null;
+      runtime.pendingInboundRequests = [];
+      runtime.pendingOutboundRequests = 0;
+      runtime.stopping = false;
       if (this.isRunning(snapId)) {
         _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _transition, transition_fn).call(this, snapId, statusEvent);
       }
@@ -1162,7 +1165,7 @@ var SnapController = class extends _basecontroller.BaseController {
       );
       const snap = this.getExpect(snapId);
       const oldManifest = snap.manifest;
-      const newSnap = await _chunkXE5IWVNVjs.fetchSnap.call(void 0, snapId, location);
+      const newSnap = await _chunk4DPX4O3Tjs.fetchSnap.call(void 0, snapId, location);
       const { sourceCode: sourceCodeFile, manifest: manifestFile } = newSnap;
       const manifest = manifestFile.result;
       const newVersion = manifest.version;
@@ -1410,7 +1413,6 @@ _featureFlags = new WeakMap();
 _fetchFunction = new WeakMap();
 _idleTimeCheckInterval = new WeakMap();
 _maxIdleTime = new WeakMap();
-_maxInitTime = new WeakMap();
 _encryptor = new WeakMap();
 _getMnemonic = new WeakMap();
 _detectSnapLocation = new WeakMap();
@@ -1698,6 +1700,10 @@ transition_fn = function(snapId, event) {
 _terminateSnap = new WeakSet();
 terminateSnap_fn = async function(snapId) {
   await this.messagingSystem.call("ExecutionService:terminateSnap", snapId);
+  await new Promise((resolve) => setTimeout(resolve, 1));
+  const runtime = _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _getRuntimeExpect, getRuntimeExpect_fn).call(this, snapId);
+  runtime.pendingInboundRequests.filter((pendingRequest) => pendingRequest.timer.status !== "finished").forEach((pendingRequest) => pendingRequest.timer.finish());
+  await new Promise((resolve) => setTimeout(resolve, 1));
   this.messagingSystem.publish(
     "SnapController:snapTerminated",
     this.getTruncatedExpect(snapId)
@@ -1767,7 +1773,7 @@ encryptSnapState_fn = async function(snapId, state) {
 _handleInitialConnections = new WeakSet();
 handleInitialConnections_fn = function(snapId, previousInitialConnections, initialConnections) {
   if (previousInitialConnections) {
-    const revokedInitialConnections = _chunkXE5IWVNVjs.setDiff.call(void 0, 
+    const revokedInitialConnections = _chunk4DPX4O3Tjs.setDiff.call(void 0, 
       previousInitialConnections,
       initialConnections
     );
@@ -1889,7 +1895,7 @@ add_fn = async function(args) {
   if (!runtime.installPromise) {
     _chunkNXZVKBSVjs.log.call(void 0, `Adding snap: ${snapId}`);
     runtime.installPromise = (async () => {
-      const fetchedSnap = await _chunkXE5IWVNVjs.fetchSnap.call(void 0, snapId, location);
+      const fetchedSnap = await _chunk4DPX4O3Tjs.fetchSnap.call(void 0, snapId, location);
       const manifest = fetchedSnap.manifest.result;
       if (!_utils.satisfiesVersionRange.call(void 0, manifest.version, versionRange)) {
         throw new Error(
@@ -1923,16 +1929,13 @@ startSnap_fn = async function(snapData) {
   }
   try {
     const runtime = _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _getRuntimeExpect, getRuntimeExpect_fn).call(this, snapId);
-    const result = await _chunkXE5IWVNVjs.withTimeout.call(void 0, 
-      this.messagingSystem.call("ExecutionService:executeSnap", {
+    const result = await this.messagingSystem.call(
+      "ExecutionService:executeSnap",
+      {
         ...snapData,
         endowments: await _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _getEndowments, getEndowments_fn).call(this, snapId)
-      }),
-      _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _maxInitTime)
+      }
     );
-    if (result === _chunkXE5IWVNVjs.hasTimedOut) {
-      throw new Error(`${snapId} failed to start.`);
-    }
     _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _transition, transition_fn).call(this, snapId, _snapsutils.SnapStatusEvents.Start);
     runtime.lastRequest = Date.now();
     return result;
@@ -2137,7 +2140,7 @@ getRpcRequestHandler_fn = function(snapId) {
         }
       }
     }
-    const timer = new (0, _chunkNOLPMHXSjs.Timer)(timeout);
+    const timer = new (0, _chunkBOFPNIRXjs.Timer)(timeout);
     _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _recordSnapRpcRequestStart, recordSnapRpcRequestStart_fn).call(this, snapId, request.id, timer);
     const handleRpcRequestPromise = this.messagingSystem.call(
       "ExecutionService:handleRpcRequest",
@@ -2145,22 +2148,23 @@ getRpcRequestHandler_fn = function(snapId) {
       { origin, handler: handlerType, request }
     );
     try {
-      const result = await _chunkXE5IWVNVjs.withTimeout.call(void 0, handleRpcRequestPromise, timer);
-      if (result === _chunkXE5IWVNVjs.hasTimedOut) {
+      const result = await _chunk4DPX4O3Tjs.withTimeout.call(void 0, handleRpcRequestPromise, timer);
+      if (result === _chunk4DPX4O3Tjs.hasTimedOut) {
         throw new Error(
           `${snapId} failed to respond to the request in time.`
         );
       }
       await _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn).call(this, snapId, handlerType, result);
-      return _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn).call(this, snapId, handlerType, result);
+      const transformedResult = await _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn).call(this, snapId, handlerType, result);
+      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn).call(this, snapId, request.id);
+      return transformedResult;
     } catch (error) {
+      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn).call(this, snapId, request.id);
       const [jsonRpcError, handled] = _snapsutils.unwrapError.call(void 0, error);
       if (!handled) {
         await this.stopSnap(snapId, _snapsutils.SnapStatusEvents.Crash);
       }
       throw jsonRpcError;
-    } finally {
-      _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _recordSnapRpcRequestFinish, recordSnapRpcRequestFinish_fn).call(this, snapId, request.id);
     }
   };
   runtime.rpcHandler = rpcHandler;
@@ -2344,7 +2348,8 @@ setupRuntime_fn = function(snapId) {
     activeReferences: 0,
     pendingInboundRequests: [],
     pendingOutboundRequests: 0,
-    interpreter
+    interpreter,
+    stopping: false
   });
 };
 _calculatePermissionsChange = new WeakSet();
@@ -2353,9 +2358,18 @@ calculatePermissionsChange_fn = function(snapId, desiredPermissionsSet) {
     "PermissionController:getPermissions",
     snapId
   ) ?? {};
-  const newPermissions = _chunkXE5IWVNVjs.setDiff.call(void 0, desiredPermissionsSet, oldPermissions);
-  const unusedPermissions = _chunkXE5IWVNVjs.setDiff.call(void 0, oldPermissions, desiredPermissionsSet);
-  const approvedPermissions = _chunkXE5IWVNVjs.setDiff.call(void 0, oldPermissions, unusedPermissions);
+  const newPermissions = _chunk4DPX4O3Tjs.permissionsDiff.call(void 0, 
+    desiredPermissionsSet,
+    oldPermissions
+  );
+  const unusedPermissions = _chunk4DPX4O3Tjs.permissionsDiff.call(void 0, 
+    oldPermissions,
+    desiredPermissionsSet
+  );
+  const approvedPermissions = _chunk4DPX4O3Tjs.permissionsDiff.call(void 0, 
+    oldPermissions,
+    unusedPermissions
+  );
   return { newPermissions, unusedPermissions, approvedPermissions };
 };
 _updatePermissions = new WeakSet();
@@ -2420,4 +2434,4 @@ callLifecycleHook_fn = async function(snapId, handler) {
 
 
 exports.controllerName = controllerName; exports.SNAP_APPROVAL_INSTALL = SNAP_APPROVAL_INSTALL; exports.SNAP_APPROVAL_UPDATE = SNAP_APPROVAL_UPDATE; exports.SNAP_APPROVAL_RESULT = SNAP_APPROVAL_RESULT; exports.SnapController = SnapController;
-//# sourceMappingURL=chunk-CJN25EXL.js.map
+//# sourceMappingURL=chunk-JMP6XYRL.js.map