@replit/river 0.23.11 → 0.23.13

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

@@ -24,8 +24,8 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 
-// transport/transport.ts
-var import_value = require("@sinclair/typebox/value");
+// transport/session.ts
+var import_nanoid2 = require("nanoid");
 
 // transport/message.ts
 var import_typebox = require("@sinclair/typebox");
@@ -102,104 +102,11 @@ function isAck(controlFlag) {
   return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
 }
 
-// logging/log.ts
-var LoggingLevels = {
-  debug: -1,
-  info: 0,
-  warn: 1,
-  error: 2
-};
-var cleanedLogFn = (log) => {
-  return (msg, metadata) => {
-    if (!metadata?.transportMessage) {
-      log(msg, metadata);
-      return;
-    }
-    const { payload, ...rest } = metadata.transportMessage;
-    metadata.transportMessage = rest;
-    log(msg, metadata);
-  };
-};
-var BaseLogger = class {
-  minLevel;
-  output;
-  constructor(output, minLevel = "info") {
-    this.minLevel = minLevel;
-    this.output = output;
-  }
-  debug(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {
-      this.output(msg, metadata ?? {}, "debug");
-    }
-  }
-  info(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {
-      this.output(msg, metadata ?? {}, "info");
-    }
-  }
-  warn(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {
-      this.output(msg, metadata ?? {}, "warn");
-    }
-  }
-  error(msg, metadata) {
-    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {
-      this.output(msg, metadata ?? {}, "error");
-    }
-  }
-};
-var createLogProxy = (log) => ({
-  debug: cleanedLogFn(log.debug.bind(log)),
-  info: cleanedLogFn(log.info.bind(log)),
-  warn: cleanedLogFn(log.warn.bind(log)),
-  error: cleanedLogFn(log.error.bind(log))
-});
-
-// transport/events.ts
-var ProtocolError = {
-  RetriesExceeded: "conn_retry_exceeded",
-  HandshakeFailed: "handshake_failed",
-  MessageOrderingViolated: "message_ordering_violated"
-};
-var EventDispatcher = class {
-  eventListeners = {};
-  removeAllListeners() {
-    this.eventListeners = {};
-  }
-  numberOfListeners(eventType) {
-    return this.eventListeners[eventType]?.size ?? 0;
-  }
-  addEventListener(eventType, handler) {
-    if (!this.eventListeners[eventType]) {
-      this.eventListeners[eventType] = /* @__PURE__ */ new Set();
-    }
-    this.eventListeners[eventType]?.add(handler);
-  }
-  removeEventListener(eventType, handler) {
-    const handlers = this.eventListeners[eventType];
-    if (handlers) {
-      this.eventListeners[eventType]?.delete(handler);
-    }
-  }
-  dispatchEvent(eventType, event) {
-    const handlers = this.eventListeners[eventType];
-    if (handlers) {
-      const copy = [...handlers];
-      for (const handler of copy) {
-        handler(event);
-      }
-    }
-  }
-};
-
-// transport/session.ts
-var import_nanoid2 = require("nanoid");
-
 // tracing/index.ts
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.11";
+var version = "0.23.13";
 
 // tracing/index.ts
 function createSessionTelemetryInfo(session, propagationCtx) {
@@ -449,10 +356,12 @@ var Session = class {
     this.connection.close();
     this.connection = void 0;
   }
-  replaceWithNewConnection(newConn) {
+  replaceWithNewConnection(newConn, isTransparentReconnect) {
     this.closeStaleConnection(newConn);
     this.cancelGrace();
-    this.sendBufferedMessages(newConn);
+    if (isTransparentReconnect) {
+      this.sendBufferedMessages(newConn);
+    }
     this.connection = newConn;
     this.handshakingConnection = void 0;
   }
@@ -523,13 +432,59 @@ var Session = class {
   }
 };
 
-// util/stringify.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
+// transport/impls/ws/connection.ts
+var WebSocketConnection = class extends Connection {
+  errorCb = null;
+  closeCb = null;
+  ws;
+  constructor(ws) {
+    super();
+    this.ws = ws;
+    this.ws.binaryType = "arraybuffer";
+    let didError = false;
+    this.ws.onerror = () => {
+      didError = true;
+    };
+    this.ws.onclose = ({ code, reason }) => {
+      if (didError && this.errorCb) {
+        this.errorCb(
+          new Error(
+            `websocket closed with code and reason: ${code} - ${reason}`
+          )
+        );
+      }
+      if (this.closeCb) {
+        this.closeCb();
+      }
+    };
   }
-  return `[coerced to error] ${String(err)}`;
-}
+  addDataListener(cb) {
+    this.ws.onmessage = (msg) => cb(msg.data);
+  }
+  removeDataListener() {
+    this.ws.onmessage = null;
+  }
+  addCloseListener(cb) {
+    this.closeCb = cb;
+  }
+  addErrorListener(cb) {
+    this.errorCb = cb;
+  }
+  send(payload) {
+    if (this.ws.readyState === this.ws.OPEN) {
+      this.ws.send(payload);
+      return true;
+    } else {
+      return false;
+    }
+  }
+  close() {
+    this.ws.close();
+  }
+};
+
+// transport/server.ts
+var import_api4 = require("@opentelemetry/api");
 
 // codec/json.ts
 var encoder = new TextEncoder();
