@metamask-previews/eth-json-rpc-middleware 21.0.0-preview-2e88eaea → 21.0.0-preview-c96ff8f

package/dist/inflight-cache.cjs

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInflightCacheMiddleware = void 0;
-const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
-const full_1 = require("klona/full");
+const utils_1 = require("@metamask/utils");
 const logging_utils_1 = require("./logging-utils.cjs");
 const cache_1 = require("./utils/cache.cjs");
 const log = (0, logging_utils_1.createModuleLogger)(logging_utils_1.projectLogger, 'inflight-cache');
+/**
+ * Creates a middleware that caches inflight requests.
+ * If a request is already in flight, the middleware will wait for the request to complete
+ * and then return the result.
+ *
+ * @returns A middleware that caches inflight requests.
+ */
 function createInflightCacheMiddleware() {
     const inflightRequests = {};
-    return (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res, next) => {
-        // allow cach to be skipped if so specified
-        if (req.skipCache) {
+    return async ({ request, context, next }) => {
+        if (context.get('skipCache')) {
             return next();
         }
-        // get cacheId, if cacheable
-        const cacheId = (0, cache_1.cacheIdentifierForRequest)(req);
-        // if not cacheable, skip
+        const cacheId = (0, cache_1.cacheIdentifierForRequest)(request);
         if (!cacheId) {
-            log('Request is not cacheable, proceeding. req = %o', req);
+            log('Request is not cacheable, proceeding. req = %o', request);
             return next();
         }
         // check for matching requests
@@ -26,55 +29,68 @@ function createInflightCacheMiddleware() {
         if (activeRequestHandlers) {
             // setup the response listener and wait for it to be called
             // it will handle copying the result and request fields
-            log('Running %i handler(s) for request %o', activeRequestHandlers.length, req);
-            await createActiveRequestHandler(res, activeRequestHandlers);
-            return undefined;
+            log('Running %i handler(s) for request %o', activeRequestHandlers.length, request);
+            return await createActiveRequestHandler(activeRequestHandlers);
         }
         // setup response handler array for subsequent requests
         activeRequestHandlers = [];
         inflightRequests[cacheId] = activeRequestHandlers;
         // allow request to be handled normally
-        log('Carrying original request forward %o', req);
-        await next();
-        // clear inflight requests
-        delete inflightRequests[cacheId];
-        // schedule activeRequestHandlers to be handled
-        log('Running %i collected handler(s) for request %o', activeRequestHandlers.length, req);
-        handleActiveRequest(res, activeRequestHandlers);
-        // complete
-        return undefined;
-    });
-    async function createActiveRequestHandler(res, activeRequestHandlers) {
-        const { resolve, promise } = deferredPromise();
-        activeRequestHandlers.push((handledRes) => {
-            // append a copy of the result and error to the response
-            res.result = (0, full_1.klona)(handledRes.result);
-            res.error = (0, full_1.klona)(handledRes.error);
-            resolve();
+        log('Carrying original request forward %o', request);
+        try {
+            const result = (await next());
+            log('Running %i collected handler(s) for successful request %o', activeRequestHandlers.length, request);
+            handleSuccess(result, activeRequestHandlers);
+            return result;
+        }
+        catch (error) {
+            log('Running %i collected handler(s) for failed request %o', activeRequestHandlers.length, request);
+            handleError(error, activeRequestHandlers);
+            throw error;
+        }
+        finally {
+            delete inflightRequests[cacheId];
+        }
+    };
+    /**
+     * Creates a new request handler for the active request.
+     *
+     * @param activeRequestHandlers - The active request handlers.
+     * @returns A promise that resolves to the result of the request.
+     */
+    function createActiveRequestHandler(activeRequestHandlers) {
+        const { resolve, promise, reject } = (0, utils_1.createDeferredPromise)();
+        activeRequestHandlers.push({
+            onSuccess: (result) => resolve(result),
+            onError: (error) => reject(error),
         });
         return promise;
     }
-    function handleActiveRequest(res, activeRequestHandlers) {
+    /**
+     * Handles successful requests.
+     *
+     * @param result - The result of the request.
+     * @param activeRequestHandlers - The active request handlers.
+     */
+    function handleSuccess(result, activeRequestHandlers) {
         // use setTimeout so we can resolve our original request first
         setTimeout(() => {
-            activeRequestHandlers.forEach((handler) => {
-                try {
-                    handler(res);
-                }
-                catch (err) {
-                    // catch error so all requests are handled correctly
-                    console.error(err);
-                }
+            activeRequestHandlers.forEach(({ onSuccess }) => {
+                onSuccess(result);
             });
         });
     }
+    /**
+     * Handles failed requests.
+     *
+     * @param error - The error of the request.
+     * @param activeRequestHandlers - The active request handlers.
+     */
+    function handleError(error, activeRequestHandlers) {
+        activeRequestHandlers.forEach(({ onError }) => {
+            onError(error);
+        });
+    }
 }
 exports.createInflightCacheMiddleware = createInflightCacheMiddleware;
-function deferredPromise() {
-    let resolve;
-    const promise = new Promise((_resolve) => {
-        resolve = _resolve;
-    });
-    return { resolve, promise };
-}
 //# sourceMappingURL=inflight-cache.cjs.map

package/dist/inflight-cache.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"inflight-cache.cjs","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":";;;AAAA,+DAAkE;AAMlE,qCAAmC;AAEnC,uDAAoE;AAEpE,6CAA0D;AAO1D,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,gBAAgB,CAAC,CAAC;AAEhE,SAAgB,6BAA6B;IAI3C,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAE7C,OAAO,IAAA,uCAAqB,EAC1B,KAAK,EAAE,GAAyC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC7D,2CAA2C;QAC3C,IAAI,GAAG,CAAC,SAAS,EAAE;YACjB,OAAO,IAAI,EAAE,CAAC;SACf;QACD,4BAA4B;QAC5B,MAAM,OAAO,GAAkB,IAAA,iCAAyB,EAAC,GAAG,CAAC,CAAC;QAC9D,yBAAyB;QACzB,IAAI,CAAC,OAAO,EAAE;YACZ,GAAG,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAC;YAC3D,OAAO,IAAI,EAAE,CAAC;SACf;QACD,8BAA8B;QAC9B,IAAI,qBAAqB,GAAsB,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACzE,sDAAsD;QACtD,IAAI,qBAAqB,EAAE;YACzB,2DAA2D;YAC3D,uDAAuD;YACvD,GAAG,CACD,sCAAsC,EACtC,qBAAqB,CAAC,MAAM,EAC5B,GAAG,CACJ,CAAC;YACF,MAAM,0BAA0B,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;YAC7D,OAAO,SAAS,CAAC;SAClB;QACD,uDAAuD;QACvD,qBAAqB,GAAG,EAAE,CAAC;QAC3B,gBAAgB,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC;QAClD,uCAAuC;QACvC,GAAG,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;QAEb,0BAA0B;QAC1B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjC,+CAA+C;QAC/C,GAAG,CACD,gDAAgD,EAChD,qBAAqB,CAAC,MAAM,EAC5B,GAAG,CACJ,CAAC;QACF,mBAAmB,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;QAChD,WAAW;QACX,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;IAEF,KAAK,UAAU,0BAA0B,CACvC,GAA2B,EAC3B,qBAAwC;QAExC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;QAC/C,qBAAqB,CAAC,IAAI,CAAC,CAAC,UAAkC,EAAE,EAAE;YAChE,wDAAwD;YACxD,GAAG,CAAC,MAAM,GAAG,IAAA,YAAK,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACtC,GAAG,CAAC,KAAK,GAAG,IAAA,YAAK,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACpC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,SAAS,mBAAmB,CAC1B,GAA2B,EAC3B,qBAAwC;QAExC,8DAA8D;QAC9D,UAAU,CAAC,GAAG,EAAE;YACd,qBAAqB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACxC,IAAI;oBACF,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;gBAAC,OAAO,GAAG,EAAE;oBACZ,oDAAoD;oBACpD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AApFD,sEAoFC;AAED,SAAS,eAAe;IACtB,IAAI,OAAY,CAAC;IACjB,MAAM,OAAO,GAAkB,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACtD,OAAO,GAAG,QAAQ,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC","sourcesContent":["import { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport type {\n  JsonRpcParams,\n  Json,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { klona } from 'klona/full';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { JsonRpcRequestToCache, JsonRpcCacheMiddleware } from './types';\nimport { cacheIdentifierForRequest } from './utils/cache';\n\ntype RequestHandlers = (handledRes: PendingJsonRpcResponse) => void;\ntype InflightRequest = {\n  [cacheId: string]: RequestHandlers[];\n};\n\nconst log = createModuleLogger(projectLogger, 'inflight-cache');\n\nexport function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<\n  JsonRpcParams,\n  Json\n> {\n  const inflightRequests: InflightRequest = {};\n\n  return createAsyncMiddleware(\n    async (req: JsonRpcRequestToCache<JsonRpcParams>, res, next) => {\n      // allow cach to be skipped if so specified\n      if (req.skipCache) {\n        return next();\n      }\n      // get cacheId, if cacheable\n      const cacheId: string | null = cacheIdentifierForRequest(req);\n      // if not cacheable, skip\n      if (!cacheId) {\n        log('Request is not cacheable, proceeding. req = %o', req);\n        return next();\n      }\n      // check for matching requests\n      let activeRequestHandlers: RequestHandlers[] = inflightRequests[cacheId];\n      // if found, wait for the active request to be handled\n      if (activeRequestHandlers) {\n        // setup the response listener and wait for it to be called\n        // it will handle copying the result and request fields\n        log(\n          'Running %i handler(s) for request %o',\n          activeRequestHandlers.length,\n          req,\n        );\n        await createActiveRequestHandler(res, activeRequestHandlers);\n        return undefined;\n      }\n      // setup response handler array for subsequent requests\n      activeRequestHandlers = [];\n      inflightRequests[cacheId] = activeRequestHandlers;\n      // allow request to be handled normally\n      log('Carrying original request forward %o', req);\n      await next();\n\n      // clear inflight requests\n      delete inflightRequests[cacheId];\n      // schedule activeRequestHandlers to be handled\n      log(\n        'Running %i collected handler(s) for request %o',\n        activeRequestHandlers.length,\n        req,\n      );\n      handleActiveRequest(res, activeRequestHandlers);\n      // complete\n      return undefined;\n    },\n  );\n\n  async function createActiveRequestHandler(\n    res: PendingJsonRpcResponse,\n    activeRequestHandlers: RequestHandlers[],\n  ): Promise<void> {\n    const { resolve, promise } = deferredPromise();\n    activeRequestHandlers.push((handledRes: PendingJsonRpcResponse) => {\n      // append a copy of the result and error to the response\n      res.result = klona(handledRes.result);\n      res.error = klona(handledRes.error);\n      resolve();\n    });\n    return promise;\n  }\n\n  function handleActiveRequest(\n    res: PendingJsonRpcResponse,\n    activeRequestHandlers: RequestHandlers[],\n  ): void {\n    // use setTimeout so we can resolve our original request first\n    setTimeout(() => {\n      activeRequestHandlers.forEach((handler) => {\n        try {\n          handler(res);\n        } catch (err) {\n          // catch error so all requests are handled correctly\n          console.error(err);\n        }\n      });\n    });\n  }\n}\n\nfunction deferredPromise() {\n  let resolve: any;\n  const promise: Promise<void> = new Promise((_resolve) => {\n    resolve = _resolve;\n  });\n  return { resolve, promise };\n}\n"]}
+{"version":3,"file":"inflight-cache.cjs","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":";;;AAIA,2CAIyB;AAEzB,uDAAoE;AACpE,6CAA0D;AAU1D,MAAM,GAAG,GAAG,IAAA,kCAAkB,EAAC,6BAAa,EAAE,gBAAgB,CAAC,CAAC;AAEhE;;;;;;GAMG;AACH,SAAgB,6BAA6B;IAK3C,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAE7C,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YAC5B,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,OAAO,GAAkB,IAAA,iCAAyB,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,EAAE;YACZ,GAAG,CAAC,gDAAgD,EAAE,OAAO,CAAC,CAAC;YAC/D,OAAO,IAAI,EAAE,CAAC;SACf;QAED,8BAA8B;QAC9B,IAAI,qBAAqB,GAAqB,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACxE,sDAAsD;QACtD,IAAI,qBAAqB,EAAE;YACzB,2DAA2D;YAC3D,uDAAuD;YACvD,GAAG,CACD,sCAAsC,EACtC,qBAAqB,CAAC,MAAM,EAC5B,OAAO,CACR,CAAC;YACF,OAAO,MAAM,0BAA0B,CAAC,qBAAqB,CAAC,CAAC;SAChE;QAED,uDAAuD;QACvD,qBAAqB,GAAG,EAAE,CAAC;QAC3B,gBAAgB,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC;QAClD,uCAAuC;QACvC,GAAG,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI;YACF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAAS,CAAC;YACtC,GAAG,CACD,2DAA2D,EAC3D,qBAAqB,CAAC,MAAM,EAC5B,OAAO,CACR,CAAC;YACF,aAAa,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,GAAG,CACD,uDAAuD,EACvD,qBAAqB,CAAC,MAAM,EAC5B,OAAO,CACR,CAAC;YACF,WAAW,CAAC,KAAc,EAAE,qBAAqB,CAAC,CAAC;YACnD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;SAClC;IACH,CAAC,CAAC;IAEF;;;;;OAKG;IACH,SAAS,0BAA0B,CACjC,qBAAuC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAqB,GAAQ,CAAC;QACnE,qBAAqB,CAAC,IAAI,CAAC;YACzB,SAAS,EAAE,CAAC,MAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5C,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;SACzC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACH,SAAS,aAAa,CACpB,MAAY,EACZ,qBAAuC;QAEvC,8DAA8D;QAC9D,UAAU,CAAC,GAAG,EAAE;YACd,qBAAqB,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;gBAC9C,SAAS,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,SAAS,WAAW,CAClB,KAAY,EACZ,qBAAuC;QAEvC,qBAAqB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AA5GD,sEA4GC","sourcesContent":["import type {\n  JsonRpcMiddleware,\n  MiddlewareContext,\n} from '@metamask/json-rpc-engine/v2';\nimport {\n  type Json,\n  type JsonRpcRequest,\n  createDeferredPromise,\n} from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport { cacheIdentifierForRequest } from './utils/cache';\n\ntype RequestHandler = {\n  onSuccess: (result: Json) => void;\n  onError: (error: Error) => void;\n};\ntype InflightRequest = {\n  [cacheId: string]: RequestHandler[];\n};\n\nconst log = createModuleLogger(projectLogger, 'inflight-cache');\n\n/**\n * Creates a middleware that caches inflight requests.\n * If a request is already in flight, the middleware will wait for the request to complete\n * and then return the result.\n *\n * @returns A middleware that caches inflight requests.\n */\nexport function createInflightCacheMiddleware(): JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  MiddlewareContext<{ skipCache: boolean }>\n> {\n  const inflightRequests: InflightRequest = {};\n\n  return async ({ request, context, next }) => {\n    if (context.get('skipCache')) {\n      return next();\n    }\n\n    const cacheId: string | null = cacheIdentifierForRequest(request);\n    if (!cacheId) {\n      log('Request is not cacheable, proceeding. req = %o', request);\n      return next();\n    }\n\n    // check for matching requests\n    let activeRequestHandlers: RequestHandler[] = inflightRequests[cacheId];\n    // if found, wait for the active request to be handled\n    if (activeRequestHandlers) {\n      // setup the response listener and wait for it to be called\n      // it will handle copying the result and request fields\n      log(\n        'Running %i handler(s) for request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      return await createActiveRequestHandler(activeRequestHandlers);\n    }\n\n    // setup response handler array for subsequent requests\n    activeRequestHandlers = [];\n    inflightRequests[cacheId] = activeRequestHandlers;\n    // allow request to be handled normally\n    log('Carrying original request forward %o', request);\n    try {\n      const result = (await next()) as Json;\n      log(\n        'Running %i collected handler(s) for successful request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      handleSuccess(result, activeRequestHandlers);\n      return result;\n    } catch (error) {\n      log(\n        'Running %i collected handler(s) for failed request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      handleError(error as Error, activeRequestHandlers);\n      throw error;\n    } finally {\n      delete inflightRequests[cacheId];\n    }\n  };\n\n  /**\n   * Creates a new request handler for the active request.\n   *\n   * @param activeRequestHandlers - The active request handlers.\n   * @returns A promise that resolves to the result of the request.\n   */\n  function createActiveRequestHandler(\n    activeRequestHandlers: RequestHandler[],\n  ): Promise<Json> {\n    const { resolve, promise, reject } = createDeferredPromise<Json>();\n    activeRequestHandlers.push({\n      onSuccess: (result: Json) => resolve(result),\n      onError: (error: Error) => reject(error),\n    });\n    return promise;\n  }\n\n  /**\n   * Handles successful requests.\n   *\n   * @param result - The result of the request.\n   * @param activeRequestHandlers - The active request handlers.\n   */\n  function handleSuccess(\n    result: Json,\n    activeRequestHandlers: RequestHandler[],\n  ): void {\n    // use setTimeout so we can resolve our original request first\n    setTimeout(() => {\n      activeRequestHandlers.forEach(({ onSuccess }) => {\n        onSuccess(result);\n      });\n    });\n  }\n\n  /**\n   * Handles failed requests.\n   *\n   * @param error - The error of the request.\n   * @param activeRequestHandlers - The active request handlers.\n   */\n  function handleError(\n    error: Error,\n    activeRequestHandlers: RequestHandler[],\n  ): void {\n    activeRequestHandlers.forEach(({ onError }) => {\n      onError(error);\n    });\n  }\n}\n"]}

package/dist/inflight-cache.d.cts

@@ -1,4 +1,13 @@
-import type { JsonRpcParams, Json } from "@metamask/utils";
-import type { JsonRpcCacheMiddleware } from "./types.cjs";
-export declare function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<JsonRpcParams, Json>;
+import type { JsonRpcMiddleware, MiddlewareContext } from "@metamask/json-rpc-engine/v2";
+import { type Json, type JsonRpcRequest } from "@metamask/utils";
+/**
+ * Creates a middleware that caches inflight requests.
+ * If a request is already in flight, the middleware will wait for the request to complete
+ * and then return the result.
+ *
+ * @returns A middleware that caches inflight requests.
+ */
+export declare function createInflightCacheMiddleware(): JsonRpcMiddleware<JsonRpcRequest, Json, MiddlewareContext<{
+    skipCache: boolean;
+}>>;
 //# sourceMappingURL=inflight-cache.d.cts.map

package/dist/inflight-cache.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"inflight-cache.d.cts","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,IAAI,EAEL,wBAAwB;AAIzB,OAAO,KAAK,EAAyB,sBAAsB,EAAE,oBAAgB;AAU7E,wBAAgB,6BAA6B,IAAI,sBAAsB,CACrE,aAAa,EACb,IAAI,CACL,CAiFA"}
+{"version":3,"file":"inflight-cache.d.cts","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EAClB,qCAAqC;AACtC,OAAO,EACL,KAAK,IAAI,EACT,KAAK,cAAc,EAEpB,wBAAwB;AAezB;;;;;;GAMG;AACH,wBAAgB,6BAA6B,IAAI,iBAAiB,CAChE,cAAc,EACd,IAAI,EACJ,iBAAiB,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAC1C,CAwGA"}

package/dist/inflight-cache.d.mts

@@ -1,4 +1,13 @@
-import type { JsonRpcParams, Json } from "@metamask/utils";
-import type { JsonRpcCacheMiddleware } from "./types.mjs";
-export declare function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<JsonRpcParams, Json>;
+import type { JsonRpcMiddleware, MiddlewareContext } from "@metamask/json-rpc-engine/v2";
+import { type Json, type JsonRpcRequest } from "@metamask/utils";
+/**
+ * Creates a middleware that caches inflight requests.
+ * If a request is already in flight, the middleware will wait for the request to complete
+ * and then return the result.
+ *
+ * @returns A middleware that caches inflight requests.
+ */
+export declare function createInflightCacheMiddleware(): JsonRpcMiddleware<JsonRpcRequest, Json, MiddlewareContext<{
+    skipCache: boolean;
+}>>;
 //# sourceMappingURL=inflight-cache.d.mts.map

package/dist/inflight-cache.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"inflight-cache.d.mts","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,IAAI,EAEL,wBAAwB;AAIzB,OAAO,KAAK,EAAyB,sBAAsB,EAAE,oBAAgB;AAU7E,wBAAgB,6BAA6B,IAAI,sBAAsB,CACrE,aAAa,EACb,IAAI,CACL,CAiFA"}
+{"version":3,"file":"inflight-cache.d.mts","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EAClB,qCAAqC;AACtC,OAAO,EACL,KAAK,IAAI,EACT,KAAK,cAAc,EAEpB,wBAAwB;AAezB;;;;;;GAMG;AACH,wBAAgB,6BAA6B,IAAI,iBAAiB,CAChE,cAAc,EACd,IAAI,EACJ,iBAAiB,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAC1C,CAwGA"}

package/dist/inflight-cache.mjs

@@ -1,20 +1,23 @@
-import { createAsyncMiddleware } from "@metamask/json-rpc-engine";
-import { klona } from "klona/full";
+import { createDeferredPromise } from "@metamask/utils";
 import { projectLogger, createModuleLogger } from "./logging-utils.mjs";
 import { cacheIdentifierForRequest } from "./utils/cache.mjs";
 const log = createModuleLogger(projectLogger, 'inflight-cache');
+/**
+ * Creates a middleware that caches inflight requests.
+ * If a request is already in flight, the middleware will wait for the request to complete
+ * and then return the result.
+ *
+ * @returns A middleware that caches inflight requests.
+ */
 export function createInflightCacheMiddleware() {
     const inflightRequests = {};
-    return createAsyncMiddleware(async (req, res, next) => {
-        // allow cach to be skipped if so specified
-        if (req.skipCache) {
+    return async ({ request, context, next }) => {
+        if (context.get('skipCache')) {
             return next();
         }
-        // get cacheId, if cacheable
-        const cacheId = cacheIdentifierForRequest(req);
-        // if not cacheable, skip
+        const cacheId = cacheIdentifierForRequest(request);
         if (!cacheId) {
-            log('Request is not cacheable, proceeding. req = %o', req);
+            log('Request is not cacheable, proceeding. req = %o', request);
             return next();
         }
         // check for matching requests
@@ -23,54 +26,67 @@ export function createInflightCacheMiddleware() {
         if (activeRequestHandlers) {
             // setup the response listener and wait for it to be called
             // it will handle copying the result and request fields
-            log('Running %i handler(s) for request %o', activeRequestHandlers.length, req);
-            await createActiveRequestHandler(res, activeRequestHandlers);
-            return undefined;
+            log('Running %i handler(s) for request %o', activeRequestHandlers.length, request);
+            return await createActiveRequestHandler(activeRequestHandlers);
         }
         // setup response handler array for subsequent requests
         activeRequestHandlers = [];
         inflightRequests[cacheId] = activeRequestHandlers;
         // allow request to be handled normally
-        log('Carrying original request forward %o', req);
-        await next();
-        // clear inflight requests
-        delete inflightRequests[cacheId];
-        // schedule activeRequestHandlers to be handled
-        log('Running %i collected handler(s) for request %o', activeRequestHandlers.length, req);
-        handleActiveRequest(res, activeRequestHandlers);
-        // complete
-        return undefined;
-    });
-    async function createActiveRequestHandler(res, activeRequestHandlers) {
-        const { resolve, promise } = deferredPromise();
-        activeRequestHandlers.push((handledRes) => {
-            // append a copy of the result and error to the response
-            res.result = klona(handledRes.result);
-            res.error = klona(handledRes.error);
-            resolve();
+        log('Carrying original request forward %o', request);
+        try {
+            const result = (await next());
+            log('Running %i collected handler(s) for successful request %o', activeRequestHandlers.length, request);
+            handleSuccess(result, activeRequestHandlers);
+            return result;
+        }
+        catch (error) {
+            log('Running %i collected handler(s) for failed request %o', activeRequestHandlers.length, request);
+            handleError(error, activeRequestHandlers);
+            throw error;
+        }
+        finally {
+            delete inflightRequests[cacheId];
+        }
+    };
+    /**
+     * Creates a new request handler for the active request.
+     *
+     * @param activeRequestHandlers - The active request handlers.
+     * @returns A promise that resolves to the result of the request.
+     */
+    function createActiveRequestHandler(activeRequestHandlers) {
+        const { resolve, promise, reject } = createDeferredPromise();
+        activeRequestHandlers.push({
+            onSuccess: (result) => resolve(result),
+            onError: (error) => reject(error),
         });
         return promise;
     }
-    function handleActiveRequest(res, activeRequestHandlers) {
+    /**
+     * Handles successful requests.
+     *
+     * @param result - The result of the request.
+     * @param activeRequestHandlers - The active request handlers.
+     */
+    function handleSuccess(result, activeRequestHandlers) {
         // use setTimeout so we can resolve our original request first
         setTimeout(() => {
-            activeRequestHandlers.forEach((handler) => {
-                try {
-                    handler(res);
-                }
-                catch (err) {
-                    // catch error so all requests are handled correctly
-                    console.error(err);
-                }
+            activeRequestHandlers.forEach(({ onSuccess }) => {
+                onSuccess(result);
             });
         });
     }
-}
-function deferredPromise() {
-    let resolve;
-    const promise = new Promise((_resolve) => {
-        resolve = _resolve;
-    });
-    return { resolve, promise };
+    /**
+     * Handles failed requests.
+     *
+     * @param error - The error of the request.
+     * @param activeRequestHandlers - The active request handlers.
+     */
+    function handleError(error, activeRequestHandlers) {
+        activeRequestHandlers.forEach(({ onError }) => {
+            onError(error);
+        });
+    }
 }
 //# sourceMappingURL=inflight-cache.mjs.map

package/dist/inflight-cache.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"inflight-cache.mjs","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { createAsyncMiddleware } from '@metamask/json-rpc-engine';\nimport type {\n  JsonRpcParams,\n  Json,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { klona } from 'klona/full';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport type { JsonRpcRequestToCache, JsonRpcCacheMiddleware } from './types';\nimport { cacheIdentifierForRequest } from './utils/cache';\n\ntype RequestHandlers = (handledRes: PendingJsonRpcResponse) => void;\ntype InflightRequest = {\n  [cacheId: string]: RequestHandlers[];\n};\n\nconst log = createModuleLogger(projectLogger, 'inflight-cache');\n\nexport function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<\n  JsonRpcParams,\n  Json\n> {\n  const inflightRequests: InflightRequest = {};\n\n  return createAsyncMiddleware(\n    async (req: JsonRpcRequestToCache<JsonRpcParams>, res, next) => {\n      // allow cach to be skipped if so specified\n      if (req.skipCache) {\n        return next();\n      }\n      // get cacheId, if cacheable\n      const cacheId: string | null = cacheIdentifierForRequest(req);\n      // if not cacheable, skip\n      if (!cacheId) {\n        log('Request is not cacheable, proceeding. req = %o', req);\n        return next();\n      }\n      // check for matching requests\n      let activeRequestHandlers: RequestHandlers[] = inflightRequests[cacheId];\n      // if found, wait for the active request to be handled\n      if (activeRequestHandlers) {\n        // setup the response listener and wait for it to be called\n        // it will handle copying the result and request fields\n        log(\n          'Running %i handler(s) for request %o',\n          activeRequestHandlers.length,\n          req,\n        );\n        await createActiveRequestHandler(res, activeRequestHandlers);\n        return undefined;\n      }\n      // setup response handler array for subsequent requests\n      activeRequestHandlers = [];\n      inflightRequests[cacheId] = activeRequestHandlers;\n      // allow request to be handled normally\n      log('Carrying original request forward %o', req);\n      await next();\n\n      // clear inflight requests\n      delete inflightRequests[cacheId];\n      // schedule activeRequestHandlers to be handled\n      log(\n        'Running %i collected handler(s) for request %o',\n        activeRequestHandlers.length,\n        req,\n      );\n      handleActiveRequest(res, activeRequestHandlers);\n      // complete\n      return undefined;\n    },\n  );\n\n  async function createActiveRequestHandler(\n    res: PendingJsonRpcResponse,\n    activeRequestHandlers: RequestHandlers[],\n  ): Promise<void> {\n    const { resolve, promise } = deferredPromise();\n    activeRequestHandlers.push((handledRes: PendingJsonRpcResponse) => {\n      // append a copy of the result and error to the response\n      res.result = klona(handledRes.result);\n      res.error = klona(handledRes.error);\n      resolve();\n    });\n    return promise;\n  }\n\n  function handleActiveRequest(\n    res: PendingJsonRpcResponse,\n    activeRequestHandlers: RequestHandlers[],\n  ): void {\n    // use setTimeout so we can resolve our original request first\n    setTimeout(() => {\n      activeRequestHandlers.forEach((handler) => {\n        try {\n          handler(res);\n        } catch (err) {\n          // catch error so all requests are handled correctly\n          console.error(err);\n        }\n      });\n    });\n  }\n}\n\nfunction deferredPromise() {\n  let resolve: any;\n  const promise: Promise<void> = new Promise((_resolve) => {\n    resolve = _resolve;\n  });\n  return { resolve, promise };\n}\n"]}
+{"version":3,"file":"inflight-cache.mjs","sourceRoot":"","sources":["../src/inflight-cache.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  JsonRpcMiddleware,\n  MiddlewareContext,\n} from '@metamask/json-rpc-engine/v2';\nimport {\n  type Json,\n  type JsonRpcRequest,\n  createDeferredPromise,\n} from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from './logging-utils';\nimport { cacheIdentifierForRequest } from './utils/cache';\n\ntype RequestHandler = {\n  onSuccess: (result: Json) => void;\n  onError: (error: Error) => void;\n};\ntype InflightRequest = {\n  [cacheId: string]: RequestHandler[];\n};\n\nconst log = createModuleLogger(projectLogger, 'inflight-cache');\n\n/**\n * Creates a middleware that caches inflight requests.\n * If a request is already in flight, the middleware will wait for the request to complete\n * and then return the result.\n *\n * @returns A middleware that caches inflight requests.\n */\nexport function createInflightCacheMiddleware(): JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  MiddlewareContext<{ skipCache: boolean }>\n> {\n  const inflightRequests: InflightRequest = {};\n\n  return async ({ request, context, next }) => {\n    if (context.get('skipCache')) {\n      return next();\n    }\n\n    const cacheId: string | null = cacheIdentifierForRequest(request);\n    if (!cacheId) {\n      log('Request is not cacheable, proceeding. req = %o', request);\n      return next();\n    }\n\n    // check for matching requests\n    let activeRequestHandlers: RequestHandler[] = inflightRequests[cacheId];\n    // if found, wait for the active request to be handled\n    if (activeRequestHandlers) {\n      // setup the response listener and wait for it to be called\n      // it will handle copying the result and request fields\n      log(\n        'Running %i handler(s) for request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      return await createActiveRequestHandler(activeRequestHandlers);\n    }\n\n    // setup response handler array for subsequent requests\n    activeRequestHandlers = [];\n    inflightRequests[cacheId] = activeRequestHandlers;\n    // allow request to be handled normally\n    log('Carrying original request forward %o', request);\n    try {\n      const result = (await next()) as Json;\n      log(\n        'Running %i collected handler(s) for successful request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      handleSuccess(result, activeRequestHandlers);\n      return result;\n    } catch (error) {\n      log(\n        'Running %i collected handler(s) for failed request %o',\n        activeRequestHandlers.length,\n        request,\n      );\n      handleError(error as Error, activeRequestHandlers);\n      throw error;\n    } finally {\n      delete inflightRequests[cacheId];\n    }\n  };\n\n  /**\n   * Creates a new request handler for the active request.\n   *\n   * @param activeRequestHandlers - The active request handlers.\n   * @returns A promise that resolves to the result of the request.\n   */\n  function createActiveRequestHandler(\n    activeRequestHandlers: RequestHandler[],\n  ): Promise<Json> {\n    const { resolve, promise, reject } = createDeferredPromise<Json>();\n    activeRequestHandlers.push({\n      onSuccess: (result: Json) => resolve(result),\n      onError: (error: Error) => reject(error),\n    });\n    return promise;\n  }\n\n  /**\n   * Handles successful requests.\n   *\n   * @param result - The result of the request.\n   * @param activeRequestHandlers - The active request handlers.\n   */\n  function handleSuccess(\n    result: Json,\n    activeRequestHandlers: RequestHandler[],\n  ): void {\n    // use setTimeout so we can resolve our original request first\n    setTimeout(() => {\n      activeRequestHandlers.forEach(({ onSuccess }) => {\n        onSuccess(result);\n      });\n    });\n  }\n\n  /**\n   * Handles failed requests.\n   *\n   * @param error - The error of the request.\n   * @param activeRequestHandlers - The active request handlers.\n   */\n  function handleError(\n    error: Error,\n    activeRequestHandlers: RequestHandler[],\n  ): void {\n    activeRequestHandlers.forEach(({ onError }) => {\n      onError(error);\n    });\n  }\n}\n"]}

package/dist/methods/wallet-request-execution-permissions.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walletRequestExecutionPermissions = exports.RequestExecutionPermissionsStruct = void 0;
+exports.createWalletRequestExecutionPermissionsHandler = exports.RequestExecutionPermissionsStruct = void 0;
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const superstruct_1 = require("@metamask/superstruct");
 const utils_1 = require("@metamask/utils");
@@ -29,13 +29,15 @@ const PermissionRequestStruct = (0, superstruct_1.object)({
     rules: (0, superstruct_1.optional)((0, superstruct_1.union)([(0, superstruct_1.array)(RuleStruct), (0, superstruct_1.literal)(null)])),
 });
 exports.RequestExecutionPermissionsStruct = (0, superstruct_1.array)(PermissionRequestStruct);
-async function walletRequestExecutionPermissions(req, res, { processRequestExecutionPermissions, }) {
-    if (!processRequestExecutionPermissions) {
-        throw rpc_errors_1.rpcErrors.methodNotSupported('wallet_requestExecutionPermissions - no middleware configured');
-    }
-    const { params } = req;
-    (0, validation_1.validateParams)(params, exports.RequestExecutionPermissionsStruct);
-    res.result = await processRequestExecutionPermissions(params, req);
+function createWalletRequestExecutionPermissionsHandler({ processRequestExecutionPermissions, }) {
+    return async ({ request }) => {
+        if (!processRequestExecutionPermissions) {
+            throw rpc_errors_1.rpcErrors.methodNotSupported('wallet_requestExecutionPermissions - no middleware configured');
+        }
+        const { params } = request;
+        (0, validation_1.validateParams)(params, exports.RequestExecutionPermissionsStruct);
+        return await processRequestExecutionPermissions(params, request);
+    };
 }
-exports.walletRequestExecutionPermissions = walletRequestExecutionPermissions;
+exports.createWalletRequestExecutionPermissionsHandler = createWalletRequestExecutionPermissionsHandler;
 //# sourceMappingURL=wallet-request-execution-permissions.cjs.map

package/dist/methods/wallet-request-execution-permissions.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-request-execution-permissions.cjs","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAEjD,uDAU+B;AAC/B,2CAOyB;AAEzB,wDAAqD;AAErD,MAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAC;IAC9B,IAAI,EAAE,IAAA,oBAAM,GAAE;IACd,mBAAmB,EAAE,IAAA,qBAAO,GAAE;IAC9B,IAAI,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,IAAA,qBAAO,GAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC;IACxB,IAAI,EAAE,IAAA,oBAAM,GAAE;IACd,mBAAmB,EAAE,IAAA,qBAAO,GAAE;IAC9B,IAAI,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,IAAA,qBAAO,GAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAA,oBAAM,EAAC;IACjC,IAAI,EAAE,IAAA,qBAAO,EAAC,SAAS,CAAC;IACxB,IAAI,EAAE,IAAA,oBAAM,EAAC;QACX,OAAO,EAAE,gCAAwB;KAClC,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,IAAA,oBAAM,EAAC;IACrC,OAAO,EAAE,uBAAe;IACxB,OAAO,EAAE,IAAA,sBAAQ,EAAC,gCAAwB,CAAC;IAC3C,MAAM,EAAE,mBAAmB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,KAAK,EAAE,IAAA,sBAAQ,EAAC,IAAA,mBAAK,EAAC,CAAC,IAAA,mBAAK,EAAC,UAAU,CAAC,EAAE,IAAA,qBAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC,CAAC;AAEU,QAAA,iCAAiC,GAAG,IAAA,mBAAK,EAAC,uBAAuB,CAAC,CAAC;AAiBzE,KAAK,UAAU,iCAAiC,CACrD,GAAmB,EACnB,GAA2B,EAC3B,EACE,kCAAkC,GAGnC;IAED,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,sBAAS,CAAC,kBAAkB,CAChC,+DAA+D,CAChE,CAAC;KACH;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAEvB,IAAA,2BAAc,EAAC,MAAM,EAAE,yCAAiC,CAAC,CAAC;IAE1D,GAAG,CAAC,MAAM,GAAG,MAAM,kCAAkC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACrE,CAAC;AApBD,8EAoBC","sourcesContent":["import { rpcErrors } from '@metamask/rpc-errors';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  boolean,\n  literal,\n  object,\n  optional,\n  record,\n  string,\n  union,\n  unknown,\n} from '@metamask/superstruct';\nimport {\n  HexChecksumAddressStruct,\n  type Hex,\n  type Json,\n  type JsonRpcRequest,\n  type PendingJsonRpcResponse,\n  StrictHexStruct,\n} from '@metamask/utils';\n\nimport { validateParams } from '../utils/validation';\n\nconst PermissionStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst RuleStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst AccountSignerStruct = object({\n  type: literal('account'),\n  data: object({\n    address: HexChecksumAddressStruct,\n  }),\n});\n\nconst PermissionRequestStruct = object({\n  chainId: StrictHexStruct,\n  address: optional(HexChecksumAddressStruct),\n  signer: AccountSignerStruct,\n  permission: PermissionStruct,\n  rules: optional(union([array(RuleStruct), literal(null)])),\n});\n\nexport const RequestExecutionPermissionsStruct = array(PermissionRequestStruct);\n\n// RequestExecutionPermissions API types\nexport type RequestExecutionPermissionsRequestParams = Infer<\n  typeof RequestExecutionPermissionsStruct\n>;\n\nexport type RequestExecutionPermissionsResult = Json &\n  (Infer<typeof PermissionRequestStruct> & {\n    context: Hex;\n  })[];\n\nexport type ProcessRequestExecutionPermissionsHook = (\n  request: RequestExecutionPermissionsRequestParams,\n  req: JsonRpcRequest,\n) => Promise<RequestExecutionPermissionsResult>;\n\nexport async function walletRequestExecutionPermissions(\n  req: JsonRpcRequest,\n  res: PendingJsonRpcResponse,\n  {\n    processRequestExecutionPermissions,\n  }: {\n    processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n  },\n): Promise<void> {\n  if (!processRequestExecutionPermissions) {\n    throw rpcErrors.methodNotSupported(\n      'wallet_requestExecutionPermissions - no middleware configured',\n    );\n  }\n\n  const { params } = req;\n\n  validateParams(params, RequestExecutionPermissionsStruct);\n\n  res.result = await processRequestExecutionPermissions(params, req);\n}\n"]}
+{"version":3,"file":"wallet-request-execution-permissions.cjs","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAEjD,uDAU+B;AAC/B,2CAMyB;AAEzB,wDAAqD;AAGrD,MAAM,gBAAgB,GAAG,IAAA,oBAAM,EAAC;IAC9B,IAAI,EAAE,IAAA,oBAAM,GAAE;IACd,mBAAmB,EAAE,IAAA,qBAAO,GAAE;IAC9B,IAAI,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,IAAA,qBAAO,GAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC;IACxB,IAAI,EAAE,IAAA,oBAAM,GAAE;IACd,mBAAmB,EAAE,IAAA,qBAAO,GAAE;IAC9B,IAAI,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,IAAA,qBAAO,GAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAA,oBAAM,EAAC;IACjC,IAAI,EAAE,IAAA,qBAAO,EAAC,SAAS,CAAC;IACxB,IAAI,EAAE,IAAA,oBAAM,EAAC;QACX,OAAO,EAAE,gCAAwB;KAClC,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,IAAA,oBAAM,EAAC;IACrC,OAAO,EAAE,uBAAe;IACxB,OAAO,EAAE,IAAA,sBAAQ,EAAC,gCAAwB,CAAC;IAC3C,MAAM,EAAE,mBAAmB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,KAAK,EAAE,IAAA,sBAAQ,EAAC,IAAA,mBAAK,EAAC,CAAC,IAAA,mBAAK,EAAC,UAAU,CAAC,EAAE,IAAA,qBAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC,CAAC;AAEU,QAAA,iCAAiC,GAAG,IAAA,mBAAK,EAAC,uBAAuB,CAAC,CAAC;AAiBhF,SAAgB,8CAA8C,CAAC,EAC7D,kCAAkC,GAGnC;IACC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3B,IAAI,CAAC,kCAAkC,EAAE;YACvC,MAAM,sBAAS,CAAC,kBAAkB,CAChC,+DAA+D,CAChE,CAAC;SACH;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3B,IAAA,2BAAc,EAAC,MAAM,EAAE,yCAAiC,CAAC,CAAC;QAE1D,OAAO,MAAM,kCAAkC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC;AAlBD,wGAkBC","sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  boolean,\n  literal,\n  object,\n  optional,\n  record,\n  string,\n  union,\n  unknown,\n} from '@metamask/superstruct';\nimport {\n  HexChecksumAddressStruct,\n  type Hex,\n  type Json,\n  type JsonRpcRequest,\n  StrictHexStruct,\n} from '@metamask/utils';\n\nimport { validateParams } from '../utils/validation';\nimport type { WalletMiddlewareContext } from '../wallet';\n\nconst PermissionStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst RuleStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst AccountSignerStruct = object({\n  type: literal('account'),\n  data: object({\n    address: HexChecksumAddressStruct,\n  }),\n});\n\nconst PermissionRequestStruct = object({\n  chainId: StrictHexStruct,\n  address: optional(HexChecksumAddressStruct),\n  signer: AccountSignerStruct,\n  permission: PermissionStruct,\n  rules: optional(union([array(RuleStruct), literal(null)])),\n});\n\nexport const RequestExecutionPermissionsStruct = array(PermissionRequestStruct);\n\n// RequestExecutionPermissions API types\nexport type RequestExecutionPermissionsRequestParams = Infer<\n  typeof RequestExecutionPermissionsStruct\n>;\n\nexport type RequestExecutionPermissionsResult = Json &\n  (Infer<typeof PermissionRequestStruct> & {\n    context: Hex;\n  })[];\n\nexport type ProcessRequestExecutionPermissionsHook = (\n  request: RequestExecutionPermissionsRequestParams,\n  req: JsonRpcRequest,\n) => Promise<RequestExecutionPermissionsResult>;\n\nexport function createWalletRequestExecutionPermissionsHandler({\n  processRequestExecutionPermissions,\n}: {\n  processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n}): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext> {\n  return async ({ request }) => {\n    if (!processRequestExecutionPermissions) {\n      throw rpcErrors.methodNotSupported(\n        'wallet_requestExecutionPermissions - no middleware configured',\n      );\n    }\n\n    const { params } = request;\n\n    validateParams(params, RequestExecutionPermissionsStruct);\n\n    return await processRequestExecutionPermissions(params, request);\n  };\n}\n"]}

package/dist/methods/wallet-request-execution-permissions.d.cts

@@ -1,5 +1,7 @@
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
 import type { Infer } from "@metamask/superstruct";
-import { type Hex, type Json, type JsonRpcRequest, type PendingJsonRpcResponse } from "@metamask/utils";
+import { type Hex, type Json, type JsonRpcRequest } from "@metamask/utils";
+import type { WalletMiddlewareContext } from "../wallet.cjs";
 declare const PermissionRequestStruct: import("@metamask/superstruct").Struct<{
     chainId: `0x${string}`;
     signer: {
@@ -124,8 +126,8 @@ export type RequestExecutionPermissionsResult = Json & (Infer<typeof PermissionR
     context: Hex;
 })[];
 export type ProcessRequestExecutionPermissionsHook = (request: RequestExecutionPermissionsRequestParams, req: JsonRpcRequest) => Promise<RequestExecutionPermissionsResult>;
-export declare function walletRequestExecutionPermissions(req: JsonRpcRequest, res: PendingJsonRpcResponse, { processRequestExecutionPermissions, }: {
+export declare function createWalletRequestExecutionPermissionsHandler({ processRequestExecutionPermissions, }: {
     processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;
-}): Promise<void>;
+}): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext>;
 export {};
 //# sourceMappingURL=wallet-request-execution-permissions.d.cts.map

package/dist/methods/wallet-request-execution-permissions.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-request-execution-permissions.d.cts","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAYnD,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAE5B,wBAAwB;AAuBzB,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM3B,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAiC,CAAC;AAGhF,MAAM,MAAM,wCAAwC,GAAG,KAAK,CAC1D,OAAO,iCAAiC,CACzC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,IAAI,GAClD,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG;IACvC,OAAO,EAAE,GAAG,CAAC;CACd,CAAC,EAAE,CAAC;AAEP,MAAM,MAAM,sCAAsC,GAAG,CACnD,OAAO,EAAE,wCAAwC,EACjD,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhD,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,sBAAsB,EAC3B,EACE,kCAAkC,GACnC,EAAE;IACD,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;CAC7E,GACA,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"wallet-request-execution-permissions.d.cts","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAYnD,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,IAAI,EACT,KAAK,cAAc,EAEpB,wBAAwB;AAGzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAkB;AAqBzD,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM3B,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAiC,CAAC;AAGhF,MAAM,MAAM,wCAAwC,GAAG,KAAK,CAC1D,OAAO,iCAAiC,CACzC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,IAAI,GAClD,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG;IACvC,OAAO,EAAE,GAAG,CAAC;CACd,CAAC,EAAE,CAAC;AAEP,MAAM,MAAM,sCAAsC,GAAG,CACnD,OAAO,EAAE,wCAAwC,EACjD,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhD,wBAAgB,8CAA8C,CAAC,EAC7D,kCAAkC,GACnC,EAAE;IACD,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;CAC7E,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAcnE"}

package/dist/methods/wallet-request-execution-permissions.d.mts

@@ -1,5 +1,7 @@
+import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine/v2";
 import type { Infer } from "@metamask/superstruct";
-import { type Hex, type Json, type JsonRpcRequest, type PendingJsonRpcResponse } from "@metamask/utils";
+import { type Hex, type Json, type JsonRpcRequest } from "@metamask/utils";
+import type { WalletMiddlewareContext } from "../wallet.mjs";
 declare const PermissionRequestStruct: import("@metamask/superstruct").Struct<{
     chainId: `0x${string}`;
     signer: {
@@ -124,8 +126,8 @@ export type RequestExecutionPermissionsResult = Json & (Infer<typeof PermissionR
     context: Hex;
 })[];
 export type ProcessRequestExecutionPermissionsHook = (request: RequestExecutionPermissionsRequestParams, req: JsonRpcRequest) => Promise<RequestExecutionPermissionsResult>;
-export declare function walletRequestExecutionPermissions(req: JsonRpcRequest, res: PendingJsonRpcResponse, { processRequestExecutionPermissions, }: {
+export declare function createWalletRequestExecutionPermissionsHandler({ processRequestExecutionPermissions, }: {
     processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;
-}): Promise<void>;
+}): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext>;
 export {};
 //# sourceMappingURL=wallet-request-execution-permissions.d.mts.map

package/dist/methods/wallet-request-execution-permissions.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-request-execution-permissions.d.mts","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAYnD,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAE5B,wBAAwB;AAuBzB,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM3B,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAiC,CAAC;AAGhF,MAAM,MAAM,wCAAwC,GAAG,KAAK,CAC1D,OAAO,iCAAiC,CACzC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,IAAI,GAClD,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG;IACvC,OAAO,EAAE,GAAG,CAAC;CACd,CAAC,EAAE,CAAC;AAEP,MAAM,MAAM,sCAAsC,GAAG,CACnD,OAAO,EAAE,wCAAwC,EACjD,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhD,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,sBAAsB,EAC3B,EACE,kCAAkC,GACnC,EAAE;IACD,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;CAC7E,GACA,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"wallet-request-execution-permissions.d.mts","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAYnD,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,IAAI,EACT,KAAK,cAAc,EAEpB,wBAAwB;AAGzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAkB;AAqBzD,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM3B,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAiC,CAAC;AAGhF,MAAM,MAAM,wCAAwC,GAAG,KAAK,CAC1D,OAAO,iCAAiC,CACzC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,IAAI,GAClD,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG;IACvC,OAAO,EAAE,GAAG,CAAC;CACd,CAAC,EAAE,CAAC;AAEP,MAAM,MAAM,sCAAsC,GAAG,CACnD,OAAO,EAAE,wCAAwC,EACjD,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhD,wBAAgB,8CAA8C,CAAC,EAC7D,kCAAkC,GACnC,EAAE;IACD,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;CAC7E,GAAG,iBAAiB,CAAC,cAAc,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAcnE"}

package/dist/methods/wallet-request-execution-permissions.mjs

@@ -26,12 +26,14 @@ const PermissionRequestStruct = object({
     rules: optional(union([array(RuleStruct), literal(null)])),
 });
 export const RequestExecutionPermissionsStruct = array(PermissionRequestStruct);
-export async function walletRequestExecutionPermissions(req, res, { processRequestExecutionPermissions, }) {
-    if (!processRequestExecutionPermissions) {
-        throw rpcErrors.methodNotSupported('wallet_requestExecutionPermissions - no middleware configured');
-    }
-    const { params } = req;
-    validateParams(params, RequestExecutionPermissionsStruct);
-    res.result = await processRequestExecutionPermissions(params, req);
+export function createWalletRequestExecutionPermissionsHandler({ processRequestExecutionPermissions, }) {
+    return async ({ request }) => {
+        if (!processRequestExecutionPermissions) {
+            throw rpcErrors.methodNotSupported('wallet_requestExecutionPermissions - no middleware configured');
+        }
+        const { params } = request;
+        validateParams(params, RequestExecutionPermissionsStruct);
+        return await processRequestExecutionPermissions(params, request);
+    };
 }
 //# sourceMappingURL=wallet-request-execution-permissions.mjs.map

package/dist/methods/wallet-request-execution-permissions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-request-execution-permissions.mjs","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,6BAA6B;AAEjD,OAAO,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACR,8BAA8B;AAC/B,OAAO,EACL,wBAAwB,EAKxB,eAAe,EAChB,wBAAwB;AAEzB,OAAO,EAAE,cAAc,EAAE,gCAA4B;AAErD,MAAM,gBAAgB,GAAG,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,EAAE;IACd,mBAAmB,EAAE,OAAO,EAAE;IAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE;IACd,mBAAmB,EAAE,OAAO,EAAE;IAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,wBAAwB;KAClC,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,MAAM,CAAC;IACrC,OAAO,EAAE,eAAe;IACxB,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAC3C,MAAM,EAAE,mBAAmB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC;AAiBhF,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,GAAmB,EACnB,GAA2B,EAC3B,EACE,kCAAkC,GAGnC;IAED,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,SAAS,CAAC,kBAAkB,CAChC,+DAA+D,CAChE,CAAC;KACH;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAEvB,cAAc,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;IAE1D,GAAG,CAAC,MAAM,GAAG,MAAM,kCAAkC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACrE,CAAC","sourcesContent":["import { rpcErrors } from '@metamask/rpc-errors';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  boolean,\n  literal,\n  object,\n  optional,\n  record,\n  string,\n  union,\n  unknown,\n} from '@metamask/superstruct';\nimport {\n  HexChecksumAddressStruct,\n  type Hex,\n  type Json,\n  type JsonRpcRequest,\n  type PendingJsonRpcResponse,\n  StrictHexStruct,\n} from '@metamask/utils';\n\nimport { validateParams } from '../utils/validation';\n\nconst PermissionStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst RuleStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst AccountSignerStruct = object({\n  type: literal('account'),\n  data: object({\n    address: HexChecksumAddressStruct,\n  }),\n});\n\nconst PermissionRequestStruct = object({\n  chainId: StrictHexStruct,\n  address: optional(HexChecksumAddressStruct),\n  signer: AccountSignerStruct,\n  permission: PermissionStruct,\n  rules: optional(union([array(RuleStruct), literal(null)])),\n});\n\nexport const RequestExecutionPermissionsStruct = array(PermissionRequestStruct);\n\n// RequestExecutionPermissions API types\nexport type RequestExecutionPermissionsRequestParams = Infer<\n  typeof RequestExecutionPermissionsStruct\n>;\n\nexport type RequestExecutionPermissionsResult = Json &\n  (Infer<typeof PermissionRequestStruct> & {\n    context: Hex;\n  })[];\n\nexport type ProcessRequestExecutionPermissionsHook = (\n  request: RequestExecutionPermissionsRequestParams,\n  req: JsonRpcRequest,\n) => Promise<RequestExecutionPermissionsResult>;\n\nexport async function walletRequestExecutionPermissions(\n  req: JsonRpcRequest,\n  res: PendingJsonRpcResponse,\n  {\n    processRequestExecutionPermissions,\n  }: {\n    processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n  },\n): Promise<void> {\n  if (!processRequestExecutionPermissions) {\n    throw rpcErrors.methodNotSupported(\n      'wallet_requestExecutionPermissions - no middleware configured',\n    );\n  }\n\n  const { params } = req;\n\n  validateParams(params, RequestExecutionPermissionsStruct);\n\n  res.result = await processRequestExecutionPermissions(params, req);\n}\n"]}
+{"version":3,"file":"wallet-request-execution-permissions.mjs","sourceRoot":"","sources":["../../src/methods/wallet-request-execution-permissions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,6BAA6B;AAEjD,OAAO,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACR,8BAA8B;AAC/B,OAAO,EACL,wBAAwB,EAIxB,eAAe,EAChB,wBAAwB;AAEzB,OAAO,EAAE,cAAc,EAAE,gCAA4B;AAGrD,MAAM,gBAAgB,GAAG,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,EAAE;IACd,mBAAmB,EAAE,OAAO,EAAE;IAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE;IACd,mBAAmB,EAAE,OAAO,EAAE;IAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,wBAAwB;KAClC,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,MAAM,CAAC;IACrC,OAAO,EAAE,eAAe;IACxB,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAC3C,MAAM,EAAE,mBAAmB;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC;AAiBhF,MAAM,UAAU,8CAA8C,CAAC,EAC7D,kCAAkC,GAGnC;IACC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3B,IAAI,CAAC,kCAAkC,EAAE;YACvC,MAAM,SAAS,CAAC,kBAAkB,CAChC,+DAA+D,CAChE,CAAC;SACH;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3B,cAAc,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;QAE1D,OAAO,MAAM,kCAAkC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  boolean,\n  literal,\n  object,\n  optional,\n  record,\n  string,\n  union,\n  unknown,\n} from '@metamask/superstruct';\nimport {\n  HexChecksumAddressStruct,\n  type Hex,\n  type Json,\n  type JsonRpcRequest,\n  StrictHexStruct,\n} from '@metamask/utils';\n\nimport { validateParams } from '../utils/validation';\nimport type { WalletMiddlewareContext } from '../wallet';\n\nconst PermissionStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst RuleStruct = object({\n  type: string(),\n  isAdjustmentAllowed: boolean(),\n  data: record(string(), unknown()),\n});\n\nconst AccountSignerStruct = object({\n  type: literal('account'),\n  data: object({\n    address: HexChecksumAddressStruct,\n  }),\n});\n\nconst PermissionRequestStruct = object({\n  chainId: StrictHexStruct,\n  address: optional(HexChecksumAddressStruct),\n  signer: AccountSignerStruct,\n  permission: PermissionStruct,\n  rules: optional(union([array(RuleStruct), literal(null)])),\n});\n\nexport const RequestExecutionPermissionsStruct = array(PermissionRequestStruct);\n\n// RequestExecutionPermissions API types\nexport type RequestExecutionPermissionsRequestParams = Infer<\n  typeof RequestExecutionPermissionsStruct\n>;\n\nexport type RequestExecutionPermissionsResult = Json &\n  (Infer<typeof PermissionRequestStruct> & {\n    context: Hex;\n  })[];\n\nexport type ProcessRequestExecutionPermissionsHook = (\n  request: RequestExecutionPermissionsRequestParams,\n  req: JsonRpcRequest,\n) => Promise<RequestExecutionPermissionsResult>;\n\nexport function createWalletRequestExecutionPermissionsHandler({\n  processRequestExecutionPermissions,\n}: {\n  processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n}): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext> {\n  return async ({ request }) => {\n    if (!processRequestExecutionPermissions) {\n      throw rpcErrors.methodNotSupported(\n        'wallet_requestExecutionPermissions - no middleware configured',\n      );\n    }\n\n    const { params } = request;\n\n    validateParams(params, RequestExecutionPermissionsStruct);\n\n    return await processRequestExecutionPermissions(params, request);\n  };\n}\n"]}

package/dist/methods/wallet-revoke-execution-permission.cjs

@@ -1,20 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walletRevokeExecutionPermission = exports.RevokeExecutionPermissionRequestParamsStruct = exports.RevokeExecutionPermissionResultStruct = void 0;
+exports.createWalletRevokeExecutionPermissionHandler = exports.RevokeExecutionPermissionRequestParamsStruct = exports.RevokeExecutionPermissionResultStruct = void 0;
 const rpc_errors_1 = require("@metamask/rpc-errors");
+const superstruct_1 = require("@metamask/superstruct");
 const utils_1 = require("@metamask/utils");
 const validation_1 = require("../utils/validation.cjs");
-exports.RevokeExecutionPermissionResultStruct = (0, utils_1.object)({});
-exports.RevokeExecutionPermissionRequestParamsStruct = (0, utils_1.object)({
+exports.RevokeExecutionPermissionResultStruct = (0, superstruct_1.object)({});
+exports.RevokeExecutionPermissionRequestParamsStruct = (0, superstruct_1.object)({
     permissionContext: utils_1.StrictHexStruct,
 });
-async function walletRevokeExecutionPermission(req, res, { processRevokeExecutionPermission, }) {
-    if (!processRevokeExecutionPermission) {
-        throw rpc_errors_1.rpcErrors.methodNotSupported('wallet_revokeExecutionPermission - no middleware configured');
-    }
-    const { params } = req;
-    (0, validation_1.validateParams)(params, exports.RevokeExecutionPermissionRequestParamsStruct);
-    res.result = await processRevokeExecutionPermission(params, req);
+function createWalletRevokeExecutionPermissionHandler({ processRevokeExecutionPermission, }) {
+    return async ({ request }) => {
+        if (!processRevokeExecutionPermission) {
+            throw rpc_errors_1.rpcErrors.methodNotSupported('wallet_revokeExecutionPermission - no middleware configured');
+        }
+        const { params } = request;
+        (0, validation_1.validateParams)(params, exports.RevokeExecutionPermissionRequestParamsStruct);
+        return await processRevokeExecutionPermission(params, request);
+    };
 }
-exports.walletRevokeExecutionPermission = walletRevokeExecutionPermission;
+exports.createWalletRevokeExecutionPermissionHandler = createWalletRevokeExecutionPermissionHandler;
 //# sourceMappingURL=wallet-revoke-execution-permission.cjs.map