@replit/river 0.23.0 → 0.23.2

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

@@ -1,11 +1,12 @@
-import { T as TransportClientId } from '../../../index-a6fe0edd.js';
+import { T as TransportClientId } from '../../../index-72b688b7.js';
 import { ServerTransport, ServerTransportOptions as ProvidedServerTransportOptions } from '../../index.cjs';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-5685d817.js';
+import { W as WebSocketConnection } from '../../../connection-a25109b5.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
+import '@sinclair/typebox/value';
 import '@sinclair/typebox';
-import '../../../types-3e5768ec.js';
 import '@opentelemetry/api';
+import '../../../types-3e5768ec.js';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;

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

@@ -1,11 +1,12 @@
-import { T as TransportClientId } from '../../../index-a6fe0edd.js';
+import { T as TransportClientId } from '../../../index-72b688b7.js';
 import { ServerTransport, ServerTransportOptions as ProvidedServerTransportOptions } from '../../index.js';
 import { WebSocketServer } from 'ws';
-import { W as WebSocketConnection } from '../../../connection-5685d817.js';
+import { W as WebSocketConnection } from '../../../connection-a25109b5.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
+import '@sinclair/typebox/value';
 import '@sinclair/typebox';
-import '../../../types-3e5768ec.js';
 import '@opentelemetry/api';
+import '../../../types-3e5768ec.js';
 
 declare class WebSocketServerTransport extends ServerTransport<WebSocketConnection> {
     wss: WebSocketServer;

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

@@ -1,11 +1,11 @@
 import {
   WebSocketConnection
-} from "../../../chunk-ZF2UFTNN.js";
+} from "../../../chunk-KPLLLP3F.js";
 import {
   ServerTransport
-} from "../../../chunk-MJUFKPBT.js";
-import "../../../chunk-PCKHBAVP.js";
-import "../../../chunk-OTQNCLFH.js";
+} from "../../../chunk-LHLQY5FR.js";
+import "../../../chunk-3ZS3RHZF.js";
+import "../../../chunk-SPP7ACQN.js";
 import "../../../chunk-3AW3IXVD.js";
 
 // transport/impls/ws/server.ts

package/dist/transport/index.cjs

@@ -171,7 +171,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.0";
+var version = "0.23.2";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -305,7 +305,7 @@ var Session = class {
     const fullMsg = this.constructMsg(msg);
     log?.debug(`sending msg`, {
       ...this.loggingMetadata,
-      fullTransportMessage: fullMsg
+      transportMessage: fullMsg
     });
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -315,13 +315,13 @@ var Session = class {
         `failed to send msg to ${fullMsg.to}, connection is probably dead`,
         {
           ...this.loggingMetadata,
-          fullTransportMessage: fullMsg
+          transportMessage: fullMsg
         }
       );
     } else {
       log?.info(
         `failed to send msg to ${fullMsg.to}, connection not ready yet`,
-        { ...this.loggingMetadata, fullTransportMessage: fullMsg }
+        { ...this.loggingMetadata, transportMessage: fullMsg }
       );
     }
     return fullMsg.id;