@@ -583,8 +538,7 @@ var NaiveJsonCodec = {
   }
 };
 
-// transport/transport.ts
-var import_api3 = require("@opentelemetry/api");
+// transport/options.ts
 var defaultTransportOptions = {
   heartbeatIntervalMs: 1e3,
   heartbeatsUntilDead: 2,
@@ -605,6 +559,102 @@ var defaultClientTransportOptions = {
 var defaultServerTransportOptions = {
   ...defaultTransportOptions
 };
+
+// transport/transport.ts
+var import_value = require("@sinclair/typebox/value");
+
+// logging/log.ts
+var LoggingLevels = {
+  debug: -1,
+  info: 0,
+  warn: 1,
+  error: 2
+};
+var cleanedLogFn = (log) => {
+  return (msg, metadata) => {
+    if (!metadata?.transportMessage) {
+      log(msg, metadata);
+      return;
+    }
+    const { payload, ...rest } = metadata.transportMessage;
+    metadata.transportMessage = rest;
+    log(msg, metadata);
+  };
+};
+var BaseLogger = class {
+  minLevel;
+  output;
+  constructor(output, minLevel = "info") {
+    this.minLevel = minLevel;
+    this.output = output;
+  }
+  debug(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {
+      this.output(msg, metadata ?? {}, "debug");
+    }
+  }
+  info(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {
+      this.output(msg, metadata ?? {}, "info");
+    }
+  }
+  warn(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {
+      this.output(msg, metadata ?? {}, "warn");
+    }
+  }
+  error(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {
+      this.output(msg, metadata ?? {}, "error");
+    }
+  }
+};
+var createLogProxy = (log) => ({
+  debug: cleanedLogFn(log.debug.bind(log)),
+  info: cleanedLogFn(log.info.bind(log)),
+  warn: cleanedLogFn(log.warn.bind(log)),
+  error: cleanedLogFn(log.error.bind(log))
+});
+
+// transport/events.ts
+var ProtocolError = {
+  RetriesExceeded: "conn_retry_exceeded",
+  HandshakeFailed: "handshake_failed",
+  MessageOrderingViolated: "message_ordering_violated"
+};
+var EventDispatcher = class {
+  eventListeners = {};
+  removeAllListeners() {
+    this.eventListeners = {};
+  }
+  numberOfListeners(eventType) {
+    return this.eventListeners[eventType]?.size ?? 0;
+  }
+  addEventListener(eventType, handler) {
+    if (!this.eventListeners[eventType]) {
+      this.eventListeners[eventType] = /* @__PURE__ */ new Set();
+    }
+    this.eventListeners[eventType]?.add(handler);
+  }
+  removeEventListener(eventType, handler) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      this.eventListeners[eventType]?.delete(handler);
+    }
+  }
+  dispatchEvent(eventType, event) {
+    const handlers = this.eventListeners[eventType];
+    if (handlers) {
+      const copy = [...handlers];
+      for (const handler of copy) {
+        handler(event);
+      }
+    }
+  }
+};
+
+// transport/transport.ts
+var import_api3 = require("@opentelemetry/api");
 var Transport = class {
   /**
    * The status of the transport.
@@ -665,15 +715,13 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, session, isReconnect) {
+  onConnect(conn, session, isTransparentReconnect) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
     });
     conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
-    if (isReconnect) {
-      session.replaceWithNewConnection(conn);
-    }
+    session.replaceWithNewConnection(conn, isTransparentReconnect);
     this.log?.info(`connected to ${session.to}`, {
       ...conn.loggingMetadata,
       ...session.loggingMetadata
@@ -705,7 +753,8 @@ var Transport = class {
     propagationCtx
   }) {
     let session = this.sessions.get(to);
-    let isReconnect = session !== void 0;
+    const isReconnect = session !== void 0;
+    let isTransparentReconnect = isReconnect;
     if (session?.advertisedSessionId !== void 0 && sessionId !== void 0 && session.advertisedSessionId !== sessionId) {
       this.log?.info(
         `session for ${to} already exists but has a different session id (expected: ${session.advertisedSessionId}, got: ${sessionId}), creating a new one`,
@@ -716,7 +765,7 @@ var Transport = class {
         closeHandshakingConnection: handshakingConn !== void 0,
         handshakingConn
       });
-      isReconnect = false;
+      isTransparentReconnect = false;
       session = void 0;
     }
     if (!session) {
@@ -732,7 +781,7 @@ var Transport = class {
     if (handshakingConn !== void 0) {
       session.replaceWithNewHandshakingConnection(handshakingConn);
     }
-    return { session, isReconnect };
+    return { session, isReconnect, isTransparentReconnect };
   }
   deleteSession({
     session,
@@ -760,6 +809,16 @@ var Transport = class {
    * @param connectedTo The peer we are connected to.
    */
   onDisconnect(conn, session) {
+    if (session.connection !== void 0 && session.connection.id !== conn.id) {
+      session.telemetry.span.addEvent("onDisconnect race");
+      this.log?.warn("onDisconnect race", {
+        clientId: this.clientId,
+        ...session.loggingMetadata,
+        ...conn.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
+      return;
+    }
     conn.telemetry?.span.end();
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "disconnect",
@@ -767,6 +826,16 @@ var Transport = class {
     });
     session.connection = void 0;
     session.beginGrace(() => {
+      if (session.connection !== void 0) {
+        session.telemetry.span.addEvent("session grace period race");
+        this.log?.warn("session grace period race", {
+          clientId: this.clientId,
+          ...session.loggingMetadata,
+          ...conn.loggingMetadata,
+          tags: ["invariant-violation"]
+        });
+        return;
+      }
       session.telemetry.span.addEvent("session grace period expired");
       this.deleteSession({
         session,
@@ -934,6 +1003,17 @@ var Transport = class {
     return this.status;
   }
 };
+
+// util/stringify.ts
+function coerceErrorString(err) {
+  if (err instanceof Error) {
+    return err.message || "unknown reason";
+  }
+  return `[coerced to error] ${String(err)}`;
+}
+
+// transport/server.ts
+var import_value2 = require("@sinclair/typebox/value");
 var ServerTransport = class extends Transport {
   /**
    * The options for this transport.
@@ -982,7 +1062,7 @@ var ServerTransport = class extends Transport {
           }
         );
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api4.SpanStatusCode.ERROR,
           message: "handshake timeout"
         });
         conn.close();
@@ -1033,7 +1113,7 @@ var ServerTransport = class extends Transport {
     });
     conn.addErrorListener((err) => {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "connection error"
       });
       if (!session)
@@ -1047,9 +1127,9 @@ var ServerTransport = class extends Transport {
   async validateHandshakeMetadata(conn, session, rawMetadata, from) {
     let parsedMetadata = {};
     if (this.handshakeExtensions) {
-      if (!import_value.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
+      if (!import_value2.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api4.SpanStatusCode.ERROR,
           message: "malformed handshake meta"
         });
         const reason = "received malformed handshake metadata";
@@ -1062,7 +1142,7 @@ var ServerTransport = class extends Transport {
           ...conn.loggingMetadata,
           clientId: this.clientId,
           validationErrors: [
-            ...import_value.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
+            ...import_value2.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
           ]
         });
         this.protocolError(ProtocolError.HandshakeFailed, reason);
@@ -1076,7 +1156,7 @@ var ServerTransport = class extends Transport {
       if (parsedMetadata === false) {
         const reason = "rejected by handshake handler";
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api4.SpanStatusCode.ERROR,
           message: reason
         });
         const responseMsg = handshakeResponseMessage(this.clientId, from, {
@@ -1098,7 +1178,7 @@ var ServerTransport = class extends Transport {
     const parsed = this.parseMsg(data, conn);
     if (!parsed) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "non-transport message"
       });
       this.protocolError(
@@ -1107,9 +1187,9 @@ var ServerTransport = class extends Transport {
       );
       return false;
     }
-    if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
+    if (!import_value2.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "invalid handshake request"
       });
       const reason = "received invalid handshake msg";
@@ -1125,7 +1205,7 @@ var ServerTransport = class extends Transport {
         // before passing it to user-land
         transportMessage: parsed,
         validationErrors: [
-          ...import_value.Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload)
+          ...import_value2.Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload)
         ]
       });
       this.protocolError(
@@ -1137,7 +1217,7 @@ var ServerTransport = class extends Transport {
     const gotVersion = parsed.payload.protocolVersion;
     if (gotVersion !== PROTOCOL_VERSION) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "incorrect protocol version"
       });
       const reason = `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`;
@@ -1163,7 +1243,7 @@ var ServerTransport = class extends Transport {
     if (parsedMetadata === false) {
       return false;
     }
-    const { session, isReconnect } = this.getOrCreateSession({
+    const { session, isTransparentReconnect } = this.getOrCreateSession({
       to: parsed.from,
       conn,
       sessionId: parsed.payload.sessionId,
@@ -1179,62 +1259,11 @@ var ServerTransport = class extends Transport {
       sessionId: session.id
     });
     conn.send(this.codec.toBuffer(responseMsg));
-    this.onConnect(conn, session, isReconnect);
+    this.onConnect(conn, session, isTransparentReconnect);
     return session;
   }
 };
 
-// transport/impls/ws/connection.ts
-var WebSocketConnection = class extends Connection {
-  errorCb = null;
-  closeCb = null;
-  ws;
-  constructor(ws) {
-    super();
-    this.ws = ws;
-    this.ws.binaryType = "arraybuffer";
-    let didError = false;
-    this.ws.onerror = () => {
-      didError = true;
-    };
-    this.ws.onclose = ({ code, reason }) => {
-      if (didError && this.errorCb) {
-        this.errorCb(
-          new Error(
-            `websocket closed with code and reason: ${code} - ${reason}`
-          )
-        );
-      }
-      if (this.closeCb) {
-        this.closeCb();
-      }
-    };
-  }
-  addDataListener(cb) {
-    this.ws.onmessage = (msg) => cb(msg.data);
-  }
-  removeDataListener() {
-    this.ws.onmessage = null;
-  }
-  addCloseListener(cb) {
-    this.closeCb = cb;
-  }
-  addErrorListener(cb) {
-    this.errorCb = cb;
-  }
-  send(payload) {
-    if (this.ws.readyState === this.ws.OPEN) {
-      this.ws.send(payload);
-      return true;
-    } else {
-      return false;
-    }
-  }
-  close() {
-    this.ws.close();
-  }
-};
-
 // transport/impls/ws/server.ts
 var WebSocketServerTransport = class extends ServerTransport {
   wss;