@replit/river 0.26.5 → 0.26.7

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-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 { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-4478e99b.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-4478e99b.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';
-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 { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-02a61755.js';
+export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-02a61755.js';
+import { S as ServerTransport } from '../server-89076d9a.js';
+import '../message-3edb8fac.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-6c67339a.js';
+import '../client-1229b53d.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.5";
+var version = "0.26.7";
 
 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-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 { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-4478e99b.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-4478e99b.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';
-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 { C as Connection, s as ServerHandshakeOptions, o as ServiceContext } from '../handshake-02a61755.js';
+export { t as ParsedMetadata, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, w as createClientHandshakeOptions, x as createServerHandshakeOptions } from '../handshake-02a61755.js';
+import { S as ServerTransport } from '../server-89076d9a.js';
+import '../message-3edb8fac.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-6c67339a.js';
+import '../client-1229b53d.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.5";
+var version = "0.26.7";
 
 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-FA2IRWCM.js";
+} from "../chunk-C7OSTU6D.js";
 import {
   version
-} from "../chunk-7KB7DHFZ.js";
+} from "../chunk-NHM3XC6K.js";
 export {
   Err,
   Ok,

package/dist/{server-1f5eb427.d.ts → server-89076d9a.d.ts}

@@ -1,5 +1,5 @@
-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 { 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, D as DeleteSessionOptions } from './handshake-02a61755.js';
+import { b as OpaqueTransportMessage, e as Tags, a as TransportMessage, H as HandshakeErrorResponseCodes, c as TransportClientId, P as PartialTransportMessage } from './message-3edb8fac.js';
 import * as _sinclair_typebox_errors from '@sinclair/typebox/errors';
 import { Static } from '@sinclair/typebox';
 
@@ -33,6 +33,7 @@ declare class SessionWaitingForHandshake<ConnType extends Connection> extends Co
             traceId: string;
             spanId: string;
         } | undefined;
+        extras?: unknown;
     };
     onHandshakeData: (msg: Uint8Array) => void;
     sendHandshake(msg: TransportMessage): boolean;
@@ -59,7 +60,7 @@ declare abstract class ServerTransport<ConnType extends Connection> extends Tran
     extendHandshake(options: ServerHandshakeOptions): void;
     send(to: string, msg: PartialTransportMessage): string;
     protected deletePendingSession(pendingSession: SessionWaitingForHandshake<ConnType>): void;
-    protected deleteSession(session: ServerSession<ConnType>): void;
+    protected deleteSession(session: ServerSession<ConnType>, options?: DeleteSessionOptions): void;
     protected handleConnection(conn: ConnType): void;
     private rejectHandshakeRequest;
     protected onHandshakeRequest(session: SessionWaitingForHandshake<ConnType>, msg: OpaqueTransportMessage): Promise<void>;

package/dist/{services-6140f578.d.ts → services-4478e99b.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-154a0bb2.js';
-import { c as TransportClientId } from './message-ff78a233.js';
-import { C as ClientTransport } from './client-6c67339a.js';
+import { C as Connection, p as ClientHandshakeOptions, v as ServiceContextWithTransportInfo, o as ServiceContext } from './handshake-02a61755.js';
+import { c as TransportClientId } from './message-3edb8fac.js';
+import { C as ClientTransport } from './client-1229b53d.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -355,7 +355,8 @@ var createLogProxy = (log) => ({
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  MessageOrderingViolated: "message_ordering_violated"
+  MessageOrderingViolated: "message_ordering_violated",
+  InvalidMessage: "invalid_message"
 };
 var EventDispatcher = class {
   eventListeners = {};
@@ -631,7 +632,7 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.26.5";
+var version = "0.26.7";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -841,6 +842,12 @@ var SessionConnected = class extends IdentifiedSession {
       }
     });
   }
