@orpc/server 0.39.0 → 0.40.0

package/dist/{chunk-N2FJGXSJ.js → chunk-L4ESXQX7.js}

@@ -2,7 +2,7 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-DAUWED3D.js";
+} from "./chunk-NXEANHUK.js";
 
 // src/adapters/fetch/rpc-handler.ts
 import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
@@ -29,4 +29,4 @@ var RPCHandler = class {
 export {
   RPCHandler
 };
-//# sourceMappingURL=chunk-N2FJGXSJ.js.map
+//# sourceMappingURL=chunk-L4ESXQX7.js.map

package/dist/{chunk-DAUWED3D.js → chunk-NXEANHUK.js}

@@ -6,13 +6,13 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-XP6YRLY2.js";
+} from "./chunk-XXBE6CYD.js";
 import {
   CompositePlugin
 } from "./chunk-XI6WGCB3.js";
 
 // src/adapters/standard/handler.ts
-import { toORPCError } from "@orpc/contract";
+import { ORPCError, toORPCError } from "@orpc/contract";
 import { intercept, trim } from "@orpc/shared";
 var StandardHandler = class {
   constructor(router, matcher, codec, options = {}) {
@@ -34,6 +34,7 @@ var StandardHandler = class {
         // context is optional only when all fields are optional so we can safely force it to have a context
       },
       async (interceptorOptions) => {
+        let isDecoding = false;
         try {
           return await intercept(
             this.options.interceptors ?? [],
@@ -52,8 +53,11 @@ var StandardHandler = class {
               };
               this.plugin.beforeCreateProcedureClient(clientOptions, interceptorOptions2);
               const client = createProcedureClient(match.procedure, clientOptions);
+              isDecoding = true;
               const input = await this.codec.decode(request, match.params, match.procedure);
-              const output = await client(input, { signal: request.signal });
+              isDecoding = false;
+              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
+              const output = await client(input, { signal: request.signal, lastEventId });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -62,7 +66,10 @@ var StandardHandler = class {
             }
           );
         } catch (e) {
-          const error = toORPCError(e);
+          const error = isDecoding ? 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,
@@ -75,14 +82,27 @@ var StandardHandler = class {
 };
 
 // src/adapters/standard/rpc-serializer.ts
+import { mapEventIterator, ORPCError as ORPCError2, toORPCError as toORPCError2 } from "@orpc/contract";
+import { ErrorEvent, isAsyncIteratorObject } from "@orpc/server-standard";
 import { findDeepMatches, isObject, set } from "@orpc/shared";
 var RPCSerializer = class {
   serialize(data) {
-    if (data === void 0) {
-      return void 0;
-    }
-    if (data instanceof Blob) {
-      return data;
+    if (isAsyncIteratorObject(data)) {
+      return mapEventIterator(data, {
+        value: async (value) => serializeRPCJson(value),
+        error: async (e) => {
+          if (e instanceof ErrorEvent) {
+            return new ErrorEvent({
+              data: serializeRPCJson(e.data),
+              cause: e
+            });
+          }
+          return new ErrorEvent({
+            data: serializeRPCJson(toORPCError2(e).toJSON()),
+            cause: e
+          });
+        }
+      });
     }
     const serializedJSON = serializeRPCJson(data);
     const { maps, values: blobs } = findDeepMatches((v) => v instanceof Blob, serializedJSON.json);
@@ -98,11 +118,23 @@ var RPCSerializer = class {
     return form;
   }
   deserialize(serialized) {
-    if (serialized === void 0) {
-      return void 0;
-    }
-    if (serialized instanceof Blob) {
-      return serialized;
+    if (isAsyncIteratorObject(serialized)) {
+      return mapEventIterator(serialized, {
+        value: async (value) => deserializeRPCJson(value),
+        error: async (e) => {
+          if (!(e instanceof ErrorEvent)) {
+            return e;
+          }
+          const deserialized = deserializeRPCJson(e.data);
+          if (ORPCError2.isValidJSON(deserialized)) {
+            return ORPCError2.fromJSON(deserialized, { cause: e });
+          }
+          return new ErrorEvent({
+            data: deserialized,
+            cause: e
+          });
+        }
+      });
     }
     if (!(serialized instanceof FormData)) {
       return deserializeRPCJson(serialized);
@@ -316,4 +348,4 @@ export {
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-DAUWED3D.js.map
+//# sourceMappingURL=chunk-NXEANHUK.js.map

package/dist/{chunk-XP6YRLY2.js → chunk-XXBE6CYD.js}

@@ -81,7 +81,8 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
           errors,
           path,
           procedure,
-          signal: callerOptions?.signal
+          signal: callerOptions?.signal,
+          lastEventId: callerOptions?.lastEventId
         },
         (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
       );
@@ -375,4 +376,4 @@ export {
   convertPathToHttpPath,
   createContractedProcedure
 };
-//# sourceMappingURL=chunk-XP6YRLY2.js.map
+//# sourceMappingURL=chunk-XXBE6CYD.js.map

package/dist/fetch.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-L4ESXQX7.js";
+import "./chunk-NXEANHUK.js";
+import "./chunk-XXBE6CYD.js";
 import "./chunk-XI6WGCB3.js";
 export {
   RPCHandler

package/dist/hono.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-L4ESXQX7.js";
+import "./chunk-NXEANHUK.js";
+import "./chunk-XXBE6CYD.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/hono/middleware.ts

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-XP6YRLY2.js";
+} from "./chunk-XXBE6CYD.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
@@ -50,10 +50,14 @@ function decorateMiddleware(middleware) {
   decorated.concat = (concatMiddleware, mapInput) => {
     const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
     const concatted = decorateMiddleware((options, input, output, ...rest) => {
-      const next = async (...[nextOptions]) => {
-        return mapped({ ...options, context: { ...nextOptions?.context, ...options.context } }, input, output, ...rest);
-      };
-      const merged = middleware({ ...options, next }, input, output, ...rest);
+      const merged = middleware({
+        ...options,
+        next: (...[nextOptions1]) => mapped({
+          ...options,
+          context: { ...options.context, ...nextOptions1?.context },
+          next: (...[nextOptions2]) => options.next({ context: { ...nextOptions1?.context, ...nextOptions2?.context } })
+        }, input, output, ...rest)
+      }, input, output, ...rest);
       return merged;
     });
     return concatted;
@@ -357,7 +361,8 @@ function createRouterClient(router, ...rest) {
 }
 
 // src/index.ts
-import { isDefinedError, ORPCError, safe, type, ValidationError } from "@orpc/contract";
+import { eventIterator, isDefinedError, ORPCError, safe, type, ValidationError } from "@orpc/contract";
+import { getEventMeta, withEventMeta } from "@orpc/server-standard";
 import { onError, onFinish, onStart, onSuccess } from "@orpc/shared";
 export {
   Builder,
@@ -378,8 +383,10 @@ export {
   deepSetLazyRouterPrefix,
   eachAllContractProcedure,
   eachContractProcedure,
+  eventIterator,
   fallbackConfig,
   flatLazy,
+  getEventMeta,
   getLazyRouterPrefix,
   getRouterChild,
   getRouterContract,
@@ -399,6 +406,7 @@ export {
   safe,
   setRouterContract,
   type,
-  unlazy
+  unlazy,
+  withEventMeta
 };
 //# sourceMappingURL=index.js.map

package/dist/next.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-L4ESXQX7.js";
+import "./chunk-NXEANHUK.js";
+import "./chunk-XXBE6CYD.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/next/serve.ts

package/dist/node.js

@@ -2,8 +2,8 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-NXEANHUK.js";
+import "./chunk-XXBE6CYD.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/node/rpc-handler.ts

package/dist/src/adapters/standard/rpc-serializer.d.ts

@@ -3,7 +3,13 @@ export type RPCSerializedJsonMeta = ['bigint' | 'date' | 'nan' | 'undefined' | '
 export type RPCSerialized = {
     json: unknown;
     meta: RPCSerializedJsonMeta;
-} | FormData | Blob | undefined;
+} | FormData | AsyncIteratorObject<{
+    json: unknown;
+    meta: RPCSerializedJsonMeta;
+}, {
+    json: unknown;
+    meta: RPCSerializedJsonMeta;
+}, void>;
 export type RPCSerializedFormDataMaps = Segment[][];
 export declare class RPCSerializer {
     serialize(data: unknown): RPCSerialized;

package/dist/src/context.d.ts

@@ -1,6 +1,5 @@
 import type { IsNever } from '@orpc/shared';
 export type Context = Record<string, any>;
-export type TypeInitialContext<T extends Context> = (type: T) => unknown;
 export type MergedContext<T extends Context, U extends Context> = T & U;
 export declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
 export type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {

package/dist/src/index.d.ts

@@ -18,6 +18,7 @@ export * from './router';
 export * from './router-accessible-lazy';
 export * from './router-client';
 export * from './utils';
-export { isDefinedError, ORPCError, safe, type, ValidationError } from '@orpc/contract';
+export { eventIterator, isDefinedError, ORPCError, safe, type, ValidationError } from '@orpc/contract';
+export { getEventMeta, withEventMeta } from '@orpc/server-standard';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/middleware.d.ts

@@ -22,6 +22,7 @@ export interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorCo
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
     next: MiddlewareNextFn<TInContext, TOutput>;
     errors: TErrorConstructorMap;
 }

package/dist/src/procedure-client.d.ts

@@ -11,6 +11,7 @@ export interface ProcedureClientInterceptorOptions<TInitialContext extends Conte
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
 }
 /**
  * Options for creating a procedure caller with comprehensive type safety

package/dist/src/procedure.d.ts

@@ -1,6 +1,6 @@
 import type { ContractProcedureDef, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
-import type { Context, TypeInitialContext } from './context';
+import type { Context } from './context';
 import type { AnyMiddleware } from './middleware';
 export interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TCurrentContext;
@@ -8,13 +8,14 @@ export interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
     errors: TErrorConstructorMap;
 }
 export interface ProcedureHandler<TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> {
     (opt: ProcedureHandlerOptions<TCurrentContext, SchemaOutput<TInputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
 export interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
-    __initialContext?: TypeInitialContext<TInitialContext>;
+    __initialContext?: (type: TInitialContext) => unknown;
     middlewares: AnyMiddleware[];
     inputValidationIndex: number;
     outputValidationIndex: number;

package/dist/standard.js

@@ -4,8 +4,8 @@ import {
   RPCSerializer,
   StandardHandler,
   serializeRPCJson
-} from "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-NXEANHUK.js";
+import "./chunk-XXBE6CYD.js";
 import "./chunk-XI6WGCB3.js";
 export {
   RPCCodec,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -63,12 +63,11 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/server-standard": "^0.0.0",
-    "@orpc/server-standard-fetch": "^0.0.0",
-    "@orpc/server-standard-node": "^0.0.0",
-    "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/contract": "0.39.0",
-    "@orpc/shared": "0.39.0"
+    "@orpc/server-standard": "^0.4.0",
+    "@orpc/server-standard-fetch": "^0.4.0",
+    "@orpc/server-standard-node": "^0.4.0",
+    "@orpc/contract": "0.40.0",
+    "@orpc/shared": "0.40.0"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"