@metamask/snaps-controllers 18.0.4 → 19.0.0

package/dist/services/ExecutionService.d.mts

@@ -1,18 +1,43 @@
+import { JsonRpcEngineV2 as JsonRpcEngine } from "@metamask/json-rpc-engine/v2";
 import type { Messenger } from "@metamask/messenger";
+import type ObjectMultiplex from "@metamask/object-multiplex";
+import type { BasePostMessageStream } from "@metamask/post-message-stream";
 import type { SnapRpcHookArgs } from "@metamask/snaps-utils";
-import type { Json } from "@metamask/utils";
-type TerminateSnap = (snapId: string) => Promise<void>;
-type TerminateAll = () => Promise<void>;
-type ExecuteSnap = (snapData: SnapExecutionData) => Promise<unknown>;
-type HandleRpcRequest = (snapId: string, options: SnapRpcHookArgs) => Promise<unknown>;
-export type ExecutionService = {
-    name: 'ExecutionService';
-    state: null;
-    terminateSnap: TerminateSnap;
-    terminateAllSnaps: TerminateAll;
-    executeSnap: ExecuteSnap;
-    handleRpcRequest: HandleRpcRequest;
+import type { Json, JsonRpcRequest } from "@metamask/utils";
+import type { Duplex } from "readable-stream";
+import type { ExecutionServiceMethodActions } from "./ExecutionService-method-action-types.mjs";
+declare const serviceName = "ExecutionService";
+export type SetupSnapProvider = (snapId: string, stream: Duplex) => void;
+export type ExecutionServiceArgs = {
+    setupSnapProvider: SetupSnapProvider;
+    messenger: ExecutionServiceMessenger;
+    initTimeout?: number;
+    pingTimeout?: number;
+    terminationTimeout?: number;
+    usePing?: boolean;
+};
+type JobStreams = {
+    command: Duplex;
+    rpc: Duplex;
+    connection: BasePostMessageStream;
+    mux: ObjectMultiplex;
+};
+export type Job<WorkerType> = {
+    id: string;
+    streams: JobStreams;
+    rpcEngine: JsonRpcEngine<JsonRpcRequest>;
+    worker: WorkerType;
 };
+export type TerminateJobArgs<WorkerType> = Partial<Job<WorkerType>> & Pick<Job<WorkerType>, 'id'>;
+/**
+ Statuses used for diagnostic purposes
+ - created: The initial state, no initialization has started
+ - initializing: Snap execution environment is initializing
+ - initialized: Snap execution environment has initialized
+ - executing: Snap source code is being executed
+ - running: Snap executed and ready for RPC requests
+ */
+type ExecutionStatus = 'created' | 'initializing' | 'initialized' | 'executing' | 'running';
 export type SnapExecutionData = {
     snapId: string;
     sourceCode: string;
@@ -23,49 +48,78 @@ export type SnapErrorJson = {
     code: number;
     data?: Json;
 };
-type ControllerName = 'ExecutionService';
-export type ErrorMessageEvent = {
+export type ExecutionServiceUnhandledErrorEvent = {
     type: 'ExecutionService:unhandledError';
     payload: [string, SnapErrorJson];
 };
-export type OutboundRequest = {
+export type ExecutionServiceOutboundRequestEvent = {
     type: 'ExecutionService:outboundRequest';
     payload: [string];
 };
-export type OutboundResponse = {
+export type ExecutionServiceOutboundResponseEvent = {
     type: 'ExecutionService:outboundResponse';
     payload: [string];
 };
-export type ExecutionServiceEvents = ErrorMessageEvent | OutboundRequest | OutboundResponse;
-/**
- * Handles RPC request.
- */
-export type HandleRpcRequestAction = {
-    type: `${ControllerName}:handleRpcRequest`;
-    handler: ExecutionService['handleRpcRequest'];
-};
-/**
- * Executes a given snap.
- */
-export type ExecuteSnapAction = {
-    type: `${ControllerName}:executeSnap`;
-    handler: ExecutionService['executeSnap'];
-};
-/**
- * Terminates a given snap.
- */
-export type TerminateSnapAction = {
-    type: `${ControllerName}:terminateSnap`;
-    handler: ExecutionService['terminateSnap'];
-};
-/**
- * Terminates all snaps.
- */
-export type TerminateAllSnapsAction = {
-    type: `${ControllerName}:terminateAllSnaps`;
-    handler: ExecutionService['terminateAllSnaps'];
-};
-export type ExecutionServiceActions = HandleRpcRequestAction | ExecuteSnapAction | TerminateSnapAction | TerminateAllSnapsAction;
+export type ExecutionServiceEvents = ExecutionServiceUnhandledErrorEvent | ExecutionServiceOutboundRequestEvent | ExecutionServiceOutboundResponseEvent;
+export type ExecutionServiceActions = ExecutionServiceMethodActions;
 export type ExecutionServiceMessenger = Messenger<'ExecutionService', ExecutionServiceActions, ExecutionServiceEvents>;
+export declare abstract class ExecutionService<WorkerType = unknown> {
+    #private;
+    name: typeof serviceName;
+    state: null;
+    constructor({ setupSnapProvider, messenger, initTimeout, pingTimeout, terminationTimeout, usePing, }: ExecutionServiceArgs);
+    /**
+     * Performs additional necessary work during job termination. **MUST** be
+     * implemented by concrete implementations. See
+     * {@link AbstractExecutionService.terminate} for details.
+     *
+     * @param job - The object corresponding to the job to be terminated.
+     */
+    protected abstract terminateJob(job: TerminateJobArgs<WorkerType>): Promise<void>;
+    /**
+     * Terminates the Snap with the specified ID and deletes all its associated
+     * data. Any subsequent messages targeting the Snap will fail with an error.
+     * Throws an error if termination fails unexpectedly.
+     *
+     * @param snapId - The id of the Snap to be terminated.
+     */
+    terminateSnap(snapId: string): Promise<void>;
+    /**
+     * Abstract function implemented by implementing class that spins up a new worker for a 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.
+     */
+    protected abstract initEnvStream(snapId: string): Promise<{
+        worker: WorkerType;
+        stream: BasePostMessageStream;
+    }>;
+    /**
+     * Set the execution status of the Snap.
+     *
+     * @param snapId - The Snap ID.
+     * @param status - The current execution status.
+     */
+    protected setSnapStatus(snapId: string, status: ExecutionStatus): void;
+    terminateAllSnaps(): Promise<void>;
+    /**
+     * Initializes and executes a Snap, setting up the communication channels to the Snap etc.
+     *
+     * @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 or execution times out.
+     */
+    executeSnap({ snapId, sourceCode, endowments, }: SnapExecutionData): Promise<string>;
+    /**
+     * Handle RPC request.
+     *
+     * @param snapId - The ID of the recipient Snap.
+     * @param options - Bag of options to pass to the RPC handler.
+     * @returns Promise that can handle the request.
+     */
+    handleRpcRequest(snapId: string, options: SnapRpcHookArgs): Promise<unknown>;
+}
 export {};
 //# sourceMappingURL=ExecutionService.d.mts.map

package/dist/services/ExecutionService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutionService.d.mts","sourceRoot":"","sources":["../../src/services/ExecutionService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAC7D,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAE5C,KAAK,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACvD,KAAK,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AACxC,KAAK,WAAW,GAAG,CAAC,QAAQ,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAErE,KAAK,gBAAgB,GAAG,CACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,gBAAgB,GAAG;IAG7B,IAAI,EAAE,kBAAkB,CAAC;IACzB,KAAK,EAAE,IAAI,CAAC;IAEZ,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,YAAY,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,KAAK,cAAc,GAAG,kBAAkB,CAAC;AAEzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,iCAAiC,CAAC;IACxC,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,kCAAkC,CAAC;IACzC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,mCAAmC,CAAC;IAC1C,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,iBAAiB,GACjB,eAAe,GACf,gBAAgB,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,GAAG,cAAc,mBAAmB,CAAC;IAC3C,OAAO,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,cAAc,cAAc,CAAC;IACtC,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;CAC1C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,GAAG,cAAc,gBAAgB,CAAC;IACxC,OAAO,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;CAC5C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,GAAG,cAAc,oBAAoB,CAAC;IAC5C,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,sBAAsB,GACtB,iBAAiB,GACjB,mBAAmB,GACnB,uBAAuB,CAAC;AAE5B,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,CACvB,CAAC"}
+{"version":3,"file":"ExecutionService.d.mts","sourceRoot":"","sources":["../../src/services/ExecutionService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,qCAAqC;AAEhF,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,eAAe,mCAAmC;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,sCAAsC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAE7D,OAAO,KAAK,EACV,IAAI,EAEJ,cAAc,EACf,wBAAwB;AASzB,OAAO,KAAK,EAAE,MAAM,EAAE,wBAAwB;AAE9C,OAAO,KAAK,EAAE,6BAA6B,EAAE,mDAA+C;AAM5F,QAAA,MAAM,WAAW,qBAAqB,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzE,MAAM,MAAM,oBAAoB,GAAG;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,SAAS,EAAE,yBAAyB,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,qBAAqB,CAAC;IAClC,GAAG,EAAE,eAAe,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,UAAU,IAAI;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,UAAU,CAAC;IACpB,SAAS,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACzC,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GACjE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;AAE9B;;;;;;;GAOG;AACH,KAAK,eAAe,GAChB,SAAS,GACT,cAAc,GACd,aAAa,GACb,WAAW,GACX,SAAS,CAAC;AASd,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,IAAI,EAAE,iCAAiC,CAAC;IACxC,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,IAAI,EAAE,kCAAkC,CAAC;IACzC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,IAAI,EAAE,mCAAmC,CAAC;IAC1C,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,mCAAmC,GACnC,oCAAoC,GACpC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,uBAAuB,GAAG,6BAA6B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,CACvB,CAAC;AAEF,8BAAsB,gBAAgB,CAAC,UAAU,GAAG,OAAO;;IACzD,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC,KAAK,OAAQ;gBAkBD,EACV,iBAAiB,EACjB,SAAS,EACT,WAAiD,EACjD,WAAiD,EACjD,kBAAuD,EACvD,OAAc,GACf,EAAE,oBAAoB;IAgBvB;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,CAC7B,GAAG,EAAE,gBAAgB,CAAC,UAAU,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;;;OAMG;IACU,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgMzD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QACxD,MAAM,EAAE,UAAU,CAAC;QACnB,MAAM,EAAE,qBAAqB,CAAC;KAC/B,CAAC;IAEF;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe;IAIzD,iBAAiB;IAMvB;;;;;;;;;OASG;IACG,WAAW,CAAC,EAChB,MAAM,EACN,UAAU,EACV,UAAU,GACX,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiFtC;;;;;;OAMG;IACU,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,OAAO,CAAC;CAepB"}

package/dist/services/ExecutionService.mjs

@@ -1,2 +1,286 @@
-export {};
+import { asV2Middleware } from "@metamask/json-rpc-engine";
+import { JsonRpcEngineV2 as JsonRpcEngine } from "@metamask/json-rpc-engine/v2";
+import { createStreamMiddleware } from "@metamask/json-rpc-middleware-stream";
+import { SNAP_STREAM_NAMES, logError, logWarning } from "@metamask/snaps-utils";
+import { Duration, assertIsJsonRpcRequest, hasProperty, inMilliseconds } from "@metamask/utils";
+import { nanoid } from "nanoid";
+import { pipeline } from "readable-stream";
+import { setupMultiplex } from "./multiplex.mjs";
+import { log } from "../logging.mjs";
+import { Timer } from "../snaps/Timer.mjs";
+import { hasTimedOut, withTimeout } from "../utils.mjs";
+const serviceName = 'ExecutionService';
+const MESSENGER_EXPOSED_METHODS = [
+    'terminateSnap',
+    'terminateAllSnaps',
+    'executeSnap',
+    'handleRpcRequest',
+];
+export class ExecutionService {
+    name = serviceName;
+    state = null;
+    #jobs;
+    #status;
+    #setupSnapProvider;
+    #messenger;
+    #initTimeout;
+    #pingTimeout;
+    #terminationTimeout;
+    #usePing;
+    constructor({ setupSnapProvider, messenger, initTimeout = inMilliseconds(60, Duration.Second), pingTimeout = inMilliseconds(10, Duration.Second), terminationTimeout = inMilliseconds(1, Duration.Second), usePing = true, }) {
+        this.#jobs = new Map();
+        this.#status = new Map();
+        this.#setupSnapProvider = setupSnapProvider;
+        this.#messenger = messenger;
+        this.#initTimeout = initTimeout;
+        this.#pingTimeout = pingTimeout;
+        this.#terminationTimeout = terminationTimeout;
+        this.#usePing = usePing;
+        this.#messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
+    }
+    /**
+     * Terminates the Snap with the specified ID and deletes all its associated
+     * data. Any subsequent messages targeting the Snap will fail with an error.
+     * Throws an error if termination fails unexpectedly.
+     *
+     * @param snapId - The id of the Snap to be terminated.
+     */
+    async terminateSnap(snapId) {
+        const job = this.#jobs.get(snapId);
+        if (!job) {
+            return;
+        }
+        try {
+            // Ping worker and tell it to run teardown, continue with termination if it takes too long
+            const result = await withTimeout(this.#command(snapId, {
+                jsonrpc: '2.0',
+                method: 'terminate',
+                id: nanoid(),
+            }), this.#terminationTimeout);
+            if (result === hasTimedOut || result !== 'OK') {
+                logWarning(`Snap "${snapId}" failed to terminate gracefully.`);
+            }
+        }
+        catch {
+            // Ignore
+        }
+        Object.values(job.streams).forEach((stream) => {
+            try {
+                if (!stream.destroyed) {
+                    stream.destroy();
+                }
+            }
+            catch (error) {
+                logError('Error while destroying stream', error);
+            }
+        });
+        await this.terminateJob(job);
+        this.#jobs.delete(snapId);
+        this.#status.delete(snapId);
+        log(`Snap "${snapId}" terminated.`);
+    }
+    /**
+     * Initiates a job for a Snap.
+     *
+     * @param snapId - The ID of the Snap to initiate a job for.
+     * @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(snapId, timer) {
+        const { streams, worker } = await this.#initStreams(snapId, timer);
+        const jsonRpcConnection = createStreamMiddleware();
+        pipeline(jsonRpcConnection.stream, streams.command, jsonRpcConnection.stream, (error) => {
+            if (error && !error.message?.match('Premature close')) {
+                logError(`Command stream failure.`, error);
+            }
+        });
+        const rpcEngine = JsonRpcEngine.create({
+            middleware: [asV2Middleware(jsonRpcConnection.middleware)],
+        });
+        const envMetadata = {
+            id: snapId,
+            streams,
+            rpcEngine,
+            worker,
+        };
+        this.#jobs.set(snapId, envMetadata);
+        return envMetadata;
+    }
+    /**
+     * Sets up the streams for an initiated job.
+     *
+     * @param snapId - The Snap ID.
+     * @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(snapId, timer) {
+        const result = await withTimeout(this.initEnvStream(snapId), timer);
+        if (result === hasTimedOut) {
+            // For certain environments, such as the iframe we may have already created the worker and wish to terminate it.
+            await this.terminateJob({ id: snapId });
+            const status = this.#status.get(snapId);
+            if (status === 'created') {
+                // Currently this error can only be thrown by OffscreenExecutionService.
+                throw new Error(`The executor for "${snapId}" couldn't start initialization. The offscreen document may not exist.`);
+            }
+            throw new Error(`The executor for "${snapId}" failed to initialize. The iframe/webview/worker failed to load.`);
+        }
+        const { worker, stream: envStream } = result;
+        const mux = setupMultiplex(envStream, `Snap: "${snapId}"`);
+        const commandStream = mux.createStream(SNAP_STREAM_NAMES.COMMAND);
+        // Handle out-of-band errors, i.e. errors thrown from the Snap outside of the req/res cycle.
+        // Also keep track of outbound request/responses
+        const notificationHandler = (message) => {
+            if (hasProperty(message, 'id')) {
+                return;
+            }
+            if (message.method === 'OutboundRequest') {
+                this.#messenger.publish('ExecutionService:outboundRequest', snapId);
+            }
+            else if (message.method === 'OutboundResponse') {
+                this.#messenger.publish('ExecutionService:outboundResponse', snapId);
+            }
+            else if (message.method === 'UnhandledError') {
+                this.#messenger.publish('ExecutionService:unhandledError', snapId, message.params.error);
+                commandStream.removeListener('data', notificationHandler);
+            }
+            else {
+                logError(new Error(`Received unexpected command stream notification "${message.method}".`));
+            }
+        };
+        commandStream.on('data', notificationHandler);
+        const rpcStream = mux
+            .createStream(SNAP_STREAM_NAMES.JSON_RPC)
+            .setMaxListeners(20);
+        rpcStream.on('data', (chunk) => {
+            if (chunk?.data && hasProperty(chunk?.data, 'id')) {
+                this.#messenger.publish('ExecutionService:outboundRequest', snapId);
+            }
+        });
+        // An error handler is not attached to the RPC stream until `setupSnapProvider` is called.
+        // We must set it up here to prevent errors from bubbling up if the stream is destroyed before then.
+        rpcStream.on('error', (error) => {
+            if (error && !error.message?.match('Premature close')) {
+                logError(`Snap: "${snapId}" - RPC stream failure:`, error);
+            }
+        });
+        const originalWrite = rpcStream.write.bind(rpcStream);
+        // @ts-expect-error Hack to inspect the messages being written to the stream.
+        rpcStream.write = (chunk, encoding, callback) => {
+            // Ignore chain switching notifications as it doesn't matter for the SnapProvider.
+            if (chunk?.data?.method === 'metamask_chainChanged') {
+                return true;
+            }
+            if (chunk?.data && hasProperty(chunk?.data, 'id')) {
+                this.#messenger.publish('ExecutionService:outboundResponse', snapId);
+            }
+            return originalWrite(chunk, encoding, callback);
+        };
+        return {
+            streams: {
+                command: commandStream,
+                rpc: rpcStream,
+                connection: envStream,
+                mux,
+            },
+            worker,
+        };
+    }
+    /**
+     * Set the execution status of the Snap.
+     *
+     * @param snapId - The Snap ID.
+     * @param status - The current execution status.
+     */
+    setSnapStatus(snapId, status) {
+        this.#status.set(snapId, status);
+    }
+    async terminateAllSnaps() {
+        await Promise.all([...this.#jobs.keys()].map(async (snapId) => this.terminateSnap(snapId)));
+    }
+    /**
+     * Initializes and executes a Snap, setting up the communication channels to the Snap etc.
+     *
+     * @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 or execution times out.
+     */
+    async executeSnap({ snapId, sourceCode, endowments, }) {
+        if (this.#jobs.has(snapId)) {
+            throw new Error(`"${snapId}" is already running.`);
+        }
+        this.setSnapStatus(snapId, 'created');
+        const timer = new Timer(this.#initTimeout);
+        // This may resolve even if the environment has failed to start up fully
+        const job = await this.#initJob(snapId, timer);
+        // Certain environments use ping as part of their initialization and thus can skip it here
+        if (this.#usePing) {
+            // Ping the worker to ensure that it started up
+            const pingResult = await withTimeout(this.#command(job.id, {
+                jsonrpc: '2.0',
+                method: 'ping',
+                id: nanoid(),
+            }), this.#pingTimeout);
+            if (pingResult === hasTimedOut) {
+                throw new Error(`The executor for "${snapId}" was unreachable. The executor did not respond in time.`);
+            }
+        }
+        const rpcStream = job.streams.rpc;
+        this.#setupSnapProvider(snapId, rpcStream);
+        // Use the remaining time as the timer, but ensure that the
+        // Snap gets at least half the init timeout.
+        const remainingTime = Math.max(timer.remaining, this.#initTimeout / 2);
+        this.setSnapStatus(snapId, 'initialized');
+        const request = {
+            jsonrpc: '2.0',
+            method: 'executeSnap',
+            params: { snapId, sourceCode, endowments },
+            id: nanoid(),
+        };
+        assertIsJsonRpcRequest(request);
+        this.setSnapStatus(snapId, 'executing');
+        const result = await withTimeout(this.#command(job.id, request), remainingTime);
+        if (result === hasTimedOut) {
+            throw new Error(`${snapId} failed to start.`);
+        }
+        if (result === 'OK') {
+            this.setSnapStatus(snapId, 'running');
+        }
+        return result;
+    }
+    async #command(snapId, message) {
+        const job = this.#jobs.get(snapId);
+        if (!job) {
+            throw new Error(`"${snapId}" is not currently running.`);
+        }
+        log('Parent: Sending Command', message);
+        return await job.rpcEngine.handle(message);
+    }
+    /**
+     * Handle RPC request.
+     *
+     * @param snapId - The ID of the recipient Snap.
+     * @param options - Bag of options to pass to the RPC handler.
+     * @returns Promise that can handle the request.
+     */
+    async handleRpcRequest(snapId, options) {
+        const { handler, request, origin } = options;
+        return await this.#command(snapId, {
+            id: nanoid(),
+            jsonrpc: '2.0',
+            method: 'snapRpc',
+            params: {
+                snapId,
+                origin,
+                handler,
+                request: request,
+            },
+        });
+    }
+}
 //# sourceMappingURL=ExecutionService.mjs.map

package/dist/services/ExecutionService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutionService.mjs","sourceRoot":"","sources":["../../src/services/ExecutionService.ts"],"names":[],"mappings":"","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport type { SnapRpcHookArgs } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\ntype TerminateSnap = (snapId: string) => Promise<void>;\ntype TerminateAll = () => Promise<void>;\ntype ExecuteSnap = (snapData: SnapExecutionData) => Promise<unknown>;\n\ntype HandleRpcRequest = (\n  snapId: string,\n  options: SnapRpcHookArgs,\n) => Promise<unknown>;\n\nexport type ExecutionService = {\n  // These fields are required for modular initialisation of the execution\n  // service in the MetaMask extension.\n  name: 'ExecutionService';\n  state: null;\n\n  terminateSnap: TerminateSnap;\n  terminateAllSnaps: TerminateAll;\n  executeSnap: ExecuteSnap;\n  handleRpcRequest: HandleRpcRequest;\n};\n\nexport type SnapExecutionData = {\n  snapId: string;\n  sourceCode: string;\n  endowments: Json;\n};\n\nexport type SnapErrorJson = {\n  message: string;\n  code: number;\n  data?: Json;\n};\n\ntype ControllerName = 'ExecutionService';\n\nexport type ErrorMessageEvent = {\n  type: 'ExecutionService:unhandledError';\n  payload: [string, SnapErrorJson];\n};\n\nexport type OutboundRequest = {\n  type: 'ExecutionService:outboundRequest';\n  payload: [string];\n};\n\nexport type OutboundResponse = {\n  type: 'ExecutionService:outboundResponse';\n  payload: [string];\n};\n\nexport type ExecutionServiceEvents =\n  | ErrorMessageEvent\n  | OutboundRequest\n  | OutboundResponse;\n\n/**\n * Handles RPC request.\n */\nexport type HandleRpcRequestAction = {\n  type: `${ControllerName}:handleRpcRequest`;\n  handler: ExecutionService['handleRpcRequest'];\n};\n\n/**\n * Executes a given snap.\n */\nexport type ExecuteSnapAction = {\n  type: `${ControllerName}:executeSnap`;\n  handler: ExecutionService['executeSnap'];\n};\n\n/**\n * Terminates a given snap.\n */\nexport type TerminateSnapAction = {\n  type: `${ControllerName}:terminateSnap`;\n  handler: ExecutionService['terminateSnap'];\n};\n\n/**\n * Terminates all snaps.\n */\nexport type TerminateAllSnapsAction = {\n  type: `${ControllerName}:terminateAllSnaps`;\n  handler: ExecutionService['terminateAllSnaps'];\n};\n\nexport type ExecutionServiceActions =\n  | HandleRpcRequestAction\n  | ExecuteSnapAction\n  | TerminateSnapAction\n  | TerminateAllSnapsAction;\n\nexport type ExecutionServiceMessenger = Messenger<\n  'ExecutionService',\n  ExecutionServiceActions,\n  ExecutionServiceEvents\n>;\n"]}
+{"version":3,"file":"ExecutionService.mjs","sourceRoot":"","sources":["../../src/services/ExecutionService.ts"],"names":[],"mappings":"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","sourcesContent":["import { asV2Middleware } from '@metamask/json-rpc-engine';\nimport { JsonRpcEngineV2 as JsonRpcEngine } from '@metamask/json-rpc-engine/v2';\nimport { createStreamMiddleware } from '@metamask/json-rpc-middleware-stream';\nimport type { Messenger } from '@metamask/messenger';\nimport type ObjectMultiplex from '@metamask/object-multiplex';\nimport type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport type { SnapRpcHookArgs } from '@metamask/snaps-utils';\nimport { SNAP_STREAM_NAMES, logError, logWarning } from '@metamask/snaps-utils';\nimport type {\n  Json,\n  JsonRpcNotification,\n  JsonRpcRequest,\n} from '@metamask/utils';\nimport {\n  Duration,\n  assertIsJsonRpcRequest,\n  hasProperty,\n  inMilliseconds,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\nimport { pipeline } from 'readable-stream';\nimport type { Duplex } from 'readable-stream';\n\nimport type { ExecutionServiceMethodActions } from './ExecutionService-method-action-types';\nimport { setupMultiplex } from './multiplex';\nimport { log } from '../logging';\nimport { Timer } from '../snaps/Timer';\nimport { hasTimedOut, withTimeout } from '../utils';\n\nconst serviceName = '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  usePing?: boolean;\n};\n\ntype JobStreams = {\n  command: Duplex;\n  rpc: Duplex;\n  connection: BasePostMessageStream;\n  mux: ObjectMultiplex;\n};\n\nexport type Job<WorkerType> = {\n  id: string;\n  streams: JobStreams;\n  rpcEngine: JsonRpcEngine<JsonRpcRequest>;\n  worker: WorkerType;\n};\n\nexport type TerminateJobArgs<WorkerType> = Partial<Job<WorkerType>> &\n  Pick<Job<WorkerType>, 'id'>;\n\n/**\n Statuses used for diagnostic purposes\n - created: The initial state, no initialization has started\n - initializing: Snap execution environment is initializing\n - initialized: Snap execution environment has initialized\n - executing: Snap source code is being executed\n - running: Snap executed and ready for RPC requests\n */\ntype ExecutionStatus =\n  | 'created'\n  | 'initializing'\n  | 'initialized'\n  | 'executing'\n  | 'running';\n\nconst MESSENGER_EXPOSED_METHODS = [\n  'terminateSnap',\n  'terminateAllSnaps',\n  'executeSnap',\n  'handleRpcRequest',\n] as const;\n\nexport type SnapExecutionData = {\n  snapId: string;\n  sourceCode: string;\n  endowments: Json;\n};\n\nexport type SnapErrorJson = {\n  message: string;\n  code: number;\n  data?: Json;\n};\n\nexport type ExecutionServiceUnhandledErrorEvent = {\n  type: 'ExecutionService:unhandledError';\n  payload: [string, SnapErrorJson];\n};\n\nexport type ExecutionServiceOutboundRequestEvent = {\n  type: 'ExecutionService:outboundRequest';\n  payload: [string];\n};\n\nexport type ExecutionServiceOutboundResponseEvent = {\n  type: 'ExecutionService:outboundResponse';\n  payload: [string];\n};\n\nexport type ExecutionServiceEvents =\n  | ExecutionServiceUnhandledErrorEvent\n  | ExecutionServiceOutboundRequestEvent\n  | ExecutionServiceOutboundResponseEvent;\n\nexport type ExecutionServiceActions = ExecutionServiceMethodActions;\n\nexport type ExecutionServiceMessenger = Messenger<\n  'ExecutionService',\n  ExecutionServiceActions,\n  ExecutionServiceEvents\n>;\n\nexport abstract class ExecutionService<WorkerType = unknown> {\n  name: typeof serviceName = serviceName;\n\n  state = null;\n\n  readonly #jobs: Map<string, Job<WorkerType>>;\n\n  readonly #status: Map<string, ExecutionStatus>;\n\n  readonly #setupSnapProvider: SetupSnapProvider;\n\n  readonly #messenger: ExecutionServiceMessenger;\n\n  readonly #initTimeout: number;\n\n  readonly #pingTimeout: number;\n\n  readonly #terminationTimeout: number;\n\n  readonly #usePing: boolean;\n\n  constructor({\n    setupSnapProvider,\n    messenger,\n    initTimeout = inMilliseconds(60, Duration.Second),\n    pingTimeout = inMilliseconds(10, Duration.Second),\n    terminationTimeout = inMilliseconds(1, Duration.Second),\n    usePing = true,\n  }: ExecutionServiceArgs) {\n    this.#jobs = new Map();\n    this.#status = new Map();\n    this.#setupSnapProvider = setupSnapProvider;\n    this.#messenger = messenger;\n    this.#initTimeout = initTimeout;\n    this.#pingTimeout = pingTimeout;\n    this.#terminationTimeout = terminationTimeout;\n    this.#usePing = usePing;\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\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(\n    job: TerminateJobArgs<WorkerType>,\n  ): Promise<void>;\n\n  /**\n   * Terminates the Snap with the specified ID and deletes all its associated\n   * data. Any subsequent messages targeting the Snap will fail with an error.\n   * Throws an error if termination fails unexpectedly.\n   *\n   * @param snapId - The id of the Snap to be terminated.\n   */\n  public async terminateSnap(snapId: string): Promise<void> {\n    const job = this.#jobs.get(snapId);\n    if (!job) {\n      return;\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(snapId, {\n          jsonrpc: '2.0',\n          method: 'terminate',\n          id: nanoid(),\n        }),\n        this.#terminationTimeout,\n      );\n\n      if (result === hasTimedOut || result !== 'OK') {\n        logWarning(`Snap \"${snapId}\" failed to terminate gracefully.`);\n      }\n    } catch {\n      // Ignore\n    }\n\n    Object.values(job.streams).forEach((stream) => {\n      try {\n        if (!stream.destroyed) {\n          stream.destroy();\n        }\n      } catch (error) {\n        logError('Error while destroying stream', error);\n      }\n    });\n\n    await this.terminateJob(job);\n\n    this.#jobs.delete(snapId);\n    this.#status.delete(snapId);\n    log(`Snap \"${snapId}\" terminated.`);\n  }\n\n  /**\n   * Initiates a job for a Snap.\n   *\n   * @param snapId - The ID of the Snap to initiate a job for.\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  async #initJob(snapId: string, timer: Timer): Promise<Job<WorkerType>> {\n    const { streams, worker } = await this.#initStreams(snapId, timer);\n\n    const jsonRpcConnection = createStreamMiddleware();\n\n    pipeline(\n      jsonRpcConnection.stream,\n      streams.command,\n      jsonRpcConnection.stream,\n      (error) => {\n        if (error && !error.message?.match('Premature close')) {\n          logError(`Command stream failure.`, error);\n        }\n      },\n    );\n\n    const rpcEngine = JsonRpcEngine.create({\n      middleware: [asV2Middleware(jsonRpcConnection.middleware)],\n    });\n\n    const envMetadata = {\n      id: snapId,\n      streams,\n      rpcEngine,\n      worker,\n    };\n    this.#jobs.set(snapId, envMetadata);\n\n    return envMetadata;\n  }\n\n  /**\n   * Sets up the streams for an initiated job.\n   *\n   * @param snapId - The Snap ID.\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  async #initStreams(\n    snapId: string,\n    timer: Timer,\n  ): Promise<{ streams: JobStreams; worker: WorkerType }> {\n    const result = await withTimeout(this.initEnvStream(snapId), 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      await this.terminateJob({ id: snapId });\n\n      const status = this.#status.get(snapId);\n      if (status === 'created') {\n        // Currently this error can only be thrown by OffscreenExecutionService.\n        throw new Error(\n          `The executor for \"${snapId}\" couldn't start initialization. The offscreen document may not exist.`,\n        );\n      }\n      throw new Error(\n        `The executor for \"${snapId}\" failed to initialize. The iframe/webview/worker failed to load.`,\n      );\n    }\n\n    const { worker, stream: envStream } = result;\n    const mux = setupMultiplex(envStream, `Snap: \"${snapId}\"`);\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 (hasProperty(message, 'id')) {\n        return;\n      }\n\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        this.#messenger.publish(\n          'ExecutionService:unhandledError',\n          snapId,\n          (message.params as { error: SnapErrorJson }).error,\n        );\n        commandStream.removeListener('data', notificationHandler);\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\n    const rpcStream = mux\n      .createStream(SNAP_STREAM_NAMES.JSON_RPC)\n      .setMaxListeners(20);\n\n    rpcStream.on('data', (chunk) => {\n      if (chunk?.data && hasProperty(chunk?.data, 'id')) {\n        this.#messenger.publish('ExecutionService:outboundRequest', snapId);\n      }\n    });\n\n    // An error handler is not attached to the RPC stream until `setupSnapProvider` is called.\n    // We must set it up here to prevent errors from bubbling up if the stream is destroyed before then.\n    rpcStream.on('error', (error) => {\n      if (error && !error.message?.match('Premature close')) {\n        logError(`Snap: \"${snapId}\" - RPC stream failure:`, error);\n      }\n    });\n\n    const originalWrite = rpcStream.write.bind(rpcStream);\n\n    // @ts-expect-error Hack to inspect the messages being written to the stream.\n    rpcStream.write = (chunk, encoding, callback) => {\n      // Ignore chain switching notifications as it doesn't matter for the SnapProvider.\n      if (chunk?.data?.method === 'metamask_chainChanged') {\n        return true;\n      }\n\n      if (chunk?.data && hasProperty(chunk?.data, 'id')) {\n        this.#messenger.publish('ExecutionService:outboundResponse', snapId);\n      }\n\n      return originalWrite(chunk, encoding, callback);\n    };\n\n    return {\n      streams: {\n        command: commandStream,\n        rpc: rpcStream,\n        connection: envStream,\n        mux,\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(snapId: string): Promise<{\n    worker: WorkerType;\n    stream: BasePostMessageStream;\n  }>;\n\n  /**\n   * Set the execution status of the Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @param status - The current execution status.\n   */\n  protected setSnapStatus(snapId: string, status: ExecutionStatus) {\n    this.#status.set(snapId, status);\n  }\n\n  async terminateAllSnaps() {\n    await Promise.all(\n      [...this.#jobs.keys()].map(async (snapId) => this.terminateSnap(snapId)),\n    );\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.#jobs.has(snapId)) {\n      throw new Error(`\"${snapId}\" is already running.`);\n    }\n\n    this.setSnapStatus(snapId, 'created');\n\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(snapId, timer);\n\n    // Certain environments use ping as part of their initialization and thus can skip it here\n    if (this.#usePing) {\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(\n          `The executor for \"${snapId}\" was unreachable. The executor did not respond in time.`,\n        );\n      }\n    }\n\n    const rpcStream = job.streams.rpc;\n\n    this.#setupSnapProvider(snapId, rpcStream);\n\n    // Use the remaining time as the timer, but ensure that the\n    // Snap gets at least half the init timeout.\n    const remainingTime = Math.max(timer.remaining, this.#initTimeout / 2);\n\n    this.setSnapStatus(snapId, 'initialized');\n\n    const request = {\n      jsonrpc: '2.0',\n      method: 'executeSnap',\n      params: { snapId, sourceCode, endowments },\n      id: nanoid(),\n    };\n\n    assertIsJsonRpcRequest(request);\n\n    this.setSnapStatus(snapId, 'executing');\n\n    const result = await withTimeout(\n      this.#command(job.id, request),\n      remainingTime,\n    );\n\n    if (result === hasTimedOut) {\n      throw new Error(`${snapId} failed to start.`);\n    }\n\n    if (result === 'OK') {\n      this.setSnapStatus(snapId, 'running');\n    }\n\n    return result as string;\n  }\n\n  async #command(\n    snapId: string,\n    message: JsonRpcRequest,\n  ): Promise<Json | undefined> {\n    const job = this.#jobs.get(snapId);\n    if (!job) {\n      throw new Error(`\"${snapId}\" is not currently running.`);\n    }\n\n    log('Parent: Sending Command', message);\n    return await job.rpcEngine.handle(message);\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 { handler, request, origin } = options;\n\n    return await this.#command(snapId, {\n      id: nanoid(),\n      jsonrpc: '2.0',\n      method: 'snapRpc',\n      params: {\n        snapId,\n        origin,\n        handler,\n        request: request as JsonRpcRequest,\n      },\n    });\n  }\n}\n"]}

package/dist/services/browser.cjs

@@ -14,8 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// Subset of exports meant for browser environments, omits Node.js services
-__exportStar(require("./AbstractExecutionService.cjs"), exports);
+exports.setupMultiplex = exports.ExecutionService = void 0;
+var ExecutionService_1 = require("./ExecutionService.cjs");
+Object.defineProperty(exports, "ExecutionService", { enumerable: true, get: function () { return ExecutionService_1.ExecutionService; } });
+var multiplex_1 = require("./multiplex.cjs");
+Object.defineProperty(exports, "setupMultiplex", { enumerable: true, get: function () { return multiplex_1.setupMultiplex; } });
 __exportStar(require("./ProxyPostMessageStream.cjs"), exports);
 __exportStar(require("./iframe/index.cjs"), exports);
 __exportStar(require("./offscreen/index.cjs"), exports);

package/dist/services/browser.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"browser.cjs","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2EAA2E;AAC3E,iEAA2C;AAE3C,+DAAyC;AACzC,qDAAyB;AACzB,wDAA4B;AAC5B,sDAA0B","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport * from './AbstractExecutionService';\nexport type * from './ExecutionService';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './offscreen';\nexport * from './webview';\n"]}
+{"version":3,"file":"browser.cjs","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAYA,2DAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AAOzB,6CAA6C;AAApC,2GAAA,cAAc,OAAA;AACvB,+DAAyC;AACzC,qDAAyB;AACzB,wDAA4B;AAC5B,sDAA0B","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport type {\n  ExecutionServiceActions,\n  ExecutionServiceArgs,\n  ExecutionServiceEvents,\n  ExecutionServiceMessenger,\n  ExecutionServiceOutboundRequestEvent,\n  ExecutionServiceOutboundResponseEvent,\n  ExecutionServiceUnhandledErrorEvent,\n  SnapErrorJson,\n  SnapExecutionData,\n} from './ExecutionService';\nexport { ExecutionService } from './ExecutionService';\nexport type {\n  ExecutionServiceTerminateSnapAction,\n  ExecutionServiceTerminateAllSnapsAction,\n  ExecutionServiceExecuteSnapAction,\n  ExecutionServiceHandleRpcRequestAction,\n} from './ExecutionService-method-action-types';\nexport { setupMultiplex } from './multiplex';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './offscreen';\nexport * from './webview';\n"]}

package/dist/services/browser.d.cts

@@ -1,5 +1,7 @@
-export * from "./AbstractExecutionService.cjs";
-export type * from "./ExecutionService.cjs";
+export type { ExecutionServiceActions, ExecutionServiceArgs, ExecutionServiceEvents, ExecutionServiceMessenger, ExecutionServiceOutboundRequestEvent, ExecutionServiceOutboundResponseEvent, ExecutionServiceUnhandledErrorEvent, SnapErrorJson, SnapExecutionData, } from "./ExecutionService.cjs";
+export { ExecutionService } from "./ExecutionService.cjs";
+export type { ExecutionServiceTerminateSnapAction, ExecutionServiceTerminateAllSnapsAction, ExecutionServiceExecuteSnapAction, ExecutionServiceHandleRpcRequestAction, } from "./ExecutionService-method-action-types.cjs";
+export { setupMultiplex } from "./multiplex.cjs";
 export * from "./ProxyPostMessageStream.cjs";
 export * from "./iframe/index.cjs";
 export * from "./offscreen/index.cjs";

package/dist/services/browser.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.cts","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AACA,+CAA2C;AAC3C,4CAAwC;AACxC,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B"}
+{"version":3,"file":"browser.d.cts","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AACA,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,EACzB,oCAAoC,EACpC,qCAAqC,EACrC,mCAAmC,EACnC,aAAa,EACb,iBAAiB,GAClB,+BAA2B;AAC5B,OAAO,EAAE,gBAAgB,EAAE,+BAA2B;AACtD,YAAY,EACV,mCAAmC,EACnC,uCAAuC,EACvC,iCAAiC,EACjC,sCAAsC,GACvC,mDAA+C;AAChD,OAAO,EAAE,cAAc,EAAE,wBAAoB;AAC7C,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B"}

package/dist/services/browser.d.mts

@@ -1,5 +1,7 @@
-export * from "./AbstractExecutionService.mjs";
-export type * from "./ExecutionService.mjs";
+export type { ExecutionServiceActions, ExecutionServiceArgs, ExecutionServiceEvents, ExecutionServiceMessenger, ExecutionServiceOutboundRequestEvent, ExecutionServiceOutboundResponseEvent, ExecutionServiceUnhandledErrorEvent, SnapErrorJson, SnapExecutionData, } from "./ExecutionService.mjs";
+export { ExecutionService } from "./ExecutionService.mjs";
+export type { ExecutionServiceTerminateSnapAction, ExecutionServiceTerminateAllSnapsAction, ExecutionServiceExecuteSnapAction, ExecutionServiceHandleRpcRequestAction, } from "./ExecutionService-method-action-types.mjs";
+export { setupMultiplex } from "./multiplex.mjs";
 export * from "./ProxyPostMessageStream.mjs";
 export * from "./iframe/index.mjs";
 export * from "./offscreen/index.mjs";

package/dist/services/browser.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.mts","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AACA,+CAA2C;AAC3C,4CAAwC;AACxC,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B"}
+{"version":3,"file":"browser.d.mts","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AACA,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,EACzB,oCAAoC,EACpC,qCAAqC,EACrC,mCAAmC,EACnC,aAAa,EACb,iBAAiB,GAClB,+BAA2B;AAC5B,OAAO,EAAE,gBAAgB,EAAE,+BAA2B;AACtD,YAAY,EACV,mCAAmC,EACnC,uCAAuC,EACvC,iCAAiC,EACjC,sCAAsC,GACvC,mDAA+C;AAChD,OAAO,EAAE,cAAc,EAAE,wBAAoB;AAC7C,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B"}

package/dist/services/browser.mjs

@@ -1,5 +1,5 @@
-// Subset of exports meant for browser environments, omits Node.js services
-export * from "./AbstractExecutionService.mjs";
+export { ExecutionService } from "./ExecutionService.mjs";
+export { setupMultiplex } from "./multiplex.mjs";
 export * from "./ProxyPostMessageStream.mjs";
 export * from "./iframe/index.mjs";
 export * from "./offscreen/index.mjs";

package/dist/services/browser.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"browser.mjs","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,+CAA2C;AAE3C,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport * from './AbstractExecutionService';\nexport type * from './ExecutionService';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './offscreen';\nexport * from './webview';\n"]}
+{"version":3,"file":"browser.mjs","sourceRoot":"","sources":["../../src/services/browser.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,gBAAgB,EAAE,+BAA2B;AAOtD,OAAO,EAAE,cAAc,EAAE,wBAAoB;AAC7C,6CAAyC;AACzC,mCAAyB;AACzB,sCAA4B;AAC5B,oCAA0B","sourcesContent":["// Subset of exports meant for browser environments, omits Node.js services\nexport type {\n  ExecutionServiceActions,\n  ExecutionServiceArgs,\n  ExecutionServiceEvents,\n  ExecutionServiceMessenger,\n  ExecutionServiceOutboundRequestEvent,\n  ExecutionServiceOutboundResponseEvent,\n  ExecutionServiceUnhandledErrorEvent,\n  SnapErrorJson,\n  SnapExecutionData,\n} from './ExecutionService';\nexport { ExecutionService } from './ExecutionService';\nexport type {\n  ExecutionServiceTerminateSnapAction,\n  ExecutionServiceTerminateAllSnapsAction,\n  ExecutionServiceExecuteSnapAction,\n  ExecutionServiceHandleRpcRequestAction,\n} from './ExecutionService-method-action-types';\nexport { setupMultiplex } from './multiplex';\nexport * from './ProxyPostMessageStream';\nexport * from './iframe';\nexport * from './offscreen';\nexport * from './webview';\n"]}

package/dist/services/iframe/IframeExecutionService.cjs

@@ -4,8 +4,8 @@ exports.IframeExecutionService = void 0;
 const post_message_stream_1 = require("@metamask/post-message-stream");
 const snaps_utils_1 = require("@metamask/snaps-utils");
 const utils_1 = require("../../utils.cjs");
-const AbstractExecutionService_1 = require("../AbstractExecutionService.cjs");
-class IframeExecutionService extends AbstractExecutionService_1.AbstractExecutionService {
+const ExecutionService_1 = require("../ExecutionService.cjs");
+class IframeExecutionService extends ExecutionService_1.ExecutionService {
     iframeUrl;
     constructor({ iframeUrl, messenger, setupSnapProvider, ...args }) {
         super({