@replit/river 0.23.13 → 0.23.15

package/dist/router/index.d.cts

@@ -1,14 +1,14 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-f406b3aa.js';
-export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, p as ProcedureMap, d as ProcedureResult, q as RPCProcedure, y as ResultUnwrapErr, x as ResultUnwrapOk, w as RiverErrorSchema, c as RiverUncaughtSchema, o as SerializedProcedureSchema, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, v as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, u as createClient, s as serializeSchema } from '../services-f406b3aa.js';
+import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-86c4d10d.js';
+export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, p as ProcedureMap, d as ProcedureResult, q as RPCProcedure, y as ResultUnwrapErr, x as ResultUnwrapOk, w as RiverErrorSchema, c as RiverUncaughtSchema, o as SerializedProcedureSchema, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, v as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, u as createClient, s as serializeSchema } from '../services-86c4d10d.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-e428d1c8.js';
-export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-e428d1c8.js';
-import { S as ServerTransport } from '../server-ebf80863.js';
+import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-5665ffd3.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-5665ffd3.js';
+import { S as ServerTransport } from '../server-1cfc88d1.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-dd5c9dd0.js';
+import '../client-e13979ac.js';
 import '../types-3e5768ec.js';
 
 interface ServerBreakage {
@@ -83,6 +83,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.13";
+var version = "0.23.15";
 
 export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };

package/dist/router/index.d.ts

@@ -1,14 +1,14 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-f406b3aa.js';
-export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, p as ProcedureMap, d as ProcedureResult, q as RPCProcedure, y as ResultUnwrapErr, x as ResultUnwrapOk, w as RiverErrorSchema, c as RiverUncaughtSchema, o as SerializedProcedureSchema, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, v as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, u as createClient, s as serializeSchema } from '../services-f406b3aa.js';
+import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-86c4d10d.js';
+export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, p as ProcedureMap, d as ProcedureResult, q as RPCProcedure, y as ResultUnwrapErr, x as ResultUnwrapOk, w as RiverErrorSchema, c as RiverUncaughtSchema, o as SerializedProcedureSchema, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m as ServiceSchema, t as StreamProcedure, r as SubscriptionProcedure, v as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, u as createClient, s as serializeSchema } from '../services-86c4d10d.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-e428d1c8.js';
-export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-e428d1c8.js';
-import { S as ServerTransport } from '../server-ebf80863.js';
+import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-5665ffd3.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-5665ffd3.js';
+import { S as ServerTransport } from '../server-1cfc88d1.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-dd5c9dd0.js';
+import '../client-e13979ac.js';
 import '../types-3e5768ec.js';
 
 interface ServerBreakage {
@@ -83,6 +83,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.13";
+var version = "0.23.15";
 
 export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };

package/dist/router/index.js

