@replit/river 0.21.0 → 0.22.0

package/dist/util/testHelpers.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // util/testHelpers.ts
@@ -25,6 +35,7 @@ __export(testHelpers_exports, {
   asClientSubscription: () => asClientSubscription,
   asClientUpload: () => asClientUpload,
   createDummyTransportMessage: () => createDummyTransportMessage,
+  createLocalWebSocketClient: () => createLocalWebSocketClient,
   createWebSocketServer: () => createWebSocketServer,
   getUnixSocketPath: () => getUnixSocketPath,
   iterNext: () => iterNext,
@@ -35,7 +46,7 @@ __export(testHelpers_exports, {
   waitForMessage: () => waitForMessage
 });
 module.exports = __toCommonJS(testHelpers_exports);
-var import_ws = require("ws");
+var import_ws = __toESM(require("ws"), 1);
 
 // node_modules/p-defer/index.js
 function pDefer() {
@@ -330,10 +341,41 @@ var RiverUncaughtSchema = import_typebox.Type.Object({
   ]),
   message: import_typebox.Type.String()
 });
+function Err(error) {
+  return {
+    ok: false,
+    payload: error
+  };
+}
 
 // logging/log.ts
 var log = void 0;
 
+// tracing/index.ts
+var import_api = require("@opentelemetry/api");
+
+// package.json
+var version = "0.22.0";
+
+// tracing/index.ts
+function createSessionTelemetryInfo(session, propagationCtx) {
+  const ctx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+  const span = tracer.startSpan(
+    `session ${session.id}`,
+    {
+      attributes: {
+        component: "river",
+        "river.session.id": session.id,
+        "river.session.to": session.to,
+        "river.session.from": session.from
+      }
+    },
+    ctx
+  );
+  return { span, ctx };
+}
+var tracer = import_api.trace.getTracer("river", version);
+
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
@@ -347,11 +389,13 @@ var import_nanoid2 = require("nanoid");
 
 // transport/session.ts
 var import_nanoid = require("nanoid");
+var import_api2 = require("@opentelemetry/api");
 var nanoid = (0, import_nanoid.customAlphabet)("1234567890abcdefghijklmnopqrstuvxyz", 6);
 var unsafeId = () => nanoid();
 var Session = class {
   codec;
   options;
+  telemetry;
   /**
    * The buffer of messages that have been sent but not yet acknowledged.
    */
@@ -398,7 +442,7 @@ var Session = class {
    * The interval for sending heartbeats.
    */
   heartbeat;
-  constructor(conn, from, to, options) {
+  constructor(conn, from, to, options, propagationCtx) {
     this.id = `session-${nanoid(12)}`;
     this.options = options;
     this.from = from;
@@ -410,13 +454,14 @@ var Session = class {
       () => this.sendHeartbeat(),
       options.heartbeatIntervalMs
     );
+    this.telemetry = createSessionTelemetryInfo(this, propagationCtx);
   }
   get loggingMetadata() {
     return {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id,
-      connId: this.connection?.debugId
+      connId: this.connection?.id
     };
   }
   /**
@@ -461,6 +506,7 @@ var Session = class {
           `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,
           this.loggingMetadata
         );
+        this.telemetry.span.addEvent("closing connection due to inactivity");
         this.closeStaleConnection();
       }
       return;
@@ -482,32 +528,38 @@ var Session = class {
   sendBufferedMessages(conn) {
     log?.info(`resending ${this.sendBuffer.length} buffered messages`, {
       ...this.loggingMetadata,
-      connId: conn.debugId
+      connId: conn.id
     });
     for (const msg of this.sendBuffer) {
       log?.debug(`resending msg`, {
         ...this.loggingMetadata,
         fullTransportMessage: msg,
-        connId: conn.debugId
+        connId: conn.id
       });
       const ok = conn.send(this.codec.toBuffer(msg));
       if (!ok) {
         const errMsg = `failed to send buffered message to ${this.to} (sus, this is a fresh connection)`;
+        conn.telemetry?.span.setStatus({
+          code: import_api2.SpanStatusCode.ERROR,
+          message: errMsg
+        });
         log?.error(errMsg, {
           ...this.loggingMetadata,
           fullTransportMessage: msg,
-          connId: conn.debugId
+          connId: conn.id,
+          tags: ["invariant-violation"]
         });
-        throw new Error(errMsg);
+        conn.close();
+        return;
       }
     }
   }
   updateBookkeeping(ack, seq) {
     if (seq + 1 < this.ack) {
-      log?.error(
-        `received stale seq ${seq} + 1 < ${this.ack}`,
-        this.loggingMetadata
-      );
+      log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
+        ...this.loggingMetadata,
+        tags: ["invariant-violation"]
+      });
       return;
     }
     this.sendBuffer = this.sendBuffer.filter((unacked) => unacked.seq >= ack);
@@ -579,7 +631,6 @@ var Session = class {
 
 // transport/transport.ts
 var import_value = require("@sinclair/typebox/value");
-var import_api = require("@opentelemetry/api");
 
 // codec/json.ts
 var encoder = new TextEncoder();
@@ -634,6 +685,7 @@ var NaiveJsonCodec = {
 };
 
 // transport/transport.ts
+var import_api3 = require("@opentelemetry/api");
 var defaultTransportOptions = {
   heartbeatIntervalMs: 1e3,
   heartbeatsUntilDead: 2,
@@ -656,6 +708,11 @@ var defaultServerTransportOptions = {
 };
 
 // util/testHelpers.ts
+function createLocalWebSocketClient(port) {
+  const sock = new import_ws.default(`ws://localhost:${port}`);
+  sock.binaryType = "arraybuffer";
+  return sock;
+}
 function createWebSocketServer(server) {
   return new import_ws.WebSocketServer({ server });
 }
@@ -711,13 +768,7 @@ async function waitForMessage(t, filter, rejectMismatch) {
 }
 function catchProcError(err) {
   const errorMsg = coerceErrorString(err);
-  return {
-    ok: false,
-    payload: {
-      code: UNCAUGHT_ERROR,
-      message: errorMsg
-    }
-  };
+  return Err({ code: UNCAUGHT_ERROR, message: errorMsg });
 }
 var testingSessionOptions = defaultTransportOptions;
 function dummySession() {
@@ -792,6 +843,7 @@ var getUnixSocketPath = () => {
   asClientSubscription,
   asClientUpload,
   createDummyTransportMessage,
+  createLocalWebSocketClient,
   createWebSocketServer,
   getUnixSocketPath,
   iterNext,