@orpc/server 0.0.0-next.fd1ee2a → 0.0.0-next.fdd2389

package/dist/shared/{server.NeumLVdS.mjs → server.Ds4HPpvH.mjs}

@@ -1,6 +1,7 @@
-import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
-import { resolveMaybeOptionalOptions, toArray, value, intercept } from '@orpc/shared';
-import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
+import { isContractProcedure, validateORPCError, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
+import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, overlayProxy, asyncIteratorWithSpan } from '@orpc/shared';
+import { ORPCError, mapEventIterator } from '@orpc/client';
+import { HibernationEventIterator } from '@orpc/standard-server';
 
 const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
 function lazy(loader, meta = {}) {
@@ -87,21 +88,6 @@ function createORPCErrorConstructorMap(errors) {
   });
   return proxy;
 }
-async function validateORPCError(map, error) {
-  const { code, status, message, data, cause, defined } = error;
-  const config = map?.[error.code];
-  if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
-    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
-  }
-  if (!config.data) {
-    return defined ? error : new ORPCError(code, { defined: true, status, message, data, cause });
-  }
-  const validated = await config.data["~standard"].validate(error.data);
-  if (validated.issues) {
-    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
-  }
-  return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
-}
 
 function middlewareOutputFn(output) {
   return { output, context: {} };
@@ -115,27 +101,51 @@ function createProcedureClient(lazyableProcedure, ...rest) {
     const clientContext = callerOptions?.context ?? {};
     const context = await value(options.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
+    const validateError = async (e) => {
+      if (e instanceof ORPCError) {
+        return await validateORPCError(procedure["~orpc"].errorMap, e);
+      }
+      return e;
+    };
     try {
-      return await intercept(
-        toArray(options.interceptors),
-        {
-          context,
-          input,
-          // input only optional when it undefinable so we can safely cast it
-          errors,
-          path,
-          procedure,
-          signal: callerOptions?.signal,
-          lastEventId: callerOptions?.lastEventId
-        },
-        (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+      const output = await runWithSpan(
+        { name: "call_procedure", signal: callerOptions?.signal },
+        (span) => {
+          span?.setAttribute("procedure.path", [...path]);
+          return intercept(
+            toArray(options.interceptors),
+            {
+              context,
+              input,
+              // input only optional when it undefinable so we can safely cast it
+              errors,
+              path,
+              procedure,
+              signal: callerOptions?.signal,
+              lastEventId: callerOptions?.lastEventId
+            },
+            (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+          );
+        }
       );
-    } catch (e) {
-      if (!(e instanceof ORPCError)) {
-        throw e;
+      if (isAsyncIteratorObject(output)) {
+        if (output instanceof HibernationEventIterator) {
+          return output;
+        }
+        return overlayProxy(output, mapEventIterator(
+          asyncIteratorWithSpan(
+            { name: "consume_event_iterator_output", signal: callerOptions?.signal },
+            output
+          ),
+          {
+            value: (v) => v,
+            error: (e) => validateError(e)
+          }
+        ));
       }
-      const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
-      throw validated;
+      return output;
+    } catch (e) {
+      throw await validateError(e);
     }
   };
 }
@@ -144,31 +154,49 @@ async function validateInput(procedure, input) {
   if (!schema) {
     return input;
   }
-  const result = await schema["~standard"].validate(input);
-  if (result.issues) {
-    throw new ORPCError("BAD_REQUEST", {
-      message: "Input validation failed",
-      data: {
-        issues: result.issues
-      },
-      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
-    });
-  }
-  return result.value;
+  return runWithSpan(
+    { name: "validate_input" },
+    async () => {
+      const result = await schema["~standard"].validate(input);
+      if (result.issues) {
+        throw new ORPCError("BAD_REQUEST", {
+          message: "Input validation failed",
+          data: {
+            issues: result.issues
+          },
+          cause: new ValidationError({
+            message: "Input validation failed",
+            issues: result.issues,
+            data: input
+          })
+        });
+      }
+      return result.value;
+    }
+  );
 }
 async function validateOutput(procedure, output) {
   const schema = procedure["~orpc"].outputSchema;
   if (!schema) {
     return output;
   }
-  const result = await schema["~standard"].validate(output);
-  if (result.issues) {
-    throw new ORPCError("INTERNAL_SERVER_ERROR", {
-      message: "Output validation failed",
-      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
-    });
-  }
-  return result.value;
+  return runWithSpan(
+    { name: "validate_output" },
+    async () => {
+      const result = await schema["~standard"].validate(output);
+      if (result.issues) {
+        throw new ORPCError("INTERNAL_SERVER_ERROR", {
+          message: "Output validation failed",
+          cause: new ValidationError({
+            message: "Output validation failed",
+            issues: result.issues,
+            data: output
+          })
+        });
+      }
+      return result.value;
+    }
+  );
 }
 async function executeProcedureInternal(procedure, options) {
   const middlewares = procedure["~orpc"].middlewares;
@@ -180,17 +208,28 @@ async function executeProcedureInternal(procedure, options) {
       currentInput = await validateInput(procedure, currentInput);
     }
     const mid = middlewares[index];
-    const output = mid ? (await mid({
-      ...options,
-      context,
-      next: async (...[nextOptions]) => {
-        const nextContext = nextOptions?.context ?? {};
-        return {
-          output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
-          context: nextContext
-        };
+    const output = mid ? await runWithSpan(
+      { name: `middleware.${mid.name}`, signal: options.signal },
+      async (span) => {
+        span?.setAttribute("middleware.index", index);
+        span?.setAttribute("middleware.name", mid.name);
+        const result = await mid({
+          ...options,
+          context,
+          next: async (...[nextOptions]) => {
+            const nextContext = nextOptions?.context ?? {};
+            return {
+              output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
+              context: nextContext
+            };
+          }
+        }, currentInput, middlewareOutputFn);
+        return result.output;
       }
-    }, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
+    ) : await runWithSpan(
+      { name: "handler", signal: options.signal },
+      () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
+    );
     if (index === outputValidationIndex) {
       return await validateOutput(procedure, output);
     }
@@ -367,4 +406,4 @@ function call(procedure, input, ...rest) {
   return createProcedureClient(procedure, options)(input, options);
 }
 
-export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, resolveContractProcedures as w, unlazyRouter as x };
+export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, resolveContractProcedures as v, unlazyRouter as w };

package/dist/shared/{server.Cwq7K86l.d.mts → server.DzV1hr3z.d.mts}

@@ -1,5 +1,5 @@
 import { ErrorMap, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure } from '@orpc/contract';
-import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.wMv480px.mjs';
+import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.B4BGqy3Y.mjs';
 
 declare function getRouter<T extends Lazyable<AnyRouter | undefined>>(router: T, path: readonly string[]): T extends Lazy<any> ? Lazy<AnyRouter | undefined> : Lazyable<AnyRouter | undefined>;
 type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends Lazy<infer U extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> ? AccessibleLazyRouter<U> : T extends AnyProcedure | undefined ? Lazy<T> : Lazy<T> & {

package/dist/shared/{server.BW-nUGgA.mjs → server.TEVCLCFC.mjs}

@@ -3,6 +3,9 @@ import { ORPCError, fallbackContractConfig } from '@orpc/contract';
 const STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL = Symbol("STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT");
 class StrictGetMethodPlugin {
   error;
+  /**
+   * make sure execute before batch plugin to get real method
+   */
   order = 7e6;
   constructor(options = {}) {
     this.error = options.error ?? new ORPCError("METHOD_NOT_SUPPORTED");

package/dist/shared/server.UVMTOWrk.mjs

@@ -0,0 +1,26 @@
+import '@orpc/client';
+import '@orpc/shared';
+import '@orpc/standard-server';
+import '@orpc/contract';
+import '@orpc/client/standard';
+import { r as resolveFriendlyStandardHandleOptions } from './server.DZ5BIITo.mjs';
+
+async function handleStandardServerPeerMessage(handler, peer, message, options) {
+  const [id, request] = await peer.message(message);
+  if (!request) {
+    return;
+  }
+  const handle = createServerPeerHandleRequestFn(handler, options);
+  await peer.response(id, await handle(request));
+}
+function createServerPeerHandleRequestFn(handler, options) {
+  return async (request) => {
+    const { response } = await handler.handle(
+      { ...request, body: () => Promise.resolve(request.body) },
+      resolveFriendlyStandardHandleOptions(options)
+    );
+    return response ?? { status: 404, headers: {}, body: "No procedure matched" };
+  };
+}
+
+export { createServerPeerHandleRequestFn as c, handleStandardServerPeerMessage as h };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.fd1ee2a",
+  "version": "0.0.0-next.fdd2389",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -19,6 +19,11 @@
       "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",
@@ -96,20 +101,23 @@
     }
   },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.fd1ee2a",
-    "@orpc/client": "0.0.0-next.fd1ee2a",
-    "@orpc/shared": "0.0.0-next.fd1ee2a",
-    "@orpc/standard-server": "0.0.0-next.fd1ee2a",
-    "@orpc/standard-server-aws-lambda": "0.0.0-next.fd1ee2a",
-    "@orpc/standard-server-fetch": "0.0.0-next.fd1ee2a",
-    "@orpc/standard-server-peer": "0.0.0-next.fd1ee2a",
-    "@orpc/standard-server-node": "0.0.0-next.fd1ee2a"
+    "cookie": "^1.0.2",
+    "@orpc/client": "0.0.0-next.fdd2389",
+    "@orpc/contract": "0.0.0-next.fdd2389",
+    "@orpc/interop": "0.0.0-next.fdd2389",
+    "@orpc/shared": "0.0.0-next.fdd2389",
+    "@orpc/standard-server-aws-lambda": "0.0.0-next.fdd2389",
+    "@orpc/standard-server-node": "0.0.0-next.fdd2389",
+    "@orpc/standard-server-peer": "0.0.0-next.fdd2389",
+    "@orpc/standard-server-fetch": "0.0.0-next.fdd2389",
+    "@orpc/standard-server": "0.0.0-next.fdd2389"
   },
   "devDependencies": {
+    "@tanstack/router-core": "^1.132.41",
     "@types/ws": "^8.18.1",
     "crossws": "^0.4.1",
-    "next": "^15.4.1",
-    "supertest": "^7.1.3",
+    "next": "^15.5.4",
+    "supertest": "^7.1.4",
     "ws": "^8.18.3"
   },
   "scripts": {

package/dist/shared/server.C6Q5sqYw.mjs

@@ -1,20 +0,0 @@
-import '@orpc/client';
-import '@orpc/shared';
-import '@orpc/standard-server';
-import '@orpc/contract';
-import '@orpc/client/standard';
-import { r as resolveFriendlyStandardHandleOptions } from './server.DZ5BIITo.mjs';
-
-async function handleStandardServerPeerMessage(handler, peer, message, options) {
-  const [id, request] = await peer.message(message);
-  if (!request) {
-    return;
-  }
-  const { response } = await handler.handle(
-    { ...request, body: () => Promise.resolve(request.body) },
-    resolveFriendlyStandardHandleOptions(options)
-  );
-  await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
-}
-
-export { handleStandardServerPeerMessage as h };