@metamask-previews/json-rpc-engine 10.2.4-preview-45a82ea8e → 10.2.4-preview-8daaa5a40

package/CHANGELOG.md

@@ -10,12 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add `createOriginMiddleware` utility to `v2` ([#8522](https://github.com/MetaMask/core/pull/8522))
-- Add `createMethodMiddleware` utility to `v2` ([#8506](https://github.com/MetaMask/core/pull/8506), [#8583](https://github.com/MetaMask/core/pull/8583))
+- Add `createMethodMiddleware` utility to `v2` ([#8506](https://github.com/MetaMask/core/pull/8506))
   - This utility allows JSON-RPC method implementations to use both the hooks pattern and the messenger.
-- Add legacy `createMethodMiddleware` ([#8583](https://github.com/MetaMask/core/pull/8583))
-  - Consolidates bespoke `makeMethodMiddlewareMaker` implementations from the MetaMask extension and mobile clients.
-  - Handlers may now declare `actionNames` and receive a delegated messenger as the sixth argument to `implementation`, mirroring the v2 `createMethodMiddleware`.
-  - Deprecated in favor of the v2 `createMethodMiddleware`.
 
 ## [10.2.4]
 

package/dist/index.cjs

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeMiddleware = exports.JsonRpcEngine = exports.createIdRemapMiddleware = exports.getUniqueId = exports.createScaffoldMiddleware = exports.createMethodMiddleware = exports.createAsyncMiddleware = exports.asV2Middleware = void 0;
+exports.mergeMiddleware = exports.JsonRpcEngine = exports.createIdRemapMiddleware = exports.getUniqueId = exports.createScaffoldMiddleware = exports.createAsyncMiddleware = exports.asV2Middleware = void 0;
 var asV2Middleware_1 = require("./asV2Middleware.cjs");
 Object.defineProperty(exports, "asV2Middleware", { enumerable: true, get: function () { return asV2Middleware_1.asV2Middleware; } });
 var createAsyncMiddleware_1 = require("./createAsyncMiddleware.cjs");
 Object.defineProperty(exports, "createAsyncMiddleware", { enumerable: true, get: function () { return createAsyncMiddleware_1.createAsyncMiddleware; } });
-var createMethodMiddleware_1 = require("./createMethodMiddleware.cjs");
-Object.defineProperty(exports, "createMethodMiddleware", { enumerable: true, get: function () { return createMethodMiddleware_1.createMethodMiddleware; } });
 var createScaffoldMiddleware_1 = require("./createScaffoldMiddleware.cjs");
 Object.defineProperty(exports, "createScaffoldMiddleware", { enumerable: true, get: function () { return createScaffoldMiddleware_1.createScaffoldMiddleware; } });
 var getUniqueId_1 = require("./getUniqueId.cjs");

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAAzC,gHAAA,cAAc,OAAA;AAKvB,qEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAM9B,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA;AACjC,iDAA4C;AAAnC,0GAAA,WAAW,OAAA;AACpB,6DAA8D;AAArD,4HAAA,uBAAuB,OAAA;AAShC,qDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAoD;AAA3C,kHAAA,eAAe,OAAA","sourcesContent":["export { asV2Middleware } from './asV2Middleware';\nexport type {\n  AsyncJsonRpcEngineNextCallback,\n  AsyncJsonrpcMiddleware,\n} from './createAsyncMiddleware';\nexport { createAsyncMiddleware } from './createAsyncMiddleware';\nexport type {\n  CreateMethodMiddlewareOptions,\n  MethodHandler,\n  MethodHandlerImplementation,\n} from './createMethodMiddleware';\nexport { createMethodMiddleware } from './createMethodMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { getUniqueId } from './getUniqueId';\nexport { createIdRemapMiddleware } from './idRemapMiddleware';\nexport type {\n  JsonRpcEngineCallbackError,\n  JsonRpcEngineReturnHandler,\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n  JsonRpcMiddleware,\n  JsonRpcNotificationHandler,\n} from './JsonRpcEngine';\nexport { JsonRpcEngine } from './JsonRpcEngine';\nexport { mergeMiddleware } from './mergeMiddleware';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAAzC,gHAAA,cAAc,OAAA;AAKvB,qEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA;AACjC,iDAA4C;AAAnC,0GAAA,WAAW,OAAA;AACpB,6DAA8D;AAArD,4HAAA,uBAAuB,OAAA;AAShC,qDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAoD;AAA3C,kHAAA,eAAe,OAAA","sourcesContent":["export { asV2Middleware } from './asV2Middleware';\nexport type {\n  AsyncJsonRpcEngineNextCallback,\n  AsyncJsonrpcMiddleware,\n} from './createAsyncMiddleware';\nexport { createAsyncMiddleware } from './createAsyncMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { getUniqueId } from './getUniqueId';\nexport { createIdRemapMiddleware } from './idRemapMiddleware';\nexport type {\n  JsonRpcEngineCallbackError,\n  JsonRpcEngineReturnHandler,\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n  JsonRpcMiddleware,\n  JsonRpcNotificationHandler,\n} from './JsonRpcEngine';\nexport { JsonRpcEngine } from './JsonRpcEngine';\nexport { mergeMiddleware } from './mergeMiddleware';\n"]}

package/dist/index.d.cts

@@ -1,8 +1,6 @@
 export { asV2Middleware } from "./asV2Middleware.cjs";
 export type { AsyncJsonRpcEngineNextCallback, AsyncJsonrpcMiddleware, } from "./createAsyncMiddleware.cjs";
 export { createAsyncMiddleware } from "./createAsyncMiddleware.cjs";
-export type { CreateMethodMiddlewareOptions, MethodHandler, MethodHandlerImplementation, } from "./createMethodMiddleware.cjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.cjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.cjs";
 export { getUniqueId } from "./getUniqueId.cjs";
 export { createIdRemapMiddleware } from "./idRemapMiddleware.cjs";

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAClD,YAAY,EACV,8BAA8B,EAC9B,sBAAsB,GACvB,oCAAgC;AACjC,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAChE,YAAY,EACV,6BAA6B,EAC7B,aAAa,EACb,2BAA2B,GAC5B,qCAAiC;AAClC,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAC9D,YAAY,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,GAC3B,4BAAwB;AACzB,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAClD,YAAY,EACV,8BAA8B,EAC9B,sBAAsB,GACvB,oCAAgC;AACjC,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAChE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAC9D,YAAY,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,GAC3B,4BAAwB;AACzB,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B"}

package/dist/index.d.mts

@@ -1,8 +1,6 @@
 export { asV2Middleware } from "./asV2Middleware.mjs";
 export type { AsyncJsonRpcEngineNextCallback, AsyncJsonrpcMiddleware, } from "./createAsyncMiddleware.mjs";
 export { createAsyncMiddleware } from "./createAsyncMiddleware.mjs";
-export type { CreateMethodMiddlewareOptions, MethodHandler, MethodHandlerImplementation, } from "./createMethodMiddleware.mjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.mjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.mjs";
 export { getUniqueId } from "./getUniqueId.mjs";
 export { createIdRemapMiddleware } from "./idRemapMiddleware.mjs";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAClD,YAAY,EACV,8BAA8B,EAC9B,sBAAsB,GACvB,oCAAgC;AACjC,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAChE,YAAY,EACV,6BAA6B,EAC7B,aAAa,EACb,2BAA2B,GAC5B,qCAAiC;AAClC,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAC9D,YAAY,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,GAC3B,4BAAwB;AACzB,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAClD,YAAY,EACV,8BAA8B,EAC9B,sBAAsB,GACvB,oCAAgC;AACjC,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAChE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAC9D,YAAY,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,GAC3B,4BAAwB;AACzB,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B"}

package/dist/index.mjs

@@ -1,6 +1,5 @@
 export { asV2Middleware } from "./asV2Middleware.mjs";
 export { createAsyncMiddleware } from "./createAsyncMiddleware.mjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.mjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.mjs";
 export { getUniqueId } from "./getUniqueId.mjs";
 export { createIdRemapMiddleware } from "./idRemapMiddleware.mjs";

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAKlD,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAMhE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAS9D,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B","sourcesContent":["export { asV2Middleware } from './asV2Middleware';\nexport type {\n  AsyncJsonRpcEngineNextCallback,\n  AsyncJsonrpcMiddleware,\n} from './createAsyncMiddleware';\nexport { createAsyncMiddleware } from './createAsyncMiddleware';\nexport type {\n  CreateMethodMiddlewareOptions,\n  MethodHandler,\n  MethodHandlerImplementation,\n} from './createMethodMiddleware';\nexport { createMethodMiddleware } from './createMethodMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { getUniqueId } from './getUniqueId';\nexport { createIdRemapMiddleware } from './idRemapMiddleware';\nexport type {\n  JsonRpcEngineCallbackError,\n  JsonRpcEngineReturnHandler,\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n  JsonRpcMiddleware,\n  JsonRpcNotificationHandler,\n} from './JsonRpcEngine';\nexport { JsonRpcEngine } from './JsonRpcEngine';\nexport { mergeMiddleware } from './mergeMiddleware';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAyB;AAKlD,OAAO,EAAE,qBAAqB,EAAE,oCAAgC;AAChE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,WAAW,EAAE,0BAAsB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,gCAA4B;AAS9D,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,eAAe,EAAE,8BAA0B","sourcesContent":["export { asV2Middleware } from './asV2Middleware';\nexport type {\n  AsyncJsonRpcEngineNextCallback,\n  AsyncJsonrpcMiddleware,\n} from './createAsyncMiddleware';\nexport { createAsyncMiddleware } from './createAsyncMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { getUniqueId } from './getUniqueId';\nexport { createIdRemapMiddleware } from './idRemapMiddleware';\nexport type {\n  JsonRpcEngineCallbackError,\n  JsonRpcEngineReturnHandler,\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n  JsonRpcMiddleware,\n  JsonRpcNotificationHandler,\n} from './JsonRpcEngine';\nexport { JsonRpcEngine } from './JsonRpcEngine';\nexport { mergeMiddleware } from './mergeMiddleware';\n"]}

package/dist/v2/createMethodMiddleware.cjs

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMethodMiddleware = void 0;
+exports.selectHooks = exports.createMethodMiddleware = void 0;
 const messenger_1 = require("@metamask/messenger");
-const utils_1 = require("./utils.cjs");
 /**
  * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
  *
@@ -15,14 +14,15 @@ const utils_1 = require("./utils.cjs");
 function createMethodMiddleware(options) {
     const { messenger: rootMessenger } = options;
     const allHooks = options.hooks;
-    const expectedHookNames = new Set(Object.values(options.handlers).flatMap((handler) => handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : []));
-    (0, utils_1.assertExpectedHooks)(allHooks, expectedHookNames);
     const handlers = Object.entries(options.handlers).reduce((accumulator, [handlerName, handler]) => {
-        const handlerHooks = (0, utils_1.selectHooks)(allHooks, handler.hookNames) ?? {};
-        const handlerMessenger = (0, utils_1.createHandlerMessenger)({
+        const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};
+        const handlerMessenger = new messenger_1.Messenger({
             namespace: handlerName,
-            actionNames: handler.actionNames,
-            rootMessenger,
+            parent: rootMessenger,
+        });
+        rootMessenger.delegate({
+            actions: (handler.actionNames ?? []),
+            messenger: handlerMessenger,
         });
         accumulator[handlerName] = {
             implementation: handler.implementation,
@@ -41,4 +41,27 @@ function createMethodMiddleware(options) {
     };
 }
 exports.createMethodMiddleware = createMethodMiddleware;
+/**
+ * Returns the subset of the specified `hooks` that are included in the
+ * `hookNames` object. This is a Principle of Least Authority (POLA) measure
+ * to ensure that each RPC method implementation only has access to the
+ * API "hooks" it needs to do its job.
+ *
+ * @param hooks - The hooks to select from.
+ * @param hookNames - The names of the hooks to select.
+ * @returns The selected hooks.
+ * @template Hooks - The hooks to select from.
+ * @template HookName - The names of the hooks to select.
+ */
+function selectHooks(hooks, hookNames) {
+    if (hookNames) {
+        return Object.keys(hookNames).reduce((hookSubset, _hookName) => {
+            const hookName = _hookName;
+            hookSubset[hookName] = hooks[hookName];
+            return hookSubset;
+        }, {});
+    }
+    return undefined;
+}
+exports.selectHooks = selectHooks;
 //# sourceMappingURL=createMethodMiddleware.cjs.map

package/dist/v2/createMethodMiddleware.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createMethodMiddleware.cjs","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAIlE,uCAQiB;AAoFjB;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CAIpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAgC,CAAC;IAE1D,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CACvE,CACF,CAAC;IACF,IAAA,2BAAmB,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAEtD,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,IAAA,8BAAsB,EAE7C;YACA,SAAS,EAAE,WAAW;YACtB,WAAW,EAAE,OAAO,CAAC,WAER;YACb,aAAa;SACd,CAAC,CAAC;QAEH,WAAW,CAAC,WAAW,CAAC,GAAG;YACzB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC;AAhDD,wDAgDC","sourcesContent":["import { ActionConstraint, Messenger } from '@metamask/messenger';\n\nimport { JsonRpcMiddleware, Next } from './JsonRpcEngineV2';\nimport { ContextConstraint } from './MiddlewareContext';\nimport {\n  assertExpectedHooks,\n  createHandlerMessenger,\n  selectHooks,\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  UnionToIntersection,\n} from './utils';\n\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { messenger: Messenger<string, infer Actions> }\n    ? Actions\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { hooks: infer Hooks }\n    ? Hooks\n    : never\n  : never;\n\n/**\n * A `JsonRpcEngineV2` method middleware handler.\n */\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Parameters extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  Context extends ContextConstraint = ContextConstraint,\n> = {\n  implementation: (options: {\n    request: Readonly<JsonRpcRequest<Parameters>>;\n    context: Context;\n    next: Next<JsonRpcRequest>;\n    messenger: Messenger<string, MessengerActions>;\n    hooks: Hooks;\n  }) => Promise<Result> | Result;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    options: {\n      request: Readonly<JsonRpcRequest>;\n      context: ContextConstraint;\n      next: Next<JsonRpcRequest>;\n      messenger: unknown;\n      hooks: unknown;\n    },\n  ): Promise<Json> | Json;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\ntype CreateMethodMiddlewareBaseOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n};\n\n/**\n * Options for {@link createMethodMiddleware}.\n */\nexport type CreateMethodMiddlewareOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = CreateMethodMiddlewareBaseOptions<Handlers> &\n  ([HandlerActions<Handlers[keyof Handlers]>] extends [never]\n    ? {\n        messenger?: undefined;\n      }\n    : {\n        messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;\n      });\n\ntype ResolvedHandler = {\n  implementation: AnyMethodHandler['implementation'];\n  hooks: Record<string, unknown>;\n  messenger?: Messenger<string, ActionConstraint> | undefined;\n};\n\n/**\n * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.\n *\n * @param options The options.\n * @param options.handlers - The JSON-RPC method handler implementations.\n * @param options.messenger - The messenger to be used by the handlers.\n * @param options.hooks - The hooks to be used by the handlers.\n * @returns A JsonRpcEngineV2 middleware.\n */\nexport function createMethodMiddleware<\n  Handlers extends Record<string, AnyMethodHandler>,\n  Context extends ContextConstraint,\n>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcRequest, Json, Context> {\n  const { messenger: rootMessenger } = options;\n  const allHooks = options.hooks as Record<string, unknown>;\n\n  const expectedHookNames = new Set(\n    Object.values(options.handlers).flatMap((handler) =>\n      handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : [],\n    ),\n  );\n  assertExpectedHooks(allHooks, expectedHookNames);\n\n  const handlers = Object.entries(options.handlers).reduce<\n    Record<string, ResolvedHandler>\n  >((accumulator, [handlerName, handler]) => {\n    const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};\n    const handlerMessenger = createHandlerMessenger<\n      HandlerActions<Handlers[keyof Handlers]>\n    >({\n      namespace: handlerName,\n      actionNames: handler.actionNames as\n        | readonly HandlerActions<Handlers[keyof Handlers]>['type'][]\n        | undefined,\n      rootMessenger,\n    });\n\n    accumulator[handlerName] = {\n      implementation: handler.implementation,\n      hooks: handlerHooks,\n      messenger: handlerMessenger,\n    };\n    return accumulator;\n  }, {});\n\n  return ({ request, context, next }) => {\n    const handler = handlers[request.method];\n    if (handler === undefined) {\n      return next();\n    }\n\n    const { implementation, hooks, messenger } = handler;\n\n    return implementation({ request, context, next, hooks, messenger });\n  };\n}\n"]}
+{"version":3,"file":"createMethodMiddleware.cjs","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AA8ElE;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CAIpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAgC,CAAC;IAE1D,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAEtD,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,IAAI,qBAAS,CAKpC;YACA,SAAS,EAAE,WAAW;YACtB,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QAEH,aAAa,CAAC,QAAQ,CAAC;YACrB,OAAO,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAExB;YACX,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CAAC;QAEH,WAAW,CAAC,WAAW,CAAC,GAAG;YACzB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC;AAhDD,wDAgDC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,WAAW,CAIzB,KAAY,EACZ,SAAkC;IAElC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAClC,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE;YACxB,MAAM,QAAQ,GAAG,SAAqB,CAAC;YACvC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvC,OAAO,UAAU,CAAC;QACpB,CAAC,EACD,EAAE,CACsB,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAlBD,kCAkBC","sourcesContent":["import { ActionConstraint, Messenger } from '@metamask/messenger';\n\nimport { JsonRpcMiddleware, Next } from './JsonRpcEngineV2';\nimport { ContextConstraint } from './MiddlewareContext';\nimport {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  UnionToIntersection,\n} from './utils';\n\n// The helpers below seem excessive, but they are required for inference of hooks/actions.\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { messenger: Messenger<string, infer Actions> }\n    ? Actions\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { hooks: infer Hooks }\n    ? Hooks\n    : never\n  : never;\n\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Parameters extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  Context extends ContextConstraint = ContextConstraint,\n> = {\n  implementation: (options: {\n    request: Readonly<JsonRpcRequest<Parameters>>;\n    context: Context;\n    next: Next<JsonRpcRequest>;\n    messenger: Messenger<string, MessengerActions>;\n    hooks: Hooks;\n  }) => Promise<Result> | Result;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    options: {\n      request: Readonly<JsonRpcRequest>;\n      context: ContextConstraint;\n      next: Next<JsonRpcRequest>;\n      messenger: unknown;\n      hooks: unknown;\n    },\n  ): Promise<Json> | Json;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\nexport type CreateMethodMiddlewareOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;\n  hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n};\n\ntype ResolvedHandler = {\n  implementation: AnyMethodHandler['implementation'];\n  hooks: Record<string, unknown>;\n  messenger: Messenger<string, ActionConstraint>;\n};\n\n/**\n * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.\n *\n * @param options The options.\n * @param options.handlers - The JSON-RPC method handler implementations.\n * @param options.messenger - The messenger to be used by the handlers.\n * @param options.hooks - The hooks to be used by the handlers.\n * @returns A JsonRpcEngineV2 middleware.\n */\nexport function createMethodMiddleware<\n  Handlers extends Record<string, AnyMethodHandler>,\n  Context extends ContextConstraint,\n>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcRequest, Json, Context> {\n  const { messenger: rootMessenger } = options;\n  const allHooks = options.hooks as Record<string, unknown>;\n\n  const handlers = Object.entries(options.handlers).reduce<\n    Record<string, ResolvedHandler>\n  >((accumulator, [handlerName, handler]) => {\n    const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};\n    const handlerMessenger = new Messenger<\n      string,\n      HandlerActions<Handlers[keyof Handlers]>,\n      never,\n      typeof rootMessenger\n    >({\n      namespace: handlerName,\n      parent: rootMessenger,\n    });\n\n    rootMessenger.delegate({\n      actions: (handler.actionNames ?? []) as HandlerActions<\n        Handlers[keyof Handlers]\n      >['type'][],\n      messenger: handlerMessenger,\n    });\n\n    accumulator[handlerName] = {\n      implementation: handler.implementation,\n      hooks: handlerHooks,\n      messenger: handlerMessenger,\n    };\n    return accumulator;\n  }, {});\n\n  return ({ request, context, next }) => {\n    const handler = handlers[request.method];\n    if (handler === undefined) {\n      return next();\n    }\n\n    const { implementation, hooks, messenger } = handler;\n\n    return implementation({ request, context, next, hooks, messenger });\n  };\n}\n\n/**\n * Returns the subset of the specified `hooks` that are included in the\n * `hookNames` object. This is a Principle of Least Authority (POLA) measure\n * to ensure that each RPC method implementation only has access to the\n * API \"hooks\" it needs to do its job.\n *\n * @param hooks - The hooks to select from.\n * @param hookNames - The names of the hooks to select.\n * @returns The selected hooks.\n * @template Hooks - The hooks to select from.\n * @template HookName - The names of the hooks to select.\n */\nexport function selectHooks<\n  Hooks extends Record<string, unknown>,\n  HookName extends keyof Hooks,\n>(\n  hooks: Hooks,\n  hookNames?: Record<HookName, true>,\n): Pick<Hooks, HookName> | undefined {\n  if (hookNames) {\n    return Object.keys(hookNames).reduce<Partial<Pick<Hooks, HookName>>>(\n      (hookSubset, _hookName) => {\n        const hookName = _hookName as HookName;\n        hookSubset[hookName] = hooks[hookName];\n        return hookSubset;\n      },\n      {},\n    ) as Pick<Hooks, HookName>;\n  }\n  return undefined;\n}\n"]}

package/dist/v2/createMethodMiddleware.d.cts

@@ -12,9 +12,6 @@ type HandlerHooks<Handler> = Handler extends {
 } ? Options extends {
     hooks: infer Hooks;
 } ? Hooks : never : never;
-/**
- * A `JsonRpcEngineV2` method middleware handler.
- */
 export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Parameters extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, Context extends ContextConstraint = ContextConstraint> = {
     implementation: (options: {
         request: Readonly<JsonRpcRequest<Parameters>>;
@@ -45,18 +42,11 @@ type AnyMethodHandler = {
     hookNames?: Record<string, true>;
     actionNames?: readonly string[];
 };
-type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
+export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = {
     handlers: Handlers;
+    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
     hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
 };
-/**
- * Options for {@link createMethodMiddleware}.
- */
-export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = CreateMethodMiddlewareBaseOptions<Handlers> & ([HandlerActions<Handlers[keyof Handlers]>] extends [never] ? {
-    messenger?: undefined;
-} : {
-    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
-});
 /**
  * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
  *
@@ -67,5 +57,18 @@ export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMet
  * @returns A JsonRpcEngineV2 middleware.
  */
 export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>, Context extends ContextConstraint>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcRequest, Json, Context>;
+/**
+ * Returns the subset of the specified `hooks` that are included in the
+ * `hookNames` object. This is a Principle of Least Authority (POLA) measure
+ * to ensure that each RPC method implementation only has access to the
+ * API "hooks" it needs to do its job.
+ *
+ * @param hooks - The hooks to select from.
+ * @param hookNames - The names of the hooks to select.
+ * @returns The selected hooks.
+ * @template Hooks - The hooks to select from.
+ * @template HookName - The names of the hooks to select.
+ */
+export declare function selectHooks<Hooks extends Record<string, unknown>, HookName extends keyof Hooks>(hooks: Hooks, hookNames?: Record<HookName, true>): Pick<Hooks, HookName> | undefined;
 export {};
 //# sourceMappingURL=createMethodMiddleware.d.cts.map

package/dist/v2/createMethodMiddleware.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"createMethodMiddleware.d.cts","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createMethodMiddleware.d.cts","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/v2/createMethodMiddleware.d.mts

@@ -12,9 +12,6 @@ type HandlerHooks<Handler> = Handler extends {
 } ? Options extends {
     hooks: infer Hooks;
 } ? Hooks : never : never;
-/**
- * A `JsonRpcEngineV2` method middleware handler.
- */
 export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Parameters extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, Context extends ContextConstraint = ContextConstraint> = {
     implementation: (options: {
         request: Readonly<JsonRpcRequest<Parameters>>;
@@ -45,18 +42,11 @@ type AnyMethodHandler = {
     hookNames?: Record<string, true>;
     actionNames?: readonly string[];
 };
-type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
+export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = {
     handlers: Handlers;
+    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
     hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
 };
-/**
- * Options for {@link createMethodMiddleware}.
- */
-export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = CreateMethodMiddlewareBaseOptions<Handlers> & ([HandlerActions<Handlers[keyof Handlers]>] extends [never] ? {
-    messenger?: undefined;
-} : {
-    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
-});
 /**
  * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
  *
@@ -67,5 +57,18 @@ export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMet
  * @returns A JsonRpcEngineV2 middleware.
  */
 export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>, Context extends ContextConstraint>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcRequest, Json, Context>;
+/**
+ * Returns the subset of the specified `hooks` that are included in the
+ * `hookNames` object. This is a Principle of Least Authority (POLA) measure
+ * to ensure that each RPC method implementation only has access to the
+ * API "hooks" it needs to do its job.
+ *
+ * @param hooks - The hooks to select from.
+ * @param hookNames - The names of the hooks to select.
+ * @returns The selected hooks.
+ * @template Hooks - The hooks to select from.
+ * @template HookName - The names of the hooks to select.
+ */
+export declare function selectHooks<Hooks extends Record<string, unknown>, HookName extends keyof Hooks>(hooks: Hooks, hookNames?: Record<HookName, true>): Pick<Hooks, HookName> | undefined;
 export {};
 //# sourceMappingURL=createMethodMiddleware.d.mts.map

package/dist/v2/createMethodMiddleware.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"createMethodMiddleware.d.mts","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createMethodMiddleware.d.mts","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/v2/createMethodMiddleware.mjs

@@ -1,5 +1,4 @@
 import { Messenger } from "@metamask/messenger";
-import { assertExpectedHooks, createHandlerMessenger, selectHooks } from "./utils.mjs";
 /**
  * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
  *
@@ -12,14 +11,15 @@ import { assertExpectedHooks, createHandlerMessenger, selectHooks } from "./util
 export function createMethodMiddleware(options) {
     const { messenger: rootMessenger } = options;
     const allHooks = options.hooks;
-    const expectedHookNames = new Set(Object.values(options.handlers).flatMap((handler) => handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : []));
-    assertExpectedHooks(allHooks, expectedHookNames);
     const handlers = Object.entries(options.handlers).reduce((accumulator, [handlerName, handler]) => {
         const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};
-        const handlerMessenger = createHandlerMessenger({
+        const handlerMessenger = new Messenger({
             namespace: handlerName,
-            actionNames: handler.actionNames,
-            rootMessenger,
+            parent: rootMessenger,
+        });
+        rootMessenger.delegate({
+            actions: (handler.actionNames ?? []),
+            messenger: handlerMessenger,
         });
         accumulator[handlerName] = {
             implementation: handler.implementation,
@@ -37,4 +37,26 @@ export function createMethodMiddleware(options) {
         return implementation({ request, context, next, hooks, messenger });
     };
 }
+/**
+ * Returns the subset of the specified `hooks` that are included in the
+ * `hookNames` object. This is a Principle of Least Authority (POLA) measure
+ * to ensure that each RPC method implementation only has access to the
+ * API "hooks" it needs to do its job.
+ *
+ * @param hooks - The hooks to select from.
+ * @param hookNames - The names of the hooks to select.
+ * @returns The selected hooks.
+ * @template Hooks - The hooks to select from.
+ * @template HookName - The names of the hooks to select.
+ */
+export function selectHooks(hooks, hookNames) {
+    if (hookNames) {
+        return Object.keys(hookNames).reduce((hookSubset, _hookName) => {
+            const hookName = _hookName;
+            hookSubset[hookName] = hooks[hookName];
+            return hookSubset;
+        }, {});
+    }
+    return undefined;
+}
 //# sourceMappingURL=createMethodMiddleware.mjs.map

package/dist/v2/createMethodMiddleware.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createMethodMiddleware.mjs","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,4BAA4B;AAIlE,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EAKZ,oBAAgB;AAoFjB;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAIpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAgC,CAAC;IAE1D,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CACvE,CACF,CAAC;IACF,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAEtD,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,sBAAsB,CAE7C;YACA,SAAS,EAAE,WAAW;YACtB,WAAW,EAAE,OAAO,CAAC,WAER;YACb,aAAa;SACd,CAAC,CAAC;QAEH,WAAW,CAAC,WAAW,CAAC,GAAG;YACzB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { ActionConstraint, Messenger } from '@metamask/messenger';\n\nimport { JsonRpcMiddleware, Next } from './JsonRpcEngineV2';\nimport { ContextConstraint } from './MiddlewareContext';\nimport {\n  assertExpectedHooks,\n  createHandlerMessenger,\n  selectHooks,\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  UnionToIntersection,\n} from './utils';\n\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { messenger: Messenger<string, infer Actions> }\n    ? Actions\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { hooks: infer Hooks }\n    ? Hooks\n    : never\n  : never;\n\n/**\n * A `JsonRpcEngineV2` method middleware handler.\n */\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Parameters extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  Context extends ContextConstraint = ContextConstraint,\n> = {\n  implementation: (options: {\n    request: Readonly<JsonRpcRequest<Parameters>>;\n    context: Context;\n    next: Next<JsonRpcRequest>;\n    messenger: Messenger<string, MessengerActions>;\n    hooks: Hooks;\n  }) => Promise<Result> | Result;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    options: {\n      request: Readonly<JsonRpcRequest>;\n      context: ContextConstraint;\n      next: Next<JsonRpcRequest>;\n      messenger: unknown;\n      hooks: unknown;\n    },\n  ): Promise<Json> | Json;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\ntype CreateMethodMiddlewareBaseOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n};\n\n/**\n * Options for {@link createMethodMiddleware}.\n */\nexport type CreateMethodMiddlewareOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = CreateMethodMiddlewareBaseOptions<Handlers> &\n  ([HandlerActions<Handlers[keyof Handlers]>] extends [never]\n    ? {\n        messenger?: undefined;\n      }\n    : {\n        messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;\n      });\n\ntype ResolvedHandler = {\n  implementation: AnyMethodHandler['implementation'];\n  hooks: Record<string, unknown>;\n  messenger?: Messenger<string, ActionConstraint> | undefined;\n};\n\n/**\n * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.\n *\n * @param options The options.\n * @param options.handlers - The JSON-RPC method handler implementations.\n * @param options.messenger - The messenger to be used by the handlers.\n * @param options.hooks - The hooks to be used by the handlers.\n * @returns A JsonRpcEngineV2 middleware.\n */\nexport function createMethodMiddleware<\n  Handlers extends Record<string, AnyMethodHandler>,\n  Context extends ContextConstraint,\n>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcRequest, Json, Context> {\n  const { messenger: rootMessenger } = options;\n  const allHooks = options.hooks as Record<string, unknown>;\n\n  const expectedHookNames = new Set(\n    Object.values(options.handlers).flatMap((handler) =>\n      handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : [],\n    ),\n  );\n  assertExpectedHooks(allHooks, expectedHookNames);\n\n  const handlers = Object.entries(options.handlers).reduce<\n    Record<string, ResolvedHandler>\n  >((accumulator, [handlerName, handler]) => {\n    const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};\n    const handlerMessenger = createHandlerMessenger<\n      HandlerActions<Handlers[keyof Handlers]>\n    >({\n      namespace: handlerName,\n      actionNames: handler.actionNames as\n        | readonly HandlerActions<Handlers[keyof Handlers]>['type'][]\n        | undefined,\n      rootMessenger,\n    });\n\n    accumulator[handlerName] = {\n      implementation: handler.implementation,\n      hooks: handlerHooks,\n      messenger: handlerMessenger,\n    };\n    return accumulator;\n  }, {});\n\n  return ({ request, context, next }) => {\n    const handler = handlers[request.method];\n    if (handler === undefined) {\n      return next();\n    }\n\n    const { implementation, hooks, messenger } = handler;\n\n    return implementation({ request, context, next, hooks, messenger });\n  };\n}\n"]}
+{"version":3,"file":"createMethodMiddleware.mjs","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,4BAA4B;AA8ElE;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAIpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAgC,CAAC;IAE1D,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAEtD,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAKpC;YACA,SAAS,EAAE,WAAW;YACtB,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QAEH,aAAa,CAAC,QAAQ,CAAC;YACrB,OAAO,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAExB;YACX,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CAAC;QAEH,WAAW,CAAC,WAAW,CAAC,GAAG;YACzB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAErD,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CAIzB,KAAY,EACZ,SAAkC;IAElC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAClC,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE;YACxB,MAAM,QAAQ,GAAG,SAAqB,CAAC;YACvC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvC,OAAO,UAAU,CAAC;QACpB,CAAC,EACD,EAAE,CACsB,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import { ActionConstraint, Messenger } from '@metamask/messenger';\n\nimport { JsonRpcMiddleware, Next } from './JsonRpcEngineV2';\nimport { ContextConstraint } from './MiddlewareContext';\nimport {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  UnionToIntersection,\n} from './utils';\n\n// The helpers below seem excessive, but they are required for inference of hooks/actions.\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { messenger: Messenger<string, infer Actions> }\n    ? Actions\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (options: infer Options) => unknown;\n}\n  ? Options extends { hooks: infer Hooks }\n    ? Hooks\n    : never\n  : never;\n\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Parameters extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  Context extends ContextConstraint = ContextConstraint,\n> = {\n  implementation: (options: {\n    request: Readonly<JsonRpcRequest<Parameters>>;\n    context: Context;\n    next: Next<JsonRpcRequest>;\n    messenger: Messenger<string, MessengerActions>;\n    hooks: Hooks;\n  }) => Promise<Result> | Result;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    options: {\n      request: Readonly<JsonRpcRequest>;\n      context: ContextConstraint;\n      next: Next<JsonRpcRequest>;\n      messenger: unknown;\n      hooks: unknown;\n    },\n  ): Promise<Json> | Json;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\nexport type CreateMethodMiddlewareOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;\n  hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n};\n\ntype ResolvedHandler = {\n  implementation: AnyMethodHandler['implementation'];\n  hooks: Record<string, unknown>;\n  messenger: Messenger<string, ActionConstraint>;\n};\n\n/**\n * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.\n *\n * @param options The options.\n * @param options.handlers - The JSON-RPC method handler implementations.\n * @param options.messenger - The messenger to be used by the handlers.\n * @param options.hooks - The hooks to be used by the handlers.\n * @returns A JsonRpcEngineV2 middleware.\n */\nexport function createMethodMiddleware<\n  Handlers extends Record<string, AnyMethodHandler>,\n  Context extends ContextConstraint,\n>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcRequest, Json, Context> {\n  const { messenger: rootMessenger } = options;\n  const allHooks = options.hooks as Record<string, unknown>;\n\n  const handlers = Object.entries(options.handlers).reduce<\n    Record<string, ResolvedHandler>\n  >((accumulator, [handlerName, handler]) => {\n    const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};\n    const handlerMessenger = new Messenger<\n      string,\n      HandlerActions<Handlers[keyof Handlers]>,\n      never,\n      typeof rootMessenger\n    >({\n      namespace: handlerName,\n      parent: rootMessenger,\n    });\n\n    rootMessenger.delegate({\n      actions: (handler.actionNames ?? []) as HandlerActions<\n        Handlers[keyof Handlers]\n      >['type'][],\n      messenger: handlerMessenger,\n    });\n\n    accumulator[handlerName] = {\n      implementation: handler.implementation,\n      hooks: handlerHooks,\n      messenger: handlerMessenger,\n    };\n    return accumulator;\n  }, {});\n\n  return ({ request, context, next }) => {\n    const handler = handlers[request.method];\n    if (handler === undefined) {\n      return next();\n    }\n\n    const { implementation, hooks, messenger } = handler;\n\n    return implementation({ request, context, next, hooks, messenger });\n  };\n}\n\n/**\n * Returns the subset of the specified `hooks` that are included in the\n * `hookNames` object. This is a Principle of Least Authority (POLA) measure\n * to ensure that each RPC method implementation only has access to the\n * API \"hooks\" it needs to do its job.\n *\n * @param hooks - The hooks to select from.\n * @param hookNames - The names of the hooks to select.\n * @returns The selected hooks.\n * @template Hooks - The hooks to select from.\n * @template HookName - The names of the hooks to select.\n */\nexport function selectHooks<\n  Hooks extends Record<string, unknown>,\n  HookName extends keyof Hooks,\n>(\n  hooks: Hooks,\n  hookNames?: Record<HookName, true>,\n): Pick<Hooks, HookName> | undefined {\n  if (hookNames) {\n    return Object.keys(hookNames).reduce<Partial<Pick<Hooks, HookName>>>(\n      (hookSubset, _hookName) => {\n        const hookName = _hookName as HookName;\n        hookSubset[hookName] = hooks[hookName];\n        return hookSubset;\n      },\n      {},\n    ) as Pick<Hooks, HookName>;\n  }\n  return undefined;\n}\n"]}

package/dist/v2/index.cjs

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectHooks = exports.JsonRpcEngineError = exports.isRequest = exports.isNotification = exports.MiddlewareContext = exports.JsonRpcServer = exports.JsonRpcEngineV2 = exports.createScaffoldMiddleware = exports.createOriginMiddleware = exports.createMethodMiddleware = exports.getUniqueId = exports.asLegacyMiddleware = void 0;
+exports.JsonRpcEngineError = exports.isRequest = exports.isNotification = exports.MiddlewareContext = exports.JsonRpcServer = exports.JsonRpcEngineV2 = exports.createScaffoldMiddleware = exports.createOriginMiddleware = exports.createMethodMiddleware = exports.selectHooks = exports.getUniqueId = exports.asLegacyMiddleware = void 0;
 var asLegacyMiddleware_1 = require("./asLegacyMiddleware.cjs");
 Object.defineProperty(exports, "asLegacyMiddleware", { enumerable: true, get: function () { return asLegacyMiddleware_1.asLegacyMiddleware; } });
 var getUniqueId_1 = require("../getUniqueId.cjs");
 Object.defineProperty(exports, "getUniqueId", { enumerable: true, get: function () { return getUniqueId_1.getUniqueId; } });
 var createMethodMiddleware_1 = require("./createMethodMiddleware.cjs");
+Object.defineProperty(exports, "selectHooks", { enumerable: true, get: function () { return createMethodMiddleware_1.selectHooks; } });
 Object.defineProperty(exports, "createMethodMiddleware", { enumerable: true, get: function () { return createMethodMiddleware_1.createMethodMiddleware; } });
 var createOriginMiddleware_1 = require("./createOriginMiddleware.cjs");
 Object.defineProperty(exports, "createOriginMiddleware", { enumerable: true, get: function () { return createOriginMiddleware_1.createOriginMiddleware; } });
@@ -21,5 +22,4 @@ var utils_1 = require("./utils.cjs");
 Object.defineProperty(exports, "isNotification", { enumerable: true, get: function () { return utils_1.isNotification; } });
 Object.defineProperty(exports, "isRequest", { enumerable: true, get: function () { return utils_1.isRequest; } });
 Object.defineProperty(exports, "JsonRpcEngineError", { enumerable: true, get: function () { return utils_1.JsonRpcEngineError; } });
-Object.defineProperty(exports, "selectHooks", { enumerable: true, get: function () { return utils_1.selectHooks; } });
 //# sourceMappingURL=index.cjs.map

package/dist/v2/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,kDAA6C;AAApC,0GAAA,WAAW,OAAA;AACpB,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAE/B,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA;AACjC,yDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAWxB,qDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,6DAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAE1B,qCAKiB;AAJf,uGAAA,cAAc,OAAA;AACd,kGAAA,SAAS,OAAA;AACT,2GAAA,kBAAkB,OAAA;AAClB,oGAAA,WAAW,OAAA","sourcesContent":["export { asLegacyMiddleware } from './asLegacyMiddleware';\nexport { getUniqueId } from '../getUniqueId';\nexport { createMethodMiddleware } from './createMethodMiddleware';\nexport type { MethodHandler } from './createMethodMiddleware';\nexport { createOriginMiddleware } from './createOriginMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nexport type {\n  JsonRpcMiddleware,\n  HandleOptions,\n  MergedContextOf,\n  MiddlewareParams,\n  MiddlewareConstraint,\n  Next,\n  RequestOf,\n  ResultConstraint,\n} from './JsonRpcEngineV2';\nexport { JsonRpcServer } from './JsonRpcServer';\nexport { MiddlewareContext } from './MiddlewareContext';\nexport type { EmptyContext, ContextConstraint } from './MiddlewareContext';\nexport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  selectHooks,\n} from './utils';\nexport type {\n  Json,\n  JsonRpcCall,\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from './utils';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,kDAA6C;AAApC,0GAAA,WAAW,OAAA;AACpB,uEAA+E;AAAtE,qHAAA,WAAW,OAAA;AAAE,gIAAA,sBAAsB,OAAA;AAE5C,uEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,2EAAsE;AAA7D,oIAAA,wBAAwB,OAAA;AACjC,yDAAoD;AAA3C,kHAAA,eAAe,OAAA;AAWxB,qDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,6DAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAE1B,qCAAwE;AAA/D,uGAAA,cAAc,OAAA;AAAE,kGAAA,SAAS,OAAA;AAAE,2GAAA,kBAAkB,OAAA","sourcesContent":["export { asLegacyMiddleware } from './asLegacyMiddleware';\nexport { getUniqueId } from '../getUniqueId';\nexport { selectHooks, createMethodMiddleware } from './createMethodMiddleware';\nexport type { MethodHandler } from './createMethodMiddleware';\nexport { createOriginMiddleware } from './createOriginMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nexport type {\n  JsonRpcMiddleware,\n  HandleOptions,\n  MergedContextOf,\n  MiddlewareParams,\n  MiddlewareConstraint,\n  Next,\n  RequestOf,\n  ResultConstraint,\n} from './JsonRpcEngineV2';\nexport { JsonRpcServer } from './JsonRpcServer';\nexport { MiddlewareContext } from './MiddlewareContext';\nexport type { EmptyContext, ContextConstraint } from './MiddlewareContext';\nexport { isNotification, isRequest, JsonRpcEngineError } from './utils';\nexport type {\n  Json,\n  JsonRpcCall,\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from './utils';\n"]}

package/dist/v2/index.d.cts

@@ -1,6 +1,6 @@
 export { asLegacyMiddleware } from "./asLegacyMiddleware.cjs";
 export { getUniqueId } from "../getUniqueId.cjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.cjs";
+export { selectHooks, createMethodMiddleware } from "./createMethodMiddleware.cjs";
 export type { MethodHandler } from "./createMethodMiddleware.cjs";
 export { createOriginMiddleware } from "./createOriginMiddleware.cjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.cjs";
@@ -9,6 +9,6 @@ export type { JsonRpcMiddleware, HandleOptions, MergedContextOf, MiddlewareParam
 export { JsonRpcServer } from "./JsonRpcServer.cjs";
 export { MiddlewareContext } from "./MiddlewareContext.cjs";
 export type { EmptyContext, ContextConstraint } from "./MiddlewareContext.cjs";
-export { isNotification, isRequest, JsonRpcEngineError, selectHooks, } from "./utils.cjs";
+export { isNotification, isRequest, JsonRpcEngineError } from "./utils.cjs";
 export type { Json, JsonRpcCall, JsonRpcNotification, JsonRpcParams, JsonRpcRequest, } from "./utils.cjs";
 //# sourceMappingURL=index.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,YAAY,EAAE,aAAa,EAAE,qCAAiC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AACpD,YAAY,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,IAAI,EACJ,SAAS,EACT,gBAAgB,GACjB,8BAA0B;AAC3B,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AACxD,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,gCAA4B;AAC3E,OAAO,EACL,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,WAAW,GACZ,oBAAgB;AACjB,YAAY,EACV,IAAI,EACJ,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,GACf,oBAAgB"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,qCAAiC;AAC/E,YAAY,EAAE,aAAa,EAAE,qCAAiC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AACpD,YAAY,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,IAAI,EACJ,SAAS,EACT,gBAAgB,GACjB,8BAA0B;AAC3B,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AACxD,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,gCAA4B;AAC3E,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,kBAAkB,EAAE,oBAAgB;AACxE,YAAY,EACV,IAAI,EACJ,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,GACf,oBAAgB"}

package/dist/v2/index.d.mts

@@ -1,6 +1,6 @@
 export { asLegacyMiddleware } from "./asLegacyMiddleware.mjs";
 export { getUniqueId } from "../getUniqueId.mjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.mjs";
+export { selectHooks, createMethodMiddleware } from "./createMethodMiddleware.mjs";
 export type { MethodHandler } from "./createMethodMiddleware.mjs";
 export { createOriginMiddleware } from "./createOriginMiddleware.mjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.mjs";
@@ -9,6 +9,6 @@ export type { JsonRpcMiddleware, HandleOptions, MergedContextOf, MiddlewareParam
 export { JsonRpcServer } from "./JsonRpcServer.mjs";
 export { MiddlewareContext } from "./MiddlewareContext.mjs";
 export type { EmptyContext, ContextConstraint } from "./MiddlewareContext.mjs";
-export { isNotification, isRequest, JsonRpcEngineError, selectHooks, } from "./utils.mjs";
+export { isNotification, isRequest, JsonRpcEngineError } from "./utils.mjs";
 export type { Json, JsonRpcCall, JsonRpcNotification, JsonRpcParams, JsonRpcRequest, } from "./utils.mjs";
 //# sourceMappingURL=index.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,YAAY,EAAE,aAAa,EAAE,qCAAiC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AACpD,YAAY,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,IAAI,EACJ,SAAS,EACT,gBAAgB,GACjB,8BAA0B;AAC3B,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AACxD,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,gCAA4B;AAC3E,OAAO,EACL,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,WAAW,GACZ,oBAAgB;AACjB,YAAY,EACV,IAAI,EACJ,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,GACf,oBAAgB"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,qCAAiC;AAC/E,YAAY,EAAE,aAAa,EAAE,qCAAiC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AACpD,YAAY,EACV,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,IAAI,EACJ,SAAS,EACT,gBAAgB,GACjB,8BAA0B;AAC3B,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AACxD,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,gCAA4B;AAC3E,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,kBAAkB,EAAE,oBAAgB;AACxE,YAAY,EACV,IAAI,EACJ,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,GACf,oBAAgB"}

package/dist/v2/index.mjs

@@ -1,10 +1,10 @@
 export { asLegacyMiddleware } from "./asLegacyMiddleware.mjs";
 export { getUniqueId } from "../getUniqueId.mjs";
-export { createMethodMiddleware } from "./createMethodMiddleware.mjs";
+export { selectHooks, createMethodMiddleware } from "./createMethodMiddleware.mjs";
 export { createOriginMiddleware } from "./createOriginMiddleware.mjs";
 export { createScaffoldMiddleware } from "./createScaffoldMiddleware.mjs";
 export { JsonRpcEngineV2 } from "./JsonRpcEngineV2.mjs";
 export { JsonRpcServer } from "./JsonRpcServer.mjs";
 export { MiddlewareContext } from "./MiddlewareContext.mjs";
-export { isNotification, isRequest, JsonRpcEngineError, selectHooks } from "./utils.mjs";
+export { isNotification, isRequest, JsonRpcEngineError } from "./utils.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/v2/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAElE,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAWpD,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AAExD,OAAO,EACL,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,WAAW,EACZ,oBAAgB","sourcesContent":["export { asLegacyMiddleware } from './asLegacyMiddleware';\nexport { getUniqueId } from '../getUniqueId';\nexport { createMethodMiddleware } from './createMethodMiddleware';\nexport type { MethodHandler } from './createMethodMiddleware';\nexport { createOriginMiddleware } from './createOriginMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nexport type {\n  JsonRpcMiddleware,\n  HandleOptions,\n  MergedContextOf,\n  MiddlewareParams,\n  MiddlewareConstraint,\n  Next,\n  RequestOf,\n  ResultConstraint,\n} from './JsonRpcEngineV2';\nexport { JsonRpcServer } from './JsonRpcServer';\nexport { MiddlewareContext } from './MiddlewareContext';\nexport type { EmptyContext, ContextConstraint } from './MiddlewareContext';\nexport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  selectHooks,\n} from './utils';\nexport type {\n  Json,\n  JsonRpcCall,\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from './utils';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,EAAE,WAAW,EAAE,2BAAuB;AAC7C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,qCAAiC;AAE/E,OAAO,EAAE,sBAAsB,EAAE,qCAAiC;AAClE,OAAO,EAAE,wBAAwB,EAAE,uCAAmC;AACtE,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAWpD,OAAO,EAAE,aAAa,EAAE,4BAAwB;AAChD,OAAO,EAAE,iBAAiB,EAAE,gCAA4B;AAExD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,kBAAkB,EAAE,oBAAgB","sourcesContent":["export { asLegacyMiddleware } from './asLegacyMiddleware';\nexport { getUniqueId } from '../getUniqueId';\nexport { selectHooks, createMethodMiddleware } from './createMethodMiddleware';\nexport type { MethodHandler } from './createMethodMiddleware';\nexport { createOriginMiddleware } from './createOriginMiddleware';\nexport { createScaffoldMiddleware } from './createScaffoldMiddleware';\nexport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nexport type {\n  JsonRpcMiddleware,\n  HandleOptions,\n  MergedContextOf,\n  MiddlewareParams,\n  MiddlewareConstraint,\n  Next,\n  RequestOf,\n  ResultConstraint,\n} from './JsonRpcEngineV2';\nexport { JsonRpcServer } from './JsonRpcServer';\nexport { MiddlewareContext } from './MiddlewareContext';\nexport type { EmptyContext, ContextConstraint } from './MiddlewareContext';\nexport { isNotification, isRequest, JsonRpcEngineError } from './utils';\nexport type {\n  Json,\n  JsonRpcCall,\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from './utils';\n"]}

package/dist/v2/utils.cjs

@@ -1,8 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHandlerMessenger = exports.assertExpectedHooks = exports.selectHooks = exports.JsonRpcEngineError = exports.isInstance = exports.stringify = exports.isNotification = exports.isRequest = void 0;
-const messenger_1 = require("@metamask/messenger");
+exports.JsonRpcEngineError = exports.isInstance = exports.stringify = exports.isNotification = exports.isRequest = void 0;
 const utils_1 = require("@metamask/utils");
 const isRequest = (message) => (0, utils_1.hasProperty)(message, 'id');
 exports.isRequest = isRequest;
@@ -50,78 +49,4 @@ class JsonRpcEngineError extends Error {
 }
 exports.JsonRpcEngineError = JsonRpcEngineError;
 _a = JsonRpcEngineErrorSymbol;
-// Method middleware utils
-/**
- * Returns the subset of the specified `hooks` that are included in the
- * `hookNames` object. This is a Principle of Least Authority (POLA) measure
- * to ensure that each RPC method implementation only has access to the
- * API "hooks" it needs to do its job.
- *
- * @param hooks - The hooks to select from.
- * @param hookNames - The names of the hooks to select.
- * @returns The selected hooks, or `undefined` if `hookNames` is not provided.
- * @template Hooks - The hooks to select from.
- * @template HookName - The names of the hooks to select.
- */
-function selectHooks(hooks, hookNames) {
-    if (hookNames) {
-        return Object.keys(hookNames).reduce((subset, name) => {
-            const hookName = name;
-            subset[hookName] = hooks[hookName];
-            return subset;
-        }, {});
-    }
-    return undefined;
-}
-exports.selectHooks = selectHooks;
-/**
- * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.
- * Throws on any missing hooks, then on any extraneous hooks.
- *
- * @param hooks - The hooks object to validate.
- * @param expectedHookNames - The expected hook names.
- */
-function assertExpectedHooks(hooks, expectedHookNames) {
-    const missingHookNames = [];
-    expectedHookNames.forEach((hookName) => {
-        if (!(0, utils_1.hasProperty)(hooks, hookName)) {
-            missingHookNames.push(hookName);
-        }
-    });
-    if (missingHookNames.length > 0) {
-        throw new Error(`Missing expected hooks:\n\n${missingHookNames.join('\n')}\n`);
-    }
-    const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter((hookName) => !expectedHookNames.has(hookName));
-    if (extraneousHookNames.length > 0) {
-        throw new Error(`Received unexpected hooks:\n\n${extraneousHookNames.join('\n')}\n`);
-    }
-}
-exports.assertExpectedHooks = assertExpectedHooks;
-/**
- * Creates a per-handler messenger namespaced to `namespace`, and delegates the
- * specified `actionNames` from `rootMessenger` to it. This lets each handler
- * call only the actions it declared, per POLA.
- *
- * @param options - The options.
- * @param options.namespace - The namespace for the handler messenger.
- * @param options.actionNames - Actions to delegate from the root messenger.
- * @param options.rootMessenger - The root messenger to delegate from. Required
- * when `actionNames` are provided.
- * @returns The per-handler messenger.
- */
-function createHandlerMessenger({ namespace, actionNames, rootMessenger, }) {
-    if (!actionNames) {
-        return undefined;
-    }
-    if (!rootMessenger) {
-        throw new Error('A messenger is required when a handler declares actionNames.');
-    }
-    const handlerMessenger = new messenger_1.Messenger({ namespace, parent: rootMessenger });
-    rootMessenger.delegate({
-        actions: actionNames,
-        messenger: handlerMessenger,
-    });
-    return handlerMessenger;
-}
-exports.createHandlerMessenger = createHandlerMessenger;
 //# sourceMappingURL=utils.cjs.map