@orpc/server 1.14.11 → 1.14.13

package/dist/adapters/fetch/index.mjs

@@ -1,44 +1,153 @@
-import { sortPlugins, intercept, resolveMaybeOptionalOptions, toArray } from '@orpc/shared';
-import { toStandardLazyRequest, toFetchResponse } from '@standardserver/fetch';
-import { r as resolveFriendlyStandardHandlerHandleOptions } from '../../shared/server.W91HSRkE.mjs';
-import { C as CSRFGuardHandlerPlugin } from '../../shared/server.D_QauotT.mjs';
-import { R as RPCHandlerCodec, S as StandardHandler } from '../../shared/server.COPVXhDG.mjs';
-import '@orpc/client';
-import '@standardserver/core';
-import '../../shared/server.DofEOwf-.mjs';
+import { ORPCError } from '@orpc/client';
+import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
+import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CMf4nKky.mjs';
+import { S as StrictGetMethodPlugin } from '../../shared/server.TEVCLCFC.mjs';
+import '@orpc/client/standard';
+import '@orpc/standard-server';
+import '../../shared/server.DEBcqOjg.mjs';
 import '@orpc/contract';
-import '../../shared/server.BoiFpNT7.mjs';
 
-class CompositeFetchHandlerPlugin {
-  name = "~composite/fetch-handler";
-  plugins;
-  constructor(plugins = []) {
-    this.plugins = sortPlugins(plugins);
+class BodyLimitPlugin {
+  maxBodySize;
+  constructor(options) {
+    this.maxBodySize = options.maxBodySize;
   }
-  initFetchHandlerOptions(options) {
-    for (const plugin of this.plugins) {
-      if (plugin.initFetchHandlerOptions) {
-        options = plugin.initFetchHandlerOptions(options);
+  initRuntimeAdapter(options) {
+    options.adapterInterceptors ??= [];
+    options.adapterInterceptors.push(async (options2) => {
+      if (!options2.request.body) {
+        return options2.next();
+      }
+      let currentBodySize = 0;
+      const rawReader = options2.request.body.getReader();
+      const reader = new ReadableStream({
+        start: async (controller) => {
+          try {
+            if (Number(options2.request.headers.get("content-length")) > this.maxBodySize) {
+              controller.error(new ORPCError("PAYLOAD_TOO_LARGE"));
+              return;
+            }
+            while (true) {
+              const { done, value } = await rawReader.read();
+              if (done) {
+                break;
+              }
+              currentBodySize += value.length;
+              if (currentBodySize > this.maxBodySize) {
+                controller.error(new ORPCError("PAYLOAD_TOO_LARGE"));
+                break;
+              }
+              controller.enqueue(value);
+            }
+          } finally {
+            controller.close();
+          }
+        }
+      });
+      const requestInit = { body: reader, duplex: "half" };
+      return options2.next({
+        ...options2,
+        request: new Request(options2.request, requestInit)
+      });
+    });
+  }
+}
+
+const ORDERED_SUPPORTED_ENCODINGS = ["gzip", "deflate"];
+class CompressionPlugin {
+  encodings;
+  threshold;
+  filter;
+  constructor(options = {}) {
+    this.encodings = options.encodings ?? ORDERED_SUPPORTED_ENCODINGS;
+    this.threshold = options.threshold ?? 1024;
+    this.filter = (request, response) => {
+      const hasContentDisposition = response.headers.has("content-disposition");
+      const contentType = response.headers.get("content-type");
+      if (!hasContentDisposition && contentType?.startsWith("text/event-stream")) {
+        return false;
+      }
+      return options.filter ? options.filter(request, response) : isCompressibleContentType(contentType);
+    };
+  }
+  initRuntimeAdapter(options) {
+    options.adapterInterceptors ??= [];
+    options.adapterInterceptors.unshift(async (options2) => {
+      const result = await options2.next();
+      if (!result.matched) {
+        return result;
+      }
+      const response = result.response;
+      if (response.headers.has("content-encoding") || response.headers.has("transfer-encoding") || isNoTransformCacheControl(response.headers.get("cache-control"))) {
+        return result;
+      }
+      const contentLength = response.headers.get("content-length");
+      if (contentLength && Number(contentLength) < this.threshold) {
+        return result;
+      }
+      const acceptEncoding = options2.request.headers.get("accept-encoding")?.split(",").map((enc) => enc.trim().split(";")[0]);
+      const encoding = this.encodings.find((enc) => acceptEncoding?.includes(enc));
+      if (!response.body || encoding === void 0) {
+        return result;
       }
+      if (!this.filter(options2.request, response)) {
+        return result;
+      }
+      const compressedBody = response.body.pipeThrough(new CompressionStream(encoding));
+      const compressedHeaders = new Headers(response.headers);
+      compressedHeaders.delete("content-length");
+      compressedHeaders.set("content-encoding", encoding);
+      return {
+        ...result,
+        response: new Response(compressedBody, {
+          status: response.status,
+          statusText: response.statusText,
+          headers: compressedHeaders
+        })
+      };
+    });
+  }
+}
+const COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/(?!event-stream(?:[;\s]|$))[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
+function isCompressibleContentType(contentType) {
+  if (contentType === null) {
+    return false;
+  }
+  return COMPRESSIBLE_CONTENT_TYPE_REGEX.test(contentType);
+}
+const CACHE_CONTROL_NO_TRANSFORM_REGEX = /(?:^|,)\s*no-transform\s*(?:,|$)/i;
+function isNoTransformCacheControl(cacheControl) {
+  if (cacheControl === null) {
+    return false;
+  }
+  return CACHE_CONTROL_NO_TRANSFORM_REGEX.test(cacheControl);
+}
+
+class CompositeFetchHandlerPlugin extends CompositeStandardHandlerPlugin {
+  initRuntimeAdapter(options) {
+    for (const plugin of this.plugins) {
+      plugin.initRuntimeAdapter?.(options);
     }
-    return options;
   }
 }
 
 class FetchHandler {
   constructor(standardHandler, options = {}) {
     this.standardHandler = standardHandler;
-    options = new CompositeFetchHandlerPlugin(options.plugins).initFetchHandlerOptions(options);
-    this.fetchInterceptors = options.fetchInterceptors;
-    this.toFetchResponseOptions = options.toFetchResponse;
+    const plugin = new CompositeFetchHandlerPlugin(options.plugins);
+    plugin.initRuntimeAdapter(options);
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
+    this.toFetchResponseOptions = options;
   }
   toFetchResponseOptions;
-  fetchInterceptors;
+  adapterInterceptors;
   async handle(request, ...rest) {
     return intercept(
-      this.fetchInterceptors,
+      this.adapterInterceptors,
       {
-        ...resolveFriendlyStandardHandlerHandleOptions(resolveMaybeOptionalOptions(rest)),
+        ...resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest)),
         request,
         toFetchResponseOptions: this.toFetchResponseOptions
       },
@@ -59,16 +168,12 @@ class FetchHandler {
 
 class RPCHandler extends FetchHandler {
   constructor(router, options = {}) {
-    if (options.csrfGuardHandlerPlugin?.enabled !== false) {
-      options = {
-        ...options,
-        plugins: [...toArray(options.plugins), new CSRFGuardHandlerPlugin()]
-      };
+    if (options.strictGetMethodPluginEnabled ?? true) {
+      options.plugins ??= [];
+      options.plugins.push(new StrictGetMethodPlugin());
     }
-    const codec = new RPCHandlerCodec(router, options);
-    const handler = new StandardHandler(codec, options);
-    super(handler, options);
+    super(new StandardRPCHandler(router, options), options);
   }
 }
 
-export { CompositeFetchHandlerPlugin, FetchHandler, RPCHandler };
+export { BodyLimitPlugin, CompositeFetchHandlerPlugin, CompressionPlugin, FetchHandler, RPCHandler };

package/dist/adapters/message-port/index.d.mts

@@ -1,71 +1,56 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 import { Value, Promisable, MaybeOptionalOptions } from '@orpc/shared';
-import { ServerPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standardserver/peer';
-import { C as Context } from '../../shared/server.CcR4kgje.mjs';
-import { S as StandardHandler, a as StandardHandlerOptions } from '../../shared/server.DDFizwfU.mjs';
-import { StandardPeerRequestHandlerOptions } from '../standard-peer/index.mjs';
-import { R as Router } from '../../shared/server.15O7oC1p.mjs';
-import { R as RPCHandlerCodecOptions } from '../../shared/server.B4BnEWWm.mjs';
+import { DecodedResponseMessage } from '@orpc/standard-server-peer';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.mjs';
+import { f as StandardHandler } from '../../shared/server.BqadksTP.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.DzE6WeuY.mjs';
 import '@orpc/client';
 import '@orpc/contract';
-import '@standardserver/core';
+import '@orpc/standard-server';
+import '../../shared/server.B8gYOD5g.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.C8_sRzQB.mjs';
 
-type DecodedResponseMessage = ConstructorParameters<typeof ServerPeer>[0] extends (message: infer TMessage) => unknown ? TMessage : never;
 interface MessagePortHandlerOptions<_T extends Context> {
     /**
-     * By default, oRPC encodes peer messages as strings or binary data before sending them over the message port.
-     * Use this option to bypass encoding and leverage the full capabilities of the
-     * [MessagePort: postMessage() method](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort/postMessage),
-     * such as transferring object ownership or supporting non-serializable objects like `OffscreenCanvas` or improving performance.
+     * By default, oRPC serializes request/response messages to string/binary data before sending over message port.
+     * If needed, you can define the this option to utilize full power of [MessagePort: postMessage() method](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort/postMessage),
+     * such as transferring ownership of objects to the other side or support unserializable objects like `OffscreenCanvas`.
      *
      * @remarks
-     * - Returning `null` or `undefined` disables this feature.
+     * - return null | undefined to disable this feature
      *
-     * @warning Ensure your message port implementation supports `transferable` objects before enabling this.
+     * @warning Make sure your message port supports `transfer` before using this feature.
+     * @example
+     * ```ts
+     * experimental_transfer: (message, port) => {
+     *   const transfer = deepFindTransferableObjects(message) // implement your own logic
+     *   return transfer.length ? transfer : null // only enable when needed
+     * }
+     * ```
+     *
+     * @see {@link https://orpc.dev/docs/adapters/message-port#transfer Message Port Transfer Docs}
      */
     experimental_transfer?: Value<Promisable<object[] | null | undefined>, [message: DecodedResponseMessage, port: SupportedMessagePort]>;
-    /**
-     * Options for encoding peer messages. such as `prefix` for distinguishing messages on the same channel..
-     */
-    encodePeerMessage?: EncodePeerMessageOptions | undefined;
-    /**
-     * Options for decoding peer messages. such as `prefix` for distinguishing messages on the same channel..
-     */
-    decodePeerMessage?: DecodePeerMessageOptions | undefined;
 }
 declare class MessagePortHandler<T extends Context> {
-    private readonly handler;
-    private readonly peers;
+    private readonly standardHandler;
     private readonly transfer;
-    private readonly encodePeerMessageOptions;
-    private readonly decodePeerMessageOptions;
-    constructor(handler: StandardHandler<T>, options?: NoInfer<MessagePortHandlerOptions<T>>);
-    /**
-     * Attaches message and close listeners to a message port.
-     *
-     * Prefer this over calling `.message()` and `.close()` manually.
-     */
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
-    /**
-     * Handles a single message received from a message port.
-     *
-     * @param port The message port instance. Use the same instance for all messages.
-     */
-    message(port: SupportedMessagePort, data: unknown, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): Promise<{
-        matched: boolean;
-    }>;
-    /**
-     * Cleans up peer state for a closed message port.
-     *
-     * @param port The same message port instance passed to `.message()`.
-     */
-    close(port: SupportedMessagePort): Promise<void>;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<MessagePortHandlerOptions<T>>);
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
 }
 
-interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, RPCHandlerCodecOptions<T>, MessagePortHandlerOptions<T> {
+interface RPCHandlerOptions<T extends Context> extends StandardRPCHandlerOptions<T>, MessagePortHandlerOptions<T> {
 }
+/**
+ * RPC Handler for common message port implementations.
+ *
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/message-port Message Port Adapter Docs}
+ */
 declare class RPCHandler<T extends Context> extends MessagePortHandler<T> {
-    constructor(router: Router<T>, options?: NoInfer<RPCHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { MessagePortHandler, RPCHandler };

package/dist/adapters/message-port/index.d.ts

@@ -1,71 +1,56 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 import { Value, Promisable, MaybeOptionalOptions } from '@orpc/shared';
-import { ServerPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standardserver/peer';
-import { C as Context } from '../../shared/server.CcR4kgje.js';
-import { S as StandardHandler, a as StandardHandlerOptions } from '../../shared/server.BhsVw7m7.js';
-import { StandardPeerRequestHandlerOptions } from '../standard-peer/index.js';
-import { R as Router } from '../../shared/server.m3szVJGU.js';
-import { R as RPCHandlerCodecOptions } from '../../shared/server.CnN50DHH.js';
+import { DecodedResponseMessage } from '@orpc/standard-server-peer';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.js';
+import { f as StandardHandler } from '../../shared/server.7cEtMB30.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.D8IXzfqT.js';
 import '@orpc/client';
 import '@orpc/contract';
-import '@standardserver/core';
+import '@orpc/standard-server';
+import '../../shared/server.EfTOZ2Q7.js';
+import '@orpc/client/standard';
+import '../../shared/server.ChyoA9XY.js';
 
-type DecodedResponseMessage = ConstructorParameters<typeof ServerPeer>[0] extends (message: infer TMessage) => unknown ? TMessage : never;
 interface MessagePortHandlerOptions<_T extends Context> {
     /**
-     * By default, oRPC encodes peer messages as strings or binary data before sending them over the message port.
-     * Use this option to bypass encoding and leverage the full capabilities of the
-     * [MessagePort: postMessage() method](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort/postMessage),
-     * such as transferring object ownership or supporting non-serializable objects like `OffscreenCanvas` or improving performance.
+     * By default, oRPC serializes request/response messages to string/binary data before sending over message port.
+     * If needed, you can define the this option to utilize full power of [MessagePort: postMessage() method](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort/postMessage),
+     * such as transferring ownership of objects to the other side or support unserializable objects like `OffscreenCanvas`.
      *
      * @remarks
-     * - Returning `null` or `undefined` disables this feature.
+     * - return null | undefined to disable this feature
      *
-     * @warning Ensure your message port implementation supports `transferable` objects before enabling this.
+     * @warning Make sure your message port supports `transfer` before using this feature.
+     * @example
+     * ```ts
+     * experimental_transfer: (message, port) => {
+     *   const transfer = deepFindTransferableObjects(message) // implement your own logic
+     *   return transfer.length ? transfer : null // only enable when needed
+     * }
+     * ```
+     *
+     * @see {@link https://orpc.dev/docs/adapters/message-port#transfer Message Port Transfer Docs}
      */
     experimental_transfer?: Value<Promisable<object[] | null | undefined>, [message: DecodedResponseMessage, port: SupportedMessagePort]>;
-    /**
-     * Options for encoding peer messages. such as `prefix` for distinguishing messages on the same channel..
-     */
-    encodePeerMessage?: EncodePeerMessageOptions | undefined;
-    /**
-     * Options for decoding peer messages. such as `prefix` for distinguishing messages on the same channel..
-     */
-    decodePeerMessage?: DecodePeerMessageOptions | undefined;
 }
 declare class MessagePortHandler<T extends Context> {
-    private readonly handler;
-    private readonly peers;
+    private readonly standardHandler;
     private readonly transfer;
-    private readonly encodePeerMessageOptions;
-    private readonly decodePeerMessageOptions;
-    constructor(handler: StandardHandler<T>, options?: NoInfer<MessagePortHandlerOptions<T>>);
-    /**
-     * Attaches message and close listeners to a message port.
-     *
-     * Prefer this over calling `.message()` and `.close()` manually.
-     */
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
-    /**
-     * Handles a single message received from a message port.
-     *
-     * @param port The message port instance. Use the same instance for all messages.
-     */
-    message(port: SupportedMessagePort, data: unknown, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): Promise<{
-        matched: boolean;
-    }>;
-    /**
-     * Cleans up peer state for a closed message port.
-     *
-     * @param port The same message port instance passed to `.message()`.
-     */
-    close(port: SupportedMessagePort): Promise<void>;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<MessagePortHandlerOptions<T>>);
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
 }
 
-interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, RPCHandlerCodecOptions<T>, MessagePortHandlerOptions<T> {
+interface RPCHandlerOptions<T extends Context> extends StandardRPCHandlerOptions<T>, MessagePortHandlerOptions<T> {
 }
+/**
+ * RPC Handler for common message port implementations.
+ *
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/message-port Message Port Adapter Docs}
+ */
 declare class RPCHandler<T extends Context> extends MessagePortHandler<T> {
-    constructor(router: Router<T>, options?: NoInfer<RPCHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { MessagePortHandler, RPCHandler };

package/dist/adapters/message-port/index.mjs

@@ -1,85 +1,54 @@
-import { onMessagePortMessage, onMessagePortClose, postMessagePortMessage } from '@orpc/client/message-port';
-import { value, resolveMaybeOptionalOptions } from '@orpc/shared';
-import { ServerPeer, encodePeerMessage, decodePeerMessage, isClientPeerSendMessage, isPeerMessage } from '@standardserver/peer';
-import { c as createStandardPeerRequestHandler } from '../../shared/server.CX4vUnDk.mjs';
-import { R as RPCHandlerCodec, S as StandardHandler } from '../../shared/server.COPVXhDG.mjs';
+import { postMessagePortMessage, onMessagePortMessage, onMessagePortClose } from '@orpc/client/message-port';
+import { value, resolveMaybeOptionalOptions, isObject } from '@orpc/shared';
+import { experimental_ServerPeerWithoutCodec, serializeResponseMessage, encodeResponseMessage, deserializeRequestMessage, decodeRequestMessage } from '@orpc/standard-server-peer';
+import { createServerPeerHandleRequestFn } from '../standard-peer/index.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CMf4nKky.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '@orpc/client/standard';
 import '@orpc/client';
-import '@standardserver/core';
-import '../../shared/server.DofEOwf-.mjs';
+import '@orpc/standard-server';
+import '../../shared/server.DEBcqOjg.mjs';
 import '@orpc/contract';
-import '../../shared/server.BoiFpNT7.mjs';
 
 class MessagePortHandler {
-  constructor(handler, options = {}) {
-    this.handler = handler;
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
     this.transfer = options.experimental_transfer;
-    this.encodePeerMessageOptions = options.encodePeerMessage;
-    this.decodePeerMessageOptions = options.decodePeerMessage;
   }
-  peers = /* @__PURE__ */ new WeakMap();
   transfer;
-  encodePeerMessageOptions;
-  decodePeerMessageOptions;
-  /**
-   * Attaches message and close listeners to a message port.
-   *
-   * Prefer this over calling `.message()` and `.close()` manually.
-   */
   upgrade(port, ...rest) {
-    onMessagePortMessage(port, (message) => this.message(port, message, ...rest));
-    onMessagePortClose(port, () => this.close(port));
-  }
-  /**
-   * Handles a single message received from a message port.
-   *
-   * @param port The message port instance. Use the same instance for all messages.
-   */
-  async message(port, data, ...rest) {
-    let peer = this.peers.get(port);
-    if (!peer) {
-      this.peers.set(port, peer = new ServerPeer(async (message) => {
-        const transfer = await value(this.transfer, message, port);
-        if (transfer) {
-          postMessagePortMessage(port, message, transfer);
-        } else {
-          postMessagePortMessage(port, await encodePeerMessage(message, this.encodePeerMessageOptions));
-        }
-      }));
-    }
-    let peerMessage;
-    if (typeof data === "string" || data instanceof Uint8Array) {
-      const result = decodePeerMessage(data, this.decodePeerMessageOptions);
-      if (result.matched && isClientPeerSendMessage(result.message)) {
-        peerMessage = result.message;
+    const peer = new experimental_ServerPeerWithoutCodec(async (message) => {
+      const [id, type, payload] = message;
+      const transfer = await value(this.transfer, message, port);
+      if (transfer) {
+        postMessagePortMessage(port, serializeResponseMessage(id, type, payload), transfer);
+      } else {
+        postMessagePortMessage(port, await encodeResponseMessage(id, type, payload));
       }
-    } else if (isPeerMessage(data) && isClientPeerSendMessage(data)) {
-      peerMessage = data;
-    }
-    if (peerMessage === void 0) {
-      return { matched: false };
-    }
-    await peer.message(peerMessage, createStandardPeerRequestHandler(this.handler, resolveMaybeOptionalOptions(rest)));
-    return { matched: true };
-  }
-  /**
-   * Cleans up peer state for a closed message port.
-   *
-   * @param port The same message port instance passed to `.message()`.
-   */
-  async close(port) {
-    const peer = this.peers.get(port);
-    if (peer) {
-      this.peers.delete(port);
-      await peer.close();
-    }
+    });
+    onMessagePortMessage(port, async (message) => {
+      const handleFn = createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest));
+      if (isObject(message)) {
+        await peer.message(
+          deserializeRequestMessage(message),
+          handleFn
+        );
+      } else {
+        await peer.message(
+          await decodeRequestMessage(message),
+          handleFn
+        );
+      }
+    });
+    onMessagePortClose(port, () => {
+      peer.close();
+    });
   }
 }
 
 class RPCHandler extends MessagePortHandler {
   constructor(router, options = {}) {
-    const codec = new RPCHandlerCodec(router, options);
-    const handler = new StandardHandler(codec, options);
-    super(handler, options);
+    super(new StandardRPCHandler(router, options), options);
   }
 }