+  closeConnection() {
+    this.conn.removeDataListener(this.onMessageData);
+    this.conn.removeCloseListener(this.listeners.onConnectionClosed);
+    this.conn.removeErrorListener(this.listeners.onConnectionErrored);
+    this.conn.close();
+  }
   onMessageData = (msg) => {
     const parsedMsg = this.parseMsg(msg);
     if (parsedMsg === null) {
@@ -857,8 +864,8 @@ var SessionConnected = class extends IdentifiedSession {
           }
         );
       } else {
-        const reason = `received out-of-order msg (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
-        this.log?.error(reason, {
+        const reason = `received out-of-order msg, closing connection (got seq: ${parsedMsg.seq}, wanted seq: ${this.ack})`;
+        this.log?.warn(reason, {
           ...this.loggingMetadata,
           transportMessage: parsedMsg,
           tags: ["invariant-violation"]
@@ -867,7 +874,7 @@ var SessionConnected = class extends IdentifiedSession {
           code: import_api2.SpanStatusCode.ERROR,
           message: reason
         });
-        this.listeners.onInvalidMessage(reason);
+        this.closeConnection();
       }
       return;
     }
@@ -893,8 +900,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;
+    if (this.heartbeatHandle) {
+      clearInterval(this.heartbeatHandle);
+      this.heartbeatHandle = void 0;
+    }
   }
   _handleClose() {
     super._handleClose();
@@ -1323,8 +1332,12 @@ var Transport = class {
     return session;
   }
   // state transitions
-  deleteSession(session) {
-    session.log?.info(`closing session ${session.id}`, session.loggingMetadata);
+  deleteSession(session, options) {
+    const loggingMetadata = session.loggingMetadata;
+    if (loggingMetadata.tags && options?.unhealthy) {
+      loggingMetadata.tags.push("unhealthy-session");
+    }
+    session.log?.info(`closing session ${session.id}`, loggingMetadata);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "disconnect",
       session
@@ -1486,7 +1499,7 @@ var ClientTransport = class extends Transport {
             `invalid handshake: ${reason}`,
             handshakingSession.loggingMetadata
           );
-          this.deleteSession(session);
+          this.deleteSession(session, { unhealthy: true });
           this.protocolError({
             type: ProtocolError.HandshakeFailed,
             code,
@@ -1515,7 +1528,7 @@ var ClientTransport = class extends Transport {
       message: reason
     });
     this.log?.warn(reason, metadata);
-    this.deleteSession(session);
+    this.deleteSession(session, { unhealthy: true });
   }
   onHandshakeResponse(session, msg) {
     if (!import_value2.Value.Check(ControlMessageHandshakeResponseSchema, msg.payload)) {
@@ -1580,9 +1593,9 @@ var ClientTransport = class extends Transport {
       },
       onMessage: (msg2) => this.handleMsg(msg2),
       onInvalidMessage: (reason) => {
-        this.deleteSession(connectedSession);
+        this.deleteSession(connectedSession, { unhealthy: true });
         this.protocolError({
-          type: ProtocolError.MessageOrderingViolated,
+          type: ProtocolError.InvalidMessage,
           message: reason
         });
       }
@@ -1694,6 +1707,9 @@ var ClientTransport = class extends Transport {
     if (this.handshakeExtensions) {
       metadata = await this.handshakeExtensions.construct();
     }
+    if (session._isConsumed) {
+      return;
+    }
     const requestMsg = handshakeRequestMessage({
       from: this.clientId,
       to: session.to,
@@ -1791,9 +1807,18 @@ var Connection = class {
 // transport/impls/ws/connection.ts
 var WebSocketConnection = class extends Connection {
   ws;
-  constructor(ws) {
+  extras;
+  get loggingMetadata() {
+    const metadata = super.loggingMetadata;
+    if (this.extras) {
+      metadata.extras = this.extras;
+    }
+    return metadata;
+  }
+  constructor(ws, extras) {
     super();
     this.ws = ws;
+    this.extras = extras;
     this.ws.binaryType = "arraybuffer";
     let didError = false;
     this.ws.onerror = () => {