@rocicorp/zero 0.22.2025071900 → 0.22.2025072500
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/out/{chunk-A6LHZQIK.js → chunk-CPTFADYI.js} +2 -2
- package/out/{chunk-IQCMHXK7.js → chunk-ROYQ5GXF.js} +191 -124
- package/out/{chunk-IQCMHXK7.js.map → chunk-ROYQ5GXF.js.map} +4 -4
- package/out/otel/src/enabled.d.ts +5 -0
- package/out/otel/src/enabled.d.ts.map +1 -0
- package/out/otel/src/enabled.js +16 -0
- package/out/otel/src/enabled.js.map +1 -0
- package/out/react.js +1 -1
- package/out/solid.js +2 -2
- package/out/zero/package.json +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +2 -2
- package/out/zero-cache/src/config/zero-config.js +5 -5
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/server/anonymous-otel-start.d.ts.map +1 -1
- package/out/zero-cache/src/server/anonymous-otel-start.js +21 -17
- package/out/zero-cache/src/server/anonymous-otel-start.js.map +1 -1
- package/out/zero-cache/src/server/logging.d.ts.map +1 -1
- package/out/zero-cache/src/server/logging.js +3 -3
- package/out/zero-cache/src/server/logging.js.map +1 -1
- package/out/zero-cache/src/server/otel-start.d.ts.map +1 -1
- package/out/zero-cache/src/server/otel-start.js +24 -18
- package/out/zero-cache/src/server/otel-start.js.map +1 -1
- package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.js +1 -1
- package/out/zero-cache/src/server/syncer.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.js +12 -1
- package/out/zero-cache/src/services/change-source/pg/schema/init.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts +10 -0
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/shard.js +21 -2
- package/out/zero-cache/src/services/change-source/pg/schema/shard.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js +4 -2
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js.map +1 -1
- package/out/zero-cache/src/services/litestream/commands.d.ts.map +1 -1
- package/out/zero-cache/src/services/litestream/commands.js +50 -23
- package/out/zero-cache/src/services/litestream/commands.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.d.ts +42 -3
- package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.js +14 -1
- package/out/zero-cache/src/services/mutagen/pusher.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.js +28 -0
- package/out/zero-cache/src/services/view-syncer/client-handler.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js +46 -0
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.js +26 -37
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.d.ts.map +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js +5 -0
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js.map +1 -1
- package/out/zero-client/src/client/mutation-tracker.d.ts +7 -2
- package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
- package/out/zero-client/src/client/zero-poke-handler.d.ts +6 -2
- package/out/zero-client/src/client/zero-poke-handler.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-protocol/src/down.d.ts +18 -0
- package/out/zero-protocol/src/down.d.ts.map +1 -1
- package/out/zero-protocol/src/mutations-patch.d.ts +65 -0
- package/out/zero-protocol/src/mutations-patch.d.ts.map +1 -0
- package/out/zero-protocol/src/mutations-patch.js +16 -0
- package/out/zero-protocol/src/mutations-patch.js.map +1 -0
- package/out/zero-protocol/src/poke.d.ts +36 -0
- package/out/zero-protocol/src/poke.d.ts.map +1 -1
- package/out/zero-protocol/src/poke.js +3 -0
- package/out/zero-protocol/src/poke.js.map +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
- package/out/zero-protocol/src/protocol-version.js +3 -1
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-protocol/src/push.d.ts +8 -3
- package/out/zero-protocol/src/push.d.ts.map +1 -1
- package/out/zero-protocol/src/push.js +7 -3
- package/out/zero-protocol/src/push.js.map +1 -1
- package/out/zero-protocol/src/up.d.ts +4 -1
- package/out/zero-protocol/src/up.d.ts.map +1 -1
- package/out/zero-protocol/src/up.js +2 -2
- package/out/zero-protocol/src/up.js.map +1 -1
- package/out/zero.js +2 -2
- package/package.json +1 -1
- /package/out/{chunk-A6LHZQIK.js.map → chunk-CPTFADYI.js.map} +0 -0
|
@@ -34,7 +34,7 @@ export function newReplicationSlot(shard) {
|
|
|
34
34
|
function defaultPublicationName(appID, shardID) {
|
|
35
35
|
return `_${appID}_public_${shardID}`;
|
|
36
36
|
}
|
|
37
|
-
function metadataPublicationName(appID, shardID) {
|
|
37
|
+
export function metadataPublicationName(appID, shardID) {
|
|
38
38
|
return `_${appID}_metadata_${shardID}`;
|
|
39
39
|
}
|
|
40
40
|
// The GLOBAL_SETUP must be idempotent as it can be run multiple times for different shards.
|
|
@@ -95,6 +95,24 @@ export function getClientsTableDefinition(schema) {
|
|
|
95
95
|
PRIMARY KEY("clientGroupID", "clientID")
|
|
96
96
|
);`;
|
|
97
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Tracks the results of mutations.
|
|
100
|
+
* 1. It is an error for the same mutation ID to be used twice.
|
|
101
|
+
* 2. The result is JSONB to allow for arbitrary results.
|
|
102
|
+
*
|
|
103
|
+
* The tables must be cleaned up as the clients
|
|
104
|
+
* receive the mutation responses and as clients are removed.
|
|
105
|
+
*/
|
|
106
|
+
export function getMutationsTableDefinition(schema) {
|
|
107
|
+
return /*sql*/ `
|
|
108
|
+
CREATE TABLE ${schema}."mutations" (
|
|
109
|
+
"clientGroupID" TEXT NOT NULL,
|
|
110
|
+
"clientID" TEXT NOT NULL,
|
|
111
|
+
"mutationID" BIGINT NOT NULL,
|
|
112
|
+
"result" JSON NOT NULL,
|
|
113
|
+
PRIMARY KEY("clientGroupID", "clientID", "mutationID")
|
|
114
|
+
);`;
|
|
115
|
+
}
|
|
98
116
|
export const SHARD_CONFIG_TABLE = 'shardConfig';
|
|
99
117
|
export function shardSetup(shardConfig, metadataPublication) {
|
|
100
118
|
const app = id(appSchema(shardConfig));
|
|
@@ -105,9 +123,10 @@ export function shardSetup(shardConfig, metadataPublication) {
|
|
|
105
123
|
CREATE SCHEMA IF NOT EXISTS ${shard};
|
|
106
124
|
|
|
107
125
|
${getClientsTableDefinition(shard)}
|
|
126
|
+
${getMutationsTableDefinition(shard)}
|
|
108
127
|
|
|
109
128
|
CREATE PUBLICATION ${id(metadataPublication)}
|
|
110
|
-
FOR TABLE ${app}."schemaVersions", ${app}."permissions", TABLE ${shard}."clients";
|
|
129
|
+
FOR TABLE ${app}."schemaVersions", ${app}."permissions", TABLE ${shard}."clients", ${shard}."mutations";
|
|
111
130
|
|
|
112
131
|
CREATE TABLE ${shard}."${SHARD_CONFIG_TABLE}" (
|
|
113
132
|
"publications" TEXT[] NOT NULL,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shard.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,MAAM,EAAC,MAAM,yCAAyC,CAAC;AAC/D,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAC5D,OAAO,EAAC,OAAO,EAAC,MAAM,kDAAkD,CAAC;AAGzE,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,4BAA4B,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EACL,kBAAkB,EAClB,eAAe,GAGhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAEzC,MAAM,UAAU,yBAAyB,CAAC,EAAC,KAAK,EAAQ;IACtD,OAAO,IAAI,KAAK,GAAG,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAU;IAC9D,OAAO,GAAG,KAAK,IAAI,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,MAAM,EAAC,KAAK,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,GAAG,KAAK,IAAI,QAAQ,GAAG,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,oDAAoD;IACpD,8BAA8B;IAC9B,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,qBAAqB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AACnD,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa,EAAE,OAAwB;IACrE,OAAO,IAAI,KAAK,WAAW,OAAO,EAAE,CAAC;AACvC,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"shard.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/schema/shard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LogContext } from '@rocicorp/logger';
|
|
2
2
|
import { IncomingMessage } from 'node:http';
|
|
3
3
|
import { type Worker } from '../../types/processes.ts';
|
|
4
|
-
import type
|
|
4
|
+
import { type ShardID } from '../../types/shards.ts';
|
|
5
5
|
import { type Source } from '../../types/streams.ts';
|
|
6
6
|
import { HttpService, type Options } from '../http-service.ts';
|
|
7
7
|
import type { BackupMonitor } from './backup-monitor.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-streamer-http.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAM1C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"change-streamer-http.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAM1C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAC,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAsB,KAAK,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAIxE,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,KAAK,eAAe,EAAC,MAAM,eAAe,CAAC;AAW1E,qBAAa,wBAAyB,SAAQ,WAAW;;IACvD,QAAQ,CAAC,EAAE,iCAAiC;gBAK1C,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,GAAG,IAAI;CAsFtC;AAED,qBAAa,wBAAyB,YAAW,cAAc;;gBAO3D,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,GAAG,SAAS;IA+BjC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IASjE,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CAQrE;AAED,KAAK,cAAc,GAAG,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAE/D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,iBAAiB,CAc3E"}
|
|
@@ -6,6 +6,7 @@ import { assert } from "../../../../shared/src/asserts.js";
|
|
|
6
6
|
import { must } from "../../../../shared/src/must.js";
|
|
7
7
|
import { pgClient } from "../../types/pg.js";
|
|
8
8
|
import {} from "../../types/processes.js";
|
|
9
|
+
import {} from "../../types/shards.js";
|
|
9
10
|
import { streamIn, streamOut } from "../../types/streams.js";
|
|
10
11
|
import { URLParams } from "../../types/url-params.js";
|
|
11
12
|
import { installWebSocketReceiver } from "../../types/websocket-handoff.js";
|
|
@@ -52,6 +53,7 @@ export class ChangeStreamerHttpServer extends HttpService {
|
|
|
52
53
|
#reserveSnapshot = (ws, req) => {
|
|
53
54
|
try {
|
|
54
55
|
const url = new URL(req.url ?? '', req.headers.origin ?? 'http://localhost');
|
|
56
|
+
checkProtocolVersion(url.pathname);
|
|
55
57
|
const taskID = url.searchParams.get('taskID');
|
|
56
58
|
if (!taskID) {
|
|
57
59
|
throw new Error('Missing taskID in snapshot request');
|
|
@@ -124,7 +126,7 @@ export class ChangeStreamerHttpClient {
|
|
|
124
126
|
}
|
|
125
127
|
export function getSubscriberContext(req) {
|
|
126
128
|
const url = new URL(req.url ?? '', req.headers.origin ?? 'http://localhost');
|
|
127
|
-
const protocolVersion =
|
|
129
|
+
const protocolVersion = checkProtocolVersion(url.pathname);
|
|
128
130
|
const params = new URLParams(url);
|
|
129
131
|
return {
|
|
130
132
|
protocolVersion,
|
|
@@ -136,7 +138,7 @@ export function getSubscriberContext(req) {
|
|
|
136
138
|
initial: params.getBoolean('initial'),
|
|
137
139
|
};
|
|
138
140
|
}
|
|
139
|
-
function
|
|
141
|
+
function checkProtocolVersion(pathname) {
|
|
140
142
|
const match = PATH_REGEX.exec(pathname);
|
|
141
143
|
if (!match) {
|
|
142
144
|
throw new Error(`invalid path: ${pathname}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-streamer-http.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAC1C,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAC,QAAQ,EAAkB,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAa,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"change-streamer-http.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/change-streamer-http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/litestream/commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAW,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAC,YAAY,EAAQ,MAAM,oBAAoB,CAAC;AAKvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/litestream/commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAW,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAC,YAAY,EAAQ,MAAM,oBAAoB,CAAC;AAKvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAW5D;;;GAGG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC,CAwBf;AAgHD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,CAO1E"}
|
|
@@ -62,11 +62,12 @@ function getLitestream(config, logLevelOverride, backupURLOverride) {
|
|
|
62
62
|
}
|
|
63
63
|
async function tryRestore(lc, config) {
|
|
64
64
|
const { changeStreamer } = config;
|
|
65
|
+
const isViewSyncer = changeStreamer.mode === 'discover' || changeStreamer.uri !== undefined;
|
|
65
66
|
// Fire off a snapshot reservation to the current replication-manager
|
|
66
67
|
// (if there is one).
|
|
67
|
-
const backupURL = reserveAndGetSnapshotLocation(lc, config);
|
|
68
|
+
const backupURL = reserveAndGetSnapshotLocation(lc, config, isViewSyncer);
|
|
68
69
|
let backupURLOverride;
|
|
69
|
-
if (
|
|
70
|
+
if (isViewSyncer) {
|
|
70
71
|
// The return value is required by view-syncers ...
|
|
71
72
|
backupURLOverride = await backupURL;
|
|
72
73
|
lc.info?.(`restoring backup from ${backupURLOverride}`);
|
|
@@ -113,34 +114,60 @@ export function startReplicaBackupProcess(config) {
|
|
|
113
114
|
windowsHide: true,
|
|
114
115
|
});
|
|
115
116
|
}
|
|
116
|
-
|
|
117
|
+
function reserveAndGetSnapshotLocation(lc, config, isViewSyncer) {
|
|
117
118
|
const { promise: backupURL, resolve, reject } = resolver();
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
// Capture the value of the status message that the change-streamer
|
|
125
|
-
// (i.e. BackupMonitor) returns, and hold the connection open to
|
|
126
|
-
// "reserve" the snapshot and prevent change log cleanup.
|
|
127
|
-
//
|
|
128
|
-
// The change-streamer itself will close the connection when the
|
|
129
|
-
// subscription is started (or the reservation retried).
|
|
130
|
-
void (async function () {
|
|
119
|
+
void (async function () {
|
|
120
|
+
const abort = new AbortController();
|
|
121
|
+
process.on('SIGINT', () => abort.abort());
|
|
122
|
+
process.on('SIGTERM', () => abort.abort());
|
|
123
|
+
for (let i = 0;; i++) {
|
|
124
|
+
let err = '';
|
|
131
125
|
try {
|
|
132
|
-
|
|
126
|
+
let resolved = false;
|
|
127
|
+
const stream = await reserveSnapshot(lc, config);
|
|
128
|
+
for await (const msg of stream) {
|
|
129
|
+
// Capture the value of the status message that the change-streamer
|
|
130
|
+
// (i.e. BackupMonitor) returns, and hold the connection open to
|
|
131
|
+
// "reserve" the snapshot and prevent change log cleanup.
|
|
133
132
|
resolve(msg[1].backupURL);
|
|
133
|
+
resolved = true;
|
|
134
|
+
}
|
|
135
|
+
// The change-streamer itself closes the connection when the
|
|
136
|
+
// subscription is started (or the reservation retried).
|
|
137
|
+
if (resolved) {
|
|
138
|
+
break;
|
|
134
139
|
}
|
|
135
140
|
}
|
|
136
141
|
catch (e) {
|
|
137
|
-
|
|
142
|
+
err = e;
|
|
138
143
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
+
if (!isViewSyncer) {
|
|
145
|
+
return reject(err);
|
|
146
|
+
}
|
|
147
|
+
// Retry in the view-syncer since it cannot proceed until it connects
|
|
148
|
+
// to a (compatible) replication-manager. In particular, a
|
|
149
|
+
// replication-manager that does not support the view-syncer's
|
|
150
|
+
// change-streamer protocol will close the stream with an error; this
|
|
151
|
+
// retry logic essentially delays the startup of a view-syncer until
|
|
152
|
+
// a compatible replication-manager has been rolled out, allowing
|
|
153
|
+
// replication-manager and view-syncer services to be updated in
|
|
154
|
+
// parallel.
|
|
155
|
+
lc.warn?.(`Unable to reserve snapshot (attempt ${i + 1}). Retrying in 5 seconds.`, String(err));
|
|
156
|
+
try {
|
|
157
|
+
await sleep(5000, abort.signal);
|
|
158
|
+
}
|
|
159
|
+
catch (e) {
|
|
160
|
+
return reject(e);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
})();
|
|
144
164
|
return backupURL;
|
|
145
165
|
}
|
|
166
|
+
function reserveSnapshot(lc, config) {
|
|
167
|
+
assertNormalized(config);
|
|
168
|
+
const { taskID, change, changeStreamer } = config;
|
|
169
|
+
const shardID = getShardConfig(config);
|
|
170
|
+
const changeStreamerClient = new ChangeStreamerHttpClient(lc, shardID, change.db, changeStreamer.uri);
|
|
171
|
+
return changeStreamerClient.reserveSnapshot(taskID);
|
|
172
|
+
}
|
|
146
173
|
//# sourceMappingURL=commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/litestream/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAC,KAAK,EAAC,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/litestream/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import type { LogContext } from '@rocicorp/logger';
|
|
2
2
|
import type { UserMutateParams } from '../../../../zero-protocol/src/connect.ts';
|
|
3
3
|
import type { Downstream } from '../../../../zero-protocol/src/down.ts';
|
|
4
|
-
import { type PushBody } from '../../../../zero-protocol/src/push.ts';
|
|
4
|
+
import { type MutationID, type PushBody } from '../../../../zero-protocol/src/push.ts';
|
|
5
5
|
import { type ZeroConfig } from '../../config/zero-config.ts';
|
|
6
6
|
import type { Source } from '../../types/streams.ts';
|
|
7
7
|
import { Subscription } from '../../types/subscription.ts';
|
|
8
8
|
import type { HandlerResult, StreamResult } from '../../workers/connection.ts';
|
|
9
9
|
import type { RefCountedService, Service } from '../service.ts';
|
|
10
|
+
import type { PostgresDB } from '../../types/pg.ts';
|
|
10
11
|
export interface Pusher extends RefCountedService {
|
|
11
12
|
readonly pushURL: string | undefined;
|
|
12
|
-
enqueuePush(clientID: string, push: PushBody, jwt: string | undefined, httpCookie: string | undefined): HandlerResult;
|
|
13
13
|
initConnection(clientID: string, wsID: string, userPushParams: UserMutateParams | undefined): Source<Downstream>;
|
|
14
|
+
enqueuePush(clientID: string, push: PushBody, jwt: string | undefined, httpCookie: string | undefined): HandlerResult;
|
|
15
|
+
ackMutationResponses(upToID: MutationID): Promise<void>;
|
|
14
16
|
}
|
|
15
17
|
type Config = Pick<ZeroConfig, 'app' | 'shard'>;
|
|
16
18
|
/**
|
|
@@ -29,7 +31,7 @@ type Config = Pick<ZeroConfig, 'app' | 'shard'>;
|
|
|
29
31
|
export declare class PusherService implements Service, Pusher {
|
|
30
32
|
#private;
|
|
31
33
|
readonly id: string;
|
|
32
|
-
constructor(appConfig: Config, pushConfig: ZeroConfig['push'] & {
|
|
34
|
+
constructor(upstream: PostgresDB, appConfig: Config, pushConfig: ZeroConfig['push'] & {
|
|
33
35
|
url: string[];
|
|
34
36
|
}, lc: LogContext, clientGroupID: string);
|
|
35
37
|
get pushURL(): string | undefined;
|
|
@@ -144,6 +146,24 @@ export declare class PusherService implements Service, Pusher {
|
|
|
144
146
|
} | {
|
|
145
147
|
op: "clear";
|
|
146
148
|
})[] | undefined;
|
|
149
|
+
mutationsPatch?: {
|
|
150
|
+
op: "put";
|
|
151
|
+
mutation: {
|
|
152
|
+
id: {
|
|
153
|
+
id: number;
|
|
154
|
+
clientID: string;
|
|
155
|
+
};
|
|
156
|
+
result: {
|
|
157
|
+
details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
158
|
+
error: "app";
|
|
159
|
+
} | {
|
|
160
|
+
details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
161
|
+
error: "oooMutation" | "alreadyProcessed";
|
|
162
|
+
} | {
|
|
163
|
+
data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
164
|
+
};
|
|
165
|
+
};
|
|
166
|
+
}[] | undefined;
|
|
147
167
|
pokeID: string;
|
|
148
168
|
}] | ["pokeEnd", {
|
|
149
169
|
cancel?: boolean | undefined;
|
|
@@ -264,6 +284,24 @@ export declare class PusherService implements Service, Pusher {
|
|
|
264
284
|
} | {
|
|
265
285
|
op: "clear";
|
|
266
286
|
})[] | undefined;
|
|
287
|
+
mutationsPatch?: {
|
|
288
|
+
op: "put";
|
|
289
|
+
mutation: {
|
|
290
|
+
id: {
|
|
291
|
+
id: number;
|
|
292
|
+
clientID: string;
|
|
293
|
+
};
|
|
294
|
+
result: {
|
|
295
|
+
details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
296
|
+
error: "app";
|
|
297
|
+
} | {
|
|
298
|
+
details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
299
|
+
error: "oooMutation" | "alreadyProcessed";
|
|
300
|
+
} | {
|
|
301
|
+
data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
302
|
+
};
|
|
303
|
+
};
|
|
304
|
+
}[] | undefined;
|
|
267
305
|
pokeID: string;
|
|
268
306
|
}] | ["pokeEnd", {
|
|
269
307
|
cancel?: boolean | undefined;
|
|
@@ -275,6 +313,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
275
313
|
lastMutationIDChanges: Record<string, number>;
|
|
276
314
|
}]>;
|
|
277
315
|
enqueuePush(clientID: string, push: PushBody, jwt: string | undefined, httpCookie: string | undefined): Exclude<HandlerResult, StreamResult>;
|
|
316
|
+
ackMutationResponses(upToID: MutationID): Promise<void>;
|
|
278
317
|
ref(): void;
|
|
279
318
|
unref(): void;
|
|
280
319
|
hasRefs(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAG5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAc,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC7E,OAAO,KAAK,EAAC,iBAAiB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { ErrorForClient } from "../../types/error-for-client.js";
|
|
|
11
11
|
import { Subscription } from "../../types/subscription.js";
|
|
12
12
|
import { fetchFromAPIServer } from "../../custom/fetch.js";
|
|
13
13
|
import { recordMutation } from "../../server/anonymous-otel-start.js";
|
|
14
|
+
import { upstreamSchema } from "../../types/shards.js";
|
|
14
15
|
/**
|
|
15
16
|
* Receives push messages from zero-client and forwards
|
|
16
17
|
* them the the user's API server.
|
|
@@ -29,10 +30,14 @@ export class PusherService {
|
|
|
29
30
|
#pusher;
|
|
30
31
|
#queue;
|
|
31
32
|
#pushConfig;
|
|
33
|
+
#upstream;
|
|
34
|
+
#config;
|
|
32
35
|
#stopped;
|
|
33
36
|
#refCount = 0;
|
|
34
37
|
#isStopped = false;
|
|
35
|
-
constructor(appConfig, pushConfig, lc, clientGroupID) {
|
|
38
|
+
constructor(upstream, appConfig, pushConfig, lc, clientGroupID) {
|
|
39
|
+
this.#config = appConfig;
|
|
40
|
+
this.#upstream = upstream;
|
|
36
41
|
this.#queue = new Queue();
|
|
37
42
|
this.#pusher = new PushWorker(appConfig, lc, pushConfig.url, pushConfig.apiKey, this.#queue);
|
|
38
43
|
this.id = clientGroupID;
|
|
@@ -53,6 +58,14 @@ export class PusherService {
|
|
|
53
58
|
type: 'ok',
|
|
54
59
|
};
|
|
55
60
|
}
|
|
61
|
+
async ackMutationResponses(upToID) {
|
|
62
|
+
// delete the relevant rows from the `mutations` table
|
|
63
|
+
const sql = this.#upstream;
|
|
64
|
+
await sql `DELETE FROM ${upstreamSchema({
|
|
65
|
+
appID: this.#config.app.id,
|
|
66
|
+
shardNum: this.#config.shard.num,
|
|
67
|
+
})}.mutations WHERE "clientGroupID" = ${this.id} AND "clientID" = ${upToID.clientID} AND "mutationID" <= ${upToID}`;
|
|
68
|
+
}
|
|
56
69
|
ref() {
|
|
57
70
|
assert(!this.#isStopped, 'PusherService is already stopped');
|
|
58
71
|
++this.#refCount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pusher.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pusher.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,UAAU,IAAI,cAAc,EAClC,MAAM,gCAAgC,CAAC;AAMxC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AACtE,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,+CAA+C,CAAC;AASnF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAiB,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAKL,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"client-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,UAAU,IAAI,cAAc,EAClC,MAAM,gCAAgC,CAAC;AAMxC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AACtE,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,+CAA+C,CAAC;AASnF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAiB,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAKL,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;IACV,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,cAAc,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,aAAa,CAAC;AAExD,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,GAAG,CAAC,YAAY,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9C;AAQD,uEAAuE;AACvE,wBAAgB,SAAS,CACvB,OAAO,EAAE,aAAa,EAAE,EACxB,gBAAgB,EAAE,UAAU,EAC5B,cAAc,CAAC,EAAE,cAAc,GAC9B,WAAW,CAyBb;AAMD;;GAEG;AACH,qBAAa,aAAa;;IAExB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBASpB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC;IActC,OAAO,IAAI,kBAAkB;IAS7B,IAAI,CAAC,CAAC,EAAE,OAAO;IAQf,KAAK,CAAC,MAAM,EAAE,MAAM;IAKpB,SAAS,CACP,gBAAgB,EAAE,UAAU,EAC5B,cAAc,CAAC,EAAE,cAAc,GAC9B,WAAW;IA8IR,iBAAiB,CACrB,EAAE,EAAE,UAAU,EACd,gBAAgB,EAAE,MAAM,EAAE,EAC1B,qBAAqB,EAAE,MAAM,EAAE;IAajC,mBAAmB,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;CA0BrE;AA0CD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAkB9D"}
|
|
@@ -10,6 +10,7 @@ import { getLogLevel } from "../../types/error-for-client.js";
|
|
|
10
10
|
import { getErrorForClientIfSchemaVersionNotSupported, } from "../../types/schema-versions.js";
|
|
11
11
|
import { upstreamSchema } from "../../types/shards.js";
|
|
12
12
|
import { cmpVersions, cookieToVersion, versionToCookie, versionToNullableCookie, } from "./schema/types.js";
|
|
13
|
+
import { mutationResultSchema } from "../../../../zero-protocol/src/push.js";
|
|
13
14
|
const NOOP = {
|
|
14
15
|
addPatch: () => promiseVoid,
|
|
15
16
|
cancel: () => promiseVoid,
|
|
@@ -49,6 +50,7 @@ export class ClientHandler {
|
|
|
49
50
|
clientID;
|
|
50
51
|
wsID;
|
|
51
52
|
#zeroClientsTable;
|
|
53
|
+
#zeroMutationsTable;
|
|
52
54
|
#lc;
|
|
53
55
|
#downstream;
|
|
54
56
|
#baseVersion;
|
|
@@ -59,6 +61,7 @@ export class ClientHandler {
|
|
|
59
61
|
this.clientID = clientID;
|
|
60
62
|
this.wsID = wsID;
|
|
61
63
|
this.#zeroClientsTable = `${upstreamSchema(shard)}.clients`;
|
|
64
|
+
this.#zeroMutationsTable = `${upstreamSchema(shard)}.mutations`;
|
|
62
65
|
this.#lc = lc;
|
|
63
66
|
this.#downstream = downstream;
|
|
64
67
|
this.#baseVersion = cookieToVersion(baseCookie);
|
|
@@ -141,6 +144,25 @@ export class ClientHandler {
|
|
|
141
144
|
if (patch.id.table === this.#zeroClientsTable) {
|
|
142
145
|
this.#updateLMIDs((body.lastMutationIDChanges ??= {}), patch);
|
|
143
146
|
}
|
|
147
|
+
else if (patch.id.table === this.#zeroMutationsTable) {
|
|
148
|
+
const patches = (body.mutationsPatch ??= []);
|
|
149
|
+
if (op === 'put') {
|
|
150
|
+
const row = v.parse(ensureSafeJSON(patch.contents), mutationRowSchema, 'passthrough');
|
|
151
|
+
patches.push({
|
|
152
|
+
op: 'put',
|
|
153
|
+
mutation: {
|
|
154
|
+
id: {
|
|
155
|
+
clientID: row.clientID,
|
|
156
|
+
id: row.mutationID,
|
|
157
|
+
},
|
|
158
|
+
result: row.result,
|
|
159
|
+
},
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
// no need to deal with `del` as the mutation results are ephemeral on the client.
|
|
164
|
+
}
|
|
165
|
+
}
|
|
144
166
|
else {
|
|
145
167
|
(body.rowsPatch ??= []).push(makeRowPatch(patch));
|
|
146
168
|
}
|
|
@@ -224,6 +246,12 @@ const lmidRowSchema = v.object({
|
|
|
224
246
|
clientID: v.string(),
|
|
225
247
|
lastMutationID: v.number(), // Actually returned as a bigint, but converted by ensureSafeJSON().
|
|
226
248
|
});
|
|
249
|
+
const mutationRowSchema = v.object({
|
|
250
|
+
clientGroupID: v.string(),
|
|
251
|
+
clientID: v.string(),
|
|
252
|
+
mutationID: v.number(),
|
|
253
|
+
result: mutationResultSchema,
|
|
254
|
+
});
|
|
227
255
|
function makeRowPatch(patch) {
|
|
228
256
|
const { op, id: { table: tableName, rowKey: id }, } = patch;
|
|
229
257
|
switch (op) {
|