@replit/river 0.26.2 → 0.26.4

package/dist/router/index.d.cts

@@ -1,14 +1,15 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-7daa60a0.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-7daa60a0.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-6140f578.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-6140f578.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-1a86f06d.js';
-export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-1a86f06d.js';
-import { S as ServerTransport } from '../server-9a6b5a8e.js';
-import '../message-57296605.js';
+import { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-154a0bb2.js';
+export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-154a0bb2.js';
+import { S as ServerTransport } from '../server-1f5eb427.js';
+import '../message-ff78a233.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-654098be.js';
+import '../client-6c67339a.js';
+import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 
 /**
@@ -45,6 +46,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.26.2";
+var version = "0.26.4";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,14 +1,15 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-7daa60a0.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-7daa60a0.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-6140f578.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-6140f578.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-1a86f06d.js';
-export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-1a86f06d.js';
-import { S as ServerTransport } from '../server-9a6b5a8e.js';
-import '../message-57296605.js';
+import { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-154a0bb2.js';
+export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-154a0bb2.js';
+import { S as ServerTransport } from '../server-1f5eb427.js';
+import '../message-ff78a233.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-654098be.js';
+import '../client-6c67339a.js';
+import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 
 /**
@@ -45,6 +46,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.26.2";
+var version = "0.26.4";
 
 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-MREEJE3X.js";
+} from "../chunk-PXRKBNWN.js";
 import {
   version
-} from "../chunk-M75K5TJS.js";
+} from "../chunk-65EMTMCV.js";
 export {
   Err,
   Ok,

package/dist/{server-9a6b5a8e.d.ts → server-1f5eb427.d.ts}

@@ -1,5 +1,6 @@
-import { C as Connection, y as CommonSession, d as SessionState, z as CommonSessionProps, T as Transport, A as ServerTransportOptions, s as ServerHandshakeOptions, t as ParsedMetadata, B as ServerSession, c as ProvidedServerTransportOptions } from './handshake-1a86f06d.js';
-import { M as MessageMetadata, a as TransportMessage, b as OpaqueTransportMessage, H as HandshakeErrorResponseCodes, c as TransportClientId, P as PartialTransportMessage } from './message-57296605.js';
+import { C as Connection, y as CommonSession, d as SessionState, z as CommonSessionProps, T as Transport, A as ServerTransportOptions, s as ServerHandshakeOptions, t as ParsedMetadata, B as ServerSession, c as ProvidedServerTransportOptions } from './handshake-154a0bb2.js';
+import { b as OpaqueTransportMessage, e as Tags, a as TransportMessage, H as HandshakeErrorResponseCodes, c as TransportClientId, P as PartialTransportMessage } from './message-ff78a233.js';
+import * as _sinclair_typebox_errors from '@sinclair/typebox/errors';
 import { Static } from '@sinclair/typebox';
 
 interface SessionWaitingForHandshakeListeners {
@@ -19,8 +20,21 @@ declare class SessionWaitingForHandshake<ConnType extends Connection> extends Co
     listeners: SessionWaitingForHandshakeListeners;
     handshakeTimeout?: ReturnType<typeof setTimeout>;
     constructor(props: SessionWaitingForHandshakeProps<ConnType>);
+    get loggingMetadata(): {
+        protocolVersion?: string | undefined;
+        clientId: string;
+        connectedTo?: string | undefined;
+        sessionId?: string | undefined;
+        connId: string;
+        transportMessage?: Partial<OpaqueTransportMessage> | undefined;
+        validationErrors?: _sinclair_typebox_errors.ValueError[] | undefined;
+        tags?: Tags[] | undefined;
+        telemetry?: {
+            traceId: string;
+            spanId: string;
+        } | undefined;
+    };
     onHandshakeData: (msg: Uint8Array) => void;
-    get loggingMetadata(): MessageMetadata;
     sendHandshake(msg: TransportMessage): boolean;
     _handleStateExit(): void;
     _handleClose(): void;
@@ -49,7 +63,6 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     protected handleConnection(conn: ConnType): void;
     private rejectHandshakeRequest;
     protected onHandshakeRequest(session: SessionWaitingForHandshake<ConnType>, msg: OpaqueTransportMessage): Promise<void>;
-    private validateHandshakeMetadata;
 }
 
 export { ServerTransport as S, SessionWaitingForHandshake as a };

package/dist/{services-7daa60a0.d.ts → services-6140f578.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, p as ClientHandshakeOptions, v as ServiceContextWithTransportInfo, o as ServiceContext } from './handshake-1a86f06d.js';
-import { c as TransportClientId } from './message-57296605.js';
-import { C as ClientTransport } from './client-654098be.js';
+import { C as Connection, p as ClientHandshakeOptions, v as ServiceContextWithTransportInfo, o as ServiceContext } from './handshake-154a0bb2.js';
+import { c as TransportClientId } from './message-ff78a233.js';
+import { C as ClientTransport } from './client-6c67339a.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -420,6 +420,7 @@ var StateMachineState = class {
         }
         if (prop === "_handleClose") {
           return () => {
+            target._isConsumed = true;
             target._handleStateExit();
             target._handleClose();
           };
@@ -500,15 +501,18 @@ var IdentifiedSession = class extends CommonSession {
   }
   get loggingMetadata() {
     const spanContext = this.telemetry.span.spanContext();
-    return {
+    const metadata = {
       clientId: this.from,
       connectedTo: this.to,
-      sessionId: this.id,
-      telemetry: {
+      sessionId: this.id
+    };
+    if (this.telemetry.span.isRecording()) {
+      metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
-      }
-    };
+      };
+    }
+    return metadata;
   }
   constructMsg(partialMsg) {
     const msg = {
@@ -571,9 +575,6 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
     super(props);
     this.connPromise = props.connPromise;
     this.listeners = props.listeners;
-    this.connectionTimeout = setTimeout(() => {
-      this.listeners.onConnectionTimeout();
-    }, this.options.connectionTimeoutMs);
     this.connPromise.then(
       (conn) => {
         if (this._isConsumed)
@@ -586,11 +587,25 @@ var SessionConnecting = class extends IdentifiedSessionWithGracePeriod {
         this.listeners.onConnectionFailed(err);
       }
     );
+    this.connectionTimeout = setTimeout(() => {
+      this.listeners.onConnectionTimeout();
+    }, this.options.connectionTimeoutMs);
   }
   // close a pending connection if it resolves, ignore errors if the promise
   // ends up rejected anyways
   bestEffortClose() {
-    void this.connPromise.then((conn) => conn.close()).catch(() => {
+    const logger = this.log;
+    const metadata = this.loggingMetadata;
+    this.connPromise.then((conn) => {
+      conn.close();
+      logger?.info(
+        "connection eventually resolved but session has transitioned, closed connection",
+        {
+          ...metadata,
+          ...conn.loggingMetadata
+        }
+      );
+    }).catch(() => {
     });
   }
   _handleStateExit() {
@@ -621,7 +636,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.2";
+var version = "0.26.4";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -669,6 +684,13 @@ var SessionWaitingForHandshake = class extends CommonSession {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      clientId: this.from,
+      connId: this.conn.id,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -680,12 +702,6 @@ var SessionWaitingForHandshake = class extends CommonSession {
     }
     this.listeners.onHandshake(parsedMsg);
   };
-  get loggingMetadata() {
-    return {
-      clientId: this.from,
-      connId: this.conn.id
-    };
-  }
   sendHandshake(msg) {
     return this.conn.send(this.options.codec.toBuffer(msg));
   }
@@ -718,6 +734,12 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
     this.conn.addErrorListener(this.listeners.onConnectionErrored);
     this.conn.addCloseListener(this.listeners.onConnectionClosed);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   onHandshakeData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -805,6 +827,12 @@ var SessionConnected = class extends IdentifiedSession {
       this.heartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  get loggingMetadata() {
+    return {
+      ...super.loggingMetadata,
+      ...this.conn.loggingMetadata
+    };
+  }
   startActiveHeartbeat() {
     this.isActivelyHeartbeating = true;
   }
@@ -1306,8 +1334,9 @@ var Transport = class {
       status: "disconnect",
       session
     });
+    const to = session.to;
     session.close();
-    this.sessions.delete(session.to);
+    this.sessions.delete(to);
   }
   // common listeners
   onSessionGracePeriodElapsed(session) {
@@ -1511,14 +1540,14 @@ var ClientTransport = class extends Transport {
         msg.payload.status.code
       ) : false;
       const reason = `handshake failed: ${msg.payload.status.reason}`;
+      const to = session.to;
       this.rejectHandshakeResponse(session, reason, {
         ...session.loggingMetadata,
         transportMessage: msg
       });
       if (retriable) {
-        this.tryReconnecting(session.to);
+        this.tryReconnecting(to);
       } else {
-        this.deleteSession(session);
         this.protocolError({
           type: ProtocolError.HandshakeFailed,
           code: msg.payload.status.code,
@@ -1571,6 +1600,12 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   connect(to) {
+    if (this.getStatus() !== "open") {
+      this.log?.info(
+        `transport state is no longer open, cancelling attempt to connect to ${to}`
+      );
+      return;
+    }
     let session = this.sessions.get(to);
     session ??= this.createUnconnectedSession(to);
     if (session.state !== "NoConnection" /* NoConnection */) {
@@ -1580,13 +1615,6 @@ var ClientTransport = class extends Transport {
       );
       return;
     }
