@replit/river 0.23.10 → 0.23.11

package/dist/router/index.d.cts

@@ -1,8 +1,8 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-409c5545.js';
-export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l 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, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m 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-409c5545.js';
+import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-524bab79.js';
+export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l 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, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m 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-524bab79.js';
 import { Static } from '@sinclair/typebox';
-import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-cf856c41.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-cf856c41.js';
+import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-c8f36f6d.js';
+export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-c8f36f6d.js';
 import { Pushable } from 'it-pushable';
 import '../index-60f03cb7.js';
 import '@sinclair/typebox/value';
@@ -42,7 +42,11 @@ type PayloadBreakage = {
     reason: 'field-breakage';
     fieldBreakages: Record<string, PayloadBreakage>;
 };
-declare function diffServerSchema(oldServer: SerializedServerSchema, newServer: SerializedServerSchema): ServerBreakage | null;
+interface DiffOptions {
+    allowServiceRemoval?: boolean;
+    allowProcedureRemoval?: boolean;
+}
+declare function diffServerSchema(oldServer: SerializedServerSchema, newServer: SerializedServerSchema, options?: DiffOptions): ServerBreakage | null;
 
 /**
  * Represents a server with a set of services. Use {@link createServer} to create it.
@@ -77,6 +81,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.10";
+var version = "0.23.11";
 
-export { PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };
+export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };

package/dist/router/index.d.ts

@@ -1,8 +1,8 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-409c5545.js';
-export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l 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, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m 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-409c5545.js';
+import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-524bab79.js';
+export { C as Client, E as Err, O as Ok, z as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l 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, n as SerializedServiceSchema, e as Service, f as ServiceConfiguration, m 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-524bab79.js';
 import { Static } from '@sinclair/typebox';
-import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-cf856c41.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-cf856c41.js';
+import { d as ServerTransport, C as Connection, f as ServerHandshakeOptions, b as ServiceContext } from '../transport-c8f36f6d.js';
+export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-c8f36f6d.js';
 import { Pushable } from 'it-pushable';
 import '../index-60f03cb7.js';
 import '@sinclair/typebox/value';
@@ -42,7 +42,11 @@ type PayloadBreakage = {
     reason: 'field-breakage';
     fieldBreakages: Record<string, PayloadBreakage>;
 };
-declare function diffServerSchema(oldServer: SerializedServerSchema, newServer: SerializedServerSchema): ServerBreakage | null;
+interface DiffOptions {
+    allowServiceRemoval?: boolean;
+    allowProcedureRemoval?: boolean;
+}
+declare function diffServerSchema(oldServer: SerializedServerSchema, newServer: SerializedServerSchema, options?: DiffOptions): ServerBreakage | null;
 
 /**
  * Represents a server with a set of services. Use {@link createServer} to create it.
@@ -77,6 +81,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.10";
+var version = "0.23.11";
 
-export { PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };
+export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };

package/dist/router/index.js

@@ -11,10 +11,10 @@ import {
   createServerHandshakeOptions,
   diffServerSchema,
   serializeSchema
-} from "../chunk-B323CECK.js";
+} from "../chunk-ZSKCZYVU.js";
 import {
   version
-} from "../chunk-FRICSBDW.js";
+} from "../chunk-MEHCOYKJ.js";
 export {
   Err,
   Ok,

package/dist/{services-409c5545.d.ts → services-524bab79.d.ts}

@@ -1,5 +1,5 @@
 import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@sinclair/typebox';
-import { c as ClientTransport, C as Connection, l as ClientHandshakeOptions, i as ServiceContextWithTransportInfo } from './transport-cf856c41.js';
+import { c as ClientTransport, C as Connection, l as ClientHandshakeOptions, i as ServiceContextWithTransportInfo } from './transport-c8f36f6d.js';
 import { Pushable } from 'it-pushable';
 import { T as TransportClientId } from './index-60f03cb7.js';
 

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

@@ -110,7 +110,7 @@ function isAck(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.10";
+var version = "0.23.11";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -384,19 +384,8 @@ var Session = class {
       `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
       this.loggingMetadata
     );
-    this.cancelGrace({ keepHeartbeatMisses: true });
+    this.cancelGrace();
     this.disconnectionGrace = setTimeout(() => {
-      if (this.connection !== void 0) {
-        this.log?.warn(
-          `grace period for ${this.to} elapsed while connected. not calling callback`,
-          {
-            ...this.loggingMetadata,
-            connId: this.connection.id,
-            tags: ["invariant-violation"]
-          }
-        );
-        return;
-      }
       this.log?.info(
         `grace period for ${this.to} elapsed`,
         this.loggingMetadata
@@ -405,14 +394,8 @@ var Session = class {
     }, this.options.sessionDisconnectGraceMs);
   }
   // called on reconnect of the underlying session
-  cancelGrace({ keepHeartbeatMisses } = {
-    keepHeartbeatMisses: false
-  }) {
-    if (!keepHeartbeatMisses) {
-      this.heartbeatMisses = 0;
-    }
-    if (this.disconnectionGrace === void 0)
-      return;
+  cancelGrace() {
+    this.heartbeatMisses = 0;
     clearTimeout(this.disconnectionGrace);
     this.disconnectionGrace = void 0;
   }
@@ -864,7 +847,7 @@ var Transport = class {
    * and we know the identity of the connected client.
    * @param conn The connection object.
    */
