@replit/river 0.23.11 → 0.23.13

package/dist/transport/index.cjs

@@ -224,7 +224,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.11";
+var version = "0.23.13";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -483,10 +483,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;
   }
@@ -557,84 +559,8 @@ var Session = class {
   }
 };
 
-// util/stringify.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
-  }
-  return `[coerced to error] ${String(err)}`;
-}
-
-// transport/rateLimit.ts
-var LeakyBucketRateLimit = class {
-  budgetConsumed;
-  intervalHandles;
-  options;
-  constructor(options) {
-    this.options = options;
-    this.budgetConsumed = /* @__PURE__ */ new Map();
-    this.intervalHandles = /* @__PURE__ */ new Map();
-  }
-  getBackoffMs(user) {
-    if (!this.budgetConsumed.has(user))
-      return 0;
-    const exponent = Math.max(0, this.getBudgetConsumed(user) - 1);
-    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
-    const backoffMs = Math.min(
-      this.options.baseIntervalMs * 2 ** exponent,
-      this.options.maxBackoffMs
-    );
-    return backoffMs + jitter;
-  }
-  get totalBudgetRestoreTime() {
-    return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
-  }
-  consumeBudget(user) {
-    this.stopLeak(user);
-    this.budgetConsumed.set(user, this.getBudgetConsumed(user) + 1);
-  }
-  getBudgetConsumed(user) {
-    return this.budgetConsumed.get(user) ?? 0;
-  }
-  hasBudget(user) {
-    return this.getBudgetConsumed(user) < this.options.attemptBudgetCapacity;
-  }
-  startRestoringBudget(user) {
-    if (this.intervalHandles.has(user)) {
-      return;
-    }
-    const restoreBudgetForUser = () => {
-      const currentBudget = this.budgetConsumed.get(user);
-      if (!currentBudget) {
-        this.stopLeak(user);
-        return;
-      }
-      const newBudget = currentBudget - 1;
-      if (newBudget === 0) {
-        this.budgetConsumed.delete(user);
-        return;
-      }
-      this.budgetConsumed.set(user, newBudget);
-    };
-    const intervalHandle = setInterval(
-      restoreBudgetForUser,
-      this.options.budgetRestoreIntervalMs
-    );
-    this.intervalHandles.set(user, intervalHandle);
-  }
-  stopLeak(user) {
-    if (!this.intervalHandles.has(user)) {
-      return;
-    }
-    clearInterval(this.intervalHandles.get(user));
-    this.intervalHandles.delete(user);
-  }
-  close() {
-    for (const user of this.intervalHandles.keys()) {
-      this.stopLeak(user);
-    }
-  }
-};
+// transport/transport.ts
+var import_api3 = require("@opentelemetry/api");
 
 // codec/json.ts
 var encoder = new TextEncoder();
@@ -688,8 +614,7 @@ var NaiveJsonCodec = {
   }
 };
 
