@rocicorp/zero 0.26.1 → 0.26.2-canary.4

package/out/zero-cache/src/types/shards.js.map

@@ -1 +1 @@
-{"version":3,"file":"shards.js","sources":["../../../../../zero-cache/src/types/shards.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\n\nexport type AppID = {\n  readonly appID: string;\n};\n\nexport type ShardID = AppID & {\n  readonly shardNum: number;\n};\n\nexport type ShardConfig = ShardID & {\n  readonly publications: readonly string[];\n};\n\n// Gets a ShardID from a ZeroConfig.\nexport function getShardID({\n  app,\n  shard,\n}: {\n  app: {id: string};\n  shard: {num: number};\n}): ShardID {\n  return {\n    appID: app.id,\n    shardNum: shard.num,\n  };\n}\n\n// Gets a ShardConfig from a ZeroConfig.\nexport function getShardConfig({\n  app,\n  shard,\n}: {\n  app: {id: string; publications: string[]};\n  shard: {num: number};\n}): ShardConfig {\n  return {\n    appID: app.id,\n    shardNum: shard.num,\n    publications: app.publications,\n  };\n}\n\n// Constrained by https://www.postgresql.org/docs/current/warm-standby.html#STREAMING-REPLICATION-SLOTS-MANIPULATION\nexport const ALLOWED_APP_ID_CHARACTERS = /^[a-z0-9_]+$/;\n\nexport const INVALID_APP_ID_MESSAGE =\n  'The App ID may only consist of lower-case letters, numbers, and the underscore character';\n\nexport function check(shard: ShardID): {appID: string; shardNum: number} {\n  const {appID, shardNum} = shard;\n  if (!ALLOWED_APP_ID_CHARACTERS.test(appID)) {\n    throw new Error(INVALID_APP_ID_MESSAGE);\n  }\n  assert(typeof shardNum === 'number', 'shardNum must be a number');\n  return {appID, shardNum};\n}\n\nexport function appSchema({appID}: AppID) {\n  check({appID, shardNum: 0});\n  return appID;\n}\n\nexport function upstreamSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}`;\n}\n\nexport function cdcSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}/cdc`;\n}\n\nexport function cvrSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}/cvr`;\n}\n"],"names":[],"mappings":";AAeO,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AACF,GAGY;AACV,SAAO;AAAA,IACL,OAAO,IAAI;AAAA,IACX,UAAU,MAAM;AAAA,EAAA;AAEpB;AAGO,SAAS,eAAe;AAAA,EAC7B;AAAA,EACA;AACF,GAGgB;AACd,SAAO;AAAA,IACL,OAAO,IAAI;AAAA,IACX,UAAU,MAAM;AAAA,IAChB,cAAc,IAAI;AAAA,EAAA;AAEtB;AAGO,MAAM,4BAA4B;AAElC,MAAM,yBACX;AAEK,SAAS,MAAM,OAAmD;AACvE,QAAM,EAAC,OAAO,SAAA,IAAY;AAC1B,MAAI,CAAC,0BAA0B,KAAK,KAAK,GAAG;AAC1C,UAAM,IAAI,MAAM,sBAAsB;AAAA,EACxC;AACA,SAAO,OAAO,aAAa,UAAU,2BAA2B;AAChE,SAAO,EAAC,OAAO,SAAA;AACjB;AAEO,SAAS,UAAU,EAAC,SAAe;AACxC,QAAM,EAAC,OAAO,UAAU,EAAA,CAAE;AAC1B,SAAO;AACT;AAEO,SAAS,eAAe,OAAgB;AAC7C,QAAM,EAAC,OAAO,aAAY,MAAM,KAAK;AACrC,SAAO,GAAG,KAAK,IAAI,QAAQ;AAC7B;AAEO,SAAS,UAAU,OAAgB;AACxC,QAAM,EAAC,OAAO,aAAY,MAAM,KAAK;AACrC,SAAO,GAAG,KAAK,IAAI,QAAQ;AAC7B;AAEO,SAAS,UAAU,OAAgB;AACxC,QAAM,EAAC,OAAO,aAAY,MAAM,KAAK;AACrC,SAAO,GAAG,KAAK,IAAI,QAAQ;AAC7B;"}
+{"version":3,"file":"shards.js","names":[],"sources":["../../../../../zero-cache/src/types/shards.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\n\nexport type AppID = {\n  readonly appID: string;\n};\n\nexport type ShardID = AppID & {\n  readonly shardNum: number;\n};\n\nexport type ShardConfig = ShardID & {\n  readonly publications: readonly string[];\n};\n\n// Gets a ShardID from a ZeroConfig.\nexport function getShardID({\n  app,\n  shard,\n}: {\n  app: {id: string};\n  shard: {num: number};\n}): ShardID {\n  return {\n    appID: app.id,\n    shardNum: shard.num,\n  };\n}\n\n// Gets a ShardConfig from a ZeroConfig.\nexport function getShardConfig({\n  app,\n  shard,\n}: {\n  app: {id: string; publications: string[]};\n  shard: {num: number};\n}): ShardConfig {\n  return {\n    appID: app.id,\n    shardNum: shard.num,\n    publications: app.publications,\n  };\n}\n\n// Constrained by https://www.postgresql.org/docs/current/warm-standby.html#STREAMING-REPLICATION-SLOTS-MANIPULATION\nexport const ALLOWED_APP_ID_CHARACTERS = /^[a-z0-9_]+$/;\n\nexport const INVALID_APP_ID_MESSAGE =\n  'The App ID may only consist of lower-case letters, numbers, and the underscore character';\n\nexport function check(shard: ShardID): {appID: string; shardNum: number} {\n  const {appID, shardNum} = shard;\n  if (!ALLOWED_APP_ID_CHARACTERS.test(appID)) {\n    throw new Error(INVALID_APP_ID_MESSAGE);\n  }\n  assert(typeof shardNum === 'number', 'shardNum must be a number');\n  return {appID, shardNum};\n}\n\nexport function appSchema({appID}: AppID) {\n  check({appID, shardNum: 0});\n  return appID;\n}\n\nexport function upstreamSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}`;\n}\n\nexport function cdcSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}/cdc`;\n}\n\nexport function cvrSchema(shard: ShardID) {\n  const {appID, shardNum} = check(shard);\n  return `${appID}_${shardNum}/cvr`;\n}\n"],"mappings":";;AAeA,SAAgB,WAAW,EACzB,KACA,SAIU;AACV,QAAO;EACL,OAAO,IAAI;EACX,UAAU,MAAM;EACjB;;AAIH,SAAgB,eAAe,EAC7B,KACA,SAIc;AACd,QAAO;EACL,OAAO,IAAI;EACX,UAAU,MAAM;EAChB,cAAc,IAAI;EACnB;;AAIH,IAAa,4BAA4B;AAEzC,IAAa,yBACX;AAEF,SAAgB,MAAM,OAAmD;CACvE,MAAM,EAAC,OAAO,aAAY;AAC1B,KAAI,CAAC,0BAA0B,KAAK,MAAM,CACxC,OAAM,IAAI,MAAM,uBAAuB;AAEzC,QAAO,OAAO,aAAa,UAAU,4BAA4B;AACjE,QAAO;EAAC;EAAO;EAAS;;AAG1B,SAAgB,UAAU,EAAC,SAAe;AACxC,OAAM;EAAC;EAAO,UAAU;EAAE,CAAC;AAC3B,QAAO;;AAGT,SAAgB,eAAe,OAAgB;CAC7C,MAAM,EAAC,OAAO,aAAY,MAAM,MAAM;AACtC,QAAO,GAAG,MAAM,GAAG;;AAGrB,SAAgB,UAAU,OAAgB;CACxC,MAAM,EAAC,OAAO,aAAY,MAAM,MAAM;AACtC,QAAO,GAAG,MAAM,GAAG,SAAS;;AAG9B,SAAgB,UAAU,OAAgB;CACxC,MAAM,EAAC,OAAO,aAAY,MAAM,MAAM;AACtC,QAAO,GAAG,MAAM,GAAG,SAAS"}

