@replit/river 0.213.1 → 0.215.0

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

@@ -1,14 +1,14 @@
-import { c as TransportClientId } from '../../../message-Dlsh5WDF.cjs';
+import { c as TransportClientId } from '../../../message-aABg0s5M.cjs';
 import { WebSocketServer } from 'ws';
-import { a as WebSocketConnection } from '../../../connection-Dzkqj18h.cjs';
+import { a as WebSocketConnection } from '../../../connection-CS00EWuS.cjs';
 import { W as WsLike } from '../../../wslike-Dng9H1C7.cjs';
-import { S as ServerTransport } from '../../../server-BDSYa-CO.cjs';
-import { c as ProvidedServerTransportOptions } from '../../../transport-CxT7y8Qk.cjs';
+import { S as ServerTransport } from '../../../server-BR0DZaWi.cjs';
+import { c as ProvidedServerTransportOptions } from '../../../transport-D3jzhFSi.cjs';
 import { IncomingMessage } from 'http';
 import { TSchema } from '@sinclair/typebox';
 import '@opentelemetry/api';
-import '../../../index-D9R6UTMl.cjs';
-import '../../../adapter-DjiEwOYi.cjs';
+import '../../../index-CHCzvZ9D.cjs';
+import '../../../adapter-IGrG4KLL.cjs';
 
 declare class WebSocketServerTransport<MetadataSchema extends TSchema = TSchema, ParsedMetadata extends object = object> extends ServerTransport<WebSocketConnection, MetadataSchema, ParsedMetadata> {
     wss: WebSocketServer;

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

@@ -1,14 +1,14 @@
-import { c as TransportClientId } from '../../../message-Dlsh5WDF.js';
+import { c as TransportClientId } from '../../../message-aABg0s5M.js';
 import { WebSocketServer } from 'ws';
-import { a as WebSocketConnection } from '../../../connection-C2lYgRh0.js';
+import { a as WebSocketConnection } from '../../../connection-DU9v3y8a.js';
 import { W as WsLike } from '../../../wslike-Dng9H1C7.js';
-import { S as ServerTransport } from '../../../server-DFOzjvLh.js';
-import { c as ProvidedServerTransportOptions } from '../../../transport-pdbkDzmJ.js';
+import { S as ServerTransport } from '../../../server-uNzkzIRh.js';
+import { c as ProvidedServerTransportOptions } from '../../../transport-BOL2p5s-.js';
 import { IncomingMessage } from 'http';
 import { TSchema } from '@sinclair/typebox';
 import '@opentelemetry/api';
-import '../../../index-CSM8soK7.js';
-import '../../../adapter-Cp7_gIVA.js';
+import '../../../index-uF0cBM7z.js';
+import '../../../adapter-CgF7vQPu.js';
 
 declare class WebSocketServerTransport<MetadataSchema extends TSchema = TSchema, ParsedMetadata extends object = object> extends ServerTransport<WebSocketConnection, MetadataSchema, ParsedMetadata> {
     wss: WebSocketServer;

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

@@ -1,9 +1,9 @@
 import {
   ServerTransport,
   WebSocketConnection
-} from "../../../chunk-2A645F27.js";
+} from "../../../chunk-VXRAFUA3.js";
 import "../../../chunk-CC7RN7GI.js";
-import "../../../chunk-X4PP65DW.js";
+import "../../../chunk-RDTQZ7HO.js";
 
 // transport/impls/ws/server.ts
 function cleanHeaders(headers) {

package/dist/transport/index.cjs

@@ -307,6 +307,7 @@ var IdentifiedSession = class extends CommonSession {
   telemetry;
   to;
   protocolVersion;
+  listeners;
   /**
    * Index of the message we will send next (excluding handshake)
    */
@@ -330,7 +331,8 @@ var IdentifiedSession = class extends CommonSession {
       telemetry,
       log,
       protocolVersion,
-      seqSent: messagesSent
+      seqSent: messagesSent,
+      listeners
     } = props;
     super(props);
     this.id = id;
@@ -342,6 +344,7 @@ var IdentifiedSession = class extends CommonSession {
     this.log = log;
     this.protocolVersion = protocolVersion;
     this.seqSent = messagesSent;
+    this.listeners = listeners;
   }
   get loggingMetadata() {
     const metadata = {
@@ -358,7 +361,7 @@ var IdentifiedSession = class extends CommonSession {
     }
     return metadata;
   }
-  constructMsg(partialMsg) {
+  encodeMsg(partialMsg) {
     const msg = {
       ...partialMsg,
       id: generateId(),
@@ -367,18 +370,37 @@ var IdentifiedSession = class extends CommonSession {
       seq: this.seq,
       ack: this.ack
     };
+    const encoded = this.codec.toBuffer(msg);
+    if (!encoded.ok) {
+      this.listeners.onMessageSendFailure(
+        { ...partialMsg, seq: this.seq },
+        encoded.reason
+      );
+      return encoded;
+    }
     this.seq++;
-    return msg;
+    return {
+      ok: true,
+      value: {
+        id: msg.id,
+        seq: msg.seq,
+        msg: partialMsg,
+        data: encoded.value
+      }
+    };
   }
   nextSeq() {
     return this.sendBuffer.length > 0 ? this.sendBuffer[0].seq : this.seq;
   }
   send(msg) {
-    const constructedMsg = this.constructMsg(msg);
-    this.sendBuffer.push(constructedMsg);
+    const encodeResult = this.encodeMsg(msg);
+    if (!encodeResult.ok) {
+      return encodeResult;
+    }
+    this.sendBuffer.push(encodeResult.value);
     return {
       ok: true,
-      value: constructedMsg.id
+      value: encodeResult.value.id
     };
   }
   _handleStateExit() {
@@ -411,23 +433,6 @@ var IdentifiedSessionWithGracePeriod = class extends IdentifiedSession {
     super._handleClose();
   }
 };
-function sendMessage(conn, codec, msg) {
-  const buff = codec.toBuffer(msg);
-  if (!buff.ok) {
-    return buff;
-  }
-  const sent = conn.send(buff.value);
-  if (!sent) {
-    return {
-      ok: false,
-      reason: "failed to send message"
-    };
-  }
-  return {
-    ok: true,
-    value: msg.id
-  };
-}
 
 // transport/sessionStateMachine/SessionConnecting.ts
 var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
@@ -647,7 +652,7 @@ function coerceErrorString(err) {
 }
 
 // package.json
-var version = "0.213.1";
+var version = "0.215.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -730,7 +735,21 @@ var SessionWaitingForHandshake = class extends CommonSession {
     this.listeners.onHandshake(parsedMsgRes.value);
   };
   sendHandshake(msg) {
-    return sendMessage(this.conn, this.codec, msg);
+    const buff = this.codec.toBuffer(msg);
+    if (!buff.ok) {
+      return buff;
+    }
+    const sent = this.conn.send(buff.value);
+    if (!sent) {
+      return {
+        ok: false,
+        reason: "failed to send handshake"
+      };
+    }
+    return {
+      ok: true,
+      value: msg.id
+    };
   }
   _handleStateExit() {
     this.conn.removeDataListener();
@@ -779,7 +798,21 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
     this.listeners.onHandshake(parsedMsgRes.value);
   };
   sendHandshake(msg) {
-    return sendMessage(this.conn, this.codec, msg);
+    const buff = this.codec.toBuffer(msg);
+    if (!buff.ok) {
+      return buff;
+    }
+    const sent = this.conn.send(buff.value);
+    if (!sent) {
+      return {
+        ok: false,
+        reason: "failed to send handshake"
+      };
+    }
+    return {
+      ok: true,
+      value: msg.id
+    };
   }
   _handleStateExit() {
     super._handleStateExit();
@@ -814,28 +847,35 @@ var SessionConnected = class extends IdentifiedSession {
     }
     this.startMissingHeartbeatTimeout();
   }
-  assertSendOrdering(constructedMsg) {
-    if (constructedMsg.seq > this.seqSent + 1) {
-      const msg = `invariant violation: would have sent out of order msg (seq: ${constructedMsg.seq}, expected: ${this.seqSent} + 1)`;
+  assertSendOrdering(encodedMsg) {
+    if (encodedMsg.seq > this.seqSent + 1) {
+      const msg = `invariant violation: would have sent out of order msg (seq: ${encodedMsg.seq}, expected: ${this.seqSent} + 1)`;
       this.log?.error(msg, {
         ...this.loggingMetadata,
-        transportMessage: constructedMsg,
         tags: ["invariant-violation"]
       });
       throw new Error(msg);
     }
   }
   send(msg) {
-    const constructedMsg = this.constructMsg(msg);
-    this.assertSendOrdering(constructedMsg);
-    this.sendBuffer.push(constructedMsg);
-    const res = sendMessage(this.conn, this.codec, constructedMsg);
-    if (!res.ok) {
-      this.listeners.onMessageSendFailure(constructedMsg, res.reason);
-      return res;
+    const encodeResult = this.encodeMsg(msg);
+    if (!encodeResult.ok) {
+      return encodeResult;
+    }
+    const encodedMsg = encodeResult.value;
+    this.assertSendOrdering(encodedMsg);
+    this.sendBuffer.push(encodedMsg);
+    const sent = this.conn.send(encodedMsg.data);
+    if (!sent) {
+      const reason = "failed to send message";
+      this.listeners.onMessageSendFailure(
+        { ...encodedMsg.msg, seq: encodedMsg.seq },
+        reason
+      );
+      return { ok: false, reason };
     }
-    this.seqSent = constructedMsg.seq;
-    return res;
+    this.seqSent = encodedMsg.seq;
+    return { ok: true, value: encodedMsg.id };
   }
   constructor(props) {
     super(props);
@@ -853,10 +893,14 @@ var SessionConnected = class extends IdentifiedSession {
       );
       for (const msg of this.sendBuffer) {
         this.assertSendOrdering(msg);
-        const res = sendMessage(this.conn, this.codec, msg);
-        if (!res.ok) {
-          this.listeners.onMessageSendFailure(msg, res.reason);
-          return res;
+        const sent = this.conn.send(msg.data);
+        if (!sent) {
+          const reason = "failed to send buffered message";
+          this.listeners.onMessageSendFailure(
+            { ...msg.msg, seq: msg.seq },
+            reason
+          );
+          return { ok: false, reason };
         }
         this.seqSent = msg.seq;
       }
@@ -1517,6 +1561,17 @@ var Transport = class {
     const noConnectionSession = SessionStateGraph.transition.ConnectingToNoConnection(session, {
       onSessionGracePeriodElapsed: () => {
         this.onSessionGracePeriodElapsed(noConnectionSession);
+      },
+      onMessageSendFailure: (msg, reason) => {
+        this.log?.error(`failed to send message: ${reason}`, {
+          ...noConnectionSession.loggingMetadata,
+          transportMessage: msg
+        });
+        this.protocolError({
+          type: ProtocolError.MessageSendFailure,
+          message: reason
+        });
+        this.deleteSession(noConnectionSession, { unhealthy: true });
       }
     });
     this.updateSession(noConnectionSession);
@@ -1524,18 +1579,32 @@ var Transport = class {
   }
   onConnClosed(session) {
     let noConnectionSession;
+    const listeners = {
+      onSessionGracePeriodElapsed: () => {
+        this.onSessionGracePeriodElapsed(noConnectionSession);
+      },
+      onMessageSendFailure: (msg, reason) => {
+        this.log?.error(`failed to send message: ${reason}`, {
+          ...noConnectionSession.loggingMetadata,
+          transportMessage: msg
+        });
+        this.protocolError({
+          type: ProtocolError.MessageSendFailure,
+          message: reason
+        });
+        this.deleteSession(noConnectionSession, { unhealthy: true });
+      }
+    };
     if (session.state === "Handshaking" /* Handshaking */) {
-      noConnectionSession = SessionStateGraph.transition.HandshakingToNoConnection(session, {
-        onSessionGracePeriodElapsed: () => {
-          this.onSessionGracePeriodElapsed(noConnectionSession);
-        }
-      });
+      noConnectionSession = SessionStateGraph.transition.HandshakingToNoConnection(
+        session,
+        listeners
+      );
     } else {
-      noConnectionSession = SessionStateGraph.transition.ConnectedToNoConnection(session, {
-        onSessionGracePeriodElapsed: () => {
-          this.onSessionGracePeriodElapsed(noConnectionSession);
-        }
-      });
+      noConnectionSession = SessionStateGraph.transition.ConnectedToNoConnection(
+        session,
+        listeners
+      );
     }
     this.updateSession(noConnectionSession);
     return noConnectionSession;
@@ -1696,6 +1765,17 @@ var ClientTransport = class extends Transport {
       {
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(session);
+        },
+        onMessageSendFailure: (msg, reason) => {
+          this.log?.error(`failed to send message: ${reason}`, {
+            ...session.loggingMetadata,
+            transportMessage: msg
+          });
+          this.protocolError({
+            type: ProtocolError.MessageSendFailure,
+            message: reason
+          });
+          this.deleteSession(session, { unhealthy: true });
         }
       },
       this.options,
@@ -1760,6 +1840,17 @@ var ClientTransport = class extends Transport {
         },
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(handshakingSession);
+        },
+        onMessageSendFailure: (msg, reason) => {
+          this.log?.error(`failed to send message: ${reason}`, {
+            ...handshakingSession.loggingMetadata,
+            transportMessage: msg
+          });
+          this.protocolError({
+            type: ProtocolError.MessageSendFailure,
+            message: reason
+          });
+          this.deleteSession(handshakingSession, { unhealthy: true });
         }
       }
     );
@@ -1921,6 +2012,17 @@ var ClientTransport = class extends Transport {
         },
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(backingOffSession);
+        },
+        onMessageSendFailure: (msg, reason) => {
+          this.log?.error(`failed to send message: ${reason}`, {
+            ...backingOffSession.loggingMetadata,
+            transportMessage: msg
+          });
+          this.protocolError({
+            type: ProtocolError.MessageSendFailure,
+            message: reason
+          });
+          this.deleteSession(backingOffSession, { unhealthy: true });
         }
       }
     );
@@ -1984,6 +2086,17 @@ var ClientTransport = class extends Transport {
         },
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(connectingSession);
+        },
+        onMessageSendFailure: (msg, reason) => {
+          this.log?.error(`failed to send message: ${reason}`, {
+            ...connectingSession.loggingMetadata,
+            transportMessage: msg
+          });
+          this.protocolError({
+            type: ProtocolError.MessageSendFailure,
+            message: reason
+          });
+          this.deleteSession(connectingSession, { unhealthy: true });
         }
       }
     );
@@ -2314,6 +2427,17 @@ var ServerTransport = class extends Transport {
           {
             onSessionGracePeriodElapsed: () => {
               this.onSessionGracePeriodElapsed(noConnectionSession);
+            },
+            onMessageSendFailure: (msg2, reason) => {
+              this.log?.error(`failed to send message: ${reason}`, {
+                ...noConnectionSession.loggingMetadata,
+                transportMessage: msg2
+              });
+              this.protocolError({
+                type: ProtocolError.MessageSendFailure,
+                message: reason
+              });
+              this.deleteSession(noConnectionSession, { unhealthy: true });
             }
           }
         );