-// transport/transport.ts
-var import_api3 = require("@opentelemetry/api");
+// transport/options.ts
 var defaultTransportOptions = {
   heartbeatIntervalMs: 1e3,
   heartbeatsUntilDead: 2,
@@ -710,6 +635,8 @@ var defaultClientTransportOptions = {
 var defaultServerTransportOptions = {
   ...defaultTransportOptions
 };
+
+// transport/transport.ts
 var Transport = class {
   /**
    * The status of the transport.
@@ -770,15 +697,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
@@ -810,7 +735,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`,
@@ -821,7 +747,7 @@ var Transport = class {
         closeHandshakingConnection: handshakingConn !== void 0,
         handshakingConn
       });
-      isReconnect = false;
+      isTransparentReconnect = false;
       session = void 0;
     }
     if (!session) {
@@ -837,7 +763,7 @@ var Transport = class {
     if (handshakingConn !== void 0) {
       session.replaceWithNewHandshakingConnection(handshakingConn);
     }
-    return { session, isReconnect };
+    return { session, isReconnect, isTransparentReconnect };
   }
   deleteSession({
     session,
@@ -865,6 +791,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",
@@ -872,6 +808,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,
@@ -1039,6 +985,91 @@ var Transport = class {
     return this.status;
   }
 };
+
+// transport/client.ts
+var import_api4 = require("@opentelemetry/api");
+
+// transport/rateLimit.ts
+var LeakyBucketRateLimit = class {
+  budgetConsumed;
+  intervalHandles;
+  options;
+  constructor(options) {
+    this.options = options;
+    this.budgetConsumed = /* @__PURE__ */ new Map();
+    this.intervalHandles = /* @__PURE__ */ new Map();
+  }
+  getBackoffMs(user) {
+    if (!this.budgetConsumed.has(user))
+      return 0;
+    const exponent = Math.max(0, this.getBudgetConsumed(user) - 1);
+    const jitter = Math.floor(Math.random() * this.options.maxJitterMs);
+    const backoffMs = Math.min(
+      this.options.baseIntervalMs * 2 ** exponent,
+      this.options.maxBackoffMs
+    );
+    return backoffMs + jitter;
+  }
+  get totalBudgetRestoreTime() {
+    return this.options.budgetRestoreIntervalMs * this.options.attemptBudgetCapacity;
+  }
+  consumeBudget(user) {
+    this.stopLeak(user);
+    this.budgetConsumed.set(user, this.getBudgetConsumed(user) + 1);
+  }
+  getBudgetConsumed(user) {
+    return this.budgetConsumed.get(user) ?? 0;
+  }
+  hasBudget(user) {
+    return this.getBudgetConsumed(user) < this.options.attemptBudgetCapacity;
+  }
+  startRestoringBudget(user) {
+    if (this.intervalHandles.has(user)) {
+      return;
+    }
+    const restoreBudgetForUser = () => {
+      const currentBudget = this.budgetConsumed.get(user);
+      if (!currentBudget) {
+        this.stopLeak(user);
+        return;
+      }
+      const newBudget = currentBudget - 1;
+      if (newBudget === 0) {
+        this.budgetConsumed.delete(user);
+        return;
+      }
+      this.budgetConsumed.set(user, newBudget);
+    };
+    const intervalHandle = setInterval(
+      restoreBudgetForUser,
+      this.options.budgetRestoreIntervalMs
+    );
+    this.intervalHandles.set(user, intervalHandle);
+  }
+  stopLeak(user) {
+    if (!this.intervalHandles.has(user)) {
+      return;
+    }
+    clearInterval(this.intervalHandles.get(user));
+    this.intervalHandles.delete(user);
+  }
+  close() {
+    for (const user of this.intervalHandles.keys()) {
+      this.stopLeak(user);
+    }
+  }
+};
+
+// util/stringify.ts
+function coerceErrorString(err) {
+  if (err instanceof Error) {
+    return err.message || "unknown reason";
+  }
+  return `[coerced to error] ${String(err)}`;
+}
+
+// transport/client.ts
+var import_value2 = require("@sinclair/typebox/value");
 var ClientTransport = class extends Transport {
   /**
    * The options for this transport.
@@ -1099,7 +1130,7 @@ var ClientTransport = class extends Transport {
         const parsed = this.parseMsg(data2, conn);
         if (!parsed) {
           conn.telemetry?.span.setStatus({
-            code: import_api3.SpanStatusCode.ERROR,
+            code: import_api4.SpanStatusCode.ERROR,
             message: "message parse failure"
           });
           conn.close();
@@ -1130,7 +1161,7 @@ var ClientTransport = class extends Transport {
     });
     conn.addErrorListener((err) => {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "connection error"
       });
       this.log?.warn(
@@ -1148,7 +1179,7 @@ var ClientTransport = 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(
@@ -1157,9 +1188,9 @@ var ClientTransport = class extends Transport {
       );
       return false;
     }
-    if (!import_value.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
+    if (!import_value2.Value.Check(ControlMessageHandshakeResponseSchema, parsed.payload)) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "invalid handshake response"
       });
       this.log?.warn(`received invalid handshake resp`, {
@@ -1168,7 +1199,7 @@ var ClientTransport = class extends Transport {
         connectedTo: parsed.from,
         transportMessage: parsed,
         validationErrors: [
-          ...import_value.Value.Errors(
+          ...import_value2.Value.Errors(
             ControlMessageHandshakeResponseSchema,
             parsed.payload
           )
@@ -1182,7 +1213,7 @@ var ClientTransport = class extends Transport {
     }
     if (!parsed.payload.status.ok) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: "handshake rejected"
       });
       this.log?.warn(`received handshake rejection`, {
@@ -1197,18 +1228,37 @@ var ClientTransport = class extends Transport {
       );
       return false;
     }
+    const previousSession = this.sessions.get(parsed.from);
+    if (previousSession?.advertisedSessionId && previousSession.advertisedSessionId !== parsed.payload.status.sessionId) {
+      this.deleteSession({
+        session: previousSession,
+        closeHandshakingConnection: true
+      });
+      conn.telemetry?.span.setStatus({
+        code: import_api4.SpanStatusCode.ERROR,
+        message: "session id mismatch"
+      });
+      this.log?.warn(`handshake from ${parsed.from} session id mismatch`, {
+        ...conn.loggingMetadata,
+        clientId: this.clientId,
+        connectedTo: parsed.from,
+        transportMessage: parsed
+      });
+      this.protocolError(ProtocolError.HandshakeFailed, "session id mismatch");
+      return false;
+    }
     this.log?.debug(`handshake from ${parsed.from} ok`, {
       ...conn.loggingMetadata,
       clientId: this.clientId,
       connectedTo: parsed.from,
       transportMessage: parsed
     });
-    const { session, isReconnect } = this.getOrCreateSession({
+    const { session, isTransparentReconnect } = this.getOrCreateSession({
       to: parsed.from,
       conn,
       sessionId: parsed.payload.status.sessionId
     });
-    this.onConnect(conn, session, isReconnect);
+    this.onConnect(conn, session, isTransparentReconnect);
     this.retryBudget.startRestoringBudget(session.to);
     return session;
   }
@@ -1285,7 +1335,7 @@ var ClientTransport = class extends Transport {
         } catch (err) {
           const errStr = coerceErrorString(err);
           span.recordException(errStr);
-          span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
+          span.setStatus({ code: import_api4.SpanStatusCode.ERROR });
           throw err;
         } finally {
           span.end();
@@ -1336,13 +1386,13 @@ var ClientTransport = class extends Transport {
     let metadata = void 0;
     if (this.handshakeExtensions) {
       metadata = await this.handshakeExtensions.construct();
-      if (!import_value.Value.Check(this.handshakeExtensions.schema, metadata)) {
+      if (!import_value2.Value.Check(this.handshakeExtensions.schema, metadata)) {
         this.log?.error(`constructed handshake metadata did not match schema`, {
           ...conn.loggingMetadata,
           clientId: this.clientId,
           connectedTo: to,
           validationErrors: [
-            ...import_value.Value.Errors(this.handshakeExtensions.schema, metadata)
+            ...import_value2.Value.Errors(this.handshakeExtensions.schema, metadata)
           ],
           tags: ["invariant-violation"]
         });
@@ -1351,7 +1401,7 @@ var ClientTransport = class extends Transport {
           "handshake metadata did not match schema"
         );
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api4.SpanStatusCode.ERROR,
           message: "handshake meta mismatch"
         });
         return false;
@@ -1379,6 +1429,10 @@ var ClientTransport = class extends Transport {
     super.close();
   }
 };
+
+// transport/server.ts
+var import_api5 = require("@opentelemetry/api");
+var import_value3 = require("@sinclair/typebox/value");
 var ServerTransport = class extends Transport {
   /**
    * The options for this transport.
@@ -1427,7 +1481,7 @@ var ServerTransport = class extends Transport {
           }
         );
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api5.SpanStatusCode.ERROR,
           message: "handshake timeout"
         });
         conn.close();
@@ -1478,7 +1532,7 @@ var ServerTransport = class extends Transport {
     });
     conn.addErrorListener((err) => {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api5.SpanStatusCode.ERROR,
         message: "connection error"
       });
       if (!session)
@@ -1492,9 +1546,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_value3.Value.Check(this.handshakeExtensions.schema, rawMetadata)) {
         conn.telemetry?.span.setStatus({
-          code: import_api3.SpanStatusCode.ERROR,
+          code: import_api5.SpanStatusCode.ERROR,
           message: "malformed handshake meta"
         });
         const reason = "received malformed handshake metadata";
@@ -1507,7 +1561,7 @@ var ServerTransport = class extends Transport {
           ...conn.loggingMetadata,
           clientId: this.clientId,
           validationErrors: [
-            ...import_value.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
+            ...import_value3.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
           ]
         });
         this.protocolError(ProtocolError.HandshakeFailed, reason);
@@ -1521,7 +1575,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_api5.SpanStatusCode.ERROR,
           message: reason
         });
         const responseMsg = handshakeResponseMessage(this.clientId, from, {
@@ -1543,7 +1597,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_api5.SpanStatusCode.ERROR,
         message: "non-transport message"
       });
       this.protocolError(
@@ -1552,9 +1606,9 @@ var ServerTransport = class extends Transport {
       );
       return false;
     }
-    if (!import_value.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
+    if (!import_value3.Value.Check(ControlMessageHandshakeRequestSchema, parsed.payload)) {
       conn.telemetry?.span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api5.SpanStatusCode.ERROR,
         message: "invalid handshake request"
       });
       const reason = "received invalid handshake msg";
@@ -1570,7 +1624,7 @@ var ServerTransport = class extends Transport {
         // before passing it to user-land
         transportMessage: parsed,
         validationErrors: [
-          ...import_value.Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload)
+          ...import_value3.Value.Errors(ControlMessageHandshakeRequestSchema, parsed.payload)
         ]
       });
       this.protocolError(
@@ -1582,7 +1636,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_api5.SpanStatusCode.ERROR,
         message: "incorrect protocol version"
       });
       const reason = `incorrect version (got: ${gotVersion} wanted ${PROTOCOL_VERSION})`;
@@ -1608,7 +1662,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,
@@ -1624,7 +1678,7 @@ 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;
   }
 };