@@ -11,10 +11,10 @@ import {
   createServerHandshakeOptions,
   diffServerSchema,
   serializeSchema
-} from "../chunk-KFTGQ3QC.js";
+} from "../chunk-AEY7BBOZ.js";
 import {
   version
-} from "../chunk-ES4XO2XD.js";
+} from "../chunk-OXVWMLID.js";
 export {
   Err,
   Ok,

package/dist/{server-ebf80863.d.ts → server-1cfc88d1.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection, T as Transport, l as ServerTransportOptions, m as ServerHandshakeOptions, S as Session, n as ParsedMetadata, c as ProvidedServerTransportOptions } from './handshake-e428d1c8.js';
+import { C as Connection, T as Transport, l as ServerTransportOptions, m as ServerHandshakeOptions, S as Session, n as ParsedMetadata, c as ProvidedServerTransportOptions } from './handshake-5665ffd3.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
 
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {

package/dist/{services-f406b3aa.d.ts → services-86c4d10d.d.ts}

@@ -1,8 +1,8 @@
 import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, k as ClientHandshakeOptions, p as ServiceContextWithTransportInfo } from './handshake-e428d1c8.js';
+import { C as Connection, k as ClientHandshakeOptions, p as ServiceContextWithTransportInfo } from './handshake-5665ffd3.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
-import { C as ClientTransport } from './client-dd5c9dd0.js';
+import { C as ClientTransport } from './client-e13979ac.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -60,6 +60,21 @@ var ControlMessageHandshakeRequestSchema = import_typebox.Type.Object({
   type: import_typebox.Type.Literal("HANDSHAKE_REQ"),
   protocolVersion: import_typebox.Type.String(),
   sessionId: import_typebox.Type.String(),
+  /**
+   * Specifies what the server's expected session state (from the pov of the client). This can be
+   * used by the server to know whether this is a new or a reestablished connection, and whether it
+   * is compatible with what it already has.
+   */
+  expectedSessionState: import_typebox.Type.Optional(
+    import_typebox.Type.Object({
+      /**
+       * reconnect is set to true if the client explicitly wants to reestablish an existing
+       * connection.
+       */
+      reconnect: import_typebox.Type.Boolean(),
+      nextExpectedSeq: import_typebox.Type.Integer()
+    })
+  ),
   metadata: import_typebox.Type.Optional(import_typebox.Type.Unknown())
 });
 var ControlMessageHandshakeResponseSchema = import_typebox.Type.Object({
@@ -84,7 +99,14 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function handshakeRequestMessage(from, to, sessionId, metadata, tracing) {
+function handshakeRequestMessage({
+  from,
+  to,
+  sessionId,
+  expectedSessionState,
+  metadata,
+  tracing
+}) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -98,10 +120,12 @@ function handshakeRequestMessage(from, to, sessionId, metadata, tracing) {
       type: "HANDSHAKE_REQ",
       protocolVersion: PROTOCOL_VERSION,
       sessionId,
+      expectedSessionState,
       metadata
     }
   };
 }
+var SESSION_STATE_MISMATCH = "session state mismatch";
 function isAck(controlFlag) {
   return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
 }
@@ -110,7 +134,7 @@ function isAck(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.13";
+var version = "0.23.15";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -424,9 +448,17 @@ var Session = class {
   get connected() {
     return this.connection !== void 0;
   }
+  get nextExpectedAck() {
+    return this.seq;
+  }
   get nextExpectedSeq() {
     return this.ack;
   }
+  // This is only used in tests to make the session misbehave.
+  /* @internal */
+  advanceAckForTesting(by) {
+    this.ack += by;
+  }
   constructMsg(partialMsg) {
     const msg = {
       ...partialMsg,
@@ -869,6 +901,20 @@ var Transport = class {
     if (this.log) {
       session.bindLogger(this.log);
     }
+    const currentSession = this.sessions.get(session.to);
+    if (currentSession) {
+      this.log?.warn(
+        `session ${session.id} from ${session.to} surreptitiously replacing ${currentSession.id}`,
+        {
+          ...currentSession.loggingMetadata,
+          tags: ["invariant-violation"]
+        }
+      );
+      this.deleteSession({
+        session: currentSession,
+        closeHandshakingConnection: false
+      });
+    }
     this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "connect",
@@ -876,6 +922,49 @@ var Transport = class {
     });
     return session;
   }
+  createNewSession({
+    to,
+    conn,
+    sessionId,
+    propagationCtx
+  }) {
+    let session = this.sessions.get(to);
+    if (session !== void 0) {
+      this.log?.info(
+        `session for ${to} already exists, replacing it with a new session as requested`,
+        session.loggingMetadata
+      );
+      this.deleteSession({
+        session,
+        closeHandshakingConnection: false
+      });
+      session = void 0;
+    }
+    session = this.createSession(to, conn, propagationCtx);
+    session.advertisedSessionId = sessionId;
+    this.log?.info(`created new session for ${to}`, session.loggingMetadata);
+    return session;
+  }
+  getExistingSession({
+    to,
+    sessionId,
+    nextExpectedSeq
+  }) {
+    const session = this.sessions.get(to);
+    if (
+      // reject this request if there was no previous session to replace
+      session === void 0 || // or if both parties do not agree about the next expected sequence number
+      session.nextExpectedAck < nextExpectedSeq || // or if both parties do not agree on the advertised session id
+      session.advertisedSessionId !== sessionId
+    ) {
+      return false;
+    }
+    this.log?.info(
+      `reused existing session for ${to}`,
+      session.loggingMetadata
+    );
+    return session;
+  }
   getOrCreateSession({
     to,
     conn,
@@ -924,6 +1013,17 @@ var Transport = class {
     }
     session.close();
     session.telemetry.span.end();
+    const currentSession = this.sessions.get(session.to);
+    if (currentSession && currentSession.id !== session.id) {
+      this.log?.warn(
+        `session ${session.id} disconnect from ${session.to}, mismatch with ${currentSession.id}`,
+        {
+          ...session.loggingMetadata,
+          tags: ["invariant-violation"]
+        }
+      );
+      return;
+    }
     this.sessions.delete(session.to);
     this.log?.info(
       `session ${session.id} disconnect from ${session.to}`,
@@ -1286,24 +1386,40 @@ var ClientTransport = class extends Transport {
       );
       return false;
     }
+    const previousSession = this.sessions.get(parsed.from);
     if (!parsed.payload.status.ok) {
-      conn.telemetry?.span.setStatus({
-        code: import_api4.SpanStatusCode.ERROR,
-        message: "handshake rejected"
-      });
-      this.log?.warn(`received handshake rejection`, {
-        ...conn.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo: parsed.from,
-        transportMessage: parsed
-      });
+      if (parsed.payload.status.reason === SESSION_STATE_MISMATCH) {
+        if (previousSession) {
+          this.deleteSession({
+            session: previousSession,
+            closeHandshakingConnection: true
+          });
+        }
+        conn.telemetry?.span.setStatus({
+          code: import_api4.SpanStatusCode.ERROR,
+          message: parsed.payload.status.reason
+        });
+      } else {
+        conn.telemetry?.span.setStatus({
+          code: import_api4.SpanStatusCode.ERROR,
+          message: "handshake rejected"
+        });
+      }
+      this.log?.warn(
+        `received handshake rejection: ${parsed.payload.status.reason}`,
+        {
+          ...conn.loggingMetadata,
+          clientId: this.clientId,
+          connectedTo: parsed.from,
+          transportMessage: parsed
+        }
+      );
       this.protocolError(
         ProtocolError.HandshakeFailed,
         parsed.payload.status.reason
       );
       return false;
     }
-    const previousSession = this.sessions.get(parsed.from);
     if (previousSession?.advertisedSessionId && previousSession.advertisedSessionId !== parsed.payload.status.sessionId) {
       this.deleteSession({
         session: previousSession,
@@ -1483,13 +1599,17 @@ var ClientTransport = class extends Transport {
       }
     }
     const { session } = this.getOrCreateSession({ to, handshakingConn: conn });
-    const requestMsg = handshakeRequestMessage(
-      this.clientId,
+    const requestMsg = handshakeRequestMessage({
+      from: this.clientId,
       to,
-      session.id,
+      sessionId: session.id,
+      expectedSessionState: {
+        reconnect: session.advertisedSessionId !== void 0,
+        nextExpectedSeq: session.nextExpectedSeq
+      },
       metadata,
-      getPropagationContext(session.telemetry.ctx)
-    );
+      tracing: getPropagationContext(session.telemetry.ctx)
+    });
     this.log?.debug(`sending handshake request to ${to}`, {
       ...conn.loggingMetadata,
       clientId: this.clientId,