@replit/river 0.23.14 → 0.23.16

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-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 { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-75e84a9f.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-75e84a9f.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-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 { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-75d0124f.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-75d0124f.js';
+import { S as ServerTransport } from '../server-3740c5d9.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-e13979ac.js';
+import '../client-0926d3d6.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.14";
+var version = "0.23.16";
 
 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-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 { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-75e84a9f.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-75e84a9f.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-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 { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-75d0124f.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-75d0124f.js';
+import { S as ServerTransport } from '../server-3740c5d9.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-e13979ac.js';
+import '../client-0926d3d6.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.14";
+var version = "0.23.16";
 
 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-GN4YEXT7.js";
+} from "../chunk-LTSLICON.js";
 import {
   version
-} from "../chunk-GCCRVSMR.js";
+} from "../chunk-TXSQRTZB.js";
 export {
   Err,
   Ok,

package/dist/{server-1cfc88d1.d.ts → server-3740c5d9.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-5665ffd3.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-75d0124f.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
 
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {

package/dist/{services-86c4d10d.d.ts → services-75e84a9f.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-5665ffd3.js';
+import { C as Connection, k as ClientHandshakeOptions, p as ServiceContextWithTransportInfo } from './handshake-75d0124f.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
-import { C as ClientTransport } from './client-e13979ac.js';
+import { C as ClientTransport } from './client-0926d3d6.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -134,7 +134,7 @@ function isAck(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.14";
+var version = "0.23.16";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -454,6 +454,18 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
+  /**
+   * Check that the peer's next expected seq number matches something that is in our send buffer
+   * _or_ matches our actual next seq.
+   */
+  nextExpectedSeqInRange(nextExpectedSeq) {
+    for (const msg of this.sendBuffer) {
+      if (nextExpectedSeq === msg.seq) {
+        return true;
+      }
+    }
+    return nextExpectedSeq === this.seq;
+  }
   // This is only used in tests to make the session misbehave.
   /* @internal */
   advanceAckForTesting(by) {
@@ -901,6 +913,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",
@@ -940,7 +966,7 @@ var Transport = class {
     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.nextExpectedSeqInRange(nextExpectedSeq) || // or if both parties do not agree on the advertised session id
       session.advertisedSessionId !== sessionId
     ) {
       return false;
@@ -999,6 +1025,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}`,