@replit/river 0.200.0-rc.9 → 0.200.2

package/dist/transport/impls/ws/client.cjs

@@ -75,10 +75,7 @@ var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   expectedSessionState: import_typebox.Type.Object({
     // what the client expects the server to send next
     nextExpectedSeq: import_typebox.Type.Integer(),
-    // TODO: remove optional once we know all servers
-    // are nextSentSeq here
-    // what the server expects the client to send next
-    nextSentSeq: import_typebox.Type.Optional(import_typebox.Type.Integer())
+    nextSentSeq: import_typebox.Type.Integer()
   }),
   metadata: import_typebox.Type.Optional(import_typebox.Type.Unknown())
 });
@@ -114,9 +111,7 @@ var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
     import_typebox.Type.Object({
       ok: import_typebox.Type.Literal(false),
       reason: import_typebox.Type.String(),
-      // TODO: remove optional once we know all servers
-      // are sending code here
-      code: import_typebox.Type.Optional(HandshakeErrorResponseCodes)
+      code: HandshakeErrorResponseCodes
     })
   ])
 });
@@ -360,7 +355,8 @@ var createLogProxy = (log) => ({
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  MessageOrderingViolated: "message_ordering_violated"
+  MessageOrderingViolated: "message_ordering_violated",
+  InvalidMessage: "invalid_message"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -638,7 +634,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.200.0-rc.9";
+var version = "0.200.2";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -800,13 +796,13 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     if (this.sendBuffer.length > 0) {
-      this.log?.debug(
-        `sending ${this.sendBuffer.length} buffered messages`,
+      this.log?.info(
+        `sending ${this.sendBuffer.length} buffered messages, starting at seq ${this.nextSeq()}`,
         this.loggingMetadata
       );
-    }
-    for (const msg of this.sendBuffer) {
-      this.conn.send(this.options.codec.toBuffer(msg));
+      for (const msg of this.sendBuffer) {
+        this.conn.send(this.options.codec.toBuffer(msg));
+      }
     }
     this.isActivelyHeartbeating = false;
     this.heartbeatHandle = setInterval(() => {
@@ -848,6 +844,12 @@ var SessionConnected = class extends IdentifiedSession {
       }
     });
   }
+  closeConnection() {
+    this.conn.removeDataListener(this.onMessageData);
+    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
+    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
+    this.conn.close();
+  }
   onMessageData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -864,8 +866,8 @@ var SessionConnected = class extends IdentifiedSession {
           }
         );
       } else {
-        const reason = `received out-of-order msg (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
-        this.log?.error(reason, {
+        const reason = `received out-of-order msg, closing connection (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
+        this.log?.warn(reason, {
           ...this.loggingMetadata,
           transportMessage: parsedMsg,
           tags: ["invariant-violation"]
@@ -874,7 +876,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.listeners.onInvalidMessage(reason);
+        this.closeConnection();
       }
       return;
     }
@@ -900,8 +902,10 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onMessageData);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    clearInterval(this.heartbeatHandle);
-    this.heartbeatHandle = void 0;
+    if (this.heartbeatHandle) {
+      clearInterval(this.heartbeatHandle);
+      this.heartbeatHandle = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -1268,12 +1272,12 @@ var Transport = class {
   /**
    * Called when a message is received by this transport.
    * You generally shouldn't need to override this in downstream transport implementations.
-   * @param msg The received message.
+   * @param message The received message.
    */
-  handleMsg(msg) {
+  handleMsg(message) {
     if (this.getStatus() !== "open")
       return;
-    this.eventDispatcher.dispatchEvent("message", msg);
+    this.eventDispatcher.dispatchEvent("message", message);
   }
   /**
    * Adds a listener to this transport.
@@ -1313,28 +1317,59 @@ var Transport = class {
   getStatus() {
     return this.status;
   }
-  updateSession(session) {
+  // state transitions
+  createSession(session) {
     const activeSession = this.sessions.get(session.to);
-    if (activeSession && activeSession.id !== session.id) {
-      const msg = `attempt to transition active session for ${session.to} but active session (${activeSession.id}) is different from handle (${session.id})`;
+    if (activeSession) {
+      const msg = `attempt to create session for ${session.to} but active session (${activeSession.id}) already exists`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
       throw new Error(msg);
     }
     this.sessions.set(session.to, session);
+    this.eventDispatcher.dispatchEvent("sessionStatus", {
+      status: "connect",
+      session
+    });
+    this.eventDispatcher.dispatchEvent("sessionTransition", {
+      state: session.state,
+      session
+    });
+  }
+  updateSession(session) {
+    const activeSession = this.sessions.get(session.to);
     if (!activeSession) {
-      this.eventDispatcher.dispatchEvent("sessionStatus", {
-        status: "connect",
-        session
+      const msg = `attempt to transition session for ${session.to} but no active session exists`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
+      throw new Error(msg);
+    }
+    if (activeSession.id !== session.id) {
+      const msg = `attempt to transition active session for ${session.to} but active session (${activeSession.id}) is different from handle (${session.id})`;
+      this.log?.error(msg, {
+        ...session.loggingMetadata,
+        tags: ["invariant-violation"]
       });
+      throw new Error(msg);
     }
+    this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionTransition", {
       state: session.state,
       session
     });
-    return session;
   }
-  // state transitions
-  deleteSession(session) {
-    session.log?.info(`closing session ${session.id}`, session.loggingMetadata);
+  deleteSession(session, options) {
+    if (session._isConsumed)
+      return;
+    const loggingMetadata = session.loggingMetadata;
+    if (loggingMetadata.tags && options?.unhealthy) {
+      loggingMetadata.tags.push("unhealthy-session");
+    }
+    session.log?.info(`closing session ${session.id}`, loggingMetadata);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "disconnect",
       session
@@ -1357,7 +1392,8 @@ var Transport = class {
         this.onSessionGracePeriodElapsed(noConnectionSession);
       }
     });
-    return this.updateSession(noConnectionSession);
+    this.updateSession(noConnectionSession);
+    return noConnectionSession;
   }
   onConnClosed(session) {
     let noConnectionSession;
@@ -1374,7 +1410,36 @@ var Transport = class {
         }
       });
     }
-    return this.updateSession(noConnectionSession);
+    this.updateSession(noConnectionSession);
+    return noConnectionSession;
+  }
+  /**
+   * Gets a send closure scoped to a specific session. Sending using the returned
+   * closure after the session has transitioned to a different state will be a noop.
+   *
+   * Session objects themselves can become stale as they transition between
+   * states. As stale sessions cannot be used again (and will throw), holding
+   * onto a session object is not recommended.
+   */
+  getSessionBoundSendFn(to, sessionId) {
+    if (this.getStatus() !== "open") {
+      throw new Error("cannot get a bound send function on a closed transport");
+    }
+    return (msg) => {
+      const session = this.sessions.get(to);
+      if (!session) {
+        throw new Error(
+          `session scope for ${sessionId} has ended (close), can't send`
+        );
+      }
+      const sameSession = session.id === sessionId;
+      if (!sameSession) {
+        throw new Error(
+          `session scope for ${sessionId} has ended (transition), can't send`
+        );
+      }
+      return session.send(msg);
+    };
   }
 };
 
@@ -1427,22 +1492,10 @@ var ClientTransport = class extends Transport {
       this.connect(to);
     }
   }
-  send(to, msg) {
-    if (this.getStatus() === "closed") {
-      const err = "transport is closed, cant send";
-      this.log?.error(err, {
-        clientId: this.clientId,
-        transportMessage: msg,
-        tags: ["invariant-violation"]
-      });
-      throw new Error(err);
-    }
-    let session = this.sessions.get(to);
-    if (!session) {
-      session = this.createUnconnectedSession(to);
-    }
-    return session.send(msg);
-  }
+  /*
+   * Creates a raw unconnected session object.
+   * This is mostly a River internal, you shouldn't need to use this directly.
+   */
   createUnconnectedSession(to) {
     const session = ClientSessionStateGraph.entrypoint(
       to,
@@ -1456,7 +1509,7 @@ var ClientTransport = class extends Transport {
       currentProtocolVersion,
       this.log
     );
-    this.updateSession(session);
+    this.createSession(session);
     return session;
   }
   // listeners
@@ -1497,7 +1550,7 @@ var ClientTransport = class extends Transport {
             `invalid handshake: ${reason}`,
             handshakingSession.loggingMetadata
           );
-          this.deleteSession(session);
+          this.deleteSession(session, { unhealthy: true });
           this.protocolError({
             type: ProtocolError.HandshakeFailed,
             code,
@@ -1526,7 +1579,7 @@ var ClientTransport = class extends Transport {
       message: reason
     });
     this.log?.warn(reason, metadata);
-    this.deleteSession(session);
+    this.deleteSession(session, { unhealthy: true });
   }
   onHandshakeResponse(session, msg) {
     if (!import_value2.Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
@@ -1541,10 +1594,10 @@ var ClientTransport = class extends Transport {
       return;
     }
     if (!msg.payload.status.ok) {
-      const retriable = msg.payload.status.code ? import_value2.Value.Check(
+      const retriable = import_value2.Value.Check(
         HandshakeErrorRetriableResponseCodes,
         msg.payload.status.code
-      ) : false;
+      );
       const reason = `handshake failed: ${msg.payload.status.reason}`;
       const to = session.to;
       this.rejectHandshakeResponse(session, reason, {
@@ -1589,11 +1642,13 @@ var ClientTransport = class extends Transport {
         );
         this.onConnClosed(connectedSession);
       },
-      onMessage: (msg2) => this.handleMsg(msg2),
+      onMessage: (msg2) => {
+        this.handleMsg(msg2);
+      },
       onInvalidMessage: (reason) => {
-        this.deleteSession(connectedSession);
+        this.deleteSession(connectedSession, { unhealthy: true });
         this.protocolError({
-          type: ProtocolError.MessageOrderingViolated,
+          type: ProtocolError.InvalidMessage,
           message: reason
         });
       }
@@ -1612,8 +1667,7 @@ var ClientTransport = class extends Transport {
       );
       return;
     }
-    let session = this.sessions.get(to);
-    session ??= this.createUnconnectedSession(to);
+    const session = this.sessions.get(to) ?? this.createUnconnectedSession(to);
     if (session.state !== "NoConnection" /* NoConnection */) {
       this.log?.debug(
         `session to ${to} has state ${session.state}, skipping connect attempt`,
@@ -1705,6 +1759,9 @@ var ClientTransport = class extends Transport {
     if (this.handshakeExtensions) {
       metadata = await this.handshakeExtensions.construct();
     }
+    if (session._isConsumed) {
+      return;
+    }
     const requestMsg = handshakeRequestMessage({
       from: this.clientId,
       to: session.to,
@@ -1800,11 +1857,21 @@ var Connection = class {
 };
 
 // transport/impls/ws/connection.ts
+var WS_HEALTHY_CLOSE_CODE = 1e3;
 var WebSocketConnection = class extends Connection {
   ws;
-  constructor(ws) {
+  extras;
+  get loggingMetadata() {
+    const metadata = super.loggingMetadata;
+    if (this.extras) {
+      metadata.extras = this.extras;
+    }
+    return metadata;
+  }
+  constructor(ws, extras) {
     super();
     this.ws = ws;
+    this.extras = extras;
     this.ws.binaryType = "arraybuffer";
     let didError = false;
     this.ws.onerror = () => {
@@ -1837,7 +1904,7 @@ var WebSocketConnection = class extends Connection {
     return true;
   }
   close() {
-    this.ws.close();
+    this.ws.close(WS_HEALTHY_CLOSE_CODE);
   }
 };