@verdant-web/store 4.6.1 → 5.0.1
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/dist/bundle/index.js +14 -12
- package/dist/bundle/index.js.map +4 -4
- package/dist/esm/__tests__/fixtures/testStorage.d.ts +1 -1
- package/dist/esm/__tests__/fixtures/testStorage.js +3 -3
- package/dist/esm/__tests__/fixtures/testStorage.js.map +1 -1
- package/dist/esm/__tests__/queries.test.js +3 -3
- package/dist/esm/__tests__/queries.test.js.map +1 -1
- package/dist/esm/__tests__/schema.test.js +3 -3
- package/dist/esm/__tests__/schema.test.js.map +1 -1
- package/dist/esm/client/Client.d.ts +12 -10
- package/dist/esm/client/Client.js +40 -30
- package/dist/esm/client/Client.js.map +1 -1
- package/dist/esm/context/Time.d.ts +1 -1
- package/dist/esm/context/Time.js +1 -1
- package/dist/esm/context/Time.js.map +1 -1
- package/dist/esm/context/context.d.ts +84 -15
- package/dist/esm/context/context.js +98 -1
- package/dist/esm/context/context.js.map +1 -1
- package/dist/esm/entities/Entity.test.js +0 -1
- package/dist/esm/entities/Entity.test.js.map +1 -1
- package/dist/esm/entities/EntityMetadata.js +11 -5
- package/dist/esm/entities/EntityMetadata.js.map +1 -1
- package/dist/esm/entities/EntityStore.js +9 -7
- package/dist/esm/entities/EntityStore.js.map +1 -1
- package/dist/esm/files/EntityFile.js +1 -1
- package/dist/esm/files/EntityFile.js.map +1 -1
- package/dist/esm/files/FileManager.js +5 -5
- package/dist/esm/files/FileManager.js.map +1 -1
- package/dist/esm/index.d.ts +6 -4
- package/dist/esm/index.js +2 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/internal.d.ts +3 -4
- package/dist/esm/internal.js +1 -2
- package/dist/esm/internal.js.map +1 -1
- package/dist/esm/persistence/PersistenceMetadata.d.ts +3 -6
- package/dist/esm/persistence/PersistenceMetadata.js +5 -6
- package/dist/esm/persistence/PersistenceMetadata.js.map +1 -1
- package/dist/esm/persistence/idb/IdbService.d.ts +3 -3
- package/dist/esm/persistence/idb/IdbService.js +0 -1
- package/dist/esm/persistence/idb/IdbService.js.map +1 -1
- package/dist/esm/persistence/idb/idbPersistence.d.ts +9 -10
- package/dist/esm/persistence/idb/idbPersistence.js +11 -4
- package/dist/esm/persistence/idb/idbPersistence.js.map +1 -1
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.d.ts +2 -2
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.js +1 -1
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.js.map +1 -1
- package/dist/esm/persistence/idb/queries/IdbDocumentDb.d.ts +3 -2
- package/dist/esm/persistence/idb/queries/IdbDocumentDb.js +16 -15
- package/dist/esm/persistence/idb/queries/IdbDocumentDb.js.map +1 -1
- package/dist/esm/persistence/idb/queries/migration/db.js +7 -0
- package/dist/esm/persistence/idb/queries/migration/db.js.map +1 -1
- package/dist/esm/persistence/idb/util.js +27 -17
- package/dist/esm/persistence/idb/util.js.map +1 -1
- package/dist/esm/persistence/interfaces.d.ts +8 -8
- package/dist/esm/persistence/migration/engine.d.ts +5 -3
- package/dist/esm/persistence/migration/engine.js +23 -14
- package/dist/esm/persistence/migration/engine.js.map +1 -1
- package/dist/esm/persistence/migration/finalize.d.ts +5 -3
- package/dist/esm/persistence/migration/finalize.js +5 -4
- package/dist/esm/persistence/migration/finalize.js.map +1 -1
- package/dist/esm/persistence/migration/migrate.d.ts +8 -5
- package/dist/esm/persistence/migration/migrate.js +10 -4
- package/dist/esm/persistence/migration/migrate.js.map +1 -1
- package/dist/esm/persistence/persistence.d.ts +9 -2
- package/dist/esm/persistence/persistence.js +65 -32
- package/dist/esm/persistence/persistence.js.map +1 -1
- package/dist/esm/queries/FindAllQuery.js +1 -1
- package/dist/esm/queries/FindAllQuery.js.map +1 -1
- package/dist/esm/queries/FindInfiniteQuery.js +2 -2
- package/dist/esm/queries/FindInfiniteQuery.js.map +1 -1
- package/dist/esm/queries/FindOneQuery.js +1 -1
- package/dist/esm/queries/FindOneQuery.js.map +1 -1
- package/dist/esm/queries/FindPageQuery.js +1 -1
- package/dist/esm/queries/FindPageQuery.js.map +1 -1
- package/dist/esm/sync/PresenceManager.d.ts +2 -2
- package/dist/esm/sync/PresenceManager.js +5 -2
- package/dist/esm/sync/PresenceManager.js.map +1 -1
- package/dist/esm/sync/PushPullSync.js +4 -4
- package/dist/esm/sync/PushPullSync.js.map +1 -1
- package/dist/esm/sync/Sync.d.ts +2 -2
- package/dist/esm/sync/Sync.js +17 -14
- package/dist/esm/sync/Sync.js.map +1 -1
- package/dist/esm/sync/WebSocketSync.js +12 -7
- package/dist/esm/sync/WebSocketSync.js.map +1 -1
- package/dist/esm/sync/serviceWorker.d.ts +2 -2
- package/dist/esm/sync/serviceWorker.js +3 -4
- package/dist/esm/sync/serviceWorker.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/fixtures/testStorage.ts +4 -8
- package/src/__tests__/queries.test.ts +3 -5
- package/src/__tests__/schema.test.ts +3 -3
- package/src/client/Client.ts +50 -34
- package/src/context/Time.ts +2 -2
- package/src/context/context.ts +189 -17
- package/src/entities/Entity.test.ts +0 -1
- package/src/entities/EntityMetadata.ts +16 -5
- package/src/entities/EntityStore.ts +14 -10
- package/src/files/EntityFile.ts +1 -1
- package/src/files/FileManager.ts +5 -5
- package/src/index.ts +6 -10
- package/src/internal.ts +10 -11
- package/src/persistence/PersistenceMetadata.ts +9 -11
- package/src/persistence/idb/IdbService.ts +2 -3
- package/src/persistence/idb/idbPersistence.ts +25 -19
- package/src/persistence/idb/metadata/IdbMetadataDb.ts +3 -3
- package/src/persistence/idb/queries/IdbDocumentDb.ts +31 -17
- package/src/persistence/idb/queries/migration/db.ts +10 -0
- package/src/persistence/idb/util.ts +46 -24
- package/src/persistence/interfaces.ts +21 -12
- package/src/persistence/migration/engine.ts +33 -18
- package/src/persistence/migration/finalize.ts +11 -5
- package/src/persistence/migration/migrate.ts +15 -8
- package/src/persistence/persistence.ts +78 -67
- package/src/queries/FindAllQuery.ts +3 -1
- package/src/queries/FindInfiniteQuery.ts +6 -2
- package/src/queries/FindOneQuery.ts +3 -1
- package/src/queries/FindPageQuery.ts +3 -1
- package/src/sync/PresenceManager.ts +10 -7
- package/src/sync/PushPullSync.ts +8 -6
- package/src/sync/Sync.ts +26 -16
- package/src/sync/WebSocketSync.ts +25 -9
- package/src/sync/serviceWorker.ts +4 -6
- package/dist/esm/client/ClientDescriptor.d.ts +0 -87
- package/dist/esm/client/ClientDescriptor.js +0 -133
- package/dist/esm/client/ClientDescriptor.js.map +0 -1
- package/dist/esm/persistence/migration/types.d.ts +0 -3
- package/dist/esm/persistence/migration/types.js +0 -2
- package/dist/esm/persistence/migration/types.js.map +0 -1
- package/src/client/ClientDescriptor.ts +0 -246
- package/src/persistence/migration/types.ts +0 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getOidRoot, VerdantError } from '@verdant-web/common';
|
|
2
2
|
import { ShutdownHandler } from '../context/ShutdownHandler.js';
|
|
3
3
|
import { getWipNamespace } from '../utils/wip.js';
|
|
4
4
|
import { migrate } from './migration/migrate.js';
|
|
@@ -7,44 +7,59 @@ import { PersistenceMetadata } from './PersistenceMetadata.js';
|
|
|
7
7
|
import { PersistenceDocuments } from './PersistenceQueries.js';
|
|
8
8
|
export async function initializePersistence(ctx) {
|
|
9
9
|
var _a;
|
|
10
|
-
|
|
10
|
+
const initialSchema = ctx.schema;
|
|
11
11
|
if (ctx.schema.wip) {
|
|
12
12
|
// this is a WIP database, so we need to create a new namespace for the WIP data.
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
ctx.namespace = getWipNamespace(ctx.originalNamespace, ctx.schema);
|
|
14
|
+
ctx.log('info', '🔨', 'Switched to WIP namespace', ctx.namespace);
|
|
15
15
|
// check if this WIP database is already in use
|
|
16
|
-
const namespaces = await
|
|
17
|
-
if (!namespaces.includes(
|
|
16
|
+
const namespaces = await ctx.persistence.getNamespaces();
|
|
17
|
+
if (!namespaces.includes(ctx.namespace)) {
|
|
18
18
|
// copy all data to WIP namespace -- from the current version of local
|
|
19
19
|
// data, not the WIP schema version. this may not be n-1, we might
|
|
20
20
|
// be loading a WIP schema over older data.
|
|
21
|
-
const currentVersion = await
|
|
21
|
+
const currentVersion = await ctx.persistence.getNamespaceVersion(ctx.originalNamespace);
|
|
22
22
|
if (currentVersion === 0) {
|
|
23
23
|
// there is no existing data. nothing to copy.
|
|
24
|
-
|
|
24
|
+
ctx.log('debug', 'No existing data to copy to WIP namespace');
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
27
|
const currentSchema = (_a = ctx.oldSchemas) === null || _a === void 0 ? void 0 : _a.find((s) => s.version === currentVersion);
|
|
28
28
|
if (!currentSchema) {
|
|
29
29
|
throw new VerdantError(VerdantError.Code.MigrationPathNotFound, undefined, `Trying to open WIP database for version ${ctx.schema.version}, but the current local data is version ${currentVersion} and a historical schema for that version is not available.`);
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
await
|
|
31
|
+
ctx.log('info', `Copying data from ${ctx.originalNamespace} to ${ctx.namespace}`);
|
|
32
|
+
await ctx.persistence.copyNamespace(ctx.originalNamespace, ctx.namespace,
|
|
33
|
+
// needs to be the original schema; the copy should be of the original
|
|
34
|
+
// data and schema structure; the WIP schema migration application happens
|
|
35
|
+
// below.
|
|
36
|
+
ctx.cloneWithOptions({
|
|
37
|
+
schema: currentSchema,
|
|
38
|
+
}));
|
|
33
39
|
}
|
|
34
40
|
}
|
|
35
41
|
}
|
|
36
|
-
const namespace = await ctx.persistence.openNamespace(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
+
const namespace = await ctx.persistence.openNamespace(ctx.namespace, ctx);
|
|
43
|
+
ctx.log('info', 'Opening persistence metadata', ctx.namespace);
|
|
44
|
+
const meta = new PersistenceMetadata(await namespace.openMetadata(ctx), ctx);
|
|
45
|
+
ctx.log('info', 'Opening persistence files', ctx.namespace);
|
|
46
|
+
const files = new PersistenceFiles(await namespace.openFiles(ctx), ctx);
|
|
47
|
+
ctx.log('info', 'Migrating document database');
|
|
42
48
|
await migrate({
|
|
43
|
-
context,
|
|
49
|
+
context: ctx,
|
|
44
50
|
version: ctx.schema.version,
|
|
51
|
+
meta,
|
|
45
52
|
});
|
|
46
|
-
|
|
47
|
-
|
|
53
|
+
ctx.log('info', 'Opening persistence documents');
|
|
54
|
+
if (ctx.schema.version <= 0) {
|
|
55
|
+
// debugging....
|
|
56
|
+
if (ctx.schema !== initialSchema) {
|
|
57
|
+
ctx.log('critical', 'Schema at initialization does not match original schema. This is likely a bug in Verdant!');
|
|
58
|
+
throw new VerdantError(VerdantError.Code.ConfigurationError, undefined, `Schema at initialization does not match original schema. This is likely a bug in Verdant!`);
|
|
59
|
+
}
|
|
60
|
+
throw new VerdantError(VerdantError.Code.ConfigurationError, undefined, `Schema version must be greater than 0. Found version ${ctx.schema.version} with collections [${Object.keys(ctx.schema.collections).join(', ')}]\n${JSON.stringify(ctx.schema)}`);
|
|
61
|
+
}
|
|
62
|
+
const documents = new PersistenceDocuments(await namespace.openDocuments(ctx), ctx);
|
|
48
63
|
if (!ctx.schema.wip) {
|
|
49
64
|
const namespaces = await ctx.persistence.getNamespaces();
|
|
50
65
|
// cleanup old WIP databases
|
|
@@ -55,7 +70,7 @@ export async function initializePersistence(ctx) {
|
|
|
55
70
|
}
|
|
56
71
|
}
|
|
57
72
|
}
|
|
58
|
-
return
|
|
73
|
+
return { meta, files, documents };
|
|
59
74
|
}
|
|
60
75
|
export async function importPersistence(ctx, exportedData) {
|
|
61
76
|
var _a;
|
|
@@ -69,11 +84,16 @@ export async function importPersistence(ctx, exportedData) {
|
|
|
69
84
|
}
|
|
70
85
|
// using a new namespace to put all of this into a temporary zone
|
|
71
86
|
const importedNamespace = `@@import_${Date.now()}`;
|
|
72
|
-
const importedContext =
|
|
73
|
-
|
|
74
|
-
|
|
87
|
+
const importedContext = ctx.cloneWithOptions({
|
|
88
|
+
schema: exportedSchema,
|
|
89
|
+
namespace: importedNamespace,
|
|
90
|
+
disableRebasing: true,
|
|
91
|
+
persistenceShutdownHandler: new ShutdownHandler(ctx.log),
|
|
92
|
+
});
|
|
93
|
+
await importedContext.reinitialize();
|
|
94
|
+
const importedMeta = await importedContext.meta;
|
|
75
95
|
// load imported data into persistence
|
|
76
|
-
await
|
|
96
|
+
await importedMeta.resetFrom(exportedData.data);
|
|
77
97
|
// need to write indexes here!
|
|
78
98
|
const affectedOids = new Set();
|
|
79
99
|
for (const baseline of exportedData.data.baselines) {
|
|
@@ -83,23 +103,28 @@ export async function importPersistence(ctx, exportedData) {
|
|
|
83
103
|
affectedOids.add(getOidRoot(operation.oid));
|
|
84
104
|
}
|
|
85
105
|
const toSave = await Promise.all(Array.from(affectedOids).map(async (oid) => {
|
|
86
|
-
const snapshot = await
|
|
106
|
+
const snapshot = await importedMeta.getDocumentSnapshot(oid);
|
|
87
107
|
return {
|
|
88
108
|
oid,
|
|
89
109
|
getSnapshot: () => snapshot,
|
|
90
110
|
};
|
|
91
111
|
}));
|
|
92
|
-
await importedContext.documents.saveEntities(toSave);
|
|
93
|
-
await importedContext.files.import(exportedData);
|
|
112
|
+
await (await importedContext.documents).saveEntities(toSave);
|
|
113
|
+
await (await importedContext.files).import(exportedData);
|
|
94
114
|
ctx.log('debug', 'Imported data into temporary namespace', importedNamespace);
|
|
95
115
|
// shut down the imported databases
|
|
96
116
|
await importedContext.persistenceShutdownHandler.shutdown();
|
|
97
117
|
if (exportedSchema.version !== ctx.schema.version) {
|
|
98
118
|
// an upgrade of the imported data is needed ; it's an older version
|
|
99
119
|
// of the schema.
|
|
100
|
-
// upgrade the imported data to the latest schema
|
|
101
|
-
|
|
102
|
-
const upgradedContext =
|
|
120
|
+
// upgrade the imported data to the latest schema by re-initializing
|
|
121
|
+
// a context at the latest version, pointing at the imported namespace
|
|
122
|
+
const upgradedContext = importedContext.cloneWithOptions({
|
|
123
|
+
persistenceShutdownHandler: new ShutdownHandler(ctx.log),
|
|
124
|
+
schema: ctx.schema,
|
|
125
|
+
oldSchemas: ctx.oldSchemas,
|
|
126
|
+
});
|
|
127
|
+
await upgradedContext.reinitialize();
|
|
103
128
|
ctx.log('debug', 'Upgraded imported data to current schema');
|
|
104
129
|
await upgradedContext.persistenceShutdownHandler.shutdown();
|
|
105
130
|
ctx.log('debug', 'Shut down upgraded databases');
|
|
@@ -108,13 +133,15 @@ export async function importPersistence(ctx, exportedData) {
|
|
|
108
133
|
await ctx.persistenceShutdownHandler.shutdown();
|
|
109
134
|
// copy the imported data into the current namespace
|
|
110
135
|
await ctx.persistence.copyNamespace(importedNamespace, ctx.namespace, ctx);
|
|
136
|
+
ctx.log('debug', 'Copied imported data to primary namespace');
|
|
111
137
|
// restart the persistence layer
|
|
112
|
-
await
|
|
138
|
+
await ctx.reinitialize();
|
|
139
|
+
ctx.log('debug', 'Reinitialized primary persistence layer');
|
|
113
140
|
// verify integrity -- this can only be done if imported data was same
|
|
114
141
|
// version as current schema, because migrations could add or remove
|
|
115
142
|
// operations. still, it's a good sanity check.
|
|
116
143
|
if (exportedData.data.schemaVersion === ctx.schema.version) {
|
|
117
|
-
const stats = await ctx.meta.stats();
|
|
144
|
+
const stats = await (await ctx.meta).stats();
|
|
118
145
|
if (stats.operationsSize.count !== exportedData.data.operations.length) {
|
|
119
146
|
ctx.log('critical', 'Imported operations count mismatch', 'expected', exportedData.data.operations.length, 'actual', stats.operationsSize.count);
|
|
120
147
|
throw new VerdantError(VerdantError.Code.ImportFailed, undefined, 'Imported operations count mismatch');
|
|
@@ -124,6 +151,12 @@ export async function importPersistence(ctx, exportedData) {
|
|
|
124
151
|
throw new VerdantError(VerdantError.Code.ImportFailed, undefined, 'Imported documents count mismatch');
|
|
125
152
|
}
|
|
126
153
|
}
|
|
154
|
+
else {
|
|
155
|
+
ctx.log('debug', 'Skipping integrity check due to schema version mismatch (not an error)', {
|
|
156
|
+
exportedVersion: exportedData.data.schemaVersion,
|
|
157
|
+
currentVersion: ctx.schema.version,
|
|
158
|
+
});
|
|
159
|
+
}
|
|
127
160
|
ctx.log('debug', 'Data copied to primary namespace');
|
|
128
161
|
// cleanup the imported namespace
|
|
129
162
|
await ctx.persistence.deleteNamespace(importedNamespace, ctx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export class FindAllQuery extends BaseQuery {
|
|
|
17
17
|
var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
|
|
18
18
|
super(Object.assign({ initial: [] }, rest));
|
|
19
19
|
this.run = async () => {
|
|
20
|
-
const { result: oids } = await this.context.documents.findAllOids({
|
|
20
|
+
const { result: oids } = await (await this.context.documents).findAllOids({
|
|
21
21
|
collection: this.collection,
|
|
22
22
|
index: this.index,
|
|
23
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindAllQuery.js","sourceRoot":"","sources":["../../../src/queries/FindAllQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAc;IAIlD,YAAY,EAO8B;YAP9B,EACX,KAAK,EACL,OAAO,OAKkC,EAJtC,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"FindAllQuery.js","sourceRoot":"","sources":["../../../src/queries/FindAllQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAc;IAIlD,YAAY,EAO8B;YAP9B,EACX,KAAK,EACL,OAAO,OAKkC,EAJtC,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC5B,CAAC,WAAW,CAAC;gBACb,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,iBAAiB,IAAI,CAAC,MAAM,gBAAgB,IAAI,EAAE,CAClD,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QAtBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAqBD;KALC,MAAM"}
|
|
@@ -25,7 +25,7 @@ export class FindInfiniteQuery extends BaseQuery {
|
|
|
25
25
|
this._upToPage = 1;
|
|
26
26
|
this._hasNextPage = false;
|
|
27
27
|
this.run = async () => {
|
|
28
|
-
const { result, hasNextPage } = await this.context.documents.findAllOids({
|
|
28
|
+
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
29
29
|
collection: this.collection,
|
|
30
30
|
limit: this._pageSize * this._upToPage,
|
|
31
31
|
offset: 0,
|
|
@@ -35,7 +35,7 @@ export class FindInfiniteQuery extends BaseQuery {
|
|
|
35
35
|
this.setValue(await Promise.all(result.map(this.hydrate)));
|
|
36
36
|
};
|
|
37
37
|
this.loadMore = async () => {
|
|
38
|
-
const { result, hasNextPage } = await this.context.documents.findAllOids({
|
|
38
|
+
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
39
39
|
collection: this.collection,
|
|
40
40
|
limit: this._pageSize,
|
|
41
41
|
offset: this._pageSize * this._upToPage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindInfiniteQuery.js","sourceRoot":"","sources":["../../../src/queries/FindInfiniteQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,iBAAqB,SAAQ,SAAc;IAOvD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,YAAY,EAS8B;YAT9B,EACX,OAAO,EACP,QAAQ,EACR,KAAK,OAMoC,EALtC,IAAI,cAJI,gCAKX,CADO;QAMP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAzBI,cAAS,GAAG,CAAC,CAAC;QAEd,iBAAY,GAAY,KAAK,CAAC;QA6B5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"FindInfiniteQuery.js","sourceRoot":"","sources":["../../../src/queries/FindInfiniteQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,iBAAqB,SAAQ,SAAc;IAOvD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,YAAY,EAS8B;YAT9B,EACX,OAAO,EACP,QAAQ,EACR,KAAK,OAMoC,EALtC,IAAI,cAJI,gCAKX,CADO;QAMP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAzBI,cAAS,GAAG,CAAC,CAAC;QAEd,iBAAY,GAAY,KAAK,CAAC;QA6B5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC5B,CAAC,WAAW,CAAC;gBACb,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACtC,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC;QAEK,aAAQ,GAAG,KAAK,IAAI,EAAE;YAC5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC5B,CAAC,WAAW,CAAC;gBACb,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACvC,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC;gBACb,GAAG,IAAI,CAAC,OAAO;gBACf,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAChD,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QAvCD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC3B,CAAC;CAqCD;KALC,MAAM"}
|
|
@@ -17,7 +17,7 @@ export class FindOneQuery extends BaseQuery {
|
|
|
17
17
|
var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
|
|
18
18
|
super(Object.assign({ initial: null }, rest));
|
|
19
19
|
this.run = async () => {
|
|
20
|
-
const oid = await this.context.documents.findOneOid({
|
|
20
|
+
const oid = await (await this.context.documents).findOneOid({
|
|
21
21
|
collection: this.collection,
|
|
22
22
|
index: this.index,
|
|
23
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindOneQuery.js","sourceRoot":"","sources":["../../../src/queries/FindOneQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAmB;IAIvD,YAAY,EAOmC;YAPnC,EACX,KAAK,EACL,OAAO,OAKuC,EAJ3C,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"FindOneQuery.js","sourceRoot":"","sources":["../../../src/queries/FindOneQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAmB;IAIvD,YAAY,EAOmC;YAPnC,EACX,KAAK,EACL,OAAO,OAKuC,EAJ3C,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,GAAG,GAAG,MAAM,CACjB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC5B,CAAC,UAAU,CAAC;gBACZ,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QAlBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAiBD;KALC,MAAM"}
|
|
@@ -30,7 +30,7 @@ export class FindPageQuery extends BaseQuery {
|
|
|
30
30
|
super(Object.assign({ initial: [] }, rest));
|
|
31
31
|
this._hasNextPage = false;
|
|
32
32
|
this.run = async () => {
|
|
33
|
-
const { result, hasNextPage } = await this.context.documents.findAllOids({
|
|
33
|
+
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
34
34
|
collection: this.collection,
|
|
35
35
|
index: this.index,
|
|
36
36
|
limit: this._pageSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindPageQuery.js","sourceRoot":"","sources":["../../../src/queries/FindPageQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,aAAiB,SAAQ,SAAc;IAOnD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,YAAY,EAW8B;YAX9B,EACX,KAAK,EACL,OAAO,EACP,QAAQ,EACR,IAAI,OAOqC,EANtC,IAAI,cALI,wCAMX,CADO;QAOP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAjCI,iBAAY,GAAY,KAAK,CAAC;QAwC5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"FindPageQuery.js","sourceRoot":"","sources":["../../../src/queries/FindPageQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,aAAiB,SAAQ,SAAc;IAOnD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,YAAY,EAW8B;YAX9B,EACX,KAAK,EACL,OAAO,EACP,QAAQ,EACR,IAAI,OAOqC,EANtC,IAAI,cALI,wCAMX,CADO;QAOP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAjCI,iBAAY,GAAY,KAAK,CAAC;QAwC5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC5B,CAAC,WAAW,CAAC;gBACb,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,MAAM,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;aACnC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC;QAEF,aAAQ,GAAG,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO;YAE9B,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,iBAAY,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC;gBAAE,OAAO;YAE7B,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,YAAO,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QA1CD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;CAuCD;KALC,MAAM"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import type { UserInfo } from '../index.js';
|
|
1
|
+
import { EventSubscriber, ServerMessage, VerdantInternalPresence } from '@verdant-web/common';
|
|
3
2
|
import { Context } from '../context/context.js';
|
|
3
|
+
import type { UserInfo } from '../index.js';
|
|
4
4
|
import { LocalReplicaInfo } from '../persistence/interfaces.js';
|
|
5
5
|
export declare const HANDLE_MESSAGE: unique symbol;
|
|
6
6
|
export declare class PresenceManager<Profile = any, Presence = any> extends EventSubscriber<{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var _a;
|
|
2
|
-
import {
|
|
2
|
+
import { Batcher, EventSubscriber, initialInternalPresence, } from '@verdant-web/common';
|
|
3
3
|
export const HANDLE_MESSAGE = Symbol('handleMessage');
|
|
4
4
|
export class PresenceManager extends EventSubscriber {
|
|
5
5
|
get self() {
|
|
@@ -164,7 +164,10 @@ export class PresenceManager extends EventSubscriber {
|
|
|
164
164
|
this.self.id = '';
|
|
165
165
|
this.self.replicaId = '';
|
|
166
166
|
// set the local replica ID as soon as it's loaded
|
|
167
|
-
ctx.
|
|
167
|
+
ctx.waitForInitialization
|
|
168
|
+
.then(() => ctx.meta)
|
|
169
|
+
.then((meta) => meta.getLocalReplica())
|
|
170
|
+
.then((info) => {
|
|
168
171
|
this.self.replicaId = info.id;
|
|
169
172
|
});
|
|
170
173
|
this._updateBatcher = new Batcher(this.flushPresenceUpdates);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PresenceManager.js","sourceRoot":"","sources":["../../../src/sync/PresenceManager.ts"],"names":[],"mappings":";AAAA,OAAO,EAEN,
|
|
1
|
+
{"version":3,"file":"PresenceManager.js","sourceRoot":"","sources":["../../../src/sync/PresenceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,7 +81,7 @@ export class PushPullSync extends EventSubscriber {
|
|
|
81
81
|
if (message.ackThisNonce) {
|
|
82
82
|
this.ctx.log('debug', 'Sending sync ack', message.ackThisNonce);
|
|
83
83
|
await this.sendRequest([
|
|
84
|
-
await this.ctx.meta.messageCreator.createAck(message.ackThisNonce),
|
|
84
|
+
await (await this.ctx.meta).messageCreator.createAck(message.ackThisNonce),
|
|
85
85
|
]);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -130,8 +130,8 @@ export class PushPullSync extends EventSubscriber {
|
|
|
130
130
|
// will include the client's own presence info and fill in missing profile
|
|
131
131
|
// data on the first request. otherwise it would have to wait for the second.
|
|
132
132
|
this.sendRequest([
|
|
133
|
-
await this.ctx.meta.messageCreator.createPresenceUpdate(this.presence.self),
|
|
134
|
-
await this.ctx.meta.messageCreator.createSyncStep1(),
|
|
133
|
+
await (await this.ctx.meta).messageCreator.createPresenceUpdate(this.presence.self),
|
|
134
|
+
await (await this.ctx.meta).messageCreator.createSyncStep1(),
|
|
135
135
|
]);
|
|
136
136
|
};
|
|
137
137
|
// if the server fails to respond in a certain amount of time, we assume
|
|
@@ -143,7 +143,7 @@ export class PushPullSync extends EventSubscriber {
|
|
|
143
143
|
};
|
|
144
144
|
this.syncOnce = async () => {
|
|
145
145
|
await this.sendRequest([
|
|
146
|
-
await this.ctx.meta.messageCreator.createSyncStep1(),
|
|
146
|
+
await (await this.ctx.meta).messageCreator.createSyncStep1(),
|
|
147
147
|
]);
|
|
148
148
|
};
|
|
149
149
|
this.ctx = ctx;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushPullSync.js","sourceRoot":"","sources":["../../../src/sync/PushPullSync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PushPullSync.js","sourceRoot":"","sources":["../../../src/sync/PushPullSync.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/sync/Sync.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ClientMessage, DocumentBaseline, EventSubscriber, FileData, Operation, ServerMessage } from '@verdant-web/common';
|
|
2
|
-
import {
|
|
2
|
+
import { Context } from '../context/context.js';
|
|
3
3
|
import { FilePullResult, FileUploadResult } from './FileSync.js';
|
|
4
|
+
import { PresenceManager } from './PresenceManager.js';
|
|
4
5
|
import { ServerSyncEndpointProviderConfig } from './ServerSyncEndpointProvider.js';
|
|
5
|
-
import { Context } from '../context/context.js';
|
|
6
6
|
type SyncEvents = {
|
|
7
7
|
onlineChange: (isOnline: boolean) => void;
|
|
8
8
|
syncingChange: (syncing: boolean) => void;
|
package/dist/esm/sync/Sync.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { EventSubscriber, ReplicaType, rewriteAuthzOriginator, VerdantError, } from '@verdant-web/common';
|
|
2
|
-
import {
|
|
2
|
+
import { attemptToRegisterBackgroundSync } from './background.js';
|
|
3
3
|
import { FileSync } from './FileSync.js';
|
|
4
|
+
import { HANDLE_MESSAGE, PresenceManager } from './PresenceManager.js';
|
|
4
5
|
import { PushPullSync } from './PushPullSync.js';
|
|
5
6
|
import { ServerSyncEndpointProvider, } from './ServerSyncEndpointProvider.js';
|
|
6
7
|
import { WebSocketSync } from './WebSocketSync.js';
|
|
7
|
-
import { attemptToRegisterBackgroundSync } from './background.js';
|
|
8
8
|
export class NoSync extends EventSubscriber {
|
|
9
9
|
send() { }
|
|
10
10
|
async start() { }
|
|
@@ -73,11 +73,11 @@ export class ServerSync extends EventSubscriber {
|
|
|
73
73
|
baselines: message.baselines,
|
|
74
74
|
});
|
|
75
75
|
if (message.globalAckTimestamp) {
|
|
76
|
-
await this.ctx.meta.setGlobalAck(message.globalAckTimestamp);
|
|
76
|
+
await (await this.ctx.meta).setGlobalAck(message.globalAckTimestamp);
|
|
77
77
|
}
|
|
78
78
|
break;
|
|
79
79
|
case 'global-ack':
|
|
80
|
-
await this.ctx.meta.setGlobalAck(message.timestamp);
|
|
80
|
+
await (await this.ctx.meta).setGlobalAck(message.timestamp);
|
|
81
81
|
break;
|
|
82
82
|
case 'sync-resp':
|
|
83
83
|
this._activelySyncing = true;
|
|
@@ -88,9 +88,9 @@ export class ServerSync extends EventSubscriber {
|
|
|
88
88
|
reset: message.overwriteLocalData,
|
|
89
89
|
});
|
|
90
90
|
if (message.globalAckTimestamp) {
|
|
91
|
-
await this.ctx.meta.setGlobalAck(message.globalAckTimestamp);
|
|
91
|
+
await (await this.ctx.meta).setGlobalAck(message.globalAckTimestamp);
|
|
92
92
|
}
|
|
93
|
-
await this.ctx.meta.updateLastSynced(message.ackedTimestamp);
|
|
93
|
+
await (await this.ctx.meta).updateLastSynced(message.ackedTimestamp);
|
|
94
94
|
this._activelySyncing = false;
|
|
95
95
|
this.emit('syncingChange', false);
|
|
96
96
|
this._hasSynced = true;
|
|
@@ -98,11 +98,11 @@ export class ServerSync extends EventSubscriber {
|
|
|
98
98
|
break;
|
|
99
99
|
case 'need-since':
|
|
100
100
|
this.emit('serverReset', message.since);
|
|
101
|
-
this.ctx.files.onServerReset(message.since);
|
|
102
|
-
this.activeSync.send(await this.ctx.meta.messageCreator.createSyncStep1(message.since));
|
|
101
|
+
(await this.ctx.files).onServerReset(message.since);
|
|
102
|
+
this.activeSync.send(await (await this.ctx.meta).messageCreator.createSyncStep1(message.since));
|
|
103
103
|
break;
|
|
104
104
|
case 'server-ack':
|
|
105
|
-
await this.ctx.meta.updateLastSynced(message.timestamp);
|
|
105
|
+
await (await this.ctx.meta).updateLastSynced(message.timestamp);
|
|
106
106
|
}
|
|
107
107
|
// avoid rebroadcasting messages
|
|
108
108
|
if (source === 'network') {
|
|
@@ -112,13 +112,13 @@ export class ServerSync extends EventSubscriber {
|
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
// update presence if necessary
|
|
115
|
-
this.presence[HANDLE_MESSAGE](await this.ctx.meta.getLocalReplica(), message);
|
|
115
|
+
this.presence[HANDLE_MESSAGE](await (await this.ctx.meta).getLocalReplica(), message);
|
|
116
116
|
};
|
|
117
117
|
this.handleOnlineChange = async (online) => {
|
|
118
118
|
this.emit('onlineChange', online);
|
|
119
119
|
// if online, attempt to upload any unsynced files.
|
|
120
120
|
if (online) {
|
|
121
|
-
const unsyncedFiles = await this.ctx.files.listUnsynced();
|
|
121
|
+
const unsyncedFiles = await (await this.ctx.files).listUnsynced();
|
|
122
122
|
const results = await Promise.allSettled(unsyncedFiles.map((file) => this.fileSync.uploadFile(file)));
|
|
123
123
|
if (results.some((r) => r.status === 'rejected')) {
|
|
124
124
|
this.ctx.log('error', 'Failed to upload unsynced files', results
|
|
@@ -128,7 +128,7 @@ export class ServerSync extends EventSubscriber {
|
|
|
128
128
|
}
|
|
129
129
|
};
|
|
130
130
|
this.handlePresenceUpdate = async (data) => {
|
|
131
|
-
this.send(await this.ctx.meta.messageCreator.createPresenceUpdate(data));
|
|
131
|
+
this.send(await (await this.ctx.meta).messageCreator.createPresenceUpdate(data));
|
|
132
132
|
};
|
|
133
133
|
this.setMode = (transport) => {
|
|
134
134
|
if (transport === 'realtime' && !this.canDoRealtime) {
|
|
@@ -169,7 +169,7 @@ export class ServerSync extends EventSubscriber {
|
|
|
169
169
|
if (message.type === 'sync' || message.type === 'op') {
|
|
170
170
|
rewriteAuthzOriginator(message, userId);
|
|
171
171
|
}
|
|
172
|
-
|
|
172
|
+
this.activeSync.send(message);
|
|
173
173
|
(_b = this.onOutgoingMessage) === null || _b === void 0 ? void 0 : _b.call(this, message);
|
|
174
174
|
}
|
|
175
175
|
};
|
|
@@ -222,9 +222,11 @@ export class ServerSync extends EventSubscriber {
|
|
|
222
222
|
});
|
|
223
223
|
};
|
|
224
224
|
this.start = () => {
|
|
225
|
+
this.ctx.log('info', 'Starting sync');
|
|
225
226
|
return this.activeSync.start();
|
|
226
227
|
};
|
|
227
228
|
this.stop = () => {
|
|
229
|
+
this.ctx.log('info', 'Stopping sync');
|
|
228
230
|
return this.activeSync.stop();
|
|
229
231
|
};
|
|
230
232
|
this.destroy = () => {
|
|
@@ -275,6 +277,7 @@ export class ServerSync extends EventSubscriber {
|
|
|
275
277
|
this.broadcastChannel = new BroadcastChannel(`verdant-${ctx.namespace}`);
|
|
276
278
|
this.broadcastChannel.addEventListener('message', this.handleBroadcastChannelMessage);
|
|
277
279
|
}
|
|
280
|
+
ctx.log('info', 'Sync initialized with transport:', initialTransport !== null && initialTransport !== void 0 ? initialTransport : 'pull');
|
|
278
281
|
if (initialTransport === 'realtime') {
|
|
279
282
|
this.activeSync = this.webSocketSync;
|
|
280
283
|
}
|
|
@@ -282,7 +285,7 @@ export class ServerSync extends EventSubscriber {
|
|
|
282
285
|
this.activeSync = this.pushPullSync;
|
|
283
286
|
}
|
|
284
287
|
this.presence.subscribe('update', this.handlePresenceUpdate);
|
|
285
|
-
ctx.
|
|
288
|
+
ctx.internalEvents.subscribe('outgoingSyncMessage', this.send);
|
|
286
289
|
this.webSocketSync.subscribe('message', this.handleMessage);
|
|
287
290
|
this.webSocketSync.subscribe('onlineChange', this.handleOnlineChange);
|
|
288
291
|
this.pushPullSync.subscribe('message', this.handleMessage);
|