@metamask/snaps-controllers 18.0.4 → 19.0.1

package/dist/websocket/WebSocketService.cjs

@@ -7,6 +7,12 @@ const utils_1 = require("@metamask/utils");
 const nanoid_1 = require("nanoid");
 const snaps_1 = require("../snaps/index.cjs");
 const serviceName = 'WebSocketService';
+const MESSENGER_EXPOSED_METHODS = [
+    'open',
+    'close',
+    'sendMessage',
+    'getAll',
+];
 class WebSocketService {
     name = serviceName;
     state = null;
@@ -15,10 +21,7 @@ class WebSocketService {
     constructor({ messenger }) {
         this.#messenger = messenger;
         this.#sockets = new Map();
-        this.#messenger.registerActionHandler(`${serviceName}:open`, async (...args) => this.#open(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:close`, (...args) => this.#close(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:sendMessage`, async (...args) => this.#sendMessage(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:getAll`, (...args) => this.#getAll(...args));
+        this.#messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
         this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {
             this.#closeAll(snap.id);
         });
@@ -53,7 +56,7 @@ class WebSocketService {
      * @returns True if a matching connection already exists, otherwise false.
      */
     #exists(snapId, url, protocols) {
-        return this.#getAll(snapId).some((socket) => socket.url === url && (0, snaps_utils_1.isEqual)(socket.protocols, protocols));
+        return this.getAll(snapId).some((socket) => socket.url === url && (0, snaps_utils_1.isEqual)(socket.protocols, protocols));
     }
     /**
      * Handle sending a specific WebSocketEvent to a Snap.
@@ -82,7 +85,7 @@ class WebSocketService {
      * @returns The identifier for the opened connection.
      * @throws If the connection fails.
      */
-    async #open(snapId, url, protocols = []) {
+    async open(snapId, url, protocols = []) {
         (0, utils_1.assert)(!this.#exists(snapId, url, protocols), `An open WebSocket connection to ${url} already exists.`);
         const parsedUrl = new URL(url);
         const { origin } = parsedUrl;
@@ -149,7 +152,7 @@ class WebSocketService {
      * @param snapId - The Snap ID.
      * @param id - The identifier for the WebSocket connection.
      */
-    #close(snapId, id) {
+    close(snapId, id) {
         const { socket } = this.#get(snapId, id);
         socket.close();
     }
@@ -159,8 +162,8 @@ class WebSocketService {
      * @param snapId - The Snap ID.
      */
     #closeAll(snapId) {
-        for (const socket of this.#getAll(snapId)) {
-            this.#close(snapId, socket.id);
+        for (const socket of this.getAll(snapId)) {
+            this.close(snapId, socket.id);
         }
     }
     /**
@@ -170,7 +173,7 @@ class WebSocketService {
      * @param id - The identifier for the WebSocket connection.
      * @param data - The message to send.
      */
-    async #sendMessage(snapId, id, data) {
+    async sendMessage(snapId, id, data) {
         const { socket, openPromise } = this.#get(snapId, id);
         await openPromise;
         const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;
@@ -182,7 +185,7 @@ class WebSocketService {
      * @param snapId - The Snap ID.
      * @returns A list of WebSocket connections.
      */
-    #getAll(snapId) {
+    getAll(snapId) {
         return [...this.#sockets.values()]
             .filter((socket) => socket.snapId === snapId)
             .map((socket) => ({

package/dist/websocket/WebSocketService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketService.cjs","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  GetWebSocketsResult,\n  SnapId,\n  WebSocketEvent,\n} from '@metamask/snaps-sdk';\nimport { HandlerType, isEqual, logError } from '@metamask/snaps-utils';\nimport { assert, createDeferredPromise } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  HandleSnapRequest,\n  SnapInstalled,\n  SnapUninstalled,\n  SnapUpdated,\n} from '../snaps';\nimport { METAMASK_ORIGIN } from '../snaps';\n\nconst serviceName = 'WebSocketService';\n\nexport type WebSocketServiceOpenAction = {\n  type: `${typeof serviceName}:open`;\n  handler: (\n    snapId: SnapId,\n    url: string,\n    protocols?: string[],\n  ) => Promise<string>;\n};\n\nexport type WebSocketServiceCloseAction = {\n  type: `${typeof serviceName}:close`;\n  handler: (snapId: SnapId, id: string) => void;\n};\n\nexport type WebSocketServiceSendMessageAction = {\n  type: `${typeof serviceName}:sendMessage`;\n  handler: (\n    snapId: SnapId,\n    id: string,\n    data: string | number[],\n  ) => Promise<void>;\n};\n\nexport type WebSocketServiceGetAllAction = {\n  type: `${typeof serviceName}:getAll`;\n  handler: (snapId: SnapId) => GetWebSocketsResult;\n};\n\nexport type WebSocketServiceActions =\n  | WebSocketServiceOpenAction\n  | WebSocketServiceCloseAction\n  | WebSocketServiceSendMessageAction\n  | WebSocketServiceGetAllAction;\n\nexport type WebSocketServiceAllowedActions = HandleSnapRequest;\n\nexport type WebSocketServiceEvents =\n  | SnapUninstalled\n  | SnapUpdated\n  | SnapInstalled;\n\nexport type WebSocketServiceMessenger = Messenger<\n  'WebSocketService',\n  WebSocketServiceActions | WebSocketServiceAllowedActions,\n  WebSocketServiceEvents\n>;\n\ntype WebSocketServiceArgs = {\n  messenger: WebSocketServiceMessenger;\n};\n\ntype InternalSocket = {\n  id: string;\n  snapId: SnapId;\n  url: string;\n  protocols: string[];\n  openPromise: Promise<void>;\n  // eslint-disable-next-line no-restricted-globals\n  socket: WebSocket;\n};\n\nexport class WebSocketService {\n  name: typeof serviceName = serviceName;\n\n  state = null;\n\n  readonly #messenger: WebSocketServiceMessenger;\n\n  readonly #sockets: Map<string, InternalSocket>;\n\n  constructor({ messenger }: WebSocketServiceArgs) {\n    this.#messenger = messenger;\n    this.#sockets = new Map();\n\n    this.#messenger.registerActionHandler(\n      `${serviceName}:open`,\n      async (...args) => this.#open(...args),\n    );\n\n    this.#messenger.registerActionHandler(`${serviceName}:close`, (...args) =>\n      this.#close(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${serviceName}:sendMessage`,\n      async (...args) => this.#sendMessage(...args),\n    );\n\n    this.#messenger.registerActionHandler(`${serviceName}:getAll`, (...args) =>\n      this.#getAll(...args),\n    );\n\n    this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    // Due to local Snaps not currently emitting snapUninstalled we also have to\n    // listen to snapInstalled.\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n  }\n\n  /**\n   * Get information about a given WebSocket connection with an ID.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @returns Information about the WebSocket connection.\n   * @throws If the WebSocket connection cannot be found.\n   */\n  #get(snapId: SnapId, id: string) {\n    const socket = this.#sockets.get(id);\n\n    assert(\n      socket && socket.snapId === snapId,\n      `Socket with ID \"${id}\" not found.`,\n    );\n\n    return socket;\n  }\n\n  /**\n   * Check whether a given Snap ID already has an open connection for a URL and protocol.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL.\n   * @param protocols - A protocols parameter.\n   * @returns True if a matching connection already exists, otherwise false.\n   */\n  #exists(snapId: SnapId, url: string, protocols: string[]) {\n    return this.#getAll(snapId).some(\n      (socket) => socket.url === url && isEqual(socket.protocols, protocols),\n    );\n  }\n\n  /**\n   * Handle sending a specific WebSocketEvent to a Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @param event - The WebSocketEvent.\n   */\n  #handleEvent(snapId: SnapId, event: WebSocketEvent) {\n    this.#messenger\n      .call('SnapController:handleRequest', {\n        origin: METAMASK_ORIGIN,\n        snapId,\n        handler: HandlerType.OnWebSocketEvent,\n        request: { method: '', params: { event } },\n      })\n      .catch((error) => {\n        logError(\n          `An error occurred while handling a WebSocket message for Snap \"${snapId}\":`,\n          error,\n        );\n      });\n  }\n\n  /**\n   * Open a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL for the WebSocket connection.\n   * @param protocols - An optional parameter for protocols.\n   * @returns The identifier for the opened connection.\n   * @throws If the connection fails.\n   */\n  async #open(snapId: SnapId, url: string, protocols: string[] = []) {\n    assert(\n      !this.#exists(snapId, url, protocols),\n      `An open WebSocket connection to ${url} already exists.`,\n    );\n\n    const parsedUrl = new URL(url);\n    const { origin } = parsedUrl;\n\n    const id = nanoid();\n\n    // eslint-disable-next-line no-restricted-globals\n    const socket = new WebSocket(url, protocols);\n    socket.binaryType = 'arraybuffer';\n\n    const { promise, resolve, reject } = createDeferredPromise();\n\n    socket.addEventListener('open', () => {\n      resolve();\n      this.#handleEvent(snapId, {\n        type: 'open',\n        id,\n        origin,\n      });\n    });\n\n    socket.addEventListener('close', (event) => {\n      this.#sockets.delete(id);\n\n      this.#handleEvent(snapId, {\n        type: 'close',\n        id,\n        origin,\n        code: event.code,\n        reason: event.reason,\n        // wasClean is not available on mobile.\n        wasClean: event.wasClean ?? null,\n      });\n    });\n\n    const errorListener = () => {\n      reject(\n        rpcErrors.resourceUnavailable(\n          'An error occurred while opening the WebSocket.',\n        ),\n      );\n    };\n\n    socket.addEventListener('error', errorListener);\n\n    socket.addEventListener('message', (event) => {\n      const isText = typeof event.data === 'string';\n      const data = isText\n        ? { type: 'text' as const, message: event.data }\n        : {\n            type: 'binary' as const,\n            // We request that the WebSocket gives us an array buffer.\n            message: Array.from(new Uint8Array(event.data)),\n          };\n\n      this.#handleEvent(snapId, {\n        type: 'message',\n        id,\n        origin,\n        data,\n      });\n    });\n\n    this.#sockets.set(id, {\n      id,\n      snapId,\n      url,\n      protocols,\n      socket,\n      openPromise: promise,\n    });\n\n    await promise;\n\n    socket.removeEventListener('error', errorListener);\n\n    return id;\n  }\n\n  /**\n   * Close a given WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   */\n  #close(snapId: SnapId, id: string) {\n    const { socket } = this.#get(snapId, id);\n\n    socket.close();\n  }\n\n  /**\n   * Close all open connections for a given Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   */\n  #closeAll(snapId: SnapId) {\n    for (const socket of this.#getAll(snapId)) {\n      this.#close(snapId, socket.id);\n    }\n  }\n\n  /**\n   * Send a message from a given Snap ID to a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @param data - The message to send.\n   */\n  async #sendMessage(snapId: SnapId, id: string, data: string | number[]) {\n    const { socket, openPromise } = this.#get(snapId, id);\n\n    await openPromise;\n\n    const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;\n\n    socket.send(wrappedData);\n  }\n\n  /**\n   * Get a list of all open WebSocket connections for a Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   * @returns A list of WebSocket connections.\n   */\n  #getAll(snapId: SnapId) {\n    return [...this.#sockets.values()]\n      .filter((socket) => socket.snapId === snapId)\n      .map((socket) => ({\n        id: socket.id,\n        url: socket.url,\n        protocols: socket.protocols,\n      }));\n  }\n}\n"]}
+{"version":3,"file":"WebSocketService.cjs","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAEjD,uDAAuE;AACvE,2CAAgE;AAChE,mCAAgC;AAShC,8CAA2C;AAE3C,MAAM,WAAW,GAAG,kBAAkB,CAAC;AAEvC,MAAM,yBAAyB,GAAG;IAChC,MAAM;IACN,OAAO;IACP,aAAa;IACb,QAAQ;CACA,CAAC;AA+BX,MAAa,gBAAgB;IAC3B,IAAI,GAAuB,WAAW,CAAC;IAEvC,KAAK,GAAG,IAAI,CAAC;IAEJ,UAAU,CAA4B;IAEtC,QAAQ,CAA8B;IAE/C,YAAY,EAAE,SAAS,EAAwB;QAC7C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAC1C,IAAI,EACJ,yBAAyB,CAC1B,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAA4B,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gCAAgC,EAAE,CAAC,IAAI,EAAE,EAAE;YACnE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,4EAA4E;QAC5E,2BAA2B;QAC3B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,8BAA8B,EAAE,CAAC,IAAI,EAAE,EAAE;YACjE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,CAAC,MAAc,EAAE,EAAU;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAErC,IAAA,cAAM,EACJ,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAClC,mBAAmB,EAAE,cAAc,CACpC,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,MAAc,EAAE,GAAW,EAAE,SAAmB;QACtD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAC7B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,IAAA,qBAAO,EAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CACvE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,MAAc,EAAE,KAAqB;QAChD,IAAI,CAAC,UAAU;aACZ,IAAI,CAAC,8BAA8B,EAAE;YACpC,MAAM,EAAE,uBAAe;YACvB,MAAM;YACN,OAAO,EAAE,yBAAW,CAAC,gBAAgB;YACrC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE;SAC3C,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,IAAA,sBAAQ,EACN,kEAAkE,MAAM,IAAI,EAC5E,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,GAAW,EAAE,YAAsB,EAAE;QAC9D,IAAA,cAAM,EACJ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,EACrC,mCAAmC,GAAG,kBAAkB,CACzD,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QAE7B,MAAM,EAAE,GAAG,IAAA,eAAM,GAAE,CAAC;QAEpB,iDAAiD;QACjD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,GAAG,aAAa,CAAC;QAElC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAqB,GAAE,CAAC;QAE7D,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YACnC,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBACxB,IAAI,EAAE,MAAM;gBACZ,EAAE;gBACF,MAAM;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAEzB,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBACxB,IAAI,EAAE,OAAO;gBACb,EAAE;gBACF,MAAM;gBACN,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,uCAAuC;gBACvC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,GAAG,EAAE;YACzB,MAAM,CACJ,sBAAS,CAAC,mBAAmB,CAC3B,gDAAgD,CACjD,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEhD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3C,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM;gBACjB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE;gBAChD,CAAC,CAAC;oBACE,IAAI,EAAE,QAAiB;oBACvB,0DAA0D;oBAC1D,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBAChD,CAAC;YAEN,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBACxB,IAAI,EAAE,SAAS;gBACf,EAAE;gBACF,MAAM;gBACN,IAAI;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE;YACpB,EAAE;YACF,MAAM;YACN,GAAG;YACH,SAAS;YACT,MAAM;YACN,WAAW,EAAE,OAAO;SACrB,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC;QAEd,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEnD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAc,EAAE,EAAU;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEzC,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,MAAc;QACtB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,EAAU,EAAE,IAAuB;QACnE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEtD,MAAM,WAAW,CAAC;QAElB,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAEtE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,MAAc;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC/B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC;aAC5C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC,CAAC;IACR,CAAC;CACF;AA5OD,4CA4OC","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { SnapId, WebSocketEvent } from '@metamask/snaps-sdk';\nimport { HandlerType, isEqual, logError } from '@metamask/snaps-utils';\nimport { assert, createDeferredPromise } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type { WebSocketServiceMethodActions } from './WebSocketService-method-action-types';\nimport type {\n  SnapControllerHandleRequestAction,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerSnapUpdatedEvent,\n} from '../snaps';\nimport { METAMASK_ORIGIN } from '../snaps';\n\nconst serviceName = 'WebSocketService';\n\nconst MESSENGER_EXPOSED_METHODS = [\n  'open',\n  'close',\n  'sendMessage',\n  'getAll',\n] as const;\n\nexport type WebSocketServiceActions = WebSocketServiceMethodActions;\n\ntype AllowedActions = SnapControllerHandleRequestAction;\n\ntype AllowedEvents =\n  | SnapControllerSnapUninstalledEvent\n  | SnapControllerSnapUpdatedEvent\n  | SnapControllerSnapInstalledEvent;\n\nexport type WebSocketServiceMessenger = Messenger<\n  'WebSocketService',\n  WebSocketServiceActions | AllowedActions,\n  AllowedEvents\n>;\n\ntype WebSocketServiceArgs = {\n  messenger: WebSocketServiceMessenger;\n};\n\ntype InternalSocket = {\n  id: string;\n  snapId: SnapId;\n  url: string;\n  protocols: string[];\n  openPromise: Promise<void>;\n  // eslint-disable-next-line no-restricted-globals\n  socket: WebSocket;\n};\n\nexport class WebSocketService {\n  name: typeof serviceName = serviceName;\n\n  state = null;\n\n  readonly #messenger: WebSocketServiceMessenger;\n\n  readonly #sockets: Map<string, InternalSocket>;\n\n  constructor({ messenger }: WebSocketServiceArgs) {\n    this.#messenger = messenger;\n    this.#sockets = new Map();\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    // Due to local Snaps not currently emitting snapUninstalled we also have to\n    // listen to snapInstalled.\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n  }\n\n  /**\n   * Get information about a given WebSocket connection with an ID.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @returns Information about the WebSocket connection.\n   * @throws If the WebSocket connection cannot be found.\n   */\n  #get(snapId: SnapId, id: string) {\n    const socket = this.#sockets.get(id);\n\n    assert(\n      socket && socket.snapId === snapId,\n      `Socket with ID \"${id}\" not found.`,\n    );\n\n    return socket;\n  }\n\n  /**\n   * Check whether a given Snap ID already has an open connection for a URL and protocol.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL.\n   * @param protocols - A protocols parameter.\n   * @returns True if a matching connection already exists, otherwise false.\n   */\n  #exists(snapId: SnapId, url: string, protocols: string[]) {\n    return this.getAll(snapId).some(\n      (socket) => socket.url === url && isEqual(socket.protocols, protocols),\n    );\n  }\n\n  /**\n   * Handle sending a specific WebSocketEvent to a Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @param event - The WebSocketEvent.\n   */\n  #handleEvent(snapId: SnapId, event: WebSocketEvent) {\n    this.#messenger\n      .call('SnapController:handleRequest', {\n        origin: METAMASK_ORIGIN,\n        snapId,\n        handler: HandlerType.OnWebSocketEvent,\n        request: { method: '', params: { event } },\n      })\n      .catch((error) => {\n        logError(\n          `An error occurred while handling a WebSocket message for Snap \"${snapId}\":`,\n          error,\n        );\n      });\n  }\n\n  /**\n   * Open a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL for the WebSocket connection.\n   * @param protocols - An optional parameter for protocols.\n   * @returns The identifier for the opened connection.\n   * @throws If the connection fails.\n   */\n  async open(snapId: SnapId, url: string, protocols: string[] = []) {\n    assert(\n      !this.#exists(snapId, url, protocols),\n      `An open WebSocket connection to ${url} already exists.`,\n    );\n\n    const parsedUrl = new URL(url);\n    const { origin } = parsedUrl;\n\n    const id = nanoid();\n\n    // eslint-disable-next-line no-restricted-globals\n    const socket = new WebSocket(url, protocols);\n    socket.binaryType = 'arraybuffer';\n\n    const { promise, resolve, reject } = createDeferredPromise();\n\n    socket.addEventListener('open', () => {\n      resolve();\n      this.#handleEvent(snapId, {\n        type: 'open',\n        id,\n        origin,\n      });\n    });\n\n    socket.addEventListener('close', (event) => {\n      this.#sockets.delete(id);\n\n      this.#handleEvent(snapId, {\n        type: 'close',\n        id,\n        origin,\n        code: event.code,\n        reason: event.reason,\n        // wasClean is not available on mobile.\n        wasClean: event.wasClean ?? null,\n      });\n    });\n\n    const errorListener = () => {\n      reject(\n        rpcErrors.resourceUnavailable(\n          'An error occurred while opening the WebSocket.',\n        ),\n      );\n    };\n\n    socket.addEventListener('error', errorListener);\n\n    socket.addEventListener('message', (event) => {\n      const isText = typeof event.data === 'string';\n      const data = isText\n        ? { type: 'text' as const, message: event.data }\n        : {\n            type: 'binary' as const,\n            // We request that the WebSocket gives us an array buffer.\n            message: Array.from(new Uint8Array(event.data)),\n          };\n\n      this.#handleEvent(snapId, {\n        type: 'message',\n        id,\n        origin,\n        data,\n      });\n    });\n\n    this.#sockets.set(id, {\n      id,\n      snapId,\n      url,\n      protocols,\n      socket,\n      openPromise: promise,\n    });\n\n    await promise;\n\n    socket.removeEventListener('error', errorListener);\n\n    return id;\n  }\n\n  /**\n   * Close a given WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   */\n  close(snapId: SnapId, id: string) {\n    const { socket } = this.#get(snapId, id);\n\n    socket.close();\n  }\n\n  /**\n   * Close all open connections for a given Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   */\n  #closeAll(snapId: SnapId) {\n    for (const socket of this.getAll(snapId)) {\n      this.close(snapId, socket.id);\n    }\n  }\n\n  /**\n   * Send a message from a given Snap ID to a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @param data - The message to send.\n   */\n  async sendMessage(snapId: SnapId, id: string, data: string | number[]) {\n    const { socket, openPromise } = this.#get(snapId, id);\n\n    await openPromise;\n\n    const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;\n\n    socket.send(wrappedData);\n  }\n\n  /**\n   * Get a list of all open WebSocket connections for a Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   * @returns A list of WebSocket connections.\n   */\n  getAll(snapId: SnapId) {\n    return [...this.#sockets.values()]\n      .filter((socket) => socket.snapId === snapId)\n      .map((socket) => ({\n        id: socket.id,\n        url: socket.url,\n        protocols: socket.protocols,\n      }));\n  }\n}\n"]}

package/dist/websocket/WebSocketService.d.cts

@@ -1,27 +1,12 @@
 import type { Messenger } from "@metamask/messenger";
-import type { GetWebSocketsResult, SnapId } from "@metamask/snaps-sdk";
-import type { HandleSnapRequest, SnapInstalled, SnapUninstalled, SnapUpdated } from "../snaps/index.cjs";
+import type { SnapId } from "@metamask/snaps-sdk";
+import type { WebSocketServiceMethodActions } from "./WebSocketService-method-action-types.cjs";
+import type { SnapControllerHandleRequestAction, SnapControllerSnapInstalledEvent, SnapControllerSnapUninstalledEvent, SnapControllerSnapUpdatedEvent } from "../snaps/index.cjs";
 declare const serviceName = "WebSocketService";
-export type WebSocketServiceOpenAction = {
-    type: `${typeof serviceName}:open`;
-    handler: (snapId: SnapId, url: string, protocols?: string[]) => Promise<string>;
-};
-export type WebSocketServiceCloseAction = {
-    type: `${typeof serviceName}:close`;
-    handler: (snapId: SnapId, id: string) => void;
-};
-export type WebSocketServiceSendMessageAction = {
-    type: `${typeof serviceName}:sendMessage`;
-    handler: (snapId: SnapId, id: string, data: string | number[]) => Promise<void>;
-};
-export type WebSocketServiceGetAllAction = {
-    type: `${typeof serviceName}:getAll`;
-    handler: (snapId: SnapId) => GetWebSocketsResult;
-};
-export type WebSocketServiceActions = WebSocketServiceOpenAction | WebSocketServiceCloseAction | WebSocketServiceSendMessageAction | WebSocketServiceGetAllAction;
-export type WebSocketServiceAllowedActions = HandleSnapRequest;
-export type WebSocketServiceEvents = SnapUninstalled | SnapUpdated | SnapInstalled;
-export type WebSocketServiceMessenger = Messenger<'WebSocketService', WebSocketServiceActions | WebSocketServiceAllowedActions, WebSocketServiceEvents>;
+export type WebSocketServiceActions = WebSocketServiceMethodActions;
+type AllowedActions = SnapControllerHandleRequestAction;
+type AllowedEvents = SnapControllerSnapUninstalledEvent | SnapControllerSnapUpdatedEvent | SnapControllerSnapInstalledEvent;
+export type WebSocketServiceMessenger = Messenger<'WebSocketService', WebSocketServiceActions | AllowedActions, AllowedEvents>;
 type WebSocketServiceArgs = {
     messenger: WebSocketServiceMessenger;
 };
@@ -30,6 +15,42 @@ export declare class WebSocketService {
     name: typeof serviceName;
     state: null;
     constructor({ messenger }: WebSocketServiceArgs);
+    /**
+     * Open a WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param url - The URL for the WebSocket connection.
+     * @param protocols - An optional parameter for protocols.
+     * @returns The identifier for the opened connection.
+     * @throws If the connection fails.
+     */
+    open(snapId: SnapId, url: string, protocols?: string[]): Promise<string>;
+    /**
+     * Close a given WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param id - The identifier for the WebSocket connection.
+     */
+    close(snapId: SnapId, id: string): void;
+    /**
+     * Send a message from a given Snap ID to a WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param id - The identifier for the WebSocket connection.
+     * @param data - The message to send.
+     */
+    sendMessage(snapId: SnapId, id: string, data: string | number[]): Promise<void>;
+    /**
+     * Get a list of all open WebSocket connections for a Snap ID.
+     *
+     * @param snapId - The Snap ID.
+     * @returns A list of WebSocket connections.
+     */
+    getAll(snapId: SnapId): {
+        id: string;
+        url: string;
+        protocols: string[];
+    }[];
 }
 export {};
 //# sourceMappingURL=WebSocketService.d.cts.map

package/dist/websocket/WebSocketService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketService.d.cts","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,4BAA4B;AAK7B,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,WAAW,EACZ,2BAAiB;AAGlB,QAAA,MAAM,WAAW,qBAAqB,CAAC;AAEvC,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,GAAG,OAAO,WAAW,OAAO,CAAC;IACnC,OAAO,EAAE,CACP,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAAE,KACjB,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,GAAG,OAAO,WAAW,QAAQ,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,IAAI,EAAE,GAAG,OAAO,WAAW,cAAc,CAAC;IAC1C,OAAO,EAAE,CACP,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,KACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,GAAG,OAAO,WAAW,SAAS,CAAC;IACrC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,0BAA0B,GAC1B,2BAA2B,GAC3B,iCAAiC,GACjC,4BAA4B,CAAC;AAEjC,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,CAAC;AAE/D,MAAM,MAAM,sBAAsB,GAC9B,eAAe,GACf,WAAW,GACX,aAAa,CAAC;AAElB,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,GAAG,8BAA8B,EACxD,sBAAsB,CACvB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,yBAAyB,CAAC;CACtC,CAAC;AAYF,qBAAa,gBAAgB;;IAC3B,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC,KAAK,OAAQ;gBAMD,EAAE,SAAS,EAAE,EAAE,oBAAoB;CAgPhD"}
+{"version":3,"file":"WebSocketService.d.cts","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,MAAM,EAAkB,4BAA4B;AAKlE,OAAO,KAAK,EAAE,6BAA6B,EAAE,mDAA+C;AAC5F,OAAO,KAAK,EACV,iCAAiC,EACjC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,2BAAiB;AAGlB,QAAA,MAAM,WAAW,qBAAqB,CAAC;AASvC,MAAM,MAAM,uBAAuB,GAAG,6BAA6B,CAAC;AAEpE,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD,KAAK,aAAa,GACd,kCAAkC,GAClC,8BAA8B,GAC9B,gCAAgC,CAAC;AAErC,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,GAAG,cAAc,EACxC,aAAa,CACd,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,yBAAyB,CAAC;CACtC,CAAC;AAYF,qBAAa,gBAAgB;;IAC3B,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC,KAAK,OAAQ;gBAMD,EAAE,SAAS,EAAE,EAAE,oBAAoB;IA+E/C;;;;;;;;OAQG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO;IAoFhE;;;;;OAKG;IACH,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAiBhC;;;;;;OAMG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IAUrE;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM;;;;;CAStB"}

package/dist/websocket/WebSocketService.d.mts

@@ -1,27 +1,12 @@
 import type { Messenger } from "@metamask/messenger";
-import type { GetWebSocketsResult, SnapId } from "@metamask/snaps-sdk";
-import type { HandleSnapRequest, SnapInstalled, SnapUninstalled, SnapUpdated } from "../snaps/index.mjs";
+import type { SnapId } from "@metamask/snaps-sdk";
+import type { WebSocketServiceMethodActions } from "./WebSocketService-method-action-types.mjs";
+import type { SnapControllerHandleRequestAction, SnapControllerSnapInstalledEvent, SnapControllerSnapUninstalledEvent, SnapControllerSnapUpdatedEvent } from "../snaps/index.mjs";
 declare const serviceName = "WebSocketService";
-export type WebSocketServiceOpenAction = {
-    type: `${typeof serviceName}:open`;
-    handler: (snapId: SnapId, url: string, protocols?: string[]) => Promise<string>;
-};
-export type WebSocketServiceCloseAction = {
-    type: `${typeof serviceName}:close`;
-    handler: (snapId: SnapId, id: string) => void;
-};
-export type WebSocketServiceSendMessageAction = {
-    type: `${typeof serviceName}:sendMessage`;
-    handler: (snapId: SnapId, id: string, data: string | number[]) => Promise<void>;
-};
-export type WebSocketServiceGetAllAction = {
-    type: `${typeof serviceName}:getAll`;
-    handler: (snapId: SnapId) => GetWebSocketsResult;
-};
-export type WebSocketServiceActions = WebSocketServiceOpenAction | WebSocketServiceCloseAction | WebSocketServiceSendMessageAction | WebSocketServiceGetAllAction;
-export type WebSocketServiceAllowedActions = HandleSnapRequest;
-export type WebSocketServiceEvents = SnapUninstalled | SnapUpdated | SnapInstalled;
-export type WebSocketServiceMessenger = Messenger<'WebSocketService', WebSocketServiceActions | WebSocketServiceAllowedActions, WebSocketServiceEvents>;
+export type WebSocketServiceActions = WebSocketServiceMethodActions;
+type AllowedActions = SnapControllerHandleRequestAction;
+type AllowedEvents = SnapControllerSnapUninstalledEvent | SnapControllerSnapUpdatedEvent | SnapControllerSnapInstalledEvent;
+export type WebSocketServiceMessenger = Messenger<'WebSocketService', WebSocketServiceActions | AllowedActions, AllowedEvents>;
 type WebSocketServiceArgs = {
     messenger: WebSocketServiceMessenger;
 };
@@ -30,6 +15,42 @@ export declare class WebSocketService {
     name: typeof serviceName;
     state: null;
     constructor({ messenger }: WebSocketServiceArgs);
+    /**
+     * Open a WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param url - The URL for the WebSocket connection.
+     * @param protocols - An optional parameter for protocols.
+     * @returns The identifier for the opened connection.
+     * @throws If the connection fails.
+     */
+    open(snapId: SnapId, url: string, protocols?: string[]): Promise<string>;
+    /**
+     * Close a given WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param id - The identifier for the WebSocket connection.
+     */
+    close(snapId: SnapId, id: string): void;
+    /**
+     * Send a message from a given Snap ID to a WebSocket connection.
+     *
+     * @param snapId - The Snap ID.
+     * @param id - The identifier for the WebSocket connection.
+     * @param data - The message to send.
+     */
+    sendMessage(snapId: SnapId, id: string, data: string | number[]): Promise<void>;
+    /**
+     * Get a list of all open WebSocket connections for a Snap ID.
+     *
+     * @param snapId - The Snap ID.
+     * @returns A list of WebSocket connections.
+     */
+    getAll(snapId: SnapId): {
+        id: string;
+        url: string;
+        protocols: string[];
+    }[];
 }
 export {};
 //# sourceMappingURL=WebSocketService.d.mts.map

package/dist/websocket/WebSocketService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketService.d.mts","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,4BAA4B;AAK7B,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,WAAW,EACZ,2BAAiB;AAGlB,QAAA,MAAM,WAAW,qBAAqB,CAAC;AAEvC,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,GAAG,OAAO,WAAW,OAAO,CAAC;IACnC,OAAO,EAAE,CACP,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAAE,KACjB,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,GAAG,OAAO,WAAW,QAAQ,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,IAAI,EAAE,GAAG,OAAO,WAAW,cAAc,CAAC;IAC1C,OAAO,EAAE,CACP,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,KACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,GAAG,OAAO,WAAW,SAAS,CAAC;IACrC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,0BAA0B,GAC1B,2BAA2B,GAC3B,iCAAiC,GACjC,4BAA4B,CAAC;AAEjC,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,CAAC;AAE/D,MAAM,MAAM,sBAAsB,GAC9B,eAAe,GACf,WAAW,GACX,aAAa,CAAC;AAElB,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,GAAG,8BAA8B,EACxD,sBAAsB,CACvB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,yBAAyB,CAAC;CACtC,CAAC;AAYF,qBAAa,gBAAgB;;IAC3B,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC,KAAK,OAAQ;gBAMD,EAAE,SAAS,EAAE,EAAE,oBAAoB;CAgPhD"}
+{"version":3,"file":"WebSocketService.d.mts","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,MAAM,EAAkB,4BAA4B;AAKlE,OAAO,KAAK,EAAE,6BAA6B,EAAE,mDAA+C;AAC5F,OAAO,KAAK,EACV,iCAAiC,EACjC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,2BAAiB;AAGlB,QAAA,MAAM,WAAW,qBAAqB,CAAC;AASvC,MAAM,MAAM,uBAAuB,GAAG,6BAA6B,CAAC;AAEpE,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD,KAAK,aAAa,GACd,kCAAkC,GAClC,8BAA8B,GAC9B,gCAAgC,CAAC;AAErC,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,kBAAkB,EAClB,uBAAuB,GAAG,cAAc,EACxC,aAAa,CACd,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,yBAAyB,CAAC;CACtC,CAAC;AAYF,qBAAa,gBAAgB;;IAC3B,IAAI,EAAE,OAAO,WAAW,CAAe;IAEvC,KAAK,OAAQ;gBAMD,EAAE,SAAS,EAAE,EAAE,oBAAoB;IA+E/C;;;;;;;;OAQG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO;IAoFhE;;;;;OAKG;IACH,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAiBhC;;;;;;OAMG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IAUrE;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM;;;;;CAStB"}

package/dist/websocket/WebSocketService.mjs

@@ -4,6 +4,12 @@ import { assert, createDeferredPromise } from "@metamask/utils";
 import { nanoid } from "nanoid";
 import { METAMASK_ORIGIN } from "../snaps/index.mjs";
 const serviceName = 'WebSocketService';
+const MESSENGER_EXPOSED_METHODS = [
+    'open',
+    'close',
+    'sendMessage',
+    'getAll',
+];
 export class WebSocketService {
     name = serviceName;
     state = null;
@@ -12,10 +18,7 @@ export class WebSocketService {
     constructor({ messenger }) {
         this.#messenger = messenger;
         this.#sockets = new Map();
-        this.#messenger.registerActionHandler(`${serviceName}:open`, async (...args) => this.#open(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:close`, (...args) => this.#close(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:sendMessage`, async (...args) => this.#sendMessage(...args));
-        this.#messenger.registerActionHandler(`${serviceName}:getAll`, (...args) => this.#getAll(...args));
+        this.#messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
         this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {
             this.#closeAll(snap.id);
         });
@@ -50,7 +53,7 @@ export class WebSocketService {
      * @returns True if a matching connection already exists, otherwise false.
      */
     #exists(snapId, url, protocols) {
-        return this.#getAll(snapId).some((socket) => socket.url === url && isEqual(socket.protocols, protocols));
+        return this.getAll(snapId).some((socket) => socket.url === url && isEqual(socket.protocols, protocols));
     }
     /**
      * Handle sending a specific WebSocketEvent to a Snap.
@@ -79,7 +82,7 @@ export class WebSocketService {
      * @returns The identifier for the opened connection.
      * @throws If the connection fails.
      */
-    async #open(snapId, url, protocols = []) {
+    async open(snapId, url, protocols = []) {
         assert(!this.#exists(snapId, url, protocols), `An open WebSocket connection to ${url} already exists.`);
         const parsedUrl = new URL(url);
         const { origin } = parsedUrl;
@@ -146,7 +149,7 @@ export class WebSocketService {
      * @param snapId - The Snap ID.
      * @param id - The identifier for the WebSocket connection.
      */
-    #close(snapId, id) {
+    close(snapId, id) {
         const { socket } = this.#get(snapId, id);
         socket.close();
     }
@@ -156,8 +159,8 @@ export class WebSocketService {
      * @param snapId - The Snap ID.
      */
     #closeAll(snapId) {
-        for (const socket of this.#getAll(snapId)) {
-            this.#close(snapId, socket.id);
+        for (const socket of this.getAll(snapId)) {
+            this.close(snapId, socket.id);
         }
     }
     /**
@@ -167,7 +170,7 @@ export class WebSocketService {
      * @param id - The identifier for the WebSocket connection.
      * @param data - The message to send.
      */
-    async #sendMessage(snapId, id, data) {
+    async sendMessage(snapId, id, data) {
         const { socket, openPromise } = this.#get(snapId, id);
         await openPromise;
         const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;
@@ -179,7 +182,7 @@ export class WebSocketService {
      * @param snapId - The Snap ID.
      * @returns A list of WebSocket connections.
      */
-    #getAll(snapId) {
+    getAll(snapId) {
         return [...this.#sockets.values()]
             .filter((socket) => socket.snapId === snapId)
             .map((socket) => ({

package/dist/websocket/WebSocketService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketService.mjs","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  GetWebSocketsResult,\n  SnapId,\n  WebSocketEvent,\n} from '@metamask/snaps-sdk';\nimport { HandlerType, isEqual, logError } from '@metamask/snaps-utils';\nimport { assert, createDeferredPromise } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type {\n  HandleSnapRequest,\n  SnapInstalled,\n  SnapUninstalled,\n  SnapUpdated,\n} from '../snaps';\nimport { METAMASK_ORIGIN } from '../snaps';\n\nconst serviceName = 'WebSocketService';\n\nexport type WebSocketServiceOpenAction = {\n  type: `${typeof serviceName}:open`;\n  handler: (\n    snapId: SnapId,\n    url: string,\n    protocols?: string[],\n  ) => Promise<string>;\n};\n\nexport type WebSocketServiceCloseAction = {\n  type: `${typeof serviceName}:close`;\n  handler: (snapId: SnapId, id: string) => void;\n};\n\nexport type WebSocketServiceSendMessageAction = {\n  type: `${typeof serviceName}:sendMessage`;\n  handler: (\n    snapId: SnapId,\n    id: string,\n    data: string | number[],\n  ) => Promise<void>;\n};\n\nexport type WebSocketServiceGetAllAction = {\n  type: `${typeof serviceName}:getAll`;\n  handler: (snapId: SnapId) => GetWebSocketsResult;\n};\n\nexport type WebSocketServiceActions =\n  | WebSocketServiceOpenAction\n  | WebSocketServiceCloseAction\n  | WebSocketServiceSendMessageAction\n  | WebSocketServiceGetAllAction;\n\nexport type WebSocketServiceAllowedActions = HandleSnapRequest;\n\nexport type WebSocketServiceEvents =\n  | SnapUninstalled\n  | SnapUpdated\n  | SnapInstalled;\n\nexport type WebSocketServiceMessenger = Messenger<\n  'WebSocketService',\n  WebSocketServiceActions | WebSocketServiceAllowedActions,\n  WebSocketServiceEvents\n>;\n\ntype WebSocketServiceArgs = {\n  messenger: WebSocketServiceMessenger;\n};\n\ntype InternalSocket = {\n  id: string;\n  snapId: SnapId;\n  url: string;\n  protocols: string[];\n  openPromise: Promise<void>;\n  // eslint-disable-next-line no-restricted-globals\n  socket: WebSocket;\n};\n\nexport class WebSocketService {\n  name: typeof serviceName = serviceName;\n\n  state = null;\n\n  readonly #messenger: WebSocketServiceMessenger;\n\n  readonly #sockets: Map<string, InternalSocket>;\n\n  constructor({ messenger }: WebSocketServiceArgs) {\n    this.#messenger = messenger;\n    this.#sockets = new Map();\n\n    this.#messenger.registerActionHandler(\n      `${serviceName}:open`,\n      async (...args) => this.#open(...args),\n    );\n\n    this.#messenger.registerActionHandler(`${serviceName}:close`, (...args) =>\n      this.#close(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${serviceName}:sendMessage`,\n      async (...args) => this.#sendMessage(...args),\n    );\n\n    this.#messenger.registerActionHandler(`${serviceName}:getAll`, (...args) =>\n      this.#getAll(...args),\n    );\n\n    this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    // Due to local Snaps not currently emitting snapUninstalled we also have to\n    // listen to snapInstalled.\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n  }\n\n  /**\n   * Get information about a given WebSocket connection with an ID.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @returns Information about the WebSocket connection.\n   * @throws If the WebSocket connection cannot be found.\n   */\n  #get(snapId: SnapId, id: string) {\n    const socket = this.#sockets.get(id);\n\n    assert(\n      socket && socket.snapId === snapId,\n      `Socket with ID \"${id}\" not found.`,\n    );\n\n    return socket;\n  }\n\n  /**\n   * Check whether a given Snap ID already has an open connection for a URL and protocol.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL.\n   * @param protocols - A protocols parameter.\n   * @returns True if a matching connection already exists, otherwise false.\n   */\n  #exists(snapId: SnapId, url: string, protocols: string[]) {\n    return this.#getAll(snapId).some(\n      (socket) => socket.url === url && isEqual(socket.protocols, protocols),\n    );\n  }\n\n  /**\n   * Handle sending a specific WebSocketEvent to a Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @param event - The WebSocketEvent.\n   */\n  #handleEvent(snapId: SnapId, event: WebSocketEvent) {\n    this.#messenger\n      .call('SnapController:handleRequest', {\n        origin: METAMASK_ORIGIN,\n        snapId,\n        handler: HandlerType.OnWebSocketEvent,\n        request: { method: '', params: { event } },\n      })\n      .catch((error) => {\n        logError(\n          `An error occurred while handling a WebSocket message for Snap \"${snapId}\":`,\n          error,\n        );\n      });\n  }\n\n  /**\n   * Open a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL for the WebSocket connection.\n   * @param protocols - An optional parameter for protocols.\n   * @returns The identifier for the opened connection.\n   * @throws If the connection fails.\n   */\n  async #open(snapId: SnapId, url: string, protocols: string[] = []) {\n    assert(\n      !this.#exists(snapId, url, protocols),\n      `An open WebSocket connection to ${url} already exists.`,\n    );\n\n    const parsedUrl = new URL(url);\n    const { origin } = parsedUrl;\n\n    const id = nanoid();\n\n    // eslint-disable-next-line no-restricted-globals\n    const socket = new WebSocket(url, protocols);\n    socket.binaryType = 'arraybuffer';\n\n    const { promise, resolve, reject } = createDeferredPromise();\n\n    socket.addEventListener('open', () => {\n      resolve();\n      this.#handleEvent(snapId, {\n        type: 'open',\n        id,\n        origin,\n      });\n    });\n\n    socket.addEventListener('close', (event) => {\n      this.#sockets.delete(id);\n\n      this.#handleEvent(snapId, {\n        type: 'close',\n        id,\n        origin,\n        code: event.code,\n        reason: event.reason,\n        // wasClean is not available on mobile.\n        wasClean: event.wasClean ?? null,\n      });\n    });\n\n    const errorListener = () => {\n      reject(\n        rpcErrors.resourceUnavailable(\n          'An error occurred while opening the WebSocket.',\n        ),\n      );\n    };\n\n    socket.addEventListener('error', errorListener);\n\n    socket.addEventListener('message', (event) => {\n      const isText = typeof event.data === 'string';\n      const data = isText\n        ? { type: 'text' as const, message: event.data }\n        : {\n            type: 'binary' as const,\n            // We request that the WebSocket gives us an array buffer.\n            message: Array.from(new Uint8Array(event.data)),\n          };\n\n      this.#handleEvent(snapId, {\n        type: 'message',\n        id,\n        origin,\n        data,\n      });\n    });\n\n    this.#sockets.set(id, {\n      id,\n      snapId,\n      url,\n      protocols,\n      socket,\n      openPromise: promise,\n    });\n\n    await promise;\n\n    socket.removeEventListener('error', errorListener);\n\n    return id;\n  }\n\n  /**\n   * Close a given WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   */\n  #close(snapId: SnapId, id: string) {\n    const { socket } = this.#get(snapId, id);\n\n    socket.close();\n  }\n\n  /**\n   * Close all open connections for a given Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   */\n  #closeAll(snapId: SnapId) {\n    for (const socket of this.#getAll(snapId)) {\n      this.#close(snapId, socket.id);\n    }\n  }\n\n  /**\n   * Send a message from a given Snap ID to a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @param data - The message to send.\n   */\n  async #sendMessage(snapId: SnapId, id: string, data: string | number[]) {\n    const { socket, openPromise } = this.#get(snapId, id);\n\n    await openPromise;\n\n    const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;\n\n    socket.send(wrappedData);\n  }\n\n  /**\n   * Get a list of all open WebSocket connections for a Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   * @returns A list of WebSocket connections.\n   */\n  #getAll(snapId: SnapId) {\n    return [...this.#sockets.values()]\n      .filter((socket) => socket.snapId === snapId)\n      .map((socket) => ({\n        id: socket.id,\n        url: socket.url,\n        protocols: socket.protocols,\n      }));\n  }\n}\n"]}
+{"version":3,"file":"WebSocketService.mjs","sourceRoot":"","sources":["../../src/websocket/WebSocketService.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { SnapId, WebSocketEvent } from '@metamask/snaps-sdk';\nimport { HandlerType, isEqual, logError } from '@metamask/snaps-utils';\nimport { assert, createDeferredPromise } from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport type { WebSocketServiceMethodActions } from './WebSocketService-method-action-types';\nimport type {\n  SnapControllerHandleRequestAction,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerSnapUpdatedEvent,\n} from '../snaps';\nimport { METAMASK_ORIGIN } from '../snaps';\n\nconst serviceName = 'WebSocketService';\n\nconst MESSENGER_EXPOSED_METHODS = [\n  'open',\n  'close',\n  'sendMessage',\n  'getAll',\n] as const;\n\nexport type WebSocketServiceActions = WebSocketServiceMethodActions;\n\ntype AllowedActions = SnapControllerHandleRequestAction;\n\ntype AllowedEvents =\n  | SnapControllerSnapUninstalledEvent\n  | SnapControllerSnapUpdatedEvent\n  | SnapControllerSnapInstalledEvent;\n\nexport type WebSocketServiceMessenger = Messenger<\n  'WebSocketService',\n  WebSocketServiceActions | AllowedActions,\n  AllowedEvents\n>;\n\ntype WebSocketServiceArgs = {\n  messenger: WebSocketServiceMessenger;\n};\n\ntype InternalSocket = {\n  id: string;\n  snapId: SnapId;\n  url: string;\n  protocols: string[];\n  openPromise: Promise<void>;\n  // eslint-disable-next-line no-restricted-globals\n  socket: WebSocket;\n};\n\nexport class WebSocketService {\n  name: typeof serviceName = serviceName;\n\n  state = null;\n\n  readonly #messenger: WebSocketServiceMessenger;\n\n  readonly #sockets: Map<string, InternalSocket>;\n\n  constructor({ messenger }: WebSocketServiceArgs) {\n    this.#messenger = messenger;\n    this.#sockets = new Map();\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe('SnapController:snapUpdated', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n\n    // Due to local Snaps not currently emitting snapUninstalled we also have to\n    // listen to snapInstalled.\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) => {\n      this.#closeAll(snap.id);\n    });\n  }\n\n  /**\n   * Get information about a given WebSocket connection with an ID.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @returns Information about the WebSocket connection.\n   * @throws If the WebSocket connection cannot be found.\n   */\n  #get(snapId: SnapId, id: string) {\n    const socket = this.#sockets.get(id);\n\n    assert(\n      socket && socket.snapId === snapId,\n      `Socket with ID \"${id}\" not found.`,\n    );\n\n    return socket;\n  }\n\n  /**\n   * Check whether a given Snap ID already has an open connection for a URL and protocol.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL.\n   * @param protocols - A protocols parameter.\n   * @returns True if a matching connection already exists, otherwise false.\n   */\n  #exists(snapId: SnapId, url: string, protocols: string[]) {\n    return this.getAll(snapId).some(\n      (socket) => socket.url === url && isEqual(socket.protocols, protocols),\n    );\n  }\n\n  /**\n   * Handle sending a specific WebSocketEvent to a Snap.\n   *\n   * @param snapId - The Snap ID.\n   * @param event - The WebSocketEvent.\n   */\n  #handleEvent(snapId: SnapId, event: WebSocketEvent) {\n    this.#messenger\n      .call('SnapController:handleRequest', {\n        origin: METAMASK_ORIGIN,\n        snapId,\n        handler: HandlerType.OnWebSocketEvent,\n        request: { method: '', params: { event } },\n      })\n      .catch((error) => {\n        logError(\n          `An error occurred while handling a WebSocket message for Snap \"${snapId}\":`,\n          error,\n        );\n      });\n  }\n\n  /**\n   * Open a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param url - The URL for the WebSocket connection.\n   * @param protocols - An optional parameter for protocols.\n   * @returns The identifier for the opened connection.\n   * @throws If the connection fails.\n   */\n  async open(snapId: SnapId, url: string, protocols: string[] = []) {\n    assert(\n      !this.#exists(snapId, url, protocols),\n      `An open WebSocket connection to ${url} already exists.`,\n    );\n\n    const parsedUrl = new URL(url);\n    const { origin } = parsedUrl;\n\n    const id = nanoid();\n\n    // eslint-disable-next-line no-restricted-globals\n    const socket = new WebSocket(url, protocols);\n    socket.binaryType = 'arraybuffer';\n\n    const { promise, resolve, reject } = createDeferredPromise();\n\n    socket.addEventListener('open', () => {\n      resolve();\n      this.#handleEvent(snapId, {\n        type: 'open',\n        id,\n        origin,\n      });\n    });\n\n    socket.addEventListener('close', (event) => {\n      this.#sockets.delete(id);\n\n      this.#handleEvent(snapId, {\n        type: 'close',\n        id,\n        origin,\n        code: event.code,\n        reason: event.reason,\n        // wasClean is not available on mobile.\n        wasClean: event.wasClean ?? null,\n      });\n    });\n\n    const errorListener = () => {\n      reject(\n        rpcErrors.resourceUnavailable(\n          'An error occurred while opening the WebSocket.',\n        ),\n      );\n    };\n\n    socket.addEventListener('error', errorListener);\n\n    socket.addEventListener('message', (event) => {\n      const isText = typeof event.data === 'string';\n      const data = isText\n        ? { type: 'text' as const, message: event.data }\n        : {\n            type: 'binary' as const,\n            // We request that the WebSocket gives us an array buffer.\n            message: Array.from(new Uint8Array(event.data)),\n          };\n\n      this.#handleEvent(snapId, {\n        type: 'message',\n        id,\n        origin,\n        data,\n      });\n    });\n\n    this.#sockets.set(id, {\n      id,\n      snapId,\n      url,\n      protocols,\n      socket,\n      openPromise: promise,\n    });\n\n    await promise;\n\n    socket.removeEventListener('error', errorListener);\n\n    return id;\n  }\n\n  /**\n   * Close a given WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   */\n  close(snapId: SnapId, id: string) {\n    const { socket } = this.#get(snapId, id);\n\n    socket.close();\n  }\n\n  /**\n   * Close all open connections for a given Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   */\n  #closeAll(snapId: SnapId) {\n    for (const socket of this.getAll(snapId)) {\n      this.close(snapId, socket.id);\n    }\n  }\n\n  /**\n   * Send a message from a given Snap ID to a WebSocket connection.\n   *\n   * @param snapId - The Snap ID.\n   * @param id - The identifier for the WebSocket connection.\n   * @param data - The message to send.\n   */\n  async sendMessage(snapId: SnapId, id: string, data: string | number[]) {\n    const { socket, openPromise } = this.#get(snapId, id);\n\n    await openPromise;\n\n    const wrappedData = Array.isArray(data) ? new Uint8Array(data) : data;\n\n    socket.send(wrappedData);\n  }\n\n  /**\n   * Get a list of all open WebSocket connections for a Snap ID.\n   *\n   * @param snapId - The Snap ID.\n   * @returns A list of WebSocket connections.\n   */\n  getAll(snapId: SnapId) {\n    return [...this.#sockets.values()]\n      .filter((socket) => socket.snapId === snapId)\n      .map((socket) => ({\n        id: socket.id,\n        url: socket.url,\n        protocols: socket.protocols,\n      }));\n  }\n}\n"]}

package/dist/websocket/index.cjs

@@ -1,18 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./WebSocketService.cjs"), exports);
+exports.WebSocketService = void 0;
+var WebSocketService_1 = require("./WebSocketService.cjs");
+Object.defineProperty(exports, "WebSocketService", { enumerable: true, get: function () { return WebSocketService_1.WebSocketService; } });
 //# sourceMappingURL=index.cjs.map

package/dist/websocket/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAmC","sourcesContent":["export * from './WebSocketService';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":";;;AAIA,2DAAsD;AAA7C,oHAAA,gBAAgB,OAAA","sourcesContent":["export type {\n  WebSocketServiceActions,\n  WebSocketServiceMessenger,\n} from './WebSocketService';\nexport { WebSocketService } from './WebSocketService';\nexport type {\n  WebSocketServiceCloseAction,\n  WebSocketServiceGetAllAction,\n  WebSocketServiceOpenAction,\n  WebSocketServiceSendMessageAction,\n} from './WebSocketService-method-action-types';\n"]}

package/dist/websocket/index.d.cts

@@ -1,2 +1,4 @@
-export * from "./WebSocketService.cjs";
+export type { WebSocketServiceActions, WebSocketServiceMessenger, } from "./WebSocketService.cjs";
+export { WebSocketService } from "./WebSocketService.cjs";
+export type { WebSocketServiceCloseAction, WebSocketServiceGetAllAction, WebSocketServiceOpenAction, WebSocketServiceSendMessageAction, } from "./WebSocketService-method-action-types.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/websocket/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,uCAAmC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,uBAAuB,EACvB,yBAAyB,GAC1B,+BAA2B;AAC5B,OAAO,EAAE,gBAAgB,EAAE,+BAA2B;AACtD,YAAY,EACV,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAC1B,iCAAiC,GAClC,mDAA+C"}

package/dist/websocket/index.d.mts

@@ -1,2 +1,4 @@
-export * from "./WebSocketService.mjs";
+export type { WebSocketServiceActions, WebSocketServiceMessenger, } from "./WebSocketService.mjs";
+export { WebSocketService } from "./WebSocketService.mjs";
+export type { WebSocketServiceCloseAction, WebSocketServiceGetAllAction, WebSocketServiceOpenAction, WebSocketServiceSendMessageAction, } from "./WebSocketService-method-action-types.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/websocket/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,uCAAmC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,uBAAuB,EACvB,yBAAyB,GAC1B,+BAA2B;AAC5B,OAAO,EAAE,gBAAgB,EAAE,+BAA2B;AACtD,YAAY,EACV,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAC1B,iCAAiC,GAClC,mDAA+C"}

package/dist/websocket/index.mjs

@@ -1,2 +1,2 @@
-export * from "./WebSocketService.mjs";
+export { WebSocketService } from "./WebSocketService.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/websocket/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,uCAAmC","sourcesContent":["export * from './WebSocketService';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,+BAA2B","sourcesContent":["export type {\n  WebSocketServiceActions,\n  WebSocketServiceMessenger,\n} from './WebSocketService';\nexport { WebSocketService } from './WebSocketService';\nexport type {\n  WebSocketServiceCloseAction,\n  WebSocketServiceGetAllAction,\n  WebSocketServiceOpenAction,\n  WebSocketServiceSendMessageAction,\n} from './WebSocketService-method-action-types';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/snaps-controllers",
-  "version": "18.0.4",
+  "version": "19.0.1",
   "description": "Controllers for MetaMask Snaps",
   "keywords": [
     "MetaMask",
@@ -62,6 +62,7 @@
     "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/snaps-controllers",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/snaps-controllers",
+    "generate-method-action-types": "messenger-generate-action-types",
     "lint": "yarn lint:eslint && yarn lint:misc --check && yarn changelog:validate && yarn lint:dependencies",
     "lint:ci": "yarn lint",
     "lint:dependencies": "depcheck",
@@ -79,21 +80,21 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/approval-controller": "^8.0.0",
-    "@metamask/base-controller": "^9.0.0",
-    "@metamask/json-rpc-engine": "^10.2.3",
+    "@metamask/approval-controller": "^9.0.1",
+    "@metamask/base-controller": "^9.0.1",
+    "@metamask/json-rpc-engine": "^10.2.4",
     "@metamask/json-rpc-middleware-stream": "^8.0.8",
     "@metamask/key-tree": "^10.1.1",
-    "@metamask/messenger": "^0.3.0",
+    "@metamask/messenger": "^1.1.0",
     "@metamask/object-multiplex": "^2.1.0",
-    "@metamask/permission-controller": "^12.2.0",
+    "@metamask/permission-controller": "^12.3.0",
     "@metamask/post-message-stream": "^10.0.0",
     "@metamask/rpc-errors": "^7.0.3",
     "@metamask/snaps-registry": "^4.0.0",
-    "@metamask/snaps-rpc-methods": "^15.0.0",
+    "@metamask/snaps-rpc-methods": "^15.0.2",
     "@metamask/snaps-sdk": "^11.0.0",
-    "@metamask/snaps-utils": "^12.1.1",
-    "@metamask/storage-service": "^1.0.0",
+    "@metamask/snaps-utils": "^12.1.3",
+    "@metamask/storage-service": "^1.0.1",
     "@metamask/superstruct": "^3.2.1",
     "@metamask/utils": "^11.10.0",
     "@xstate/fsm": "^2.0.0",
@@ -111,7 +112,7 @@
     "tar-stream": "^3.1.7"
   },
   "devDependencies": {
-    "@lavamoat/allow-scripts": "^3.4.3",
+    "@lavamoat/allow-scripts": "^4.0.0",
     "@metamask/auto-changelog": "^5.3.2",
     "@metamask/browser-passworder": "^6.0.0",
     "@noble/hashes": "^1.7.1",
@@ -148,7 +149,7 @@
     "vitest": "^3.1.1"
   },
   "peerDependencies": {
-    "@metamask/snaps-execution-environments": "^11.0.1"
+    "@metamask/snaps-execution-environments": "^11.0.2"
   },
   "peerDependenciesMeta": {
     "@metamask/snaps-execution-environments": {