@rocicorp/zero 0.19.2025050100 → 0.19.2025050200

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/out/{chunk-BXNVGG4D.js → chunk-ZJUS7BHH.js} +2 -2
  2. package/out/solid.js +1 -1
  3. package/out/zero-cache/src/config/zero-config.d.ts +9 -19
  4. package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
  5. package/out/zero-cache/src/config/zero-config.js +18 -43
  6. package/out/zero-cache/src/config/zero-config.js.map +1 -1
  7. package/out/zero-cache/src/server/change-streamer.d.ts.map +1 -1
  8. package/out/zero-cache/src/server/change-streamer.js +3 -5
  9. package/out/zero-cache/src/server/change-streamer.js.map +1 -1
  10. package/out/zero-cache/src/server/main.d.ts.map +1 -1
  11. package/out/zero-cache/src/server/main.js +10 -10
  12. package/out/zero-cache/src/server/main.js.map +1 -1
  13. package/out/zero-cache/src/server/replicator.d.ts.map +1 -1
  14. package/out/zero-cache/src/server/replicator.js +4 -15
  15. package/out/zero-cache/src/server/replicator.js.map +1 -1
  16. package/out/zero-cache/src/server/runner/config.d.ts +9 -19
  17. package/out/zero-cache/src/server/runner/config.d.ts.map +1 -1
  18. package/out/zero-cache/src/server/runner/run-worker.d.ts.map +1 -1
  19. package/out/zero-cache/src/server/runner/run-worker.js +8 -2
  20. package/out/zero-cache/src/server/runner/run-worker.js.map +1 -1
  21. package/out/zero-cache/src/{config → server/runner}/runtime.d.ts +0 -1
  22. package/out/zero-cache/src/server/runner/runtime.d.ts.map +1 -0
  23. package/out/zero-cache/src/server/runner/runtime.js +23 -0
  24. package/out/zero-cache/src/server/runner/runtime.js.map +1 -0
  25. package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
  26. package/out/zero-cache/src/server/syncer.js +2 -4
  27. package/out/zero-cache/src/server/syncer.js.map +1 -1
  28. package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts +2 -4
  29. package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts.map +1 -1
  30. package/out/zero-cache/src/services/change-streamer/change-streamer-http.js +11 -14
  31. package/out/zero-cache/src/services/change-streamer/change-streamer-http.js.map +1 -1
  32. package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts +1 -1
  33. package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts.map +1 -1
  34. package/out/zero-cache/src/services/change-streamer/change-streamer-service.js +15 -4
  35. package/out/zero-cache/src/services/change-streamer/change-streamer-service.js.map +1 -1
  36. package/out/zero-cache/src/services/change-streamer/schema/init.d.ts.map +1 -1
  37. package/out/zero-cache/src/services/change-streamer/schema/init.js +0 -8
  38. package/out/zero-cache/src/services/change-streamer/schema/init.js.map +1 -1
  39. package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts +1 -2
  40. package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts.map +1 -1
  41. package/out/zero-cache/src/services/change-streamer/schema/tables.js +13 -19
  42. package/out/zero-cache/src/services/change-streamer/schema/tables.js.map +1 -1
  43. package/out/zero-cache/src/services/change-streamer/storer.d.ts +1 -1
  44. package/out/zero-cache/src/services/change-streamer/storer.d.ts.map +1 -1
  45. package/out/zero-cache/src/services/change-streamer/storer.js +2 -6
  46. package/out/zero-cache/src/services/change-streamer/storer.js.map +1 -1
  47. package/out/zero-cache/src/types/timeout.d.ts +11 -0
  48. package/out/zero-cache/src/types/timeout.d.ts.map +1 -0
  49. package/out/zero-cache/src/types/timeout.js +23 -0
  50. package/out/zero-cache/src/types/timeout.js.map +1 -0
  51. package/out/zero.js +1 -1
  52. package/package.json +1 -1
  53. package/out/zero-cache/src/config/normalize.d.ts +0 -29
  54. package/out/zero-cache/src/config/normalize.d.ts.map +0 -1
  55. package/out/zero-cache/src/config/normalize.js +0 -73
  56. package/out/zero-cache/src/config/normalize.js.map +0 -1
  57. package/out/zero-cache/src/config/runtime.d.ts.map +0 -1
  58. package/out/zero-cache/src/config/runtime.js +0 -63
  59. package/out/zero-cache/src/config/runtime.js.map +0 -1
  60. /package/out/{chunk-BXNVGG4D.js.map → chunk-ZJUS7BHH.js.map} +0 -0
