@replit/river 0.13.3 → 0.13.5

package/dist/{builder-d649690f.d.ts → builder-533e1324.d.ts}

@@ -1,6 +1,6 @@
 import { TObject, TUnion, TString, TSchema, TNever, TLiteral, Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { b as TransportClientId, d as Session, C as Connection } from './index-1c1493df.js';
+import { b as TransportClientId, d as Session, C as Connection } from './index-2154021c.js';
 
 /**
  * The context for services/procedures. This is used only on
@@ -200,9 +200,8 @@ declare class ServiceBuilder<T extends Service<string, object, ProcListing>> {
     private constructor();
     /**
      * Finalizes the schema for the service.
-     * @returns {T} The finalized schema for the service.
      */
-    finalize(): T;
+    finalize(): Readonly<T>;
     /**
      * Sets the initial state for the service.
      * @template InitState The type of the initial state.

package/dist/{chunk-FIX2F6VT.js → chunk-4JFIL3FG.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-MCTB3NYK.js";
+} from "./chunk-WYHD3FN7.js";
 
 // transport/transforms/messageFraming.ts
 import { Transform } from "node:stream";

package/dist/{chunk-67M47YPQ.js → chunk-E2CP4UWB.js}

@@ -41,10 +41,9 @@ var ServiceBuilder = class _ServiceBuilder {
   }
   /**
    * Finalizes the schema for the service.
-   * @returns {T} The finalized schema for the service.
    */
   finalize() {
-    return this.schema;
+    return Object.freeze(this.schema);
   }
   /**
    * Sets the initial state for the service.
@@ -771,8 +770,8 @@ var RiverServer = class {
   }
   createNewProcStream(message) {
     if (!isStreamOpen(message.controlFlags)) {
-      log?.warn(
-        `${this.transport.clientId} -- couldn't find a matching procedure stream for ${message.serviceName}.${message.procedureName}:${message.streamId}`
+      log?.error(
+        `${this.transport.clientId} -- can't create a new procedure stream from a message that doesn't have the stream open bit set`
       );
       return;
     }

package/dist/{chunk-5V6B7TM3.js → chunk-MSJNWNYI.js}

@@ -1,6 +1,6 @@
 import {
   Connection
-} from "./chunk-MCTB3NYK.js";
+} from "./chunk-WYHD3FN7.js";
 
 // transport/impls/ws/connection.ts
 var WebSocketConnection = class extends Connection {

package/dist/{chunk-MCTB3NYK.js → chunk-WYHD3FN7.js}

@@ -118,12 +118,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -137,12 +136,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -163,7 +156,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -178,6 +171,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -192,12 +188,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -240,7 +230,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -250,6 +240,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -549,6 +542,8 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    if (this.state !== "open")
+      return;
     let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
@@ -667,6 +662,11 @@ var ServerTransport = class extends Transport {
     );
   }
   handleConnection(conn) {
+    if (this.state !== "open")
+      return;
+    log?.info(
+      `${this.clientId} -- new incoming connection (id: ${conn.debugId})`
+    );
     let session = void 0;
     const client = () => session?.to ?? "unknown";
     const handshakeHandler = (data) => {

package/dist/{connection-6222fd0b.d.ts → connection-1f994b63.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection } from './index-1c1493df.js';
+import { C as Connection } from './index-2154021c.js';
 import { Socket } from 'node:net';
 import stream, { Transform, TransformCallback, TransformOptions } from 'node:stream';
 

package/dist/{connection-2b55cc7f.d.ts → connection-f46114a1.d.ts}

@@ -1,5 +1,5 @@
 import WebSocket from 'isomorphic-ws';
-import { C as Connection } from './index-1c1493df.js';
+import { C as Connection } from './index-2154021c.js';
 
 declare class WebSocketConnection extends Connection {
     ws: WebSocket;

package/dist/{index-1c1493df.d.ts → index-2154021c.d.ts}

@@ -185,16 +185,14 @@ declare class Session<ConnType extends Connection> {
      * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
      *
      * @param msg The partial message to be sent, which will be constructed into a full message.
-     * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-     * ack hearbeats, which contain information that can already be found in the other buffered messages.
+     * @param addToSendBuff Whether to add the message to the send buffer for retry.
      * @returns The full transport ID of the message that was attempted to be sent.
      */
-    send(msg: PartialTransportMessage, skipRetry?: boolean): string;
+    send(msg: PartialTransportMessage, addToSendBuff?: boolean): string;
     sendHeartbeat(): void;
     resetBufferedMessages(): void;
     sendBufferedMessages(): void;
     updateBookkeeping(ack: number, seq: number): void;
-    addToSendBuff(msg: TransportMessage): void;
     closeStaleConnection(conn?: ConnType): void;
     replaceWithNewConnection(newConn: ConnType): void;
     beginGrace(cb: () => void): void;
@@ -202,7 +200,7 @@ declare class Session<ConnType extends Connection> {
     close(): void;
     get connected(): boolean;
     get nextExpectedSeq(): number;
-    constructMsg<Payload extends Record<string, unknown>>(partialMsg: PartialTransportMessage<Payload>): TransportMessage<Payload>;
+    constructMsg<Payload extends Record<string, unknown>>(partialMsg: PartialTransportMessage<Payload>, addToSendBuff?: boolean): TransportMessage<Payload>;
     inspectSendBuffer(): ReadonlyArray<OpaqueTransportMessage>;
 }
 
@@ -421,4 +419,4 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     };
 }
 
