@orpc/server 0.0.0-next.964aca5 → 0.0.0-next.965aae5

package/dist/shared/{server.DFuJLDuo.mjs → server.vzZSq5UM.mjs}

@@ -1,18 +1,17 @@
 import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
-import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
-import '@orpc/standard-server/batch';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
-import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.C37gDhSZ.mjs';
+import { toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, parseEmptyableJSON, NullProtoObj, value } from '@orpc/shared';
+import { flattenHeader } from '@orpc/standard-server';
+import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.CaqDCZX1.mjs';
 
 class CompositeStandardHandlerPlugin {
   plugins;
   constructor(plugins = []) {
     this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
   }
-  init(options) {
+  init(options, router) {
     for (const plugin of this.plugins) {
-      plugin.init?.(options);
+      plugin.init?.(options, router);
     }
   }
 }
@@ -22,7 +21,7 @@ class StandardHandler {
     this.matcher = matcher;
     this.codec = codec;
     const plugins = new CompositeStandardHandlerPlugin(options.plugins);
-    plugins.init(options);
+    plugins.init(options, router);
     this.interceptors = toArray(options.interceptors);
     this.clientInterceptors = toArray(options.clientInterceptors);
     this.rootInterceptors = toArray(options.rootInterceptors);
@@ -40,47 +39,74 @@ class StandardHandler {
       this.rootInterceptors,
       { ...options, request, prefix },
       async (interceptorOptions) => {
-        let isDecoding = false;
-        try {
-          return await intercept(
-            this.interceptors,
-            interceptorOptions,
-            async ({ request: request2, context, prefix: prefix2 }) => {
-              const method = request2.method;
-              const url = request2.url;
-              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
-              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
-              if (!match) {
-                return { matched: false, response: void 0 };
+        return runWithSpan(
+          { name: `${request.method} ${request.url.pathname}` },
+          async (span) => {
+            let step;
+            try {
+              return await intercept(
+                this.interceptors,
+                interceptorOptions,
+                async ({ request: request2, context, prefix: prefix2 }) => {
+                  const method = request2.method;
+                  const url = request2.url;
+                  const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+                  const match = await runWithSpan(
+                    { name: "find_procedure" },
+                    () => this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`)
+                  );
+                  if (!match) {
+                    return { matched: false, response: void 0 };
+                  }
+                  span?.updateName(`${ORPC_NAME}.${match.path.join("/")}`);
+                  span?.setAttribute("rpc.system", ORPC_NAME);
+                  span?.setAttribute("rpc.method", match.path.join("."));
+                  step = "decode_input";
+                  let input = await runWithSpan(
+                    { name: "decode_input" },
+                    () => this.codec.decode(request2, match.params, match.procedure)
+                  );
+                  step = void 0;
+                  if (isAsyncIteratorObject(input)) {
+                    input = asyncIteratorWithSpan(
+                      { name: "consume_event_iterator_input", signal: request2.signal },
+                      input
+                    );
+                  }
+                  const client = createProcedureClient(match.procedure, {
+                    context,
+                    path: match.path,
+                    interceptors: this.clientInterceptors
+                  });
+                  step = "call_procedure";
+                  const output = await client(input, {
+                    signal: request2.signal,
+                    lastEventId: flattenHeader(request2.headers["last-event-id"])
+                  });
+                  step = void 0;
+                  const response = this.codec.encode(output, match.procedure);
+                  return {
+                    matched: true,
+                    response
+                  };
+                }
+              );
+            } catch (e) {
+              if (step !== "call_procedure") {
+                setSpanError(span, e);
               }
-              const client = createProcedureClient(match.procedure, {
-                context,
-                path: match.path,
-                interceptors: this.clientInterceptors
-              });
-              isDecoding = true;
-              const input = await this.codec.decode(request2, match.params, match.procedure);
-              isDecoding = false;
-              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
-              const output = await client(input, { signal: request2.signal, lastEventId });
-              const response = this.codec.encode(output, match.procedure);
+              const error = step === "decode_input" && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
+                message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
+                cause: e
+              }) : toORPCError(e);
+              const response = this.codec.encodeError(error);
               return {
                 matched: true,
                 response
               };
             }
-          );
-        } catch (e) {
-          const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
-            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
-            cause: e
-          }) : toORPCError(e);
-          const response = this.codec.encodeError(error);
-          return {
-            matched: true,
-            response
-          };
-        }
+          }
+        );
       }
     );
   }
@@ -111,10 +137,18 @@ class StandardRPCCodec {
 }
 
 class StandardRPCMatcher {
-  tree = {};
+  filter;
+  tree = new NullProtoObj();
   pendingRouters = [];
+  constructor(options = {}) {
+    this.filter = options.filter ?? true;
+  }
   init(router, path = []) {
-    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+    const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
+      if (!value(this.filter, traverseOptions)) {
+        return;
+      }
+      const { path: path2, contract } = traverseOptions;
       const httpPath = toHttpPath(path2);
       if (isProcedure(contract)) {
         this.tree[httpPath] = {
@@ -173,15 +207,10 @@ class StandardRPCMatcher {
 }
 
 class StandardRPCHandler extends StandardHandler {
-  constructor(router, options) {
-    options.plugins ??= [];
-    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
-    if (strictGetMethodPluginEnabled) {
-      options.plugins.push(new StrictGetMethodPlugin());
-    }
+  constructor(router, options = {}) {
     const jsonSerializer = new StandardRPCJsonSerializer(options);
     const serializer = new StandardRPCSerializer(jsonSerializer);
-    const matcher = new StandardRPCMatcher();
+    const matcher = new StandardRPCMatcher(options);
     const codec = new StandardRPCCodec(serializer);
     super(router, matcher, codec, options);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.964aca5",
+  "version": "0.0.0-next.965aae5",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -19,16 +19,31 @@
       "import": "./dist/index.mjs",
       "default": "./dist/index.mjs"
     },
+    "./helpers": {
+      "types": "./dist/helpers/index.d.mts",
+      "import": "./dist/helpers/index.mjs",
+      "default": "./dist/helpers/index.mjs"
+    },
     "./plugins": {
       "types": "./dist/plugins/index.d.mts",
       "import": "./dist/plugins/index.mjs",
       "default": "./dist/plugins/index.mjs"
     },
+    "./hibernation": {
+      "types": "./dist/hibernation/index.d.mts",
+      "import": "./dist/hibernation/index.mjs",
+      "default": "./dist/hibernation/index.mjs"
+    },
     "./standard": {
       "types": "./dist/adapters/standard/index.d.mts",
       "import": "./dist/adapters/standard/index.mjs",
       "default": "./dist/adapters/standard/index.mjs"
     },
+    "./standard-peer": {
+      "types": "./dist/adapters/standard-peer/index.d.mts",
+      "import": "./dist/adapters/standard-peer/index.mjs",
+      "default": "./dist/adapters/standard-peer/index.mjs"
+    },
     "./fetch": {
       "types": "./dist/adapters/fetch/index.d.mts",
       "import": "./dist/adapters/fetch/index.mjs",
@@ -38,21 +53,71 @@
       "types": "./dist/adapters/node/index.d.mts",
       "import": "./dist/adapters/node/index.mjs",
       "default": "./dist/adapters/node/index.mjs"
+    },
+    "./aws-lambda": {
+      "types": "./dist/adapters/aws-lambda/index.d.mts",
+      "import": "./dist/adapters/aws-lambda/index.mjs",
+      "default": "./dist/adapters/aws-lambda/index.mjs"
+    },
+    "./websocket": {
+      "types": "./dist/adapters/websocket/index.d.mts",
+      "import": "./dist/adapters/websocket/index.mjs",
+      "default": "./dist/adapters/websocket/index.mjs"
+    },
+    "./crossws": {
+      "types": "./dist/adapters/crossws/index.d.mts",
+      "import": "./dist/adapters/crossws/index.mjs",
+      "default": "./dist/adapters/crossws/index.mjs"
+    },
+    "./ws": {
+      "types": "./dist/adapters/ws/index.d.mts",
+      "import": "./dist/adapters/ws/index.mjs",
+      "default": "./dist/adapters/ws/index.mjs"
+    },
+    "./bun-ws": {
+      "types": "./dist/adapters/bun-ws/index.d.mts",
+      "import": "./dist/adapters/bun-ws/index.mjs",
+      "default": "./dist/adapters/bun-ws/index.mjs"
+    },
+    "./message-port": {
+      "types": "./dist/adapters/message-port/index.d.mts",
+      "import": "./dist/adapters/message-port/index.mjs",
+      "default": "./dist/adapters/message-port/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
+  "peerDependencies": {
+    "crossws": ">=0.3.4",
+    "ws": ">=8.18.1"
+  },
+  "peerDependenciesMeta": {
+    "crossws": {
+      "optional": true
+    },
+    "ws": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@orpc/client": "0.0.0-next.964aca5",
-    "@orpc/shared": "0.0.0-next.964aca5",
-    "@orpc/standard-server": "0.0.0-next.964aca5",
-    "@orpc/standard-server-fetch": "0.0.0-next.964aca5",
-    "@orpc/standard-server-node": "0.0.0-next.964aca5",
-    "@orpc/contract": "0.0.0-next.964aca5"
+    "cookie": "^1.0.2",
+    "@orpc/client": "0.0.0-next.965aae5",
+    "@orpc/contract": "0.0.0-next.965aae5",
+    "@orpc/interop": "0.0.0-next.965aae5",
+    "@orpc/shared": "0.0.0-next.965aae5",
+    "@orpc/standard-server-aws-lambda": "0.0.0-next.965aae5",
+    "@orpc/standard-server": "0.0.0-next.965aae5",
+    "@orpc/standard-server-fetch": "0.0.0-next.965aae5",
+    "@orpc/standard-server-peer": "0.0.0-next.965aae5",
+    "@orpc/standard-server-node": "0.0.0-next.965aae5"
   },
   "devDependencies": {
-    "supertest": "^7.0.0"
+    "@types/ws": "^8.18.1",
+    "crossws": "^0.4.1",
+    "next": "^15.5.2",
+    "supertest": "^7.1.4",
+    "ws": "^8.18.3"
   },
   "scripts": {
     "build": "unbuild",

package/dist/shared/server.B5yVxwZh.d.mts

@@ -1,17 +0,0 @@
-import { C as Context, R as Router } from './server.DQJX4Gnf.mjs';
-import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
-import { b as StandardHandlerOptions, i as StandardHandler } from './server.ClO23hLW.mjs';
-
-interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
-}
-declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
-}
-
-export { type StandardRPCHandlerOptions as S, StandardRPCHandler as a };

package/dist/shared/server.By38lRwX.d.ts

@@ -1,17 +0,0 @@
-import { C as Context, R as Router } from './server.DQJX4Gnf.js';
-import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
-import { b as StandardHandlerOptions, i as StandardHandler } from './server.DsVSuKTu.js';
-
-interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
-}
-declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
-}
-
-export { type StandardRPCHandlerOptions as S, StandardRPCHandler as a };

package/dist/shared/server.Cqam9L0P.d.mts

@@ -1,10 +0,0 @@
-import { C as Context } from './server.DQJX4Gnf.mjs';
-import { g as StandardHandleOptions } from './server.ClO23hLW.mjs';
-
-type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-
-export type { FriendlyStandardHandleOptions as F };

package/dist/shared/server.CuXY46Yy.d.ts

@@ -1,10 +0,0 @@
-import { C as Context } from './server.DQJX4Gnf.js';
-import { g as StandardHandleOptions } from './server.DsVSuKTu.js';
-
-type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-
-export type { FriendlyStandardHandleOptions as F };