@metamask/snaps-controllers 6.0.1 → 6.0.2

package/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.0.2]
+### Changed
+- Improve timeout handling when the execution environment fails to load ([#2242](https://github.com/MetaMask/snaps/pull/2242))
+
 ## [6.0.1]
 ### Fixed
 - Fix minor build configuration problems ([#2220](https://github.com/MetaMask/snaps/pull/2220))
@@ -207,7 +211,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@6.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@6.0.2...HEAD
+[6.0.2]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@6.0.1...@metamask/snaps-controllers@6.0.2
 [6.0.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@6.0.0...@metamask/snaps-controllers@6.0.1
 [6.0.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@5.0.1...@metamask/snaps-controllers@6.0.0
 [5.0.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@5.0.0...@metamask/snaps-controllers@5.0.1

package/dist/{chunk-6XGUJ27X.js → chunk-6HI7J27U.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkU6T2MPXTjs = require('./chunk-U6T2MPXT.js');
+var _chunkCFTCANAKjs = require('./chunk-CFTCANAK.js');
 
 
 
@@ -9,7 +9,7 @@ var _chunkEXN2TFDJjs = require('./chunk-EXN2TFDJ.js');
 // src/services/offscreen/OffscreenExecutionService.ts
 var _postmessagestream = require('@metamask/post-message-stream');
 var _createDocument, createDocument_fn;
-var OffscreenExecutionService = class extends _chunkU6T2MPXTjs.ProxyExecutionService {
+var OffscreenExecutionService = class extends _chunkCFTCANAKjs.ProxyExecutionService {
   /**
    * Create a new offscreen execution service.
    *
@@ -69,4 +69,4 @@ createDocument_fn = async function() {
 
 
 exports.OffscreenExecutionService = OffscreenExecutionService;
-//# sourceMappingURL=chunk-6XGUJ27X.js.map
+//# sourceMappingURL=chunk-6HI7J27U.js.map

package/dist/{chunk-7PZECZV3.mjs → chunk-AELC3WCV.mjs}

@@ -1,6 +1,6 @@
 import {
   AbstractExecutionService
-} from "./chunk-6NYC5VNK.mjs";
+} from "./chunk-XBGQ5PKQ.mjs";
 
 // src/services/iframe/IframeExecutionService.ts
 import { WindowPostMessageStream } from "@metamask/post-message-stream";
@@ -35,4 +35,4 @@ var IframeExecutionService = class extends AbstractExecutionService {
 export {
   IframeExecutionService
 };
-//# sourceMappingURL=chunk-7PZECZV3.mjs.map
+//# sourceMappingURL=chunk-AELC3WCV.mjs.map

package/dist/{chunk-PGKMKSAR.mjs → chunk-BAJUEBP6.mjs}

@@ -1,6 +1,6 @@
 import {
   AbstractExecutionService
-} from "./chunk-6NYC5VNK.mjs";
+} from "./chunk-XBGQ5PKQ.mjs";
 import {
   ProxyPostMessageStream
 } from "./chunk-ZVOYOZFT.mjs";
@@ -102,4 +102,4 @@ export {
   WORKER_POOL_ID,
   WebWorkerExecutionService
 };
-//# sourceMappingURL=chunk-PGKMKSAR.mjs.map
+//# sourceMappingURL=chunk-BAJUEBP6.mjs.map

package/dist/{chunk-U6T2MPXT.js → chunk-CFTCANAK.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJDHKH5YUjs = require('./chunk-JDHKH5YU.js');
+var _chunkVJZI4VSJjs = require('./chunk-VJZI4VSJ.js');
 
 
 var _chunk7Y6P5FRNjs = require('./chunk-7Y6P5FRN.js');
@@ -13,7 +13,7 @@ var _chunkEXN2TFDJjs = require('./chunk-EXN2TFDJ.js');
 // src/services/proxy/ProxyExecutionService.ts
 var _nanoid = require('nanoid');
 var _stream;
-var ProxyExecutionService = class extends _chunkJDHKH5YUjs.AbstractExecutionService {
+var ProxyExecutionService = class extends _chunkVJZI4VSJjs.AbstractExecutionService {
   /**
    * Create a new proxy execution service.
    *
@@ -71,4 +71,4 @@ _stream = new WeakMap();
 
 
 exports.ProxyExecutionService = ProxyExecutionService;
-//# sourceMappingURL=chunk-U6T2MPXT.js.map
+//# sourceMappingURL=chunk-CFTCANAK.js.map

package/dist/{chunk-6YVCFPP6.mjs → chunk-E7627MMH.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-IGC4E7PI.mjs";
 import {
   ProxyExecutionService
-} from "./chunk-KF4PCKG7.mjs";
+} from "./chunk-KEEKVE7E.mjs";
 import {
   __privateAdd,
   __privateGet,
@@ -55,4 +55,4 @@ ensureWebViewLoaded_fn = async function() {
 export {
   WebViewExecutionService
 };
-//# sourceMappingURL=chunk-6YVCFPP6.mjs.map
+//# sourceMappingURL=chunk-E7627MMH.mjs.map

package/dist/{chunk-PXECEHH7.mjs → chunk-E7FBXFXJ.mjs}

@@ -1,6 +1,6 @@
 import {
   AbstractExecutionService
-} from "./chunk-6NYC5VNK.mjs";
+} from "./chunk-XBGQ5PKQ.mjs";
 import {
   __require
 } from "./chunk-YRZVIDCF.mjs";
@@ -36,4 +36,4 @@ var NodeThreadExecutionService = class extends AbstractExecutionService {
 export {
   NodeThreadExecutionService
 };
-//# sourceMappingURL=chunk-PXECEHH7.mjs.map
+//# sourceMappingURL=chunk-E7FBXFXJ.mjs.map

package/dist/{chunk-KF4PCKG7.mjs → chunk-KEEKVE7E.mjs}

@@ -1,6 +1,6 @@
 import {
   AbstractExecutionService
-} from "./chunk-6NYC5VNK.mjs";
+} from "./chunk-XBGQ5PKQ.mjs";
 import {
   ProxyPostMessageStream
 } from "./chunk-ZVOYOZFT.mjs";
@@ -71,4 +71,4 @@ _stream = new WeakMap();
 export {
   ProxyExecutionService
 };
-//# sourceMappingURL=chunk-KF4PCKG7.mjs.map
+//# sourceMappingURL=chunk-KEEKVE7E.mjs.map

package/dist/{chunk-FZY2Z5NP.js → chunk-LAVQZHSH.js}

@@ -1,11 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJDHKH5YUjs = require('./chunk-JDHKH5YU.js');
+var _chunkVJZI4VSJjs = require('./chunk-VJZI4VSJ.js');
 
 // src/services/iframe/IframeExecutionService.ts
 var _postmessagestream = require('@metamask/post-message-stream');
 var _snapsutils = require('@metamask/snaps-utils');
-var IframeExecutionService = class extends _chunkJDHKH5YUjs.AbstractExecutionService {
+var IframeExecutionService = class extends _chunkVJZI4VSJjs.AbstractExecutionService {
   constructor({
     iframeUrl,
     messenger,
@@ -35,4 +35,4 @@ var IframeExecutionService = class extends _chunkJDHKH5YUjs.AbstractExecutionSer
 
 
 exports.IframeExecutionService = IframeExecutionService;
-//# sourceMappingURL=chunk-FZY2Z5NP.js.map
+//# sourceMappingURL=chunk-LAVQZHSH.js.map

package/dist/{chunk-KBVG3CL2.js → chunk-MXCU2GFU.js}

@@ -3,7 +3,7 @@
 var _chunkC4D6GBMYjs = require('./chunk-C4D6GBMY.js');
 
 
-var _chunkU6T2MPXTjs = require('./chunk-U6T2MPXT.js');
+var _chunkCFTCANAKjs = require('./chunk-CFTCANAK.js');
 
 
 
@@ -13,7 +13,7 @@ var _chunkEXN2TFDJjs = require('./chunk-EXN2TFDJ.js');
 
 // src/services/webview/WebViewExecutionService.ts
 var _getWebView, _ensureWebViewLoaded, ensureWebViewLoaded_fn;
-var WebViewExecutionService = class extends _chunkU6T2MPXTjs.ProxyExecutionService {
+var WebViewExecutionService = class extends _chunkCFTCANAKjs.ProxyExecutionService {
   constructor({
     messenger,
     setupSnapProvider,
@@ -55,4 +55,4 @@ ensureWebViewLoaded_fn = async function() {
 
 
 exports.WebViewExecutionService = WebViewExecutionService;
-//# sourceMappingURL=chunk-KBVG3CL2.js.map
+//# sourceMappingURL=chunk-MXCU2GFU.js.map

package/dist/{chunk-5R4ENIDN.mjs → chunk-PGQDHVHI.mjs}

@@ -113,7 +113,7 @@ function truncateSnap(snap) {
   return truncatedSnap;
 }
 var name = "SnapController";
-var _closeAllConnections, _dynamicPermissions, _environmentEndowmentPermissions, _excludedPermissions, _featureFlags, _fetchFunction, _idleTimeCheckInterval, _maxIdleTime, _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, _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, _executeWithTimeout, executeWithTimeout_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, _maxInitTime, _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, _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 {
   constructor({
     closeAllConnections,
@@ -125,6 +125,7 @@ var SnapController = class extends BaseController {
     idleTimeCheckInterval = inMilliseconds(5, Duration.Second),
     maxIdleTime = inMilliseconds(30, Duration.Second),
     maxRequestTime = inMilliseconds(60, Duration.Second),
+    maxInitTime = inMilliseconds(60, Duration.Second),
     fetchFunction = globalThis.fetch.bind(globalThis),
     featureFlags = {},
     detectSnapLocation: detectSnapLocationFunction = detectSnapLocation,
@@ -316,16 +317,6 @@ var SnapController = class extends BaseController {
      * @param result - The result of the RPC request.
      */
     __privateAdd(this, _assertSnapRpcRequestResult);
-    /**
-     * Awaits the specified promise and rejects if the promise doesn't resolve
-     * before the timeout.
-     *
-     * @param promise - The promise to await.
-     * @param timer - An optional timer object to control the timeout.
-     * @returns The result of the promise or rejects if the promise times out.
-     * @template PromiseValue - The value of the Promise.
-     */
-    __privateAdd(this, _executeWithTimeout);
     __privateAdd(this, _recordSnapRpcRequestStart);
     __privateAdd(this, _recordSnapRpcRequestFinish);
     /**
@@ -414,6 +405,7 @@ var SnapController = class extends BaseController {
     __privateAdd(this, _fetchFunction, void 0);
     __privateAdd(this, _idleTimeCheckInterval, void 0);
     __privateAdd(this, _maxIdleTime, void 0);
+    __privateAdd(this, _maxInitTime, void 0);
     __privateAdd(this, _detectSnapLocation, void 0);
     __privateAdd(this, _snapsRuntimeData, void 0);
     __privateAdd(this, _rollbackSnapshots, void 0);
@@ -428,6 +420,7 @@ var SnapController = class extends BaseController {
     __privateSet(this, _idleTimeCheckInterval, idleTimeCheckInterval);
     __privateSet(this, _maxIdleTime, maxIdleTime);
     this.maxRequestTime = maxRequestTime;
+    __privateSet(this, _maxInitTime, maxInitTime);
     __privateSet(this, _detectSnapLocation, detectSnapLocationFunction);
     this._onUnhandledSnapError = this._onUnhandledSnapError.bind(this);
     this._onOutboundRequest = this._onOutboundRequest.bind(this);
@@ -1364,6 +1357,7 @@ _featureFlags = new WeakMap();
 _fetchFunction = new WeakMap();
 _idleTimeCheckInterval = new WeakMap();
 _maxIdleTime = new WeakMap();
+_maxInitTime = new WeakMap();
 _detectSnapLocation = new WeakMap();
 _snapsRuntimeData = new WeakMap();
 _rollbackSnapshots = new WeakMap();
@@ -1813,10 +1807,16 @@ startSnap_fn = async function(snapData) {
   }
   try {
     const runtime = __privateMethod(this, _getRuntimeExpect, getRuntimeExpect_fn).call(this, snapId);
-    const result = await __privateMethod(this, _executeWithTimeout, executeWithTimeout_fn).call(this, this.messagingSystem.call("ExecutionService:executeSnap", {
-      ...snapData,
-      endowments: await __privateMethod(this, _getEndowments, getEndowments_fn).call(this, snapId)
-    }));
+    const result = await withTimeout(
+      this.messagingSystem.call("ExecutionService:executeSnap", {
+        ...snapData,
+        endowments: await __privateMethod(this, _getEndowments, getEndowments_fn).call(this, snapId)
+      }),
+      __privateGet(this, _maxInitTime)
+    );
+    if (result === hasTimedOut) {
+      throw new Error(`${snapId} failed to start.`);
+    }
     __privateMethod(this, _transition, transition_fn).call(this, snapId, SnapStatusEvents.Start);
     runtime.lastRequest = Date.now();
     return result;
@@ -2028,7 +2028,12 @@ getRpcRequestHandler_fn = function(snapId) {
       { origin, handler: handlerType, request }
     );
     try {
-      const result = await __privateMethod(this, _executeWithTimeout, executeWithTimeout_fn).call(this, handleRpcRequestPromise, timer);
+      const result = await withTimeout(handleRpcRequestPromise, timer);
+      if (result === hasTimedOut) {
+        throw new Error(
+          `${snapId} failed to respond to the request in time.`
+        );
+      }
       await __privateMethod(this, _assertSnapRpcRequestResult, assertSnapRpcRequestResult_fn).call(this, snapId, handlerType, result);
       return __privateMethod(this, _transformSnapRpcRequestResult, transformSnapRpcRequestResult_fn).call(this, snapId, handlerType, result);
     } catch (error) {
@@ -2111,14 +2116,6 @@ assertSnapRpcRequestResult_fn = async function(snapId, handlerType, result) {
       break;
   }
 };
-_executeWithTimeout = new WeakSet();
-executeWithTimeout_fn = async function(promise, timer) {
-  const result = await withTimeout(promise, timer ?? this.maxRequestTime);
-  if (result === hasTimedOut) {
-    throw new Error("The request timed out.");
-  }
-  return result;
-};
 _recordSnapRpcRequestStart = new WeakSet();
 recordSnapRpcRequestStart_fn = function(snapId, requestId, timer) {
   const runtime = __privateMethod(this, _getRuntimeExpect, getRuntimeExpect_fn).call(this, snapId);
@@ -2304,4 +2301,4 @@ export {
   SNAP_APPROVAL_RESULT,
   SnapController
 };
-//# sourceMappingURL=chunk-5R4ENIDN.mjs.map
+//# sourceMappingURL=chunk-PGQDHVHI.mjs.map