@replit/river 0.23.15 → 0.23.18

package/dist/router/index.d.cts

@@ -1,55 +1,16 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-86c4d10d.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-86c4d10d.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-38b3f758.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-38b3f758.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-5665ffd3.js';
-export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-5665ffd3.js';
-import { S as ServerTransport } from '../server-1cfc88d1.js';
+import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-a947c234.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-a947c234.js';
+import { S as ServerTransport } from '../server-53cd5b7e.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-e13979ac.js';
+import '../client-5776a6bb.js';
 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.
@@ -83,6 +44,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.15";
+var version = "0.23.18";
 
-export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };
+export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,55 +1,16 @@
-import { S as SerializedServerSchema, A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-86c4d10d.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-86c4d10d.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError } from '../services-38b3f758.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-38b3f758.js';
 import { Static } from '@sinclair/typebox';
 import { Pushable } from 'it-pushable';
-import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-5665ffd3.js';
-export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-5665ffd3.js';
-import { S as ServerTransport } from '../server-1cfc88d1.js';
+import { C as Connection, m as ServerHandshakeOptions, i as ServiceContext } from '../handshake-a947c234.js';
+export { n as ParsedMetadata, o as ServiceContextWithState, p as ServiceContextWithTransportInfo, q as createClientHandshakeOptions, r as createServerHandshakeOptions } from '../handshake-a947c234.js';
+import { S as ServerTransport } from '../server-53cd5b7e.js';
 import '../index-ea74cdbb.js';
 import '@sinclair/typebox/value';
 import '@opentelemetry/api';
-import '../client-e13979ac.js';
+import '../client-5776a6bb.js';
 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.
@@ -83,6 +44,6 @@ declare function createServer<Services extends AnyServiceSchemaMap>(transport: S
     extendedContext?: Omit<ServiceContext, 'state'>;
 }>): Server<Services>;
 
-var version = "0.23.15";
+var version = "0.23.18";
 
-export { DiffOptions, PayloadBreakage, PayloadType, ProcedureBreakage, version as RIVER_VERSION, Result, RiverError, SerializedServerSchema, Server, ServerBreakage, ServiceBreakage, ServiceContext, createServer, diffServerSchema };
+export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.js

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

package/dist/{server-1cfc88d1.d.ts → server-53cd5b7e.d.ts}

@@ -1,4 +1,4 @@
-import { C as Connection, T as Transport, l as ServerTransportOptions, m as ServerHandshakeOptions, S as Session, n as ParsedMetadata, c as ProvidedServerTransportOptions } from './handshake-5665ffd3.js';
+import { C as Connection, T as Transport, l as ServerTransportOptions, m as ServerHandshakeOptions, S as Session, n as ParsedMetadata, c as ProvidedServerTransportOptions } from './handshake-a947c234.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
 
 declare abstract class ServerTransport<ConnType extends Connection> extends Transport<ConnType> {

package/dist/{services-86c4d10d.d.ts → services-38b3f758.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, k as ClientHandshakeOptions, p as ServiceContextWithTransportInfo } from './handshake-5665ffd3.js';
+import { C as Connection, k as ClientHandshakeOptions, p as ServiceContextWithTransportInfo, i as ServiceContext } from './handshake-a947c234.js';
 import { c as TransportClientId } from './index-ea74cdbb.js';
-import { C as ClientTransport } from './client-e13979ac.js';
+import { C as ClientTransport } from './client-5776a6bb.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**
@@ -476,7 +476,7 @@ interface ServiceConfiguration<State extends object> {
     /**
      * A factory function for creating a fresh state.
      */
-    initializeState: () => State;
+    initializeState: (extendedContext: ServiceContext) => State;
 }
 interface SerializedProcedureSchema {
     input: PayloadType;
@@ -515,7 +515,7 @@ declare class ServiceSchema<State extends object, Procedures extends ProcedureMa
     /**
      * Factory function for creating a fresh state.
      */
-    protected readonly initializeState: () => State;
+    protected readonly initializeState: (extendedContext: ServiceContext) => State;
     /**
      * The procedures for this service.
      */
@@ -646,7 +646,7 @@ declare class ServiceSchema<State extends object, Procedures extends ProcedureMa
      * You probably don't need this, usually the River server will handle this
      * for you.
      */
-    instantiate(): Service<State, Procedures>;
+    instantiate(extendedContext: ServiceContext): Service<State, Procedures>;
 }
 /**
  * A scaffold for defining a service's procedures.
@@ -706,4 +706,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, 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 };
+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 };

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

@@ -134,7 +134,7 @@ function isAck(controlFlag) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.15";
+var version = "0.23.18";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -454,6 +454,18 @@ var Session = class {
   get nextExpectedSeq() {
     return this.ack;
   }
+  /**
+   * Check that the peer's next expected seq number matches something that is in our send buffer
+   * _or_ matches our actual next seq.
+   */
+  nextExpectedSeqInRange(nextExpectedSeq) {
+    for (const msg of this.sendBuffer) {
+      if (nextExpectedSeq === msg.seq) {
+        return true;
+      }
+    }
+    return nextExpectedSeq === this.seq;
+  }
   // This is only used in tests to make the session misbehave.
   /* @internal */
   advanceAckForTesting(by) {
@@ -565,9 +577,11 @@ var UdsConnection = class extends Connection {
     });
   }
   send(payload) {
-    if (this.framer.destroyed || !this.sock.writable)
+    if (this.framer.destroyed || !this.sock.writable || this.sock.closed) {
       return false;
-    return this.sock.write(MessageFramer.write(payload));
+    }
+    this.sock.write(MessageFramer.write(payload));
+    return true;
   }
   close() {
     this.sock.destroy();
@@ -635,6 +649,7 @@ var defaultTransportOptions = {
   heartbeatIntervalMs: 1e3,
   heartbeatsUntilDead: 2,
   sessionDisconnectGraceMs: 5e3,
+  handshakeTimeoutMs: 5e3,
   codec: NaiveJsonCodec
 };
 var defaultConnectionRetryOptions = {
@@ -954,7 +969,7 @@ var Transport = class {
     if (
       // reject this request if there was no previous session to replace
       session === void 0 || // or if both parties do not agree about the next expected sequence number
-      session.nextExpectedAck < nextExpectedSeq || // or if both parties do not agree on the advertised session id
+      !session.nextExpectedSeqInRange(nextExpectedSeq) || // or if both parties do not agree on the advertised session id
       session.advertisedSessionId !== sessionId
     ) {
       return false;
@@ -1290,7 +1305,7 @@ var ClientTransport = class extends Transport {
         { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to }
       );
       conn.close();
-    }, this.options.sessionDisconnectGraceMs);
+    }, this.options.handshakeTimeoutMs);
     const handshakeHandler = (data) => {
       const maybeSession = this.receiveHandshakeResponseMessage(data, conn);
       clearTimeout(handshakeTimeout);