@replit/river 0.23.0 → 0.23.2

package/dist/transport/impls/uds/server.cjs

@@ -146,7 +146,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 createSessionTelemetryInfo(session, propagationCtx) {
@@ -271,7 +271,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));
@@ -281,13 +281,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;
@@ -328,7 +328,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));
@@ -340,7 +340,7 @@ var Session = class {
         });
         log?.error(errMsg, {
           ...this.loggingMetadata,
-          fullTransportMessage: msg,
+          transportMessage: msg,
           connId: conn.id,
           tags: ["invariant-violation"]
         });
@@ -373,8 +373,8 @@ var Session = class {
   replaceWithNewConnection(newConn) {
     this.closeStaleConnection(newConn);
     this.cancelGrace();
-    this.connection = newConn;
     this.sendBufferedMessages(newConn);
+    this.connection = newConn;
   }
   beginGrace(cb) {
     log?.info(
@@ -658,7 +658,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;
     }
@@ -676,7 +679,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;
@@ -684,19 +687,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);
@@ -714,7 +717,7 @@ var Transport = class {
     } else {
       log?.debug(`discarding msg (ack bit set)`, {
         clientId: this.clientId,
-        fullTransportMessage: msg
+        transportMessage: msg
       });
     }
   }
@@ -745,7 +748,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);
@@ -753,7 +756,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;
     }
@@ -923,14 +926,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";
@@ -977,11 +984,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,