@replit/river 0.200.1 → 0.200.3

package/dist/router/index.d.cts

@@ -1,11 +1,11 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, g as AnyProcedure } from '../services-e4f28470.js';
-export { B as BaseErrorSchemaType, H as CANCEL_CODE, K as Client, L as Err, N as ErrResult, G as INVALID_REQUEST_CODE, O as Ok, Q as OkResult, P as PayloadType, m as ProcErrors, i as ProcHandler, j as ProcInit, k as ProcRequest, l as ProcResponse, n as ProcType, d as Procedure, c as ProcedureErrorSchemaType, x as ProcedureMap, y as RPCProcedure, R as Readable, f as ReaderErrorSchema, Y as ResponseData, e as Result, X as ResultUnwrapErr, T as ResultUnwrapOk, r as SerializedProcedureSchema, w as SerializedProcedureSchemaProtocolv1, p as SerializedServerSchema, u as SerializedServerSchemaProtocolv1, q as SerializedServiceSchema, v as SerializedServiceSchemaProtocolv1, S as Service, h as ServiceConfiguration, o as ServiceSchema, C as StreamProcedure, z as SubscriptionProcedure, E as UNCAUGHT_ERROR_CODE, F as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, J as createClient, D as flattenErrorType, s as serializeSchema, t as serializeSchemaV1Compat, M as unwrapOrThrow } from '../services-e4f28470.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, g as AnyProcedure } from '../services-c8fe49bf.js';
+export { B as BaseErrorSchemaType, H as CANCEL_CODE, K as Client, L as Err, N as ErrResult, G as INVALID_REQUEST_CODE, O as Ok, Q as OkResult, P as PayloadType, m as ProcErrors, i as ProcHandler, j as ProcInit, k as ProcRequest, l as ProcResponse, n as ProcType, d as Procedure, c as ProcedureErrorSchemaType, x as ProcedureMap, y as RPCProcedure, R as Readable, f as ReaderErrorSchema, Y as ResponseData, e as Result, X as ResultUnwrapErr, T as ResultUnwrapOk, r as SerializedProcedureSchema, w as SerializedProcedureSchemaProtocolv1, p as SerializedServerSchema, u as SerializedServerSchemaProtocolv1, q as SerializedServiceSchema, v as SerializedServiceSchemaProtocolv1, S as Service, h as ServiceConfiguration, o as ServiceSchema, C as StreamProcedure, z as SubscriptionProcedure, E as UNCAUGHT_ERROR_CODE, F as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, J as createClient, D as flattenErrorType, s as serializeSchema, t as serializeSchemaV1Compat, M as unwrapOrThrow } from '../services-c8fe49bf.js';
 import { c as TransportClientId, b as OpaqueTransportMessage } from '../message-57bb8187.js';