-export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, ServerTransport as S, Transport as T, ClientTransport as a, TransportClientId as b, TransportOptions as c, Session as d, TransportMessageSchema as e, OpaqueTransportMessageSchema as f, TransportMessage as g, isStreamClose as h, isStreamOpen as i, EventTypes as j, EventHandler as k };
+export { Connection as C, EventMap as E, OpaqueTransportMessage as O, PartialTransportMessage as P, ServerTransport as S, Transport as T, ClientTransport as a, TransportClientId as b, TransportOptions as c, Session as d, TransportStatus as e, TransportMessageSchema as f, OpaqueTransportMessageSchema as g, TransportMessage as h, isStreamOpen as i, isStreamClose as j, EventTypes as k, EventHandler as l };

package/dist/router/index.cjs

@@ -65,10 +65,9 @@ var ServiceBuilder = class _ServiceBuilder {
   }
   /**
    * Finalizes the schema for the service.
-   * @returns {T} The finalized schema for the service.
    */
   finalize() {
-    return this.schema;
+    return Object.freeze(this.schema);
   }
   /**
    * Sets the initial state for the service.
@@ -867,8 +866,8 @@ var RiverServer = class {
   }
   createNewProcStream(message) {
     if (!isStreamOpen(message.controlFlags)) {
-      log?.warn(
-        `${this.transport.clientId} -- couldn't find a matching procedure stream for ${message.serviceName}.${message.procedureName}:${message.streamId}`
+      log?.error(
+        `${this.transport.clientId} -- can't create a new procedure stream from a message that doesn't have the stream open bit set`
       );
       return;
     }

package/dist/router/index.d.cts

@@ -1,6 +1,6 @@
-import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-d649690f.js';
-export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-d649690f.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-1c1493df.js';
+import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-533e1324.js';
+export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-533e1324.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-2154021c.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.d.ts

@@ -1,6 +1,6 @@
-import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-d649690f.js';
-export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-d649690f.js';
-import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-1c1493df.js';
+import { A as AnyService, P as PayloadType, b as Result, R as RiverError, S as ServiceContext, d as ProcType, e as ProcInput, f as ProcOutput, g as ProcErrors, h as ProcHasInit, i as ProcInit } from '../builder-533e1324.js';
+export { E as Err, O as Ok, m as ProcHandler, k as ProcListing, a as Procedure, p as RiverErrorSchema, c as RiverUncaughtSchema, l as Service, j as ServiceBuilder, n as ServiceContextWithState, o as ServiceContextWithTransportInfo, U as UNCAUGHT_ERROR, V as ValidProcType, s as serializeService } from '../builder-533e1324.js';
+import { S as ServerTransport, C as Connection, a as ClientTransport } from '../index-2154021c.js';
 import { Pushable } from 'it-pushable';
 import { Static } from '@sinclair/typebox';
 import '../types-3e5768ec.js';

package/dist/router/index.js

@@ -8,7 +8,7 @@ import {
   createClient,
   createServer,
   serializeService
-} from "../chunk-67M47YPQ.js";
+} from "../chunk-E2CP4UWB.js";
 import "../chunk-GFRAOY75.js";
 import "../chunk-H4BYJELI.js";
 export {

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

@@ -226,12 +226,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -245,12 +244,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -271,7 +264,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -286,6 +279,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -300,12 +296,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -348,7 +338,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -358,6 +348,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -790,6 +783,8 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    if (this.state !== "open")
+      return;
     let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);

package/dist/transport/impls/uds/client.d.cts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { U as UdsConnection } from '../../../connection-6222fd0b.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { U as UdsConnection } from '../../../connection-1f994b63.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

package/dist/transport/impls/uds/client.d.ts

@@ -1,5 +1,5 @@
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { U as UdsConnection } from '../../../connection-6222fd0b.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { U as UdsConnection } from '../../../connection-1f994b63.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:net';

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

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-FIX2F6VT.js";
+} from "../../../chunk-4JFIL3FG.js";
 import {
   ClientTransport
-} from "../../../chunk-MCTB3NYK.js";
+} from "../../../chunk-WYHD3FN7.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -264,12 +264,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -283,12 +282,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -309,7 +302,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -324,6 +317,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -338,12 +334,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -386,7 +376,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -396,6 +386,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -699,6 +692,11 @@ var ServerTransport = class extends Transport {
     );
   }
   handleConnection(conn) {
+    if (this.state !== "open")
+      return;
+    log?.info(
+      `${this.clientId} -- new incoming connection (id: ${conn.debugId})`
+    );
     let session = void 0;
     const client = () => session?.to ?? "unknown";
     const handshakeHandler = (data) => {
@@ -890,9 +888,6 @@ var UnixDomainSocketServerTransport = class extends ServerTransport {
   connectionHandler = (sock) => {
     const conn = new UdsConnection(sock);
     this.handleConnection(conn);
-    log?.info(
-      `${this.clientId} -- new incoming uds connection (id: ${conn.debugId})`
-    );
   };
   close() {
     super.close();

package/dist/transport/impls/uds/server.d.cts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { U as UdsConnection } from '../../../connection-6222fd0b.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { U as UdsConnection } from '../../../connection-1f994b63.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

package/dist/transport/impls/uds/server.d.ts

@@ -1,6 +1,6 @@
 import { Server, Socket } from 'node:net';
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { U as UdsConnection } from '../../../connection-6222fd0b.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { U as UdsConnection } from '../../../connection-1f994b63.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 import 'node:stream';

package/dist/transport/impls/uds/server.js

@@ -1,9 +1,9 @@
 import {
   UdsConnection
-} from "../../../chunk-FIX2F6VT.js";
+} from "../../../chunk-4JFIL3FG.js";
 import {
   ServerTransport
-} from "../../../chunk-MCTB3NYK.js";
+} from "../../../chunk-WYHD3FN7.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log
@@ -24,9 +24,6 @@ var UnixDomainSocketServerTransport = class extends ServerTransport {
   connectionHandler = (sock) => {
     const conn = new UdsConnection(sock);
     this.handleConnection(conn);
-    log?.info(
-      `${this.clientId} -- new incoming uds connection (id: ${conn.debugId})`
-    );
   };
   close() {
     super.close();

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

@@ -256,12 +256,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -275,12 +274,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -301,7 +294,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -316,6 +309,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -330,12 +326,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -378,7 +368,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -388,6 +378,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -696,6 +689,8 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    if (this.state !== "open")
+      return;
     let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);

package/dist/transport/impls/ws/client.d.cts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { W as WebSocketConnection } from '../../../connection-2b55cc7f.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { W as WebSocketConnection } from '../../../connection-f46114a1.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/client.d.ts

@@ -1,6 +1,6 @@
 import WebSocket from 'isomorphic-ws';
-import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
-import { W as WebSocketConnection } from '../../../connection-2b55cc7f.js';
+import { a as ClientTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
+import { W as WebSocketConnection } from '../../../connection-f46114a1.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

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

@@ -1,9 +1,9 @@
 import {
   WebSocketConnection
-} from "../../../chunk-5V6B7TM3.js";
+} from "../../../chunk-MSJNWNYI.js";
 import {
   ClientTransport
-} from "../../../chunk-MCTB3NYK.js";
+} from "../../../chunk-WYHD3FN7.js";
 import "../../../chunk-GFRAOY75.js";
 import {
   log

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

@@ -24,9 +24,6 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 
-// logging/index.ts
-var log;
-
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
 
@@ -107,6 +104,9 @@ function isAck(controlFlag) {
   return (controlFlag & 1 /* AckBit */) === 1 /* AckBit */;
 }
 
