@rocicorp/zero 0.24.2025090402 → 0.24.2025091200
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-P6JME3HC.js → chunk-6XNI6IVJ.js} +233 -135
- package/out/chunk-6XNI6IVJ.js.map +7 -0
- package/out/chunk-ASRS2LFV.js +35 -0
- package/out/chunk-ASRS2LFV.js.map +7 -0
- package/out/{chunk-G442PJSB.js → chunk-K5ZSWG54.js} +343 -327
- package/out/chunk-K5ZSWG54.js.map +7 -0
- package/out/{chunk-4NLQ25GZ.js → chunk-KXV3BZ4U.js} +3 -3
- package/out/{inspector-4ALIZXAU.js → inspector-ZZSIUMBB.js} +36 -6
- package/out/inspector-ZZSIUMBB.js.map +7 -0
- package/out/react-native.js +276 -278
- package/out/react-native.js.map +4 -4
- package/out/react.js +98 -35
- package/out/react.js.map +2 -2
- package/out/replicache/src/connection-loop.d.ts.map +1 -1
- package/out/replicache/src/deleted-clients.d.ts +17 -10
- package/out/replicache/src/deleted-clients.d.ts.map +1 -1
- package/out/replicache/src/kv/expo-sqlite/store.d.ts +11 -0
- package/out/replicache/src/kv/expo-sqlite/store.d.ts.map +1 -0
- package/out/replicache/src/kv/idb-store.d.ts.map +1 -1
- package/out/replicache/src/kv/mem-store.d.ts.map +1 -1
- package/out/replicache/src/kv/op-sqlite/store.d.ts +14 -0
- package/out/replicache/src/kv/op-sqlite/store.d.ts.map +1 -0
- package/out/replicache/src/kv/op-sqlite/types.d.ts +13 -0
- package/out/replicache/src/kv/op-sqlite/types.d.ts.map +1 -0
- package/out/replicache/src/kv/read-impl.d.ts.map +1 -1
- package/out/replicache/src/kv/sqlite-store.d.ts +37 -63
- package/out/replicache/src/kv/sqlite-store.d.ts.map +1 -1
- package/out/replicache/src/kv/throw-if-closed.d.ts +12 -0
- package/out/replicache/src/kv/throw-if-closed.d.ts.map +1 -0
- package/out/replicache/src/kv/write-impl-base.d.ts.map +1 -1
- package/out/replicache/src/kv/write-impl.d.ts.map +1 -1
- package/out/replicache/src/persist/client-gc.d.ts.map +1 -1
- package/out/replicache/src/persist/client-group-gc.d.ts +2 -3
- package/out/replicache/src/persist/client-group-gc.d.ts.map +1 -1
- package/out/replicache/src/persist/clients.d.ts +2 -1
- package/out/replicache/src/persist/clients.d.ts.map +1 -1
- package/out/replicache/src/persist/collect-idb-databases.d.ts.map +1 -1
- package/out/replicache/src/replicache-impl.d.ts.map +1 -1
- package/out/solid.js +65 -20
- package/out/solid.js.map +3 -3
- package/out/zero/package.json +1 -1
- package/out/zero/src/zero-cache-dev.js +4 -0
- package/out/zero/src/zero-cache-dev.js.map +1 -1
- package/out/zero-cache/src/auth/write-authorizer.js +1 -1
- package/out/zero-cache/src/auth/write-authorizer.js.map +1 -1
- package/out/zero-cache/src/config/normalize.d.ts +1 -0
- package/out/zero-cache/src/config/normalize.d.ts.map +1 -1
- package/out/zero-cache/src/config/normalize.js +6 -0
- package/out/zero-cache/src/config/normalize.js.map +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +11 -0
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +53 -1
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.d.ts.map +1 -1
- package/out/zero-cache/src/custom-queries/transform-query.js +4 -0
- package/out/zero-cache/src/custom-queries/transform-query.js.map +1 -1
- package/out/zero-cache/src/server/anonymous-otel-start.d.ts +1 -0
- package/out/zero-cache/src/server/anonymous-otel-start.d.ts.map +1 -1
- package/out/zero-cache/src/server/anonymous-otel-start.js +41 -2
- package/out/zero-cache/src/server/anonymous-otel-start.js.map +1 -1
- package/out/zero-cache/src/server/inspector-delegate.d.ts +9 -0
- package/out/zero-cache/src/server/inspector-delegate.d.ts.map +1 -1
- package/out/zero-cache/src/server/inspector-delegate.js +18 -0
- package/out/zero-cache/src/server/inspector-delegate.js.map +1 -1
- package/out/zero-cache/src/server/otel-diag-logger.d.ts +16 -0
- package/out/zero-cache/src/server/otel-diag-logger.d.ts.map +1 -0
- package/out/zero-cache/src/server/otel-diag-logger.js +76 -0
- package/out/zero-cache/src/server/otel-diag-logger.js.map +1 -0
- package/out/zero-cache/src/server/otel-start.d.ts.map +1 -1
- package/out/zero-cache/src/server/otel-start.js +13 -13
- package/out/zero-cache/src/server/otel-start.js.map +1 -1
- package/out/zero-cache/src/server/reaper.js +5 -1
- package/out/zero-cache/src/server/reaper.js.map +1 -1
- package/out/zero-cache/src/server/syncer.js +3 -3
- package/out/zero-cache/src/server/syncer.js.map +1 -1
- package/out/zero-cache/src/services/analyze.d.ts +1 -1
- package/out/zero-cache/src/services/analyze.d.ts.map +1 -1
- package/out/zero-cache/src/services/analyze.js +6 -6
- package/out/zero-cache/src/services/analyze.js.map +1 -1
- package/out/zero-cache/src/services/heapz.d.ts +1 -1
- package/out/zero-cache/src/services/heapz.d.ts.map +1 -1
- package/out/zero-cache/src/services/heapz.js +2 -2
- package/out/zero-cache/src/services/heapz.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/pusher.d.ts +12 -4
- package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
- package/out/zero-cache/src/services/statz.d.ts +1 -1
- package/out/zero-cache/src/services/statz.d.ts.map +1 -1
- package/out/zero-cache/src/services/statz.js +3 -3
- package/out/zero-cache/src/services/statz.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-purger.d.ts +7 -1
- package/out/zero-cache/src/services/view-syncer/cvr-purger.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-purger.js +17 -8
- package/out/zero-cache/src/services/view-syncer/cvr-purger.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts +0 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.js +6 -19
- package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts +0 -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 +19 -8
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts +1 -1
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts +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 +30 -7
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-client/src/client/active-clients-manager.d.ts +2 -1
- package/out/zero-client/src/client/active-clients-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/delete-clients-manager.d.ts +3 -3
- package/out/zero-client/src/client/delete-clients-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/inspector/inspector.d.ts.map +1 -1
- package/out/zero-client/src/client/query-manager.d.ts +2 -0
- package/out/zero-client/src/client/query-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts +2 -2
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-protocol/src/down.d.ts +5 -0
- package/out/zero-protocol/src/down.d.ts.map +1 -1
- package/out/zero-protocol/src/inspect-down.d.ts +17 -0
- package/out/zero-protocol/src/inspect-down.d.ts.map +1 -1
- package/out/zero-protocol/src/inspect-down.js +5 -1
- package/out/zero-protocol/src/inspect-down.js.map +1 -1
- package/out/zero-protocol/src/inspect-up.d.ts +39 -10
- package/out/zero-protocol/src/inspect-up.d.ts.map +1 -1
- package/out/zero-protocol/src/inspect-up.js +10 -3
- package/out/zero-protocol/src/inspect-up.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 +2 -1
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-protocol/src/up.d.ts +10 -1
- package/out/zero-protocol/src/up.d.ts.map +1 -1
- package/out/zero-react/src/use-query.d.ts +20 -3
- package/out/zero-react/src/use-query.d.ts.map +1 -1
- package/out/zero-react-native/src/mod.d.ts +2 -2
- package/out/zero-react-native/src/mod.d.ts.map +1 -1
- package/out/zero-solid/src/solid-view.d.ts +24 -5
- package/out/zero-solid/src/solid-view.d.ts.map +1 -1
- package/out/zero-solid/src/use-query.d.ts.map +1 -1
- package/out/zero.js +4 -4
- package/out/zql/src/ivm/array-view.d.ts +2 -1
- package/out/zql/src/ivm/array-view.d.ts.map +1 -1
- package/out/zql/src/ivm/array-view.js +16 -5
- package/out/zql/src/ivm/array-view.js.map +1 -1
- package/out/zql/src/ivm/view.d.ts +2 -1
- package/out/zql/src/ivm/view.d.ts.map +1 -1
- package/out/zql/src/query/query-delegate.d.ts +2 -1
- package/out/zql/src/query/query-delegate.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.js +17 -5
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/typed-view.d.ts +3 -2
- package/out/zql/src/query/typed-view.d.ts.map +1 -1
- package/out/{zero-cache/src/services/view-syncer → zqlite/src}/database-storage.d.ts +2 -2
- package/out/zqlite/src/database-storage.d.ts.map +1 -0
- package/out/{zero-cache/src/services/view-syncer → zqlite/src}/database-storage.js +1 -1
- package/out/zqlite/src/database-storage.js.map +1 -0
- package/package.json +1 -1
- package/out/chunk-G442PJSB.js.map +0 -7
- package/out/chunk-MKB4RXL3.js +0 -15
- package/out/chunk-MKB4RXL3.js.map +0 -7
- package/out/chunk-P6JME3HC.js.map +0 -7
- package/out/inspector-4ALIZXAU.js.map +0 -7
- package/out/replicache/src/expo/store.d.ts +0 -4
- package/out/replicache/src/expo/store.d.ts.map +0 -1
- package/out/zero-cache/src/services/view-syncer/database-storage.d.ts.map +0 -1
- package/out/zero-cache/src/services/view-syncer/database-storage.js.map +0 -1
- /package/out/{chunk-4NLQ25GZ.js.map → chunk-KXV3BZ4U.js.map} +0 -0
|
@@ -2,6 +2,11 @@ import { assert } from "../../../shared/src/asserts.js";
|
|
|
2
2
|
import { mapValues } from "../../../shared/src/objects.js";
|
|
3
3
|
import { TDigest } from "../../../shared/src/tdigest.js";
|
|
4
4
|
import { isServerMetric, } from "../../../zql/src/query/metrics-delegate.js";
|
|
5
|
+
/**
|
|
6
|
+
* Set of authenticated client IDs. We keep this outside of the class to share this state
|
|
7
|
+
* across all instances of the InspectorDelegate.
|
|
8
|
+
*/
|
|
9
|
+
const authenticatedClientIDs = new Set();
|
|
5
10
|
export class InspectorDelegate {
|
|
6
11
|
#globalMetrics = newMetrics();
|
|
7
12
|
#perQueryServerMetrics = new Map();
|
|
@@ -57,6 +62,19 @@ export class InspectorDelegate {
|
|
|
57
62
|
this.#queryIDToTransformationHash.set(queryID, transformationHash);
|
|
58
63
|
this.#transformationASTs.set(transformationHash, ast);
|
|
59
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* Check if the client is authenticated. We only require authentication once
|
|
67
|
+
* per "worker".
|
|
68
|
+
*/
|
|
69
|
+
isAuthenticated(clientGroupID) {
|
|
70
|
+
return authenticatedClientIDs.has(clientGroupID);
|
|
71
|
+
}
|
|
72
|
+
setAuthenticated(clientGroupID) {
|
|
73
|
+
authenticatedClientIDs.add(clientGroupID);
|
|
74
|
+
}
|
|
75
|
+
clearAuthenticated(clientGroupID) {
|
|
76
|
+
authenticatedClientIDs.delete(clientGroupID);
|
|
77
|
+
}
|
|
60
78
|
}
|
|
61
79
|
function newMetrics() {
|
|
62
80
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspector-delegate.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAGvD,OAAO,EACL,cAAc,GAGf,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"inspector-delegate.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/inspector-delegate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { LogContext } from '@rocicorp/logger';
|
|
2
|
+
/**
|
|
3
|
+
* Sets up the OpenTelemetry diagnostic logger with custom error handling and suppression.
|
|
4
|
+
* This function can be called multiple times safely - it will only configure the logger once per LogContext.
|
|
5
|
+
*
|
|
6
|
+
* @param lc LogContext for routing OTEL diagnostic messages to the application logger
|
|
7
|
+
* @param force If true, will reconfigure even if already configured (useful after NodeSDK setup)
|
|
8
|
+
* @returns true if the logger was configured, false if it was already configured and not forced
|
|
9
|
+
*/
|
|
10
|
+
export declare function setupOtelDiagnosticLogger(lc?: LogContext, force?: boolean): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Reset the diagnostic logger configuration state.
|
|
13
|
+
* This is primarily useful for testing scenarios.
|
|
14
|
+
*/
|
|
15
|
+
export declare function resetOtelDiagnosticLogger(): void;
|
|
16
|
+
//# sourceMappingURL=otel-diag-logger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-diag-logger.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AA6B5C;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,EAAE,CAAC,EAAE,UAAU,EACf,KAAK,UAAQ,GACZ,OAAO,CAwCT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { diag, DiagLogLevel } from '@opentelemetry/api';
|
|
2
|
+
import { LogContext } from '@rocicorp/logger';
|
|
3
|
+
function getOtelLogLevel(level) {
|
|
4
|
+
if (!level)
|
|
5
|
+
return undefined;
|
|
6
|
+
const normalizedLevel = level.toLowerCase();
|
|
7
|
+
switch (normalizedLevel) {
|
|
8
|
+
case 'none':
|
|
9
|
+
return DiagLogLevel.NONE;
|
|
10
|
+
case 'error':
|
|
11
|
+
return DiagLogLevel.ERROR;
|
|
12
|
+
case 'warn':
|
|
13
|
+
case 'warning':
|
|
14
|
+
return DiagLogLevel.WARN;
|
|
15
|
+
case 'info':
|
|
16
|
+
return DiagLogLevel.INFO;
|
|
17
|
+
case 'debug':
|
|
18
|
+
return DiagLogLevel.DEBUG;
|
|
19
|
+
case 'verbose':
|
|
20
|
+
return DiagLogLevel.VERBOSE;
|
|
21
|
+
case 'all':
|
|
22
|
+
return DiagLogLevel.ALL;
|
|
23
|
+
default:
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
let diagLoggerConfigured = false;
|
|
28
|
+
/**
|
|
29
|
+
* Sets up the OpenTelemetry diagnostic logger with custom error handling and suppression.
|
|
30
|
+
* This function can be called multiple times safely - it will only configure the logger once per LogContext.
|
|
31
|
+
*
|
|
32
|
+
* @param lc LogContext for routing OTEL diagnostic messages to the application logger
|
|
33
|
+
* @param force If true, will reconfigure even if already configured (useful after NodeSDK setup)
|
|
34
|
+
* @returns true if the logger was configured, false if it was already configured and not forced
|
|
35
|
+
*/
|
|
36
|
+
export function setupOtelDiagnosticLogger(lc, force = false) {
|
|
37
|
+
if (!lc) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
if (!force && diagLoggerConfigured) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
const log = lc.withContext('component', 'otel');
|
|
44
|
+
diag.setLogger({
|
|
45
|
+
verbose: (msg, ...args) => log.debug?.(msg, ...args),
|
|
46
|
+
debug: (msg, ...args) => log.debug?.(msg, ...args),
|
|
47
|
+
info: (msg, ...args) => log.info?.(msg, ...args),
|
|
48
|
+
warn: (msg, ...args) => log.warn?.(msg, ...args),
|
|
49
|
+
error: (msg, ...args) => {
|
|
50
|
+
// Check if this is a known non-critical error that should be a warning
|
|
51
|
+
if (msg.includes('Request Timeout') ||
|
|
52
|
+
msg.includes('Unexpected server response: 502') ||
|
|
53
|
+
msg.includes('Export failed with retryable status') ||
|
|
54
|
+
msg.includes('Method Not Allowed') ||
|
|
55
|
+
msg.includes('socket hang up')) {
|
|
56
|
+
log.warn?.(msg, ...args);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
log.error?.(msg, ...args);
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
}, {
|
|
63
|
+
logLevel: getOtelLogLevel(process.env.OTEL_LOG_LEVEL) ?? DiagLogLevel.ERROR,
|
|
64
|
+
suppressOverrideMessage: true,
|
|
65
|
+
});
|
|
66
|
+
diagLoggerConfigured = true;
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Reset the diagnostic logger configuration state.
|
|
71
|
+
* This is primarily useful for testing scenarios.
|
|
72
|
+
*/
|
|
73
|
+
export function resetOtelDiagnosticLogger() {
|
|
74
|
+
diagLoggerConfigured = false;
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=otel-diag-logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-diag-logger.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAiF5C,eAAO,MAAM,aAAa,GAAI,KAAK,UAAU,SACA,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { diag } from '@opentelemetry/api';
|
|
2
1
|
import { logs } from '@opentelemetry/api-logs';
|
|
3
2
|
import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
|
|
4
3
|
import { resourceFromAttributes } from '@opentelemetry/resources';
|
|
5
4
|
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
6
5
|
import { ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
|
|
7
6
|
import { LogContext } from '@rocicorp/logger';
|
|
7
|
+
import { setupOtelDiagnosticLogger } from './otel-diag-logger.js';
|
|
8
8
|
import { otelEnabled, otelLogsEnabled, otelMetricsEnabled, otelTracesEnabled, } from "../../../otel/src/enabled.js";
|
|
9
9
|
class OtelManager {
|
|
10
10
|
static #instance;
|
|
@@ -18,20 +18,13 @@ class OtelManager {
|
|
|
18
18
|
return OtelManager.#instance;
|
|
19
19
|
}
|
|
20
20
|
startOtelAuto(lc) {
|
|
21
|
-
if (lc) {
|
|
22
|
-
const log = lc.withContext('component', 'otel');
|
|
23
|
-
diag.setLogger({
|
|
24
|
-
verbose: (msg, ...args) => log.debug?.(msg, ...args),
|
|
25
|
-
debug: (msg, ...args) => log.debug?.(msg, ...args),
|
|
26
|
-
info: (msg, ...args) => log.info?.(msg, ...args),
|
|
27
|
-
warn: (msg, ...args) => log.warn?.(msg, ...args),
|
|
28
|
-
error: (msg, ...args) => log.error?.(msg, ...args),
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
21
|
if (this.#started || !otelEnabled()) {
|
|
32
22
|
return;
|
|
33
23
|
}
|
|
34
24
|
this.#started = true;
|
|
25
|
+
// Store and temporarily remove OTEL_LOG_LEVEL to prevent NodeSDK from setting its own logger
|
|
26
|
+
const otelLogLevel = process.env.OTEL_LOG_LEVEL;
|
|
27
|
+
delete process.env.OTEL_LOG_LEVEL;
|
|
35
28
|
// Use exponential histograms by default to reduce cardinality from auto-instrumentation
|
|
36
29
|
// This affects HTTP server/client and other auto-instrumented histogram metrics
|
|
37
30
|
// Exponential histograms automatically adjust bucket boundaries and use fewer buckets
|
|
@@ -60,8 +53,15 @@ class OtelManager {
|
|
|
60
53
|
? [this.#autoInstrumentations]
|
|
61
54
|
: [],
|
|
62
55
|
});
|
|
63
|
-
|
|
64
|
-
|
|
56
|
+
try {
|
|
57
|
+
sdk.start();
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
if (otelLogLevel) {
|
|
61
|
+
process.env.OTEL_LOG_LEVEL = otelLogLevel;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
setupOtelDiagnosticLogger(lc, true);
|
|
65
65
|
logs.getLogger('zero-cache').emit({
|
|
66
66
|
severityText: 'INFO',
|
|
67
67
|
body: 'OpenTelemetry SDK started successfully',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"otel-start.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,11 @@ export default async function runWorker(parent, env, ...argv) {
|
|
|
22
22
|
});
|
|
23
23
|
await initViewSyncerSchema(lc, cvrDB, shard);
|
|
24
24
|
parent.send(['ready', { ready: true }]);
|
|
25
|
-
return runUntilKilled(lc, parent, new CVRPurger(lc, cvrDB, shard,
|
|
25
|
+
return runUntilKilled(lc, parent, new CVRPurger(lc, cvrDB, shard, {
|
|
26
|
+
inactivityThresholdMs: cvr.garbageCollectionInactivityThresholdHours * MS_PER_HOUR,
|
|
27
|
+
initialBatchSize: cvr.garbageCollectionInitialBatchSize,
|
|
28
|
+
initialIntervalMs: cvr.garbageCollectionInitialIntervalSeconds * 1000,
|
|
29
|
+
}));
|
|
26
30
|
}
|
|
27
31
|
// fork()
|
|
28
32
|
if (!singleProcessMode()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/reaper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,SAAS,EAAC,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAc,EACd,GAAsB,EACtB,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAG,uBAAuB,CAAC,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;IAEpD,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAE1B,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,CAAC;IACrB,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE;QACjC,UAAU,EAAE,EAAC,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,EAAC;KAC3D,CAAC,CAAC;IACH,MAAM,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;IAEtC,OAAO,cAAc,CACnB,EAAE,EACF,MAAM,EACN,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/reaper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,SAAS,EAAC,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,MAAc,EACd,GAAsB,EACtB,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAG,uBAAuB,CAAC,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;IAEpD,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAE1B,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,CAAC;IACrB,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE;QACjC,UAAU,EAAE,EAAC,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,EAAC;KAC3D,CAAC,CAAC;IACH,MAAM,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;IAEtC,OAAO,cAAc,CACnB,EAAE,EACF,MAAM,EACN,IAAI,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QAC9B,qBAAqB,EACnB,GAAG,CAAC,yCAAyC,GAAG,WAAW;QAC7D,gBAAgB,EAAE,GAAG,CAAC,iCAAiC;QACvD,iBAAiB,EAAE,GAAG,CAAC,uCAAuC,GAAG,IAAI;KACtE,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS;AACT,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACrE,CAAC;AACJ,CAAC"}
|
|
@@ -11,7 +11,7 @@ import { initEventSink } from "../observability/events.js";
|
|
|
11
11
|
import { exitAfter, runUntilKilled } from "../services/life-cycle.js";
|
|
12
12
|
import { MutagenService } from "../services/mutagen/mutagen.js";
|
|
13
13
|
import { PusherService } from "../services/mutagen/pusher.js";
|
|
14
|
-
import { DatabaseStorage } from "
|
|
14
|
+
import { DatabaseStorage } from "../../../zqlite/src/database-storage.js";
|
|
15
15
|
import { DrainCoordinator } from "../services/view-syncer/drain-coordinator.js";
|
|
16
16
|
import { PipelineDriver } from "../services/view-syncer/pipeline-driver.js";
|
|
17
17
|
import { Snapshotter } from "../services/view-syncer/snapshotter.js";
|
|
@@ -62,8 +62,8 @@ export default function runWorker(parent, env, ...args) {
|
|
|
62
62
|
.withContext('clientGroupID', id)
|
|
63
63
|
.withContext('instance', randomID());
|
|
64
64
|
lc.debug?.(`creating view syncer`);
|
|
65
|
-
const
|
|
66
|
-
return new ViewSyncerService(config, logger, shard, config.taskID, id, cvrDB, config.upstream.type === 'pg' ? upstreamDB : undefined, new PipelineDriver(logger, config.log, new Snapshotter(logger, replicaFile, shard), shard, operatorStorage.createClientGroupStorage(id), id,
|
|
65
|
+
const inspectorDelegate = new InspectorDelegate();
|
|
66
|
+
return new ViewSyncerService(config, logger, shard, config.taskID, id, cvrDB, config.upstream.type === 'pg' ? upstreamDB : undefined, new PipelineDriver(logger, config.log, new Snapshotter(logger, replicaFile, shard), shard, operatorStorage.createClientGroupStorage(id), id, inspectorDelegate), sub, drainCoordinator, config.log.slowHydrateThreshold, inspectorDelegate);
|
|
67
67
|
};
|
|
68
68
|
const mutagenFactory = (id) => new MutagenService(lc.withContext('component', 'mutagen').withContext('clientGroupID', id), shard, id, upstreamDB, config);
|
|
69
69
|
const pusherFactory = config.push.url === undefined && config.mutate.url === undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,OAAO,EAAC,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAC,eAAe,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,OAAO,EAAC,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAC,eAAe,EAAC,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAC,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAC,qBAAqB,EAAE,eAAe,EAAC,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,SAAS,QAAQ;IACf,OAAO,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAc,EACd,GAAsB,EACtB,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAG,uBAAuB,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC;IAEnE,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAE1B,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;IAEzD,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,mCAAmC,CAAC,CAAC;IACnE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,wCAAwC,CAAC,CAAC;IAE7E,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACnE,EAAE,CAAC,KAAK,EAAE,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE;QACjC,GAAG,EAAE,GAAG,CAAC,iBAAiB;QAC1B,UAAU,EAAE,EAAC,CAAC,kBAAkB,CAAC,EAAE,oBAAoB,GAAG,MAAM,EAAC;KAClE,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC3C,GAAG,EAAE,QAAQ,CAAC,iBAAiB;QAC/B,UAAU,EAAE,EAAC,CAAC,kBAAkB,CAAC,EAAE,oBAAoB,GAAG,WAAW,EAAC;KACvE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;QAClC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC;QACnC,iBAAiB,CAAC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAC5C,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CACrE,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,iBAAiB,GAAG,CACxB,EAAU,EACV,GAA+B,EAC/B,gBAAkC,EAClC,EAAE;QACF,MAAM,MAAM,GAAG,EAAE;aACd,WAAW,CAAC,WAAW,EAAE,aAAa,CAAC;aACvC,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC;aAChC,WAAW,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvC,EAAE,CAAC,KAAK,EAAE,CAAC,sBAAsB,CAAC,CAAC;QACnC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAClD,OAAO,IAAI,iBAAiB,CAC1B,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,CAAC,MAAM,EACb,EAAE,EACF,KAAK,EACL,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACtD,IAAI,cAAc,CAChB,MAAM,EACN,MAAM,CAAC,GAAG,EACV,IAAI,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,EAC3C,KAAK,EACL,eAAe,CAAC,wBAAwB,CAAC,EAAE,CAAC,EAC5C,EAAE,EACF,iBAAiB,CAClB,EACD,GAAG,EACH,gBAAgB,EAChB,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAC/B,iBAAiB,CAClB,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE,CACpC,IAAI,cAAc,CAChB,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC,EACvE,KAAK,EACL,EAAE,EACF,UAAU,EACV,MAAM,CACP,CAAC;IAEJ,MAAM,aAAa,GACjB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS;QAC9D,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,CAAC,EAAU,EAAE,EAAE,CACb,IAAI,aAAa,CACf,UAAU,EACV,MAAM,EACN;YACE,GAAG,MAAM,CAAC,IAAI;YACd,GAAG,MAAM,CAAC,MAAM;YAChB,GAAG,EAAE,IAAI,CACP,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EACpC,kCAAkC,CACnC;SACF,EACD,EAAE,CAAC,WAAW,CAAC,eAAe,EAAE,EAAE,CAAC,EACnC,EAAE,CACH,CAAC;IAEV,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,EAAE,EACF,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,MAAM,CACP,CAAC;IAEF,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAEpC,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC;IAEhE,OAAO,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS;AACT,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACrE,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import type { LogContext } from '@rocicorp/logger';
|
|
1
2
|
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
3
|
import type { NormalizedZeroConfig } from '../config/normalize.ts';
|
|
3
|
-
import type { LogContext } from '@rocicorp/logger';
|
|
4
4
|
export declare function setCors(res: FastifyReply): FastifyReply<import("fastify").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>;
|
|
5
5
|
export declare function handleAnalyzeQueryRequest(lc: LogContext, config: NormalizedZeroConfig, req: FastifyRequest, res: FastifyReply): Promise<void>;
|
|
6
6
|
//# sourceMappingURL=analyze.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAQ1D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAKjE,wBAAgB,OAAO,CAAC,GAAG,EAAE,YAAY,6RAMxC;AAED,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,YAAY,iBA+DlB"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import auth from 'basic-auth';
|
|
2
|
+
import { explainQueries } from "../../../analyze-query/src/explain-queries.js";
|
|
2
3
|
import { runAst } from "../../../analyze-query/src/run-ast.js";
|
|
3
|
-
import { Database } from "../../../zqlite/src/db.js";
|
|
4
4
|
import { Debug } from "../../../zql/src/builder/debug-delegate.js";
|
|
5
|
-
import { computeZqlSpecs, mustGetTableSpec } from "../db/lite-tables.js";
|
|
6
|
-
import { TableSource } from "../../../zqlite/src/table-source.js";
|
|
7
5
|
import { MemoryStorage } from "../../../zql/src/ivm/memory-storage.js";
|
|
8
|
-
import {
|
|
6
|
+
import { Database } from "../../../zqlite/src/db.js";
|
|
7
|
+
import { TableSource } from "../../../zqlite/src/table-source.js";
|
|
8
|
+
import { isAdminPasswordValid } from "../config/zero-config.js";
|
|
9
|
+
import { computeZqlSpecs, mustGetTableSpec } from "../db/lite-tables.js";
|
|
9
10
|
export function setCors(res) {
|
|
10
11
|
return res
|
|
11
12
|
.header('Access-Control-Allow-Origin', '*')
|
|
@@ -15,9 +16,8 @@ export function setCors(res) {
|
|
|
15
16
|
}
|
|
16
17
|
export async function handleAnalyzeQueryRequest(lc, config, req, res) {
|
|
17
18
|
const credentials = auth(req);
|
|
18
|
-
const expectedPassword = config.adminPassword;
|
|
19
19
|
void setCors(res);
|
|
20
|
-
if (!
|
|
20
|
+
if (!isAdminPasswordValid(lc, config, credentials?.pass)) {
|
|
21
21
|
await res
|
|
22
22
|
.code(401)
|
|
23
23
|
.header('WWW-Authenticate', 'Basic realm="analyze query Protected Area"')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { LogContext } from '@rocicorp/logger';
|
|
1
2
|
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
3
|
import type { NormalizedZeroConfig } from '../config/normalize.ts';
|
|
3
|
-
import type { LogContext } from '@rocicorp/logger';
|
|
4
4
|
export declare function handleHeapzRequest(lc: LogContext, config: NormalizedZeroConfig, req: FastifyRequest, res: FastifyReply): void;
|
|
5
5
|
//# sourceMappingURL=heapz.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heapz.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/heapz.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"heapz.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/heapz.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAG1D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAGjE,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,YAAY,QAyBlB"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import auth from 'basic-auth';
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import v8 from 'v8';
|
|
4
|
+
import { isAdminPasswordValid } from "../config/zero-config.js";
|
|
4
5
|
export function handleHeapzRequest(lc, config, req, res) {
|
|
5
6
|
const credentials = auth(req);
|
|
6
|
-
|
|
7
|
-
if (!expectedPassword || credentials?.pass !== expectedPassword) {
|
|
7
|
+
if (!isAdminPasswordValid(lc, config, credentials?.pass)) {
|
|
8
8
|
void res
|
|
9
9
|
.code(401)
|
|
10
10
|
.header('WWW-Authenticate', 'Basic realm="Heapz Protected Area"')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heapz.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/heapz.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"heapz.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/heapz.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,YAAY,CAAC;AAE9B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC;AAE9D,MAAM,UAAU,kBAAkB,CAChC,EAAc,EACd,MAA4B,EAC5B,GAAmB,EACnB,GAAiB;IAEjB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC;QACzD,KAAK,GAAG;aACL,IAAI,CAAC,GAAG,CAAC;aACT,MAAM,CAAC,kBAAkB,EAAE,oCAAoC,CAAC;aAChE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,KAAK,GAAG;SACL,MAAM,CAAC,cAAc,EAAE,0BAA0B,CAAC;SAClD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,QAAQ,EAAE,CAAC;SACjE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,qCAAqC;IACrC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QACpB,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;YACxB,IAAI,GAAG,EAAE,CAAC;gBACR,EAAE,CAAC,KAAK,EAAE,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -83,7 +83,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
83
83
|
data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
84
84
|
};
|
|
85
85
|
}[];
|
|
86
|
-
}] |
|
|
86
|
+
}] | ["transformError", ({
|
|
87
87
|
error: "app";
|
|
88
88
|
id: string;
|
|
89
89
|
name: string;
|
|
@@ -99,7 +99,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
99
99
|
id: string;
|
|
100
100
|
name: string;
|
|
101
101
|
details: import("../../../../shared/src/json.ts").ReadonlyJSONValue;
|
|
102
|
-
})[]] | ["inspect", {
|
|
102
|
+
})[]] | import("../../../../zero-protocol/src/error.ts").ErrorMessage | ["inspect", {
|
|
103
103
|
id: string;
|
|
104
104
|
op: "queries";
|
|
105
105
|
value: {
|
|
@@ -125,6 +125,10 @@ export declare class PusherService implements Service, Pusher {
|
|
|
125
125
|
'query-materialization-server': [number, ...number[]];
|
|
126
126
|
'query-update-server': [number, ...number[]];
|
|
127
127
|
};
|
|
128
|
+
} | {
|
|
129
|
+
id: string;
|
|
130
|
+
op: "authenticated";
|
|
131
|
+
value: boolean;
|
|
128
132
|
} | {
|
|
129
133
|
id: string;
|
|
130
134
|
op: "version";
|
|
@@ -258,7 +262,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
258
262
|
data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
|
|
259
263
|
};
|
|
260
264
|
}[];
|
|
261
|
-
}] |
|
|
265
|
+
}] | ["transformError", ({
|
|
262
266
|
error: "app";
|
|
263
267
|
id: string;
|
|
264
268
|
name: string;
|
|
@@ -274,7 +278,7 @@ export declare class PusherService implements Service, Pusher {
|
|
|
274
278
|
id: string;
|
|
275
279
|
name: string;
|
|
276
280
|
details: import("../../../../shared/src/json.ts").ReadonlyJSONValue;
|
|
277
|
-
})[]] | ["inspect", {
|
|
281
|
+
})[]] | import("../../../../zero-protocol/src/error.ts").ErrorMessage | ["inspect", {
|
|
278
282
|
id: string;
|
|
279
283
|
op: "queries";
|
|
280
284
|
value: {
|
|
@@ -300,6 +304,10 @@ export declare class PusherService implements Service, Pusher {
|
|
|
300
304
|
'query-materialization-server': [number, ...number[]];
|
|
301
305
|
'query-update-server': [number, ...number[]];
|
|
302
306
|
};
|
|
307
|
+
} | {
|
|
308
|
+
id: string;
|
|
309
|
+
op: "authenticated";
|
|
310
|
+
value: boolean;
|
|
303
311
|
} | {
|
|
304
312
|
id: string;
|
|
305
313
|
op: "version";
|
|
@@ -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,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,QAAQ,EAGd,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAK5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAElD,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;AAQ9D,MAAM,WAAW,MAAO,SAAQ,iBAAiB;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,CAAC,UAAU,CAAC,CAAC;IACtB,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,aAAa,CAAC;IACjB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzD;AAED,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC;AAEhD;;;;;;;;;;;;GAYG;AACH,qBAAa,aAAc,YAAW,OAAO,EAAE,MAAM;;IACnD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAWlB,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG;QAAC,GAAG,EAAE,MAAM,EAAE,CAAA;KAAC,EAChD,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM;IAgBvB,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAAG,SAAS
|
|
1
|
+
{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { LogContext } from '@rocicorp/logger';
|
|
1
2
|
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
3
|
import type { NormalizedZeroConfig as ZeroConfig } from '../config/normalize.ts';
|
|
3
|
-
import type { LogContext } from '@rocicorp/logger';
|
|
4
4
|
export declare function handleStatzRequest(lc: LogContext, config: ZeroConfig, req: FastifyRequest, res: FastifyReply): Promise<void>;
|
|
5
5
|
//# sourceMappingURL=statz.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statz.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/statz.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"statz.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/statz.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAM1D,OAAO,KAAK,EAAC,oBAAoB,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAsS/E,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,YAAY,iBAqBlB"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import auth from 'basic-auth';
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import os from 'os';
|
|
4
|
-
import { Database } from "../../../zqlite/src/db.js";
|
|
5
4
|
import { BigIntJSON } from "../../../shared/src/bigint-json.js";
|
|
5
|
+
import { Database } from "../../../zqlite/src/db.js";
|
|
6
|
+
import { isAdminPasswordValid } from "../config/zero-config.js";
|
|
6
7
|
import { pgClient } from "../types/pg.js";
|
|
7
8
|
import { getShardID, upstreamSchema } from "../types/shards.js";
|
|
8
9
|
async function upstreamStats(lc, config, out) {
|
|
@@ -235,8 +236,7 @@ function printStats(group, queries, out) {
|
|
|
235
236
|
}
|
|
236
237
|
export async function handleStatzRequest(lc, config, req, res) {
|
|
237
238
|
const credentials = auth(req);
|
|
238
|
-
|
|
239
|
-
if (!expectedPassword || credentials?.pass !== expectedPassword) {
|
|
239
|
+
if (!isAdminPasswordValid(lc, config, credentials?.pass)) {
|
|
240
240
|
void res
|
|
241
241
|
.code(401)
|
|
242
242
|
.header('WWW-Authenticate', 'Basic realm="Statz Protected Area"')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statz.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/statz.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"statz.js","sourceRoot":"","sources":["../../../../../zero-cache/src/services/statz.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,15 @@ import type { LogContext } from '@rocicorp/logger';
|
|
|
2
2
|
import type { PostgresDB } from '../../types/pg.ts';
|
|
3
3
|
import { type ShardID } from '../../types/shards.ts';
|
|
4
4
|
import type { Service } from '../service.ts';
|
|
5
|
+
type Options = {
|
|
6
|
+
inactivityThresholdMs: number;
|
|
7
|
+
initialBatchSize: number;
|
|
8
|
+
initialIntervalMs: number;
|
|
9
|
+
};
|
|
5
10
|
export declare class CVRPurger implements Service {
|
|
6
11
|
#private;
|
|
7
12
|
readonly id = "reaper";
|
|
8
|
-
constructor(lc: LogContext, db: PostgresDB, shard: ShardID, inactivityThresholdMs:
|
|
13
|
+
constructor(lc: LogContext, db: PostgresDB, shard: ShardID, { inactivityThresholdMs, initialBatchSize, initialIntervalMs }: Options);
|
|
9
14
|
run(): Promise<void>;
|
|
10
15
|
purgeInactiveCVRs(maxCVRs: number): Promise<{
|
|
11
16
|
purged: number;
|
|
@@ -13,4 +18,5 @@ export declare class CVRPurger implements Service {
|
|
|
13
18
|
}>;
|
|
14
19
|
stop(): Promise<void>;
|
|
15
20
|
}
|
|
21
|
+
export {};
|
|
16
22
|
//# sourceMappingURL=cvr-purger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cvr-purger.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"cvr-purger.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-purger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAK3C,KAAK,OAAO,GAAG;IACb,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,SAAU,YAAW,OAAO;;IACvC,QAAQ,CAAC,EAAE,YAAY;gBAWrB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,EAAC,qBAAqB,EAAE,gBAAgB,EAAE,iBAAiB,EAAC,EAAE,OAAO;IAUjE,GAAG;IA2CT,iBAAiB,CACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;IAuC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAItB"}
|