-  onConnect(conn, connectedTo, session, isReconnect) {
+  onConnect(conn, session, isReconnect) {
     this.eventDispatcher.dispatchEvent("connectionStatus", {
       status: "connect",
       conn
@@ -872,13 +855,11 @@ var Transport = class {
     conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
     if (isReconnect) {
       session.replaceWithNewConnection(conn);
-      this.log?.info(`reconnected to ${connectedTo}`, {
-        ...conn.loggingMetadata,
-        ...session.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo
-      });
     }
+    this.log?.info(`connected to ${session.to}`, {
+      ...conn.loggingMetadata,
+      ...session.loggingMetadata
+    });
   }
   createSession(to, conn, propagationCtx) {
     const session = new Session(
@@ -1209,12 +1190,16 @@ var ClientTransport = class extends Transport {
       if (session) {
         this.onDisconnect(conn, session);
       }
-      this.log?.info(`connection to ${to} disconnected`, {
-        ...conn.loggingMetadata,
-        ...session?.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo: to
-      });
+      const willReconnect = this.reconnectOnConnectionDrop && this.getStatus() === "open";
+      this.log?.info(
+        `connection to ${to} disconnected` + (willReconnect ? ", reconnecting" : ""),
+        {
+          ...conn.loggingMetadata,
+          ...session?.loggingMetadata,
+          clientId: this.clientId,
+          connectedTo: to
+        }
+      );
       this.inflightConnectionPromises.delete(to);
       if (this.reconnectOnConnectionDrop) {
         void this.connect(to);
@@ -1300,8 +1285,8 @@ var ClientTransport = class extends Transport {
       conn,
       sessionId: parsed.payload.status.sessionId
     });
-    this.onConnect(conn, parsed.from, session, isReconnect);
-    this.retryBudget.startRestoringBudget(parsed.from);
+    this.onConnect(conn, session, isReconnect);
+    this.retryBudget.startRestoringBudget(session.to);
     return session;
   }
   /**
@@ -1309,6 +1294,13 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   async connect(to) {
+    if (this.connections.has(to)) {
+      this.log?.info(`already connected to ${to}, skipping connect attempt`, {
+        clientId: this.clientId,
+        connectedTo: to
+      });
+      return;
+    }
     const canProceedWithConnection = () => this.getStatus() === "open";
     if (!canProceedWithConnection()) {
       this.log?.info(
@@ -1319,8 +1311,8 @@ var ClientTransport = class extends Transport {
     }
     let reconnectPromise = this.inflightConnectionPromises.get(to);
     if (!reconnectPromise) {
-      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
+        const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
         const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
         this.log?.error(errMsg, { clientId: this.clientId, connectedTo: to });
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
@@ -1401,7 +1393,7 @@ var ClientTransport = class extends Transport {
           clientId: this.clientId,
           connectedTo: to
         });
-        return this.connect(to);
+        await this.connect(to);
       }
     }
   }