-import { t as ParsedMetadata, C as Connection, u as ServerHandshakeOptions, p as ServiceContext } from '../context-85b8690e.js';
-export { v as ProcedureHandlerContext, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../context-85b8690e.js';
-import { S as ServerTransport } from '../server-456bf6cb.js';
+import { t as ParsedMetadata, C as Connection, u as ServerHandshakeOptions, p as ServiceContext } from '../context-69f37ac1.js';
+export { v as ProcedureHandlerContext, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../context-69f37ac1.js';
+import { S as ServerTransport } from '../server-8fdd7fb2.js';
 import '@sinclair/typebox';
-import '../client-095a929e.js';
+import '../client-9292552a.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
 import '@sinclair/typebox/errors';
@@ -55,6 +55,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.200.1";
+var version = "0.200.3";
 
 export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,11 +1,11 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, g as AnyProcedure } from '../services-e4f28470.js';
-export { B as BaseErrorSchemaType, H as CANCEL_CODE, K as Client, L as Err, N as ErrResult, G as INVALID_REQUEST_CODE, O as Ok, Q as OkResult, P as PayloadType, m as ProcErrors, i as ProcHandler, j as ProcInit, k as ProcRequest, l as ProcResponse, n as ProcType, d as Procedure, c as ProcedureErrorSchemaType, x as ProcedureMap, y as RPCProcedure, R as Readable, f as ReaderErrorSchema, Y as ResponseData, e as Result, X as ResultUnwrapErr, T as ResultUnwrapOk, r as SerializedProcedureSchema, w as SerializedProcedureSchemaProtocolv1, p as SerializedServerSchema, u as SerializedServerSchemaProtocolv1, q as SerializedServiceSchema, v as SerializedServiceSchemaProtocolv1, S as Service, h as ServiceConfiguration, o as ServiceSchema, C as StreamProcedure, z as SubscriptionProcedure, E as UNCAUGHT_ERROR_CODE, F as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, J as createClient, D as flattenErrorType, s as serializeSchema, t as serializeSchemaV1Compat, M as unwrapOrThrow } from '../services-e4f28470.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, g as AnyProcedure } from '../services-c8fe49bf.js';
+export { B as BaseErrorSchemaType, H as CANCEL_CODE, K as Client, L as Err, N as ErrResult, G as INVALID_REQUEST_CODE, O as Ok, Q as OkResult, P as PayloadType, m as ProcErrors, i as ProcHandler, j as ProcInit, k as ProcRequest, l as ProcResponse, n as ProcType, d as Procedure, c as ProcedureErrorSchemaType, x as ProcedureMap, y as RPCProcedure, R as Readable, f as ReaderErrorSchema, Y as ResponseData, e as Result, X as ResultUnwrapErr, T as ResultUnwrapOk, r as SerializedProcedureSchema, w as SerializedProcedureSchemaProtocolv1, p as SerializedServerSchema, u as SerializedServerSchemaProtocolv1, q as SerializedServiceSchema, v as SerializedServiceSchemaProtocolv1, S as Service, h as ServiceConfiguration, o as ServiceSchema, C as StreamProcedure, z as SubscriptionProcedure, E as UNCAUGHT_ERROR_CODE, F as UNEXPECTED_DISCONNECT_CODE, U as UploadProcedure, V as ValidProcType, W as Writable, J as createClient, D as flattenErrorType, s as serializeSchema, t as serializeSchemaV1Compat, M as unwrapOrThrow } from '../services-c8fe49bf.js';
 import { c as TransportClientId, b as OpaqueTransportMessage } from '../message-57bb8187.js';
-import { t as ParsedMetadata, C as Connection, u as ServerHandshakeOptions, p as ServiceContext } from '../context-85b8690e.js';
-export { v as ProcedureHandlerContext, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../context-85b8690e.js';
-import { S as ServerTransport } from '../server-456bf6cb.js';
+import { t as ParsedMetadata, C as Connection, u as ServerHandshakeOptions, p as ServiceContext } from '../context-69f37ac1.js';
+export { v as ProcedureHandlerContext, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../context-69f37ac1.js';
+import { S as ServerTransport } from '../server-8fdd7fb2.js';
 import '@sinclair/typebox';
-import '../client-095a929e.js';
+import '../client-9292552a.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
 import '@sinclair/typebox/errors';
@@ -55,6 +55,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     maxCancelledStreamTombstonesPerSession?: number;
 }>): Server<Services>;
 
-var version = "0.200.1";
+var version = "0.200.3";
 
 export { ParsedMetadata, version as RIVER_VERSION, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -12,7 +12,7 @@ import {
   WritableImpl,
   flattenErrorType,
   unwrapOrThrow
-} from "../chunk-MADS7AI5.js";
+} from "../chunk-ZVWJN6V2.js";
 import {
   ControlMessageCloseSchema,
   ControlMessagePayloadSchema,
@@ -27,10 +27,10 @@ import {
   isStreamClose,
   isStreamOpen,
   version
-} from "../chunk-UQHYJZTP.js";
+} from "../chunk-QHMZKXXG.js";
 
 // router/services.ts
-import { Type } from "@sinclair/typebox";
+import { Type, Kind } from "@sinclair/typebox";
 function serializeSchemaV1Compat(services, handshakeSchema) {
   const serializedServiceObject = Object.entries(services).reduce((acc, [name, value]) => {
     acc[name] = value.serializeV1Compat();
@@ -158,12 +158,9 @@ var ServiceSchema = class _ServiceSchema {
           {
             init: Type.Strict(procDef.requestInit),
             output: Type.Strict(procDef.responseData),
+            errors: getSerializedProcErrors(procDef),
             // Only add `description` field if the type declares it.
             ..."description" in procDef ? { description: procDef.description } : {},
-            // Only add the `errors` field if the type declares it.
-            ..."responseError" in procDef ? {
-              errors: Type.Strict(procDef.responseError)
-            } : {},
             type: procDef.type,
             // Only add the `input` field if the type declares it.
             ..."requestData" in procDef ? {
@@ -193,12 +190,9 @@ var ServiceSchema = class _ServiceSchema {
                   // this is the only change needed to make it compatible.
                   input: Type.Strict(procDef.requestInit),
                   output: Type.Strict(procDef.responseData),
+                  errors: getSerializedProcErrors(procDef),
                   // Only add `description` field if the type declares it.
                   ..."description" in procDef ? { description: procDef.description } : {},
-                  // Only add the `errors` field if the type declares it.
-                  ..."responseError" in procDef ? {
-                    errors: Type.Strict(procDef.responseError)
-                  } : {},
                   type: procDef.type
                 }
               ];
@@ -208,12 +202,9 @@ var ServiceSchema = class _ServiceSchema {
               {
                 init: Type.Strict(procDef.requestInit),
                 output: Type.Strict(procDef.responseData),
+                errors: getSerializedProcErrors(procDef),
                 // Only add `description` field if the type declares it.
                 ..."description" in procDef ? { description: procDef.description } : {},
-                // Only add the `errors` field if the type declares it.
-                ..."responseError" in procDef ? {
-                  errors: Type.Strict(procDef.responseError)
-                } : {},
                 type: procDef.type,
                 input: Type.Strict(procDef.requestData)
               }
@@ -236,6 +227,15 @@ var ServiceSchema = class _ServiceSchema {
     });
   }
 };
+function getSerializedProcErrors(procDef) {
+  if (!("responseError" in procDef) || procDef.responseError[Kind] === "Never") {
+    return Type.Strict(ReaderErrorSchema);
+  }
+  const withProtocolErrors = flattenErrorType(
+    Type.Union([procDef.responseError, ReaderErrorSchema])
+  );
+  return Type.Strict(withProtocolErrors);
+}
 var ServiceScaffold = class {
   /**
    * The configuration for this service.
@@ -946,6 +946,19 @@ var RiverServer = class {
       const errorMsg = coerceErrorString(err);
       span.recordException(err instanceof Error ? err : new Error(errorMsg));
       span.setStatus({ code: SpanStatusCode.ERROR });
+      this.log?.error(
+        `${serviceName}.${procedureName} handler threw an uncaught error`,
+        {
+          ...loggingMetadata,
+          transportMessage: {
+            procedureName,
+            serviceName
+          },
+          extras: {
+            error: errorMsg
+          }
+        }
+      );
       onServerCancel({
         code: UNCAUGHT_ERROR_CODE,
         message: errorMsg
@@ -954,10 +967,7 @@ var RiverServer = class {
     if (procClosesWithInit) {
       closeReadable();
     } else if (procedure.type === "rpc" || procedure.type === "subscription") {
-      this.log?.warn("sent an init without a stream close", {
-        ...loggingMetadata,
-        clientId: this.transport.clientId
-      });
+      this.log?.warn("sent an init without a stream close", loggingMetadata);
     }
     const handlerContext = {
       ...serviceContext,