@@ -8502,7 +8502,7 @@ function makeMessage(message, context, logLevel) {
8502
8502
  }
8503
8503
 
8504
8504
  // ../zero-client/src/client/version.ts
8505
- var version2 = "0.19.2025050100";
8505
+ var version2 = "0.19.2025050200";
8506
8506
 
8507
8507
  // ../zero-client/src/client/log-options.ts
8508
8508
  var LevelFilterLogSink = class {
@@ -11138,4 +11138,4 @@ export {
11138
11138
  on_error_kind_enum_exports,
11139
11139
  Zero
11140
11140
  };
11141
- //# sourceMappingURL=chunk-BXNVGG4D.js.map
11141
+ //# sourceMappingURL=chunk-ZJUS7BHH.js.map
package/out/solid.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  Zero
3
- } from "./chunk-BXNVGG4D.js";
3
+ } from "./chunk-ZJUS7BHH.js";
4
4
  import "./chunk-O6HWBJKG.js";
5
5
  import {
6
6
  DEFAULT_TTL
@@ -200,19 +200,9 @@ export declare const zeroOptions: {
200
200
  type: v.Type<number>;
201
201
  desc: string[];
202
202
  };
203
- changeStreamer: {
204
- mode: {
205
- type: v.Type<"dedicated" | "discover">;
206
- desc: string[];
207
- };
208
- port: {
209
- type: v.Optional<number>;
210
- desc: string[];
211
- };
212
- address: {
213
- type: v.Optional<string>;
214
- desc: string[];
215
- };
203
+ changeStreamerPort: {
204
+ type: v.Optional<number>;
205
+ desc: string[];
216
206
  };
217
207
  taskID: {
218
208
  type: v.Optional<string>;
@@ -232,6 +222,10 @@ export declare const zeroOptions: {
232
222
  type: v.Optional<number>;
233
223
  desc: string[];
234
224
  };
225
+ changeStreamerURI: {
226
+ type: v.Optional<string>;
227
+ desc: string[];
228
+ };
235
229
  autoReset: {
236
230
  type: v.Type<boolean>;
237
231
  desc: string[];
@@ -375,12 +369,6 @@ export declare function getZeroConfig(env?: NodeJS.ProcessEnv, argv?: string[]):
375
369
  secret?: string | undefined;
376
370
  };
377
371
  port: number;
378
- changeStreamer: {
379
- mode: "dedicated" | "discover";
380
- } & {
381
- port?: number | undefined;
382
- address?: string | undefined;
383
- };
384
372
  perUserMutationLimit: {
385
373
  windowMs: number;
386
374
  } & {
@@ -412,8 +400,10 @@ export declare function getZeroConfig(env?: NodeJS.ProcessEnv, argv?: string[]):
412
400
  } & {};
413
401
  } & {
414
402
  queryHydrationStats?: boolean | undefined;
403
+ changeStreamerPort?: number | undefined;
415
404
  taskID?: string | undefined;
416
405
  numSyncWorkers?: number | undefined;
406
+ changeStreamerURI?: string | undefined;
417
407
  adminPassword?: string | undefined;
418
408
  storageDBTmpDir?: string | undefined;
419
409
  tenantID?: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAe,KAAK,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAOnD,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;CAmBnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;CAmBhB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAKpD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyZvB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,wBAAgB,aAAa,CAC3B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAW7B;AAED,wBAAgB,mBAAmB,CACjC,CAAC,SAAS;IACR,GAAG,EAAE;QACH,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,MAAM,CAAC,EACH;QACE,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,GACD,SAAS,CAAC;IACd,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH,EACD,MAAM,EAAE,CAAC;;;;;;;EAYV"}
1
+ {"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAe,KAAK,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAOnD,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;CAmBnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;CAmBhB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAKpD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+XvB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,wBAAgB,aAAa,CAC3B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAW7B;AAED,wBAAgB,mBAAmB,CACjC,CAAC,SAAS;IACR,GAAG,EAAE;QACH,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,MAAM,CAAC,EACH;QACE,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,GACD,SAAS,CAAC;IACd,QAAQ,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH,EACD,MAAM,EAAE,CAAC;;;;;;;EAYV"}
@@ -240,49 +240,15 @@ export const zeroOptions = {
240
240
  type: v.number().default(4848),
241
241
  desc: [`The port for sync connections.`],
242
242
  },
243
- changeStreamer: {
244
- mode: {
245
- type: v
246
- .union(v.literal('dedicated'), v.literal('discover'))
247
- .default('dedicated'),
248
- desc: [
249
- `The mode for running or connecting to the change-streamer:`,
250
- `* {bold dedicated}: runs the change-streamer and shuts down when another`,
251
- ` change-streamer takes over the replication slot. This is appropriate in a `,
252
- ` single-node configuration, or for the {bold replication-manager} in a `,
253
- ` multi-node configuration.`,
254
- `* {bold discover}: connects to the change-streamer as internally advertised in the`,
255
- ` change-db. This is appropriate for the {bold view-syncers} in a multi-node `,
256
- ` configuration.`,
257
- ],
258
- },
259
- port: {
260
- type: v.number().optional(),
261
- desc: [
262
- `The port on which the {bold change-streamer} runs. This is an internal`,
263
- `protocol between the {bold replication-manager} and {bold view-syncers}, which`,
264
- `runs in the same process tree in local development or a single-node configuration.`,
265
- ``,
266
- `If unspecified, defaults to {bold --port} + 1.`,
267
- ],
268
- },
269
- address: {
270
- type: v.string().optional(),
271
- desc: [
272
- `The {bold host:port} for other processes to use when connecting to this `,
273
- `change-streamer. When unspecified, the machine's IP address and the`,
274
- `{bold --change-streamer-port} will be advertised for discovery.`,
275
- ``,
276
- `In most cases, the default behavior (unspecified) is sufficient, including in a`,
277
- `single-node configuration or a multi-node configuration with host/awsvpc networking`,
278
- `(e.g. Fargate).`,
279
- ``,
280
- `For a multi-node configuration in which the process is unable to determine the externally`,
281
- `addressable port (e.g. a container running with {bold bridge} mode networking), the`,
282
- `{bold --change-streamer-address} must be specified manually (e.g. a load balancer or`,
283
- `service discovery address).`,
284
- ],
285
- },
243
+ changeStreamerPort: {
244
+ type: v.number().optional(),
245
+ desc: [
246
+ `The port on which the {bold change-streamer} runs. This is an internal`,
247
+ `protocol between the {bold replication-manager} and {bold zero-cache}, which`,
248
+ `runs in the same process in local development.`,
249
+ ``,
250
+ `If unspecified, defaults to {bold --port} + 1.`,
251
+ ],
286
252
  },
287
253
  taskID: {
288
254
  type: v.string().optional(),
@@ -304,6 +270,15 @@ export const zeroOptions = {
304
270
  `configuration for running the {bold replication-manager}.`,
305
271
  ],
306
272
  },
273
+ changeStreamerURI: {
274
+ type: v.string().optional(),
275
+ desc: [
276
+ `When unset, the zero-cache runs its own {bold replication-manager}`,
277
+ `(i.e. {bold change-streamer}). In production, this should be set to`,
278
+ `the {bold replication-manager} URI, which runs a {bold change-streamer}`,
279
+ `on port 4849.`,
280
+ ],
281
+ },
307
282
  autoReset: {
308
283
  type: v.boolean().default(true),
309
284
  desc: [
@@ -1 +1 @@
1
- {"version":3,"file":"zero-config.js","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zero-config.js","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAI/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAuGf"}
1
+ {"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAI/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAqGf"}
@@ -1,7 +1,6 @@
1
1
  import { assert } from "../../../shared/src/asserts.js";
2
2
  import { must } from "../../../shared/src/must.js";
3
3
  import { DatabaseInitError } from "../../../zqlite/src/db.js";
4
- import { assertNormalized } from "../config/normalize.js";
5
4
  import { getZeroConfig } from "../config/zero-config.js";
6
5
  import { deleteLiteDB } from "../db/delete-lite-db.js";
7
6
  import { warmupConnections } from "../db/warmup.js";
@@ -18,11 +17,10 @@ import { getShardConfig } from "../types/shards.js";
18
17
  import { createLogContext } from "./logging.js";
19
18
  export default async function runWorker(parent, env) {
20
19
  const config = getZeroConfig(env);
21
- assertNormalized(config);
22
- const { taskID, changeStreamer: { port, address }, upstream, change, replica, initialSync, litestream, } = config;
20
+ const { taskID, changeStreamerPort: port = config.port + 1, upstream, change, replica, initialSync, litestream, } = config;
23
21
  const lc = createLogContext(config, { worker: 'change-streamer' });
24
22
  // Kick off DB connection warmup in the background.
25
- const changeDB = pgClient(lc, change.db, {
23
+ const changeDB = pgClient(lc, change.db ?? upstream.db, {
26
24
  max: change.maxConns,
27
25
  connection: { ['application_name']: 'zero-change-streamer' },
28
26
  });
@@ -39,7 +37,7 @@ export default async function runWorker(parent, env) {
39
37
  ? await initializePostgresChangeSource(lc, upstream.db, shard, replica.file, initialSync)
40
38
  : await initializeCustomChangeSource(lc, upstream.db, shard, replica.file);
41
39
  initialSyncTime = Date.now() - start;
42
- changeStreamer = await initializeStreamer(lc, shard, taskID, address, changeDB, changeSource, subscriptionState, autoReset ?? false);
40
+ changeStreamer = await initializeStreamer(lc, shard, must(taskID, `main must set --task-id`), changeDB, changeSource, subscriptionState, autoReset ?? false);
43
41
  break;
44
42
  }
45
43
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA+Lf"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAqBA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA2Lf"}
@@ -1,7 +1,7 @@
1
1
  import { resolver } from '@rocicorp/resolver';
2
2
  import { availableParallelism } from 'node:os';
3
3
  import path from 'node:path';
4
- import { normalizeConfig } from "../config/normalize.js";
4
+ import { must } from "../../../shared/src/must.js";
5
5
  import { getZeroConfig } from "../config/zero-config.js";
6
6
  import { getSubscriberContext } from "../services/change-streamer/change-streamer-http.js";
7
7
  import { Dispatcher } from "../services/dispatcher/dispatcher.js";
@@ -17,9 +17,10 @@ import { createLogContext } from "./logging.js";
17
17
  const clientConnectionBifurcated = false;
18
18
  export default async function runWorker(parent, env) {
19
19
  const startMs = Date.now();
20
- const cfg = getZeroConfig(env);
21
- const lc = createLogContext(cfg, { worker: 'dispatcher' });
22
- const config = await normalizeConfig(lc, cfg, env);
20
+ const config = getZeroConfig(env);
21
+ const lc = createLogContext(config, { worker: 'dispatcher' });
22
+ const taskID = must(config.taskID, `main must set --task-id`);
23
+ const shard = getShardID(config);
23
24
  const processes = new ProcessManager(lc, parent ?? process);
24
25
  const numSyncers = config.numSyncWorkers !== undefined
25
26
  ? config.numSyncWorkers
@@ -46,17 +47,16 @@ export default async function runWorker(parent, env) {
46
47
  const name = path.basename(modulePath) + (id ? ` (${id})` : '');
47
48
  return processes.addWorker(worker, type, name);
48
49
  }
49
- const shard = getShardID(config);
50
- const { taskID, litestream: { backupURL, restoreDurationMsEstimate }, changeStreamer: { mode: changeStreamerMode }, } = config;
50
+ const { backupURL } = config.litestream;
51
51
  const litestream = backupURL?.length;
52
- const runChangeStreamer = changeStreamerMode === 'dedicated';
52
+ const runChangeStreamer = !config.changeStreamerURI;
53
53
  if (litestream) {
54
54
  // For the replication-manager (i.e. authoritative replica), only attempt
55
55
  // a restore once, allowing the backup to be absent.
56
56
  // For view-syncers, attempt a restore for up to 10 times over 30 seconds.
57
57
  try {
58
58
  const restoreElapsedMs = await restoreReplica(lc, config, runChangeStreamer ? 1 : 10, 3000);
59
- if (!restoreDurationMsEstimate && restoreElapsedMs) {
59
+ if (!config.litestream.restoreDurationMsEstimate && restoreElapsedMs) {
60
60
  internalFlags.push('--litestream-restore-duration-ms-estimate', String(restoreElapsedMs));
61
61
  }
62
62
  }
@@ -83,8 +83,8 @@ export default async function runWorker(parent, env) {
83
83
  // Technically, setting up the CVR DB schema is the responsibility of the Syncer,
84
84
  // but it is done here in the main thread because it is wasteful to have all of
85
85
  // the Syncers attempt the migration in parallel.
86
- const { cvr } = config;
87
- const cvrDB = pgClient(lc, cvr.db);
86
+ const { cvr, upstream } = config;
87
+ const cvrDB = pgClient(lc, cvr.db ?? upstream.db);
88
88
  await initViewSyncerSchema(lc, cvrDB, shard);
89
89
  void cvrDB.end();
90
90
  }
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,oBAAoB,EAAC,MAAM,qDAAqD,CAAC;AACzF,OAAO,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAC,uBAAuB,EAAC,MAAM,6CAA6C,CAAC;AACpF,OAAO,EACL,SAAS,EACT,cAAc,EACd,cAAc,GAEf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,cAAc,EACd,yBAAyB,GAC1B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,WAAW,EACX,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EAEvB,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAEzC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAqB,EACrB,GAAsB;IAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,YAAY,EAAC,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,MAAM,IAAI,OAAO,CAAC,CAAC;IAE5D,MAAM,UAAU,GACd,MAAM,CAAC,cAAc,KAAK,SAAS;QACjC,CAAC,CAAC,MAAM,CAAC,cAAc;QACvB,CAAC,CAAC,2EAA2E;YAC3E,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9C,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,sCAAsC,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS,UAAU,WAAW;YAC1F,yGAAyG,CAC5G,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,GAAG,CAAC,QAAQ,SAAS,UAAU,WAAW;YAChF,oGAAoG,CACvG,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GACjB,UAAU,KAAK,CAAC;QACd,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,iCAAiC;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC;YACzD,4BAA4B;YAC5B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC;SACrD,CAAC;IAER,SAAS,UAAU,CACjB,UAAkB,EAClB,IAAgB,EAChB,EAAoB,EACpB,GAAG,IAAc;QAEjB,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,aAAa,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAChE,OAAO,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,EAAC,SAAS,EAAC,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,MAAM,UAAU,GAAG,SAAS,EAAE,MAAM,CAAC;IACrC,MAAM,iBAAiB,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC;IAEpD,IAAI,UAAU,EAAE,CAAC;QACf,yEAAyE;QACzE,oDAAoD;QACpD,0EAA0E;QAC1E,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAC3C,EAAE,EACF,MAAM,EACN,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAC1B,IAAI,CACL,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,IAAI,gBAAgB,EAAE,CAAC;gBACrE,aAAa,CAAC,IAAI,CAChB,2CAA2C,EAC3C,MAAM,CAAC,gBAAgB,CAAC,CACzB,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,iBAAiB,EAAE,CAAC;gBACtB,2DAA2D;gBAC3D,8CAA8C;gBAC9C,EAAE,CAAC,KAAK,EAAE,CAAC,gDAAgD,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,sEAAsE;gBACtE,+DAA+D;gBAC/D,gEAAgE;gBAChE,qBAAqB;gBACrB,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,EAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAC,GAAG,QAAQ,EAAE,CAAC;IAC3D,MAAM,cAAc,GAAG,iBAAiB;QACtC,CAAC,CAAC,UAAU,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC,IAAI,CAC1D,SAAS,EACT,OAAO,CACR;QACH,CAAC,CAAC,OAAO,EAAE,CAAC;IAEd,IAAI,UAAU,EAAE,CAAC;QACf,iFAAiF;QACjF,+EAA+E;QAC/E,iDAAiD;QACjD,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7C,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,uEAAuE;IACvE,mBAAmB;IACnB,MAAM,mBAAmB,CAAC;IAE1B,IAAI,iBAAiB,IAAI,UAAU,EAAE,CAAC;QACpC,yEAAyE;QACzE,MAAM,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAC,GAAG,QAAQ,EAAE,CAAC;QACnD,MAAM,IAAI,GAAoB,QAAQ,CAAC;QACvC,UAAU,CAAC,wBAAwB,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI;QACjE,yEAAyE;QACzE,sEAAsE;QACtE,yCAAyC;QACzC,SAAS,EACT,GAAG,EAAE;YACH,SAAS,CAAC,aAAa,CACrB,yBAAyB,CAAC,MAAM,CAAC,EACjC,YAAY,EACZ,YAAY,CACb,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;QACF,MAAM,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAI,GACR,iBAAiB,IAAI,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/D,MAAM,UAAU,GAAG,UAAU,CAC3B,wBAAwB,EACxB,YAAY,EACZ,IAAI,EACJ,IAAI,CACL,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,CACV,UAAU,CAAC,oBAAoB,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAC7D,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,OAA2B,CAAC;IAChC,IAAI,0BAA0B,EAAE,CAAC;QAC/B,OAAO,GAAG,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,EAAE,CAAC,IAAI,EAAE,CAAC,qCAAqC,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,WAAW,CAC5B,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,qBAAqB,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAC3E,MAAM,CACP,CAAC;IACF,MAAM,SAAS,CAAC,eAAe,EAAE,CAAC;IAClC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1B,EAAE,CAAC,IAAI,EAAE,CAAC,sBAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC;IAE5D,MAAM,YAAY,GAAc,EAAE,CAAC;IACnC,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,CAAC;IAEtB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,CAAC,IAAI,CACf,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAC,IAAI,EAAC,CAAC,CACrE,CAAC;IACJ,CAAC;SAAM,IAAI,cAAc,IAAI,MAAM,EAAE,CAAC;QACpC,kEAAkE;QAClE,gEAAgE;QAChE,2BAA2B;QAC3B,uBAAuB,CACrB,EAAE,EACF,GAAG,CAAC,EAAE,CAAC,CAAC,EAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAC,CAAC,EACvE,MAAM,CACP,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,EAAE,EAAE,MAAM,IAAI,OAAO,EAAE,GAAG,YAAY,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAS/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA4Cf"}
1
+ {"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"AAWA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAQ/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAoCf"}
@@ -2,36 +2,25 @@ import { pid } from 'node:process';
2
2
  import { assert } from "../../../shared/src/asserts.js";
3
3
  import { must } from "../../../shared/src/must.js";
4
4
  import * as v from "../../../shared/src/valita.js";
5
- import { assertNormalized } from "../config/normalize.js";
6
5
  import { getZeroConfig } from "../config/zero-config.js";
7
6
  import { ChangeStreamerHttpClient } from "../services/change-streamer/change-streamer-http.js";
8
7
  import { exitAfter, runUntilKilled } from "../services/life-cycle.js";
9
8
  import { ReplicatorService, } from "../services/replicator/replicator.js";
10
- import { pgClient } from "../types/pg.js";
11
9
  import { parentWorker, singleProcessMode, } from "../types/processes.js";
12
- import { getShardConfig } from "../types/shards.js";
13
10
  import { replicaFileModeSchema, setUpMessageHandlers, setupReplica, } from "../workers/replicator.js";
14
11
  import { createLogContext } from "./logging.js";
15
12
  export default async function runWorker(parent, env, ...args) {
16
13
  assert(args.length > 0, `replicator mode not specified`);
17
14
  const fileMode = v.parse(args[0], replicaFileModeSchema);
18
15
  const config = getZeroConfig(env, args.slice(1));
19
- assertNormalized(config);
20
16
  const mode = fileMode === 'backup' ? 'backup' : 'serving';
21
17
  const workerName = `${mode}-replicator`;
22
18
  const lc = createLogContext(config, { worker: workerName });
23
19
  const replica = await setupReplica(lc, fileMode, config.replica);
24
- const shard = getShardConfig(config);
25
- const { taskID, change } = config;
26
- // Create a pg client with a single short-lived connection for the purpose
27
- // of change-streamer discovery (i.e. ChangeDB as DNS).
28
- const changeDB = pgClient(lc, change.db, {
29
- max: 1,
30
- ['idle_timeout']: 15,
31
- connection: { ['application_name']: 'change-streamer-discovery' },
32
- });
33
- const changeStreamer = new ChangeStreamerHttpClient(lc, shard, changeDB);
34
- const replicator = new ReplicatorService(lc, taskID, `${workerName}-${pid}`, mode, changeStreamer, replica);
20
+ const changeStreamerPort = config.changeStreamerPort ?? config.port + 1;
21
+ const changeStreamerURI = config.changeStreamerURI ?? `ws://localhost:${changeStreamerPort}`;
22
+ const changeStreamer = new ChangeStreamerHttpClient(lc, changeStreamerURI);
23
+ const replicator = new ReplicatorService(lc, must(config.taskID, `main must set --task-id`), `${workerName}-${pid}`, mode, changeStreamer, replica);
35
24
  setUpMessageHandlers(lc, replicator, parent);
36
25
  const running = runUntilKilled(lc, parent, replicator);
37
26
  // Signal readiness once the first ReplicaVersionReady notification is received.
@@ -1 +1 @@
1
- {"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"replicator.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/replicator.ts"],"names":[],"mappings":"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"}
@@ -145,19 +145,9 @@ export declare const multiConfigSchema: {
145
145
  type: v.Type<number>;
146
146
  desc: string[];
147
147
  };
148
- changeStreamer: {
149
- mode: {
150
- type: v.Type<"dedicated" | "discover">;
151
- desc: string[];
152
- };
153
- port: {
154
- type: v.Optional<number>;
155
- desc: string[];
156
- };
157
- address: {
158
- type: v.Optional<string>;
159
- desc: string[];
160
- };
148
+ changeStreamerPort: {
149
+ type: v.Optional<number>;
150
+ desc: string[];
161
151
  };
162
152
  taskID: {
163
153
  type: v.Optional<string>;
@@ -177,6 +167,10 @@ export declare const multiConfigSchema: {
177
167
  type: v.Optional<number>;
178
168
  desc: string[];
179
169
  };
170
+ changeStreamerURI: {
171
+ type: v.Optional<string>;
172
+ desc: string[];
173
+ };
180
174
  autoReset: {
181
175
  type: v.Type<boolean>;
182
176
  desc: string[];
@@ -334,12 +328,6 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
334
328
  secret?: string | undefined;
335
329
  };
336
330
  port: number;
337
- changeStreamer: {
338
- mode: "dedicated" | "discover";
339
- } & {
340
- port?: number | undefined;
341
- address?: string | undefined;
342
- };
343
331
  perUserMutationLimit: {
344
332
  windowMs: number;
345
333
  } & {
@@ -371,8 +359,10 @@ export declare function getMultiZeroConfig(processEnv?: NodeJS.ProcessEnv, argv?
371
359
  } & {};
372
360
  serverVersion?: string | undefined;
373
361
  queryHydrationStats?: boolean | undefined;
362
+ changeStreamerPort?: number | undefined;
374
363
  taskID?: string | undefined;
375
364
  numSyncWorkers?: number | undefined;
365
+ changeStreamerURI?: string | undefined;
376
366
  adminPassword?: string | undefined;
377
367
  storageDBTmpDir?: string | undefined;
378
368
  tenantID?: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkD7B,CAAC;AAiDF,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,kBAAkB,CAChC,UAAU,GAAE,MAAM,CAAC,UAAwB,EAC3C,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiB7B"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkD7B,CAAC;AAiDF,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,kBAAkB,CAChC,UAAU,GAAE,MAAM,CAAC,UAAwB,EAC3C,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiB7B"}
@@ -1 +1 @@
1
- {"version":3,"file":"run-worker.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAMjC,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAKlE,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA6Gf"}
1
+ {"version":3,"file":"run-worker.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAMjC,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAMlE,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA8Gf"}
@@ -7,15 +7,21 @@ import { ProcessManager, runUntilKilled } from "../../services/life-cycle.js";
7
7
  import { childWorker } from "../../types/processes.js";
8
8
  import { createLogContext } from "../logging.js";
9
9
  import { getMultiZeroConfig } from "./config.js";
10
+ import { getTaskID } from "./runtime.js";
10
11
  import { ZeroDispatcher } from "./zero-dispatcher.js";
11
12
  export async function runWorker(parent, env) {
12
13
  const startMs = Date.now();
13
14
  const { config, env: baseEnv } = getMultiZeroConfig(env);
14
15
  const lc = createLogContext(config, { worker: 'runner' });
15
16
  const processes = new ProcessManager(lc, parent ?? process);
16
- const { serverVersion, port, changeStreamer: { port: changeStreamerPort = port + 1 }, } = config;
17
+ const { serverVersion, port, changeStreamerPort = port + 1 } = config;
18
+ let { taskID } = config;
19
+ if (!taskID) {
20
+ taskID = await getTaskID(lc);
21
+ baseEnv['ZERO_TASK_ID'] = taskID;
22
+ }
17
23
  lc.info?.(`starting server${!serverVersion ? '' : `@${serverVersion}`} ` +
18
- `protocolVersion=${PROTOCOL_VERSION}`);
24
+ `protocolVersion=${PROTOCOL_VERSION}, taskID=${taskID}`);
19
25
  const multiMode = config.tenants.length;
20
26
  if (!multiMode) {
21
27
  config.tenants.push({
@@ -1 +1 @@
1
- {"version":3,"file":"run-worker.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run-worker.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/run-worker.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
1
  import type { LogContext } from '@rocicorp/logger';
2
2
  export declare function getTaskID(lc: LogContext): Promise<string>;
3
- export declare function getHostIp(lc: LogContext): string;
4
3
  //# sourceMappingURL=runtime.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,wBAAsB,SAAS,CAAC,EAAE,EAAE,UAAU,mBAoB7C"}
@@ -0,0 +1,23 @@
1
+ import { nanoid } from 'nanoid';
2
+ import * as v from "../../../../shared/src/valita.js";
3
+ // https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-metadata-endpoint-v4-response.html
4
+ const containerMetadataSchema = v.object({ ['TaskARN']: v.string() });
5
+ export async function getTaskID(lc) {
6
+ const containerURI = process.env['ECS_CONTAINER_METADATA_URI_V4'];
7
+ if (containerURI) {
8
+ try {
9
+ const resp = await fetch(`${containerURI}/task`);
10
+ const { TaskARN: taskID } = v.parse(await resp.json(), containerMetadataSchema, 'passthrough');
11
+ // Task ARN's are long, e.g.
12
+ // "arn:aws:ecs:us-east-1:712907626835:task/zbugs-prod-Cluster-vvNFcPUVpGHr/0042ea25bf534dc19975e26f61441737"
13
+ // We only care about the unique ID, i.e. the last path component.
14
+ const lastSlash = taskID.lastIndexOf('/');
15
+ return taskID.substring(lastSlash + 1); // works for lastSlash === -1 too
16
+ }
17
+ catch (e) {
18
+ lc.warn?.('unable to determine task ID. falling back to random ID', e);
19
+ }
20
+ }
21
+ return nanoid();
22
+ }
23
+ //# sourceMappingURL=runtime.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/runner/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAEtD,sGAAsG;AACtG,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,EAAC,CAAC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,EAAc;IAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAClE,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,YAAY,OAAO,CAAC,CAAC;YACjD,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,CAAC,CAAC,KAAK,CAC/B,MAAM,IAAI,CAAC,IAAI,EAAE,EACjB,uBAAuB,EACvB,aAAa,CACd,CAAC;YACF,4BAA4B;YAC5B,6GAA6G;YAC7G,kEAAkE;YAClE,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1C,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC;QAC3E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,EAAE,CAAC,IAAI,EAAE,CAAC,wDAAwD,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,OAAO,MAAM,EAAE,CAAC;AAClB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAY/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAwGf"}
1
+ {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAY/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAuGf"}