@replit/river 0.25.2 → 0.26.1

package/dist/transport/impls/ws/server.d.cts

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-e6c560fd.js';
+import { c as TransportClientId } from '../../../message-57296605.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-ef50ac3a.js';
+import { W as WebSocketConnection } from '../../../connection-07e97a79.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-f8228636.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-12d57161.js';
+import { S as ServerTransport } from '../../../server-e304daec.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-8752f79e.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

package/dist/transport/impls/ws/server.d.ts

@@ -1,9 +1,9 @@
-import { c as TransportClientId } from '../../../message-e6c560fd.js';
+import { c as TransportClientId } from '../../../message-57296605.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-ef50ac3a.js';
+import { W as WebSocketConnection } from '../../../connection-07e97a79.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
-import { S as ServerTransport } from '../../../server-f8228636.js';
-import { c as ProvidedServerTransportOptions } from '../../../handshake-12d57161.js';
+import { S as ServerTransport } from '../../../server-e304daec.js';
+import { c as ProvidedServerTransportOptions } from '../../../handshake-8752f79e.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

package/dist/transport/impls/ws/server.js

@@ -1,13 +1,13 @@
 import {
   ServerTransport
-} from "../../../chunk-QXMZJ7LF.js";
+} from "../../../chunk-IVNX5H6C.js";
 import {
   WebSocketConnection
-} from "../../../chunk-ZWMWRM23.js";
-import "../../../chunk-PF74DCPQ.js";
+} from "../../../chunk-AYIMQWS7.js";
+import "../../../chunk-6UVTCZ6K.js";
 import "../../../chunk-TAH2GVTJ.js";
-import "../../../chunk-Q3PZBJXR.js";
-import "../../../chunk-EHD2JJBW.js";
+import "../../../chunk-M43R4RPL.js";
+import "../../../chunk-UQOD22AN.js";
 import "../../../chunk-4PVU7J25.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -255,11 +255,20 @@ var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
 var HandshakeErrorRetriableResponseCodes = import_typebox.Type.Union([
   import_typebox.Type.Literal("SESSION_STATE_MISMATCH")
 ]);
