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

package/dist/router/index.cjs

@@ -34,7 +34,6 @@ __export(router_exports, {
   createClientHandshakeOptions: () => createClientHandshakeOptions,
   createServer: () => createServer,
   createServerHandshakeOptions: () => createServerHandshakeOptions,
-  diffServerSchema: () => diffServerSchema,
   serializeSchema: () => serializeSchema
 });
 module.exports = __toCommonJS(router_exports);
@@ -241,468 +240,6 @@ var ServiceScaffold = class {
   }
 };
 
-// router/diff.ts
-function diffServerSchema(oldServer, newServer, options) {
-  const allServices = /* @__PURE__ */ new Set([
-    ...Object.keys(oldServer.services),
-    ...Object.keys(newServer.services)
-  ]);
-  const breakages = {};
-  for (const serviceName of allServices) {
-    const oldService = oldServer.services[serviceName];
-    const newService = newServer.services[serviceName];
-    const breakage = diffService(oldService, newService, options);
-    if (breakage) {
-      breakages[serviceName] = breakage;
-    }
-  }
-  if (Object.keys(breakages).length) {
-    return { serviceBreakages: breakages };
-  }
-  return null;
-}
-function diffService(oldService, newService, options) {
-  if (!newService) {
-    return options?.allowServiceRemoval ? null : { reason: "removed" };
-  }
-  if (!oldService) {
-    return null;
-  }
-  const allProcedures = /* @__PURE__ */ new Set([
-    ...Object.keys(oldService.procedures),
-    ...Object.keys(newService.procedures)
-  ]);
-  const breakages = {};
-  for (const procedureName of allProcedures) {
-    const aProcedure = oldService.procedures[procedureName];
-    const bProcedure = newService.procedures[procedureName];
-    const breakage = diffProcedure(aProcedure, bProcedure, options);
-    if (breakage) {
-      breakages[procedureName] = breakage;
-    }
-  }
-  if (Object.keys(breakages).length) {
-    return { reason: "modified", procedureBreakages: breakages };
-  }
-  return null;
-}
-function diffProcedure(oldProcedure, newProcedure, options) {
-  if (!newProcedure) {
-    return options?.allowProcedureRemoval ? null : { reason: "removed" };
-  }
-  if (!oldProcedure) {
-    return null;
-  }
-  if (oldProcedure.type !== newProcedure.type) {
-    return {
-      reason: "type-changed",
-      oldType: oldProcedure.type,
-      newType: newProcedure.type
-    };
-  }
-  const inputBreakage = diffProcedureField(
-    oldProcedure.input,
-    newProcedure.input,
-    "client"
-  );
-  const initBreakage = diffProcedureField(
-    oldProcedure.init,
-    newProcedure.init,
-    "client"
-  );
-  const outputBreakage = diffProcedureField(
-    oldProcedure.output,
-    newProcedure.output,
-    "server"
-  );
-  if (inputBreakage ?? initBreakage ?? outputBreakage) {
-    const result = {
-      reason: "modified"
-    };
-    if (inputBreakage) {
-      result.input = inputBreakage;
-    }
-    if (initBreakage) {
-      result.init = initBreakage;
-    }
-    if (outputBreakage) {
-      result.output = outputBreakage;
-    }
-    return result;
-  }
-  return null;
-}
-function diffProcedureField(oldSchema, newSchema, origin) {
-  if (!oldSchema && !newSchema) {
-    return null;
-  }
-  const diffBreakage = diffRequired(oldSchema, newSchema, origin, false, false);
-  if (diffBreakage) {
-    return diffBreakage;
-  }
-  if (!oldSchema || !newSchema) {
-    throw new Error("Appease typescript, this should never happen");
-  }
-  return diffJSONSchema(oldSchema, newSchema, origin);
-}
-function diffRequired(oldSchema, newSchema, origin, oldRequired, newRequired) {
-  if (!newSchema && !oldSchema) {
-    throw new Error("Both old and new schema are undefined");
-  }
-  if (!newSchema) {
-    if (!oldRequired && origin == "server") {
-      return null;
-    }
-    return { reason: "removed-required" };
-  }
-  if (!oldSchema) {
-    if (newRequired && origin === "client") {
-      return { reason: "new-required" };
-    }
-    return null;
-  }
-  if (origin === "client" && !oldRequired && newRequired) {
-    return { reason: "new-required" };
-  }
-  if (origin === "server" && oldRequired && !newRequired) {
-    return { reason: "removed-required" };
-  }
-  return null;
-}
-function diffJSONSchema(oldSchema, newSchema, origin) {
-  if (oldSchema.type !== newSchema.type) {
-    return {
-      reason: "type-changed",
-      oldType: getReportingType(oldSchema),
-      newType: getReportingType(newSchema)
-    };
-  }
-  if (getReportingType(oldSchema) !== getReportingType(newSchema)) {
-    return {
-      reason: "type-changed",
-      oldType: getReportingType(oldSchema),
-      newType: getReportingType(newSchema)
-    };
-  }
-  if ("const" in oldSchema && "const" in newSchema && oldSchema.const !== newSchema.const) {
-    return {
-      reason: "type-changed",
-      oldType: `${getReportingType(oldSchema)}-const-${oldSchema.const}`,
-      newType: `${getReportingType(newSchema)}-const-${newSchema.const}`
-    };
-  }
-  if ("const" in oldSchema && !("const" in newSchema) && origin === "server") {
-    return {
-      reason: "type-changed",
-      oldType: `${getReportingType(oldSchema)}-const-${oldSchema.const}`,
-      newType: getReportingType(newSchema)
-    };
-  }
-  if ("const" in newSchema && !("const" in oldSchema) && origin === "client") {
-    return {
-      reason: "type-changed",
-      oldType: getReportingType(oldSchema),
-      newType: `${getReportingType(newSchema)}-const-${newSchema.const}`
-    };
-  }
-  const breakages = {};
-  if ("$ref" in newSchema) {
-    if (newSchema.$ref !== oldSchema.$ref) {
-      return {
-        reason: "type-changed",
-        oldType: getReportingType(oldSchema),
-        newType: getReportingType(newSchema)
-      };
-    }
-  } else if ("not" in newSchema) {
-    const notBreakage = diffJSONSchema(
-      oldSchema.not,
-      newSchema.not,
-      origin
-    );
-    if (notBreakage) {
-      breakages.not = notBreakage;
-    }
-  } else if ("anyOf" in newSchema) {
-    const oldAnyOfStringified = oldSchema.anyOf.map((el) => JSON.stringify(el)).sort();
-    const newAnyOfStringified = newSchema.anyOf.map((el) => JSON.stringify(el)).sort();
-    const anyOfBreakages = {};
-    for (let i = 0; i < oldAnyOfStringified.length; i++) {
-      if (newAnyOfStringified.includes(oldAnyOfStringified[i])) {
-        continue;
-      }
-      if (!newAnyOfStringified[i]) {
-        if (origin === "server") {
-          continue;
-        }
-        anyOfBreakages[`old-${i}`] = { reason: "removed-required" };
-      } else {
-        const breakage = diffJSONSchema(
-          JSON.parse(oldAnyOfStringified[i]),
-          JSON.parse(newAnyOfStringified[i]),
-          origin
-        );
-        if (breakage) {
-          anyOfBreakages[`old-${i}`] = breakage;
-        }
-      }
-    }
-    for (let i = 0; i < newAnyOfStringified.length; i++) {
-      if (oldAnyOfStringified.includes(newAnyOfStringified[i])) {
-        continue;
-      }
-      if (!oldAnyOfStringified[i]) {
-        if (origin === "client") {
-          continue;
-        }
-        anyOfBreakages[`new-${i}`] = { reason: "new-required" };
-      } else {
-        const breakage = diffJSONSchema(
-          JSON.parse(oldAnyOfStringified[i]),
-          JSON.parse(newAnyOfStringified[i]),
-          origin
-        );
-        if (breakage) {
-          anyOfBreakages[`new-${i}`] = breakage;
-        }
-      }
-    }
-    if (Object.keys(anyOfBreakages).length > 0) {
-      breakages.anyOf = {
-        reason: "field-breakage",
-        fieldBreakages: anyOfBreakages
-      };
-    }
-  } else if ("oneOf" in newSchema) {
-    throw new Error("oneOf is not supported, typebox does not emit it");
-  } else if ("allOf" in newSchema) {
-    if (newSchema.allOf.length !== oldSchema.allOf.length) {
-      breakages.allOf = {
-        reason: "type-changed",
-        oldType: `${oldSchema.allOf}`,
-        newType: `${newSchema.allOf}`
-      };
-    } else {
-      for (let i = 0; i < newSchema.allOf.length; i++) {
-        const breakage = diffJSONSchema(
-          oldSchema.allOf[i],
-          newSchema.allOf[i],
-          origin
-        );
-        if (breakage) {
-          breakages.allOf = breakage;
-          break;
-        }
-      }
-    }
-  } else if (newSchema.type === "array") {
-    const itemsBreakages = diffJSONSchema(
-      oldSchema.items,
-      newSchema.items,
-      origin
-    );
-    if (itemsBreakages) {
-      breakages.items = itemsBreakages;
-    }
-    if (oldSchema.minItems < newSchema.minItems) {
-      if (origin === "client") {
-        breakages.minItems = {
-          reason: "type-changed",
-          oldType: `${oldSchema.minItems}`,
-          newType: `${newSchema.minItems}`
-        };
-      }
-    } else if (oldSchema.minItems > newSchema.minItems) {
-      if (origin === "server") {
-        breakages.minItems = {
-          reason: "type-changed",
-          oldType: `${oldSchema.minItems}`,
-          newType: `${newSchema.minItems}`
-        };
-      }
-    }
-    if (oldSchema.maxItems < newSchema.maxItems) {
-      if (origin === "server") {
-        breakages.maxItems = {
-          reason: "type-changed",
-          oldType: `${oldSchema.maxItems}`,
-          newType: `${newSchema.maxItems}`
-        };
-      }
-    } else if (oldSchema.maxItems > newSchema.maxItems) {
-      if (origin === "client") {
-        breakages.maxItems = {
-          reason: "type-changed",
-          oldType: `${oldSchema.maxItems}`,
-          newType: `${newSchema.maxItems}`
-        };
-      }
-    }
-    if (!oldSchema.uniqueItems && newSchema.uniqueItems && origin === "client") {
-      breakages.uniqueItems = {
-        reason: "type-changed",
-        oldType: `${!!oldSchema.uniqueItems}`,
-        newType: `${!!newSchema.uniqueItems}`
-      };
-    }
-    if ("contains" in newSchema !== "contains" in oldSchema) {
-      if ("contains" in newSchema && !("contains" in oldSchema) && origin === "client") {
-        breakages.contains = {
-          reason: "type-changed",
-          oldType: "no-contains",
-          newType: "contains"
-        };
-      }
-    } else if ("contains" in newSchema) {
-      const containsBreakage = diffJSONSchema(
-        oldSchema.contains,
-        newSchema.contains,
-        origin
-      );
-      if (containsBreakage) {
-        breakages.contains = containsBreakage;
-      }
-    }
-    if (oldSchema.minContains < newSchema.minContains) {
-      if (origin === "client") {
-        breakages.minContains = {
-          reason: "type-changed",
-          oldType: `${oldSchema.minContains}`,
-          newType: `${newSchema.minContains}`
-        };
-      }
-    } else if (oldSchema.minContains > newSchema.minContains) {
-      if (origin === "server") {
-        breakages.minContains = {
-          reason: "type-changed",
-          oldType: `${oldSchema.minContains}`,
-          newType: `${newSchema.minContains}`
-        };
-      }
-    }
-    if (oldSchema.maxContains < newSchema.maxContains) {
-      if (origin === "server") {
-        breakages.maxContains = {
-          reason: "type-changed",
-          oldType: `${oldSchema.maxContains}`,
-          newType: `${newSchema.maxContains}`
-        };
-      }
-    } else if (oldSchema.maxContains > newSchema.maxContains) {
-      if (origin === "client") {
-        breakages.maxContains = {
-          reason: "type-changed",
-          oldType: `${oldSchema.maxContains}`,
-          newType: `${newSchema.maxContains}`
-        };
-      }
-    }
-  } else if (newSchema.type === "object") {
-    if ("properties" in newSchema !== "properties" in oldSchema) {
-      return {
-        reason: "type-changed",
-        oldType: "properties" in oldSchema ? "probably-object" : "probably-record",
-        newType: "properties" in newSchema ? "probably-object" : "probably-record"
-      };
-    }
-    if ("properties" in newSchema) {
-      const propertiesBreakages = diffObjectProperties(
-        oldSchema.properties,
-        newSchema.properties,
-        origin,
-        oldSchema.required,
-        newSchema.required
-      );
-      if (Object.keys(propertiesBreakages).length) {
-        breakages.properties = {
-          reason: "field-breakage",
-          fieldBreakages: propertiesBreakages
-        };
-      }
-    }
-    if ("patternProperties" in newSchema) {
-      const patternPropertiesBreakages = diffObjectProperties(
-        oldSchema.patternProperties,
-        newSchema.patternProperties,
-        origin,
-        oldSchema.required,
-        newSchema.required
-      );
-      if (Object.keys(patternPropertiesBreakages).length) {
-        breakages.patternProperties = {
-          reason: "field-breakage",
-          fieldBreakages: patternPropertiesBreakages
-        };
-      }
-    }
-    if ("additionalProperties" in newSchema || "additionalProperties" in oldSchema) {
-      throw new Error("additionalProperties is not supported");
-    }
-    if ("minProperties" in newSchema || "minProperties" in oldSchema) {
-      throw new Error("minProperties is not supported");
-    }
-    if ("maxProperties" in newSchema || "maxProperties" in oldSchema) {
-      throw new Error("maxProperties is not supported");
-    }
-  }
-  if (Object.keys(breakages).length) {
-    return {
-      reason: "field-breakage",
-      fieldBreakages: breakages
-    };
-  }
-  return null;
-}
-function diffObjectProperties(oldProperties, newProperties, origin, oldRequiredProperties = [], newRequiredProperties = []) {
-  const allProperties = /* @__PURE__ */ new Set([
-    ...Object.keys(oldProperties),
-    ...Object.keys(newProperties)
-  ]);
-  const breakages = {};
-  for (const propertyName of allProperties) {
-    const requiredBreakage = diffRequired(
-      oldProperties[propertyName],
-      newProperties[propertyName],
-      origin,
-      oldRequiredProperties.includes(propertyName),
-      newRequiredProperties.includes(propertyName)
-    );
-    if (requiredBreakage) {
-      breakages[propertyName] = requiredBreakage;
-    } else if (oldProperties[propertyName] && newProperties[propertyName]) {
-      const propertyBreakage = diffJSONSchema(
-        oldProperties[propertyName],
-        newProperties[propertyName],
-        origin
-      );
-      if (propertyBreakage) {
-        breakages[propertyName] = propertyBreakage;
-      }
-    }
-  }
-  return breakages;
-}
-function getReportingType(schema) {
-  if ("not" in schema) {
-    return "not";
-  }
-  if ("anyOf" in schema) {
-    return "anyOf";
-  }
-  if ("allOf" in schema) {
-    return "allOf";
-  }
-  if ("$ref" in schema) {
-    return "$ref";
-  }
-  if (schema.type && typeof schema.type === "string") {
-    return schema.type;
-  }
-  throw new Error(
-    "Subschema not supported, probably a conditional subschema. Check logs."
-  );
-}
-
 // router/result.ts
 var import_typebox2 = require("@sinclair/typebox");
 var ErrResultSchema = (t) => import_typebox2.Type.Object({
@@ -1109,7 +646,15 @@ var Procedure = {
 
 // transport/message.ts
 var import_typebox4 = require("@sinclair/typebox");
+
+// transport/id.ts
 var import_nanoid = require("nanoid");
+var alphabet = (0, import_nanoid.customAlphabet)(
+  "1234567890abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVXYZ"
+);
+var generateId = () => alphabet(12);
+
+// transport/message.ts
 var TransportMessageSchema = (t) => import_typebox4.Type.Object({
   id: import_typebox4.Type.String(),
   from: import_typebox4.Type.String(),
@@ -1143,18 +688,29 @@ var ControlMessageHandshakeRequestSchema = import_typebox4.Type.Object({
    * used by the server to know whether this is a new or a reestablished connection, and whether it
    * is compatible with what it already has.
    */
-  expectedSessionState: import_typebox4.Type.Optional(
-    import_typebox4.Type.Object({
-      /**
-       * reconnect is set to true if the client explicitly wants to reestablish an existing
-       * connection.
-       */
-      reconnect: import_typebox4.Type.Boolean(),
-      nextExpectedSeq: import_typebox4.Type.Integer()
-    })
-  ),
+  expectedSessionState: import_typebox4.Type.Object({
+    // what the client expects the server to send next
+    nextExpectedSeq: import_typebox4.Type.Integer(),
+    // TODO: remove optional once we know all servers
+    // are nextSentSeq here
+    // what the server expects the client to send next
+    nextSentSeq: import_typebox4.Type.Optional(import_typebox4.Type.Integer())
+  }),
   metadata: import_typebox4.Type.Optional(import_typebox4.Type.Unknown())
 });
+var HandshakeErrorRetriableResponseCodes = import_typebox4.Type.Union([
+  import_typebox4.Type.Literal("SESSION_STATE_MISMATCH")
+]);
+var HandshakeErrorFatalResponseCodes = import_typebox4.Type.Union([
+  import_typebox4.Type.Literal("MALFORMED_HANDSHAKE_META"),
+  import_typebox4.Type.Literal("MALFORMED_HANDSHAKE"),
+  import_typebox4.Type.Literal("PROTOCOL_VERSION_MISMATCH"),
+  import_typebox4.Type.Literal("REJECTED_BY_CUSTOM_HANDLER")
+]);
+var HandshakeErrorResponseCodes = import_typebox4.Type.Union([
+  HandshakeErrorRetriableResponseCodes,
+  HandshakeErrorFatalResponseCodes
+]);
 var ControlMessageHandshakeResponseSchema = import_typebox4.Type.Object({
   type: import_typebox4.Type.Literal("HANDSHAKE_RESP"),
   status: import_typebox4.Type.Union([
@@ -1164,7 +720,10 @@ var ControlMessageHandshakeResponseSchema = import_typebox4.Type.Object({
     }),
     import_typebox4.Type.Object({
       ok: import_typebox4.Type.Literal(false),
-      reason: import_typebox4.Type.String()
+      reason: import_typebox4.Type.String(),
+      // TODO: remove optional once we know all servers
+      // are sending code here
+      code: import_typebox4.Type.Optional(HandshakeErrorResponseCodes)
     })
   ])
 });
@@ -1177,6 +736,31 @@ var ControlMessagePayloadSchema = import_typebox4.Type.Union([
 var OpaqueTransportMessageSchema = TransportMessageSchema(
   import_typebox4.Type.Unknown()
 );
+function closeStreamMessage(streamId) {
+  return {
+    streamId,
+    controlFlags: 8 /* StreamClosedBit */,
+    payload: {
+      type: "CLOSE"
+    }
+  };
+}
+function requestCloseStreamMessage(streamId) {
+  return {
+    streamId,
+    controlFlags: 16 /* StreamCloseRequestBit */,
+    payload: {
+      type: "CLOSE"
+    }
+  };
+}
+function abortMessage(streamId, payload) {
+  return {
+    streamId,
+    controlFlags: 4 /* StreamAbortBit */,
+    payload
+  };
+}
 function isStreamOpen(controlFlag) {
   return (
     /* eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison */
@@ -1202,14 +786,11 @@ function isStreamAbort(controlFlag) {
   );
 }
 
-// router/client.ts
-var import_nanoid2 = require("nanoid");
-
 // tracing/index.ts
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.200.0-rc.2";
+var version = "0.200.0-rc.4";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -1305,7 +886,7 @@ function createClient(transport, serverId, providedClientOptions = {}) {
   }
   const clientOptions = { ...defaultClientOptions, ...providedClientOptions };
   if (clientOptions.eagerlyConnect) {
-    void transport.connect(serverId);
+    transport.connect(serverId);
   }
   return _createRecursiveProxy((opts) => {
     const [serviceName, procName, procMethod] = [...opts.path];
@@ -1315,8 +896,8 @@ function createClient(transport, serverId, providedClientOptions = {}) {
       );
     }
     const [init, callOptions] = opts.args;
-    if (clientOptions.connectOnInvoke && !transport.connections.has(serverId)) {
-      void transport.connect(serverId);
+    if (clientOptions.connectOnInvoke && !transport.sessions.has(serverId)) {
+      transport.connect(serverId);
     }
     if (procMethod !== "rpc" && procMethod !== "subscribe" && procMethod !== "stream" && procMethod !== "upload") {
       throw new Error(
@@ -1336,7 +917,7 @@ function createClient(transport, serverId, providedClientOptions = {}) {
 }
 function handleProc(procType, transport, serverId, init, serviceName, procedureName, abortSignal) {
   const procClosesWithInit = procType === "rpc" || procType === "subscription";
-  const streamId = (0, import_nanoid2.nanoid)();
+  const streamId = generateId();
   const { span, ctx } = createProcTelemetryInfo(
     transport,
     procType,
@@ -1356,14 +937,14 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   inputWriter.onClose(() => {
     span.addEvent("inputWriter closed");
     if (!procClosesWithInit && cleanClose) {
-      transport.sendCloseControl(serverId, streamId);
+      transport.send(serverId, closeStreamMessage(streamId));
     }
     if (outputReader.isClosed()) {
       cleanup();
     }
   });
   const outputReader = new ReadStreamImpl(() => {
-    transport.sendRequestCloseControl(serverId, streamId);
+    transport.send(serverId, requestCloseStreamMessage(streamId));
   });
   outputReader.onClose(() => {
     span.addEvent("outputReader closed");
@@ -1393,13 +974,15 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
       outputReader.triggerClose();
     }
     inputWriter.close();
-    transport.sendAbort(
+    transport.send(
       serverId,
-      streamId,
-      Err({
-        code: ABORT_CODE,
-        message: "Aborted by client"
-      })
+      abortMessage(
+        streamId,
+        Err({
+          code: ABORT_CODE,
+          message: "Aborted by client"
+        })
+      )
     );
   }
   function onMessage(msg) {
@@ -1638,7 +1221,9 @@ var RiverServer = class {
     controlFlags,
     initPayload,
     from,
-    tracingCtx
+    sessionId,
+    tracingCtx,
+    protocolVersion
   }) {
     this.openStreams.add(streamId);
     let cleanClose = true;
@@ -1701,7 +1286,7 @@ var RiverServer = class {
       if (isStreamCloseRequest(msg.controlFlags)) {
         outputWriter.triggerCloseRequest();
       }
-      if (isStreamAbort(msg.controlFlags)) {
+      if (isStreamAbortBackwardsCompat(msg.controlFlags, protocolVersion)) {
         let abortResult;
         if (import_value2.Value.Check(InputErrResultSchema, msg.payload)) {
           abortResult = msg.payload;
@@ -1768,7 +1353,7 @@ var RiverServer = class {
           })
         );
       }
-      if (isStreamClose(msg.controlFlags)) {
+      if (isStreamCloseBackwardsCompat(msg.controlFlags, protocolVersion)) {
         inputReader.triggerClose();
       }
     };
@@ -1787,25 +1372,37 @@ var RiverServer = class {
       });
       onFinishedCallbacks.length = 0;
     };
+    const procClosesWithResponse = procedure.type === "rpc" || procedure.type === "upload";
     const inputReader = new ReadStreamImpl(() => {
-      this.transport.sendRequestCloseControl(from, streamId);
+      this.transport.send(from, requestCloseStreamMessage(streamId));
     });
     inputReader.onClose(() => {
+      if (protocolVersion === "v1.1") {
+        if (!procClosesWithResponse && !outputWriter.isClosed()) {
+          outputWriter.close();
+        }
+      }
       if (outputWriter.isClosed()) {
         cleanup();
       }
     });
-    const procClosesWithResponse = procedure.type === "rpc" || procedure.type === "upload";
     const outputWriter = new WriteStreamImpl((response) => {
       this.transport.send(from, {
         streamId,
-        controlFlags: procClosesWithResponse ? 8 /* StreamClosedBit */ : 0,
+        controlFlags: procClosesWithResponse ? getStreamCloseBackwardsCompat(protocolVersion) : 0,
         payload: response
       });
     });
     outputWriter.onClose(() => {
       if (!procClosesWithResponse && cleanClose) {
-        this.transport.sendCloseControl(from, streamId);
+        const message = closeStreamMessage(streamId);
+        message.controlFlags = getStreamCloseBackwardsCompat(protocolVersion);
+        this.transport.send(from, closeStreamMessage(streamId));
+      }
+      if (protocolVersion === "v1.1") {
+        if (!inputReader.isClosed()) {
+          inputReader.triggerClose();
+        }
       }
       if (inputReader.isClosed()) {
         cleanup();
@@ -1822,7 +1419,7 @@ var RiverServer = class {
         })
       );
     };
-    if (isStreamClose(controlFlags)) {
+    if (isStreamCloseBackwardsCompat(controlFlags, protocolVersion)) {
       inputReader.triggerClose();
     } else if (procedure.type === "rpc" || procedure.type === "subscription") {
       this.log?.warn(`${procedure.type} sent an init without a stream close`, {
@@ -1833,6 +1430,7 @@ var RiverServer = class {
     const serviceContextWithTransportInfo = {
       ...this.getContext(service, serviceName),
       from,
+      sessionId,
       metadata: sessionMetadata,
       abortController: handlerAbortController,
       clientAbortSignal: clientAbortController.signal,
@@ -1988,7 +1586,9 @@ var RiverServer = class {
       );
       return null;
     }
-    const sessionMetadata = this.transport.sessionHandshakeMetadata.get(session);
+    const sessionMetadata = this.transport.sessionHandshakeMetadata.get(
+      session.to
+    );
     if (!sessionMetadata) {
       const errMessage = `session doesn't have handshake metadata`;
       this.log?.error(errMessage, {
@@ -2129,7 +1729,9 @@ var RiverServer = class {
       controlFlags: initMessage.controlFlags,
       tracingCtx: initMessage.tracing,
       initPayload: initMessage.payload,
-      from: initMessage.from
+      from: initMessage.from,
+      sessionId: session.id,
+      protocolVersion: session.protocolVersion
     };
   }
   abortStream(to, streamId, payload) {
@@ -2139,7 +1741,11 @@ var RiverServer = class {
       this.serverAbortedStreams.set(to, abortedForSession);
     }
     abortedForSession.add(streamId);
-    this.transport.sendAbort(to, streamId, payload);
+    this.transport.send(
+      to,
+      // TODO remove once clients migrate to v2
+      this.transport.sessions.get(to)?.protocolVersion === "v1.1" ? closeStreamMessage(streamId) : abortMessage(streamId, payload)
+    );
   }
 };
 var LRUSet = class {
@@ -2164,6 +1770,24 @@ var LRUSet = class {
     return this.items.has(item);
   }
 };
+function isStreamAbortBackwardsCompat(controlFlags, protocolVersion) {
+  if (protocolVersion === "v1.1") {
+    return false;
+  }
+  return isStreamAbort(controlFlags);
+}
+function isStreamCloseBackwardsCompat(controlFlags, protocolVersion) {
+  if (protocolVersion === "v1.1") {
+    return isStreamAbort(controlFlags);
+  }
+  return isStreamClose(controlFlags);
+}
+function getStreamCloseBackwardsCompat(protocolVersion) {
+  if (protocolVersion === "v1.1") {
+    return 4 /* StreamAbortBit */;
+  }
+  return 8 /* StreamClosedBit */;
+}
 function createServer(transport, services, providedServerOptions) {
   return new RiverServer(
     transport,
@@ -2197,7 +1821,6 @@ function createServerHandshakeOptions(schema, validate) {
   createClientHandshakeOptions,
   createServer,
   createServerHandshakeOptions,
-  diffServerSchema,
   serializeSchema
 });
 //# sourceMappingURL=index.cjs.map