-    if (this.getStatus() !== "open") {
-      this.log?.info(
-        `transport state is no longer open, cancelling attempt to connect to ${to}`,
-        session.loggingMetadata
-      );
-      return;
-    }
     if (!this.retryBudget.hasBudget()) {
       const budgetConsumed = this.retryBudget.getBudgetConsumed();
       const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
@@ -1608,22 +1636,7 @@ var ClientTransport = class extends Transport {
       backoffMs,
       {
         onBackoffFinished: () => {
-          const reconnectPromise = tracing_default.startActiveSpan(
-            "connect",
-            async (span) => {
-              try {
-                return await this.createNewOutgoingConnection(to);
-              } catch (err) {
-                const errStr = coerceErrorString(err);
-                span.recordException(errStr);
-                span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
-                throw err;
-              } finally {
-                span.end();
-              }
-            }
-          );
-          this.onBackoffFinished(backingOffSession, reconnectPromise);
+          this.onBackoffFinished(backingOffSession);
         },
         onSessionGracePeriodElapsed: () => {
           this.onSessionGracePeriodElapsed(backingOffSession);
@@ -1632,7 +1645,19 @@ var ClientTransport = class extends Transport {
     );
     this.updateSession(backingOffSession);
   }
-  onBackoffFinished(session, connPromise) {
+  onBackoffFinished(session) {
+    const connPromise = tracing_default.startActiveSpan("connect", async (span) => {
+      try {
+        return await this.createNewOutgoingConnection(session.to);
+      } catch (err) {
+        const errStr = coerceErrorString(err);
+        span.recordException(errStr);
+        span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
     const connectingSession = ClientSessionStateGraph.transition.BackingOffToConnecting(
       session,
       connPromise,
@@ -1640,7 +1665,10 @@ var ClientTransport = class extends Transport {
         onConnectionEstablished: (conn) => {
           this.log?.debug(
             `connection to ${connectingSession.to} established`,
-            connectingSession.loggingMetadata
+            {
+              ...conn.loggingMetadata,
+              ...connectingSession.loggingMetadata
+            }
           );
           this.onConnectionEstablished(connectingSession, conn);
         },
@@ -1850,9 +1878,10 @@ var WebSocketClientTransport = class extends ClientTransport {
       };
     });
     const conn = new WebSocketConnection(ws);
-    this.log?.info(`raw websocket to ${to} ok, starting handshake`, {
+    this.log?.info(`raw websocket to ${to} ok`, {
       clientId: this.clientId,
-      connectedTo: to
+      connectedTo: to,
+      ...conn.loggingMetadata
     });
     return conn;
   }