+var HandshakeErrorCustomHandlerFatalResponseCodes = import_typebox.Type.Union([
+  // The custom validation handler rejected the handler because the client is unsupported.
+  import_typebox.Type.Literal("REJECTED_UNSUPPORTED_CLIENT"),
+  // The custom validation handler rejected the handshake.
+  import_typebox.Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+]);
 var HandshakeErrorFatalResponseCodes = import_typebox.Type.Union([
+  HandshakeErrorCustomHandlerFatalResponseCodes,
+  // The ciient sent a handshake that doesn't comply with the extended handshake metadata.
   import_typebox.Type.Literal("MALFORMED_HANDSHAKE_META"),
+  // The ciient sent a handshake that doesn't comply with ControlMessageHandshakeRequestSchema.
   import_typebox.Type.Literal("MALFORMED_HANDSHAKE"),
-  import_typebox.Type.Literal("PROTOCOL_VERSION_MISMATCH"),
-  import_typebox.Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+  // The client's protocol version does not match the server's.
+  import_typebox.Type.Literal("PROTOCOL_VERSION_MISMATCH")
 ]);
 var HandshakeErrorResponseCodes = import_typebox.Type.Union([
   HandshakeErrorRetriableResponseCodes,
@@ -564,7 +573,7 @@ var SessionNoConnection = class extends IdentifiedSession {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.25.2";
+var version = "0.26.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -615,7 +624,10 @@ var SessionWaitingForHandshake = class extends CommonSession {
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
@@ -661,7 +673,10 @@ var SessionHandshaking = class extends IdentifiedSession {
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
-      this.listeners.onInvalidHandshake("could not parse message");
+      this.listeners.onInvalidHandshake(
+        "could not parse message",
+        "MALFORMED_HANDSHAKE"
+      );
       return;
     }
     this.listeners.onHandshake(parsedMsg);
@@ -1151,8 +1166,8 @@ var Transport = class {
   removeEventListener(type, handler) {
     this.eventDispatcher.removeEventListener(type, handler);
   }
-  protocolError(type, message) {
-    this.eventDispatcher.dispatchEvent("protocolError", { type, message });
+  protocolError(message) {
+    this.eventDispatcher.dispatchEvent("protocolError", message);
   }
   /**
    * Default close implementation for transports. You should override this in the downstream
@@ -1416,13 +1431,17 @@ var ClientTransport = class extends Transport {
         onHandshake: (msg) => {
           this.onHandshakeResponse(handshakingSession, msg);
         },
-        onInvalidHandshake: (reason) => {
+        onInvalidHandshake: (reason, code) => {
           this.log?.error(
             `invalid handshake: ${reason}`,
             handshakingSession.loggingMetadata
           );
           this.deleteSession(session);
-          this.protocolError(ProtocolError.HandshakeFailed, reason);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
         },
         onHandshakeTimeout: () => {
           this.log?.error(
@@ -1471,7 +1490,11 @@ var ClientTransport = class extends Transport {
         this.tryReconnecting(session.to);
       } else {
         this.deleteSession(session);
-        this.protocolError(ProtocolError.HandshakeFailed, reason);
+        this.protocolError({
+          type: ProtocolError.HandshakeFailed,
+          code: msg.payload.status.code,
+          message: reason
+        });
       }
       return;
     }
@@ -1505,7 +1528,10 @@ var ClientTransport = class extends Transport {
       onMessage: (msg2) => this.handleMsg(msg2),
       onInvalidMessage: (reason) => {
         this.deleteSession(connectedSession);
-        this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+        this.protocolError({
+          type: ProtocolError.MessageOrderingViolated,
+          message: reason
+        });
       }
     });
     this.updateSession(connectedSession);
@@ -1536,7 +1562,10 @@ var ClientTransport = class extends Transport {
       const budgetConsumed = this.retryBudget.getBudgetConsumed();
       const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
       this.log?.error(errMsg, session.loggingMetadata);
-      this.protocolError(ProtocolError.RetriesExceeded, errMsg);
+      this.protocolError({
+        type: ProtocolError.RetriesExceeded,
+        message: errMsg
+      });
       return;
     }
     const backoffMs = this.retryBudget.getBackoffMs();
@@ -1743,13 +1772,17 @@ var ServerTransport = class extends Transport {
           receivedHandshake = true;
           void this.onHandshakeRequest(pendingSession, msg);
         },
-        onInvalidHandshake: (reason) => {
+        onInvalidHandshake: (reason, code) => {
           this.log?.error(
             `invalid handshake: ${reason}`,
             pendingSession.loggingMetadata
           );
           this.deletePendingSession(pendingSession);
-          this.protocolError(ProtocolError.HandshakeFailed, reason);
+          this.protocolError({
+            type: ProtocolError.HandshakeFailed,
+            code,
+            message: reason
+          });
         }
       },
       this.options,
@@ -1774,7 +1807,11 @@ var ServerTransport = class extends Transport {
         }
       })
     );
-    this.protocolError(ProtocolError.HandshakeFailed, reason);
+    this.protocolError({
+      type: ProtocolError.HandshakeFailed,
+      code,
+      message: reason
+    });
     this.deletePendingSession(session);
   }
   async onHandshakeRequest(session, msg) {
@@ -1936,7 +1973,10 @@ var ServerTransport = class extends Transport {
         },
         onMessage: (msg2) => this.handleMsg(msg2),
         onInvalidMessage: (reason) => {
-          this.protocolError(ProtocolError.MessageOrderingViolated, reason);
+          this.protocolError({
+            type: ProtocolError.MessageOrderingViolated,
+            message: reason
+          });
           this.deleteSession(connectedSession);
         }
       }
@@ -1947,43 +1987,43 @@ var ServerTransport = class extends Transport {
     connectedSession.startActiveHeartbeat();
   }
   async validateHandshakeMetadata(handshakingSession, existingSession, rawMetadata, from) {
-    let parsedMetadata = {};
-    if (this.handshakeExtensions) {
-      if (!import_value3.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
-        this.rejectHandshakeRequest(
-          handshakingSession,
-          from,
-          "received malformed handshake metadata",
-          "MALFORMED_HANDSHAKE_META",
-          {
-            ...handshakingSession.loggingMetadata,
-            connectedTo: from,
-            validationErrors: [
-              ...import_value3.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
-            ]
-          }
-        );
-        return false;
-      }
-      const previousParsedMetadata = existingSession ? this.sessionHandshakeMetadata.get(existingSession.to) : void 0;
-      parsedMetadata = await this.handshakeExtensions.validate(
-        rawMetadata,
-        previousParsedMetadata
+    if (!this.handshakeExtensions) {
+      return {};
+    }
+    if (!import_value3.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
+      this.rejectHandshakeRequest(
+        handshakingSession,
+        from,
+        "received malformed handshake metadata",
+        "MALFORMED_HANDSHAKE_META",
+        {
+          ...handshakingSession.loggingMetadata,
+          connectedTo: from,
+          validationErrors: [
+            ...import_value3.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
+          ]
+        }
       );
-      if (parsedMetadata === false) {
-        this.rejectHandshakeRequest(
-          handshakingSession,
-          from,
-          "rejected by handshake handler",
-          "REJECTED_BY_CUSTOM_HANDLER",
-          {
-            ...handshakingSession.loggingMetadata,
-            connectedTo: from,
-            clientId: this.clientId
-          }
-        );
-        return false;
-      }
+      return false;
+    }
+    const previousParsedMetadata = existingSession ? this.sessionHandshakeMetadata.get(existingSession.to) : void 0;
+    const parsedMetadata = await this.handshakeExtensions.validate(
+      rawMetadata,
+      previousParsedMetadata
+    );
+    if (import_value3.Value.Check(HandshakeErrorCustomHandlerFatalResponseCodes, parsedMetadata)) {
+      this.rejectHandshakeRequest(
+        handshakingSession,
+        from,
+        "rejected by handshake handler",
+        parsedMetadata,
+        {
+          ...handshakingSession.loggingMetadata,
+          connectedTo: from,
+          clientId: this.clientId
+        }
+      );
+      return false;
     }
     return parsedMetadata;
   }