@rocicorp/zero 0.23.2025090402 → 0.24.2025090402
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-Q2AQC47T.js → chunk-4NLQ25GZ.js} +2 -2
- package/out/{chunk-2IK4AWFW.js → chunk-P6JME3HC.js} +18 -27
- package/out/chunk-P6JME3HC.js.map +7 -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/custom/fetch.d.ts +2 -1
- package/out/zero-cache/src/custom/fetch.d.ts.map +1 -1
- package/out/zero-cache/src/custom/fetch.js +8 -6
- package/out/zero-cache/src/custom/fetch.js.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.d.ts +3 -2
- package/out/zero-cache/src/custom-queries/transform-query.d.ts.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.js +6 -3
- package/out/zero-cache/src/custom-queries/transform-query.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.d.ts +2 -3
- package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.js +25 -6
- package/out/zero-cache/src/services/mutagen/pusher.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts +1 -0
- 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 +20 -3
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js +1 -1
- package/out/zero-cache/src/workers/syncer-ws-message-handler.js.map +1 -1
- package/out/zero-client/src/client/options.d.ts +8 -12
- package/out/zero-client/src/client/options.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts +1 -2
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-protocol/src/connect.d.ts +4 -32
- package/out/zero-protocol/src/connect.d.ts.map +1 -1
- package/out/zero-protocol/src/connect.js +2 -17
- package/out/zero-protocol/src/connect.js.map +1 -1
- package/out/zero-protocol/src/up.d.ts +2 -8
- package/out/zero-protocol/src/up.d.ts.map +1 -1
- package/out/zero.js +2 -2
- package/package.json +1 -1
- package/out/chunk-2IK4AWFW.js.map +0 -7
- /package/out/{chunk-Q2AQC47T.js.map → chunk-4NLQ25GZ.js.map} +0 -0
package/out/react.js
CHANGED
package/out/solid.js
CHANGED
package/out/zero/package.json
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LogContext } from '@rocicorp/logger';
|
|
1
2
|
import { type ShardID } from '../types/shards.ts';
|
|
2
3
|
import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
|
|
3
4
|
export type HeaderOptions = {
|
|
@@ -5,7 +6,7 @@ export type HeaderOptions = {
|
|
|
5
6
|
token?: string | undefined;
|
|
6
7
|
cookie?: string | undefined;
|
|
7
8
|
};
|
|
8
|
-
export declare function fetchFromAPIServer(url: string, allowedUrls: string[], shard: ShardID, headerOptions: HeaderOptions,
|
|
9
|
+
export declare function fetchFromAPIServer(lc: LogContext, url: string, allowedUrls: string[], shard: ShardID, headerOptions: HeaderOptions, body: ReadonlyJSONValue): Promise<Response>;
|
|
9
10
|
/**
|
|
10
11
|
* Returns true if:
|
|
11
12
|
* 1. the url is an exact match with one of the allowedUrls
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAiB,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAKnE,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EAAE,EACrB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,iBAAiB,qBAoExB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CA4CpE"}
|
|
@@ -3,7 +3,11 @@ import { upstreamSchema } from "../types/shards.js";
|
|
|
3
3
|
import { ErrorForClient } from "../types/error-for-client.js";
|
|
4
4
|
import { ErrorKind } from "../../../zero-protocol/src/error-kind.js";
|
|
5
5
|
const reservedParams = ['schema', 'appID'];
|
|
6
|
-
export async function fetchFromAPIServer(url, allowedUrls, shard, headerOptions,
|
|
6
|
+
export async function fetchFromAPIServer(lc, url, allowedUrls, shard, headerOptions, body) {
|
|
7
|
+
lc.info?.('fetchFromAPIServer called', {
|
|
8
|
+
url,
|
|
9
|
+
allowedUrls,
|
|
10
|
+
});
|
|
7
11
|
if (!urlMatch(url, allowedUrls)) {
|
|
8
12
|
throw new Error(`URL "${url}" is not allowed by the ZERO_MUTATE/GET_QUERIES_URL configuration`);
|
|
9
13
|
}
|
|
@@ -21,16 +25,14 @@ export async function fetchFromAPIServer(url, allowedUrls, shard, headerOptions,
|
|
|
21
25
|
}
|
|
22
26
|
const urlObj = new URL(url);
|
|
23
27
|
const params = new URLSearchParams(urlObj.search);
|
|
24
|
-
for (const [key, value] of Object.entries(queryParams ?? {})) {
|
|
25
|
-
params.append(key, value);
|
|
26
|
-
}
|
|
27
28
|
for (const reserved of reservedParams) {
|
|
28
29
|
assert(!params.has(reserved), `The push URL cannot contain the reserved query param "${reserved}"`);
|
|
29
30
|
}
|
|
30
31
|
params.append('schema', upstreamSchema(shard));
|
|
31
32
|
params.append('appID', shard.appID);
|
|
32
33
|
urlObj.search = params.toString();
|
|
33
|
-
const
|
|
34
|
+
const finalUrl = urlObj.toString();
|
|
35
|
+
const response = await fetch(finalUrl, {
|
|
34
36
|
method: 'POST',
|
|
35
37
|
headers,
|
|
36
38
|
body: JSON.stringify(body),
|
|
@@ -68,7 +70,7 @@ export async function fetchFromAPIServer(url, allowedUrls, shard, headerOptions,
|
|
|
68
70
|
* - "https://*.*.example.com" does not match "https://api.example.com" (only one subdomain)
|
|
69
71
|
*/
|
|
70
72
|
export function urlMatch(url, allowedUrls) {
|
|
71
|
-
assert(url.includes('*') === false, '
|
|
73
|
+
assert(url.includes('*') === false, 'URL to fetch may not include `*`');
|
|
72
74
|
// ignore query parameters in the URL
|
|
73
75
|
url = url.split('?')[0];
|
|
74
76
|
for (let allowedUrl of allowedUrls) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LogContext } from '@rocicorp/logger';
|
|
1
2
|
import type { TransformedAndHashed } from '../auth/read-authorizer.ts';
|
|
2
3
|
import type { CustomQueryRecord } from '../services/view-syncer/schema/types.ts';
|
|
3
4
|
import { type ErroredQuery } from '../../../zero-protocol/src/custom-queries.ts';
|
|
@@ -24,10 +25,10 @@ export type HttpError = {
|
|
|
24
25
|
*/
|
|
25
26
|
export declare class CustomQueryTransformer {
|
|
26
27
|
#private;
|
|
27
|
-
constructor(config: {
|
|
28
|
+
constructor(lc: LogContext, config: {
|
|
28
29
|
url: string[];
|
|
29
30
|
forwardCookies: boolean;
|
|
30
31
|
}, shard: ShardID);
|
|
31
|
-
transform(headerOptions: HeaderOptions, queries: Iterable<CustomQueryRecord
|
|
32
|
+
transform(headerOptions: HeaderOptions, queries: Iterable<CustomQueryRecord>, userQueryURL: string | undefined): Promise<(TransformedAndHashed | ErroredQuery)[]>;
|
|
32
33
|
}
|
|
33
34
|
//# sourceMappingURL=transform-query.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-query.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom-queries/transform-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAqB,KAAK,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAMhD,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,qBAAa,sBAAsB;;
|
|
1
|
+
{"version":3,"file":"transform-query.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom-queries/transform-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAqB,KAAK,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAMhD,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,qBAAa,sBAAsB;;gBAU/B,EAAE,EAAE,UAAU,EACd,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,EAAE,CAAC;QACd,cAAc,EAAE,OAAO,CAAC;KACzB,EACD,KAAK,EAAE,OAAO;IAQV,SAAS,CACb,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EACpC,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAAC,CAAC,oBAAoB,GAAG,YAAY,CAAC,EAAE,CAAC;CAyFpD"}
|
|
@@ -22,12 +22,14 @@ export class CustomQueryTransformer {
|
|
|
22
22
|
#shard;
|
|
23
23
|
#cache;
|
|
24
24
|
#config;
|
|
25
|
-
|
|
25
|
+
#lc;
|
|
26
|
+
constructor(lc, config, shard) {
|
|
26
27
|
this.#config = config;
|
|
27
28
|
this.#shard = shard;
|
|
29
|
+
this.#lc = lc;
|
|
28
30
|
this.#cache = new TimedCache(5000); // 5 seconds cache TTL
|
|
29
31
|
}
|
|
30
|
-
async transform(headerOptions, queries) {
|
|
32
|
+
async transform(headerOptions, queries, userQueryURL) {
|
|
31
33
|
const request = [];
|
|
32
34
|
const cachedResponses = [];
|
|
33
35
|
if (!this.#config.forwardCookies && headerOptions.cookie) {
|
|
@@ -56,7 +58,8 @@ export class CustomQueryTransformer {
|
|
|
56
58
|
}
|
|
57
59
|
let response;
|
|
58
60
|
try {
|
|
59
|
-
response = await fetchFromAPIServer(
|
|
61
|
+
response = await fetchFromAPIServer(this.#lc, userQueryURL ??
|
|
62
|
+
must(this.#config.url[0], 'A ZERO_GET_QUERIES_URL must be configured for custom queries'), this.#config.url, this.#shard, headerOptions, ['transform', request]);
|
|
60
63
|
}
|
|
61
64
|
catch (e) {
|
|
62
65
|
return request.map(r => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-query.js","sourceRoot":"","sources":["../../../../../zero-cache/src/custom-queries/transform-query.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transform-query.js","sourceRoot":"","sources":["../../../../../zero-cache/src/custom-queries/transform-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { LogContext } from '@rocicorp/logger';
|
|
2
|
-
import type { UserMutateParams } from '../../../../zero-protocol/src/connect.ts';
|
|
3
2
|
import type { Downstream } from '../../../../zero-protocol/src/down.ts';
|
|
4
3
|
import { type MutationID, type PushBody } from '../../../../zero-protocol/src/push.ts';
|
|
5
4
|
import { type ZeroConfig } from '../../config/zero-config.ts';
|
|
@@ -10,7 +9,7 @@ import type { HandlerResult, StreamResult } from '../../workers/connection.ts';
|
|
|
10
9
|
import type { RefCountedService, Service } from '../service.ts';
|
|
11
10
|
export interface Pusher extends RefCountedService {
|
|
12
11
|
readonly pushURL: string | undefined;
|
|
13
|
-
initConnection(clientID: string, wsID: string,
|
|
12
|
+
initConnection(clientID: string, wsID: string, userPushURL: string | undefined): Source<Downstream>;
|
|
14
13
|
enqueuePush(clientID: string, push: PushBody, jwt: string | undefined, httpCookie: string | undefined): HandlerResult;
|
|
15
14
|
ackMutationResponses(upToID: MutationID): Promise<void>;
|
|
16
15
|
}
|
|
@@ -35,7 +34,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
35
34
|
url: string[];
|
|
36
35
|
}, lc: LogContext, clientGroupID: string);
|
|
37
36
|
get pushURL(): string | undefined;
|
|
38
|
-
initConnection(clientID: string, wsID: string,
|
|
37
|
+
initConnection(clientID: string, wsID: string, userPushURL: string | undefined): Subscription<["deleteClients", {
|
|
39
38
|
readonly clientIDs?: readonly string[] | undefined;
|
|
40
39
|
readonly clientGroupIDs?: readonly string[] | undefined;
|
|
41
40
|
}] | ["connected", {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,8 +46,8 @@ export class PusherService {
|
|
|
46
46
|
get pushURL() {
|
|
47
47
|
return this.#pusher.pushURL[0];
|
|
48
48
|
}
|
|
49
|
-
initConnection(clientID, wsID,
|
|
50
|
-
return this.#pusher.initConnection(clientID, wsID,
|
|
49
|
+
initConnection(clientID, wsID, userPushURL) {
|
|
50
|
+
return this.#pusher.initConnection(clientID, wsID, userPushURL);
|
|
51
51
|
}
|
|
52
52
|
enqueuePush(clientID, push, jwt, httpCookie) {
|
|
53
53
|
if (!this.#pushConfig.forwardCookies) {
|
|
@@ -104,6 +104,7 @@ class PushWorker {
|
|
|
104
104
|
#lc;
|
|
105
105
|
#config;
|
|
106
106
|
#clients;
|
|
107
|
+
#userPushURL;
|
|
107
108
|
#customMutations = getOrCreateCounter('mutation', 'custom', 'Number of custom mutations processed');
|
|
108
109
|
#pushes = getOrCreateCounter('mutation', 'pushes', 'Number of pushes processed by the pusher');
|
|
109
110
|
constructor(config, lc, pushURL, apiKey, queue) {
|
|
@@ -121,7 +122,7 @@ class PushWorker {
|
|
|
121
122
|
* Returns a new downstream stream if the clientID,wsID pair has not been seen before.
|
|
122
123
|
* If a clientID already exists with a different wsID, that client's downstream is cancelled.
|
|
123
124
|
*/
|
|
124
|
-
initConnection(clientID, wsID,
|
|
125
|
+
initConnection(clientID, wsID, userPushURL) {
|
|
125
126
|
const existing = this.#clients.get(clientID);
|
|
126
127
|
if (existing && existing.wsID === wsID) {
|
|
127
128
|
// already initialized for this socket
|
|
@@ -131,12 +132,27 @@ class PushWorker {
|
|
|
131
132
|
if (existing) {
|
|
132
133
|
existing.downstream.cancel();
|
|
133
134
|
}
|
|
135
|
+
// Handle client group level URL parameters
|
|
136
|
+
if (this.#userPushURL === undefined) {
|
|
137
|
+
// First client in the group - store its URL
|
|
138
|
+
this.#userPushURL = userPushURL;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
// Validate that subsequent clients have compatible parameters
|
|
142
|
+
if (this.#userPushURL !== userPushURL) {
|
|
143
|
+
this.#lc.error?.('Client provided different mutate parameters than client group', {
|
|
144
|
+
clientID,
|
|
145
|
+
clientURL: userPushURL,
|
|
146
|
+
clientGroupURL: this.#userPushURL,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
}
|
|
134
150
|
const downstream = Subscription.create({
|
|
135
151
|
cleanup: () => {
|
|
136
152
|
this.#clients.delete(clientID);
|
|
137
153
|
},
|
|
138
154
|
});
|
|
139
|
-
this.#clients.set(clientID, { wsID, downstream
|
|
155
|
+
this.#clients.set(clientID, { wsID, downstream });
|
|
140
156
|
return downstream;
|
|
141
157
|
}
|
|
142
158
|
async run() {
|
|
@@ -235,15 +251,18 @@ class PushWorker {
|
|
|
235
251
|
});
|
|
236
252
|
// Record custom mutations for telemetry
|
|
237
253
|
recordMutation('custom', entry.push.mutations.length);
|
|
254
|
+
const url = this.#userPushURL ??
|
|
255
|
+
must(this.#pushURLs[0], 'ZERO_MUTATE_URL is not set');
|
|
256
|
+
this.#lc.debug?.('pushing to', url, 'with', entry.push.mutations.length, 'mutations');
|
|
238
257
|
try {
|
|
239
|
-
const response = await fetchFromAPIServer(
|
|
258
|
+
const response = await fetchFromAPIServer(this.#lc, url, this.#pushURLs, {
|
|
240
259
|
appID: this.#config.app.id,
|
|
241
260
|
shardNum: this.#config.shard.num,
|
|
242
261
|
}, {
|
|
243
262
|
apiKey: this.#apiKey,
|
|
244
263
|
token: entry.jwt,
|
|
245
264
|
cookie: entry.httpCookie,
|
|
246
|
-
},
|
|
265
|
+
}, entry.push);
|
|
247
266
|
if (!response.ok) {
|
|
248
267
|
return {
|
|
249
268
|
error: 'http',
|
|
@@ -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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"}
|
|
@@ -52,6 +52,7 @@ type PartialZeroConfig = Pick<ZeroConfig, 'getQueries' | 'serverVersion'>;
|
|
|
52
52
|
export declare class ViewSyncerService implements ViewSyncer, ActivityBasedService {
|
|
53
53
|
#private;
|
|
54
54
|
readonly id: string;
|
|
55
|
+
userQueryURL?: string | undefined;
|
|
55
56
|
constructor(config: PartialZeroConfig, lc: LogContext, shard: ShardID, taskID: string, clientGroupID: string, cvrDb: PostgresDB, upstreamDb: PostgresDB | undefined, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, slowHydrateThreshold: number, inspectorDelegate: InspectorDelegate, keepaliveMs?: number, setTimeoutFn?: SetTimeout);
|
|
56
57
|
run(): Promise<void>;
|
|
57
58
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAerC,OAAO,KAAK,EAAC,2BAA2B,EAAC,MAAM,yDAAyD,CAAC;AACzG,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,iDAAiD,CAAC;AAC1F,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,6CAA6C,CAAC;AAMrD,OAAO,EAAmB,KAAK,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAO9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAiBxD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAsBpE,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAMF,MAAM,WAAW,UAAU;IACzB,cAAc,CACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,qBAAqB,GACzB,MAAM,CAAC,UAAU,CAAC,CAAC;IAEtB,oBAAoB,CAClB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE;AAQD,KAAK,UAAU,GAAG,CAChB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,EAChC,KAAK,CAAC,EAAE,MAAM,KACX,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,KAAK,iBAAiB,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,GAAG,eAAe,CAAC,CAAC;AAE1E,qBAAa,iBAAkB,YAAW,UAAU,EAAE,oBAAoB;;IACxE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ export class ViewSyncerService {
|
|
|
56
56
|
#keepaliveMs;
|
|
57
57
|
#slowHydrateThreshold;
|
|
58
58
|
#queryConfig;
|
|
59
|
+
userQueryURL;
|
|
59
60
|
// The ViewSyncerService is only started in response to a connection,
|
|
60
61
|
// so #lastConnectTime is always initialized to now(). This is necessary
|
|
61
62
|
// to handle race conditions in which, e.g. the replica is ready and the
|
|
@@ -133,7 +134,7 @@ export class ViewSyncerService {
|
|
|
133
134
|
() => this.#stateChanges.cancel());
|
|
134
135
|
this.#setTimeout = setTimeoutFn;
|
|
135
136
|
if (pullConfig.url) {
|
|
136
|
-
this.#customQueryTransformer = new CustomQueryTransformer({
|
|
137
|
+
this.#customQueryTransformer = new CustomQueryTransformer(this.#lc, {
|
|
137
138
|
url: pullConfig.url,
|
|
138
139
|
forwardCookies: pullConfig.forwardCookies,
|
|
139
140
|
}, shard);
|
|
@@ -338,6 +339,22 @@ export class ViewSyncerService {
|
|
|
338
339
|
this.#authData = pickToken(this.#lc, this.#authData, tokenData);
|
|
339
340
|
this.#lc.debug?.(`Picked auth token: ${JSON.stringify(this.#authData?.decoded)}`);
|
|
340
341
|
this.#httpCookie = httpCookie;
|
|
342
|
+
// Handle custom query URL
|
|
343
|
+
const [, { userQueryURL }] = initConnectionMessage;
|
|
344
|
+
if (this.userQueryURL === undefined) {
|
|
345
|
+
// First client in the group - store its parameters
|
|
346
|
+
this.userQueryURL = userQueryURL;
|
|
347
|
+
}
|
|
348
|
+
else {
|
|
349
|
+
// Validate that subsequent clients have compatible parameters
|
|
350
|
+
if (this.userQueryURL !== userQueryURL) {
|
|
351
|
+
this.#lc.error?.('Client provided different query parameters than client group', {
|
|
352
|
+
clientID,
|
|
353
|
+
clientURL: userQueryURL,
|
|
354
|
+
clientGroupURL: this.userQueryURL,
|
|
355
|
+
});
|
|
356
|
+
}
|
|
357
|
+
}
|
|
341
358
|
const lc = this.#lc
|
|
342
359
|
.withContext('clientID', clientID)
|
|
343
360
|
.withContext('wsID', wsID);
|
|
@@ -651,7 +668,7 @@ export class ViewSyncerService {
|
|
|
651
668
|
cookie: this.#queryConfig.forwardCookies
|
|
652
669
|
? this.#httpCookie
|
|
653
670
|
: undefined,
|
|
654
|
-
}, filteredCustomQueries);
|
|
671
|
+
}, filteredCustomQueries, this.userQueryURL);
|
|
655
672
|
this.#processTransformedCustomQueries(lc, transformedCustomQueries, (q) => transformedQueries.push(q), customQueries);
|
|
656
673
|
}
|
|
657
674
|
for (const q of otherQueries) {
|
|
@@ -795,7 +812,7 @@ export class ViewSyncerService {
|
|
|
795
812
|
apiKey: this.#queryConfig.apiKey,
|
|
796
813
|
token: this.#authData?.raw,
|
|
797
814
|
cookie: this.#httpCookie,
|
|
798
|
-
}, filteredCustomQueries);
|
|
815
|
+
}, filteredCustomQueries, this.userQueryURL);
|
|
799
816
|
erroredQueries = this.#processTransformedCustomQueries(lc, transformedCustomQueries, (q) => transformedQueries.push({
|
|
800
817
|
id: q.id,
|
|
801
818
|
origQuery: must(customQueries.get(q.id)),
|