+// logging/index.ts
+var log;
+
 // transport/events.ts
 var EventDispatcher = class {
   eventListeners = {};
@@ -264,12 +264,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -283,12 +282,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -309,7 +302,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -324,6 +317,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -338,12 +334,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -386,7 +376,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -396,6 +386,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -699,6 +692,11 @@ var ServerTransport = class extends Transport {
     );
   }
   handleConnection(conn) {
+    if (this.state !== "open")
+      return;
+    log?.info(
+      `${this.clientId} -- new incoming connection (id: ${conn.debugId})`
+    );
     let session = void 0;
     const client = () => session?.to ?? "unknown";
     const handshakeHandler = (data) => {
@@ -826,9 +824,6 @@ var WebSocketServerTransport = class extends ServerTransport {
   }
   connectionHandler = (ws) => {
     const conn = new WebSocketConnection(ws);
-    log?.info(
-      `${this.clientId} -- new incoming ws connection (id: ${conn.debugId})`
-    );
     this.handleConnection(conn);
   };
   close() {

package/dist/transport/impls/ws/server.d.cts

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-2b55cc7f.js';
+import { W as WebSocketConnection } from '../../../connection-f46114a1.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/server.d.ts

@@ -1,7 +1,7 @@
-import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-1c1493df.js';
+import { S as ServerTransport, b as TransportClientId, c as TransportOptions } from '../../../index-2154021c.js';
 import { WebSocketServer } from 'ws';
 import { WebSocket } from 'isomorphic-ws';
-import { W as WebSocketConnection } from '../../../connection-2b55cc7f.js';
+import { W as WebSocketConnection } from '../../../connection-f46114a1.js';
 import '../../../types-3e5768ec.js';
 import '@sinclair/typebox';
 

package/dist/transport/impls/ws/server.js

@@ -1,13 +1,11 @@
 import {
   WebSocketConnection
-} from "../../../chunk-5V6B7TM3.js";
+} from "../../../chunk-MSJNWNYI.js";
 import {
   ServerTransport
-} from "../../../chunk-MCTB3NYK.js";
+} from "../../../chunk-WYHD3FN7.js";
 import "../../../chunk-GFRAOY75.js";
-import {
-  log
-} from "../../../chunk-H4BYJELI.js";
+import "../../../chunk-H4BYJELI.js";
 import "../../../chunk-GZ7HCLLM.js";
 
 // transport/impls/ws/server.ts
@@ -20,9 +18,6 @@ var WebSocketServerTransport = class extends ServerTransport {
   }
   connectionHandler = (ws) => {
     const conn = new WebSocketConnection(ws);
-    log?.info(
-      `${this.clientId} -- new incoming ws connection (id: ${conn.debugId})`
-    );
     this.handleConnection(conn);
   };
   close() {

package/dist/transport/index.cjs

@@ -286,12 +286,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -305,12 +304,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -331,7 +324,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -346,6 +339,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -360,12 +356,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -408,7 +398,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -418,6 +408,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {
@@ -726,6 +719,8 @@ var ClientTransport = class extends Transport {
     this.inflightConnectionPromises = /* @__PURE__ */ new Map();
   }
   handleConnection(conn, to) {
+    if (this.state !== "open")
+      return;
     let session = void 0;
     const handshakeHandler = (data) => {
       const handshake = this.receiveHandshakeResponseMessage(data);
@@ -844,6 +839,11 @@ var ServerTransport = class extends Transport {
     );
   }
   handleConnection(conn) {
+    if (this.state !== "open")
+      return;
+    log?.info(
+      `${this.clientId} -- new incoming connection (id: ${conn.debugId})`
+    );
     let session = void 0;
     const client = () => session?.to ?? "unknown";
     const handshakeHandler = (data) => {

package/dist/transport/index.d.cts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-1c1493df.js';
+export { a as ClientTransport, C as Connection, l as EventHandler, E as EventMap, k as EventTypes, O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, h as TransportMessage, f as TransportMessageSchema, c as TransportOptions, e as TransportStatus, j as isStreamClose, i as isStreamOpen } from '../index-2154021c.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.d.ts

@@ -1,3 +1,3 @@
-export { a as ClientTransport, C as Connection, k as EventHandler, E as EventMap, j as EventTypes, O as OpaqueTransportMessage, f as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, g as TransportMessage, e as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-1c1493df.js';
+export { a as ClientTransport, C as Connection, l as EventHandler, E as EventMap, k as EventTypes, O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, S as ServerTransport, d as Session, T as Transport, b as TransportClientId, h as TransportMessage, f as TransportMessageSchema, c as TransportOptions, e as TransportStatus, j as isStreamClose, i as isStreamOpen } from '../index-2154021c.js';
 import '../types-3e5768ec.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -5,7 +5,7 @@ import {
   ServerTransport,
   Session,
   Transport
-} from "../chunk-MCTB3NYK.js";
+} from "../chunk-WYHD3FN7.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema

package/dist/util/testHelpers.cjs

@@ -174,12 +174,11 @@ var Session = class {
    * If the connection is not ready or the message fails to send, the message can be buffered for retry unless skipped.
    *
    * @param msg The partial message to be sent, which will be constructed into a full message.
-   * @param skipRetry Optional. If true, the message will not be buffered for retry on failure. This should only be used for
-   * ack hearbeats, which contain information that can already be found in the other buffered messages.
+   * @param addToSendBuff Whether to add the message to the send buffer for retry.
    * @returns The full transport ID of the message that was attempted to be sent.
    */
-  send(msg, skipRetry) {
-    const fullMsg = this.constructMsg(msg);
+  send(msg, addToSendBuff = true) {
+    const fullMsg = this.constructMsg(msg, addToSendBuff);
     log?.debug(`${this.from} -- sending ${JSON.stringify(fullMsg)}`);
     if (this.connection) {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
@@ -193,12 +192,6 @@ var Session = class {
         `${this.from} -- failed to send ${fullMsg.id} to ${fullMsg.to}, connection not ready yet`
       );
     }
-    if (skipRetry)
-      return fullMsg.id;
-    this.addToSendBuff(fullMsg);
-    log?.info(
-      `${this.from} -- buffering msg ${fullMsg.id} until connection is healthy again`
-    );
     return fullMsg.id;
   }
   sendHeartbeat() {
@@ -219,7 +212,7 @@ var Session = class {
           type: "ACK"
         }
       },
-      true
+      false
     );
     this.heartbeatMisses++;
   }
@@ -234,6 +227,9 @@ var Session = class {
       log?.error(msg);
       throw new Error(msg);
     }
+    log?.info(
+      `${this.from} -- resending ${this.sendBuffer.length} buffered messages`
+    );
     for (const msg of this.sendBuffer) {
       log?.debug(`${this.from} -- resending ${JSON.stringify(msg)}`);
       const ok = this.connection.send(this.codec.toBuffer(msg));
@@ -248,12 +244,6 @@ var Session = class {
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq > ack);
     this.ack = seq + 1;
   }
-  addToSendBuff(msg) {
-    this.sendBuffer.push(msg);
-    log?.debug(
-      `${this.from} -- send buff to ${this.to} now tracking ${this.sendBuffer.length} messages`
-    );
-  }
   closeStaleConnection(conn) {
     if (!this.connection || this.connection !== conn)
       return;
@@ -296,7 +286,7 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
-  constructMsg(partialMsg) {
+  constructMsg(partialMsg, addToSendBuff = true) {
     const msg = {
       ...partialMsg,
       id: unsafeId(),
@@ -306,6 +296,9 @@ var Session = class {
       ack: this.ack
     };
     this.seq++;
+    if (addToSendBuff) {
+      this.sendBuffer.push(msg);
+    }
     return msg;
   }
   inspectSendBuffer() {

package/dist/util/testHelpers.d.cts

@@ -1,8 +1,8 @@
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-1c1493df.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-d649690f.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-2154021c.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-533e1324.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 import '../types-3e5768ec.js';

package/dist/util/testHelpers.d.ts

@@ -1,8 +1,8 @@
 import * as it_pushable from 'it-pushable';
 import WebSocket from 'isomorphic-ws';
 import http from 'node:http';
-import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-1c1493df.js';
-import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-d649690f.js';
+import { P as PartialTransportMessage, T as Transport, C as Connection, O as OpaqueTransportMessage } from '../index-2154021c.js';
+import { P as PayloadType, R as RiverError, a as Procedure, S as ServiceContext, b as Result, c as RiverUncaughtSchema } from '../builder-533e1324.js';
 import { Static } from '@sinclair/typebox';
 import net from 'node:net';
 import '../types-3e5768ec.js';

package/dist/util/testHelpers.js

@@ -1,12 +1,12 @@
 import {
   UNCAUGHT_ERROR,
   pushable
-} from "../chunk-67M47YPQ.js";
+} from "../chunk-E2CP4UWB.js";
 import "../chunk-5IZ2UHWV.js";
 import {
   Session,
   defaultSessionOptions
-} from "../chunk-MCTB3NYK.js";
+} from "../chunk-WYHD3FN7.js";
 import {
   coerceErrorString
 } from "../chunk-GFRAOY75.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@replit/river",
   "description": "It's like tRPC but... with JSON Schema Support, duplex streaming and support for service multiplexing. Transport agnostic!",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "type": "module",
   "exports": {
     ".": {