@replit/river 0.23.7 → 0.23.9

package/dist/router/index.d.cts

@@ -1,8 +1,8 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-fd8a9894.js';
-export { C as Client, E as Err, O as Ok, x as Output, j as ProcErrors, f as ProcHandler, g as ProcInit, h as ProcInput, i as ProcOutput, k as ProcType, a as Procedure, n as ProcedureMap, d as ProcedureResult, o as RPCProcedure, w as ResultUnwrapErr, v as ResultUnwrapOk, u as RiverErrorSchema, c as RiverUncaughtSchema, m as SerializedServerSchema, S as Service, e as ServiceConfiguration, l as ServiceSchema, q as StreamProcedure, p as SubscriptionProcedure, t as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, r as createClient, s as serializeSchema } from '../services-fd8a9894.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-49b1b43d.js';
+export { C as Client, E as Err, O as Ok, z as Output, j as ProcErrors, f as ProcHandler, g as ProcInit, h as ProcInput, i as ProcOutput, k 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, m as SerializedServerSchema, n as SerializedServiceSchema, S as Service, e as ServiceConfiguration, l 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-49b1b43d.js';
 import { Static } from '@sinclair/typebox';
-import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-3d34f714.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d34f714.js';
+import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-3d0ba1da.js';
+export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d0ba1da.js';
 import { Pushable } from 'it-pushable';
 import '../index-60f03cb7.js';
 import '@sinclair/typebox/value';
@@ -43,6 +43,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.7";
+var version = "0.23.9";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,8 +1,8 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-fd8a9894.js';
-export { C as Client, E as Err, O as Ok, x as Output, j as ProcErrors, f as ProcHandler, g as ProcInit, h as ProcInput, i as ProcOutput, k as ProcType, a as Procedure, n as ProcedureMap, d as ProcedureResult, o as RPCProcedure, w as ResultUnwrapErr, v as ResultUnwrapOk, u as RiverErrorSchema, c as RiverUncaughtSchema, m as SerializedServerSchema, S as Service, e as ServiceConfiguration, l as ServiceSchema, q as StreamProcedure, p as SubscriptionProcedure, t as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, r as createClient, s as serializeSchema } from '../services-fd8a9894.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-49b1b43d.js';
+export { C as Client, E as Err, O as Ok, z as Output, j as ProcErrors, f as ProcHandler, g as ProcInit, h as ProcInput, i as ProcOutput, k 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, m as SerializedServerSchema, n as SerializedServiceSchema, S as Service, e as ServiceConfiguration, l 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-49b1b43d.js';
 import { Static } from '@sinclair/typebox';
-import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-3d34f714.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d34f714.js';
+import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-3d0ba1da.js';
+export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d0ba1da.js';
 import { Pushable } from 'it-pushable';
 import '../index-60f03cb7.js';
 import '@sinclair/typebox/value';
@@ -43,6 +43,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.7";
+var version = "0.23.9";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -10,10 +10,10 @@ import {
   createServer,
   createServerHandshakeOptions,
   serializeSchema
-} from "../chunk-M3TGXFWT.js";
+} from "../chunk-U4CSF3SQ.js";
 import {
   version
-} from "../chunk-MFF6IPBA.js";
+} from "../chunk-XUVTMFTJ.js";
 export {
   Err,
   Ok,

package/dist/{services-fd8a9894.d.ts → services-49b1b43d.d.ts}

@@ -1,5 +1,5 @@
 import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@sinclair/typebox';
-import { c as ClientTransport, C as Connection, l as ClientHandshakeOptions, i as ServiceContextWithTransportInfo } from './transport-3d34f714.js';
+import { c as ClientTransport, C as Connection, l as ClientHandshakeOptions, i as ServiceContextWithTransportInfo } from './transport-3d0ba1da.js';
 import { Pushable } from 'it-pushable';
 import { T as TransportClientId } from './index-60f03cb7.js';
 
@@ -477,14 +477,15 @@ interface ServiceConfiguration<State extends object> {
      */
     initializeState: () => State;
 }
+interface SerializedProcedureSchema {
+    input: PayloadType;
+    output: PayloadType;
+    errors?: RiverError;
+    type: 'rpc' | 'subscription' | 'upload' | 'stream';
+    init?: PayloadType;
+}
 interface SerializedServiceSchema {
-    procedures: Record<string, {
-        input: PayloadType;
-        output: PayloadType;
-        errors?: RiverError;
-        type: 'rpc' | 'subscription' | 'upload' | 'stream';
-        init?: PayloadType;
-    }>;
+    procedures: Record<string, SerializedProcedureSchema>;
 }
 interface SerializedServerSchema {
     handshakeSchema?: TSchema;
@@ -704,4 +705,4 @@ declare class ServiceScaffold<State extends object> {
     }>;
 }
 
-export { AnyServiceSchemaMap as A, Client as C, Err as E, InstantiatedServiceSchemaMap as I, Ok as O, PayloadType as P, RiverError as R, Service as S, UploadProcedure as U, ValidProcType as V, Procedure as a, Result as b, RiverUncaughtSchema as c, ProcedureResult as d, ServiceConfiguration as e, ProcHandler as f, ProcInit as g, ProcInput as h, ProcOutput as i, ProcErrors as j, ProcType as k, ServiceSchema as l, SerializedServerSchema as m, ProcedureMap as n, RpcProcedure as o, SubscriptionProcedure as p, StreamProcedure as q, createClient as r, serializeSchema as s, UNCAUGHT_ERROR as t, RiverErrorSchema as u, ResultUnwrapOk as v, ResultUnwrapErr as w, Output as x };
+export { AnyServiceSchemaMap as A, Client as C, Err as E, InstantiatedServiceSchemaMap as I, Ok as O, PayloadType as P, RiverError as R, Service as S, UploadProcedure as U, ValidProcType as V, Procedure as a, Result as b, RiverUncaughtSchema as c, ProcedureResult as d, ServiceConfiguration as e, ProcHandler as f, ProcInit as g, ProcInput as h, ProcOutput as i, ProcErrors as j, ProcType as k, ServiceSchema as l, SerializedServerSchema as m, SerializedServiceSchema as n, SerializedProcedureSchema as o, ProcedureMap as p, RpcProcedure as q, SubscriptionProcedure as r, serializeSchema as s, StreamProcedure as t, createClient as u, UNCAUGHT_ERROR as v, RiverErrorSchema as w, ResultUnwrapOk as x, ResultUnwrapErr as y, Output as z };

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

@@ -110,7 +110,7 @@ function isAck(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.7";
+var version = "0.23.9";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -190,6 +190,11 @@ var Session = class {
    * The active connection associated with this session
    */
   connection;
+  /**
+   * A connection that is currently undergoing handshaking. Used to distinguish between the active
+   * connection, but still be able to close it if needed.
+   */
+  handshakingConnection;
   from;
   to;
   /**
@@ -369,23 +374,60 @@ var Session = class {
     this.cancelGrace();
     this.sendBufferedMessages(newConn);
     this.connection = newConn;
+    this.handshakingConnection = void 0;
+  }
+  replaceWithNewHandshakingConnection(newConn) {
+    this.handshakingConnection = newConn;
   }
   beginGrace(cb) {
     this.log?.info(
       `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
       this.loggingMetadata
     );
+    this.cancelGrace({ keepHeartbeatMisses: true });
     this.disconnectionGrace = setTimeout(() => {
-      this.close();
+      if (this.connection !== void 0) {
+        this.log?.warn(
+          `grace period for ${this.to} elapsed while connected. not calling callback`,
+          {
+            ...this.loggingMetadata,
+            connId: this.connection.id,
+            tags: ["invariant-violation"]
+          }
+        );
+        return;
+      }
+      this.log?.info(
+        `grace period for ${this.to} elapsed`,
+        this.loggingMetadata
+      );
       cb();
     }, this.options.sessionDisconnectGraceMs);
   }
   // called on reconnect of the underlying session
-  cancelGrace() {
-    this.heartbeatMisses = 0;
+  cancelGrace({ keepHeartbeatMisses } = {
+    keepHeartbeatMisses: false
+  }) {
+    if (!keepHeartbeatMisses) {
+      this.heartbeatMisses = 0;
+    }
+    if (this.disconnectionGrace === void 0)
+      return;
     clearTimeout(this.disconnectionGrace);
     this.disconnectionGrace = void 0;
   }
+  /**
+   * Used to close the handshaking connection, if set.
+   */
+  closeHandshakingConnection(expectedHandshakingConn) {
+    if (this.handshakingConnection === void 0)
+      return;
+    if (expectedHandshakingConn !== void 0 && this.handshakingConnection === expectedHandshakingConn) {
+      return;
+    }
+    this.handshakingConnection.close();
+    this.handshakingConnection = void 0;
+  }
   // closed when we want to discard the whole session
   // (i.e. shutdown or session disconnect)
   close() {
@@ -854,7 +896,13 @@ var Transport = class {
     });
     return session;
   }
-  getOrCreateSession(to, conn, sessionId, propagationCtx) {
+  getOrCreateSession({
+    to,
+    conn,
+    handshakingConn,
+    sessionId,
+    propagationCtx
+  }) {
     let session = this.sessions.get(to);
     let isReconnect = session !== void 0;
     if (session?.advertisedSessionId !== void 0 && sessionId !== void 0 && session.advertisedSessionId !== sessionId) {
@@ -862,7 +910,11 @@ var Transport = class {
         `session for ${to} already exists but has a different session id (expected: ${session.advertisedSessionId}, got: ${sessionId}), creating a new one`,
         session.loggingMetadata
       );
-      this.deleteSession(session);
+      this.deleteSession({
+        session,
+        closeHandshakingConnection: handshakingConn !== void 0,
+        handshakingConn
+      });
       isReconnect = false;
       session = void 0;
     }
@@ -876,9 +928,19 @@ var Transport = class {
     if (sessionId !== void 0) {
       session.advertisedSessionId = sessionId;
     }
+    if (handshakingConn !== void 0) {
+      session.replaceWithNewHandshakingConnection(handshakingConn);
+    }
     return { session, isReconnect };
   }
-  deleteSession(session) {
+  deleteSession({
+    session,
+    closeHandshakingConnection,
+    handshakingConn
+  }) {
+    if (closeHandshakingConnection) {
+      session.closeHandshakingConnection(handshakingConn);
+    }
     session.close();
     session.telemetry.span.end();
     this.sessions.delete(session.to);
@@ -905,7 +967,11 @@ var Transport = class {
     session.connection = void 0;
     session.beginGrace(() => {
       session.telemetry.span.addEvent("session grace period expired");
-      this.deleteSession(session);
+      this.deleteSession({
+        session,
+        closeHandshakingConnection: true,
+        handshakingConn: conn
+      });
     });
   }
   /**
@@ -985,7 +1051,7 @@ var Transport = class {
           code: import_api3.SpanStatusCode.ERROR,
           message: "message order violated"
         });
-        session.close();
+        this.deleteSession({ session, closeHandshakingConnection: true });
       }
       return;
     }
@@ -1039,7 +1105,7 @@ var Transport = class {
       });
       return void 0;
     }
-    return this.getOrCreateSession(to).session.send(msg);
+    return this.getOrCreateSession({ to }).session.send(msg);
   }
   // control helpers
   sendCloseStream(to, streamId) {
@@ -1062,7 +1128,7 @@ var Transport = class {
   close() {
     this.state = "closed";
     for (const session of this.sessions.values()) {
-      this.deleteSession(session);
+      this.deleteSession({ session, closeHandshakingConnection: true });
     }
     this.log?.info(`manually closed transport`, { clientId: this.clientId });
   }
@@ -1074,7 +1140,7 @@ var Transport = class {
   destroy() {
     this.state = "destroyed";
     for (const session of this.sessions.values()) {
-      this.deleteSession(session);
+      this.deleteSession({ session, closeHandshakingConnection: true });
     }
     this.log?.info(`manually destroyed transport`, { clientId: this.clientId });
   }
@@ -1117,22 +1183,22 @@ var ClientTransport = class extends Transport {
       return;
     let session = void 0;
     const handshakeTimeout = setTimeout(() => {
-      if (!session) {
-        this.log?.warn(
-          `connection to ${to} timed out waiting for handshake, closing`,
-          { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to }
-        );
-        conn.close();
-      }
+      if (session)
+        return;
+      this.log?.warn(
+        `connection to ${to} timed out waiting for handshake, closing`,
+        { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to }
+      );
+      conn.close();
     }, this.options.sessionDisconnectGraceMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
+      clearTimeout(handshakeTimeout);
       if (!maybeSession) {
         conn.close();
         return;
       } else {
         session = maybeSession;
-        clearTimeout(handshakeTimeout);
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
@@ -1239,11 +1305,11 @@ var ClientTransport = class extends Transport {
       connectedTo: parsed.from,
       transportMessage: parsed
     });
-    const { session, isReconnect } = this.getOrCreateSession(
-      parsed.from,
+    const { session, isReconnect } = this.getOrCreateSession({
+      to: parsed.from,
       conn,
-      parsed.payload.status.sessionId
-    );
+      sessionId: parsed.payload.status.sessionId
+    });
     this.onConnect(conn, parsed.from, session, isReconnect);
     this.retryBudget.startRestoringBudget(parsed.from);
     return session;
@@ -1349,9 +1415,17 @@ var ClientTransport = class extends Transport {
       }
     }
   }
-  deleteSession(session) {
+  deleteSession({
+    session,
+    closeHandshakingConnection,
+    handshakingConn
+  }) {
     this.inflightConnectionPromises.delete(session.to);
-    super.deleteSession(session);
+    super.deleteSession({
+      session,
+      closeHandshakingConnection,
+      handshakingConn
+    });
   }
   async sendHandshake(to, conn) {
     let metadata = void 0;
@@ -1378,7 +1452,7 @@ var ClientTransport = class extends Transport {
         return false;
       }
     }
-    const { session } = this.getOrCreateSession(to);
+    const { session } = this.getOrCreateSession({ to, handshakingConn: conn });
     const requestMsg = handshakeRequestMessage(
       this.clientId,
       to,