@replit/river 0.205.2 → 0.206.0

package/dist/router/index.cjs

@@ -69,6 +69,10 @@ function castTypeboxValueErrors(errors) {
   }
   return result;
 }
+var CancelResultSchema = import_typebox.Type.Object({
+  code: import_typebox.Type.Literal(CANCEL_CODE),
+  message: import_typebox.Type.String()
+});
 var ReaderErrorSchema = import_typebox.Type.Union([
   import_typebox.Type.Object({
     code: import_typebox.Type.Literal(UNCAUGHT_ERROR_CODE),
@@ -88,10 +92,7 @@ var ReaderErrorSchema = import_typebox.Type.Union([
       })
     )
   }),
-  import_typebox.Type.Object({
-    code: import_typebox.Type.Literal(CANCEL_CODE),
-    message: import_typebox.Type.String()
-  })
+  CancelResultSchema
 ]);
 function isUnion(schema) {
   return schema[import_typebox.Kind] === "Union";
@@ -1184,7 +1185,6 @@ async function getSingleMessage(resReadable, log) {
 }
 
 // router/server.ts
-var import_typebox6 = require("@sinclair/typebox");
 var import_value2 = require("@sinclair/typebox/value");
 
 // transport/stringifyError.ts
@@ -1196,12 +1196,6 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
-var CancelResultSchema = ErrResultSchema(
-  import_typebox6.Type.Object({
-    code: import_typebox6.Type.Literal(CANCEL_CODE),
-    message: import_typebox6.Type.String()
-  })
-);
 var RiverServer = class {
   transport;
   contextMap;
@@ -1343,7 +1337,7 @@ var RiverServer = class {
       if (isStreamCancelBackwardsCompat(msg.controlFlags, protocolVersion)) {
         let cancelResult;
         if (import_value2.Value.Check(CancelResultSchema, msg.payload)) {
-          cancelResult = msg.payload;
+          cancelResult = Err(msg.payload);
         } else {
           cancelResult = Err({
             code: CANCEL_CODE,
@@ -1545,11 +1539,13 @@ var RiverServer = class {
       sessionId,
       metadata: sessionMetadata,
       span: span2,
-      cancel: () => {
-        onServerCancel({
+      cancel: (message) => {
+        const errRes = {
           code: CANCEL_CODE,
-          message: "cancelled by server procedure handler"
-        });
+          message: message ?? "cancelled by server procedure handler"
+        };
+        onServerCancel(errRes);
+        return Err(errRes);
       },
       signal: finishedController.signal
     });
@@ -1886,7 +1882,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.205.2";
+var version = "0.206.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,