@replit/river 0.215.1 → 0.216.0

package/dist/router/index.d.cts

@@ -1,14 +1,15 @@
-import { P as ProcedureHandlerContext, a as PayloadType, M as MaybeDisposable, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, b as AnyProcedure } from '../services-zaansuuR.cjs';
-export { B as BaseErrorSchemaType, C as CANCEL_CODE, c as Client, E as Err, d as ErrResult, e as INVALID_REQUEST_CODE, O as Ok, f as OkResult, g as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, l as ProcType, m as Procedure, n as ProcedureErrorSchemaType, o as ProcedureMap, R as RPCProcedure, p as RawReadable, q as Readable, r as ReadableBrokenError, s as ReadableResult, t as ReaderErrorSchema, u as ResponseData, v as Result, w as ResultUnwrapErr, x as ResultUnwrapOk, S as SerializedProcedureSchema, y as SerializedProcedureSchemaProtocolv1, z as SerializedServerSchema, D as SerializedServerSchemaProtocolv1, F as SerializedServiceSchema, G as SerializedServiceSchemaProtocolv1, H as Service, J as ServiceConfiguration, K as StreamProcedure, L as SubscriptionProcedure, U as UNCAUGHT_ERROR_CODE, N as UNEXPECTED_DISCONNECT_CODE, Q as UploadProcedure, V as ValidProcType, W as Writable, T as createClient, X as createServiceSchema, Y as flattenErrorType, Z as serializeSchema, _ as serializeSchemaV1Compat } from '../services-zaansuuR.cjs';
+import { P as ProcedureHandlerContext, a as PayloadType, M as MaybeDisposable, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, b as AnyProcedure } from '../services-cwGAC2rB.cjs';
+export { B as BaseErrorSchemaType, C as CANCEL_CODE, c as Client, E as Err, d as ErrResult, e as INVALID_REQUEST_CODE, O as Ok, f as OkResult, g as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, l as ProcType, m as Procedure, n as ProcedureErrorSchemaType, o as ProcedureMap, R as RPCProcedure, p as RawReadable, q as Readable, r as ReadableBrokenError, s as ReadableResult, t as ReaderErrorSchema, u as ResponseData, v as Result, w as ResultUnwrapErr, x as ResultUnwrapOk, S as SerializedProcedureSchema, y as SerializedProcedureSchemaProtocolv1, z as SerializedServerSchema, D as SerializedServerSchemaProtocolv1, F as SerializedServiceSchema, G as SerializedServiceSchemaProtocolv1, H as Service, J as ServiceConfiguration, K as StreamProcedure, L as SubscriptionProcedure, U as UNCAUGHT_ERROR_CODE, N as UNEXPECTED_DISCONNECT_CODE, Q as UploadProcedure, V as ValidProcType, W as Writable, T as createClient, X as createServiceSchema, Y as flattenErrorType, Z as serializeSchema, _ as serializeSchemaV1Compat } from '../services-cwGAC2rB.cjs';
 import { Static, TSchema } from '@sinclair/typebox';
-import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-DL74OqsX.cjs';
-import { C as Connection, q as ServerHandshakeOptions } from '../transport-CCBNESLA.cjs';
-export { r as createClientHandshakeOptions, s as createServerHandshakeOptions } from '../transport-CCBNESLA.cjs';
-import { S as ServerTransport } from '../server-BkEzDYIv.cjs';
+import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-CpXWqmJw.cjs';
+import { C as Connection, q as ServerHandshakeOptions } from '../transport-BnU3Zb0Q.cjs';
+export { r as createClientHandshakeOptions, s as createServerHandshakeOptions } from '../transport-BnU3Zb0Q.cjs';
+import { S as ServerTransport } from '../server-JdnoVO11.cjs';
 import '@opentelemetry/api';
