@replit/river 0.26.3 → 0.26.4

package/dist/router/index.d.cts

@@ -1,5 +1,5 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-491d8c32.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-491d8c32.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-154a0bb2.js';
@@ -8,7 +8,7 @@ import { S as ServerTransport } from '../server-1f5eb427.js';
 import '../message-ff78a233.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-1894a9c9.js';
+import '../client-6c67339a.js';
 import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 
@@ -46,6 +46,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.26.3";
+var version = "0.26.4";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-491d8c32.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-491d8c32.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-154a0bb2.js';
@@ -8,7 +8,7 @@ import { S as ServerTransport } from '../server-1f5eb427.js';
 import '../message-ff78a233.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-1894a9c9.js';
+import '../client-6c67339a.js';
 import '@sinclair/typebox/errors';
 import '../types-3e5768ec.js';
 
@@ -46,6 +46,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.26.3";
+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-3JCZNGF7.js";
+} from "../chunk-PXRKBNWN.js";
 import {
   version
-} from "../chunk-MZELCWJK.js";
+} from "../chunk-65EMTMCV.js";
 export {
   Err,
   Ok,

package/dist/{services-491d8c32.d.ts → services-6140f578.d.ts}

@@ -2,7 +2,7 @@ import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@si
 import { Pushable } from 'it-pushable';
 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-1894a9c9.js';
+import { C as ClientTransport } from './client-6c67339a.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -575,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)
@@ -590,16 +587,21 @@ 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) => {
+    const logger = this.log;
+    const metadata = this.loggingMetadata;
+    this.connPromise.then((conn) => {
       conn.close();
-      this.log?.info(
+      logger?.info(
         "connection eventually resolved but session has transitioned, closed connection",
         {
-          ...this.loggingMetadata,
+          ...metadata,
           ...conn.loggingMetadata
         }
       );
@@ -634,7 +636,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.3";
+var version = "0.26.4";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -1634,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);
@@ -1658,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,
@@ -1666,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);
         },