@replit/river 0.19.3 → 0.20.0

package/dist/router/index.d.cts

@@ -1,9 +1,9 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../services-4bba42d8.js';
-export { C as Client, E as Err, O as Ok, B as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, o as ProcedureMap, d as ProcedureResult, p as RPCProcedure, z as ResultUnwrapErr, y as ResultUnwrapOk, x as RiverErrorSchema, c as RiverUncaughtSchema, n as SerializedServerSchema, e as Service, f as ServiceConfiguration, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, m as ServiceSchema, r as StreamProcedure, q as SubscriptionProcedure, w as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, t as createClient, s as serializeSchema } from '../services-4bba42d8.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../services-abc077db.js';
+export { C as Client, E as Err, O as Ok, B as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, o as ProcedureMap, d as ProcedureResult, p as RPCProcedure, z as ResultUnwrapErr, y as ResultUnwrapOk, x as RiverErrorSchema, c as RiverUncaughtSchema, n as SerializedServerSchema, e as Service, f as ServiceConfiguration, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, m as ServiceSchema, r as StreamProcedure, q as SubscriptionProcedure, w as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, t as createClient, s as serializeSchema } from '../services-abc077db.js';
 import { Static } from '@sinclair/typebox';
 import { ServerTransport } from '../transport/index.cjs';
 import { Pushable } from 'it-pushable';
-import { C as Connection } from '../index-e2513701.js';
+import { C as Connection } from '../index-3ac92295.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -36,6 +36,6 @@ interface ProcStream {
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-var version = "0.19.3";
+var version = "0.20.0";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.d.ts

@@ -1,9 +1,9 @@
-import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../services-5fc5712d.js';
-export { C as Client, E as Err, O as Ok, B as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, o as ProcedureMap, d as ProcedureResult, p as RPCProcedure, z as ResultUnwrapErr, y as ResultUnwrapOk, x as RiverErrorSchema, c as RiverUncaughtSchema, n as SerializedServerSchema, e as Service, f as ServiceConfiguration, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, m as ServiceSchema, r as StreamProcedure, q as SubscriptionProcedure, w as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, t as createClient, s as serializeSchema } from '../services-5fc5712d.js';
+import { A as AnyServiceSchemaMap, I as InstantiatedServiceSchemaMap, P as PayloadType, b as Result, R as RiverError, S as ServiceContext } from '../services-8496d6e8.js';
+export { C as Client, E as Err, O as Ok, B as Output, k as ProcErrors, g as ProcHandler, h as ProcInit, i as ProcInput, j as ProcOutput, l as ProcType, a as Procedure, o as ProcedureMap, d as ProcedureResult, p as RPCProcedure, z as ResultUnwrapErr, y as ResultUnwrapOk, x as RiverErrorSchema, c as RiverUncaughtSchema, n as SerializedServerSchema, e as Service, f as ServiceConfiguration, u as ServiceContextWithState, v as ServiceContextWithTransportInfo, m as ServiceSchema, r as StreamProcedure, q as SubscriptionProcedure, w as UNCAUGHT_ERROR, U as UploadProcedure, V as ValidProcType, t as createClient, s as serializeSchema } from '../services-8496d6e8.js';
 import { Static } from '@sinclair/typebox';
 import { ServerTransport } from '../transport/index.js';
 import { Pushable } from 'it-pushable';
-import { C as Connection } from '../index-e2513701.js';
+import { C as Connection } from '../index-3ac92295.js';
 import '../types-3e5768ec.js';
 
 /**
@@ -36,6 +36,6 @@ interface ProcStream {
  */
 declare function createServer<Services extends AnyServiceSchemaMap>(transport: ServerTransport<Connection>, services: Services, extendedContext?: Omit<ServiceContext, 'state'>): Server<Services>;
 
-var version = "0.19.3";
+var version = "0.20.0";
 
 export { PayloadType, version as RIVER_VERSION, Result, RiverError, Server, ServiceContext, createServer };

package/dist/router/index.js