-import '../client-B9aKi9Li.cjs';
-import '../index-Bf9PGbS4.cjs';
-import '../adapter-CjgmjtUJ.cjs';
+import '../client-BZUvFL6B.cjs';
+import '../index-BAGGleT3.cjs';
+import '../types-BGGvYIJM.cjs';
+import '../adapter-D5X11kmP.cjs';
 
 type StreamId = string;
 /**
@@ -74,6 +75,6 @@ declare function createServer<MetadataSchema extends TSchema, ParsedMetadata ext
     middlewares?: Array<Middleware>;
 }>): Server<Context, ParsedMetadata, Services>;
 
-var version = "0.215.1";
+var version = "0.216.0";
 
 export { MaybeDisposable, type Middleware, type MiddlewareContext, type MiddlewareParam, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, type Server, createServer };

package/dist/router/index.d.ts

@@ -1,14 +1,15 @@
-import { P as ProcedureHandlerContext, a as PayloadType, M as MaybeDisposable, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, b as AnyProcedure } from '../services-KdKBWdJr.js';
-export { B as BaseErrorSchemaType, C as CANCEL_CODE, c as Client, E as Err, d as ErrResult, e as INVALID_REQUEST_CODE, O as Ok, f as OkResult, g as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, l as ProcType, m as Procedure, n as ProcedureErrorSchemaType, o as ProcedureMap, R as RPCProcedure, p as RawReadable, q as Readable, r as ReadableBrokenError, s as ReadableResult, t as ReaderErrorSchema, u as ResponseData, v as Result, w as ResultUnwrapErr, x as ResultUnwrapOk, S as SerializedProcedureSchema, y as SerializedProcedureSchemaProtocolv1, z as SerializedServerSchema, D as SerializedServerSchemaProtocolv1, F as SerializedServiceSchema, G as SerializedServiceSchemaProtocolv1, H as Service, J as ServiceConfiguration, K as StreamProcedure, L as SubscriptionProcedure, U as UNCAUGHT_ERROR_CODE, N as UNEXPECTED_DISCONNECT_CODE, Q as UploadProcedure, V as ValidProcType, W as Writable, T as createClient, X as createServiceSchema, Y as flattenErrorType, Z as serializeSchema, _ as serializeSchemaV1Compat } from '../services-KdKBWdJr.js';
+import { P as ProcedureHandlerContext, a as PayloadType, M as MaybeDisposable, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, b as AnyProcedure } from '../services-BrTFTO5Q.js';
+export { B as BaseErrorSchemaType, C as CANCEL_CODE, c as Client, E as Err, d as ErrResult, e as INVALID_REQUEST_CODE, O as Ok, f as OkResult, g as ProcErrors, h as ProcHandler, i as ProcInit, j as ProcRequest, k as ProcResponse, l as ProcType, m as Procedure, n as ProcedureErrorSchemaType, o as ProcedureMap, R as RPCProcedure, p as RawReadable, q as Readable, r as ReadableBrokenError, s as ReadableResult, t as ReaderErrorSchema, u as ResponseData, v as Result, w as ResultUnwrapErr, x as ResultUnwrapOk, S as SerializedProcedureSchema, y as SerializedProcedureSchemaProtocolv1, z as SerializedServerSchema, D as SerializedServerSchemaProtocolv1, F as SerializedServiceSchema, G as SerializedServiceSchemaProtocolv1, H as Service, J as ServiceConfiguration, K as StreamProcedure, L as SubscriptionProcedure, U as UNCAUGHT_ERROR_CODE, N as UNEXPECTED_DISCONNECT_CODE, Q as UploadProcedure, V as ValidProcType, W as Writable, T as createClient, X as createServiceSchema, Y as flattenErrorType, Z as serializeSchema, _ as serializeSchemaV1Compat } from '../services-BrTFTO5Q.js';
 import { Static, TSchema } from '@sinclair/typebox';
-import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-DL74OqsX.js';
-import { C as Connection, q as ServerHandshakeOptions } from '../transport-kW92H6x-.js';
-export { r as createClientHandshakeOptions, s as createServerHandshakeOptions } from '../transport-kW92H6x-.js';
-import { S as ServerTransport } from '../server-_bfE7LYc.js';
+import { T as TransportClientId, O as OpaqueTransportMessage } from '../message-CpXWqmJw.js';
+import { C as Connection, q as ServerHandshakeOptions } from '../transport-B1MUtXL7.js';
+export { r as createClientHandshakeOptions, s as createServerHandshakeOptions } from '../transport-B1MUtXL7.js';
+import { S as ServerTransport } from '../server-BPu7Td80.js';
 import '@opentelemetry/api';
-import '../client-BOc8blGj.js';
-import '../index-DiAq34gk.js';
-import '../adapter-Dtt4bYL-.js';
+import '../client-BNc5Pj_4.js';
+import '../index-ZWkoesQD.js';
+import '../types-BGGvYIJM.js';
+import '../adapter-BXCk-dmy.js';
 
 type StreamId = string;
 /**
@@ -74,6 +75,6 @@ declare function createServer<MetadataSchema extends TSchema, ParsedMetadata ext
     middlewares?: Array<Middleware>;
 }>): Server<Context, ParsedMetadata, Services>;
 
-var version = "0.215.1";
+var version = "0.216.0";
 
 export { MaybeDisposable, type Middleware, type MiddlewareContext, type MiddlewareParam, PayloadType, ProcedureHandlerContext, version as RIVER_VERSION, type Server, createServer };

package/dist/router/index.js

@@ -18,7 +18,7 @@ import {
   serializeSchema,
   serializeSchemaV1Compat,
   version
-} from "../chunk-NUGV5QWU.js";
+} from "../chunk-ZLMQQI43.js";
 export {
   CANCEL_CODE,
   Err,

package/dist/{server-_bfE7LYc.d.ts → server-BPu7Td80.d.ts}

@@ -1,8 +1,8 @@
-import { C as Connection, t as CommonSession, j as SessionState, u as CommonSessionProps, T as Transport, v as ServerTransportOptions, q as ServerHandshakeOptions, w as ServerSession, e as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './transport-kW92H6x-.js';
-import { O as OpaqueTransportMessage, H as HandshakeErrorResponseCodes, P as ProtocolVersion, b as TransportMessage, T as TransportClientId } from './message-DL74OqsX.js';
+import { C as Connection, t as CommonSession, j as SessionState, u as CommonSessionProps, T as Transport, v as ServerTransportOptions, q as ServerHandshakeOptions, w as ServerSession, e as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './transport-B1MUtXL7.js';
+import { O as OpaqueTransportMessage, H as HandshakeErrorResponseCodes, P as ProtocolVersion, b as TransportMessage, T as TransportClientId } from './message-CpXWqmJw.js';
 import { Static, TSchema } from '@sinclair/typebox';
-import { T as Tags } from './index-DiAq34gk.js';
-import { S as SendResult } from './adapter-Dtt4bYL-.js';
+import { T as Tags } from './index-ZWkoesQD.js';
+import { S as SendResult } from './adapter-BXCk-dmy.js';
 
 interface SessionWaitingForHandshakeListeners {
     onConnectionErrored: (err: unknown) => void;

package/dist/{server-BkEzDYIv.d.cts → server-JdnoVO11.d.cts}

@@ -1,8 +1,8 @@
-import { C as Connection, t as CommonSession, j as SessionState, u as CommonSessionProps, T as Transport, v as ServerTransportOptions, q as ServerHandshakeOptions, w as ServerSession, e as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './transport-CCBNESLA.cjs';
-import { O as OpaqueTransportMessage, H as HandshakeErrorResponseCodes, P as ProtocolVersion, b as TransportMessage, T as TransportClientId } from './message-DL74OqsX.cjs';
+import { C as Connection, t as CommonSession, j as SessionState, u as CommonSessionProps, T as Transport, v as ServerTransportOptions, q as ServerHandshakeOptions, w as ServerSession, e as ProvidedServerTransportOptions, D as DeleteSessionOptions } from './transport-BnU3Zb0Q.cjs';
+import { O as OpaqueTransportMessage, H as HandshakeErrorResponseCodes, P as ProtocolVersion, b as TransportMessage, T as TransportClientId } from './message-CpXWqmJw.cjs';
 import { Static, TSchema } from '@sinclair/typebox';
-import { T as Tags } from './index-Bf9PGbS4.cjs';
-import { S as SendResult } from './adapter-CjgmjtUJ.cjs';
+import { T as Tags } from './index-BAGGleT3.cjs';
+import { S as SendResult } from './adapter-D5X11kmP.cjs';
 
 interface SessionWaitingForHandshakeListeners {
     onConnectionErrored: (err: unknown) => void;

package/dist/{services-KdKBWdJr.d.ts → services-BrTFTO5Q.d.ts}

@@ -1,91 +1,9 @@
 import * as _sinclair_typebox from '@sinclair/typebox';
 import { TObject, TLiteral, TEnum, TString, TSchema, TNever, TUnion, Static } from '@sinclair/typebox';
 import { Span } from '@opentelemetry/api';
-import { T as TransportClientId } from './message-DL74OqsX.js';
-import { C as Connection, n as ClientHandshakeOptions, z as SessionId } from './transport-kW92H6x-.js';
-import { C as ClientTransport } from './client-BOc8blGj.js';
-
-/**
- * {@link UNCAUGHT_ERROR_CODE} is the code that is used when an error is thrown
- * inside a procedure handler that's not required.
- */
-declare const UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
-/**
- * {@link UNEXPECTED_DISCONNECT_CODE} is the code used the stream's session
- * disconnect unexpetedly.
- */
-declare const UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
-/**
- * {@link INVALID_REQUEST_CODE} is the code used when a client's request is invalid.
- */
-declare const INVALID_REQUEST_CODE = "INVALID_REQUEST";
-/**
- * {@link CANCEL_CODE} is the code used when either server or client cancels the stream.
- */
-declare const CANCEL_CODE = "CANCEL";
-type TLiteralString = TLiteral<string>;
-type TEnumString = TEnum<Record<string, string>>;
-type BaseErrorSchemaType = TObject<{
-    code: TLiteralString | TEnumString;
-    message: TLiteralString | TString;
-}> | TObject<{
-    code: TLiteralString | TEnumString;
-    message: TLiteralString | TString;
-    extras: TSchema;
-}>;
-/**
- * A schema for cancel payloads sent from the client
- */
-declare const CancelErrorSchema: TObject<{
-    code: TLiteral<"CANCEL">;
-    message: TString;
-}>;
-/**
- * {@link ReaderErrorSchema} is the schema for all the built-in river errors that
- * can be emitted to a reader (request reader on the server, and response reader
- * on the client).
- */
-declare const ReaderErrorSchema: TUnion<[TObject<{
-    code: TLiteral<"UNCAUGHT_ERROR">;
-    message: TString;
-}>, TObject<{
-    code: TLiteral<"UNEXPECTED_DISCONNECT">;
-    message: TString;
-}>, TObject<{
-    code: TLiteral<"INVALID_REQUEST">;
-    message: TString;
-    extras: _sinclair_typebox.TOptional<TObject<{
-        firstValidationErrors: _sinclair_typebox.TArray<TObject<{
-            path: TString;
-            message: TString;
-        }>>;
-        totalErrors: _sinclair_typebox.TNumber;
-    }>>;
-}>, TObject<{
-    code: TLiteral<"CANCEL">;
-    message: TString;
-}>]>;
-/**
- * Represents an acceptable schema to pass to a procedure.
- * Just a type of a schema, not an actual schema.
- *
- */
-type ProcedureErrorSchemaType = TNever | BaseErrorSchemaType | TUnion<Array<BaseErrorSchemaType>>;
-type NestableProcedureErrorSchemaType = BaseErrorSchemaType | TUnion<NestableProcedureErrorSchemaTypeArray>;
-interface NestableProcedureErrorSchemaTypeArray extends Array<NestableProcedureErrorSchemaType> {
-}
-type Flatten<T> = T extends BaseErrorSchemaType ? T : T extends TUnion<Array<infer U extends TSchema>> ? Flatten<U> : unknown;
-/**
- * In the case where API consumers for some god-forsaken reason want to use
- * arbitrarily nested unions, this helper flattens them to a single level.
- *
- * Note that loses some metadata information on the nested unions like
- * nested description fields, etc.
- *
- * @param errType - An arbitrarily union-nested error schema.
- * @returns The flattened error schema.
- */
-declare function flattenErrorType<T extends NestableProcedureErrorSchemaType>(errType: T): Flatten<T>;
+import { T as TransportClientId } from './message-CpXWqmJw.js';
+import { C as Connection, n as ClientHandshakeOptions, z as SessionId } from './transport-B1MUtXL7.js';
+import { C as ClientTransport } from './client-BNc5Pj_4.js';
 
 declare const ReadableBrokenError: {
     readonly code: "READABLE_BROKEN";
@@ -94,13 +12,13 @@ declare const ReadableBrokenError: {
 /**
  * Similar to {@link Result} but with an extra error to handle cases where {@link Readable.break} is called
  */
-type ReadableResult<T, E extends Static<BaseErrorSchemaType> = Static<BaseErrorSchemaType>> = Result<T, E | typeof ReadableBrokenError>;
+type ReadableResult<T, E extends ErrorPayload = ErrorPayload> = Result<T, E | typeof ReadableBrokenError>;
 /**
  * A simple {@link AsyncIterator} used in {@link Readable}
  * that doesn't have a the extra "return" and "throw" methods, and
  * the doesn't have a "done value" (TReturn).
  */
-interface ReadableIterator<T, E extends Static<BaseErrorSchemaType>> extends AsyncIterator<ReadableResult<T, E>> {
+interface ReadableIterator<T, E extends ErrorPayload> extends AsyncIterator<ReadableResult<T, E>> {
     next(): Promise<{
         done: false;
         value: ReadableResult<T, E>;
@@ -120,7 +38,7 @@ interface ReadableIterator<T, E extends Static<BaseErrorSchemaType>> extends Asy
  * A {@link Readable} can only have one consumer (iterator or {@link collect}) for the {@link Readable}'s
  * lifetime, in essense, reading from a {@link Readable} locks it forever.
  */
-interface Readable<T, E extends Static<BaseErrorSchemaType>> {
+interface Readable<T, E extends ErrorPayload> {
     /**
      * {@link Readable} implements AsyncIterator API and can be consumed via
      * for-await-of loops. Iteration locks the Readable. Exiting the loop
@@ -189,7 +107,7 @@ interface Writable<T> {
  * to 'tee' a {@link Readable} to create a copy of the stream but
  * this is not the common case.
  */
-declare class ReadableImpl<T, E extends Static<BaseErrorSchemaType>> implements Readable<T, E> {
+declare class ReadableImpl<T, E extends ErrorPayload> implements Readable<T, E> {
     /**
      * Whether the {@link Readable} is closed.
      *
@@ -327,19 +245,112 @@ declare function createClient<ServiceSchemaMap extends AnyServiceSchemaMap<any>>
     handshakeOptions: ClientHandshakeOptions;
 }>): Client<ServiceSchemaMap>;
 
+/**
+ * {@link UNCAUGHT_ERROR_CODE} is the code that is used when an error is thrown
+ * inside a procedure handler that's not required.
+ */
+declare const UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
+/**
+ * {@link UNEXPECTED_DISCONNECT_CODE} is the code used the stream's session
+ * disconnect unexpetedly.
+ */
+declare const UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
+/**
+ * {@link INVALID_REQUEST_CODE} is the code used when a client's request is invalid.
+ */
+declare const INVALID_REQUEST_CODE = "INVALID_REQUEST";
+/**
+ * {@link CANCEL_CODE} is the code used when either server or client cancels the stream.
+ */
+declare const CANCEL_CODE = "CANCEL";
+type TLiteralString = TLiteral<string>;
+type TEnumString = TEnum<Record<string, string>>;
+type BaseErrorSchemaType = TObject<{
+    code: TLiteralString | TEnumString;
+    message: TLiteralString | TString;
+}> | TObject<{
+    code: TLiteralString | TEnumString;
+    message: TLiteralString | TString;
+    extras: TSchema;
+}>;
+/**
+ * A schema for cancel payloads sent from the client
+ */
+declare const CancelErrorSchema: TObject<{
+    code: TLiteral<"CANCEL">;
+    message: TString;
+}>;
+/**
+ * {@link ReaderErrorSchema} is the schema for all the built-in river errors that
+ * can be emitted to a reader (request reader on the server, and response reader
+ * on the client).
+ */
+declare const ReaderErrorSchema: TUnion<[TObject<{
+    code: TLiteral<"UNCAUGHT_ERROR">;
+    message: TString;
+}>, TObject<{
+    code: TLiteral<"UNEXPECTED_DISCONNECT">;
+    message: TString;
+}>, TObject<{
+    code: TLiteral<"INVALID_REQUEST">;
+    message: TString;
+    extras: _sinclair_typebox.TOptional<TObject<{
+        firstValidationErrors: _sinclair_typebox.TArray<TObject<{
+            path: TString;
+            message: TString;
+        }>>;
+        totalErrors: _sinclair_typebox.TNumber;
+    }>>;
+}>, TObject<{
+    code: TLiteral<"CANCEL">;
+    message: TString;
+}>]>;
+/**
+ * Represents an acceptable schema to pass to a procedure.
+ * Just a type of a schema, not an actual schema.
+ *
+ */
+type ProcedureErrorSchemaType = TNever | BaseErrorSchemaType | TUnion<Array<BaseErrorSchemaType>>;
+type NestableProcedureErrorSchemaType = BaseErrorSchemaType | TUnion<NestableProcedureErrorSchemaTypeArray>;
+interface NestableProcedureErrorSchemaTypeArray extends Array<NestableProcedureErrorSchemaType> {
+}
+type Flatten<T> = T extends BaseErrorSchemaType ? T : T extends TUnion<Array<infer U extends TSchema>> ? Flatten<U> : unknown;
+/**
+ * In the case where API consumers for some god-forsaken reason want to use
+ * arbitrarily nested unions, this helper flattens them to a single level.
+ *
+ * Note that loses some metadata information on the nested unions like
+ * nested description fields, etc.
+ *
+ * @param errType - An arbitrarily union-nested error schema.
+ * @returns The flattened error schema.
+ */
+declare function flattenErrorType<T extends NestableProcedureErrorSchemaType>(errType: T): Flatten<T>;
+
+/**
+ * The minimum error shape supported by river's `Result` and stream primitives.
+ *
+ * The existing TypeBox router uses schema-derived object types for this, while
+ * the protobuf router can use a richer structural error type.
+ */
+interface ErrorPayload {
+    code: string;
+    message: string;
+    extras?: unknown;
+}
 interface OkResult<T> {
     ok: true;
     payload: T;
 }
-interface ErrResult<Err extends Static<BaseErrorSchemaType>> {
+interface ErrResult<Err extends ErrorPayload> {
     ok: false;
     payload: Err;
 }
-type Result<T, Err extends Static<BaseErrorSchemaType>> = OkResult<T> | ErrResult<Err>;
+type Result<T, Err extends ErrorPayload> = OkResult<T> | ErrResult<Err>;
 declare function Ok<const T extends Array<unknown>>(p: T): OkResult<T>;
 declare function Ok<const T extends ReadonlyArray<unknown>>(p: T): OkResult<T>;
 declare function Ok<const T>(payload: T): OkResult<T>;
-declare function Err<const Err extends Static<BaseErrorSchemaType>>(error: Err): ErrResult<Err>;
+declare function Err<const Err extends ErrorPayload>(error: Err): ErrResult<Err>;
 /**
  * Refine a {@link Result} type to its returned payload.
  */
@@ -1111,4 +1122,4 @@ declare class ServiceScaffold<Context extends MaybeDisposable, State extends obj
     };
 }
 
-export { type ReadableIterator as $, type AnyServiceSchemaMap as A, type BaseErrorSchemaType as B, CANCEL_CODE as C, type SerializedServerSchemaProtocolv1 as D, Err as E, type SerializedServiceSchema as F, type SerializedServiceSchemaProtocolv1 as G, type Service as H, type InstantiatedServiceSchemaMap as I, type ServiceConfiguration as J, type StreamProcedure as K, type SubscriptionProcedure as L, type MaybeDisposable as M, UNEXPECTED_DISCONNECT_CODE as N, Ok as O, type ProcedureHandlerContext as P, type UploadProcedure as Q, type RpcProcedure as R, type SerializedProcedureSchema as S, createClient as T, UNCAUGHT_ERROR_CODE as U, type ValidProcType as V, type Writable as W, createServiceSchema as X, flattenErrorType as Y, serializeSchema as Z, serializeSchemaV1Compat as _, type PayloadType as a, type AnyProcedure as b, type Client as c, type ErrResult as d, INVALID_REQUEST_CODE as e, type OkResult as f, type ProcErrors as g, type ProcHandler as h, type ProcInit as i, type ProcRequest as j, type ProcResponse as k, type ProcType as l, Procedure as m, type ProcedureErrorSchemaType as n, type ProcedureMap as o, ReadableImpl as p, type Readable as q, ReadableBrokenError as r, type ReadableResult as s, ReaderErrorSchema as t, type ResponseData as u, type Result as v, type ResultUnwrapErr as w, type ResultUnwrapOk as x, type SerializedProcedureSchemaProtocolv1 as y, type SerializedServerSchema as z };
+export { type ReadableIterator as $, type AnyServiceSchemaMap as A, type BaseErrorSchemaType as B, CANCEL_CODE as C, type SerializedServerSchemaProtocolv1 as D, Err as E, type SerializedServiceSchema as F, type SerializedServiceSchemaProtocolv1 as G, type Service as H, type InstantiatedServiceSchemaMap as I, type ServiceConfiguration as J, type StreamProcedure as K, type SubscriptionProcedure as L, type MaybeDisposable as M, UNEXPECTED_DISCONNECT_CODE as N, Ok as O, type ProcedureHandlerContext as P, type UploadProcedure as Q, type RpcProcedure as R, type SerializedProcedureSchema as S, createClient as T, UNCAUGHT_ERROR_CODE as U, type ValidProcType as V, type Writable as W, createServiceSchema as X, flattenErrorType as Y, serializeSchema as Z, serializeSchemaV1Compat as _, type PayloadType as a, type ErrorPayload as a0, type AnyProcedure as b, type Client as c, type ErrResult as d, INVALID_REQUEST_CODE as e, type OkResult as f, type ProcErrors as g, type ProcHandler as h, type ProcInit as i, type ProcRequest as j, type ProcResponse as k, type ProcType as l, Procedure as m, type ProcedureErrorSchemaType as n, type ProcedureMap as o, ReadableImpl as p, type Readable as q, ReadableBrokenError as r, type ReadableResult as s, ReaderErrorSchema as t, type ResponseData as u, type Result as v, type ResultUnwrapErr as w, type ResultUnwrapOk as x, type SerializedProcedureSchemaProtocolv1 as y, type SerializedServerSchema as z };

package/dist/{services-zaansuuR.d.cts → services-cwGAC2rB.d.cts}

@@ -1,91 +1,9 @@
 import * as _sinclair_typebox from '@sinclair/typebox';
 import { TObject, TLiteral, TEnum, TString, TSchema, TNever, TUnion, Static } from '@sinclair/typebox';
 import { Span } from '@opentelemetry/api';
-import { T as TransportClientId } from './message-DL74OqsX.cjs';
-import { C as Connection, n as ClientHandshakeOptions, z as SessionId } from './transport-CCBNESLA.cjs';
-import { C as ClientTransport } from './client-B9aKi9Li.cjs';
-
-/**
- * {@link UNCAUGHT_ERROR_CODE} is the code that is used when an error is thrown
- * inside a procedure handler that's not required.
- */
-declare const UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
-/**
- * {@link UNEXPECTED_DISCONNECT_CODE} is the code used the stream's session
- * disconnect unexpetedly.
- */
-declare const UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
-/**
- * {@link INVALID_REQUEST_CODE} is the code used when a client's request is invalid.
- */
-declare const INVALID_REQUEST_CODE = "INVALID_REQUEST";
-/**
- * {@link CANCEL_CODE} is the code used when either server or client cancels the stream.
- */
-declare const CANCEL_CODE = "CANCEL";
-type TLiteralString = TLiteral<string>;
-type TEnumString = TEnum<Record<string, string>>;
-type BaseErrorSchemaType = TObject<{
-    code: TLiteralString | TEnumString;
-    message: TLiteralString | TString;
-}> | TObject<{
-    code: TLiteralString | TEnumString;
-    message: TLiteralString | TString;
-    extras: TSchema;
-}>;
-/**
- * A schema for cancel payloads sent from the client
- */
-declare const CancelErrorSchema: TObject<{
-    code: TLiteral<"CANCEL">;
-    message: TString;
-}>;
-/**
- * {@link ReaderErrorSchema} is the schema for all the built-in river errors that
- * can be emitted to a reader (request reader on the server, and response reader
- * on the client).
- */
-declare const ReaderErrorSchema: TUnion<[TObject<{
-    code: TLiteral<"UNCAUGHT_ERROR">;
-    message: TString;
-}>, TObject<{
-    code: TLiteral<"UNEXPECTED_DISCONNECT">;
-    message: TString;
-}>, TObject<{
-    code: TLiteral<"INVALID_REQUEST">;
-    message: TString;
-    extras: _sinclair_typebox.TOptional<TObject<{
-        firstValidationErrors: _sinclair_typebox.TArray<TObject<{
-            path: TString;
-            message: TString;
-        }>>;
-        totalErrors: _sinclair_typebox.TNumber;
-    }>>;
-}>, TObject<{
-    code: TLiteral<"CANCEL">;
-    message: TString;
-}>]>;
-/**
- * Represents an acceptable schema to pass to a procedure.
- * Just a type of a schema, not an actual schema.
- *
- */
-type ProcedureErrorSchemaType = TNever | BaseErrorSchemaType | TUnion<Array<BaseErrorSchemaType>>;
-type NestableProcedureErrorSchemaType = BaseErrorSchemaType | TUnion<NestableProcedureErrorSchemaTypeArray>;
-interface NestableProcedureErrorSchemaTypeArray extends Array<NestableProcedureErrorSchemaType> {
-}
-type Flatten<T> = T extends BaseErrorSchemaType ? T : T extends TUnion<Array<infer U extends TSchema>> ? Flatten<U> : unknown;
-/**
- * In the case where API consumers for some god-forsaken reason want to use
- * arbitrarily nested unions, this helper flattens them to a single level.
- *
- * Note that loses some metadata information on the nested unions like
- * nested description fields, etc.
- *
- * @param errType - An arbitrarily union-nested error schema.
- * @returns The flattened error schema.
- */
-declare function flattenErrorType<T extends NestableProcedureErrorSchemaType>(errType: T): Flatten<T>;
+import { T as TransportClientId } from './message-CpXWqmJw.cjs';
+import { C as Connection, n as ClientHandshakeOptions, z as SessionId } from './transport-BnU3Zb0Q.cjs';
+import { C as ClientTransport } from './client-BZUvFL6B.cjs';
 
 declare const ReadableBrokenError: {
     readonly code: "READABLE_BROKEN";
@@ -94,13 +12,13 @@ declare const ReadableBrokenError: {
 /**
  * Similar to {@link Result} but with an extra error to handle cases where {@link Readable.break} is called
  */
-type ReadableResult<T, E extends Static<BaseErrorSchemaType> = Static<BaseErrorSchemaType>> = Result<T, E | typeof ReadableBrokenError>;
+type ReadableResult<T, E extends ErrorPayload = ErrorPayload> = Result<T, E | typeof ReadableBrokenError>;
 /**
  * A simple {@link AsyncIterator} used in {@link Readable}
  * that doesn't have a the extra "return" and "throw" methods, and
  * the doesn't have a "done value" (TReturn).
  */
-interface ReadableIterator<T, E extends Static<BaseErrorSchemaType>> extends AsyncIterator<ReadableResult<T, E>> {
+interface ReadableIterator<T, E extends ErrorPayload> extends AsyncIterator<ReadableResult<T, E>> {
     next(): Promise<{
         done: false;
         value: ReadableResult<T, E>;
@@ -120,7 +38,7 @@ interface ReadableIterator<T, E extends Static<BaseErrorSchemaType>> extends Asy
  * A {@link Readable} can only have one consumer (iterator or {@link collect}) for the {@link Readable}'s
  * lifetime, in essense, reading from a {@link Readable} locks it forever.
  */
-interface Readable<T, E extends Static<BaseErrorSchemaType>> {
+interface Readable<T, E extends ErrorPayload> {
     /**
      * {@link Readable} implements AsyncIterator API and can be consumed via
      * for-await-of loops. Iteration locks the Readable. Exiting the loop
@@ -189,7 +107,7 @@ interface Writable<T> {
  * to 'tee' a {@link Readable} to create a copy of the stream but
  * this is not the common case.
  */
-declare class ReadableImpl<T, E extends Static<BaseErrorSchemaType>> implements Readable<T, E> {
+declare class ReadableImpl<T, E extends ErrorPayload> implements Readable<T, E> {
     /**
      * Whether the {@link Readable} is closed.
      *
@@ -327,19 +245,112 @@ declare function createClient<ServiceSchemaMap extends AnyServiceSchemaMap<any>>
     handshakeOptions: ClientHandshakeOptions;
 }>): Client<ServiceSchemaMap>;
 
+/**
+ * {@link UNCAUGHT_ERROR_CODE} is the code that is used when an error is thrown
+ * inside a procedure handler that's not required.
+ */
+declare const UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
+/**
+ * {@link UNEXPECTED_DISCONNECT_CODE} is the code used the stream's session
+ * disconnect unexpetedly.
+ */
+declare const UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
+/**
+ * {@link INVALID_REQUEST_CODE} is the code used when a client's request is invalid.
+ */
+declare const INVALID_REQUEST_CODE = "INVALID_REQUEST";
+/**
+ * {@link CANCEL_CODE} is the code used when either server or client cancels the stream.
+ */
+declare const CANCEL_CODE = "CANCEL";
+type TLiteralString = TLiteral<string>;
+type TEnumString = TEnum<Record<string, string>>;
+type BaseErrorSchemaType = TObject<{
+    code: TLiteralString | TEnumString;
+    message: TLiteralString | TString;
+}> | TObject<{
+    code: TLiteralString | TEnumString;
+    message: TLiteralString | TString;
+    extras: TSchema;
+}>;
+/**
+ * A schema for cancel payloads sent from the client
+ */
+declare const CancelErrorSchema: TObject<{
+    code: TLiteral<"CANCEL">;
+    message: TString;
+}>;
+/**
+ * {@link ReaderErrorSchema} is the schema for all the built-in river errors that
+ * can be emitted to a reader (request reader on the server, and response reader
+ * on the client).
+ */
+declare const ReaderErrorSchema: TUnion<[TObject<{
+    code: TLiteral<"UNCAUGHT_ERROR">;
+    message: TString;
+}>, TObject<{
+    code: TLiteral<"UNEXPECTED_DISCONNECT">;
+    message: TString;
+}>, TObject<{
+    code: TLiteral<"INVALID_REQUEST">;
+    message: TString;
+    extras: _sinclair_typebox.TOptional<TObject<{
+        firstValidationErrors: _sinclair_typebox.TArray<TObject<{
+            path: TString;
+            message: TString;
+        }>>;
+        totalErrors: _sinclair_typebox.TNumber;
+    }>>;
+}>, TObject<{
+    code: TLiteral<"CANCEL">;
+    message: TString;
+}>]>;
+/**
+ * Represents an acceptable schema to pass to a procedure.
+ * Just a type of a schema, not an actual schema.
+ *
+ */
+type ProcedureErrorSchemaType = TNever | BaseErrorSchemaType | TUnion<Array<BaseErrorSchemaType>>;
+type NestableProcedureErrorSchemaType = BaseErrorSchemaType | TUnion<NestableProcedureErrorSchemaTypeArray>;
+interface NestableProcedureErrorSchemaTypeArray extends Array<NestableProcedureErrorSchemaType> {
+}
+type Flatten<T> = T extends BaseErrorSchemaType ? T : T extends TUnion<Array<infer U extends TSchema>> ? Flatten<U> : unknown;
+/**
+ * In the case where API consumers for some god-forsaken reason want to use
+ * arbitrarily nested unions, this helper flattens them to a single level.
+ *
+ * Note that loses some metadata information on the nested unions like
+ * nested description fields, etc.
+ *
+ * @param errType - An arbitrarily union-nested error schema.
+ * @returns The flattened error schema.
+ */
+declare function flattenErrorType<T extends NestableProcedureErrorSchemaType>(errType: T): Flatten<T>;
+
+/**
+ * The minimum error shape supported by river's `Result` and stream primitives.
+ *
+ * The existing TypeBox router uses schema-derived object types for this, while
+ * the protobuf router can use a richer structural error type.
+ */
+interface ErrorPayload {
+    code: string;
+    message: string;
+    extras?: unknown;
+}
 interface OkResult<T> {
     ok: true;
     payload: T;
 }
-interface ErrResult<Err extends Static<BaseErrorSchemaType>> {
+interface ErrResult<Err extends ErrorPayload> {
     ok: false;
     payload: Err;
 }
-type Result<T, Err extends Static<BaseErrorSchemaType>> = OkResult<T> | ErrResult<Err>;
+type Result<T, Err extends ErrorPayload> = OkResult<T> | ErrResult<Err>;
 declare function Ok<const T extends Array<unknown>>(p: T): OkResult<T>;
 declare function Ok<const T extends ReadonlyArray<unknown>>(p: T): OkResult<T>;
 declare function Ok<const T>(payload: T): OkResult<T>;
-declare function Err<const Err extends Static<BaseErrorSchemaType>>(error: Err): ErrResult<Err>;
+declare function Err<const Err extends ErrorPayload>(error: Err): ErrResult<Err>;
 /**
  * Refine a {@link Result} type to its returned payload.
  */
@@ -1111,4 +1122,4 @@ declare class ServiceScaffold<Context extends MaybeDisposable, State extends obj
     };
 }
 
-export { type ReadableIterator as $, type AnyServiceSchemaMap as A, type BaseErrorSchemaType as B, CANCEL_CODE as C, type SerializedServerSchemaProtocolv1 as D, Err as E, type SerializedServiceSchema as F, type SerializedServiceSchemaProtocolv1 as G, type Service as H, type InstantiatedServiceSchemaMap as I, type ServiceConfiguration as J, type StreamProcedure as K, type SubscriptionProcedure as L, type MaybeDisposable as M, UNEXPECTED_DISCONNECT_CODE as N, Ok as O, type ProcedureHandlerContext as P, type UploadProcedure as Q, type RpcProcedure as R, type SerializedProcedureSchema as S, createClient as T, UNCAUGHT_ERROR_CODE as U, type ValidProcType as V, type Writable as W, createServiceSchema as X, flattenErrorType as Y, serializeSchema as Z, serializeSchemaV1Compat as _, type PayloadType as a, type AnyProcedure as b, type Client as c, type ErrResult as d, INVALID_REQUEST_CODE as e, type OkResult as f, type ProcErrors as g, type ProcHandler as h, type ProcInit as i, type ProcRequest as j, type ProcResponse as k, type ProcType as l, Procedure as m, type ProcedureErrorSchemaType as n, type ProcedureMap as o, ReadableImpl as p, type Readable as q, ReadableBrokenError as r, type ReadableResult as s, ReaderErrorSchema as t, type ResponseData as u, type Result as v, type ResultUnwrapErr as w, type ResultUnwrapOk as x, type SerializedProcedureSchemaProtocolv1 as y, type SerializedServerSchema as z };
+export { type ReadableIterator as $, type AnyServiceSchemaMap as A, type BaseErrorSchemaType as B, CANCEL_CODE as C, type SerializedServerSchemaProtocolv1 as D, Err as E, type SerializedServiceSchema as F, type SerializedServiceSchemaProtocolv1 as G, type Service as H, type InstantiatedServiceSchemaMap as I, type ServiceConfiguration as J, type StreamProcedure as K, type SubscriptionProcedure as L, type MaybeDisposable as M, UNEXPECTED_DISCONNECT_CODE as N, Ok as O, type ProcedureHandlerContext as P, type UploadProcedure as Q, type RpcProcedure as R, type SerializedProcedureSchema as S, createClient as T, UNCAUGHT_ERROR_CODE as U, type ValidProcType as V, type Writable as W, createServiceSchema as X, flattenErrorType as Y, serializeSchema as Z, serializeSchemaV1Compat as _, type PayloadType as a, type ErrorPayload as a0, type AnyProcedure as b, type Client as c, type ErrResult as d, INVALID_REQUEST_CODE as e, type OkResult as f, type ProcErrors as g, type ProcHandler as h, type ProcInit as i, type ProcRequest as j, type ProcResponse as k, type ProcType as l, Procedure as m, type ProcedureErrorSchemaType as n, type ProcedureMap as o, ReadableImpl as p, type Readable as q, ReadableBrokenError as r, type ReadableResult as s, ReaderErrorSchema as t, type ResponseData as u, type Result as v, type ResultUnwrapErr as w, type ResultUnwrapOk as x, type SerializedProcedureSchemaProtocolv1 as y, type SerializedServerSchema as z };

package/dist/testUtil/index.cjs

@@ -564,7 +564,7 @@ function coerceErrorString(err) {
 }
 
 // package.json
-var version = "0.215.1";
+var version = "0.216.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -2022,10 +2022,26 @@ var ServerTransport = class extends Transport {
       const previousParsedMetadata = this.sessionHandshakeMetadata.get(
         msg.from
       );
-      const parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
-        msg.payload.metadata,
-        previousParsedMetadata
-      );
+      let parsedMetadataOrFailureCode;
+      try {
+        parsedMetadataOrFailureCode = await this.handshakeExtensions.validate(
+          msg.payload.metadata,
+          previousParsedMetadata
+        );
+      } catch (err) {
+        this.rejectHandshakeRequest(
+          session,
+          msg.from,
+          `handshake validation threw: ${coerceErrorString(err)}`,
+          "REJECTED_BY_CUSTOM_HANDLER",
+          {
+            ...session.loggingMetadata,
+            connectedTo: msg.from,
+            clientId: this.clientId
+          }
+        );
+        return;
+      }
       if (session._isConsumed) {
         return;
       }