@replit/river 0.23.9 → 0.23.11

package/dist/router/index.d.cts

@@ -1,14 +1,53 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-49b1b43d.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-49b1b43d.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-3d0ba1da.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d0ba1da.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';
 import '@opentelemetry/api';
 import '../types-3e5768ec.js';
 
+interface ServerBreakage {
+    serviceBreakages: Record<string, ServiceBreakage>;
+}
+type ServiceBreakage = {
+    reason: 'removed';
+} | {
+    reason: 'modified';
+    procedureBreakages: Record<string, ProcedureBreakage>;
+};
+type ProcedureBreakage = {
+    reason: 'removed';
+} | {
+    reason: 'type-changed';
+    oldType: string;
+    newType: string;
+} | {
+    reason: 'modified';
+    input?: PayloadBreakage;
+    init?: PayloadBreakage;
+    output?: PayloadBreakage;
+};
+type PayloadBreakage = {
+    reason: 'type-changed';
+    oldType: string;
+    newType: string;
+} | {
+    reason: 'new-required';
+} | {
+    reason: 'removed-required';
+} | {
+    reason: 'field-breakage';
+    fieldBreakages: Record<string, PayloadBreakage>;
+};
+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.
  * @template Services - The type of services provided by the server.
@@ -16,7 +55,6 @@ import '../types-3e5768ec.js';
 interface Server<Services extends AnyServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
-    close(): Promise<void>;
 }
 interface ProcStream {
     id: string;
@@ -43,6 +81,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.9";
+var version = "0.23.11";
 
-export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };
+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,14 +1,53 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-49b1b43d.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-49b1b43d.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-3d0ba1da.js';
-export { g as ParsedMetadata, h as ServiceContextWithState, i as ServiceContextWithTransportInfo, j as createClientHandshakeOptions, k as createServerHandshakeOptions } from '../transport-3d0ba1da.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';
 import '@opentelemetry/api';
 import '../types-3e5768ec.js';
 
+interface ServerBreakage {
+    serviceBreakages: Record<string, ServiceBreakage>;
+}
+type ServiceBreakage = {
+    reason: 'removed';
+} | {
+    reason: 'modified';
+    procedureBreakages: Record<string, ProcedureBreakage>;
+};
+type ProcedureBreakage = {
+    reason: 'removed';
+} | {
+    reason: 'type-changed';
+    oldType: string;
+    newType: string;
+} | {
+    reason: 'modified';
+    input?: PayloadBreakage;
+    init?: PayloadBreakage;
+    output?: PayloadBreakage;
+};
+type PayloadBreakage = {
+    reason: 'type-changed';
+    oldType: string;
+    newType: string;
+} | {
+    reason: 'new-required';
+} | {
+    reason: 'removed-required';
+} | {
+    reason: 'field-breakage';
+    fieldBreakages: Record<string, PayloadBreakage>;
+};
+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.
  * @template Services - The type of services provided by the server.
@@ -16,7 +55,6 @@ import '../types-3e5768ec.js';
 interface Server<Services extends AnyServiceSchemaMap> {
     services: InstantiatedServiceSchemaMap<Services>;
     streams: Map<string, ProcStream>;
-    close(): Promise<void>;
 }
 interface ProcStream {
     id: string;
@@ -43,6 +81,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.9";
+var version = "0.23.11";
 
-export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };
+export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };

package/dist/router/index.js

