@rocicorp/zero 0.10.2025010500 → 0.10.2025011100
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.
- package/README.md +32 -0
- package/out/change-protocol.js +257 -0
- package/out/change-protocol.js.map +7 -0
- package/out/{chunk-VLJ76GO7.js → chunk-FEVIDCUL.js} +1626 -2373
- package/out/chunk-FEVIDCUL.js.map +7 -0
- package/out/chunk-ZRR54VX5.js +224 -0
- package/out/chunk-ZRR54VX5.js.map +7 -0
- package/out/react.js.map +1 -1
- package/out/replicache/src/db/commit.d.ts +12 -35
- package/out/replicache/src/db/commit.d.ts.map +1 -1
- package/out/replicache/src/db/meta-type-enum.d.ts +1 -7
- package/out/replicache/src/db/meta-type-enum.d.ts.map +1 -1
- package/out/replicache/src/db/rebase.d.ts.map +1 -1
- package/out/replicache/src/db/write.d.ts +0 -1
- package/out/replicache/src/db/write.d.ts.map +1 -1
- package/out/replicache/src/get-default-puller.d.ts +1 -3
- package/out/replicache/src/get-default-puller.d.ts.map +1 -1
- package/out/replicache/src/mod.d.ts +5 -5
- package/out/replicache/src/mod.d.ts.map +1 -1
- package/out/replicache/src/mutation-recovery.d.ts +1 -2
- package/out/replicache/src/mutation-recovery.d.ts.map +1 -1
- package/out/replicache/src/puller.d.ts +2 -20
- package/out/replicache/src/puller.d.ts.map +1 -1
- package/out/replicache/src/replicache-impl.d.ts +1 -2
- package/out/replicache/src/replicache-impl.d.ts.map +1 -1
- package/out/replicache/src/sync/pull.d.ts +3 -30
- package/out/replicache/src/sync/pull.d.ts.map +1 -1
- package/out/replicache/src/sync/push.d.ts +3 -30
- package/out/replicache/src/sync/push.d.ts.map +1 -1
- package/out/shared/src/options.d.ts.map +1 -1
- package/out/shared/src/options.js +16 -8
- package/out/shared/src/options.js.map +1 -1
- package/out/solid.js +30 -35
- package/out/solid.js.map +3 -3
- package/out/zero/src/change-protocol.d.ts +2 -0
- package/out/zero/src/change-protocol.d.ts.map +1 -0
- package/out/zero/src/change-protocol.js +2 -0
- package/out/zero/src/change-protocol.js.map +1 -0
- package/out/zero/src/zero-cache-dev.d.ts.map +1 -1
- package/out/zero/src/zero-cache-dev.js +6 -6
- package/out/zero/src/zero-cache-dev.js.map +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +30 -4
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +31 -15
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/db/specs.d.ts +1 -1
- package/out/zero-cache/src/server/change-streamer.d.ts.map +1 -1
- package/out/zero-cache/src/server/change-streamer.js +2 -6
- package/out/zero-cache/src/server/change-streamer.js.map +1 -1
- package/out/zero-cache/src/server/life-cycle.d.ts +3 -2
- package/out/zero-cache/src/server/life-cycle.d.ts.map +1 -1
- package/out/zero-cache/src/server/life-cycle.js +15 -12
- package/out/zero-cache/src/server/life-cycle.js.map +1 -1
- package/out/zero-cache/src/server/main.d.ts.map +1 -1
- package/out/zero-cache/src/server/main.js +21 -11
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/server/multi/config.d.ts +20 -3
- package/out/zero-cache/src/server/multi/config.d.ts.map +1 -1
- package/out/zero-cache/src/server/multi/config.js +10 -2
- package/out/zero-cache/src/server/multi/config.js.map +1 -1
- package/out/zero-cache/src/server/multi/main.d.ts.map +1 -1
- package/out/zero-cache/src/server/multi/main.js +9 -3
- package/out/zero-cache/src/server/multi/main.js.map +1 -1
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/change-source.d.ts +2 -2
- package/out/zero-cache/src/services/change-source/pg/change-source.d.ts.map +1 -0
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/change-source.js +1 -1
- package/out/zero-cache/src/services/change-source/pg/change-source.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -0
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/lsn.d.ts +1 -1
- package/out/zero-cache/src/services/change-source/pg/lsn.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/lsn.js.map +1 -0
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/ddl.d.ts +5 -5
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/init.d.ts.map +1 -0
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/init.js +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.js.map +1 -0
- package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/published.d.ts +2 -2
- package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/published.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/shard.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/validation.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/schema/validation.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/shard-config.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/shard-config.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/sync-schema.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/sync-schema.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/control.d.ts +38 -0
- package/out/zero-cache/src/services/change-source/protocol/current/control.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/control.js +36 -0
- package/out/zero-cache/src/services/change-source/protocol/current/control.js.map +1 -0
- package/out/zero-cache/src/services/{change-streamer/schema/change.d.ts → change-source/protocol/current/data.d.ts} +28 -23
- package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts.map +1 -0
- package/out/zero-cache/src/services/{change-streamer/schema/change.js → change-source/protocol/current/data.js} +9 -4
- package/out/zero-cache/src/services/change-source/protocol/current/data.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts +469 -0
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.js +19 -0
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/mod.d.ts +6 -0
- package/out/zero-cache/src/services/change-source/protocol/current/mod.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/mod.js +6 -0
- package/out/zero-cache/src/services/change-source/protocol/current/mod.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/path.d.ts +20 -0
- package/out/zero-cache/src/services/change-source/protocol/current/path.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/path.js +20 -0
- package/out/zero-cache/src/services/change-source/protocol/current/path.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/upstream.d.ts +17 -0
- package/out/zero-cache/src/services/change-source/protocol/current/upstream.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/current/upstream.js +12 -0
- package/out/zero-cache/src/services/change-source/protocol/current/upstream.js.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/mod.d.ts +2 -0
- package/out/zero-cache/src/services/change-source/protocol/mod.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/protocol/mod.js +5 -0
- package/out/zero-cache/src/services/change-source/protocol/mod.js.map +1 -0
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts +3 -157
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js +3 -13
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts +1 -309
- package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer.js +3 -11
- package/out/zero-cache/src/services/change-streamer/change-streamer.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts +1 -1
- package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.d.ts +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.js +1 -0
- package/out/zero-cache/src/services/change-streamer/storer.js.map +1 -1
- package/out/zero-cache/src/services/litestream/commands.d.ts +8 -0
- package/out/zero-cache/src/services/litestream/commands.d.ts.map +1 -0
- package/out/zero-cache/src/services/litestream/commands.js +61 -0
- package/out/zero-cache/src/services/litestream/commands.js.map +1 -0
- package/out/zero-cache/src/services/litestream/config.yml +7 -0
- package/out/zero-cache/src/services/mutagen/mutagen.js +1 -1
- package/out/zero-cache/src/services/mutagen/mutagen.js.map +1 -1
- package/out/zero-cache/src/services/replicator/incremental-sync.d.ts +3 -2
- package/out/zero-cache/src/services/replicator/incremental-sync.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.js +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/types/processes.d.ts +4 -2
- package/out/zero-cache/src/types/processes.d.ts.map +1 -1
- package/out/zero-cache/src/types/processes.js.map +1 -1
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-react/src/use-query.d.ts.map +1 -1
- package/out/zero-schema/src/column.d.ts +77 -25
- package/out/zero-schema/src/column.d.ts.map +1 -1
- package/out/zero-schema/src/normalize-table-schema.d.ts +4 -3
- package/out/zero-schema/src/normalize-table-schema.d.ts.map +1 -1
- package/out/zero-schema/src/normalize-table-schema.js +27 -23
- package/out/zero-schema/src/normalize-table-schema.js.map +1 -1
- package/out/zero-schema/src/normalized-schema.d.ts.map +1 -1
- package/out/zero-schema/src/normalized-schema.js +19 -2
- package/out/zero-schema/src/normalized-schema.js.map +1 -1
- package/out/zero-schema/src/schema.d.ts +1 -1
- package/out/zero-schema/src/schema.d.ts.map +1 -1
- package/out/zero-schema/src/schema.js +5 -0
- package/out/zero-schema/src/schema.js.map +1 -1
- package/out/zero-solid/src/solid-view.d.ts +4 -1
- package/out/zero-solid/src/solid-view.d.ts.map +1 -1
- package/out/zero-solid/src/use-query.d.ts +4 -7
- package/out/zero-solid/src/use-query.d.ts.map +1 -1
- package/out/zero.js +2 -1
- package/out/zql/src/ivm/take.d.ts.map +1 -1
- package/out/zql/src/ivm/take.js +13 -6
- package/out/zql/src/ivm/take.js.map +1 -1
- package/package.json +9 -6
- package/out/chunk-VLJ76GO7.js.map +0 -7
- package/out/zero-cache/src/services/change-streamer/pg/change-source.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/change-source.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/initial-sync.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/initial-sync.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/lsn.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/lsn.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/ddl.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/ddl.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/init.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/init.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/published.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/published.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/shard.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/shard.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/validation.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/validation.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/shard-config.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/shard-config.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/sync-schema.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/pg/sync-schema.js.map +0 -1
- package/out/zero-cache/src/services/change-streamer/schema/change.d.ts.map +0 -1
- package/out/zero-cache/src/services/change-streamer/schema/change.js.map +0 -1
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/initial-sync.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/initial-sync.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/lsn.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/ddl.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/init.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/published.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/shard.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/shard.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/validation.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/schema/validation.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/shard-config.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/shard-config.js +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/sync-schema.d.ts +0 -0
- /package/out/zero-cache/src/services/{change-streamer → change-source}/pg/sync-schema.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero-cache-dev.js","sourceRoot":"","sources":["../../../src/zero-cache-dev.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"zero-cache-dev.js","sourceRoot":"","sources":["../../../src/zero-cache-dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -188,8 +188,21 @@ export declare const zeroOptions: {
|
|
|
188
188
|
desc: string[];
|
|
189
189
|
};
|
|
190
190
|
litestream: {
|
|
191
|
-
|
|
192
|
-
|
|
191
|
+
executable: {
|
|
192
|
+
type: v.Optional<string>;
|
|
193
|
+
desc: string[];
|
|
194
|
+
};
|
|
195
|
+
configPath: {
|
|
196
|
+
type: v.Type<string>;
|
|
197
|
+
desc: string[];
|
|
198
|
+
};
|
|
199
|
+
logLevel: {
|
|
200
|
+
type: v.Type<"error" | "debug" | "info" | "warn">;
|
|
201
|
+
};
|
|
202
|
+
backupURL: {
|
|
203
|
+
type: v.Optional<string>;
|
|
204
|
+
desc: string[];
|
|
205
|
+
};
|
|
193
206
|
};
|
|
194
207
|
storageDBTmpDir: {
|
|
195
208
|
type: v.Optional<string>;
|
|
@@ -356,8 +369,21 @@ export declare function getDebugConfig(env?: NodeJS.ProcessEnv, argv?: string[])
|
|
|
356
369
|
desc: string[];
|
|
357
370
|
};
|
|
358
371
|
litestream: {
|
|
359
|
-
|
|
360
|
-
|
|
372
|
+
executable: {
|
|
373
|
+
type: v.Optional<string>;
|
|
374
|
+
desc: string[];
|
|
375
|
+
};
|
|
376
|
+
configPath: {
|
|
377
|
+
type: v.Type<string>;
|
|
378
|
+
desc: string[];
|
|
379
|
+
};
|
|
380
|
+
logLevel: {
|
|
381
|
+
type: v.Type<"error" | "debug" | "info" | "warn">;
|
|
382
|
+
};
|
|
383
|
+
backupURL: {
|
|
384
|
+
type: v.Optional<string>;
|
|
385
|
+
desc: string[];
|
|
386
|
+
};
|
|
361
387
|
};
|
|
362
388
|
storageDBTmpDir: {
|
|
363
389
|
type: v.Optional<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAe,KAAK,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAInD;;GAEG;AACH,QAAA,MAAM,YAAY;;;;;;;;;;CAqCjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEtD,QAAA,MAAM,UAAU;;;;;;;;;;CAyBf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAElD,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
|
|
1
|
+
{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAe,KAAK,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAInD;;GAEG;AACH,QAAA,MAAM,YAAY;;;;;;;;;;CAqCjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAEtD,QAAA,MAAM,UAAU;;;;;;;;;;CAyBf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAElD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8QvB,CAAC;AAgBF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,wBAAgB,aAAa,CAC3B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,WAAwB,GAC3B,UAAU,CAUZ;AAED,wBAAgB,cAAc,CAC5B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,WAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAG7B"}
|
|
@@ -273,24 +273,40 @@ export const zeroOptions = {
|
|
|
273
273
|
`by shutting down, and when restarted, resetting the replica and all synced `,
|
|
274
274
|
`clients. This is a heavy-weight operation and can result in user-visible`,
|
|
275
275
|
`slowness or downtime if compute resources are scarce.`,
|
|
276
|
-
``,
|
|
277
|
-
`Moreover, {bold auto-reset} is only supported for single-node configurations`,
|
|
278
|
-
`with a permanent volume for the replica. Specifically, it is incompatible`,
|
|
279
|
-
`with the {bold litestream} option, and will be ignored with a warning if`,
|
|
280
|
-
`set in combination with {bold litestream}.`,
|
|
281
276
|
],
|
|
282
277
|
},
|
|
283
278
|
litestream: {
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
279
|
+
executable: {
|
|
280
|
+
type: v.string().optional(),
|
|
281
|
+
desc: [
|
|
282
|
+
`Path to the {bold litestream} executable. This option has no effect if`,
|
|
283
|
+
`{bold litestream-backup-url} is unspecified.`,
|
|
284
|
+
],
|
|
285
|
+
},
|
|
286
|
+
configPath: {
|
|
287
|
+
type: v.string().default('./src/services/litestream/config.yml'),
|
|
288
|
+
desc: [
|
|
289
|
+
`Path to the litestream yaml config file. zero-cache will run this with its`,
|
|
290
|
+
`environment variables, which can be referenced in the file via $\\{ENV\\}`,
|
|
291
|
+
`substitution, for example:`,
|
|
292
|
+
`* {bold ZERO_REPLICA_FILE} for the db path`,
|
|
293
|
+
`* {bold ZERO_LITESTREAM_BACKUP_LOCATION} for the db replica url`,
|
|
294
|
+
`* {bold ZERO_LITESTREAM_LOG_LEVEL} for the log level`,
|
|
295
|
+
`* {bold ZERO_LOG_FORMAT} for the log type`,
|
|
296
|
+
],
|
|
297
|
+
},
|
|
298
|
+
logLevel: {
|
|
299
|
+
type: v
|
|
300
|
+
.union(v.literal('debug'), v.literal('info'), v.literal('warn'), v.literal('error'))
|
|
301
|
+
.default('warn'),
|
|
302
|
+
},
|
|
303
|
+
backupURL: {
|
|
304
|
+
type: v.string().optional(),
|
|
305
|
+
desc: [
|
|
306
|
+
`The location of the litestream backup, usually an {bold s3://} URL.`,
|
|
307
|
+
`If set, the {bold litestream-executable} must also be specified.`,
|
|
308
|
+
],
|
|
309
|
+
},
|
|
294
310
|
},
|
|
295
311
|
storageDBTmpDir: {
|
|
296
312
|
type: v.string().optional(),
|
|
@@ -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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"}
|
|
@@ -59,7 +59,7 @@ export declare const publishedTableSpec: v.ObjectType<Omit<Omit<{
|
|
|
59
59
|
primaryKey: v.ArrayType<v.Type<string>>;
|
|
60
60
|
}, "schema"> & {
|
|
61
61
|
schema: v.Type<string>;
|
|
62
|
-
}, "publications" | "
|
|
62
|
+
}, "publications" | "oid" | "columns"> & {
|
|
63
63
|
oid: v.Type<number>;
|
|
64
64
|
columns: v.Type<Record<string, {
|
|
65
65
|
pgTypeClass?: PostgresTypeClass | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAUA,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,
|
|
1
|
+
{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAUA,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,CA6Df"}
|
|
@@ -2,9 +2,9 @@ import { assert } from '../../../shared/src/asserts.js';
|
|
|
2
2
|
import { must } from '../../../shared/src/must.js';
|
|
3
3
|
import { getZeroConfig } from '../config/zero-config.js';
|
|
4
4
|
import { deleteLiteDB } from '../db/delete-lite-db.js';
|
|
5
|
+
import { initializeChangeSource } from '../services/change-source/pg/change-source.js';
|
|
5
6
|
import { ChangeStreamerHttpServer } from '../services/change-streamer/change-streamer-http.js';
|
|
6
7
|
import { initializeStreamer } from '../services/change-streamer/change-streamer-service.js';
|
|
7
|
-
import { initializeChangeSource } from '../services/change-streamer/pg/change-source.js';
|
|
8
8
|
import { AutoResetSignal } from '../services/change-streamer/schema/tables.js';
|
|
9
9
|
import { pgClient } from '../types/pg.js';
|
|
10
10
|
import { parentWorker, singleProcessMode, } from '../types/processes.js';
|
|
@@ -20,11 +20,7 @@ export default async function runWorker(parent, env) {
|
|
|
20
20
|
connection: { ['application_name']: 'zero-change-streamer' },
|
|
21
21
|
});
|
|
22
22
|
void Promise.allSettled(Array.from({ length: config.change.maxConns }, () => changeDB `SELECT 1`.simple().execute()));
|
|
23
|
-
|
|
24
|
-
if (autoReset && config.litestream) {
|
|
25
|
-
lc.warn?.('--auto-reset is incompatible with --litestream. Disabling --auto-reset.');
|
|
26
|
-
autoReset = false;
|
|
27
|
-
}
|
|
23
|
+
const { autoReset } = config;
|
|
28
24
|
let changeStreamer;
|
|
29
25
|
for (const first of [true, false]) {
|
|
30
26
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { LogContext } from '@rocicorp/logger';
|
|
|
2
2
|
import type { EventEmitter } from 'stream';
|
|
3
3
|
import { HttpService, type Options } from '../services/http-service.js';
|
|
4
4
|
import type { SingletonService } from '../services/service.js';
|
|
5
|
-
import type { Worker } from '../types/processes.js';
|
|
5
|
+
import type { Subprocess, Worker } from '../types/processes.js';
|
|
6
6
|
/**
|
|
7
7
|
* * `user-facing` workers serve external requests and are the first to
|
|
8
8
|
* receive a `SIGTERM` or `SIGINT` signal for graceful shutdown.
|
|
@@ -26,9 +26,10 @@ export declare class ProcessManager {
|
|
|
26
26
|
#private;
|
|
27
27
|
constructor(lc: LogContext, proc?: EventEmitter, exit?: (code: number) => never);
|
|
28
28
|
done(): Promise<void>;
|
|
29
|
+
addSubprocess(proc: Subprocess, type: WorkerType, name: string): void;
|
|
29
30
|
addWorker(worker: Worker, type: WorkerType, name: string): Worker;
|
|
30
31
|
allWorkersReady(): Promise<void>;
|
|
31
|
-
logErrorAndExit(err: unknown): void;
|
|
32
|
+
logErrorAndExit(err: unknown, name: string): void;
|
|
32
33
|
}
|
|
33
34
|
/**
|
|
34
35
|
* Runs the specified services, stopping them on `SIGTERM` or `SIGINT` with
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,6BAA6B,CAAC;AAEtE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,6BAA6B,CAAC;AAEtE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAE9D;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;AAEtD,eAAO,MAAM,iBAAiB,gCAAiC,CAAC;AAChE,eAAO,MAAM,iBAAiB,sBAAuB,CAAC;AAEtD;;;GAGG;AACH,qBAAa,cAAc;;gBAYvB,EAAE,EAAE,UAAU,EACd,IAAI,GAAE,YAAsB,EAC5B,IAAI,UAAU,MAAM,UAAuB;IA6B7C,IAAI;IAoBJ,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM;IAe9D,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAa3D,eAAe;IAIrB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM;CAoE3C;AAED;;;;;;GAMG;AAEH,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,EAC/B,GAAG,QAAQ,EAAE,gBAAgB,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,iBASvD;AAID;;;;;;;;;;GAUG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;;gBAO7C,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,OAAO,EACb,YAAY,SAA2B;IAmCnC,IAAI;CAIX"}
|
|
@@ -54,13 +54,16 @@ export class ProcessManager {
|
|
|
54
54
|
this.#kill(this.#all, signal);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
|
|
57
|
+
addSubprocess(proc, type, name) {
|
|
58
58
|
if (type === 'user-facing') {
|
|
59
|
-
this.#userFacing.add(
|
|
59
|
+
this.#userFacing.add(proc);
|
|
60
60
|
}
|
|
61
|
-
this.#all.add(
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
this.#all.add(proc);
|
|
62
|
+
proc.on('error', err => this.#lc.error?.(`error from ${name} ${proc.pid}`, err));
|
|
63
|
+
proc.on('close', (code, signal) => this.#onExit(code, signal, null, type, name, proc));
|
|
64
|
+
}
|
|
65
|
+
addWorker(worker, type, name) {
|
|
66
|
+
this.addSubprocess(worker, type, name);
|
|
64
67
|
const { promise, resolve } = resolver();
|
|
65
68
|
this.#ready.push(promise);
|
|
66
69
|
worker.onceMessageType('ready', () => {
|
|
@@ -72,11 +75,11 @@ export class ProcessManager {
|
|
|
72
75
|
async allWorkersReady() {
|
|
73
76
|
await Promise.all(this.#ready);
|
|
74
77
|
}
|
|
75
|
-
logErrorAndExit(err) {
|
|
78
|
+
logErrorAndExit(err, name) {
|
|
76
79
|
// only accessible by the main (i.e. user-facing) process.
|
|
77
|
-
this.#onExit(-1, null, err, 'user-facing', undefined);
|
|
80
|
+
this.#onExit(-1, null, err, 'user-facing', name, undefined);
|
|
78
81
|
}
|
|
79
|
-
#onExit(code, sig, err, type, worker) {
|
|
82
|
+
#onExit(code, sig, err, type, name, worker) {
|
|
80
83
|
// Remove the worker from maps to avoid attempting to send more signals to it.
|
|
81
84
|
if (worker) {
|
|
82
85
|
this.#userFacing.delete(worker);
|
|
@@ -87,18 +90,18 @@ export class ProcessManager {
|
|
|
87
90
|
// The replication-manager has no user-facing workers.
|
|
88
91
|
// In this case, code === 0 shutdowns are not errors.
|
|
89
92
|
const log = code === 0 && this.#userFacing.size === 0 ? 'info' : 'error';
|
|
90
|
-
this.#lc[log]?.(`${
|
|
93
|
+
this.#lc[log]?.(`${name} (${pid}) exited with code (${code})`, err ?? '');
|
|
91
94
|
return this.#exit(log === 'error' ? -1 : code);
|
|
92
95
|
}
|
|
93
96
|
const log = this.#drainStart === 0 ? 'error' : 'warn';
|
|
94
97
|
if (sig) {
|
|
95
|
-
this.#lc[log]?.(`${
|
|
98
|
+
this.#lc[log]?.(`${name} (${pid}) killed with (${sig})`, err ?? '');
|
|
96
99
|
}
|
|
97
100
|
else if (code !== 0) {
|
|
98
|
-
this.#lc[log]?.(`${
|
|
101
|
+
this.#lc[log]?.(`${name} (${pid}) exited with code (${code})`, err ?? '');
|
|
99
102
|
}
|
|
100
103
|
else {
|
|
101
|
-
this.#lc.info?.(`${
|
|
104
|
+
this.#lc.info?.(`${name} (${pid}) exited with code (${code})`);
|
|
102
105
|
}
|
|
103
106
|
// user-facing workers exited or finished draining.
|
|
104
107
|
if (this.#userFacing.size === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAE5B,OAAO,EAAC,WAAW,EAAe,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAkB1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAU,CAAC;AAChE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAS,CAAU,CAAC;AAEtD;;;GAGG;AACH,MAAM,OAAO,cAAc;IAChB,GAAG,CAAa;IAChB,WAAW,GAAG,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.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":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAgB/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA2If"}
|
|
@@ -3,6 +3,7 @@ import { availableParallelism } from 'node:os';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { getZeroConfig } from '../config/zero-config.js';
|
|
5
5
|
import { SyncDispatcher } from '../services/dispatcher/sync-dispatcher.js';
|
|
6
|
+
import { restoreReplica, startReplicaBackupProcess, } from '../services/litestream/commands.js';
|
|
6
7
|
import { initViewSyncerSchema } from '../services/view-syncer/schema/init.js';
|
|
7
8
|
import { pgClient } from '../types/pg.js';
|
|
8
9
|
import { childWorker, parentWorker, singleProcessMode, } from '../types/processes.js';
|
|
@@ -38,10 +39,18 @@ export default async function runWorker(parent, env) {
|
|
|
38
39
|
const name = path.basename(modulePath) + (id ? ` (${id})` : '');
|
|
39
40
|
return processes.addWorker(worker, type, name);
|
|
40
41
|
}
|
|
42
|
+
const { backupURL } = config.litestream;
|
|
43
|
+
const litestream = backupURL?.length;
|
|
44
|
+
const runChangeStreamer = !config.changeStreamerURI;
|
|
45
|
+
if (litestream) {
|
|
46
|
+
// For view-syncers, attempt a restore for up to 10 times over 30 seconds.
|
|
47
|
+
// For the replication-manager, only attempt once.
|
|
48
|
+
await restoreReplica(lc, config, config.changeStreamerURI ? 10 : 1, 3000);
|
|
49
|
+
}
|
|
41
50
|
const { promise: changeStreamerReady, resolve } = resolver();
|
|
42
|
-
const changeStreamer =
|
|
43
|
-
?
|
|
44
|
-
:
|
|
51
|
+
const changeStreamer = runChangeStreamer
|
|
52
|
+
? loadWorker('./server/change-streamer.ts', 'supporting').once('message', resolve)
|
|
53
|
+
: resolve();
|
|
45
54
|
if (numSyncers) {
|
|
46
55
|
// Technically, setting up the CVR DB schema is the responsibility of the Syncer,
|
|
47
56
|
// but it is done here in the main thread because it is wasteful to have all of
|
|
@@ -50,10 +59,13 @@ export default async function runWorker(parent, env) {
|
|
|
50
59
|
await initViewSyncerSchema(lc, cvrDB);
|
|
51
60
|
void cvrDB.end();
|
|
52
61
|
}
|
|
53
|
-
//
|
|
54
|
-
//
|
|
62
|
+
// Wait for the change-streamer to be ready to guarantee that a replica
|
|
63
|
+
// file is present.
|
|
55
64
|
await changeStreamerReady;
|
|
56
|
-
if (
|
|
65
|
+
if (runChangeStreamer && litestream) {
|
|
66
|
+
processes.addSubprocess(startReplicaBackupProcess(config), 'supporting', 'litestream');
|
|
67
|
+
}
|
|
68
|
+
if (litestream) {
|
|
57
69
|
const mode = 'backup';
|
|
58
70
|
const replicator = loadWorker('./server/replicator.ts', 'supporting', mode, mode).once('message', () => subscribeTo(lc, replicator));
|
|
59
71
|
const notifier = createNotifierFrom(lc, replicator);
|
|
@@ -63,9 +75,7 @@ export default async function runWorker(parent, env) {
|
|
|
63
75
|
}
|
|
64
76
|
const syncers = [];
|
|
65
77
|
if (numSyncers) {
|
|
66
|
-
const mode =
|
|
67
|
-
? 'serving-copy'
|
|
68
|
-
: 'serving';
|
|
78
|
+
const mode = litestream ? 'serving-copy' : 'serving';
|
|
69
79
|
const replicator = loadWorker('./server/replicator.ts', 'supporting', mode, mode).once('message', () => subscribeTo(lc, replicator));
|
|
70
80
|
const notifier = createNotifierFrom(lc, replicator);
|
|
71
81
|
for (let i = 0; i < numSyncers; i++) {
|
|
@@ -74,7 +84,7 @@ export default async function runWorker(parent, env) {
|
|
|
74
84
|
syncers.forEach(syncer => handleSubscriptionsFrom(lc, syncer, notifier));
|
|
75
85
|
}
|
|
76
86
|
lc.info?.('waiting for workers to be ready ...');
|
|
77
|
-
if ((await orTimeout(processes.allWorkersReady(),
|
|
87
|
+
if ((await orTimeout(processes.allWorkersReady(), 60_000)) === 'timed-out') {
|
|
78
88
|
lc.info?.(`timed out waiting for readiness (${Date.now() - startMs} ms)`);
|
|
79
89
|
}
|
|
80
90
|
else {
|
|
@@ -90,7 +100,7 @@ export default async function runWorker(parent, env) {
|
|
|
90
100
|
await runUntilKilled(lc, parent ?? process, ...mainServices);
|
|
91
101
|
}
|
|
92
102
|
catch (err) {
|
|
93
|
-
processes.logErrorAndExit(err);
|
|
103
|
+
processes.logErrorAndExit(err, 'dispatcher');
|
|
94
104
|
}
|
|
95
105
|
await processes.done();
|
|
96
106
|
}
|
|
@@ -1 +1 @@
|
|
|
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,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -136,8 +136,21 @@ export declare const multiConfigSchema: {
|
|
|
136
136
|
desc: string[];
|
|
137
137
|
};
|
|
138
138
|
litestream: {
|
|
139
|
-
|
|
140
|
-
|
|
139
|
+
executable: {
|
|
140
|
+
type: v.Optional<string>;
|
|
141
|
+
desc: string[];
|
|
142
|
+
};
|
|
143
|
+
configPath: {
|
|
144
|
+
type: v.Type<string>;
|
|
145
|
+
desc: string[];
|
|
146
|
+
};
|
|
147
|
+
logLevel: {
|
|
148
|
+
type: v.Type<"error" | "debug" | "info" | "warn">;
|
|
149
|
+
};
|
|
150
|
+
backupURL: {
|
|
151
|
+
type: v.Optional<string>;
|
|
152
|
+
desc: string[];
|
|
153
|
+
};
|
|
141
154
|
};
|
|
142
155
|
storageDBTmpDir: {
|
|
143
156
|
type: v.Optional<string>;
|
|
@@ -164,8 +177,12 @@ declare const tenantsSchema: v.ObjectType<{
|
|
|
164
177
|
id: v.Type<string>;
|
|
165
178
|
host: v.Optional<string>;
|
|
166
179
|
path: v.Optional<string>;
|
|
167
|
-
env: v.ObjectType<{
|
|
180
|
+
env: v.ObjectType<Omit<{
|
|
168
181
|
[x: string]: v.Optional<string | undefined>;
|
|
182
|
+
}, "ZERO_REPLICA_FILE" | "ZERO_CVR_DB" | "ZERO_CHANGE_DB"> & {
|
|
183
|
+
ZERO_REPLICA_FILE: v.Type<string>;
|
|
184
|
+
ZERO_CVR_DB: v.Type<string>;
|
|
185
|
+
ZERO_CHANGE_DB: v.Type<string>;
|
|
169
186
|
}, undefined>;
|
|
170
187
|
}, undefined>>;
|
|
171
188
|
}, undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAKtD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsC7B,CAAC;AA4BF,QAAA,MAAM,aAAa;;;;;;;;;;;;;aAEjB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,GACzD,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC;AAExD,wBAAgB,kBAAkB,CAChC,UAAU,GAAE,MAAM,CAAC,UAAwB,EAC3C,IAAI,WAAwB,GAC3B;IAAC,MAAM,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAC,CAgBnD"}
|
|
@@ -29,8 +29,10 @@ export const multiConfigSchema = {
|
|
|
29
29
|
` * and are overridden by values in the tenant's {bold env} object.`,
|
|
30
30
|
` */`,
|
|
31
31
|
` env: \\{`,
|
|
32
|
-
`
|
|
32
|
+
` ZERO_REPLICA_FILE: string`,
|
|
33
33
|
` ZERO_UPSTREAM_DB: string`,
|
|
34
|
+
` ZERO_CVR_DB: string`,
|
|
35
|
+
` ZERO_CHANGE_DB: string`,
|
|
34
36
|
` ...`,
|
|
35
37
|
` \\};`,
|
|
36
38
|
` \\}[];`,
|
|
@@ -54,7 +56,13 @@ const tenantSchema = v.object({
|
|
|
54
56
|
return v.ok(p[0] === '/' ? p : '/' + p);
|
|
55
57
|
})
|
|
56
58
|
.optional(),
|
|
57
|
-
env: zeroEnvSchema.partial()
|
|
59
|
+
env: zeroEnvSchema.partial().extend({
|
|
60
|
+
// Keep these as required fields. Note that ZERO_UPSTREAM_DB is optional as
|
|
61
|
+
// it can be shared provided that each tenant has its own ZERO_SHARD_ID.
|
|
62
|
+
['ZERO_REPLICA_FILE']: v.string(),
|
|
63
|
+
['ZERO_CVR_DB']: v.string(),
|
|
64
|
+
['ZERO_CHANGE_DB']: v.string(),
|
|
65
|
+
}),
|
|
58
66
|
});
|
|
59
67
|
const tenantsSchema = v.object({
|
|
60
68
|
tenants: v.array(tenantSchema),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,oBAAoB,GAErB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD,MAAM,cAAc,GAAG,OAAO,CAAC;AAE/B,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,GAAG,WAAW;IAEd,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,kFAAkF;YAClF,EAAE;YACF,KAAK;YACL,OAAO;YACP,sFAAsF;YACtF,wFAAwF;YACxF,uEAAuE;YACvE,MAAM;YACN,2EAA2E;YAC3E,wEAAwE;YACxE,6BAA6B;YAC7B,OAAO;YACP,gBAAgB;YAChB,sEAAsE;YACtE,kEAAkE;YAClE,6EAA6E;YAC7E,EAAE;YACF,UAAU;YACV,yFAAyF;YACzF,yEAAyE;YACzE,UAAU;YACV,eAAe;YACf,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/main.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAEvB,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAalC,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/main.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAEvB,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAalC,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAsEf"}
|
|
@@ -23,7 +23,12 @@ export default async function runWorker(parent, env) {
|
|
|
23
23
|
// Run a single tenant on main `port`, and skip the TenantDispatcher.
|
|
24
24
|
config.tenants.push({
|
|
25
25
|
id: '',
|
|
26
|
-
env: {
|
|
26
|
+
env: {
|
|
27
|
+
['ZERO_PORT']: String(port),
|
|
28
|
+
['ZERO_CVR_DB']: config.cvr.db,
|
|
29
|
+
['ZERO_CHANGE_DB']: config.change.db,
|
|
30
|
+
['ZERO_REPLICA_FILE']: config.replicaFile,
|
|
31
|
+
},
|
|
27
32
|
});
|
|
28
33
|
}
|
|
29
34
|
// Start the first tenant at (port + 1 + 2) unless explicitly
|
|
@@ -32,6 +37,7 @@ export default async function runWorker(parent, env) {
|
|
|
32
37
|
const tenants = config.tenants.map(tenant => ({
|
|
33
38
|
...tenant,
|
|
34
39
|
worker: childWorker('./server/main.ts', {
|
|
40
|
+
...process.env, // propagate all ENV variables from this process
|
|
35
41
|
...baseEnv, // defaults
|
|
36
42
|
['ZERO_TENANT_ID']: tenant.id,
|
|
37
43
|
['ZERO_PORT']: String((tenantPort += 2)), // and bump the port by 2 thereafter.
|
|
@@ -43,7 +49,7 @@ export default async function runWorker(parent, env) {
|
|
|
43
49
|
}
|
|
44
50
|
const s = tenants.length > 1 ? 's' : '';
|
|
45
51
|
lc.info?.(`waiting for zero-cache${s} to be ready ...`);
|
|
46
|
-
if ((await orTimeout(processes.allWorkersReady(),
|
|
52
|
+
if ((await orTimeout(processes.allWorkersReady(), 60_000)) === 'timed-out') {
|
|
47
53
|
lc.info?.(`timed out waiting for readiness (${Date.now() - startMs} ms)`);
|
|
48
54
|
}
|
|
49
55
|
else {
|
|
@@ -60,7 +66,7 @@ export default async function runWorker(parent, env) {
|
|
|
60
66
|
await runUntilKilled(lc, parent ?? process, ...mainServices);
|
|
61
67
|
}
|
|
62
68
|
catch (err) {
|
|
63
|
-
processes.logErrorAndExit(err);
|
|
69
|
+
processes.logErrorAndExit(err, 'main');
|
|
64
70
|
}
|
|
65
71
|
await processes.done();
|
|
66
72
|
}
|