@@ -9,8 +9,8 @@ import {
   createServer,
   serializeSchema,
   version
-} from "../chunk-SLYSDRLE.js";
-import "../chunk-2Z2NE47H.js";
+} from "../chunk-YB5LRYL6.js";
+import "../chunk-5WFL722S.js";
 import "../chunk-DT5JS6TM.js";
 export {
   Err,

package/dist/{services-5fc5712d.d.ts → services-8496d6e8.d.ts}

@@ -1,7 +1,7 @@
 import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@sinclair/typebox';
 import { ClientTransport } from './transport/index.js';
 import { Pushable } from 'it-pushable';
-import { C as Connection, T as TransportClientId, a as Session, b as ParsedHandshakeMetadata } from './index-e2513701.js';
+import { C as Connection, T as TransportClientId, a as Session, b as ParsedHandshakeMetadata } from './index-3ac92295.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

package/dist/{services-4bba42d8.d.ts → services-abc077db.d.ts}

@@ -1,7 +1,7 @@
 import { Static, TObject, TUnion, TString, TSchema, TNever, TLiteral } from '@sinclair/typebox';
 import { ClientTransport } from './transport/index.cjs';
 import { Pushable } from 'it-pushable';
-import { C as Connection, T as TransportClientId, a as Session, b as ParsedHandshakeMetadata } from './index-e2513701.js';
+import { C as Connection, T as TransportClientId, a as Session, b as ParsedHandshakeMetadata } from './index-3ac92295.js';
 
 type AsyncIter<T> = AsyncGenerator<T, T>;
 /**

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

@@ -44,6 +44,12 @@ var TransportMessageSchema = (t) => import_typebox.Type.Object({
   procedureName: import_typebox.Type.Optional(import_typebox.Type.String()),
   streamId: import_typebox.Type.String(),
   controlFlags: import_typebox.Type.Integer(),
+  tracing: import_typebox.Type.Optional(
+    import_typebox.Type.Object({
+      traceparent: import_typebox.Type.String(),
+      tracestate: import_typebox.Type.String()
+    })
+  ),
   payload: t
 });
 var ControlMessageAckSchema = import_typebox.Type.Object({
@@ -81,7 +87,7 @@ var ControlMessagePayloadSchema = import_typebox.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox.Type.Unknown()
 );
-function handshakeRequestMessage(from, to, sessionId, metadata) {
+function handshakeRequestMessage(from, to, sessionId, metadata, tracing) {
   return {
     id: (0, import_nanoid.nanoid)(),
     from,
@@ -90,6 +96,7 @@ function handshakeRequestMessage(from, to, sessionId, metadata) {
     ack: 0,
     streamId: (0, import_nanoid.nanoid)(),
     controlFlags: 0,
+    tracing,
     payload: {
       type: "HANDSHAKE_REQ",
       protocolVersion: PROTOCOL_VERSION,
@@ -434,6 +441,7 @@ var UdsConnection = class extends Connection {
 
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
+var import_api2 = require("@opentelemetry/api");
 
 // transport/events.ts
 var ProtocolError = {
@@ -469,6 +477,11 @@ var EventDispatcher = class {
   }
 };
 
+// tracing/index.ts
+var import_api = require("@opentelemetry/api");
+var tracer = import_api.trace.getTracer("river");
+var tracing_default = tracer;
+
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
@@ -1028,82 +1041,142 @@ 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 (!canProceedWithConnection()) {
-      log?.info(
-        `transport state is no longer open, cancelling attempt to connect to ${to}`,
-        { clientId: this.clientId, connectedTo: to }
-      );
-      return;
-    }
-    let reconnectPromise = this.inflightConnectionPromises.get(to);
-    if (!reconnectPromise) {
-      const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
-      if (!this.retryBudget.hasBudget(to)) {
-        const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
-        log?.warn(errMsg, { clientId: this.clientId, connectedTo: to });
-        this.protocolError(ProtocolError.RetriesExceeded, errMsg);
-        return;
-      }
-      let sleep = Promise.resolve();
-      const backoffMs = this.retryBudget.getBackoffMs(to);
-      if (backoffMs > 0) {
-        sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
-      }
-      log?.info(`attempting connection to ${to} (${backoffMs}ms backoff)`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
-      this.retryBudget.consumeBudget(to);
-      reconnectPromise = sleep.then(() => {
-        if (!canProceedWithConnection()) {
-          throw new Error("transport state is no longer open");
+    return tracing_default.startActiveSpan(
+      "connect",
+      {
+        attributes: {
+          component: "river",
+          "span.kind": "client"
+        },
+        kind: import_api2.SpanKind.CLIENT
+      },
+      async (span) => {
+        try {
+          await this.connectAttempt(to);
+        } catch (e) {
+          if (e instanceof Error) {
+            span.recordException(e);
+          } else {
+            span.recordException(coerceErrorString(e));
+          }
+          span.setStatus({ code: import_api2.SpanStatusCode.ERROR });
+        } finally {
+          span.end();
         }
-      }).then(() => this.createNewOutgoingConnection(to)).then((conn) => {
-        if (!canProceedWithConnection()) {
-          log?.info(
-            `transport state is no longer open, closing pre-handshake connection to ${to}`,
-            {
-              clientId: this.clientId,
-              connectedTo: to,
-              connId: conn.debugId
+      }
+    );
+  }
+  async connectAttempt(to, attempt = 0) {
+    const retry = await tracing_default.startActiveSpan(
+      "connect",
+      {
+        attributes: {
+          component: "river",
+          "river.attempt": attempt,
+          "span.kind": "client"
+        },
+        kind: import_api2.SpanKind.CLIENT
+      },
+      async (span) => {
+        try {
+          const canProceedWithConnection = () => this.state === "open";
+          if (!canProceedWithConnection()) {
+            log?.info(
+              `transport state is no longer open, cancelling attempt to connect to ${to}`,
+              { clientId: this.clientId, connectedTo: to }
+            );
+            return false;
+          }
+          let reconnectPromise = this.inflightConnectionPromises.get(to);
+          if (!reconnectPromise) {
+            const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
+            if (!this.retryBudget.hasBudget(to)) {
+              const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
+              log?.warn(errMsg, { clientId: this.clientId, connectedTo: to });
+              this.protocolError(ProtocolError.RetriesExceeded, errMsg);
+              return false;
             }
-          );
-          conn.close();
-          throw new Error("transport state is no longer open");
-        }
-        return this.sendHandshake(to, conn).then((ok) => {
-          if (!ok) {
-            conn.close();
-            throw new Error("failed to send handshake");
+            let sleep = Promise.resolve();
+            const backoffMs = this.retryBudget.getBackoffMs(to);
+            if (backoffMs > 0) {
+              sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
+            }
+            log?.info(
+              `attempting connection to ${to} (${backoffMs}ms backoff)`,
+              {
+                clientId: this.clientId,
+                connectedTo: to
+              }
+            );
+            this.retryBudget.consumeBudget(to);
+            reconnectPromise = sleep.then(() => {
+              if (!canProceedWithConnection()) {
+                throw new Error("transport state is no longer open");
+              }
+            }).then(() => this.createNewOutgoingConnection(to)).then((conn) => {
+              if (!canProceedWithConnection()) {
+                log?.info(
+                  `transport state is no longer open, closing pre-handshake connection to ${to}`,
+                  {
+                    clientId: this.clientId,
+                    connectedTo: to,
+                    connId: conn.debugId
+                  }
+                );
+                conn.close();
+                throw new Error("transport state is no longer open");
+              }
+              return this.sendHandshake(to, conn).then((ok) => {
+                if (!ok) {
+                  conn.close();
+                  throw new Error("failed to send handshake");
+                }
+                return conn;
+              });
+            });
+            this.inflightConnectionPromises.set(to, reconnectPromise);
+          } else {
+            log?.info(
+              `attempting connection to ${to} (reusing previous attempt)`,
+              {
+                clientId: this.clientId,
+                connectedTo: to
+              }
+            );
           }
-          return conn;
-        });
-      });
-      this.inflightConnectionPromises.set(to, reconnectPromise);
-    } else {
-      log?.info(`attempting connection to ${to} (reusing previous attempt)`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
-    }
-    try {
-      await reconnectPromise;
-    } catch (error) {
-      this.inflightConnectionPromises.delete(to);
-      const errStr = coerceErrorString(error);
-      if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
-        log?.warn(`connection to ${to} failed (${errStr})`, {
-          clientId: this.clientId,
-          connectedTo: to
-        });
-      } else {
-        log?.warn(`connection to ${to} failed (${errStr}), retrying`, {
-          clientId: this.clientId,
-          connectedTo: to
-        });
-        return this.connect(to);
+          try {
+            await reconnectPromise;
+          } catch (error) {
+            this.inflightConnectionPromises.delete(to);
+            const errStr = coerceErrorString(error);
+            if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
+              log?.warn(`connection to ${to} failed (${errStr})`, {
+                clientId: this.clientId,
+                connectedTo: to
+              });
+            } else {
+              log?.warn(`connection to ${to} failed (${errStr}), retrying`, {
+                clientId: this.clientId,
+                connectedTo: to
+              });
+              return true;
+            }
+          }
+        } catch (e) {
+          if (e instanceof Error) {
+            span.recordException(e);
+          } else {
+            span.recordException(coerceErrorString(e));
+          }
+          span.setStatus({ code: import_api2.SpanStatusCode.ERROR });
+        } finally {
+          span.end();
+        }
+        return false;
       }
+    );
+    if (retry) {
+      return this.connectAttempt(to, attempt + 1);
     }
   }
   deleteSession(session) {
@@ -1111,6 +1184,8 @@ var ClientTransport = class extends Transport {
     super.deleteSession(session);
   }
   async sendHandshake(to, conn) {
+    const tracing = { traceparent: "", tracestate: "" };
+    import_api2.propagation.inject(import_api2.context.active(), tracing);
     let metadata;
     if (this.options.handshake) {
       metadata = await this.options.handshake.get();
@@ -1131,7 +1206,8 @@ var ClientTransport = class extends Transport {
       this.clientId,
       to,
       session.id,
-      metadata
+      metadata,
+      tracing
     );
     log?.debug(`sending handshake request to ${to}`, {
       clientId: this.clientId,