@@ -9,11 +9,12 @@ import {
   createClientHandshakeOptions,
   createServer,
   createServerHandshakeOptions,
+  diffServerSchema,
   serializeSchema
-} from "../chunk-U4CSF3SQ.js";
+} from "../chunk-ZSKCZYVU.js";
 import {
   version
-} from "../chunk-XUVTMFTJ.js";
+} from "../chunk-MEHCOYKJ.js";
 export {
   Err,
   Ok,
@@ -26,6 +27,7 @@ export {
   createClientHandshakeOptions,
   createServer,
   createServerHandshakeOptions,
+  diffServerSchema,
   serializeSchema
 };
 //# sourceMappingURL=index.js.map

package/dist/{services-49b1b43d.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-3d0ba1da.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';
 
@@ -705,4 +705,4 @@ declare class ServiceScaffold<State extends object> {
     }>;
 }
 
-export { AnyServiceSchemaMap as A, Client as C, Err as E, InstantiatedServiceSchemaMap as I, Ok as O, PayloadType as P, RiverError as R, Service as S, UploadProcedure as U, ValidProcType as V, Procedure as a, Result as b, RiverUncaughtSchema as c, ProcedureResult as d, ServiceConfiguration as e, ProcHandler as f, ProcInit as g, ProcInput as h, ProcOutput as i, ProcErrors as j, ProcType as k, ServiceSchema as l, SerializedServerSchema as m, SerializedServiceSchema as n, SerializedProcedureSchema as o, ProcedureMap as p, RpcProcedure as q, SubscriptionProcedure as r, serializeSchema as s, StreamProcedure as t, createClient as u, UNCAUGHT_ERROR as v, RiverErrorSchema as w, ResultUnwrapOk as x, ResultUnwrapErr as y, Output as z };
+export { AnyServiceSchemaMap as A, Client as C, Err as E, InstantiatedServiceSchemaMap as I, Ok as O, PayloadType as P, RiverError as R, SerializedServerSchema as S, UploadProcedure as U, ValidProcType as V, Procedure as a, Result as b, RiverUncaughtSchema as c, ProcedureResult as d, Service as e, ServiceConfiguration as f, ProcHandler as g, ProcInit as h, ProcInput as i, ProcOutput as j, ProcErrors as k, ProcType as l, ServiceSchema as m, SerializedServiceSchema as n, SerializedProcedureSchema as o, ProcedureMap as p, RpcProcedure as q, SubscriptionProcedure as r, serializeSchema as s, StreamProcedure as t, createClient as u, UNCAUGHT_ERROR as v, RiverErrorSchema as w, ResultUnwrapOk as x, ResultUnwrapErr as y, Output as z };

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.9";
+var version = "0.23.11";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -169,7 +169,7 @@ var Connection = class {
   get loggingMetadata() {
     const metadata = { connId: this.id };
     const spanContext = this.telemetry?.span.spanContext();
-    if (spanContext) {
+    if (this.telemetry?.span.isRecording() && spanContext) {
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -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;
   }
@@ -618,11 +601,13 @@ var createLogProxy = (log) => ({
 var ProtocolError = {
   RetriesExceeded: "conn_retry_exceeded",
   HandshakeFailed: "handshake_failed",
-  UseAfterDestroy: "use_after_destroy",
   MessageOrderingViolated: "message_ordering_violated"
 };
 var EventDispatcher = class {
   eventListeners = {};
+  removeAllListeners() {
+    this.eventListeners = {};
+  }
   numberOfListeners(eventType) {
     return this.eventListeners[eventType]?.size ?? 0;
   }
@@ -641,7 +626,8 @@ var EventDispatcher = class {
   dispatchEvent(eventType, event) {
     const handlers = this.eventListeners[eventType];
     if (handlers) {
-      for (const handler of handlers) {
+      const copy = [...handlers];
+      for (const handler of copy) {
         handler(event);
       }
     }
@@ -803,10 +789,9 @@ var defaultServerTransportOptions = {
 };
 var Transport = class {
   /**
-   * A flag indicating whether the transport has been destroyed.
-   * A destroyed transport will not attempt to reconnect and cannot be used again.
+   * The status of the transport.
    */
-  state;
+  status;
   /**
    * The {@link Codec} used to encode and decode messages.
    */
@@ -848,7 +833,7 @@ var Transport = class {
     this.sessions = /* @__PURE__ */ new Map();
     this.codec = this.options.codec;
     this.clientId = clientId;
-    this.state = "open";
+    this.status = "open";
   }
   bindLogger(fn, level) {
     if (typeof fn === "function") {
@@ -862,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
@@ -870,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(
@@ -1010,7 +993,7 @@ var Transport = class {
    * @param msg The received message.
    */
   handleMsg(msg, conn) {
-    if (this.state !== "open")
+    if (this.getStatus() !== "open")
       return;
     const session = this.sessions.get(msg.from);
     if (!session) {
@@ -1089,21 +1072,14 @@ var Transport = class {
    * @returns The ID of the sent message or undefined if it wasn't sent
    */
   send(to, msg) {
-    if (this.state === "destroyed") {
-      const err = "transport is destroyed, cant send";
+    if (this.getStatus() === "closed") {
+      const err = "transport is closed, cant send";
       this.log?.error(err, {
         clientId: this.clientId,
         transportMessage: msg,
         tags: ["invariant-violation"]
       });
-      this.protocolError(ProtocolError.UseAfterDestroy, err);
-      return void 0;
-    } else if (this.state === "closed") {
-      this.log?.info(`transport closed when sending, discarding`, {
-        clientId: this.clientId,
-        transportMessage: msg
-      });
-      return void 0;
+      throw new Error(err);
     }
     return this.getOrCreateSession({ to }).session.send(msg);
   }
@@ -1126,23 +1102,18 @@ var Transport = class {
    * Closes the transport. Any messages sent while the transport is closed will be silently discarded.
    */
   close() {
-    this.state = "closed";
+    this.status = "closed";
     for (const session of this.sessions.values()) {
       this.deleteSession({ session, closeHandshakingConnection: true });
     }
+    this.eventDispatcher.dispatchEvent("transportStatus", {
+      status: this.status
+    });
+    this.eventDispatcher.removeAllListeners();
     this.log?.info(`manually closed transport`, { clientId: this.clientId });
   }
-  /**
-   * Default destroy implementation for transports. You should override this in the downstream
-   * implementation if you need to do any additional cleanup and call super.destroy() at the end.
-   * Destroys the transport. Any messages sent while the transport is destroyed will throw an error.
-   */
-  destroy() {
-    this.state = "destroyed";
-    for (const session of this.sessions.values()) {
-      this.deleteSession({ session, closeHandshakingConnection: true });
-    }
-    this.log?.info(`manually destroyed transport`, { clientId: this.clientId });
+  getStatus() {
+    return this.status;
   }
 };
 var ClientTransport = class extends Transport {
@@ -1179,7 +1150,7 @@ var ClientTransport = class extends Transport {
     this.handshakeExtensions = options;
   }
   handleConnection(conn, to) {
-    if (this.state !== "open")
+    if (this.getStatus() !== "open")
       return;
     let session = void 0;
     const handshakeTimeout = setTimeout(() => {
@@ -1219,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);
@@ -1310,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;
   }
   /**
@@ -1319,7 +1294,14 @@ var ClientTransport = class extends Transport {
    * @param to The client ID of the node to connect to.
    */
   async connect(to) {
-    const canProceedWithConnection = () => this.state === "open";
+    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(
         `transport state is no longer open, cancelling attempt to connect to ${to}`,
@@ -1329,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);
@@ -1411,7 +1393,7 @@ var ClientTransport = class extends Transport {
           clientId: this.clientId,
           connectedTo: to
         });
-        return this.connect(to);
+        await this.connect(to);
       }
     }
   }