@@ -362,7 +362,7 @@ var Session = class {
     for (const msg of this.sendBuffer) {
       log?.debug(`resending msg`, {
         ...this.loggingMetadata,
-        fullTransportMessage: msg,
+        transportMessage: msg,
         connId: conn.id
       });
       const ok = conn.send(this.codec.toBuffer(msg));
@@ -374,7 +374,7 @@ var Session = class {
         });
         log?.error(errMsg, {
           ...this.loggingMetadata,
-          fullTransportMessage: msg,
+          transportMessage: msg,
           connId: conn.id,
           tags: ["invariant-violation"]
         });
@@ -407,8 +407,8 @@ var Session = class {
   replaceWithNewConnection(newConn) {
     this.closeStaleConnection(newConn);
     this.cancelGrace();
-    this.connection = newConn;
     this.sendBufferedMessages(newConn);
+    this.connection = newConn;
   }
   beginGrace(cb) {
     log?.info(
@@ -763,7 +763,10 @@ var Transport = class {
     }
     if (!import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
       log?.error(`received invalid msg: ${JSON.stringify(parsedMsg)}`, {
-        clientId: this.clientId
+        clientId: this.clientId,
+        validationErrors: [
+          ...import_value.Value.Errors(OpaqueTransportMessageSchema, parsedMsg)
+        ]
       });
       return null;
     }
@@ -781,7 +784,7 @@ var Transport = class {
     if (!session) {
       log?.error(`no existing session for ${msg.from}`, {
         clientId: this.clientId,
-        fullTransportMessage: msg,
+        transportMessage: msg,
         tags: ["invariant-violation"]
       });
       return;
@@ -789,19 +792,19 @@ var Transport = class {
     session.cancelGrace();
     log?.debug(`received msg`, {
       clientId: this.clientId,
-      fullTransportMessage: msg
+      transportMessage: msg
     });
     if (msg.seq !== session.nextExpectedSeq) {
       if (msg.seq < session.nextExpectedSeq) {
         log?.debug(
           `received duplicate msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq}), discarding`,
-          { clientId: this.clientId, fullTransportMessage: msg }
+          { clientId: this.clientId, transportMessage: msg }
         );
       } else {
         const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
         log?.error(`${errMsg}, marking connection as dead`, {
           clientId: this.clientId,
-          fullTransportMessage: msg,
+          transportMessage: msg,
           tags: ["invariant-violation"]
         });
         this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
@@ -819,7 +822,7 @@ var Transport = class {
     } else {
       log?.debug(`discarding msg (ack bit set)`, {
         clientId: this.clientId,
-        fullTransportMessage: msg
+        transportMessage: msg
       });
     }
   }
@@ -850,7 +853,7 @@ var Transport = class {
       const err = "transport is destroyed, cant send";
       log?.error(err, {
         clientId: this.clientId,
-        partialTransportMessage: msg,
+        transportMessage: msg,
         tags: ["invariant-violation"]
       });
       this.protocolError(ProtocolError.UseAfterDestroy, err);
@@ -858,7 +861,7 @@ var Transport = class {
     } else if (this.state === "closed") {
       log?.info(`transport closed when sending, discarding`, {
         clientId: this.clientId,
-        partialTransportMessage: msg
+        transportMessage: msg
       });
       return void 0;
     }
@@ -1019,7 +1022,13 @@ var ClientTransport = class extends Transport {
       log?.warn(`received invalid handshake resp`, {
         clientId: this.clientId,
         connectedTo: parsed.from,
-        fullTransportMessage: parsed
+        transportMessage: parsed,
+        validationErrors: [
+          ...import_value.Value.Errors(
+            ControlMessageHandshakeResponseSchema,
+            parsed.payload
+          )
+        ]
       });
       this.protocolError(
         ProtocolError.HandshakeFailed,
@@ -1035,7 +1044,7 @@ var ClientTransport = class extends Transport {
       log?.warn(`received handshake rejection`, {
         clientId: this.clientId,
         connectedTo: parsed.from,
-        fullTransportMessage: parsed
+        transportMessage: parsed
       });
       this.protocolError(
         ProtocolError.HandshakeFailed,
@@ -1046,7 +1055,7 @@ var ClientTransport = class extends Transport {
     log?.debug(`handshake from ${parsed.from} ok`, {
       clientId: this.clientId,
       connectedTo: parsed.from,
-      fullTransportMessage: parsed
+      transportMessage: parsed
     });
     const { session, isReconnect } = this.getOrCreateSession(
       parsed.from,
@@ -1164,6 +1173,9 @@ var ClientTransport = class extends Transport {
         log?.error(`constructed handshake metadata did not match schema`, {
           clientId: this.clientId,
           connectedTo: to,
+          validationErrors: [
+            ...import_value.Value.Errors(this.handshakeExtensions.schema, metadata)
+          ],
           tags: ["invariant-violation"]
         });
         this.protocolError(
@@ -1177,7 +1189,7 @@ var ClientTransport = class extends Transport {
         return false;
       }
     }
-    const { session } = this.getOrCreateSession(to, conn);
+    const { session } = this.getOrCreateSession(to);
     const requestMsg = handshakeRequestMessage(
       this.clientId,
       to,
@@ -1323,14 +1335,18 @@ var ServerTransport = class extends Transport {
         conn.send(this.codec.toBuffer(responseMsg));
         log?.warn(`received malformed handshake metadata from ${from}`, {
           clientId: this.clientId,
-          connId: conn.id
+          connId: conn.id,
+          validationErrors: [
+            ...import_value.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
+          ]
         });
         this.protocolError(ProtocolError.HandshakeFailed, reason);
         return false;
       }
+      const previousParsedMetadata = session ? this.sessionHandshakeMetadata.get(session) : void 0;
       parsedMetadata = await this.handshakeExtensions.validate(
         rawMetadata,
-        session
+        previousParsedMetadata
       );
       if (parsedMetadata === false) {
         const reason = "rejected by handshake handler";
@@ -1377,11 +1393,15 @@ var ServerTransport = class extends Transport {
         reason
       });
       conn.send(this.codec.toBuffer(responseMsg2));
-      const logData = { ...parsed.payload ?? {}, metadata: "redacted" };
       log?.warn(reason, {
         clientId: this.clientId,
         connId: conn.id,
-        partialTransportMessage: { ...parsed, payload: logData }
+        // safe to log metadata here as we remove the payload
+        // before passing it to user-land
+        transportMessage: parsed,
+        validationErrors: [
+          ...import_value.Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload)
+        ]
       });
       this.protocolError(
         ProtocolError.HandshakeFailed,