@replit/river 0.22.0 → 0.23.1

package/dist/router/index.cjs

@@ -35,14 +35,18 @@ module.exports = __toCommonJS(router_exports);
 
 // router/services.ts
 var import_typebox = require("@sinclair/typebox");
-function serializeSchema(services) {
-  return Object.entries(services).reduce(
-    (acc, [name, value]) => {
-      acc[name] = value.serialize();
-      return acc;
-    },
-    {}
-  );
+function serializeSchema(services, handshakeSchema) {
+  const serializedServiceObject = Object.entries(services).reduce((acc, [name, value]) => {
+    acc[name] = value.serialize();
+    return acc;
+  }, {});
+  const schema = {
+    services: serializedServiceObject
+  };
+  if (handshakeSchema) {
+    schema.handshakeSchema = import_typebox.Type.Strict(handshakeSchema);
+  }
+  return schema;
 }
 var ServiceSchema = class _ServiceSchema {
   /**
@@ -706,7 +710,7 @@ var log = void 0;
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.22.0";
+var version = "0.23.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -782,7 +786,10 @@ var defaultClientOptions = {
   connectOnInvoke: true,
   eagerlyConnect: true
 };
-var createClient = (transport, serverId, providedClientOptions = {}) => {
+function createClient(transport, serverId, providedClientOptions = {}) {
+  if (providedClientOptions.handshakeOptions) {
+    transport.extendHandshake(providedClientOptions.handshakeOptions);
+  }
   const options = { ...defaultClientOptions, ...providedClientOptions };
   if (options.eagerlyConnect) {
     void transport.connect(serverId);
@@ -818,7 +825,7 @@ var createClient = (transport, serverId, providedClientOptions = {}) => {
       throw new Error(`invalid river call, unknown procedure type ${procType}`);
     }
   }, []);
-};
+}
 function createSessionDisconnectHandler(from, cb) {
   return (evt) => {
     if (evt.status === "disconnect" && evt.session.to === from) {
@@ -1097,7 +1104,7 @@ var RiverServer = class {
   // map of client to their open streams by streamId
   clientStreams;
   disconnectedSessions;
-  constructor(transport, services, extendedContext) {
+  constructor(transport, services, handshakeOptions, extendedContext) {
     const instances = {};
     this.services = instances;
     this.contextMap = /* @__PURE__ */ new Map();
@@ -1109,6 +1116,9 @@ var RiverServer = class {
         state: instance.state
       });
     }
+    if (handshakeOptions) {
+      transport.extendHandshake(handshakeOptions);
+    }
     this.transport = transport;
     this.disconnectedSessions = /* @__PURE__ */ new Set();
     this.streamMap = /* @__PURE__ */ new Map();
@@ -1265,7 +1275,8 @@ var RiverServer = class {
         })
       );
     };
-    if (session.metadata === void 0) {
+    const sessionMeta = this.transport.sessionHandshakeMetadata.get(session);
+    if (!sessionMeta) {
       log?.error(`session doesn't have handshake metadata`, {
         ...session.loggingMetadata,
         tags: ["invariant-violation"]
@@ -1279,8 +1290,8 @@ var RiverServer = class {
       to: message.to,
       from: message.from,
       streamId: message.streamId,
-      // we've already validated that the session has handshake metadata
-      session
+      session,
+      metadata: sessionMeta
     };
     switch (procedure.type) {
       case "rpc":
@@ -1500,8 +1511,13 @@ var RiverServer = class {
     this.streamMap.delete(id);
   };
 };
-function createServer(transport, services, extendedContext) {
-  return new RiverServer(transport, services, extendedContext);
+function createServer(transport, services, providedServerOptions) {
+  return new RiverServer(
+    transport,
+    services,
+    providedServerOptions?.handshakeOptions,
+    providedServerOptions?.extendedContext
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {