@replit/river 0.24.3 → 0.25.0

package/dist/router/index.d.cts

@@ -1,14 +1,14 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-adfd0bc3.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-adfd0bc3.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-8d14ae16.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-8d14ae16.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, q as ServerHandshakeOptions, n as ServiceContext } from '../handshake-0b88e8fc.js';
-export { r as ParsedMetadata, s as ServiceContextWithState, t as ServiceContextWithTransportInfo, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../handshake-0b88e8fc.js';
-import { S as ServerTransport } from '../server-732e7014.js';
+import { C as Connection, q as ServerHandshakeOptions, n as ServiceContext } from '../handshake-3772d7ca.js';
+export { r as ParsedMetadata, s as ServiceContextWithState, t as ServiceContextWithTransportInfo, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../handshake-3772d7ca.js';
+import { S as ServerTransport } from '../server-f0fd2b98.js';
 import '../message-e6c560fd.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-2ba72e89.js';
+import '../client-1321630c.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -45,6 +45,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.24.3";
+var version = "0.25.0";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,14 +1,14 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-adfd0bc3.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-adfd0bc3.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-8d14ae16.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-8d14ae16.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, q as ServerHandshakeOptions, n as ServiceContext } from '../handshake-0b88e8fc.js';
-export { r as ParsedMetadata, s as ServiceContextWithState, t as ServiceContextWithTransportInfo, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../handshake-0b88e8fc.js';
-import { S as ServerTransport } from '../server-732e7014.js';
+import { C as Connection, q as ServerHandshakeOptions, n as ServiceContext } from '../handshake-3772d7ca.js';
+export { r as ParsedMetadata, s as ServiceContextWithState, t as ServiceContextWithTransportInfo, u as createClientHandshakeOptions, v as createServerHandshakeOptions } from '../handshake-3772d7ca.js';
+import { S as ServerTransport } from '../server-f0fd2b98.js';
 import '../message-e6c560fd.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-2ba72e89.js';
+import '../client-1321630c.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -45,6 +45,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.24.3";
+var version = "0.25.0";
 
 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-LSHUPI6U.js";
+} from "../chunk-JTZVFCMT.js";
 import {
   version
-} from "../chunk-DZNP3EI5.js";
+} from "../chunk-6NPQ43ZP.js";
 export {
   Err,
   Ok,

package/dist/{server-732e7014.d.ts → server-f0fd2b98.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection, w as CommonSession, d as SessionState, x as SessionHandshakingListeners, T as Transport, y as ServerTransportOptions, q as ServerHandshakeOptions, r as ParsedMetadata, c as ProvidedServerTransportOptions, S as Session } from './handshake-0b88e8fc.js';
+import { C as Connection, w as CommonSession, d as SessionState, x as SessionHandshakingListeners, T as Transport, y as ServerTransportOptions, q as ServerHandshakeOptions, r as ParsedMetadata, c as ProvidedServerTransportOptions, S as Session } from './handshake-3772d7ca.js';
 import { M as MessageMetadata, a as TransportMessage, c as TransportClientId, P as PartialTransportMessage, b as OpaqueTransportMessage } from './message-e6c560fd.js';
 
 declare class SessionWaitingForHandshake<ConnType extends Connection> extends CommonSession {

package/dist/{services-adfd0bc3.d.ts → services-8d14ae16.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, t as ServiceContextWithTransportInfo, n as ServiceContext } from './handshake-0b88e8fc.js';
+import { C as Connection, p as ClientHandshakeOptions, t as ServiceContextWithTransportInfo, n as ServiceContext } from './handshake-3772d7ca.js';
 import { c as TransportClientId } from './message-e6c560fd.js';
-import { C as ClientTransport } from './client-2ba72e89.js';
+import { C as ClientTransport } from './client-1321630c.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -602,7 +602,7 @@ var SessionNoConnection = class extends IdentifiedSession {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.24.3";
+var version = "0.25.0";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -726,15 +726,16 @@ var SessionConnected = class extends IdentifiedSession {
   state = "Connected" /* Connected */;
   conn;
   listeners;
-  heartbeatHandle;
-  heartbeatMisses = 0;
+  activeHeartbeatHandle;
+  activeHeartbeatMisses = 0;
+  passiveHeartbeatHandle;
   get isActivelyHeartbeating() {
-    return this.heartbeatHandle !== void 0;
+    return this.activeHeartbeatHandle !== void 0;
   }
   updateBookkeeping(ack, seq) {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
     this.ack = seq + 1;
-    this.heartbeatMisses = 0;
+    this.activeHeartbeatMisses = 0;
   }
   send(msg) {
     const constructedMsg = this.constructMsg(msg);
@@ -760,8 +761,8 @@ var SessionConnected = class extends IdentifiedSession {
     }
   }
   startActiveHeartbeat() {
-    this.heartbeatHandle = setInterval(() => {
-      const misses = this.heartbeatMisses;
+    this.activeHeartbeatHandle = setInterval(() => {
+      const misses = this.activeHeartbeatMisses;
       const missDuration = misses * this.options.heartbeatIntervalMs;
       if (misses >= this.options.heartbeatsUntilDead) {
         this.log?.info(
@@ -770,15 +771,32 @@ var SessionConnected = class extends IdentifiedSession {
         );
         this.telemetry.span.addEvent("closing connection due to inactivity");
         this.conn.close();
-        clearInterval(this.heartbeatHandle);
-        this.heartbeatHandle = void 0;
+        clearInterval(this.activeHeartbeatHandle);
+        this.activeHeartbeatHandle = void 0;
         return;
       }
       this.sendHeartbeat();
-      this.heartbeatMisses++;
+      this.activeHeartbeatMisses++;
     }, this.options.heartbeatIntervalMs);
   }
+  waitForNextHeartbeat() {
+    const duration = this.options.heartbeatsUntilDead * this.options.heartbeatIntervalMs;
+    if (this.passiveHeartbeatHandle) {
+      clearTimeout(this.passiveHeartbeatHandle);
+      this.passiveHeartbeatHandle = void 0;
+    }
+    this.passiveHeartbeatHandle = setTimeout(() => {
+      this.log?.info(
+        `closing connection to ${this.to} due to not receiving a heartbeat in the last ${duration}ms`,
+        this.loggingMetadata
+      );
+      this.telemetry.span.addEvent("closing connection due to inactivity");
+      this.conn.close();
+      this.passiveHeartbeatHandle = void 0;
+    }, duration);
+  }
   sendHeartbeat() {
+    this.log?.debug("sending heartbeat", this.loggingMetadata);
     this.send({
       streamId: "heartbeat",
       controlFlags: 1 /* AckBit */,
@@ -830,6 +848,7 @@ var SessionConnected = class extends IdentifiedSession {
     });
     if (!this.isActivelyHeartbeating) {
       this.sendHeartbeat();
+      this.waitForNextHeartbeat();
     }
   };
   _handleStateExit() {
@@ -837,8 +856,10 @@ var SessionConnected = class extends IdentifiedSession {
     this.conn.removeDataListener(this.onMessageData);
     this.conn.removeCloseListener(this.listeners.onConnectionClosed);
     this.conn.removeErrorListener(this.listeners.onConnectionErrored);
-    clearInterval(this.heartbeatHandle);
-    this.heartbeatHandle = void 0;
+    clearInterval(this.activeHeartbeatHandle);
+    clearTimeout(this.passiveHeartbeatHandle);
+    this.activeHeartbeatHandle = void 0;
+    this.passiveHeartbeatHandle = void 0;
   }
   _handleClose() {
     super._handleClose();