@metamask-previews/json-rpc-engine 10.2.4-preview-95a687acf → 10.3.0-preview-53e60e1a5

package/CHANGELOG.md

@@ -7,11 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.3.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))
+- Add `createMethodMiddleware` utility to `v2` ([#8506](https://github.com/MetaMask/core/pull/8506), [#8583](https://github.com/MetaMask/core/pull/8583))
   - 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`.
 
 ### Changed
 
@@ -112,7 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     ["Are the Types Wrong?"](https://arethetypeswrong.github.io/) tool as
     ["masquerading as CJS"](https://github.com/arethetypeswrong/arethetypeswrong.github.io/blob/main/docs/problems/FalseCJS.md).
     All of the ATTW checks now pass.
-- Remove chunk files ([#4648](https://github.com/MetaMask/core/pull/4648)).
+- Remove chunk files. ([#4648](https://github.com/MetaMask/core/pull/4648))
   - Previously, the build tool we used to generate JavaScript files extracted
     common code to "chunk" files. While this was intended to make this package
     more tree-shakeable, it also made debugging more difficult for our
@@ -292,7 +298,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     This change may affect consumers that depend on the eager execution of middleware _during_ request processing, _outside of_ middleware functions and request handlers.
     - In general, it is a bad practice to work with state that depends on middleware execution, while the middleware are executing.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.2.4...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.3.0...HEAD
+[10.3.0]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.2.4...@metamask/json-rpc-engine@10.3.0
 [10.2.4]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.2.3...@metamask/json-rpc-engine@10.2.4
 [10.2.3]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.2.2...@metamask/json-rpc-engine@10.2.3
 [10.2.2]: https://github.com/MetaMask/core/compare/@metamask/json-rpc-engine@10.2.1...@metamask/json-rpc-engine@10.2.2

package/dist/createMethodMiddleware.cjs

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMethodMiddleware = void 0;
+const rpc_errors_1 = require("@metamask/rpc-errors");
+const utils_1 = require("./v2/utils.cjs");
+/**
+ * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ * @param options The options.
+ * @param options.handlers - The JSON-RPC method handler implementations.
+ * @param options.messenger - The messenger to be used by the handlers.
+ * @param options.hooks - The hooks to be used by the handlers.
+ * @returns A JsonRpcEngineV2 middleware.
+ */
+function createMethodMiddleware(options) {
+    const { messenger: rootMessenger, onError } = 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)({
+            namespace: handlerName,
+            actionNames: handler.actionNames,
+            rootMessenger,
+        });
+        accumulator[handlerName] = {
+            implementation: handler.implementation,
+            hooks: handlerHooks,
+            messenger: handlerMessenger,
+        };
+        return accumulator;
+    }, {});
+    // This should technically use createAsyncMiddleware, but we get around this by catching
+    // all handler errors.
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    return async (req, res, next, end) => {
+        const handler = handlers[req.method];
+        if (!handler) {
+            return next();
+        }
+        const { implementation, hooks: handlerHooks, messenger } = handler;
+        try {
+            return await implementation(req, res, next, end, handlerHooks, messenger);
+        }
+        catch (error) {
+            onError?.(error, req);
+            return end(error instanceof Error
+                ? error
+                : rpc_errors_1.rpcErrors.internal({ data: error }));
+        }
+    };
+}
+exports.createMethodMiddleware = createMethodMiddleware;
+//# sourceMappingURL=createMethodMiddleware.cjs.map

package/dist/createMethodMiddleware.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"createMethodMiddleware.cjs","sourceRoot":"","sources":["../src/createMethodMiddleware.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAajD,0CAKoB;AAwIpB;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAGpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtD,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,wFAAwF;IACxF,sBAAsB;IACtB,kEAAkE;IAClE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACnE,IAAI,CAAC;YACH,OAAO,MAAM,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACtB,OAAO,GAAG,CACR,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,sBAAS,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAa,EAAE,CAAC,CAChD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AA1DD,wDA0DC","sourcesContent":["import type { ActionConstraint } from '@metamask/messenger';\nimport type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  JsonRpcMiddleware,\n} from './JsonRpcEngine';\nimport {\n  assertExpectedHooks,\n  createHandlerMessenger,\n  selectHooks,\n  UnionToIntersection,\n} from './v2/utils';\n\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      infer HandlerMessenger,\n    ]\n    ? HandlerMessenger extends Messenger<string, infer Actions>\n      ? Actions\n      : never\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      infer ArgHooks,\n      ...unknown[],\n    ]\n    ? ArgHooks extends Record<string, unknown>\n      ? ArgHooks\n      : never\n    : never\n  : never;\n\n/**\n * A {@link MethodHandler} implementation.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandlerImplementation<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = (\n  req: JsonRpcRequest<Params> & RequestExtras,\n  res: PendingJsonRpcResponse<Result>,\n  next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: Hooks,\n  messenger: Messenger<string, MessengerActions>,\n) => Promise<void> | void;\n\n/**\n * A handler for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = {\n  implementation: MethodHandlerImplementation<\n    Hooks,\n    MessengerActions,\n    Params,\n    Result,\n    RequestExtras\n  >;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: readonly MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n    hooks: unknown,\n    messenger: unknown,\n  ): Promise<void> | void;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\ntype CreateMethodMiddlewareBaseOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  // Due to a quirk of TypeScript's inference over generics, the hooks property must\n  // be present even if no hooks are needed. Otherwise, TypeScript will fail to infer\n  // the correct type for the messenger property. `Record<string, never>` is the\n  // (hopefully) least confusing way to satisfy this requirement.\n  hooks: [HandlerHooks<Handlers[keyof Handlers]>] extends [never]\n    ? Record<string, never>\n    : UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n  /**\n   * Called when a handler throws, before the error is forwarded to `end`.\n   * Intended for logging; must not throw.\n   */\n  onError?: (error: unknown, request: JsonRpcRequest) => void;\n};\n\n/**\n * Options for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\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 * @deprecated Use the v2 `createMethodMiddleware` instead.\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>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcParams, Json> {\n  const { messenger: rootMessenger, onError } = 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  // This should technically use createAsyncMiddleware, but we get around this by catching\n  // all handler errors.\n  // eslint-disable-next-line @typescript-eslint/no-misused-promises\n  return async (req, res, next, end) => {\n    const handler = handlers[req.method];\n    if (!handler) {\n      return next();\n    }\n\n    const { implementation, hooks: handlerHooks, messenger } = handler;\n    try {\n      return await implementation(req, res, next, end, handlerHooks, messenger);\n    } catch (error) {\n      onError?.(error, req);\n      return end(\n        error instanceof Error\n          ? error\n          : rpcErrors.internal({ data: error as Json }),\n      );\n    }\n  };\n}\n"]}

package/dist/createMethodMiddleware.d.cts

@@ -0,0 +1,86 @@
+import type { ActionConstraint } from "@metamask/messenger";
+import type { Messenger } from "@metamask/messenger";
+import type { Json, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, JsonRpcMiddleware } from "./JsonRpcEngine.cjs";
+import { UnionToIntersection } from "./v2/utils.cjs";
+type HandlerActions<Handler> = Handler extends {
+    implementation: (...args: infer Args) => unknown;
+} ? Args extends [
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    infer HandlerMessenger
+] ? HandlerMessenger extends Messenger<string, infer Actions> ? Actions : never : never : never;
+type HandlerHooks<Handler> = Handler extends {
+    implementation: (...args: infer Args) => unknown;
+} ? Args extends [
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    infer ArgHooks,
+    ...unknown[]
+] ? ArgHooks extends Record<string, unknown> ? ArgHooks : never : never : never;
+/**
+ * A {@link MethodHandler} implementation.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+export type MethodHandlerImplementation<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = (req: JsonRpcRequest<Params> & RequestExtras, res: PendingJsonRpcResponse<Result>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Hooks, messenger: Messenger<string, MessengerActions>) => Promise<void> | void;
+/**
+ * A handler for {@link createMethodMiddleware}.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = {
+    implementation: MethodHandlerImplementation<Hooks, MessengerActions, Params, Result, RequestExtras>;
+} & ([Hooks] extends [never] ? {
+    hookNames?: undefined;
+} : {
+    hookNames: {
+        [Key in keyof Hooks]: true;
+    };
+}) & ([MessengerActions] extends [never] ? {
+    actionNames?: undefined;
+} : {
+    actionNames: readonly MessengerActions['type'][];
+});
+type AnyMethodHandler = {
+    implementation(this: void, req: JsonRpcRequest, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: unknown, messenger: unknown): Promise<void> | void;
+    hookNames?: Record<string, true>;
+    actionNames?: readonly string[];
+};
+type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
+    handlers: Handlers;
+    hooks: [HandlerHooks<Handlers[keyof Handlers]>] extends [never] ? Record<string, never> : UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
+    /**
+     * Called when a handler throws, before the error is forwarded to `end`.
+     * Intended for logging; must not throw.
+     */
+    onError?: (error: unknown, request: JsonRpcRequest) => void;
+};
+/**
+ * Options for {@link createMethodMiddleware}.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+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.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ * @param options The options.
+ * @param options.handlers - The JSON-RPC method handler implementations.
+ * @param options.messenger - The messenger to be used by the handlers.
+ * @param options.hooks - The hooks to be used by the handlers.
+ * @returns A JsonRpcEngineV2 middleware.
+ */
+export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcParams, Json>;
+export {};
+//# sourceMappingURL=createMethodMiddleware.d.cts.map

package/dist/createMethodMiddleware.d.cts.map

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

package/dist/createMethodMiddleware.d.mts

@@ -0,0 +1,86 @@
+import type { ActionConstraint } from "@metamask/messenger";
+import type { Messenger } from "@metamask/messenger";
+import type { Json, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, JsonRpcMiddleware } from "./JsonRpcEngine.mjs";
+import { UnionToIntersection } from "./v2/utils.mjs";
+type HandlerActions<Handler> = Handler extends {
+    implementation: (...args: infer Args) => unknown;
+} ? Args extends [
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    infer HandlerMessenger
+] ? HandlerMessenger extends Messenger<string, infer Actions> ? Actions : never : never : never;
+type HandlerHooks<Handler> = Handler extends {
+    implementation: (...args: infer Args) => unknown;
+} ? Args extends [
+    unknown,
+    unknown,
+    unknown,
+    unknown,
+    infer ArgHooks,
+    ...unknown[]
+] ? ArgHooks extends Record<string, unknown> ? ArgHooks : never : never : never;
+/**
+ * A {@link MethodHandler} implementation.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+export type MethodHandlerImplementation<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = (req: JsonRpcRequest<Params> & RequestExtras, res: PendingJsonRpcResponse<Result>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Hooks, messenger: Messenger<string, MessengerActions>) => Promise<void> | void;
+/**
+ * A handler for {@link createMethodMiddleware}.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = {
+    implementation: MethodHandlerImplementation<Hooks, MessengerActions, Params, Result, RequestExtras>;
+} & ([Hooks] extends [never] ? {
+    hookNames?: undefined;
+} : {
+    hookNames: {
+        [Key in keyof Hooks]: true;
+    };
+}) & ([MessengerActions] extends [never] ? {
+    actionNames?: undefined;
+} : {
+    actionNames: readonly MessengerActions['type'][];
+});
+type AnyMethodHandler = {
+    implementation(this: void, req: JsonRpcRequest, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: unknown, messenger: unknown): Promise<void> | void;
+    hookNames?: Record<string, true>;
+    actionNames?: readonly string[];
+};
+type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
+    handlers: Handlers;
+    hooks: [HandlerHooks<Handlers[keyof Handlers]>] extends [never] ? Record<string, never> : UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
+    /**
+     * Called when a handler throws, before the error is forwarded to `end`.
+     * Intended for logging; must not throw.
+     */
+    onError?: (error: unknown, request: JsonRpcRequest) => void;
+};
+/**
+ * Options for {@link createMethodMiddleware}.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ */
+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.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ * @param options The options.
+ * @param options.handlers - The JSON-RPC method handler implementations.
+ * @param options.messenger - The messenger to be used by the handlers.
+ * @param options.hooks - The hooks to be used by the handlers.
+ * @returns A JsonRpcEngineV2 middleware.
+ */
+export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcParams, Json>;
+export {};
+//# sourceMappingURL=createMethodMiddleware.d.mts.map

package/dist/createMethodMiddleware.d.mts.map

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

package/dist/createMethodMiddleware.mjs

@@ -0,0 +1,52 @@
+import { rpcErrors } from "@metamask/rpc-errors";
+import { assertExpectedHooks, createHandlerMessenger, selectHooks } from "./v2/utils.mjs";
+/**
+ * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
+ *
+ * @deprecated Use the v2 `createMethodMiddleware` instead.
+ * @param options The options.
+ * @param options.handlers - The JSON-RPC method handler implementations.
+ * @param options.messenger - The messenger to be used by the handlers.
+ * @param options.hooks - The hooks to be used by the handlers.
+ * @returns A JsonRpcEngineV2 middleware.
+ */
+export function createMethodMiddleware(options) {
+    const { messenger: rootMessenger, onError } = 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({
+            namespace: handlerName,
+            actionNames: handler.actionNames,
+            rootMessenger,
+        });
+        accumulator[handlerName] = {
+            implementation: handler.implementation,
+            hooks: handlerHooks,
+            messenger: handlerMessenger,
+        };
+        return accumulator;
+    }, {});
+    // This should technically use createAsyncMiddleware, but we get around this by catching
+    // all handler errors.
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    return async (req, res, next, end) => {
+        const handler = handlers[req.method];
+        if (!handler) {
+            return next();
+        }
+        const { implementation, hooks: handlerHooks, messenger } = handler;
+        try {
+            return await implementation(req, res, next, end, handlerHooks, messenger);
+        }
+        catch (error) {
+            onError?.(error, req);
+            return end(error instanceof Error
+                ? error
+                : rpcErrors.internal({ data: error }));
+        }
+    };
+}
+//# sourceMappingURL=createMethodMiddleware.mjs.map

package/dist/createMethodMiddleware.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"createMethodMiddleware.mjs","sourceRoot":"","sources":["../src/createMethodMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,6BAA6B;AAajD,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EAEZ,uBAAmB;AAwIpB;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAGpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtD,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,wFAAwF;IACxF,sBAAsB;IACtB,kEAAkE;IAClE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACnE,IAAI,CAAC;YACH,OAAO,MAAM,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACtB,OAAO,GAAG,CACR,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAa,EAAE,CAAC,CAChD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { ActionConstraint } from '@metamask/messenger';\nimport type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  JsonRpcMiddleware,\n} from './JsonRpcEngine';\nimport {\n  assertExpectedHooks,\n  createHandlerMessenger,\n  selectHooks,\n  UnionToIntersection,\n} from './v2/utils';\n\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      infer HandlerMessenger,\n    ]\n    ? HandlerMessenger extends Messenger<string, infer Actions>\n      ? Actions\n      : never\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      infer ArgHooks,\n      ...unknown[],\n    ]\n    ? ArgHooks extends Record<string, unknown>\n      ? ArgHooks\n      : never\n    : never\n  : never;\n\n/**\n * A {@link MethodHandler} implementation.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandlerImplementation<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = (\n  req: JsonRpcRequest<Params> & RequestExtras,\n  res: PendingJsonRpcResponse<Result>,\n  next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: Hooks,\n  messenger: Messenger<string, MessengerActions>,\n) => Promise<void> | void;\n\n/**\n * A handler for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = {\n  implementation: MethodHandlerImplementation<\n    Hooks,\n    MessengerActions,\n    Params,\n    Result,\n    RequestExtras\n  >;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: readonly MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n    hooks: unknown,\n    messenger: unknown,\n  ): Promise<void> | void;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\ntype CreateMethodMiddlewareBaseOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  // Due to a quirk of TypeScript's inference over generics, the hooks property must\n  // be present even if no hooks are needed. Otherwise, TypeScript will fail to infer\n  // the correct type for the messenger property. `Record<string, never>` is the\n  // (hopefully) least confusing way to satisfy this requirement.\n  hooks: [HandlerHooks<Handlers[keyof Handlers]>] extends [never]\n    ? Record<string, never>\n    : UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n  /**\n   * Called when a handler throws, before the error is forwarded to `end`.\n   * Intended for logging; must not throw.\n   */\n  onError?: (error: unknown, request: JsonRpcRequest) => void;\n};\n\n/**\n * Options for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\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 * @deprecated Use the v2 `createMethodMiddleware` instead.\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>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcParams, Json> {\n  const { messenger: rootMessenger, onError } = 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  // This should technically use createAsyncMiddleware, but we get around this by catching\n  // all handler errors.\n  // eslint-disable-next-line @typescript-eslint/no-misused-promises\n  return async (req, res, next, end) => {\n    const handler = handlers[req.method];\n    if (!handler) {\n      return next();\n    }\n\n    const { implementation, hooks: handlerHooks, messenger } = handler;\n    try {\n      return await implementation(req, res, next, end, handlerHooks, messenger);\n    } catch (error) {\n      onError?.(error, req);\n      return end(\n        error instanceof Error\n          ? error\n          : rpcErrors.internal({ data: error as Json }),\n      );\n    }\n  };\n}\n"]}

package/dist/index.cjs

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeMiddleware = exports.JsonRpcEngine = exports.createIdRemapMiddleware = exports.getUniqueId = exports.createScaffoldMiddleware = exports.createAsyncMiddleware = exports.asV2Middleware = void 0;
+exports.mergeMiddleware = exports.JsonRpcEngine = exports.createIdRemapMiddleware = exports.getUniqueId = exports.createScaffoldMiddleware = exports.createMethodMiddleware = 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;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"]}
+{"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"]}

package/dist/index.d.cts

@@ -1,6 +1,8 @@
 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,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,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"}

package/dist/index.d.mts

@@ -1,6 +1,8 @@
 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,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,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"}

package/dist/index.mjs

@@ -1,5 +1,6 @@
 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;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"]}
+{"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"]}

package/dist/v2/createMethodMiddleware.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectHooks = exports.createMethodMiddleware = void 0;
+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.
  *
@@ -14,15 +15,14 @@ const messenger_1 = require("@metamask/messenger");
 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 = selectHooks(allHooks, handler.hookNames) ?? {};
-        const handlerMessenger = new messenger_1.Messenger({
+        const handlerHooks = (0, utils_1.selectHooks)(allHooks, handler.hookNames) ?? {};
+        const handlerMessenger = (0, utils_1.createHandlerMessenger)({
             namespace: handlerName,
-            parent: rootMessenger,
-        });
-        rootMessenger.delegate({
-            actions: (handler.actionNames ?? []),
-            messenger: handlerMessenger,
+            actionNames: handler.actionNames,
+            rootMessenger,
         });
         accumulator[handlerName] = {
             implementation: handler.implementation,
@@ -41,27 +41,4 @@ 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;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"]}
+{"version":3,"file":"createMethodMiddleware.cjs","sourceRoot":"","sources":["../../src/v2/createMethodMiddleware.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAIlE,uCAQiB;AAsFjB;;;;;;;;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: [HandlerHooks<Handlers[keyof Handlers]>] extends [never]\n    ? Record<string, never>\n    : 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"]}

package/dist/v2/createMethodMiddleware.d.cts

@@ -12,6 +12,9 @@ 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>>;
@@ -42,11 +45,18 @@ type AnyMethodHandler = {
     hookNames?: Record<string, true>;
     actionNames?: readonly string[];
 };
-export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = {
+type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
     handlers: Handlers;
-    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
-    hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
+    hooks: [HandlerHooks<Handlers[keyof Handlers]>] extends [never] ? Record<string, never> : 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.
  *
@@ -57,18 +67,5 @@ 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