@metamask-previews/json-rpc-engine 10.1.1-preview-c96ff8f → 10.1.1-preview-b289ac1c

package/CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add `JsonRpcEngineV2` ([#6176](https://github.com/MetaMask/core/pull/6176), [#6971](https://github.com/MetaMask/core/pull/6971), [#6975](https://github.com/MetaMask/core/pull/6975), [#6990](https://github.com/MetaMask/core/pull/6990), [#6991](https://github.com/MetaMask/core/pull/6991), [#7032](https://github.com/MetaMask/core/pull/7032), [#7001](https://github.com/MetaMask/core/pull/7001), [#7061](https://github.com/MetaMask/core/pull/7061))
+- Add `JsonRpcEngineV2` ([#6176](https://github.com/MetaMask/core/pull/6176), [#6971](https://github.com/MetaMask/core/pull/6971), [#6975](https://github.com/MetaMask/core/pull/6975), [#6990](https://github.com/MetaMask/core/pull/6990), [#6991](https://github.com/MetaMask/core/pull/6991), [#7001](https://github.com/MetaMask/core/pull/7001), [#7032](https://github.com/MetaMask/core/pull/7032))
   - This is a complete rewrite of `JsonRpcEngine`, intended to replace the original implementation. See the readme for details.
 
 ## [10.1.1]

package/README.md

@@ -444,33 +444,6 @@ const engine = JsonRpcEngineV2.create({
 });
 ```
 
-#### Passing the context to `handle()`
-
-You can pass a `MiddlewareContext` instance directly to `handle()`:
-
-```ts
-const context = new MiddlewareContext();
-context.set('foo', 'bar');
-const result = await engine.handle(
-  { id: '1', jsonrpc: '2.0', method: 'hello' },
-  { context },
-);
-console.log(result); // 'bar'
-```
-
-You can also pass a plain object as a shorthand for a `MiddlewareContext` instance:
-
-```ts
-const context = { foo: 'bar' };
-const result = await engine.handle(
-  { id: '1', jsonrpc: '2.0', method: 'hello' },
-  { context },
-);
-console.log(result); // 'bar'
-```
-
-This works the same way for `JsonRpcServer.handle()`.
-
 #### Constraining context keys and values
 
 The context exposes a generic parameter `KeyValues`, which determines the keys and values

package/dist/v2/JsonRpcEngineV2.cjs

@@ -134,10 +134,10 @@ _JsonRpcEngineV2_middleware = new WeakMap(), _JsonRpcEngineV2_isDestroyed = new
  * operation. Permits returning an `undefined` result.
  *
  * @param originalRequest - The JSON-RPC request to handle.
- * @param rawContext - The context to pass to the middleware.
+ * @param context - The context to pass to the middleware.
  * @returns The result from the middleware.
  */
-async function _JsonRpcEngineV2_handle(originalRequest, rawContext = new MiddlewareContext_1.MiddlewareContext()) {
+async function _JsonRpcEngineV2_handle(originalRequest, context = new MiddlewareContext_1.MiddlewareContext()) {
     __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_assertIsNotDestroyed).call(this);
     (0, deep_freeze_strict_1.default)(originalRequest);
     const state = {
@@ -146,9 +146,6 @@ async function _JsonRpcEngineV2_handle(originalRequest, rawContext = new Middlew
     };
     const middlewareIterator = __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_makeMiddlewareIterator).call(this);
     const firstMiddleware = middlewareIterator.next().value;
-    const context = MiddlewareContext_1.MiddlewareContext.isInstance(rawContext)
-        ? rawContext
-        : new MiddlewareContext_1.MiddlewareContext(rawContext);
     const makeNext = __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_makeNextFactory).call(this, middlewareIterator, state, context);
     const result = await firstMiddleware({
         request: originalRequest,

package/dist/v2/JsonRpcEngineV2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcEngineV2.cjs","sourceRoot":"","sources":["../../src/v2/JsonRpcEngineV2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcNotification,\n  type NonEmptyArray,\n  hasProperty,\n} from '@metamask/utils';\nimport deepFreeze from 'deep-freeze-strict';\n\nimport type {\n  ContextConstraint,\n  InferKeyValues,\n  MergeContexts,\n} from './MiddlewareContext';\nimport { MiddlewareContext } from './MiddlewareContext';\nimport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  stringify,\n} from './utils';\nimport type { JsonRpcCall } from './utils';\n\n// Helper to forbid `id` on notifications\ntype WithoutId<Request extends JsonRpcCall> = Request & { id?: never };\n\n// Helper to enable JsonRpcCall overload of handle()\ntype MixedParam<Request extends JsonRpcCall> = [\n  Extract<Request, JsonRpcRequest>,\n] extends [never]\n  ? never\n  : [Extract<Request, JsonRpcNotification>] extends [never]\n    ? never\n    :\n        | Extract<Request, JsonRpcRequest>\n        | WithoutId<Extract<Request, JsonRpcNotification>>;\n\nexport type ResultConstraint<Request extends JsonRpcCall> =\n  Request extends JsonRpcRequest ? Json : void;\n\nexport type Next<Request extends JsonRpcCall> = (\n  request?: Readonly<Request>,\n) => Promise<Readonly<ResultConstraint<Request>> | undefined>;\n\nexport type MiddlewareParams<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> = {\n  request: Readonly<Request>;\n  context: Context;\n  next: Next<Request>;\n};\n\nexport type JsonRpcMiddleware<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Result extends ResultConstraint<Request> = ResultConstraint<Request>,\n  Context extends ContextConstraint = MiddlewareContext,\n> = (\n  params: MiddlewareParams<Request, Context>,\n) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;\n\ntype RequestState<Request extends JsonRpcCall> = {\n  request: Request;\n  result: Readonly<ResultConstraint<Request>> | undefined;\n};\n\n/**\n * The options for the JSON-RPC request/notification handling operation.\n */\nexport type HandleOptions<Context extends ContextConstraint> = {\n  context?: Context | InferKeyValues<Context>;\n};\n\ntype ConstructorOptions<\n  Request extends JsonRpcCall,\n  Context extends MiddlewareContext,\n> = {\n  middleware: NonEmptyArray<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  >;\n};\n\n/**\n * The request type of a middleware.\n */\nexport type RequestOf<Middleware> =\n  Middleware extends JsonRpcMiddleware<\n    infer Request,\n    ResultConstraint<infer Request>,\n    // Non-polluting `any` constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    any\n  >\n    ? Request\n    : never;\n\ntype ContextOf<Middleware> =\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Middleware extends JsonRpcMiddleware<any, ResultConstraint<any>, infer C>\n    ? C\n    : never;\n\n/**\n * A constraint for {@link JsonRpcMiddleware} generic parameters.\n */\n// Non-polluting `any` constraint.\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport type MiddlewareConstraint = JsonRpcMiddleware<\n  any,\n  ResultConstraint<any>,\n  MiddlewareContext<any>\n>;\n/* eslint-enable @typescript-eslint/no-explicit-any */\n\n/**\n * The context supertype of a middleware type.\n */\nexport type MergedContextOf<Middleware extends MiddlewareConstraint> =\n  MergeContexts<ContextOf<Middleware>>;\n\nconst INVALID_ENGINE = Symbol('Invalid engine');\n\n/**\n * An internal type for invalid engines that explains why the engine is invalid.\n *\n * @template Message - The message explaining why the engine is invalid.\n */\ntype InvalidEngine<Message extends string> = { [INVALID_ENGINE]: Message };\n\n/**\n * A JSON-RPC request and response processor.\n *\n * Give it a stack of middleware, pass it requests, and get back responses.\n *\n * #### Requests vs. notifications\n *\n * JSON-RPC requests come in two flavors:\n *\n * - [Requests](https://www.jsonrpc.org/specification#request_object), i.e. request objects _with_ an `id`\n * - [Notifications](https://www.jsonrpc.org/specification#notification), i.e. request objects _without_ an `id`\n *\n * For requests, one of the engine's middleware must \"end\" the request by returning a non-`undefined` result,\n * or {@link handle} will throw an error:\n *\n * For notifications, on the other hand, one of the engine's middleware must return `undefined` to end the request,\n * and any non-`undefined` return values will cause an error:\n *\n * @template Request - The type of request to handle.\n * @template Result - The type of result to return.\n *\n * @example\n * ```ts\n * const engine = JsonRpcEngineV2.create({\n *   middleware,\n * });\n *\n * try {\n *   const result = await engine.handle(request);\n *   // Handle result\n * } catch (error) {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcEngineV2<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> {\n  #middleware: Readonly<\n    NonEmptyArray<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >\n  >;\n\n  #isDestroyed = false;\n\n  // See .create() for why this is private.\n  private constructor({ middleware }: ConstructorOptions<Request, Context>) {\n    this.#middleware = [...middleware];\n  }\n\n  // We use a static factory method in order to construct a supertype of all middleware contexts,\n  // which enables us to instantiate an engine despite different middleware expecting different\n  // context types.\n  /**\n   * Create a new JSON-RPC engine.\n   *\n   * @throws If the middleware array is empty.\n   * @param options - The options for the engine.\n   * @param options.middleware - The middleware to use.\n   * @returns The JSON-RPC engine.\n   */\n  static create<\n    Middleware extends JsonRpcMiddleware<\n      // Non-polluting `any` constraint.\n      /* eslint-disable @typescript-eslint/no-explicit-any */\n      any,\n      ResultConstraint<any>,\n      any\n      /* eslint-enable @typescript-eslint/no-explicit-any */\n    > = JsonRpcMiddleware,\n  >({ middleware }: { middleware: Middleware[] }) {\n    // We can't use NonEmptyArray for the params because it ruins type inference.\n    if (middleware.length === 0) {\n      throw new JsonRpcEngineError('Middleware array cannot be empty');\n    }\n\n    type MergedContext = MergedContextOf<Middleware>;\n    type InputRequest = RequestOf<Middleware>;\n    const mw = middleware as unknown as NonEmptyArray<\n      JsonRpcMiddleware<\n        InputRequest,\n        ResultConstraint<InputRequest>,\n        MergedContext\n      >\n    >;\n    return new JsonRpcEngineV2<InputRequest, MergedContext>({\n      middleware: mw,\n    }) as MergedContext extends never\n      ? InvalidEngine<'Some middleware have incompatible context types'>\n      : JsonRpcEngineV2<InputRequest, MergedContext>;\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * @param request - The JSON-RPC request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response.\n   */\n  async handle(\n    request: Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : Extract<Request, JsonRpcRequest>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC notification. Notifications do not return a result.\n   *\n   * @param notification - The JSON-RPC notification to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   */\n  async handle(\n    notification: Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : WithoutId<Extract<Request, JsonRpcNotification>>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC call, i.e. request or notification. Requests return a\n   * result, notifications do not.\n   *\n   * @param call - The JSON-RPC call to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response, or `undefined` if the call is a notification.\n   */\n  async handle(\n    call: MixedParam<Request>,\n    options?: HandleOptions<Context>,\n  ): Promise<ResultConstraint<Request> | void>;\n\n  async handle(\n    request: Request,\n    { context }: HandleOptions<Context> = {},\n  ): Promise<Readonly<ResultConstraint<Request>> | void> {\n    const isReq = isRequest(request);\n    const { result } = await this.#handle(request, context);\n\n    if (isReq && result === undefined) {\n      throw new JsonRpcEngineError(\n        `Nothing ended request: ${stringify(request)}`,\n      );\n    }\n    return result;\n  }\n\n  /**\n   * Handle a JSON-RPC request. Throws if a middleware performs an invalid\n   * operation. Permits returning an `undefined` result.\n   *\n   * @param originalRequest - The JSON-RPC request to handle.\n   * @param rawContext - The context to pass to the middleware.\n   * @returns The result from the middleware.\n   */\n  async #handle(\n    originalRequest: Request,\n    rawContext:\n      | Context\n      | InferKeyValues<Context> = new MiddlewareContext() as Context,\n  ): Promise<RequestState<Request>> {\n    this.#assertIsNotDestroyed();\n\n    deepFreeze(originalRequest);\n\n    const state: RequestState<Request> = {\n      request: originalRequest,\n      result: undefined,\n    };\n    const middlewareIterator = this.#makeMiddlewareIterator();\n    const firstMiddleware = middlewareIterator.next().value;\n    const context = MiddlewareContext.isInstance(rawContext)\n      ? rawContext\n      : (new MiddlewareContext(rawContext) as Context);\n\n    const makeNext = this.#makeNextFactory(middlewareIterator, state, context);\n\n    const result = await firstMiddleware({\n      request: originalRequest,\n      context,\n      next: makeNext(),\n    });\n    this.#updateResult(result, state);\n\n    return state;\n  }\n\n  /**\n   * Create a factory of `next()` functions for use with a particular request.\n   * The factory is recursive, and a new `next()` is created for each middleware\n   * invocation.\n   *\n   * @param middlewareIterator - The iterator of middleware for the current\n   * request.\n   * @param state - The current values of the request and result.\n   * @param context - The context to pass to the middleware.\n   * @returns The `next()` function factory.\n   */\n  #makeNextFactory(\n    middlewareIterator: Iterator<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >,\n    state: RequestState<Request>,\n    context: Context,\n  ): () => Next<Request> {\n    const makeNext = (): Next<Request> => {\n      let wasCalled = false;\n\n      const next = async (\n        request: Request = state.request,\n      ): Promise<Readonly<ResultConstraint<Request>> | undefined> => {\n        if (wasCalled) {\n          throw new JsonRpcEngineError(\n            `Middleware attempted to call next() multiple times for request: ${stringify(request)}`,\n          );\n        }\n        wasCalled = true;\n\n        if (request !== state.request) {\n          this.#assertValidNextRequest(state.request, request);\n          state.request = deepFreeze(request);\n        }\n\n        const { value: nextMiddleware, done } = middlewareIterator.next();\n        if (done) {\n          // This will cause the last middleware to return `undefined`. See the class\n          // JSDoc or package README for more details.\n          return undefined;\n        }\n\n        const result = await nextMiddleware({\n          request,\n          context,\n          next: makeNext(),\n        });\n        this.#updateResult(result, state);\n\n        return state.result;\n      };\n      return next;\n    };\n\n    return makeNext;\n  }\n\n  #makeMiddlewareIterator(): Iterator<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  > {\n    return this.#middleware[Symbol.iterator]();\n  }\n\n  /**\n   * Validate the result from a middleware and, if it's a new value, update the\n   * current result.\n   *\n   * @param result - The result from the middleware.\n   * @param state - The current values of the request and result.\n   */\n  #updateResult(\n    result:\n      | Readonly<ResultConstraint<Request>>\n      | ResultConstraint<Request>\n      | void,\n    state: RequestState<Request>,\n  ): void {\n    if (isNotification(state.request) && result !== undefined) {\n      throw new JsonRpcEngineError(\n        `Result returned for notification: ${stringify(state.request)}`,\n      );\n    }\n\n    if (result !== undefined && result !== state.result) {\n      if (typeof result === 'object' && result !== null) {\n        deepFreeze(result);\n      }\n      state.result = result;\n    }\n  }\n\n  /**\n   * Assert that a request modified by a middleware is valid.\n   *\n   * @param currentRequest - The current request.\n   * @param nextRequest - The next request.\n   */\n  #assertValidNextRequest(currentRequest: Request, nextRequest: Request): void {\n    if (nextRequest.jsonrpc !== currentRequest.jsonrpc) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"jsonrpc\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n    if (\n      hasProperty(nextRequest, 'id') !== hasProperty(currentRequest, 'id') ||\n      // @ts-expect-error - \"id\" does not exist on notifications, but we can still\n      // check the value of the property at runtime.\n      nextRequest.id !== currentRequest.id\n    ) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"id\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n  }\n\n  /**\n   * Convert the engine into a JSON-RPC middleware.\n   *\n   * @returns The JSON-RPC middleware.\n   */\n  asMiddleware(): JsonRpcMiddleware<\n    Request,\n    ResultConstraint<Request>,\n    Context\n  > {\n    this.#assertIsNotDestroyed();\n\n    return async ({ request, context, next }) => {\n      const { result, request: finalRequest } = await this.#handle(\n        request,\n        context,\n      );\n      return result === undefined ? await next(finalRequest) : result;\n    };\n  }\n\n  /**\n   * Destroy the engine. Calls the `destroy()` method of any middleware that has\n   * one. Attempting to use the engine after destroying it will throw an error.\n   */\n  async destroy(): Promise<void> {\n    if (this.#isDestroyed) {\n      return;\n    }\n    this.#isDestroyed = true;\n\n    const destructionPromise = Promise.all(\n      this.#middleware.map(async (middleware) => {\n        if (\n          // Intentionally using `in` to walk the prototype chain.\n          'destroy' in middleware &&\n          typeof middleware.destroy === 'function'\n        ) {\n          return middleware.destroy();\n        }\n        return undefined;\n      }),\n    );\n    this.#middleware = [] as never;\n    await destructionPromise;\n  }\n\n  #assertIsNotDestroyed(): void {\n    if (this.#isDestroyed) {\n      throw new JsonRpcEngineError('Engine is destroyed');\n    }\n  }\n}\n"]}
+{"version":3,"file":"JsonRpcEngineV2.cjs","sourceRoot":"","sources":["../../src/v2/JsonRpcEngineV2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAMyB;AACzB,4EAA4C;AAG5C,+DAAwD;AACxD,uCAKiB;AAkGjB,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAShD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAa,eAAe;IAY1B,yCAAyC;IACzC,YAAoB,EAAE,UAAU,EAAwC;;QATxE,8CAIE;QAEF,uCAAe,KAAK,EAAC;QAInB,uBAAA,IAAI,+BAAe,CAAC,GAAG,UAAU,CAAC,MAAA,CAAC;IACrC,CAAC;IAED,+FAA+F;IAC/F,6FAA6F;IAC7F,iBAAiB;IACjB;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CASX,EAAE,UAAU,EAAgC;QAC5C,6EAA6E;QAC7E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,MAAM,IAAI,0BAAkB,CAAC,kCAAkC,CAAC,CAAC;SAClE;QAID,MAAM,EAAE,GAAG,UAMV,CAAC;QACF,OAAO,IAAI,eAAe,CAA8B;YACtD,UAAU,EAAE,EAAE;SACf,CAE+C,CAAC;IACnD,CAAC;IAqDD,KAAK,CAAC,MAAM,CACV,OAAgB,EAChB,EAAE,OAAO,KAA6B,EAAE;QAExC,MAAM,KAAK,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;QACjC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,uBAAA,IAAI,2DAAQ,MAAZ,IAAI,EAAS,OAAO,EAAE,OAAO,CAAC,CAAC;QAExD,IAAI,KAAK,IAAI,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,IAAI,0BAAkB,CAC1B,0BAA0B,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAE,CAC/C,CAAC;SACH;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAyJD;;;;OAIG;IACH,YAAY;QAKV,uBAAA,IAAI,yEAAsB,MAA1B,IAAI,CAAwB,CAAC;QAE7B,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,uBAAA,IAAI,2DAAQ,MAAZ,IAAI,EAClD,OAAO,EACP,OAAO,CACR,CAAC;YACF,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,uBAAA,IAAI,oCAAa,EAAE;YACrB,OAAO;SACR;QACD,uBAAA,IAAI,gCAAgB,IAAI,MAAA,CAAC;QAEzB,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CACpC,uBAAA,IAAI,mCAAY,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACxC;YACE,wDAAwD;YACxD,SAAS,IAAI,UAAU;gBACvB,OAAO,UAAU,CAAC,OAAO,KAAK,UAAU,EACxC;gBACA,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;aAC7B;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CACH,CAAC;QACF,uBAAA,IAAI,+BAAe,EAAW,MAAA,CAAC;QAC/B,MAAM,kBAAkB,CAAC;IAC3B,CAAC;CAOF;AAxUD,0CAwUC;;AA3MC;;;;;;;GAOG;AACH,KAAK,kCACH,eAAwB,EACxB,UAAmB,IAAI,qCAAiB,EAAa;IAErD,uBAAA,IAAI,yEAAsB,MAA1B,IAAI,CAAwB,CAAC;IAE7B,IAAA,4BAAU,EAAC,eAAe,CAAC,CAAC;IAE5B,MAAM,KAAK,GAA0B;QACnC,OAAO,EAAE,eAAe;QACxB,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,MAAM,kBAAkB,GAAG,uBAAA,IAAI,2EAAwB,MAA5B,IAAI,CAA0B,CAAC;IAC1D,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;IAExD,MAAM,QAAQ,GAAG,uBAAA,IAAI,oEAAiB,MAArB,IAAI,EAAkB,kBAAkB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QACnC,OAAO,EAAE,eAAe;QACxB,OAAO;QACP,IAAI,EAAE,QAAQ,EAAE;KACjB,CAAC,CAAC;IACH,uBAAA,IAAI,iEAAc,MAAlB,IAAI,EAAe,MAAM,EAAE,KAAK,CAAC,CAAC;IAElC,OAAO,KAAK,CAAC;AACf,CAAC,+EAcC,kBAEC,EACD,KAA4B,EAC5B,OAAgB;IAEhB,MAAM,QAAQ,GAAG,GAAkB,EAAE;QACnC,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,MAAM,IAAI,GAAG,KAAK,EAChB,UAAmB,KAAK,CAAC,OAAO,EAC0B,EAAE;YAC5D,IAAI,SAAS,EAAE;gBACb,MAAM,IAAI,0BAAkB,CAC1B,mEAAmE,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAE,CACxF,CAAC;aACH;YACD,SAAS,GAAG,IAAI,CAAC;YAEjB,IAAI,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE;gBAC7B,uBAAA,IAAI,2EAAwB,MAA5B,IAAI,EAAyB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACrD,KAAK,CAAC,OAAO,GAAG,IAAA,4BAAU,EAAC,OAAO,CAAC,CAAC;aACrC;YAED,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAClE,IAAI,IAAI,EAAE;gBACR,2EAA2E;gBAC3E,4CAA4C;gBAC5C,OAAO,SAAS,CAAC;aAClB;YAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;gBAClC,OAAO;gBACP,OAAO;gBACP,IAAI,EAAE,QAAQ,EAAE;aACjB,CAAC,CAAC;YACH,uBAAA,IAAI,iEAAc,MAAlB,IAAI,EAAe,MAAM,EAAE,KAAK,CAAC,CAAC;YAElC,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;IAKC,OAAO,uBAAA,IAAI,mCAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC7C,CAAC,yEAUC,MAGQ,EACR,KAA4B;IAE5B,IAAI,IAAA,sBAAc,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,KAAK,SAAS,EAAE;QACzD,MAAM,IAAI,0BAAkB,CAC1B,qCAAqC,IAAA,iBAAS,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAChE,CAAC;KACH;IAED,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;QACnD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE;YACjD,IAAA,4BAAU,EAAC,MAAM,CAAC,CAAC;SACpB;QACD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;KACvB;AACH,CAAC,6FAQuB,cAAuB,EAAE,WAAoB;IACnE,IAAI,WAAW,CAAC,OAAO,KAAK,cAAc,CAAC,OAAO,EAAE;QAClD,MAAM,IAAI,0BAAkB,CAC1B,2EAA2E,IAAA,iBAAS,EAAC,cAAc,CAAC,EAAE,CACvG,CAAC;KACH;IACD,IACE,IAAA,mBAAW,EAAC,WAAW,EAAE,IAAI,CAAC,KAAK,IAAA,mBAAW,EAAC,cAAc,EAAE,IAAI,CAAC;QACpE,4EAA4E;QAC5E,8CAA8C;QAC9C,WAAW,CAAC,EAAE,KAAK,cAAc,CAAC,EAAE,EACpC;QACA,MAAM,IAAI,0BAAkB,CAC1B,sEAAsE,IAAA,iBAAS,EAAC,cAAc,CAAC,EAAE,CAClG,CAAC;KACH;AACH,CAAC;IAkDC,IAAI,uBAAA,IAAI,oCAAa,EAAE;QACrB,MAAM,IAAI,0BAAkB,CAAC,qBAAqB,CAAC,CAAC;KACrD;AACH,CAAC","sourcesContent":["import {\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcNotification,\n  type NonEmptyArray,\n  hasProperty,\n} from '@metamask/utils';\nimport deepFreeze from 'deep-freeze-strict';\n\nimport type { ContextConstraint, MergeContexts } from './MiddlewareContext';\nimport { MiddlewareContext } from './MiddlewareContext';\nimport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  stringify,\n} from './utils';\nimport type { JsonRpcCall } from './utils';\n\n// Helper to forbid `id` on notifications\ntype WithoutId<Request extends JsonRpcCall> = Request & { id?: never };\n\n// Helper to enable JsonRpcCall overload of handle()\ntype MixedParam<Request extends JsonRpcCall> = [\n  Extract<Request, JsonRpcRequest>,\n] extends [never]\n  ? never\n  : [Extract<Request, JsonRpcNotification>] extends [never]\n    ? never\n    :\n        | Extract<Request, JsonRpcRequest>\n        | WithoutId<Extract<Request, JsonRpcNotification>>;\n\nexport type ResultConstraint<Request extends JsonRpcCall> =\n  Request extends JsonRpcRequest ? Json : void;\n\nexport type Next<Request extends JsonRpcCall> = (\n  request?: Readonly<Request>,\n) => Promise<Readonly<ResultConstraint<Request>> | undefined>;\n\nexport type MiddlewareParams<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends MiddlewareContext = MiddlewareContext,\n> = {\n  request: Readonly<Request>;\n  context: Context;\n  next: Next<Request>;\n};\n\nexport type JsonRpcMiddleware<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Result extends ResultConstraint<Request> = ResultConstraint<Request>,\n  Context extends ContextConstraint = MiddlewareContext,\n> = (\n  params: MiddlewareParams<Request, Context>,\n) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;\n\ntype RequestState<Request extends JsonRpcCall> = {\n  request: Request;\n  result: Readonly<ResultConstraint<Request>> | undefined;\n};\n\ntype HandleOptions<Context extends MiddlewareContext> = {\n  context?: Context;\n};\n\ntype ConstructorOptions<\n  Request extends JsonRpcCall,\n  Context extends MiddlewareContext,\n> = {\n  middleware: NonEmptyArray<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  >;\n};\n\n/**\n * The request type of a middleware.\n */\nexport type RequestOf<Middleware> =\n  Middleware extends JsonRpcMiddleware<\n    infer Request,\n    ResultConstraint<infer Request>,\n    // Non-polluting `any` constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    any\n  >\n    ? Request\n    : never;\n\ntype ContextOf<Middleware> =\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Middleware extends JsonRpcMiddleware<any, ResultConstraint<any>, infer C>\n    ? C\n    : never;\n\n/**\n * A constraint for {@link JsonRpcMiddleware} generic parameters.\n */\n// Non-polluting `any` constraint.\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport type MiddlewareConstraint = JsonRpcMiddleware<\n  any,\n  ResultConstraint<any>,\n  MiddlewareContext<any>\n>;\n/* eslint-enable @typescript-eslint/no-explicit-any */\n\n/**\n * The context supertype of a middleware type.\n */\nexport type MergedContextOf<Middleware extends MiddlewareConstraint> =\n  MergeContexts<ContextOf<Middleware>>;\n\nconst INVALID_ENGINE = Symbol('Invalid engine');\n\n/**\n * An internal type for invalid engines that explains why the engine is invalid.\n *\n * @template Message - The message explaining why the engine is invalid.\n */\ntype InvalidEngine<Message extends string> = { [INVALID_ENGINE]: Message };\n\n/**\n * A JSON-RPC request and response processor.\n *\n * Give it a stack of middleware, pass it requests, and get back responses.\n *\n * #### Requests vs. notifications\n *\n * JSON-RPC requests come in two flavors:\n *\n * - [Requests](https://www.jsonrpc.org/specification#request_object), i.e. request objects _with_ an `id`\n * - [Notifications](https://www.jsonrpc.org/specification#notification), i.e. request objects _without_ an `id`\n *\n * For requests, one of the engine's middleware must \"end\" the request by returning a non-`undefined` result,\n * or {@link handle} will throw an error:\n *\n * For notifications, on the other hand, one of the engine's middleware must return `undefined` to end the request,\n * and any non-`undefined` return values will cause an error:\n *\n * @template Request - The type of request to handle.\n * @template Result - The type of result to return.\n *\n * @example\n * ```ts\n * const engine = JsonRpcEngineV2.create({\n *   middleware,\n * });\n *\n * try {\n *   const result = await engine.handle(request);\n *   // Handle result\n * } catch (error) {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcEngineV2<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> {\n  #middleware: Readonly<\n    NonEmptyArray<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >\n  >;\n\n  #isDestroyed = false;\n\n  // See .create() for why this is private.\n  private constructor({ middleware }: ConstructorOptions<Request, Context>) {\n    this.#middleware = [...middleware];\n  }\n\n  // We use a static factory method in order to construct a supertype of all middleware contexts,\n  // which enables us to instantiate an engine despite different middleware expecting different\n  // context types.\n  /**\n   * Create a new JSON-RPC engine.\n   *\n   * @throws If the middleware array is empty.\n   * @param options - The options for the engine.\n   * @param options.middleware - The middleware to use.\n   * @returns The JSON-RPC engine.\n   */\n  static create<\n    Middleware extends JsonRpcMiddleware<\n      // Non-polluting `any` constraint.\n      /* eslint-disable @typescript-eslint/no-explicit-any */\n      any,\n      ResultConstraint<any>,\n      any\n      /* eslint-enable @typescript-eslint/no-explicit-any */\n    > = JsonRpcMiddleware,\n  >({ middleware }: { middleware: Middleware[] }) {\n    // We can't use NonEmptyArray for the params because it ruins type inference.\n    if (middleware.length === 0) {\n      throw new JsonRpcEngineError('Middleware array cannot be empty');\n    }\n\n    type MergedContext = MergedContextOf<Middleware>;\n    type InputRequest = RequestOf<Middleware>;\n    const mw = middleware as unknown as NonEmptyArray<\n      JsonRpcMiddleware<\n        InputRequest,\n        ResultConstraint<InputRequest>,\n        MergedContext\n      >\n    >;\n    return new JsonRpcEngineV2<InputRequest, MergedContext>({\n      middleware: mw,\n    }) as MergedContext extends never\n      ? InvalidEngine<'Some middleware have incompatible context types'>\n      : JsonRpcEngineV2<InputRequest, MergedContext>;\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * @param request - The JSON-RPC request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response.\n   */\n  async handle(\n    request: Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : Extract<Request, JsonRpcRequest>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC notification. Notifications do not return a result.\n   *\n   * @param notification - The JSON-RPC notification to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   */\n  async handle(\n    notification: Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : WithoutId<Extract<Request, JsonRpcNotification>>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC call, i.e. request or notification. Requests return a\n   * result, notifications do not.\n   *\n   * @param call - The JSON-RPC call to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response, or `undefined` if the call is a notification.\n   */\n  async handle(\n    call: MixedParam<Request>,\n    options?: HandleOptions<Context>,\n  ): Promise<ResultConstraint<Request> | void>;\n\n  async handle(\n    request: Request,\n    { context }: HandleOptions<Context> = {},\n  ): Promise<Readonly<ResultConstraint<Request>> | void> {\n    const isReq = isRequest(request);\n    const { result } = await this.#handle(request, context);\n\n    if (isReq && result === undefined) {\n      throw new JsonRpcEngineError(\n        `Nothing ended request: ${stringify(request)}`,\n      );\n    }\n    return result;\n  }\n\n  /**\n   * Handle a JSON-RPC request. Throws if a middleware performs an invalid\n   * operation. Permits returning an `undefined` result.\n   *\n   * @param originalRequest - The JSON-RPC request to handle.\n   * @param context - The context to pass to the middleware.\n   * @returns The result from the middleware.\n   */\n  async #handle(\n    originalRequest: Request,\n    context: Context = new MiddlewareContext() as Context,\n  ): Promise<RequestState<Request>> {\n    this.#assertIsNotDestroyed();\n\n    deepFreeze(originalRequest);\n\n    const state: RequestState<Request> = {\n      request: originalRequest,\n      result: undefined,\n    };\n    const middlewareIterator = this.#makeMiddlewareIterator();\n    const firstMiddleware = middlewareIterator.next().value;\n\n    const makeNext = this.#makeNextFactory(middlewareIterator, state, context);\n\n    const result = await firstMiddleware({\n      request: originalRequest,\n      context,\n      next: makeNext(),\n    });\n    this.#updateResult(result, state);\n\n    return state;\n  }\n\n  /**\n   * Create a factory of `next()` functions for use with a particular request.\n   * The factory is recursive, and a new `next()` is created for each middleware\n   * invocation.\n   *\n   * @param middlewareIterator - The iterator of middleware for the current\n   * request.\n   * @param state - The current values of the request and result.\n   * @param context - The context to pass to the middleware.\n   * @returns The `next()` function factory.\n   */\n  #makeNextFactory(\n    middlewareIterator: Iterator<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >,\n    state: RequestState<Request>,\n    context: Context,\n  ): () => Next<Request> {\n    const makeNext = (): Next<Request> => {\n      let wasCalled = false;\n\n      const next = async (\n        request: Request = state.request,\n      ): Promise<Readonly<ResultConstraint<Request>> | undefined> => {\n        if (wasCalled) {\n          throw new JsonRpcEngineError(\n            `Middleware attempted to call next() multiple times for request: ${stringify(request)}`,\n          );\n        }\n        wasCalled = true;\n\n        if (request !== state.request) {\n          this.#assertValidNextRequest(state.request, request);\n          state.request = deepFreeze(request);\n        }\n\n        const { value: nextMiddleware, done } = middlewareIterator.next();\n        if (done) {\n          // This will cause the last middleware to return `undefined`. See the class\n          // JSDoc or package README for more details.\n          return undefined;\n        }\n\n        const result = await nextMiddleware({\n          request,\n          context,\n          next: makeNext(),\n        });\n        this.#updateResult(result, state);\n\n        return state.result;\n      };\n      return next;\n    };\n\n    return makeNext;\n  }\n\n  #makeMiddlewareIterator(): Iterator<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  > {\n    return this.#middleware[Symbol.iterator]();\n  }\n\n  /**\n   * Validate the result from a middleware and, if it's a new value, update the\n   * current result.\n   *\n   * @param result - The result from the middleware.\n   * @param state - The current values of the request and result.\n   */\n  #updateResult(\n    result:\n      | Readonly<ResultConstraint<Request>>\n      | ResultConstraint<Request>\n      | void,\n    state: RequestState<Request>,\n  ): void {\n    if (isNotification(state.request) && result !== undefined) {\n      throw new JsonRpcEngineError(\n        `Result returned for notification: ${stringify(state.request)}`,\n      );\n    }\n\n    if (result !== undefined && result !== state.result) {\n      if (typeof result === 'object' && result !== null) {\n        deepFreeze(result);\n      }\n      state.result = result;\n    }\n  }\n\n  /**\n   * Assert that a request modified by a middleware is valid.\n   *\n   * @param currentRequest - The current request.\n   * @param nextRequest - The next request.\n   */\n  #assertValidNextRequest(currentRequest: Request, nextRequest: Request): void {\n    if (nextRequest.jsonrpc !== currentRequest.jsonrpc) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"jsonrpc\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n    if (\n      hasProperty(nextRequest, 'id') !== hasProperty(currentRequest, 'id') ||\n      // @ts-expect-error - \"id\" does not exist on notifications, but we can still\n      // check the value of the property at runtime.\n      nextRequest.id !== currentRequest.id\n    ) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"id\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n  }\n\n  /**\n   * Convert the engine into a JSON-RPC middleware.\n   *\n   * @returns The JSON-RPC middleware.\n   */\n  asMiddleware(): JsonRpcMiddleware<\n    Request,\n    ResultConstraint<Request>,\n    Context\n  > {\n    this.#assertIsNotDestroyed();\n\n    return async ({ request, context, next }) => {\n      const { result, request: finalRequest } = await this.#handle(\n        request,\n        context,\n      );\n      return result === undefined ? await next(finalRequest) : result;\n    };\n  }\n\n  /**\n   * Destroy the engine. Calls the `destroy()` method of any middleware that has\n   * one. Attempting to use the engine after destroying it will throw an error.\n   */\n  async destroy(): Promise<void> {\n    if (this.#isDestroyed) {\n      return;\n    }\n    this.#isDestroyed = true;\n\n    const destructionPromise = Promise.all(\n      this.#middleware.map(async (middleware) => {\n        if (\n          // Intentionally using `in` to walk the prototype chain.\n          'destroy' in middleware &&\n          typeof middleware.destroy === 'function'\n        ) {\n          return middleware.destroy();\n        }\n        return undefined;\n      }),\n    );\n    this.#middleware = [] as never;\n    await destructionPromise;\n  }\n\n  #assertIsNotDestroyed(): void {\n    if (this.#isDestroyed) {\n      throw new JsonRpcEngineError('Engine is destroyed');\n    }\n  }\n}\n"]}

package/dist/v2/JsonRpcEngineV2.d.cts

@@ -1,5 +1,5 @@
 import { type Json, type JsonRpcRequest, type JsonRpcNotification } from "@metamask/utils";
-import type { ContextConstraint, InferKeyValues, MergeContexts } from "./MiddlewareContext.cjs";
+import type { ContextConstraint, MergeContexts } from "./MiddlewareContext.cjs";
 import { MiddlewareContext } from "./MiddlewareContext.cjs";
 import type { JsonRpcCall } from "./utils.cjs";
 type WithoutId<Request extends JsonRpcCall> = Request & {
@@ -10,17 +10,14 @@ type MixedParam<Request extends JsonRpcCall> = [
 ] extends [never] ? never : [Extract<Request, JsonRpcNotification>] extends [never] ? never : Extract<Request, JsonRpcRequest> | WithoutId<Extract<Request, JsonRpcNotification>>;
 export type ResultConstraint<Request extends JsonRpcCall> = Request extends JsonRpcRequest ? Json : void;
 export type Next<Request extends JsonRpcCall> = (request?: Readonly<Request>) => Promise<Readonly<ResultConstraint<Request>> | undefined>;
-export type MiddlewareParams<Request extends JsonRpcCall = JsonRpcCall, Context extends ContextConstraint = MiddlewareContext> = {
+export type MiddlewareParams<Request extends JsonRpcCall = JsonRpcCall, Context extends MiddlewareContext = MiddlewareContext> = {
     request: Readonly<Request>;
     context: Context;
     next: Next<Request>;
 };
 export type JsonRpcMiddleware<Request extends JsonRpcCall = JsonRpcCall, Result extends ResultConstraint<Request> = ResultConstraint<Request>, Context extends ContextConstraint = MiddlewareContext> = (params: MiddlewareParams<Request, Context>) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;
-/**
- * The options for the JSON-RPC request/notification handling operation.
- */
-export type HandleOptions<Context extends ContextConstraint> = {
-    context?: Context | InferKeyValues<Context>;
+type HandleOptions<Context extends MiddlewareContext> = {
+    context?: Context;
 };
 /**
  * The request type of a middleware.

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

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

package/dist/v2/JsonRpcEngineV2.d.mts

@@ -1,5 +1,5 @@
 import { type Json, type JsonRpcRequest, type JsonRpcNotification } from "@metamask/utils";
-import type { ContextConstraint, InferKeyValues, MergeContexts } from "./MiddlewareContext.mjs";
+import type { ContextConstraint, MergeContexts } from "./MiddlewareContext.mjs";
 import { MiddlewareContext } from "./MiddlewareContext.mjs";
 import type { JsonRpcCall } from "./utils.mjs";
 type WithoutId<Request extends JsonRpcCall> = Request & {
@@ -10,17 +10,14 @@ type MixedParam<Request extends JsonRpcCall> = [
 ] extends [never] ? never : [Extract<Request, JsonRpcNotification>] extends [never] ? never : Extract<Request, JsonRpcRequest> | WithoutId<Extract<Request, JsonRpcNotification>>;
 export type ResultConstraint<Request extends JsonRpcCall> = Request extends JsonRpcRequest ? Json : void;
 export type Next<Request extends JsonRpcCall> = (request?: Readonly<Request>) => Promise<Readonly<ResultConstraint<Request>> | undefined>;
-export type MiddlewareParams<Request extends JsonRpcCall = JsonRpcCall, Context extends ContextConstraint = MiddlewareContext> = {
+export type MiddlewareParams<Request extends JsonRpcCall = JsonRpcCall, Context extends MiddlewareContext = MiddlewareContext> = {
     request: Readonly<Request>;
     context: Context;
     next: Next<Request>;
 };
 export type JsonRpcMiddleware<Request extends JsonRpcCall = JsonRpcCall, Result extends ResultConstraint<Request> = ResultConstraint<Request>, Context extends ContextConstraint = MiddlewareContext> = (params: MiddlewareParams<Request, Context>) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;
-/**
- * The options for the JSON-RPC request/notification handling operation.
- */
-export type HandleOptions<Context extends ContextConstraint> = {
-    context?: Context | InferKeyValues<Context>;
+type HandleOptions<Context extends MiddlewareContext> = {
+    context?: Context;
 };
 /**
  * The request type of a middleware.

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

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

package/dist/v2/JsonRpcEngineV2.mjs

@@ -134,10 +134,10 @@ _JsonRpcEngineV2_middleware = new WeakMap(), _JsonRpcEngineV2_isDestroyed = new
  * operation. Permits returning an `undefined` result.
  *
  * @param originalRequest - The JSON-RPC request to handle.
- * @param rawContext - The context to pass to the middleware.
+ * @param context - The context to pass to the middleware.
  * @returns The result from the middleware.
  */
-async function _JsonRpcEngineV2_handle(originalRequest, rawContext = new MiddlewareContext()) {
+async function _JsonRpcEngineV2_handle(originalRequest, context = new MiddlewareContext()) {
     __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_assertIsNotDestroyed).call(this);
     deepFreeze(originalRequest);
     const state = {
@@ -146,9 +146,6 @@ async function _JsonRpcEngineV2_handle(originalRequest, rawContext = new Middlew
     };
     const middlewareIterator = __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_makeMiddlewareIterator).call(this);
     const firstMiddleware = middlewareIterator.next().value;
-    const context = MiddlewareContext.isInstance(rawContext)
-        ? rawContext
-        : new MiddlewareContext(rawContext);
     const makeNext = __classPrivateFieldGet(this, _JsonRpcEngineV2_instances, "m", _JsonRpcEngineV2_makeNextFactory).call(this, middlewareIterator, state, context);
     const result = await firstMiddleware({
         request: originalRequest,

package/dist/v2/JsonRpcEngineV2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcEngineV2.mjs","sourceRoot":"","sources":["../../src/v2/JsonRpcEngineV2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcNotification,\n  type NonEmptyArray,\n  hasProperty,\n} from '@metamask/utils';\nimport deepFreeze from 'deep-freeze-strict';\n\nimport type {\n  ContextConstraint,\n  InferKeyValues,\n  MergeContexts,\n} from './MiddlewareContext';\nimport { MiddlewareContext } from './MiddlewareContext';\nimport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  stringify,\n} from './utils';\nimport type { JsonRpcCall } from './utils';\n\n// Helper to forbid `id` on notifications\ntype WithoutId<Request extends JsonRpcCall> = Request & { id?: never };\n\n// Helper to enable JsonRpcCall overload of handle()\ntype MixedParam<Request extends JsonRpcCall> = [\n  Extract<Request, JsonRpcRequest>,\n] extends [never]\n  ? never\n  : [Extract<Request, JsonRpcNotification>] extends [never]\n    ? never\n    :\n        | Extract<Request, JsonRpcRequest>\n        | WithoutId<Extract<Request, JsonRpcNotification>>;\n\nexport type ResultConstraint<Request extends JsonRpcCall> =\n  Request extends JsonRpcRequest ? Json : void;\n\nexport type Next<Request extends JsonRpcCall> = (\n  request?: Readonly<Request>,\n) => Promise<Readonly<ResultConstraint<Request>> | undefined>;\n\nexport type MiddlewareParams<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> = {\n  request: Readonly<Request>;\n  context: Context;\n  next: Next<Request>;\n};\n\nexport type JsonRpcMiddleware<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Result extends ResultConstraint<Request> = ResultConstraint<Request>,\n  Context extends ContextConstraint = MiddlewareContext,\n> = (\n  params: MiddlewareParams<Request, Context>,\n) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;\n\ntype RequestState<Request extends JsonRpcCall> = {\n  request: Request;\n  result: Readonly<ResultConstraint<Request>> | undefined;\n};\n\n/**\n * The options for the JSON-RPC request/notification handling operation.\n */\nexport type HandleOptions<Context extends ContextConstraint> = {\n  context?: Context | InferKeyValues<Context>;\n};\n\ntype ConstructorOptions<\n  Request extends JsonRpcCall,\n  Context extends MiddlewareContext,\n> = {\n  middleware: NonEmptyArray<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  >;\n};\n\n/**\n * The request type of a middleware.\n */\nexport type RequestOf<Middleware> =\n  Middleware extends JsonRpcMiddleware<\n    infer Request,\n    ResultConstraint<infer Request>,\n    // Non-polluting `any` constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    any\n  >\n    ? Request\n    : never;\n\ntype ContextOf<Middleware> =\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Middleware extends JsonRpcMiddleware<any, ResultConstraint<any>, infer C>\n    ? C\n    : never;\n\n/**\n * A constraint for {@link JsonRpcMiddleware} generic parameters.\n */\n// Non-polluting `any` constraint.\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport type MiddlewareConstraint = JsonRpcMiddleware<\n  any,\n  ResultConstraint<any>,\n  MiddlewareContext<any>\n>;\n/* eslint-enable @typescript-eslint/no-explicit-any */\n\n/**\n * The context supertype of a middleware type.\n */\nexport type MergedContextOf<Middleware extends MiddlewareConstraint> =\n  MergeContexts<ContextOf<Middleware>>;\n\nconst INVALID_ENGINE = Symbol('Invalid engine');\n\n/**\n * An internal type for invalid engines that explains why the engine is invalid.\n *\n * @template Message - The message explaining why the engine is invalid.\n */\ntype InvalidEngine<Message extends string> = { [INVALID_ENGINE]: Message };\n\n/**\n * A JSON-RPC request and response processor.\n *\n * Give it a stack of middleware, pass it requests, and get back responses.\n *\n * #### Requests vs. notifications\n *\n * JSON-RPC requests come in two flavors:\n *\n * - [Requests](https://www.jsonrpc.org/specification#request_object), i.e. request objects _with_ an `id`\n * - [Notifications](https://www.jsonrpc.org/specification#notification), i.e. request objects _without_ an `id`\n *\n * For requests, one of the engine's middleware must \"end\" the request by returning a non-`undefined` result,\n * or {@link handle} will throw an error:\n *\n * For notifications, on the other hand, one of the engine's middleware must return `undefined` to end the request,\n * and any non-`undefined` return values will cause an error:\n *\n * @template Request - The type of request to handle.\n * @template Result - The type of result to return.\n *\n * @example\n * ```ts\n * const engine = JsonRpcEngineV2.create({\n *   middleware,\n * });\n *\n * try {\n *   const result = await engine.handle(request);\n *   // Handle result\n * } catch (error) {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcEngineV2<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> {\n  #middleware: Readonly<\n    NonEmptyArray<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >\n  >;\n\n  #isDestroyed = false;\n\n  // See .create() for why this is private.\n  private constructor({ middleware }: ConstructorOptions<Request, Context>) {\n    this.#middleware = [...middleware];\n  }\n\n  // We use a static factory method in order to construct a supertype of all middleware contexts,\n  // which enables us to instantiate an engine despite different middleware expecting different\n  // context types.\n  /**\n   * Create a new JSON-RPC engine.\n   *\n   * @throws If the middleware array is empty.\n   * @param options - The options for the engine.\n   * @param options.middleware - The middleware to use.\n   * @returns The JSON-RPC engine.\n   */\n  static create<\n    Middleware extends JsonRpcMiddleware<\n      // Non-polluting `any` constraint.\n      /* eslint-disable @typescript-eslint/no-explicit-any */\n      any,\n      ResultConstraint<any>,\n      any\n      /* eslint-enable @typescript-eslint/no-explicit-any */\n    > = JsonRpcMiddleware,\n  >({ middleware }: { middleware: Middleware[] }) {\n    // We can't use NonEmptyArray for the params because it ruins type inference.\n    if (middleware.length === 0) {\n      throw new JsonRpcEngineError('Middleware array cannot be empty');\n    }\n\n    type MergedContext = MergedContextOf<Middleware>;\n    type InputRequest = RequestOf<Middleware>;\n    const mw = middleware as unknown as NonEmptyArray<\n      JsonRpcMiddleware<\n        InputRequest,\n        ResultConstraint<InputRequest>,\n        MergedContext\n      >\n    >;\n    return new JsonRpcEngineV2<InputRequest, MergedContext>({\n      middleware: mw,\n    }) as MergedContext extends never\n      ? InvalidEngine<'Some middleware have incompatible context types'>\n      : JsonRpcEngineV2<InputRequest, MergedContext>;\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * @param request - The JSON-RPC request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response.\n   */\n  async handle(\n    request: Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : Extract<Request, JsonRpcRequest>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC notification. Notifications do not return a result.\n   *\n   * @param notification - The JSON-RPC notification to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   */\n  async handle(\n    notification: Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : WithoutId<Extract<Request, JsonRpcNotification>>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC call, i.e. request or notification. Requests return a\n   * result, notifications do not.\n   *\n   * @param call - The JSON-RPC call to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response, or `undefined` if the call is a notification.\n   */\n  async handle(\n    call: MixedParam<Request>,\n    options?: HandleOptions<Context>,\n  ): Promise<ResultConstraint<Request> | void>;\n\n  async handle(\n    request: Request,\n    { context }: HandleOptions<Context> = {},\n  ): Promise<Readonly<ResultConstraint<Request>> | void> {\n    const isReq = isRequest(request);\n    const { result } = await this.#handle(request, context);\n\n    if (isReq && result === undefined) {\n      throw new JsonRpcEngineError(\n        `Nothing ended request: ${stringify(request)}`,\n      );\n    }\n    return result;\n  }\n\n  /**\n   * Handle a JSON-RPC request. Throws if a middleware performs an invalid\n   * operation. Permits returning an `undefined` result.\n   *\n   * @param originalRequest - The JSON-RPC request to handle.\n   * @param rawContext - The context to pass to the middleware.\n   * @returns The result from the middleware.\n   */\n  async #handle(\n    originalRequest: Request,\n    rawContext:\n      | Context\n      | InferKeyValues<Context> = new MiddlewareContext() as Context,\n  ): Promise<RequestState<Request>> {\n    this.#assertIsNotDestroyed();\n\n    deepFreeze(originalRequest);\n\n    const state: RequestState<Request> = {\n      request: originalRequest,\n      result: undefined,\n    };\n    const middlewareIterator = this.#makeMiddlewareIterator();\n    const firstMiddleware = middlewareIterator.next().value;\n    const context = MiddlewareContext.isInstance(rawContext)\n      ? rawContext\n      : (new MiddlewareContext(rawContext) as Context);\n\n    const makeNext = this.#makeNextFactory(middlewareIterator, state, context);\n\n    const result = await firstMiddleware({\n      request: originalRequest,\n      context,\n      next: makeNext(),\n    });\n    this.#updateResult(result, state);\n\n    return state;\n  }\n\n  /**\n   * Create a factory of `next()` functions for use with a particular request.\n   * The factory is recursive, and a new `next()` is created for each middleware\n   * invocation.\n   *\n   * @param middlewareIterator - The iterator of middleware for the current\n   * request.\n   * @param state - The current values of the request and result.\n   * @param context - The context to pass to the middleware.\n   * @returns The `next()` function factory.\n   */\n  #makeNextFactory(\n    middlewareIterator: Iterator<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >,\n    state: RequestState<Request>,\n    context: Context,\n  ): () => Next<Request> {\n    const makeNext = (): Next<Request> => {\n      let wasCalled = false;\n\n      const next = async (\n        request: Request = state.request,\n      ): Promise<Readonly<ResultConstraint<Request>> | undefined> => {\n        if (wasCalled) {\n          throw new JsonRpcEngineError(\n            `Middleware attempted to call next() multiple times for request: ${stringify(request)}`,\n          );\n        }\n        wasCalled = true;\n\n        if (request !== state.request) {\n          this.#assertValidNextRequest(state.request, request);\n          state.request = deepFreeze(request);\n        }\n\n        const { value: nextMiddleware, done } = middlewareIterator.next();\n        if (done) {\n          // This will cause the last middleware to return `undefined`. See the class\n          // JSDoc or package README for more details.\n          return undefined;\n        }\n\n        const result = await nextMiddleware({\n          request,\n          context,\n          next: makeNext(),\n        });\n        this.#updateResult(result, state);\n\n        return state.result;\n      };\n      return next;\n    };\n\n    return makeNext;\n  }\n\n  #makeMiddlewareIterator(): Iterator<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  > {\n    return this.#middleware[Symbol.iterator]();\n  }\n\n  /**\n   * Validate the result from a middleware and, if it's a new value, update the\n   * current result.\n   *\n   * @param result - The result from the middleware.\n   * @param state - The current values of the request and result.\n   */\n  #updateResult(\n    result:\n      | Readonly<ResultConstraint<Request>>\n      | ResultConstraint<Request>\n      | void,\n    state: RequestState<Request>,\n  ): void {\n    if (isNotification(state.request) && result !== undefined) {\n      throw new JsonRpcEngineError(\n        `Result returned for notification: ${stringify(state.request)}`,\n      );\n    }\n\n    if (result !== undefined && result !== state.result) {\n      if (typeof result === 'object' && result !== null) {\n        deepFreeze(result);\n      }\n      state.result = result;\n    }\n  }\n\n  /**\n   * Assert that a request modified by a middleware is valid.\n   *\n   * @param currentRequest - The current request.\n   * @param nextRequest - The next request.\n   */\n  #assertValidNextRequest(currentRequest: Request, nextRequest: Request): void {\n    if (nextRequest.jsonrpc !== currentRequest.jsonrpc) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"jsonrpc\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n    if (\n      hasProperty(nextRequest, 'id') !== hasProperty(currentRequest, 'id') ||\n      // @ts-expect-error - \"id\" does not exist on notifications, but we can still\n      // check the value of the property at runtime.\n      nextRequest.id !== currentRequest.id\n    ) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"id\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n  }\n\n  /**\n   * Convert the engine into a JSON-RPC middleware.\n   *\n   * @returns The JSON-RPC middleware.\n   */\n  asMiddleware(): JsonRpcMiddleware<\n    Request,\n    ResultConstraint<Request>,\n    Context\n  > {\n    this.#assertIsNotDestroyed();\n\n    return async ({ request, context, next }) => {\n      const { result, request: finalRequest } = await this.#handle(\n        request,\n        context,\n      );\n      return result === undefined ? await next(finalRequest) : result;\n    };\n  }\n\n  /**\n   * Destroy the engine. Calls the `destroy()` method of any middleware that has\n   * one. Attempting to use the engine after destroying it will throw an error.\n   */\n  async destroy(): Promise<void> {\n    if (this.#isDestroyed) {\n      return;\n    }\n    this.#isDestroyed = true;\n\n    const destructionPromise = Promise.all(\n      this.#middleware.map(async (middleware) => {\n        if (\n          // Intentionally using `in` to walk the prototype chain.\n          'destroy' in middleware &&\n          typeof middleware.destroy === 'function'\n        ) {\n          return middleware.destroy();\n        }\n        return undefined;\n      }),\n    );\n    this.#middleware = [] as never;\n    await destructionPromise;\n  }\n\n  #assertIsNotDestroyed(): void {\n    if (this.#isDestroyed) {\n      throw new JsonRpcEngineError('Engine is destroyed');\n    }\n  }\n}\n"]}
+{"version":3,"file":"JsonRpcEngineV2.mjs","sourceRoot":"","sources":["../../src/v2/JsonRpcEngineV2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcNotification,\n  type NonEmptyArray,\n  hasProperty,\n} from '@metamask/utils';\nimport deepFreeze from 'deep-freeze-strict';\n\nimport type { ContextConstraint, MergeContexts } from './MiddlewareContext';\nimport { MiddlewareContext } from './MiddlewareContext';\nimport {\n  isNotification,\n  isRequest,\n  JsonRpcEngineError,\n  stringify,\n} from './utils';\nimport type { JsonRpcCall } from './utils';\n\n// Helper to forbid `id` on notifications\ntype WithoutId<Request extends JsonRpcCall> = Request & { id?: never };\n\n// Helper to enable JsonRpcCall overload of handle()\ntype MixedParam<Request extends JsonRpcCall> = [\n  Extract<Request, JsonRpcRequest>,\n] extends [never]\n  ? never\n  : [Extract<Request, JsonRpcNotification>] extends [never]\n    ? never\n    :\n        | Extract<Request, JsonRpcRequest>\n        | WithoutId<Extract<Request, JsonRpcNotification>>;\n\nexport type ResultConstraint<Request extends JsonRpcCall> =\n  Request extends JsonRpcRequest ? Json : void;\n\nexport type Next<Request extends JsonRpcCall> = (\n  request?: Readonly<Request>,\n) => Promise<Readonly<ResultConstraint<Request>> | undefined>;\n\nexport type MiddlewareParams<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends MiddlewareContext = MiddlewareContext,\n> = {\n  request: Readonly<Request>;\n  context: Context;\n  next: Next<Request>;\n};\n\nexport type JsonRpcMiddleware<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Result extends ResultConstraint<Request> = ResultConstraint<Request>,\n  Context extends ContextConstraint = MiddlewareContext,\n> = (\n  params: MiddlewareParams<Request, Context>,\n) => Readonly<Result> | undefined | Promise<Readonly<Result> | undefined>;\n\ntype RequestState<Request extends JsonRpcCall> = {\n  request: Request;\n  result: Readonly<ResultConstraint<Request>> | undefined;\n};\n\ntype HandleOptions<Context extends MiddlewareContext> = {\n  context?: Context;\n};\n\ntype ConstructorOptions<\n  Request extends JsonRpcCall,\n  Context extends MiddlewareContext,\n> = {\n  middleware: NonEmptyArray<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  >;\n};\n\n/**\n * The request type of a middleware.\n */\nexport type RequestOf<Middleware> =\n  Middleware extends JsonRpcMiddleware<\n    infer Request,\n    ResultConstraint<infer Request>,\n    // Non-polluting `any` constraint.\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    any\n  >\n    ? Request\n    : never;\n\ntype ContextOf<Middleware> =\n  // Non-polluting `any` constraint.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Middleware extends JsonRpcMiddleware<any, ResultConstraint<any>, infer C>\n    ? C\n    : never;\n\n/**\n * A constraint for {@link JsonRpcMiddleware} generic parameters.\n */\n// Non-polluting `any` constraint.\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport type MiddlewareConstraint = JsonRpcMiddleware<\n  any,\n  ResultConstraint<any>,\n  MiddlewareContext<any>\n>;\n/* eslint-enable @typescript-eslint/no-explicit-any */\n\n/**\n * The context supertype of a middleware type.\n */\nexport type MergedContextOf<Middleware extends MiddlewareConstraint> =\n  MergeContexts<ContextOf<Middleware>>;\n\nconst INVALID_ENGINE = Symbol('Invalid engine');\n\n/**\n * An internal type for invalid engines that explains why the engine is invalid.\n *\n * @template Message - The message explaining why the engine is invalid.\n */\ntype InvalidEngine<Message extends string> = { [INVALID_ENGINE]: Message };\n\n/**\n * A JSON-RPC request and response processor.\n *\n * Give it a stack of middleware, pass it requests, and get back responses.\n *\n * #### Requests vs. notifications\n *\n * JSON-RPC requests come in two flavors:\n *\n * - [Requests](https://www.jsonrpc.org/specification#request_object), i.e. request objects _with_ an `id`\n * - [Notifications](https://www.jsonrpc.org/specification#notification), i.e. request objects _without_ an `id`\n *\n * For requests, one of the engine's middleware must \"end\" the request by returning a non-`undefined` result,\n * or {@link handle} will throw an error:\n *\n * For notifications, on the other hand, one of the engine's middleware must return `undefined` to end the request,\n * and any non-`undefined` return values will cause an error:\n *\n * @template Request - The type of request to handle.\n * @template Result - The type of result to return.\n *\n * @example\n * ```ts\n * const engine = JsonRpcEngineV2.create({\n *   middleware,\n * });\n *\n * try {\n *   const result = await engine.handle(request);\n *   // Handle result\n * } catch (error) {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcEngineV2<\n  Request extends JsonRpcCall = JsonRpcCall,\n  Context extends ContextConstraint = MiddlewareContext,\n> {\n  #middleware: Readonly<\n    NonEmptyArray<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >\n  >;\n\n  #isDestroyed = false;\n\n  // See .create() for why this is private.\n  private constructor({ middleware }: ConstructorOptions<Request, Context>) {\n    this.#middleware = [...middleware];\n  }\n\n  // We use a static factory method in order to construct a supertype of all middleware contexts,\n  // which enables us to instantiate an engine despite different middleware expecting different\n  // context types.\n  /**\n   * Create a new JSON-RPC engine.\n   *\n   * @throws If the middleware array is empty.\n   * @param options - The options for the engine.\n   * @param options.middleware - The middleware to use.\n   * @returns The JSON-RPC engine.\n   */\n  static create<\n    Middleware extends JsonRpcMiddleware<\n      // Non-polluting `any` constraint.\n      /* eslint-disable @typescript-eslint/no-explicit-any */\n      any,\n      ResultConstraint<any>,\n      any\n      /* eslint-enable @typescript-eslint/no-explicit-any */\n    > = JsonRpcMiddleware,\n  >({ middleware }: { middleware: Middleware[] }) {\n    // We can't use NonEmptyArray for the params because it ruins type inference.\n    if (middleware.length === 0) {\n      throw new JsonRpcEngineError('Middleware array cannot be empty');\n    }\n\n    type MergedContext = MergedContextOf<Middleware>;\n    type InputRequest = RequestOf<Middleware>;\n    const mw = middleware as unknown as NonEmptyArray<\n      JsonRpcMiddleware<\n        InputRequest,\n        ResultConstraint<InputRequest>,\n        MergedContext\n      >\n    >;\n    return new JsonRpcEngineV2<InputRequest, MergedContext>({\n      middleware: mw,\n    }) as MergedContext extends never\n      ? InvalidEngine<'Some middleware have incompatible context types'>\n      : JsonRpcEngineV2<InputRequest, MergedContext>;\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * @param request - The JSON-RPC request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response.\n   */\n  async handle(\n    request: Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : Extract<Request, JsonRpcRequest>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcRequest> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC notification. Notifications do not return a result.\n   *\n   * @param notification - The JSON-RPC notification to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   */\n  async handle(\n    notification: Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : WithoutId<Extract<Request, JsonRpcNotification>>,\n    options?: HandleOptions<Context>,\n  ): Promise<\n    Extract<Request, JsonRpcNotification> extends never\n      ? never\n      : ResultConstraint<Request>\n  >;\n\n  /**\n   * Handle a JSON-RPC call, i.e. request or notification. Requests return a\n   * result, notifications do not.\n   *\n   * @param call - The JSON-RPC call to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response, or `undefined` if the call is a notification.\n   */\n  async handle(\n    call: MixedParam<Request>,\n    options?: HandleOptions<Context>,\n  ): Promise<ResultConstraint<Request> | void>;\n\n  async handle(\n    request: Request,\n    { context }: HandleOptions<Context> = {},\n  ): Promise<Readonly<ResultConstraint<Request>> | void> {\n    const isReq = isRequest(request);\n    const { result } = await this.#handle(request, context);\n\n    if (isReq && result === undefined) {\n      throw new JsonRpcEngineError(\n        `Nothing ended request: ${stringify(request)}`,\n      );\n    }\n    return result;\n  }\n\n  /**\n   * Handle a JSON-RPC request. Throws if a middleware performs an invalid\n   * operation. Permits returning an `undefined` result.\n   *\n   * @param originalRequest - The JSON-RPC request to handle.\n   * @param context - The context to pass to the middleware.\n   * @returns The result from the middleware.\n   */\n  async #handle(\n    originalRequest: Request,\n    context: Context = new MiddlewareContext() as Context,\n  ): Promise<RequestState<Request>> {\n    this.#assertIsNotDestroyed();\n\n    deepFreeze(originalRequest);\n\n    const state: RequestState<Request> = {\n      request: originalRequest,\n      result: undefined,\n    };\n    const middlewareIterator = this.#makeMiddlewareIterator();\n    const firstMiddleware = middlewareIterator.next().value;\n\n    const makeNext = this.#makeNextFactory(middlewareIterator, state, context);\n\n    const result = await firstMiddleware({\n      request: originalRequest,\n      context,\n      next: makeNext(),\n    });\n    this.#updateResult(result, state);\n\n    return state;\n  }\n\n  /**\n   * Create a factory of `next()` functions for use with a particular request.\n   * The factory is recursive, and a new `next()` is created for each middleware\n   * invocation.\n   *\n   * @param middlewareIterator - The iterator of middleware for the current\n   * request.\n   * @param state - The current values of the request and result.\n   * @param context - The context to pass to the middleware.\n   * @returns The `next()` function factory.\n   */\n  #makeNextFactory(\n    middlewareIterator: Iterator<\n      JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n    >,\n    state: RequestState<Request>,\n    context: Context,\n  ): () => Next<Request> {\n    const makeNext = (): Next<Request> => {\n      let wasCalled = false;\n\n      const next = async (\n        request: Request = state.request,\n      ): Promise<Readonly<ResultConstraint<Request>> | undefined> => {\n        if (wasCalled) {\n          throw new JsonRpcEngineError(\n            `Middleware attempted to call next() multiple times for request: ${stringify(request)}`,\n          );\n        }\n        wasCalled = true;\n\n        if (request !== state.request) {\n          this.#assertValidNextRequest(state.request, request);\n          state.request = deepFreeze(request);\n        }\n\n        const { value: nextMiddleware, done } = middlewareIterator.next();\n        if (done) {\n          // This will cause the last middleware to return `undefined`. See the class\n          // JSDoc or package README for more details.\n          return undefined;\n        }\n\n        const result = await nextMiddleware({\n          request,\n          context,\n          next: makeNext(),\n        });\n        this.#updateResult(result, state);\n\n        return state.result;\n      };\n      return next;\n    };\n\n    return makeNext;\n  }\n\n  #makeMiddlewareIterator(): Iterator<\n    JsonRpcMiddleware<Request, ResultConstraint<Request>, Context>\n  > {\n    return this.#middleware[Symbol.iterator]();\n  }\n\n  /**\n   * Validate the result from a middleware and, if it's a new value, update the\n   * current result.\n   *\n   * @param result - The result from the middleware.\n   * @param state - The current values of the request and result.\n   */\n  #updateResult(\n    result:\n      | Readonly<ResultConstraint<Request>>\n      | ResultConstraint<Request>\n      | void,\n    state: RequestState<Request>,\n  ): void {\n    if (isNotification(state.request) && result !== undefined) {\n      throw new JsonRpcEngineError(\n        `Result returned for notification: ${stringify(state.request)}`,\n      );\n    }\n\n    if (result !== undefined && result !== state.result) {\n      if (typeof result === 'object' && result !== null) {\n        deepFreeze(result);\n      }\n      state.result = result;\n    }\n  }\n\n  /**\n   * Assert that a request modified by a middleware is valid.\n   *\n   * @param currentRequest - The current request.\n   * @param nextRequest - The next request.\n   */\n  #assertValidNextRequest(currentRequest: Request, nextRequest: Request): void {\n    if (nextRequest.jsonrpc !== currentRequest.jsonrpc) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"jsonrpc\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n    if (\n      hasProperty(nextRequest, 'id') !== hasProperty(currentRequest, 'id') ||\n      // @ts-expect-error - \"id\" does not exist on notifications, but we can still\n      // check the value of the property at runtime.\n      nextRequest.id !== currentRequest.id\n    ) {\n      throw new JsonRpcEngineError(\n        `Middleware attempted to modify readonly property \"id\" for request: ${stringify(currentRequest)}`,\n      );\n    }\n  }\n\n  /**\n   * Convert the engine into a JSON-RPC middleware.\n   *\n   * @returns The JSON-RPC middleware.\n   */\n  asMiddleware(): JsonRpcMiddleware<\n    Request,\n    ResultConstraint<Request>,\n    Context\n  > {\n    this.#assertIsNotDestroyed();\n\n    return async ({ request, context, next }) => {\n      const { result, request: finalRequest } = await this.#handle(\n        request,\n        context,\n      );\n      return result === undefined ? await next(finalRequest) : result;\n    };\n  }\n\n  /**\n   * Destroy the engine. Calls the `destroy()` method of any middleware that has\n   * one. Attempting to use the engine after destroying it will throw an error.\n   */\n  async destroy(): Promise<void> {\n    if (this.#isDestroyed) {\n      return;\n    }\n    this.#isDestroyed = true;\n\n    const destructionPromise = Promise.all(\n      this.#middleware.map(async (middleware) => {\n        if (\n          // Intentionally using `in` to walk the prototype chain.\n          'destroy' in middleware &&\n          typeof middleware.destroy === 'function'\n        ) {\n          return middleware.destroy();\n        }\n        return undefined;\n      }),\n    );\n    this.#middleware = [] as never;\n    await destructionPromise;\n  }\n\n  #assertIsNotDestroyed(): void {\n    if (this.#isDestroyed) {\n      throw new JsonRpcEngineError('Engine is destroyed');\n    }\n  }\n}\n"]}

package/dist/v2/JsonRpcServer.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _a, _JsonRpcServer_engine, _JsonRpcServer_onError, _JsonRpcServer_coerceRequest;
+var _JsonRpcServer_instances, _JsonRpcServer_engine, _JsonRpcServer_onError, _JsonRpcServer_coerceRequest;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcServer = void 0;
 const rpc_errors_1 = require("@metamask/rpc-errors");
@@ -57,6 +57,7 @@ class JsonRpcServer {
      * `engine`.
      */
     constructor(options) {
+        _JsonRpcServer_instances.add(this);
         _JsonRpcServer_engine.set(this, void 0);
         _JsonRpcServer_onError.set(this, void 0);
         __classPrivateFieldSet(this, _JsonRpcServer_onError, options.onError, "f");
@@ -69,16 +70,16 @@ class JsonRpcServer {
             __classPrivateFieldSet(this, _JsonRpcServer_engine, JsonRpcEngineV2_1.JsonRpcEngineV2.create({ middleware: options.middleware }), "f");
         }
     }
-    async handle(rawRequest, options) {
+    async handle(rawRequest) {
         // If rawRequest is not a notification, the originalId will be attached
         // to the response. We attach our own, trusted id in #coerceRequest()
         // while the request is being handled.
         const [originalId, isRequest] = getOriginalId(rawRequest);
         try {
-            const request = __classPrivateFieldGet(_a, _a, "m", _JsonRpcServer_coerceRequest).call(_a, rawRequest, isRequest);
+            const request = __classPrivateFieldGet(this, _JsonRpcServer_instances, "m", _JsonRpcServer_coerceRequest).call(this, rawRequest, isRequest);
             // @ts-expect-error - The request may not be of the type expected by the engine,
             // and we intentionally allow this to happen.
-            const result = await __classPrivateFieldGet(this, _JsonRpcServer_engine, "f").handle(request, options);
+            const result = await __classPrivateFieldGet(this, _JsonRpcServer_engine, "f").handle(request);
             if (result !== undefined) {
                 return {
                     jsonrpc,
@@ -106,7 +107,7 @@ class JsonRpcServer {
     }
 }
 exports.JsonRpcServer = JsonRpcServer;
-_a = JsonRpcServer, _JsonRpcServer_engine = new WeakMap(), _JsonRpcServer_onError = new WeakMap(), _JsonRpcServer_coerceRequest = function _JsonRpcServer_coerceRequest(rawRequest, isRequest) {
+_JsonRpcServer_engine = new WeakMap(), _JsonRpcServer_onError = new WeakMap(), _JsonRpcServer_instances = new WeakSet(), _JsonRpcServer_coerceRequest = function _JsonRpcServer_coerceRequest(rawRequest, isRequest) {
     if (!isMinimalRequest(rawRequest)) {
         throw rpc_errors_1.rpcErrors.invalidRequest({
             data: {

package/dist/v2/JsonRpcServer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcServer.cjs","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":"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","sourcesContent":["import { rpcErrors, serializeError } from '@metamask/rpc-errors';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcResponse,\n  NonEmptyArray,\n} from '@metamask/utils';\nimport { hasProperty, isObject } from '@metamask/utils';\n\nimport type {\n  HandleOptions,\n  JsonRpcMiddleware,\n  MergedContextOf,\n  MiddlewareConstraint,\n  RequestOf,\n} from './JsonRpcEngineV2';\nimport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nimport type { JsonRpcCall } from './utils';\nimport { getUniqueId } from '../getUniqueId';\n\ntype OnError = (error: unknown) => void;\n\ntype Options<Middleware extends MiddlewareConstraint> = {\n  onError?: OnError;\n} & (\n  | {\n      engine: ReturnType<typeof JsonRpcEngineV2.create<Middleware>>;\n    }\n  | {\n      middleware: NonEmptyArray<Middleware>;\n    }\n);\n\nconst jsonrpc = '2.0' as const;\n\n/**\n * A JSON-RPC server that handles requests and notifications.\n *\n * Essentially wraps a {@link JsonRpcEngineV2} in order to create a conformant\n * yet permissive JSON-RPC 2.0 server.\n *\n * Note that the server will accept both requests and notifications via {@link handle},\n * even if the underlying engine is only able to handle one or the other.\n *\n * @example\n * ```ts\n * const server = new JsonRpcServer({\n *   engine,\n *   onError,\n * });\n *\n * const response = await server.handle(request);\n * if ('result' in response) {\n *   // Handle result\n * } else {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcServer<\n  Middleware extends MiddlewareConstraint = JsonRpcMiddleware,\n> {\n  readonly #engine: JsonRpcEngineV2<\n    RequestOf<Middleware>,\n    MergedContextOf<Middleware>\n  >;\n\n  readonly #onError?: OnError | undefined;\n\n  /**\n   * Construct a new JSON-RPC server.\n   *\n   * @param options - The options for the server.\n   * @param options.onError - The callback to handle errors thrown by the\n   * engine. Errors always result in a failed response object, containing a\n   * JSON-RPC 2.0 serialized version of the original error. If you need to\n   * access the original error, use the `onError` callback.\n   * @param options.engine - The engine to use. Mutually exclusive with\n   * `middleware`.\n   * @param options.middleware - The middleware to use. Mutually exclusive with\n   * `engine`.\n   */\n  constructor(options: Options<Middleware>) {\n    this.#onError = options.onError;\n\n    if (hasProperty(options, 'engine')) {\n      // @ts-expect-error - hasProperty fails to narrow the type.\n      this.#engine = options.engine;\n    } else {\n      // @ts-expect-error - TypeScript complains that engine is of the wrong type, but clearly it's not.\n      this.#engine = JsonRpcEngineV2.create({ middleware: options.middleware });\n    }\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * This method never throws. For requests, a response is always returned.\n   * All errors are passed to the engine's `onError` callback.\n   *\n   * **WARNING**: This method is unaware of the request type of the underlying\n   * engine. The request will fail if the engine can only handle notifications.\n   *\n   * @param request - The request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response.\n   */\n  async handle(\n    request: JsonRpcRequest,\n    options?: HandleOptions<MergedContextOf<Middleware>>,\n  ): Promise<JsonRpcResponse>;\n\n  /**\n   * Handle a JSON-RPC notification.\n   *\n   * This method never throws. For notifications, `undefined` is always returned.\n   * All errors are passed to the engine's `onError` callback.\n   *\n   * **WARNING**: This method is unaware of the request type of the underlying\n   * engine. The request will fail if the engine cannot handle notifications.\n   *\n   * @param notification - The notification to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   */\n  async handle(\n    notification: JsonRpcNotification,\n    options?: HandleOptions<MergedContextOf<Middleware>>,\n  ): Promise<void>;\n\n  /**\n   * Handle an alleged JSON-RPC request or notification. Permits any plain\n   * object with `{ method: string }`, so long as any present JSON-RPC 2.0\n   * properties are valid. If the object has an `id` property, it will be\n   * treated as a request, otherwise it will be treated as a notification.\n   *\n   * This method never throws. All errors are passed to the engine's\n   * `onError` callback. A JSON-RPC response is always returned for requests,\n   * and `undefined` is returned for notifications.\n   *\n   * **WARNING**: The request will fail if its coerced type (i.e. request or\n   * response) is not of the type expected by the underlying engine.\n   *\n   * @param rawRequest - The raw request to handle.\n   * @param options - The options for the handle operation.\n   * @param options.context - The context to pass to the middleware.\n   * @returns The JSON-RPC response, or `undefined` if the request is a\n   * notification.\n   */\n  async handle(\n    rawRequest: unknown,\n    options?: HandleOptions<MergedContextOf<Middleware>>,\n  ): Promise<JsonRpcResponse | void>;\n\n  async handle(\n    rawRequest: unknown,\n    options?: HandleOptions<MergedContextOf<Middleware>>,\n  ): Promise<JsonRpcResponse | void> {\n    // If rawRequest is not a notification, the originalId will be attached\n    // to the response. We attach our own, trusted id in #coerceRequest()\n    // while the request is being handled.\n    const [originalId, isRequest] = getOriginalId(rawRequest);\n\n    try {\n      const request = JsonRpcServer.#coerceRequest(rawRequest, isRequest);\n      // @ts-expect-error - The request may not be of the type expected by the engine,\n      // and we intentionally allow this to happen.\n      const result = await this.#engine.handle(request, options);\n\n      if (result !== undefined) {\n        return {\n          jsonrpc,\n          // @ts-expect-error - Reassign the original id, regardless of its type.\n          id: originalId,\n          result,\n        };\n      }\n    } catch (error) {\n      this.#onError?.(error);\n\n      if (isRequest) {\n        return {\n          jsonrpc,\n          // @ts-expect-error - Reassign the original id, regardless of its type.\n          id: originalId,\n          error: serializeError(error, {\n            shouldIncludeStack: false,\n            shouldPreserveMessage: true,\n          }),\n        };\n      }\n    }\n    return undefined;\n  }\n\n  static #coerceRequest(rawRequest: unknown, isRequest: boolean): JsonRpcCall {\n    if (!isMinimalRequest(rawRequest)) {\n      throw rpcErrors.invalidRequest({\n        data: {\n          request: rawRequest,\n        },\n      });\n    }\n\n    const request: JsonRpcCall = {\n      jsonrpc,\n      method: rawRequest.method,\n    };\n\n    if (hasProperty(rawRequest, 'params')) {\n      request.params = rawRequest.params as JsonRpcParams;\n    }\n\n    if (isRequest) {\n      (request as JsonRpcRequest).id = getUniqueId();\n    }\n\n    return request;\n  }\n}\n\n/**\n * The most minimally conformant request object that we will accept.\n */\ntype MinimalRequest = {\n  method: string;\n  params?: JsonRpcParams;\n} & Record<string, unknown>;\n\n/**\n * Check if an unvalidated request is a minimal request.\n *\n * @param rawRequest - The raw request to check.\n * @returns `true` if the request is a {@link MinimalRequest}, `false` otherwise.\n */\nfunction isMinimalRequest(rawRequest: unknown): rawRequest is MinimalRequest {\n  return (\n    isObject(rawRequest) &&\n    hasProperty(rawRequest, 'method') &&\n    typeof rawRequest.method === 'string' &&\n    hasValidParams(rawRequest)\n  );\n}\n\n/**\n * Check if a request has valid params, i.e. an array or object.\n * The contents of the params are not inspected.\n *\n * @param rawRequest - The request to check.\n * @returns `true` if the request has valid params, `false` otherwise.\n */\nfunction hasValidParams(\n  rawRequest: Record<string, unknown>,\n): rawRequest is { params?: JsonRpcParams } {\n  if (hasProperty(rawRequest, 'params')) {\n    return Array.isArray(rawRequest.params) || isObject(rawRequest.params);\n  }\n  return true;\n}\n\n/**\n * Get the original id from a request.\n *\n * @param rawRequest - The request to get the original id from.\n * @returns The original id and a boolean indicating if the request is a request\n * (as opposed to a notification).\n */\nfunction getOriginalId(rawRequest: unknown): [unknown, boolean] {\n  if (isObject(rawRequest) && hasProperty(rawRequest, 'id')) {\n    return [rawRequest.id, true];\n  }\n  return [undefined, false];\n}\n"]}
+{"version":3,"file":"JsonRpcServer.cjs","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAiE;AAQjE,2CAAwD;AAQxD,2DAAoD;AAEpD,oDAA6C;AAe7C,MAAM,OAAO,GAAG,KAAc,CAAC;AAE/B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,aAAa;IAUxB;;;;;;;;;;;;OAYG;IACH,YAAY,OAA4B;;QApB/B,wCAGP;QAEO,yCAA+B;QAgBtC,uBAAA,IAAI,0BAAY,OAAO,CAAC,OAAO,MAAA,CAAC;QAEhC,IAAI,IAAA,mBAAW,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;YAClC,2DAA2D;YAC3D,uBAAA,IAAI,yBAAW,OAAO,CAAC,MAAM,MAAA,CAAC;SAC/B;aAAM;YACL,kGAAkG;YAClG,uBAAA,IAAI,yBAAW,iCAAe,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,MAAA,CAAC;SAC3E;IACH,CAAC;IAgDD,KAAK,CAAC,MAAM,CAAC,UAAmB;QAC9B,uEAAuE;QACvE,qEAAqE;QACrE,sCAAsC;QACtC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAE1D,IAAI;YACF,MAAM,OAAO,GAAG,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,UAAU,EAAE,SAAS,CAAC,CAAC;YAC3D,gFAAgF;YAChF,6CAA6C;YAC7C,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,6BAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAElD,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,OAAO;oBACL,OAAO;oBACP,uEAAuE;oBACvE,EAAE,EAAE,UAAU;oBACd,MAAM;iBACP,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,uBAAA,IAAI,8BAAS,EAAE,KAAf,IAAI,EAAY,KAAK,CAAC,CAAC;YAEvB,IAAI,SAAS,EAAE;gBACb,OAAO;oBACL,OAAO;oBACP,uEAAuE;oBACvE,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,IAAA,2BAAc,EAAC,KAAK,EAAE;wBAC3B,kBAAkB,EAAE,KAAK;wBACzB,qBAAqB,EAAE,IAAI;qBAC5B,CAAC;iBACH,CAAC;aACH;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CA0BF;AA/ID,sCA+IC;8LAxBgB,UAAmB,EAAE,SAAkB;IACpD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE;QACjC,MAAM,sBAAS,CAAC,cAAc,CAAC;YAC7B,IAAI,EAAE;gBACJ,OAAO,EAAE,UAAU;aACpB;SACF,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAgB;QAC3B,OAAO;QACP,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;IAEF,IAAI,IAAA,mBAAW,EAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;QACrC,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,MAAuB,CAAC;KACrD;IAED,IAAI,SAAS,EAAE;QACZ,OAA0B,CAAC,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAC;KAChD;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAWH;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,UAAmB;IAC3C,OAAO,CACL,IAAA,gBAAQ,EAAC,UAAU,CAAC;QACpB,IAAA,mBAAW,EAAC,UAAU,EAAE,QAAQ,CAAC;QACjC,OAAO,UAAU,CAAC,MAAM,KAAK,QAAQ;QACrC,cAAc,CAAC,UAAU,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CACrB,UAAmC;IAEnC,IAAI,IAAA,mBAAW,EAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAA,gBAAQ,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KACxE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,UAAmB;IACxC,IAAI,IAAA,gBAAQ,EAAC,UAAU,CAAC,IAAI,IAAA,mBAAW,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE;QACzD,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC9B;IACD,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { rpcErrors, serializeError } from '@metamask/rpc-errors';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcResponse,\n  NonEmptyArray,\n} from '@metamask/utils';\nimport { hasProperty, isObject } from '@metamask/utils';\n\nimport type {\n  JsonRpcMiddleware,\n  MergedContextOf,\n  MiddlewareConstraint,\n  RequestOf,\n} from './JsonRpcEngineV2';\nimport { JsonRpcEngineV2 } from './JsonRpcEngineV2';\nimport type { JsonRpcCall } from './utils';\nimport { getUniqueId } from '../getUniqueId';\n\ntype OnError = (error: unknown) => void;\n\ntype Options<Middleware extends MiddlewareConstraint> = {\n  onError?: OnError;\n} & (\n  | {\n      engine: ReturnType<typeof JsonRpcEngineV2.create<Middleware>>;\n    }\n  | {\n      middleware: NonEmptyArray<Middleware>;\n    }\n);\n\nconst jsonrpc = '2.0' as const;\n\n/**\n * A JSON-RPC server that handles requests and notifications.\n *\n * Essentially wraps a {@link JsonRpcEngineV2} in order to create a conformant\n * yet permissive JSON-RPC 2.0 server.\n *\n * Note that the server will accept both requests and notifications via {@link handle},\n * even if the underlying engine is only able to handle one or the other.\n *\n * @example\n * ```ts\n * const server = new JsonRpcServer({\n *   engine,\n *   onError,\n * });\n *\n * const response = await server.handle(request);\n * if ('result' in response) {\n *   // Handle result\n * } else {\n *   // Handle error\n * }\n * ```\n */\nexport class JsonRpcServer<\n  Middleware extends MiddlewareConstraint = JsonRpcMiddleware,\n> {\n  readonly #engine: JsonRpcEngineV2<\n    RequestOf<Middleware>,\n    MergedContextOf<Middleware>\n  >;\n\n  readonly #onError?: OnError | undefined;\n\n  /**\n   * Construct a new JSON-RPC server.\n   *\n   * @param options - The options for the server.\n   * @param options.onError - The callback to handle errors thrown by the\n   * engine. Errors always result in a failed response object, containing a\n   * JSON-RPC 2.0 serialized version of the original error. If you need to\n   * access the original error, use the `onError` callback.\n   * @param options.engine - The engine to use. Mutually exclusive with\n   * `middleware`.\n   * @param options.middleware - The middleware to use. Mutually exclusive with\n   * `engine`.\n   */\n  constructor(options: Options<Middleware>) {\n    this.#onError = options.onError;\n\n    if (hasProperty(options, 'engine')) {\n      // @ts-expect-error - hasProperty fails to narrow the type.\n      this.#engine = options.engine;\n    } else {\n      // @ts-expect-error - TypeScript complains that engine is of the wrong type, but clearly it's not.\n      this.#engine = JsonRpcEngineV2.create({ middleware: options.middleware });\n    }\n  }\n\n  /**\n   * Handle a JSON-RPC request.\n   *\n   * This method never throws. For requests, a response is always returned.\n   * All errors are passed to the engine's `onError` callback.\n   *\n   * **WARNING**: This method is unaware of the request type of the underlying\n   * engine. The request will fail if the engine can only handle notifications.\n   *\n   * @param request - The request to handle.\n   * @returns The JSON-RPC response.\n   */\n  async handle(request: JsonRpcRequest): Promise<JsonRpcResponse>;\n\n  /**\n   * Handle a JSON-RPC notification.\n   *\n   * This method never throws. For notifications, `undefined` is always returned.\n   * All errors are passed to the engine's `onError` callback.\n   *\n   * **WARNING**: This method is unaware of the request type of the underlying\n   * engine. The request will fail if the engine cannot handle notifications.\n   *\n   * @param notification - The notification to handle.\n   */\n  async handle(notification: JsonRpcNotification): Promise<void>;\n\n  /**\n   * Handle an alleged JSON-RPC request or notification. Permits any plain\n   * object with `{ method: string }`, so long as any present JSON-RPC 2.0\n   * properties are valid. If the object has an `id` property, it will be\n   * treated as a request, otherwise it will be treated as a notification.\n   *\n   * This method never throws. All errors are passed to the engine's\n   * `onError` callback. A JSON-RPC response is always returned for requests,\n   * and `undefined` is returned for notifications.\n   *\n   * **WARNING**: The request will fail if its coerced type (i.e. request or\n   * response) is not of the type expected by the underlying engine.\n   *\n   * @param rawRequest - The raw request to handle.\n   * @returns The JSON-RPC response, or `undefined` if the request is a\n   * notification.\n   */\n  async handle(rawRequest: unknown): Promise<JsonRpcResponse | void>;\n\n  async handle(rawRequest: unknown): Promise<JsonRpcResponse | void> {\n    // If rawRequest is not a notification, the originalId will be attached\n    // to the response. We attach our own, trusted id in #coerceRequest()\n    // while the request is being handled.\n    const [originalId, isRequest] = getOriginalId(rawRequest);\n\n    try {\n      const request = this.#coerceRequest(rawRequest, isRequest);\n      // @ts-expect-error - The request may not be of the type expected by the engine,\n      // and we intentionally allow this to happen.\n      const result = await this.#engine.handle(request);\n\n      if (result !== undefined) {\n        return {\n          jsonrpc,\n          // @ts-expect-error - Reassign the original id, regardless of its type.\n          id: originalId,\n          result,\n        };\n      }\n    } catch (error) {\n      this.#onError?.(error);\n\n      if (isRequest) {\n        return {\n          jsonrpc,\n          // @ts-expect-error - Reassign the original id, regardless of its type.\n          id: originalId,\n          error: serializeError(error, {\n            shouldIncludeStack: false,\n            shouldPreserveMessage: true,\n          }),\n        };\n      }\n    }\n    return undefined;\n  }\n\n  #coerceRequest(rawRequest: unknown, isRequest: boolean): JsonRpcCall {\n    if (!isMinimalRequest(rawRequest)) {\n      throw rpcErrors.invalidRequest({\n        data: {\n          request: rawRequest,\n        },\n      });\n    }\n\n    const request: JsonRpcCall = {\n      jsonrpc,\n      method: rawRequest.method,\n    };\n\n    if (hasProperty(rawRequest, 'params')) {\n      request.params = rawRequest.params as JsonRpcParams;\n    }\n\n    if (isRequest) {\n      (request as JsonRpcRequest).id = getUniqueId();\n    }\n\n    return request;\n  }\n}\n\n/**\n * The most minimally conformant request object that we will accept.\n */\ntype MinimalRequest = {\n  method: string;\n  params?: JsonRpcParams;\n} & Record<string, unknown>;\n\n/**\n * Check if an unvalidated request is a minimal request.\n *\n * @param rawRequest - The raw request to check.\n * @returns `true` if the request is a {@link MinimalRequest}, `false` otherwise.\n */\nfunction isMinimalRequest(rawRequest: unknown): rawRequest is MinimalRequest {\n  return (\n    isObject(rawRequest) &&\n    hasProperty(rawRequest, 'method') &&\n    typeof rawRequest.method === 'string' &&\n    hasValidParams(rawRequest)\n  );\n}\n\n/**\n * Check if a request has valid params, i.e. an array or object.\n * The contents of the params are not inspected.\n *\n * @param rawRequest - The request to check.\n * @returns `true` if the request has valid params, `false` otherwise.\n */\nfunction hasValidParams(\n  rawRequest: Record<string, unknown>,\n): rawRequest is { params?: JsonRpcParams } {\n  if (hasProperty(rawRequest, 'params')) {\n    return Array.isArray(rawRequest.params) || isObject(rawRequest.params);\n  }\n  return true;\n}\n\n/**\n * Get the original id from a request.\n *\n * @param rawRequest - The request to get the original id from.\n * @returns The original id and a boolean indicating if the request is a request\n * (as opposed to a notification).\n */\nfunction getOriginalId(rawRequest: unknown): [unknown, boolean] {\n  if (isObject(rawRequest) && hasProperty(rawRequest, 'id')) {\n    return [rawRequest.id, true];\n  }\n  return [undefined, false];\n}\n"]}

package/dist/v2/JsonRpcServer.d.cts

@@ -1,5 +1,5 @@
 import type { JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, NonEmptyArray } from "@metamask/utils";
-import type { HandleOptions, JsonRpcMiddleware, MergedContextOf, MiddlewareConstraint } from "./JsonRpcEngineV2.cjs";
+import type { JsonRpcMiddleware, MiddlewareConstraint } from "./JsonRpcEngineV2.cjs";
 import { JsonRpcEngineV2 } from "./JsonRpcEngineV2.cjs";
 type OnError = (error: unknown) => void;
 type Options<Middleware extends MiddlewareConstraint> = {
@@ -59,11 +59,9 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * engine. The request will fail if the engine can only handle notifications.
      *
      * @param request - The request to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      * @returns The JSON-RPC response.
      */
-    handle(request: JsonRpcRequest, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<JsonRpcResponse>;
+    handle(request: JsonRpcRequest): Promise<JsonRpcResponse>;
     /**
      * Handle a JSON-RPC notification.
      *
@@ -74,10 +72,8 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * engine. The request will fail if the engine cannot handle notifications.
      *
      * @param notification - The notification to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      */
-    handle(notification: JsonRpcNotification, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<void>;
+    handle(notification: JsonRpcNotification): Promise<void>;
     /**
      * Handle an alleged JSON-RPC request or notification. Permits any plain
      * object with `{ method: string }`, so long as any present JSON-RPC 2.0
@@ -92,12 +88,10 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * response) is not of the type expected by the underlying engine.
      *
      * @param rawRequest - The raw request to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      * @returns The JSON-RPC response, or `undefined` if the request is a
      * notification.
      */
-    handle(rawRequest: unknown, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<JsonRpcResponse | void>;
+    handle(rawRequest: unknown): Promise<JsonRpcResponse | void>;
 }
 export {};
 //# sourceMappingURL=JsonRpcServer.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcServer.d.cts","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EAEnB,cAAc,EACd,eAAe,EACf,aAAa,EACd,wBAAwB;AAGzB,OAAO,KAAK,EACV,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EAErB,8BAA0B;AAC3B,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAIpD,KAAK,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;AAExC,KAAK,OAAO,CAAC,UAAU,SAAS,oBAAoB,IAAI;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/D,GACD;IACE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACvC,CACJ,CAAC;AAIF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAa,CACxB,UAAU,SAAS,oBAAoB,GAAG,iBAAiB;;IAS3D;;;;;;;;;;;;OAYG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAYxC;;;;;;;;;;;;;OAaG;IACG,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;;OAYG;IACG,MAAM,CACV,YAAY,EAAE,mBAAmB,EACjC,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;;;;;;;;;;;;;;;OAkBG;IACG,MAAM,CACV,UAAU,EAAE,OAAO,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;CAmEnC"}
+{"version":3,"file":"JsonRpcServer.d.cts","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EAEnB,cAAc,EACd,eAAe,EACf,aAAa,EACd,wBAAwB;AAGzB,OAAO,KAAK,EACV,iBAAiB,EAEjB,oBAAoB,EAErB,8BAA0B;AAC3B,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAIpD,KAAK,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;AAExC,KAAK,OAAO,CAAC,UAAU,SAAS,oBAAoB,IAAI;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/D,GACD;IACE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACvC,CACJ,CAAC;AAIF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAa,CACxB,UAAU,SAAS,oBAAoB,GAAG,iBAAiB;;IAS3D;;;;;;;;;;;;OAYG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAYxC;;;;;;;;;;;OAWG;IACG,MAAM,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAE/D;;;;;;;;;;OAUG;IACG,MAAM,CAAC,YAAY,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9D;;;;;;;;;;;;;;;;OAgBG;IACG,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;CAgEnE"}

package/dist/v2/JsonRpcServer.d.mts

@@ -1,5 +1,5 @@
 import type { JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, NonEmptyArray } from "@metamask/utils";
-import type { HandleOptions, JsonRpcMiddleware, MergedContextOf, MiddlewareConstraint } from "./JsonRpcEngineV2.mjs";
+import type { JsonRpcMiddleware, MiddlewareConstraint } from "./JsonRpcEngineV2.mjs";
 import { JsonRpcEngineV2 } from "./JsonRpcEngineV2.mjs";
 type OnError = (error: unknown) => void;
 type Options<Middleware extends MiddlewareConstraint> = {
@@ -59,11 +59,9 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * engine. The request will fail if the engine can only handle notifications.
      *
      * @param request - The request to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      * @returns The JSON-RPC response.
      */
-    handle(request: JsonRpcRequest, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<JsonRpcResponse>;
+    handle(request: JsonRpcRequest): Promise<JsonRpcResponse>;
     /**
      * Handle a JSON-RPC notification.
      *
@@ -74,10 +72,8 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * engine. The request will fail if the engine cannot handle notifications.
      *
      * @param notification - The notification to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      */
-    handle(notification: JsonRpcNotification, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<void>;
+    handle(notification: JsonRpcNotification): Promise<void>;
     /**
      * Handle an alleged JSON-RPC request or notification. Permits any plain
      * object with `{ method: string }`, so long as any present JSON-RPC 2.0
@@ -92,12 +88,10 @@ export declare class JsonRpcServer<Middleware extends MiddlewareConstraint = Jso
      * response) is not of the type expected by the underlying engine.
      *
      * @param rawRequest - The raw request to handle.
-     * @param options - The options for the handle operation.
-     * @param options.context - The context to pass to the middleware.
      * @returns The JSON-RPC response, or `undefined` if the request is a
      * notification.
      */
-    handle(rawRequest: unknown, options?: HandleOptions<MergedContextOf<Middleware>>): Promise<JsonRpcResponse | void>;
+    handle(rawRequest: unknown): Promise<JsonRpcResponse | void>;
 }
 export {};
 //# sourceMappingURL=JsonRpcServer.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcServer.d.mts","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EAEnB,cAAc,EACd,eAAe,EACf,aAAa,EACd,wBAAwB;AAGzB,OAAO,KAAK,EACV,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EAErB,8BAA0B;AAC3B,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAIpD,KAAK,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;AAExC,KAAK,OAAO,CAAC,UAAU,SAAS,oBAAoB,IAAI;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/D,GACD;IACE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACvC,CACJ,CAAC;AAIF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAa,CACxB,UAAU,SAAS,oBAAoB,GAAG,iBAAiB;;IAS3D;;;;;;;;;;;;OAYG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAYxC;;;;;;;;;;;;;OAaG;IACG,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;;OAYG;IACG,MAAM,CACV,YAAY,EAAE,mBAAmB,EACjC,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;;;;;;;;;;;;;;;OAkBG;IACG,MAAM,CACV,UAAU,EAAE,OAAO,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;CAmEnC"}
+{"version":3,"file":"JsonRpcServer.d.mts","sourceRoot":"","sources":["../../src/v2/JsonRpcServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EAEnB,cAAc,EACd,eAAe,EACf,aAAa,EACd,wBAAwB;AAGzB,OAAO,KAAK,EACV,iBAAiB,EAEjB,oBAAoB,EAErB,8BAA0B;AAC3B,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAIpD,KAAK,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;AAExC,KAAK,OAAO,CAAC,UAAU,SAAS,oBAAoB,IAAI;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/D,GACD;IACE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACvC,CACJ,CAAC;AAIF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAa,CACxB,UAAU,SAAS,oBAAoB,GAAG,iBAAiB;;IAS3D;;;;;;;;;;;;OAYG;gBACS,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;IAYxC;;;;;;;;;;;OAWG;IACG,MAAM,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAE/D;;;;;;;;;;OAUG;IACG,MAAM,CAAC,YAAY,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9D;;;;;;;;;;;;;;;;OAgBG;IACG,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;CAgEnE"}