package/out/zero-cache/src/types/sql.js

@@ -1,15 +1,26 @@
+//#region ../zero-cache/src/types/sql.ts
+/**
+* Escapes the identifier with double quotes, as per:
+*
+* https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+*/
 function id(name) {
-  return '"' + name.replace(/"/g, '""') + '"';
+	return "\"" + name.replace(/"/g, "\"\"") + "\"";
 }
+/**
+* Escapes and comma-separates a list of identifiers.
+*/
 function idList(names) {
-  return Array.from(names, (name) => id(name)).join(",");
+	return Array.from(names, (name) => id(name)).join(",");
 }
+/**
+* Escapes a string literal with single quotes, as per:
+* https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+*/
 function lit(value) {
-  return "'" + value.replace(/'/g, "''") + "'";
+	return "'" + value.replace(/'/g, "''") + "'";
 }
-export {
-  id,
-  idList,
-  lit
-};
-//# sourceMappingURL=sql.js.map
+//#endregion
+export { id, idList, lit };
+
+//# sourceMappingURL=sql.js.map

package/out/zero-cache/src/types/sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql.js","sources":["../../../../../zero-cache/src/types/sql.ts"],"sourcesContent":["/**\n * Escapes the identifier with double quotes, as per:\n *\n * https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS\n */\nexport function id(name: string): string {\n  return '\"' + name.replace(/\"/g, '\"\"') + '\"'; //.replace(/\\./g, '\".\"') + '\"';\n}\n\n/**\n * Escapes and comma-separates a list of identifiers.\n */\nexport function idList(names: Iterable<string>): string {\n  return Array.from(names, name => id(name)).join(',');\n}\n\n/**\n * Escapes a string literal with single quotes, as per:\n * https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS\n */\nexport function lit(value: string): string {\n  return \"'\" + value.replace(/'/g, \"''\") + \"'\";\n}\n"],"names":[],"mappings":"AAKO,SAAS,GAAG,MAAsB;AACvC,SAAO,MAAM,KAAK,QAAQ,MAAM,IAAI,IAAI;AAC1C;AAKO,SAAS,OAAO,OAAiC;AACtD,SAAO,MAAM,KAAK,OAAO,CAAA,SAAQ,GAAG,IAAI,CAAC,EAAE,KAAK,GAAG;AACrD;AAMO,SAAS,IAAI,OAAuB;AACzC,SAAO,MAAM,MAAM,QAAQ,MAAM,IAAI,IAAI;AAC3C;"}
+{"version":3,"file":"sql.js","names":[],"sources":["../../../../../zero-cache/src/types/sql.ts"],"sourcesContent":["/**\n * Escapes the identifier with double quotes, as per:\n *\n * https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS\n */\nexport function id(name: string): string {\n  return '\"' + name.replace(/\"/g, '\"\"') + '\"'; //.replace(/\\./g, '\".\"') + '\"';\n}\n\n/**\n * Escapes and comma-separates a list of identifiers.\n */\nexport function idList(names: Iterable<string>): string {\n  return Array.from(names, name => id(name)).join(',');\n}\n\n/**\n * Escapes a string literal with single quotes, as per:\n * https://www.postgresql.org/docs/16/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS\n */\nexport function lit(value: string): string {\n  return \"'\" + value.replace(/'/g, \"''\") + \"'\";\n}\n"],"mappings":";;;;;;AAKA,SAAgB,GAAG,MAAsB;AACvC,QAAO,OAAM,KAAK,QAAQ,MAAM,OAAK,GAAG;;;;;AAM1C,SAAgB,OAAO,OAAiC;AACtD,QAAO,MAAM,KAAK,QAAO,SAAQ,GAAG,KAAK,CAAC,CAAC,KAAK,IAAI;;;;;;AAOtD,SAAgB,IAAI,OAAuB;AACzC,QAAO,MAAM,MAAM,QAAQ,MAAM,KAAK,GAAG"}

package/out/zero-cache/src/types/state-version.js

@@ -1,33 +1,27 @@
 import { assert } from "../../../shared/src/asserts.js";
 import { versionFromLexi, versionToLexi } from "./lexi-version.js";
+//#region ../zero-cache/src/types/state-version.ts
 function stateVersionFromString(ver) {
-  if (!ver.includes(".")) {
-    return { major: versionFromLexi(ver) };
-  }
-  const parts = ver.split(".");
-  assert(parts.length === 2, () => `Invalid stateVersion ${ver}`);
-  return {
-    major: versionFromLexi(parts[0]),
-    minor: versionFromLexi(parts[1])
-  };
+	if (!ver.includes(".")) return { major: versionFromLexi(ver) };
+	const parts = ver.split(".");
+	assert(parts.length === 2, () => `Invalid stateVersion ${ver}`);
+	return {
+		major: versionFromLexi(parts[0]),
+		minor: versionFromLexi(parts[1])
+	};
 }
 function stateVersionToString(ver) {
-  return ver.minor === void 0 ? versionToLexi(ver.major) : `${versionToLexi(ver.major)}.${versionToLexi(ver.minor)}`;
+	return ver.minor === void 0 ? versionToLexi(ver.major) : `${versionToLexi(ver.major)}.${versionToLexi(ver.minor)}`;
 }
 function majorVersionFromString(ver) {
-  if (!ver.includes(".")) {
-    return versionFromLexi(ver);
-  }
-  const { major } = stateVersionFromString(ver);
-  return major;
+	if (!ver.includes(".")) return versionFromLexi(ver);
+	const { major } = stateVersionFromString(ver);
+	return major;
 }
 function majorVersionToString(major) {
-  return versionToLexi(major);
+	return versionToLexi(major);
 }
-export {
-  majorVersionFromString,
-  majorVersionToString,
-  stateVersionFromString,
-  stateVersionToString
-};
-//# sourceMappingURL=state-version.js.map
+//#endregion
+export { majorVersionFromString, majorVersionToString, stateVersionFromString, stateVersionToString };
+
+//# sourceMappingURL=state-version.js.map

package/out/zero-cache/src/types/state-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-version.js","sources":["../../../../../zero-cache/src/types/state-version.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {versionFromLexi, versionToLexi} from './lexi-version.ts';\n\n/**\n * Identifies the version of the data on the replica, corresponding to the\n * stream of changes produced by the change-source and change-streamer.\n *\n * The `major` version directly tracks the watermark of the replication\n * stream (e.g. the Postgres LSN).\n *\n * The `minor` version is optional and used to auxiliary state changes,\n * such as writes from pending backfills.\n *\n * StateVersions are persisted and passed as lexicographically ordered\n * strings, using the LexiVersion format for major and minor versions,\n * separated by a dot. If there is no minor version, the StateVersion\n * is represented by a single LexiVersion.\n */\nexport type StateVersion = {\n  major: bigint;\n  minor?: bigint | undefined;\n};\n\ntype StateVersionInput = {\n  major: bigint | number;\n  minor?: bigint | number | undefined;\n};\n\nexport function stateVersionFromString(ver: string): StateVersion {\n  if (!ver.includes('.')) {\n    return {major: versionFromLexi(ver)};\n  }\n  const parts = ver.split('.');\n  assert(parts.length === 2, () => `Invalid stateVersion ${ver}`);\n  return {\n    major: versionFromLexi(parts[0]),\n    minor: versionFromLexi(parts[1]),\n  };\n}\n\nexport function stateVersionToString(ver: StateVersionInput) {\n  return ver.minor === undefined\n    ? versionToLexi(ver.major)\n    : `${versionToLexi(ver.major)}.${versionToLexi(ver.minor)}`;\n}\n\nexport function majorVersionFromString(ver: string): bigint {\n  if (!ver.includes('.')) {\n    return versionFromLexi(ver);\n  }\n  const {major} = stateVersionFromString(ver);\n  return major;\n}\n\nexport function majorVersionToString(major: number | bigint) {\n  return versionToLexi(major);\n}\n"],"names":[],"mappings":";;AA4BO,SAAS,uBAAuB,KAA2B;AAChE,MAAI,CAAC,IAAI,SAAS,GAAG,GAAG;AACtB,WAAO,EAAC,OAAO,gBAAgB,GAAG,EAAA;AAAA,EACpC;AACA,QAAM,QAAQ,IAAI,MAAM,GAAG;AAC3B,SAAO,MAAM,WAAW,GAAG,MAAM,wBAAwB,GAAG,EAAE;AAC9D,SAAO;AAAA,IACL,OAAO,gBAAgB,MAAM,CAAC,CAAC;AAAA,IAC/B,OAAO,gBAAgB,MAAM,CAAC,CAAC;AAAA,EAAA;AAEnC;AAEO,SAAS,qBAAqB,KAAwB;AAC3D,SAAO,IAAI,UAAU,SACjB,cAAc,IAAI,KAAK,IACvB,GAAG,cAAc,IAAI,KAAK,CAAC,IAAI,cAAc,IAAI,KAAK,CAAC;AAC7D;AAEO,SAAS,uBAAuB,KAAqB;AAC1D,MAAI,CAAC,IAAI,SAAS,GAAG,GAAG;AACtB,WAAO,gBAAgB,GAAG;AAAA,EAC5B;AACA,QAAM,EAAC,MAAA,IAAS,uBAAuB,GAAG;AAC1C,SAAO;AACT;AAEO,SAAS,qBAAqB,OAAwB;AAC3D,SAAO,cAAc,KAAK;AAC5B;"}
+{"version":3,"file":"state-version.js","names":[],"sources":["../../../../../zero-cache/src/types/state-version.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {versionFromLexi, versionToLexi} from './lexi-version.ts';\n\n/**\n * Identifies the version of the data on the replica, corresponding to the\n * stream of changes produced by the change-source and change-streamer.\n *\n * The `major` version directly tracks the watermark of the replication\n * stream (e.g. the Postgres LSN).\n *\n * The `minor` version is optional and used to auxiliary state changes,\n * such as writes from pending backfills.\n *\n * StateVersions are persisted and passed as lexicographically ordered\n * strings, using the LexiVersion format for major and minor versions,\n * separated by a dot. If there is no minor version, the StateVersion\n * is represented by a single LexiVersion.\n */\nexport type StateVersion = {\n  major: bigint;\n  minor?: bigint | undefined;\n};\n\ntype StateVersionInput = {\n  major: bigint | number;\n  minor?: bigint | number | undefined;\n};\n\nexport function stateVersionFromString(ver: string): StateVersion {\n  if (!ver.includes('.')) {\n    return {major: versionFromLexi(ver)};\n  }\n  const parts = ver.split('.');\n  assert(parts.length === 2, () => `Invalid stateVersion ${ver}`);\n  return {\n    major: versionFromLexi(parts[0]),\n    minor: versionFromLexi(parts[1]),\n  };\n}\n\nexport function stateVersionToString(ver: StateVersionInput) {\n  return ver.minor === undefined\n    ? versionToLexi(ver.major)\n    : `${versionToLexi(ver.major)}.${versionToLexi(ver.minor)}`;\n}\n\nexport function majorVersionFromString(ver: string): bigint {\n  if (!ver.includes('.')) {\n    return versionFromLexi(ver);\n  }\n  const {major} = stateVersionFromString(ver);\n  return major;\n}\n\nexport function majorVersionToString(major: number | bigint) {\n  return versionToLexi(major);\n}\n"],"mappings":";;;AA4BA,SAAgB,uBAAuB,KAA2B;AAChE,KAAI,CAAC,IAAI,SAAS,IAAI,CACpB,QAAO,EAAC,OAAO,gBAAgB,IAAI,EAAC;CAEtC,MAAM,QAAQ,IAAI,MAAM,IAAI;AAC5B,QAAO,MAAM,WAAW,SAAS,wBAAwB,MAAM;AAC/D,QAAO;EACL,OAAO,gBAAgB,MAAM,GAAG;EAChC,OAAO,gBAAgB,MAAM,GAAG;EACjC;;AAGH,SAAgB,qBAAqB,KAAwB;AAC3D,QAAO,IAAI,UAAU,KAAA,IACjB,cAAc,IAAI,MAAM,GACxB,GAAG,cAAc,IAAI,MAAM,CAAC,GAAG,cAAc,IAAI,MAAM;;AAG7D,SAAgB,uBAAuB,KAAqB;AAC1D,KAAI,CAAC,IAAI,SAAS,IAAI,CACpB,QAAO,gBAAgB,IAAI;CAE7B,MAAM,EAAC,UAAS,uBAAuB,IAAI;AAC3C,QAAO;;AAGT,SAAgB,qBAAqB,OAAwB;AAC3D,QAAO,cAAc,MAAM"}

package/out/zero-cache/src/types/streams.js

@@ -1,284 +1,248 @@
-import { resolver } from "@rocicorp/resolver";
-import { pipeline, Writable, Readable, Transform } from "node:stream";
-import { createWebSocketStream } from "ws";
 import { assert } from "../../../shared/src/asserts.js";
+import { parse, valita_exports } from "../../../shared/src/valita.js";
 import { BigIntJSON } from "../../../shared/src/bigint-json.js";
+import { closeWithError, expectPingsForLiveness, sendPingsForLiveness } from "./ws.js";
 import { Queue } from "../../../shared/src/queue.js";
-import { parse } from "../../../shared/src/valita.js";
 import { Subscription } from "./subscription.js";
-import { sendPingsForLiveness, closeWithError, expectPingsForLiveness } from "./ws.js";
-import { object, number } from "@badrap/valita";
-const PING_INTERVAL_MS = 3e4;
+import { resolver } from "@rocicorp/resolver";
+import { createWebSocketStream } from "ws";
+import { Readable, Transform, Writable, pipeline } from "node:stream";
+//#region ../zero-cache/src/types/streams.ts
+var PING_INTERVAL_MS = 3e4;
+/**
+* Back-pressure-aware transformation of a WebSocket into
+* upstream and downstream {@link Subscription} objects.
+*/
 function stream(lc, ws, inSchema, outOptions = {}, inOptions = {}, streamOptions = {}) {
-  const endpoint = ws.url ?? "client";
-  function close(err) {
-    if (ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING) {
-      if (err) {
-        closeWithError(lc, ws, err);
-      } else {
-        lc.info?.(`closing connection to ${endpoint}`);
-        ws.close();
-      }
-    }
-  }
-  const instream = Subscription.create({
-    ...inOptions,
-    cleanup: (unconsumed, err) => {
-      inOptions.cleanup?.(unconsumed, err);
-      close(err);
-    }
-  });
-  const outstream = Subscription.create({
-    ...outOptions,
-    cleanup: (unconsumed, err) => {
-      outOptions.cleanup?.(unconsumed, err);
-      close(err);
-    }
-  });
-  const duplex = createWebSocketStream(ws, {
-    ...streamOptions,
-    decodeStrings: false
-  });
-  function streamOut2() {
-    duplex.on("drain", () => lc.debug?.(`drained messages to ${endpoint}`));
-    pipeline(
-      Readable.from(outstream),
-      new Transform({
-        objectMode: true,
-        transform: (msg, _encoding, callback) => callback(null, BigIntJSON.stringify(msg))
-      }),
-      duplex,
-      (err) => err ? outstream.fail(err) : outstream.cancel()
-    );
-  }
-  if (ws.readyState === ws.CONNECTING) {
-    ws.on("open", () => {
-      lc.info?.(`connected to ${endpoint}`);
-      streamOut2();
-    });
-  } else {
-    streamOut2();
-  }
-  pipe({
-    source: duplex,
-    sink: instream,
-    parse: (chunk) => {
-      const json = BigIntJSON.parse(chunk.toString());
-      return parse(json, inSchema, "passthrough");
-    }
-  });
-  sendPingsForLiveness(lc, ws, PING_INTERVAL_MS);
-  return { outstream, instream };
+	const endpoint = ws.url ?? "client";
+	function close(err) {
+		if (ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING) if (err) closeWithError(lc, ws, err);
+		else {
+			lc.info?.(`closing connection to ${endpoint}`);
+			ws.close();
+		}
+	}
+	const instream = Subscription.create({
+		...inOptions,
+		cleanup: (unconsumed, err) => {
+			inOptions.cleanup?.(unconsumed, err);
+			close(err);
+		}
+	});
+	const outstream = Subscription.create({
+		...outOptions,
+		cleanup: (unconsumed, err) => {
+			outOptions.cleanup?.(unconsumed, err);
+			close(err);
+		}
+	});
+	const duplex = createWebSocketStream(ws, {
+		...streamOptions,
+		decodeStrings: false
+	});
+	function streamOut() {
+		duplex.on("drain", () => lc.debug?.(`drained messages to ${endpoint}`));
+		pipeline(Readable.from(outstream), new Transform({
+			objectMode: true,
+			transform: (msg, _encoding, callback) => callback(null, BigIntJSON.stringify(msg))
+		}), duplex, (err) => err ? outstream.fail(err) : outstream.cancel());
+	}
+	if (ws.readyState === ws.CONNECTING) ws.on("open", () => {
+		lc.info?.(`connected to ${endpoint}`);
+		streamOut();
+	});
+	else streamOut();
+	pipe({
+		source: duplex,
+		sink: instream,
+		parse: (chunk) => {
+			return parse(BigIntJSON.parse(chunk.toString()), inSchema, "passthrough");
+		}
+	});
+	sendPingsForLiveness(lc, ws, PING_INTERVAL_MS);
+	return {
+		outstream,
+		instream
+	};
 }
-function pipe({ source, sink, parse: parse2, bufferMessages }) {
-  bufferMessages ??= 0;
-  assert(bufferMessages >= 0, "bufferMessages must be non-negative");
-  const pending = [];
-  pipeline(
-    source,
-    new Writable({
-      decodeStrings: false,
-      write: (chunk, _encoding, callback) => {
-        let msg;
-        try {
-          if ((msg = parse2(chunk)) === null) {
-            callback();
-            return;
-          }
-        } catch (err) {
-          callback(ensureError(err));
-          return;
-        }
-        const { result } = sink.push(msg);
-        pending.push(result);
-        void result.then(() => pending.shift());
-        if (pending.length <= bufferMessages) {
-          callback();
-        } else {
-          pending[0].then(
-            () => callback(),
-            (err) => callback(ensureError(err))
-          );
-        }
-      },
-      destroy: (err, callback) => {
-        if (err) {
-          sink.fail(ensureError(err));
-        }
-        callback();
-      },
-      final: (callback) => {
-        sink.cancel();
-        callback();
-      }
-    }),
-    (err) => err ? sink.fail(err) : sink.cancel()
-  );
+function pipe({ source, sink, parse, bufferMessages }) {
+	bufferMessages ??= 0;
+	assert(bufferMessages >= 0, "bufferMessages must be non-negative");
+	const pending = [];
+	pipeline(source, new Writable({
+		decodeStrings: false,
+		write: (chunk, _encoding, callback) => {
+			let msg;
+			try {
+				if ((msg = parse(chunk)) === null) {
+					callback();
+					return;
+				}
+			} catch (err) {
+				callback(ensureError(err));
+				return;
+			}
+			const { result } = sink.push(msg);
+			pending.push(result);
+			result.then(() => pending.shift());
+			if (pending.length <= bufferMessages) callback();
+			else pending[0].then(() => callback(), (err) => callback(ensureError(err)));
+		},
+		destroy: (err, callback) => {
+			if (err) sink.fail(ensureError(err));
+			callback();
+		},
+		final: (callback) => {
+			sink.cancel();
+			callback();
+		}
+	}), (err) => err ? sink.fail(err) : sink.cancel());
 }
 function ensureError(err) {
-  return err instanceof Error ? err : new Error(String(err));
+	return err instanceof Error ? err : new Error(String(err));
 }
-const ackSchema = object({ ack: number() });
+var ackSchema = valita_exports.object({ ack: valita_exports.number() });
 async function streamOut(lc, source, sink) {
-  sendPingsForLiveness(lc, sink, PING_INTERVAL_MS);
-  const closer = WebSocketCloser.forSource(lc, sink, source);
-  const acks = new Queue();
-  sink.addEventListener("message", ({ data }) => {
-    try {
-      if (typeof data !== "string") {
-        throw new Error("Expected string message");
-      }
-      acks.enqueue(parse(JSON.parse(data), ackSchema));
-    } catch (e) {
-      lc.error?.(`error parsing ack`, e);
-      closer.close(e);
-    }
-  });
-  try {
-    let nextID = 0;
-    const { pipeline: pipeline2 } = source;
-    if (pipeline2) {
-      lc.debug?.(`started pipelined outbound stream`);
-      for await (const { value: msg, consumed } of pipeline2) {
-        const id = ++nextID;
-        const data = BigIntJSON.stringify({ msg, id });
-        sink.send(data);
-        void (async () => {
-          const { ack } = await acks.dequeue();
-          if (ack !== id) {
-            throw new Error(`Unexpected ack for ${id}: ${ack}`);
-          }
-          consumed();
-        })();
-      }
-    } else {
-      lc.debug?.(`started synchronous outbound stream`);
-      for await (const msg of source) {
-        const id = ++nextID;
-        const data = BigIntJSON.stringify({ msg, id });
-        sink.send(data);
-        const { ack } = await acks.dequeue();
-        if (ack !== id) {
-          throw new Error(`Unexpected ack for ${id}: ${ack}`);
-        }
-      }
-    }
-    closer.close();
-  } catch (e) {
-    closer.close(e);
-  }
+	sendPingsForLiveness(lc, sink, PING_INTERVAL_MS);
+	const closer = WebSocketCloser.forSource(lc, sink, source);
+	const acks = new Queue();
+	sink.addEventListener("message", ({ data }) => {
+		try {
+			if (typeof data !== "string") throw new Error("Expected string message");
+			acks.enqueue(parse(JSON.parse(data), ackSchema));
+		} catch (e) {
+			lc.error?.(`error parsing ack`, e);
+			closer.close(e);
+		}
+	});
+	try {
+		let nextID = 0;
+		const { pipeline } = source;
+		if (pipeline) {
+			lc.debug?.(`started pipelined outbound stream`);
+			for await (const { value: msg, consumed } of pipeline) {
+				const id = ++nextID;
+				const data = BigIntJSON.stringify({
+					msg,
+					id
+				});
+				sink.send(data);
+				(async () => {
+					const { ack } = await acks.dequeue();
+					if (ack !== id) throw new Error(`Unexpected ack for ${id}: ${ack}`);
+					consumed();
+				})();
+			}
+		} else {
+			lc.debug?.(`started synchronous outbound stream`);
+			for await (const msg of source) {
+				const id = ++nextID;
+				const data = BigIntJSON.stringify({
+					msg,
+					id
+				});
+				sink.send(data);
+				const { ack } = await acks.dequeue();
+				if (ack !== id) throw new Error(`Unexpected ack for ${id}: ${ack}`);
+			}
+		}
+		closer.close();
+	} catch (e) {
+		closer.close(e);
+	}
 }
 async function streamIn(lc, source, schema) {
-  expectPingsForLiveness(lc, source, PING_INTERVAL_MS);
-  const streamedSchema = object({
-    msg: schema,
-    id: number()
-  });
-  const sink = new Subscription(
-    {
-      consumed: ({ id }) => source.send(JSON.stringify({ ack: id })),
-      cleanup: () => closer.close()
-    },
-    ({ msg }) => msg
-  );
-  const closer = WebSocketCloser.forSink(lc, source, sink, handleMessage);
-  function handleMessage(event) {
-    const data = event.data.toString();
-    if (!sink.active) {
-      lc.warn?.("dropping ws message received after close", data);
-      return;
-    }
-    try {
-      const value = BigIntJSON.parse(data);
-      const msg = parse(value, streamedSchema, "passthrough");
-      sink.push(msg);
-    } catch (e) {
-      closer.close(e);
-    }
-  }
-  await closer.connected;
-  return sink;
-}
-class WebSocketCloser {
-  #lc;
-  #ws;
-  #closeStream;
-  #messageHandler;
-  #connected = resolver();
-  get connected() {
-    return this.#connected.promise;
-  }
-  static forSource(lc, ws, stream2) {
-    return new WebSocketCloser(lc, ws, () => stream2.cancel());
-  }
-  static forSink(lc, ws, stream2, messageHandler) {
-    return new WebSocketCloser(lc, ws, () => stream2.end(), messageHandler);
-  }
-  constructor(lc, ws, closeStream, messageHandler) {
-    this.#lc = lc;
-    this.#ws = ws;
-    this.#closeStream = closeStream;
-    this.#messageHandler = messageHandler ?? null;
-    ws.addEventListener("open", this.#handleOpen);
-    ws.addEventListener("close", this.#handleClose);
-    ws.addEventListener("error", this.#handleError);
-    if (this.#messageHandler) {
-      ws.addEventListener("message", this.#messageHandler);
-    }
-    switch (ws.readyState) {
-      case ws.CONNECTING:
-        break;
-      // expected for new connections. resolve or reject in handlers.
-      case ws.OPEN:
-        this.#connected.resolve();
-        break;
-      default:
-        this.#connected.reject(
-          new Error(`websocket already in state ${ws.readyState}`)
-        );
-        break;
-    }
-  }
-  get #conn() {
-    return "connection" + (this.#ws.url ? ` to ${this.#ws.url}` : "");
-  }
-  #handleOpen = () => {
-    this.#lc.info?.(`${this.#conn} established`);
-    this.#connected.resolve();
-  };
-  #handleClose = (e) => {
-    const { code, reason, wasClean } = e;
-    this.#lc.info?.(`${this.#conn} closed`, {
-      code,
-      reason,
-      wasClean
-    });
-    this.close();
-    this.#connected.reject(`${this.#conn} closed with code ${code}`);
-  };
-  #handleError = ({ message, error }) => {
-    if (this.#ws.readyState === this.#ws.OPEN) {
-      this.#lc.error?.(`error in ${this.#conn}`, message, error);
-    }
-    this.#connected.reject(error);
-  };
-  close(err) {
-    if (err) {
-      this.#lc.error?.(`closing stream with error`, err);
-    }
-    this.#closeStream();
-    if (!this.closed()) {
-      this.#ws.close();
-    }
-  }
-  closed() {
-    return this.#ws.readyState === this.#ws.CLOSED || this.#ws.readyState === this.#ws.CLOSING;
-  }
+	expectPingsForLiveness(lc, source, PING_INTERVAL_MS);
+	const streamedSchema = valita_exports.object({
+		msg: schema,
+		id: valita_exports.number()
+	});
+	const sink = new Subscription({
+		consumed: ({ id }) => source.send(JSON.stringify({ ack: id })),
+		cleanup: () => closer.close()
+	}, ({ msg }) => msg);
+	const closer = WebSocketCloser.forSink(lc, source, sink, handleMessage);
+	function handleMessage(event) {
+		const data = event.data.toString();
+		if (!sink.active) {
+			lc.warn?.("dropping ws message received after close", data);
+			return;
+		}
+		try {
+			const msg = parse(BigIntJSON.parse(data), streamedSchema, "passthrough");
+			sink.push(msg);
+		} catch (e) {
+			closer.close(e);
+		}
+	}
+	await closer.connected;
+	return sink;
 }
-export {
-  pipe,
-  stream,
-  streamIn,
-  streamOut
+var WebSocketCloser = class WebSocketCloser {
+	#lc;
+	#ws;
+	#closeStream;
+	#messageHandler;
+	#connected = resolver();
+	get connected() {
+		return this.#connected.promise;
+	}
+	static forSource(lc, ws, stream) {
+		return new WebSocketCloser(lc, ws, () => stream.cancel());
+	}
+	static forSink(lc, ws, stream, messageHandler) {
+		return new WebSocketCloser(lc, ws, () => stream.end(), messageHandler);
+	}
+	constructor(lc, ws, closeStream, messageHandler) {
+		this.#lc = lc;
+		this.#ws = ws;
+		this.#closeStream = closeStream;
+		this.#messageHandler = messageHandler ?? null;
+		ws.addEventListener("open", this.#handleOpen);
+		ws.addEventListener("close", this.#handleClose);
+		ws.addEventListener("error", this.#handleError);
+		if (this.#messageHandler) ws.addEventListener("message", this.#messageHandler);
+		switch (ws.readyState) {
+			case ws.CONNECTING: break;
+			case ws.OPEN:
+				this.#connected.resolve();
+				break;
+			default:
+				this.#connected.reject(/* @__PURE__ */ new Error(`websocket already in state ${ws.readyState}`));
+				break;
+		}
+	}
+	get #conn() {
+		return "connection" + (this.#ws.url ? ` to ${this.#ws.url}` : "");
+	}
+	#handleOpen = () => {
+		this.#lc.info?.(`${this.#conn} established`);
+		this.#connected.resolve();
+	};
+	#handleClose = (e) => {
+		const { code, reason, wasClean } = e;
+		this.#lc.info?.(`${this.#conn} closed`, {
+			code,
+			reason,
+			wasClean
+		});
+		this.close();
+		this.#connected.reject(`${this.#conn} closed with code ${code}`);
+	};
+	#handleError = ({ message, error }) => {
+		if (this.#ws.readyState === this.#ws.OPEN) this.#lc.error?.(`error in ${this.#conn}`, message, error);
+		this.#connected.reject(error);
+	};
+	close(err) {
+		if (err) this.#lc.error?.(`closing stream with error`, err);
+		this.#closeStream();
+		if (!this.closed()) this.#ws.close();
+	}
+	closed() {
+		return this.#ws.readyState === this.#ws.CLOSED || this.#ws.readyState === this.#ws.CLOSING;
+	}
 };
-//# sourceMappingURL=streams.js.map
+//#endregion
+export { pipe, stream, streamIn, streamOut };
+
+//# sourceMappingURL=streams.js.map