@replit/river 0.200.0-rc.0 → 0.200.0-rc.2

package/dist/transport/index.d.cts

@@ -1,5 +1,5 @@
-import { C as Connection, T as Transport, a1 as ServerTransportOptions, k as ServerHandshakeOptions, a as Session, M as ParsedMetadata, i as ProvidedServerTransportOptions } from '../services-34d97070.js';
-export { g as ClientTransport, h as ClientTransportOptions, a6 as EventHandler, a4 as EventMap, a5 as EventTypes, a7 as ProtocolError, a8 as ProtocolErrorType, a3 as TransportOptions, a2 as TransportStatus } from '../services-34d97070.js';
+import { C as Connection, T as Transport, a1 as ServerTransportOptions, k as ServerHandshakeOptions, a as Session, M as ParsedMetadata, i as ProvidedServerTransportOptions } from '../services-970f97bb.js';
+export { g as ClientTransport, h as ClientTransportOptions, a6 as EventHandler, a4 as EventMap, a5 as EventTypes, a7 as ProtocolError, a8 as ProtocolErrorType, a3 as TransportOptions, a2 as TransportStatus } from '../services-970f97bb.js';
 import { T as TransportClientId } from '../index-10ebd26a.js';
 export { O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, c as TransportMessage, f as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-10ebd26a.js';
 import '@sinclair/typebox';

package/dist/transport/index.d.ts

@@ -1,5 +1,5 @@
-import { C as Connection, T as Transport, a1 as ServerTransportOptions, k as ServerHandshakeOptions, a as Session, M as ParsedMetadata, i as ProvidedServerTransportOptions } from '../services-34d97070.js';
-export { g as ClientTransport, h as ClientTransportOptions, a6 as EventHandler, a4 as EventMap, a5 as EventTypes, a7 as ProtocolError, a8 as ProtocolErrorType, a3 as TransportOptions, a2 as TransportStatus } from '../services-34d97070.js';
+import { C as Connection, T as Transport, a1 as ServerTransportOptions, k as ServerHandshakeOptions, a as Session, M as ParsedMetadata, i as ProvidedServerTransportOptions } from '../services-970f97bb.js';
+export { g as ClientTransport, h as ClientTransportOptions, a6 as EventHandler, a4 as EventMap, a5 as EventTypes, a7 as ProtocolError, a8 as ProtocolErrorType, a3 as TransportOptions, a2 as TransportStatus } from '../services-970f97bb.js';
 import { T as TransportClientId } from '../index-10ebd26a.js';
 export { O as OpaqueTransportMessage, g as OpaqueTransportMessageSchema, c as TransportMessage, f as TransportMessageSchema, h as isStreamClose, i as isStreamOpen } from '../index-10ebd26a.js';
 import '@sinclair/typebox';

package/dist/transport/index.js

@@ -1,22 +1,22 @@
 import {
   ServerTransport
-} from "../chunk-6RKO3DDG.js";
+} from "../chunk-CZP4LK3F.js";
 import {
   ClientTransport
-} from "../chunk-TK7QHUFP.js";
+} from "../chunk-47TFNAY2.js";
 import {
   ProtocolError,
   Transport
-} from "../chunk-YUY37VAK.js";
+} from "../chunk-ONUXWVRC.js";
 import "../chunk-QMM35C3H.js";
 import {
   Connection,
   Session
-} from "../chunk-3FALN7ZG.js";
+} from "../chunk-NQWDT6GS.js";
 import {
   OpaqueTransportMessageSchema,
   TransportMessageSchema
-} from "../chunk-LK74ZG7M.js";
+} from "../chunk-S5RL45KH.js";
 import "../chunk-4PVU7J25.js";
 export {
   ClientTransport,

package/dist/util/testHelpers.cjs

@@ -50,47 +50,20 @@ __export(testHelpers_exports, {
 module.exports = __toCommonJS(testHelpers_exports);
 var import_ws = __toESM(require("ws"), 1);
 
-// router/procedures.ts
-var import_typebox = require("@sinclair/typebox");
-var INTERNAL_RIVER_ERROR_CODE = "INTERNAL_RIVER_ERROR";
-var UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
-var UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
-var INVALID_REQUEST_CODE = "INVALID_REQUEST";
-var ABORT_CODE = "ABORT";
-var OutputReaderErrorSchema = import_typebox.Type.Object({
-  code: import_typebox.Type.Union([
-    import_typebox.Type.Literal(INTERNAL_RIVER_ERROR_CODE),
-    import_typebox.Type.Literal(UNCAUGHT_ERROR_CODE),
-    import_typebox.Type.Literal(UNEXPECTED_DISCONNECT_CODE),
-    import_typebox.Type.Literal(INVALID_REQUEST_CODE),
-    import_typebox.Type.Literal(ABORT_CODE)
-  ]),
-  message: import_typebox.Type.String()
-});
-var InputReaderErrorSchema = import_typebox.Type.Object({
-  code: import_typebox.Type.Union([
-    import_typebox.Type.Literal(UNCAUGHT_ERROR_CODE),
-    import_typebox.Type.Literal(UNEXPECTED_DISCONNECT_CODE),
-    import_typebox.Type.Literal(INVALID_REQUEST_CODE),
-    import_typebox.Type.Literal(ABORT_CODE)
-  ]),
-  message: import_typebox.Type.String()
-});
-
 // router/result.ts
-var import_typebox2 = require("@sinclair/typebox");
-var AnyResultSchema = import_typebox2.Type.Union([
-  import_typebox2.Type.Object({
-    ok: import_typebox2.Type.Literal(false),
-    payload: import_typebox2.Type.Object({
-      code: import_typebox2.Type.String(),
-      message: import_typebox2.Type.String(),
-      extras: import_typebox2.Type.Optional(import_typebox2.Type.Unknown())
+var import_typebox = require("@sinclair/typebox");
+var AnyResultSchema = import_typebox.Type.Union([
+  import_typebox.Type.Object({
+    ok: import_typebox.Type.Literal(false),
+    payload: import_typebox.Type.Object({
+      code: import_typebox.Type.String(),
+      message: import_typebox.Type.String(),
+      extras: import_typebox.Type.Optional(import_typebox.Type.Unknown())
     })
   }),
-  import_typebox2.Type.Object({
-    ok: import_typebox2.Type.Literal(true),
-    payload: import_typebox2.Type.Unknown()
+  import_typebox.Type.Object({
+    ok: import_typebox.Type.Literal(true),
+    payload: import_typebox.Type.Unknown()
   })
 ]);
 function Ok(payload) {
@@ -106,32 +79,6 @@ function Err(error) {
   };
 }
 
-// tracing/index.ts
-var import_api = require("@opentelemetry/api");
-
-// package.json
-var version = "0.200.0-rc.0";
-
-// tracing/index.ts
-function createSessionTelemetryInfo(session, propagationCtx) {
-  const parentCtx = 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
-      }
-    },
-    parentCtx
-  );
-  const ctx = import_api.trace.setSpan(parentCtx, span);
-  return { span, ctx };
-}
-var tracer = import_api.trace.getTracer("river", version);
-
 // router/streams.ts
 var StreamDrainedError = {
   code: "STREAM_DRAINED",
@@ -322,26 +269,26 @@ var WriteStreamImpl = class {
    * Passed via constructor to pass on write requests
    */
   writeCb;
-  /**
-   * Passed via constructor to pass on close requests
-   */
-  closeCb;
   /**
    * Whether the stream is closed.
    */
   closed = false;
+  /**
+   * A list of listeners that will be called when the stream is closed.
+   */
+  onCloseListeners;
   /**
    * Whether the reader has requested to close the stream.
    */
   closeRequested = false;
   /**
-   * A list of listeners that will be called when the stream is closed.
+   * A list of listeners that will be called when a close request is triggered.
    */
-  onCloseListeners;
-  constructor(writeCb, closeCb) {
+  onCloseRequestListeners;
+  constructor(writeCb) {
     this.writeCb = writeCb;
-    this.closeCb = closeCb;
     this.onCloseListeners = /* @__PURE__ */ new Set();
+    this.onCloseRequestListeners = /* @__PURE__ */ new Set();
   }
   write(value) {
     if (this.isClosed()) {
@@ -349,12 +296,26 @@ var WriteStreamImpl = class {
     }
     this.writeCb(value);
   }
+  isClosed() {
+    return this.closed;
+  }
+  onClose(cb) {
+    if (this.isClosed()) {
+      cb();
+      return () => void 0;
+    }
+    this.onCloseListeners.add(cb);
+    return () => this.onCloseListeners.delete(cb);
+  }
   close() {
     if (this.isClosed()) {
       return;
     }
     this.closed = true;
-    this.closeCb();
+    this.onCloseListeners.forEach((cb) => cb());
+    this.onCloseListeners.clear();
+    this.onCloseRequestListeners.clear();
+    this.writeCb = () => void 0;
   }
   isCloseRequested() {
     return this.closeRequested;
@@ -363,11 +324,12 @@ var WriteStreamImpl = class {
     if (this.isClosed()) {
       throw new Error("Stream is already closed");
     }
-    this.onCloseListeners.add(cb);
-    return () => this.onCloseListeners.delete(cb);
-  }
-  isClosed() {
-    return this.closed;
+    if (this.isCloseRequested()) {
+      cb();
+      return () => void 0;
+    }
+    this.onCloseRequestListeners.add(cb);
+    return () => this.onCloseRequestListeners.delete(cb);
   }
   /**
    * @internal meant for use within river, not exposed as a public API
@@ -382,11 +344,64 @@ var WriteStreamImpl = class {
       throw new Error("Cannot trigger close request on closed stream");
     }
     this.closeRequested = true;
-    this.onCloseListeners.forEach((cb) => cb());
-    this.onCloseListeners.clear();
+    this.onCloseRequestListeners.forEach((cb) => cb());
+    this.onCloseRequestListeners.clear();
   }
 };
 
+// router/procedures.ts
+var import_typebox2 = require("@sinclair/typebox");
+var INTERNAL_RIVER_ERROR_CODE = "INTERNAL_RIVER_ERROR";
+var UNCAUGHT_ERROR_CODE = "UNCAUGHT_ERROR";
+var UNEXPECTED_DISCONNECT_CODE = "UNEXPECTED_DISCONNECT";
+var INVALID_REQUEST_CODE = "INVALID_REQUEST";
+var ABORT_CODE = "ABORT";
+var OutputReaderErrorSchema = import_typebox2.Type.Object({
+  code: import_typebox2.Type.Union([
+    import_typebox2.Type.Literal(INTERNAL_RIVER_ERROR_CODE),
+    import_typebox2.Type.Literal(UNCAUGHT_ERROR_CODE),
+    import_typebox2.Type.Literal(UNEXPECTED_DISCONNECT_CODE),
+    import_typebox2.Type.Literal(INVALID_REQUEST_CODE),
+    import_typebox2.Type.Literal(ABORT_CODE)
+  ]),
+  message: import_typebox2.Type.String()
+});
+var InputReaderErrorSchema = import_typebox2.Type.Object({
+  code: import_typebox2.Type.Union([
+    import_typebox2.Type.Literal(UNCAUGHT_ERROR_CODE),
+    import_typebox2.Type.Literal(UNEXPECTED_DISCONNECT_CODE),
+    import_typebox2.Type.Literal(INVALID_REQUEST_CODE),
+    import_typebox2.Type.Literal(ABORT_CODE)
+  ]),
+  message: import_typebox2.Type.String()
+});
+
+// tracing/index.ts
+var import_api = require("@opentelemetry/api");
+
+// package.json
+var version = "0.200.0-rc.2";
+
+// tracing/index.ts
+function createSessionTelemetryInfo(session, propagationCtx) {
+  const parentCtx = 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
+      }
+    },
+    parentCtx
+  );
+  const ctx = import_api.trace.setSpan(parentCtx, span);
+  return { span, ctx };
+}
+var tracer = import_api.trace.getTracer("river", version);
+
 // util/stringify.ts
 function coerceErrorString(err) {
   if (err instanceof Error) {
@@ -864,13 +879,13 @@ function createOutputPipe() {
   const writer = new WriteStreamImpl(
     (v) => {
       reader.pushValue(v);
-    },
-    () => {
-      void Promise.resolve().then(() => {
-        reader.triggerClose();
-      });
     }
   );
+  writer.onClose(() => {
+    void Promise.resolve().then(() => {
+      reader.triggerClose();
+    });
+  });
   return { reader, writer };
 }
 function createInputPipe() {
@@ -879,16 +894,14 @@ function createInputPipe() {
       writer.triggerCloseRequest();
     });
   });
-  const writer = new WriteStreamImpl(
-    (v) => {
-      reader.pushValue(Ok(v));
-    },
-    () => {
-      void Promise.resolve().then(() => {
-        reader.triggerClose();
-      });
-    }
-  );
+  const writer = new WriteStreamImpl((v) => {
+    reader.pushValue(Ok(v));
+  });
+  writer.onClose(() => {
+    void Promise.resolve().then(() => {
+      reader.triggerClose();
+    });
+  });
   return { reader, writer };
 }
 function asClientStream(state, proc, init, extendedContext, session = dummySession()) {