@verdant-web/store 4.6.0 → 5.0.0

package/dist/esm/persistence/persistence.js

@@ -1,4 +1,4 @@
-import { EventSubscriber, getOidRoot, VerdantError } from '@verdant-web/common';
+import { getOidRoot, VerdantError } from '@verdant-web/common';
 import { ShutdownHandler } from '../context/ShutdownHandler.js';
 import { getWipNamespace } from '../utils/wip.js';
 import { migrate } from './migration/migrate.js';
@@ -7,44 +7,59 @@ import { PersistenceMetadata } from './PersistenceMetadata.js';
 import { PersistenceDocuments } from './PersistenceQueries.js';
 export async function initializePersistence(ctx) {
     var _a;
-    let context = ctx;
+    const initialSchema = ctx.schema;
     if (ctx.schema.wip) {
         // this is a WIP database, so we need to create a new namespace for the WIP data.
-        context.namespace = getWipNamespace(ctx.originalNamespace, ctx.schema);
-        context.log('info', 'Switched to WIP namespace', context.namespace);
+        ctx.namespace = getWipNamespace(ctx.originalNamespace, ctx.schema);
+        ctx.log('info', '🔨', 'Switched to WIP namespace', ctx.namespace);
         // check if this WIP database is already in use
-        const namespaces = await context.persistence.getNamespaces();
-        if (!namespaces.includes(context.namespace)) {
+        const namespaces = await ctx.persistence.getNamespaces();
+        if (!namespaces.includes(ctx.namespace)) {
             // copy all data to WIP namespace -- from the current version of local
             // data, not the WIP schema version. this may not be n-1, we might
             // be loading a WIP schema over older data.
-            const currentVersion = await context.persistence.getNamespaceVersion(context.originalNamespace);
+            const currentVersion = await ctx.persistence.getNamespaceVersion(ctx.originalNamespace);
             if (currentVersion === 0) {
                 // there is no existing data. nothing to copy.
-                context.log('debug', 'No existing data to copy to WIP namespace');
+                ctx.log('debug', 'No existing data to copy to WIP namespace');
             }
             else {
                 const currentSchema = (_a = ctx.oldSchemas) === null || _a === void 0 ? void 0 : _a.find((s) => s.version === currentVersion);
                 if (!currentSchema) {
                     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.`);
                 }
-                context.log('info', `Copying data from ${context.originalNamespace} to ${context.namespace}`);
-                await context.persistence.copyNamespace(context.originalNamespace, context.namespace, Object.assign(Object.assign({}, context), { schema: currentSchema }));
+                ctx.log('info', `Copying data from ${ctx.originalNamespace} to ${ctx.namespace}`);
+                await ctx.persistence.copyNamespace(ctx.originalNamespace, ctx.namespace, 
+                // needs to be the original schema; the copy should be of the original
+                // data and schema structure; the WIP schema migration application happens
+                // below.
+                ctx.cloneWithOptions({
+                    schema: currentSchema,
+                }));
             }
         }
     }
-    const namespace = await ctx.persistence.openNamespace(context.namespace, context);
-    context.log('info', 'Opening persistence metadata');
-    context.meta = new PersistenceMetadata(await namespace.openMetadata(ctx), ctx);
-    context.log('info', 'Opening persistence files');
-    context.files = new PersistenceFiles(await namespace.openFiles(context), context);
-    context.log('info', 'Migrating document database');
+    const namespace = await ctx.persistence.openNamespace(ctx.namespace, ctx);
+    ctx.log('info', 'Opening persistence metadata', ctx.namespace);
+    const meta = new PersistenceMetadata(await namespace.openMetadata(ctx), ctx);
+    ctx.log('info', 'Opening persistence files', ctx.namespace);
+    const files = new PersistenceFiles(await namespace.openFiles(ctx), ctx);
+    ctx.log('info', 'Migrating document database');
     await migrate({
-        context,
+        context: ctx,
         version: ctx.schema.version,
+        meta,
     });
-    context.log('info', 'Opening persistence documents');
-    context.documents = new PersistenceDocuments(await namespace.openDocuments(context), context);
+    ctx.log('info', 'Opening persistence documents');
+    if (ctx.schema.version <= 0) {
+        // debugging....
+        if (ctx.schema !== initialSchema) {
+            ctx.log('critical', 'Schema at initialization does not match original schema. This is likely a bug in Verdant!');
+            throw new VerdantError(VerdantError.Code.ConfigurationError, undefined, `Schema at initialization does not match original schema. This is likely a bug in Verdant!`);
+        }
+        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)}`);
+    }
+    const documents = new PersistenceDocuments(await namespace.openDocuments(ctx), ctx);
     if (!ctx.schema.wip) {
         const namespaces = await ctx.persistence.getNamespaces();
         // cleanup old WIP databases
@@ -55,7 +70,7 @@ export async function initializePersistence(ctx) {
             }
         }
     }
-    return context;
+    return { meta, files, documents };
 }
 export async function importPersistence(ctx, exportedData) {
     var _a;
@@ -69,11 +84,16 @@ export async function importPersistence(ctx, exportedData) {
     }
     // using a new namespace to put all of this into a temporary zone
     const importedNamespace = `@@import_${Date.now()}`;
-    const importedContext = await initializePersistence(Object.assign(Object.assign({}, ctx), { schema: exportedSchema, namespace: importedNamespace, originalNamespace: importedNamespace, 
-        // no-op entity events -- don't need to inform queries of changes.
-        entityEvents: new EventSubscriber(), internalEvents: new EventSubscriber(), globalEvents: new EventSubscriber(), config: Object.assign(Object.assign({}, ctx.config), { persistence: Object.assign(Object.assign({}, ctx.config.persistence), { disableRebasing: true }) }), persistenceShutdownHandler: new ShutdownHandler(ctx.log) }));
+    const importedContext = ctx.cloneWithOptions({
+        schema: exportedSchema,
+        namespace: importedNamespace,
+        disableRebasing: true,
+        persistenceShutdownHandler: new ShutdownHandler(ctx.log),
+    });
+    await importedContext.reinitialize();
+    const importedMeta = await importedContext.meta;
     // load imported data into persistence
-    await importedContext.meta.resetFrom(exportedData.data);
+    await importedMeta.resetFrom(exportedData.data);
     // need to write indexes here!
     const affectedOids = new Set();
     for (const baseline of exportedData.data.baselines) {
@@ -83,23 +103,28 @@ export async function importPersistence(ctx, exportedData) {
         affectedOids.add(getOidRoot(operation.oid));
     }
     const toSave = await Promise.all(Array.from(affectedOids).map(async (oid) => {
-        const snapshot = await importedContext.meta.getDocumentSnapshot(oid);
+        const snapshot = await importedMeta.getDocumentSnapshot(oid);
         return {
             oid,
             getSnapshot: () => snapshot,
         };
     }));
-    await importedContext.documents.saveEntities(toSave);
-    await importedContext.files.import(exportedData);
+    await (await importedContext.documents).saveEntities(toSave);
+    await (await importedContext.files).import(exportedData);
     ctx.log('debug', 'Imported data into temporary namespace', importedNamespace);
     // shut down the imported databases
     await importedContext.persistenceShutdownHandler.shutdown();
     if (exportedSchema.version !== ctx.schema.version) {
         // an upgrade of the imported data is needed ; it's an older version
         // of the schema.
-        // upgrade the imported data to the latest schema
-        const currentSchema = ctx.schema;
-        const upgradedContext = await initializePersistence(Object.assign(Object.assign({}, importedContext), { persistenceShutdownHandler: new ShutdownHandler(ctx.log), schema: currentSchema }));
+        // upgrade the imported data to the latest schema by re-initializing
+        // a context at the latest version, pointing at the imported namespace
+        const upgradedContext = importedContext.cloneWithOptions({
+            persistenceShutdownHandler: new ShutdownHandler(ctx.log),
+            schema: ctx.schema,
+            oldSchemas: ctx.oldSchemas,
+        });
+        await upgradedContext.reinitialize();
         ctx.log('debug', 'Upgraded imported data to current schema');
         await upgradedContext.persistenceShutdownHandler.shutdown();
         ctx.log('debug', 'Shut down upgraded databases');
@@ -108,13 +133,15 @@ export async function importPersistence(ctx, exportedData) {
     await ctx.persistenceShutdownHandler.shutdown();
     // copy the imported data into the current namespace
     await ctx.persistence.copyNamespace(importedNamespace, ctx.namespace, ctx);
+    ctx.log('debug', 'Copied imported data to primary namespace');
     // restart the persistence layer
-    await initializePersistence(ctx);
+    await ctx.reinitialize();
+    ctx.log('debug', 'Reinitialized primary persistence layer');
     // verify integrity -- this can only be done if imported data was same
     // version as current schema, because migrations could add or remove
     // operations. still, it's a good sanity check.
     if (exportedData.data.schemaVersion === ctx.schema.version) {
-        const stats = await ctx.meta.stats();
+        const stats = await (await ctx.meta).stats();
         if (stats.operationsSize.count !== exportedData.data.operations.length) {
             ctx.log('critical', 'Imported operations count mismatch', 'expected', exportedData.data.operations.length, 'actual', stats.operationsSize.count);
             throw new VerdantError(VerdantError.Code.ImportFailed, undefined, 'Imported operations count mismatch');
@@ -124,6 +151,12 @@ export async function importPersistence(ctx, exportedData) {
             throw new VerdantError(VerdantError.Code.ImportFailed, undefined, 'Imported documents count mismatch');
         }
     }
+    else {
+        ctx.log('debug', 'Skipping integrity check due to schema version mismatch (not an error)', {
+            exportedVersion: exportedData.data.schemaVersion,
+            currentVersion: ctx.schema.version,
+        });
+    }
     ctx.log('debug', 'Data copied to primary namespace');
     // cleanup the imported namespace
     await ctx.persistence.deleteNamespace(importedNamespace, ctx);

package/dist/esm/persistence/persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../src/persistence/persistence.ts"],"names":[],"mappings":"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"}

package/dist/esm/queries/FindAllQuery.js

@@ -17,7 +17,7 @@ export class FindAllQuery extends BaseQuery {
         var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
         super(Object.assign({ initial: [] }, rest));
         this.run = async () => {
-            const { result: oids } = await this.context.documents.findAllOids({
+            const { result: oids } = await (await this.context.documents).findAllOids({
                 collection: this.collection,
                 index: this.index,
             });

package/dist/esm/queries/FindAllQuery.js.map

@@ -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;gBACjE,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;QApBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAmBD;KALC,MAAM"}
+{"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"}

package/dist/esm/queries/FindInfiniteQuery.js

@@ -25,7 +25,7 @@ export class FindInfiniteQuery extends BaseQuery {
         this._upToPage = 1;
         this._hasNextPage = false;
         this.run = async () => {
-            const { result, hasNextPage } = await this.context.documents.findAllOids({
+            const { result, hasNextPage } = await (await this.context.documents).findAllOids({
                 collection: this.collection,
                 limit: this._pageSize * this._upToPage,
                 offset: 0,
@@ -35,7 +35,7 @@ export class FindInfiniteQuery extends BaseQuery {
             this.setValue(await Promise.all(result.map(this.hydrate)));
         };
         this.loadMore = async () => {
-            const { result, hasNextPage } = await this.context.documents.findAllOids({
+            const { result, hasNextPage } = await (await this.context.documents).findAllOids({
                 collection: this.collection,
                 limit: this._pageSize,
                 offset: this._pageSize * this._upToPage,

package/dist/esm/queries/FindInfiniteQuery.js.map

@@ -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;gBACxE,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,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;gBACxE,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;QAnCD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC3B,CAAC;CAiCD;KALC,MAAM"}
+{"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"}

package/dist/esm/queries/FindOneQuery.js

@@ -17,7 +17,7 @@ export class FindOneQuery extends BaseQuery {
         var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
         super(Object.assign({ initial: null }, rest));
         this.run = async () => {
-            const oid = await this.context.documents.findOneOid({
+            const oid = await (await this.context.documents).findOneOid({
                 collection: this.collection,
                 index: this.index,
             });

package/dist/esm/queries/FindOneQuery.js.map

@@ -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;gBACnD,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;QAhBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAeD;KALC,MAAM"}
+{"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"}

package/dist/esm/queries/FindPageQuery.js

@@ -30,7 +30,7 @@ export class FindPageQuery extends BaseQuery {
         super(Object.assign({ initial: [] }, rest));
         this._hasNextPage = false;
         this.run = async () => {
-            const { result, hasNextPage } = await this.context.documents.findAllOids({
+            const { result, hasNextPage } = await (await this.context.documents).findAllOids({
                 collection: this.collection,
                 index: this.index,
                 limit: this._pageSize,

package/dist/esm/queries/FindPageQuery.js.map

@@ -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;gBACxE,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;QAxCD,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;CAqCD;KALC,MAAM"}
+{"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"}

package/dist/esm/sync/Heartbeat.js

@@ -26,9 +26,11 @@ export class Heartbeat extends EventSubscriber {
         this.stop = () => {
             if (this.nextBeat) {
                 clearTimeout(this.nextBeat);
+                this.nextBeat = null;
             }
             if (this.deadline) {
                 clearTimeout(this.deadline);
+                this.deadline = null;
             }
         };
         this.beat = async () => {

package/dist/esm/sync/Heartbeat.js.map

@@ -1 +1 @@
-{"version":3,"file":"Heartbeat.js","sourceRoot":"","sources":["../../../src/sync/Heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,OAAO,SAAU,SAAQ,eAG7B;IAMD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,YAAY,EACX,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,GAAG,IAAI,EACzB,iBAAiB,GAAG,IAAI,MAKrB,EAAE;QACL,KAAK,EAAE,CAAC;QAhBD,aAAQ,GAA0B,IAAI,CAAC;QACvC,aAAQ,GAA0B,IAAI,CAAC;QA4B/C,cAAS,GAAG,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,CAAC;QACF,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,SAAS,GAAG,KAAK,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACvD,CAAC;QACF,CAAC,CAAC;QAEF,SAAI,GAAG,GAAG,EAAE;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC;QACF,CAAC,CAAC;QAEM,SAAI,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAClE,CAAC,CAAC;QAEM,eAAU,GAAG,GAAG,EAAE;YACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF;;WAEG;QACH,gBAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;YAClC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC;QArDD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACxD,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;gBAClD,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;oBAC5C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CA4CD"}
+{"version":3,"file":"Heartbeat.js","sourceRoot":"","sources":["../../../src/sync/Heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,OAAO,SAAU,SAAQ,eAG7B;IAMD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,YAAY,EACX,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,GAAG,IAAI,EACzB,iBAAiB,GAAG,IAAI,MAKrB,EAAE;QACL,KAAK,EAAE,CAAC;QAhBD,aAAQ,GAA0B,IAAI,CAAC;QACvC,aAAQ,GAA0B,IAAI,CAAC;QA4B/C,cAAS,GAAG,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,CAAC;QACF,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,SAAS,GAAG,KAAK,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACvD,CAAC;QACF,CAAC,CAAC;QAEF,SAAI,GAAG,GAAG,EAAE;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtB,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtB,CAAC;QACF,CAAC,CAAC;QAEM,SAAI,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAClE,CAAC,CAAC;QAEM,eAAU,GAAG,GAAG,EAAE;YACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF;;WAEG;QACH,gBAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;YAClC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC;QAvDD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACxD,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;gBAClD,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;oBAC5C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CA8CD"}

package/dist/esm/sync/PresenceManager.d.ts

@@ -1,6 +1,6 @@
-import { ServerMessage, EventSubscriber, VerdantInternalPresence } from '@verdant-web/common';
-import type { UserInfo } from '../index.js';
+import { EventSubscriber, ServerMessage, VerdantInternalPresence } from '@verdant-web/common';
 import { Context } from '../context/context.js';
+import type { UserInfo } from '../index.js';
 import { LocalReplicaInfo } from '../persistence/interfaces.js';
 export declare const HANDLE_MESSAGE: unique symbol;
 export declare class PresenceManager<Profile = any, Presence = any> extends EventSubscriber<{

package/dist/esm/sync/PresenceManager.js

@@ -1,5 +1,5 @@
 var _a;
-import { EventSubscriber, Batcher, initialInternalPresence, } from '@verdant-web/common';
+import { Batcher, EventSubscriber, initialInternalPresence, } from '@verdant-web/common';
 export const HANDLE_MESSAGE = Symbol('handleMessage');
 export class PresenceManager extends EventSubscriber {
     get self() {
@@ -164,7 +164,10 @@ export class PresenceManager extends EventSubscriber {
         this.self.id = '';
         this.self.replicaId = '';
         // set the local replica ID as soon as it's loaded
-        ctx.meta.getLocalReplica().then((info) => {
+        ctx.waitForInitialization
+            .then(() => ctx.meta)
+            .then((meta) => meta.getLocalReplica())
+            .then((info) => {
             this.self.replicaId = info.id;
         });
         this._updateBatcher = new Batcher(this.flushPresenceUpdates);

package/dist/esm/sync/PresenceManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PresenceManager.js","sourceRoot":"","sources":["../../../src/sync/PresenceManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PresenceManager.js","sourceRoot":"","sources":["../../../src/sync/PresenceManager.ts"],"names":[],"mappings":"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"}

package/dist/esm/sync/PushPullSync.js

@@ -81,7 +81,7 @@ export class PushPullSync extends EventSubscriber {
                 if (message.ackThisNonce) {
                     this.ctx.log('debug', 'Sending sync ack', message.ackThisNonce);
                     await this.sendRequest([
-                        await this.ctx.meta.messageCreator.createAck(message.ackThisNonce),
+                        await (await this.ctx.meta).messageCreator.createAck(message.ackThisNonce),
                     ]);
                 }
             }
@@ -93,6 +93,10 @@ export class PushPullSync extends EventSubscriber {
             this.sendRequest([message]);
         }, 3000);
         this.send = (message) => {
+            if (this.status !== 'active') {
+                this.ctx.log('warn', 'Attempted to send message while sync is not active', message);
+                return;
+            }
             // only certain messages are sent for pull-based sync.
             switch (message.type) {
                 case 'presence-update':
@@ -111,6 +115,7 @@ export class PushPullSync extends EventSubscriber {
             if (this.status === 'active') {
                 return;
             }
+            this.ctx.log('debug', 'Starting push-pull sync');
             await this.endpointProvider.getEndpoints();
             this.heartbeat.start(true);
             this._status = 'active';
@@ -125,8 +130,8 @@ export class PushPullSync extends EventSubscriber {
             // will include the client's own presence info and fill in missing profile
             // data on the first request. otherwise it would have to wait for the second.
             this.sendRequest([
-                await this.ctx.meta.messageCreator.createPresenceUpdate(this.presence.self),
-                await this.ctx.meta.messageCreator.createSyncStep1(),
+                await (await this.ctx.meta).messageCreator.createPresenceUpdate(this.presence.self),
+                await (await this.ctx.meta).messageCreator.createSyncStep1(),
             ]);
         };
         // if the server fails to respond in a certain amount of time, we assume
@@ -138,7 +143,7 @@ export class PushPullSync extends EventSubscriber {
         };
         this.syncOnce = async () => {
             await this.sendRequest([
-                await this.ctx.meta.messageCreator.createSyncStep1(),
+                await (await this.ctx.meta).messageCreator.createSyncStep1(),
             ]);
         };
         this.ctx = ctx;
@@ -157,6 +162,7 @@ export class PushPullSync extends EventSubscriber {
         return this._hasSynced;
     }
     stop() {
+        this.ctx.log('debug', 'Stopping push-pull sync');
         this.heartbeat.stop();
         this._status = 'paused';
     }

package/dist/esm/sync/PushPullSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"PushPullSync.js","sourceRoot":"","sources":["../../../src/sync/PushPullSync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PushPullSync.js","sourceRoot":"","sources":["../../../src/sync/PushPullSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,eAAe,EAGf,gBAAgB,EAChB,sBAAsB,EACtB,QAAQ,GACR,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,MAAM,OAAO,YACZ,SAAQ,eAAoC;IAM5C,IAAY,KAAK;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;IACnC,CAAC;IASD,YAAY,EACX,gBAAgB,EAChB,QAAQ,EACR,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,GAAG,GAMH;QACA,KAAK,EAAE,CAAC;QAlBA,SAAI,GAAG,MAAM,CAAC;QAGf,iBAAY,GAAG,KAAK,CAAC;QACrB,YAAO,GAAwB,QAAQ,CAAC;QACxC,eAAU,GAAG,KAAK,CAAC;QAyB3B,gBAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC;QAUM,gBAAW,GAAG,KAAK,EAAE,QAAyB,EAAE,EAAE;YACzD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC;gBACJ,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;gBACzE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;oBACvC,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACR,cAAc,EAAE,kBAAkB;wBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;qBAChC;oBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACpB,QAAQ;qBACR,CAAC;oBACF,WAAW,EAAE,SAAS;iBACtB,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACjB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;oBAC3B,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAElC,CAAC;oBACF,yCAAyC;oBACzC,sCAAsC;oBACtC,IAAI;oBACJ,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAC3C,CAAC;oBACF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;wBACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;wBACzB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;oBACjC,CAAC;oBACD,MAAM,aAAa,CAAC;gBACrB,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAEpE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;wBACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;wBAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;oBAClC,CAAC;oBAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACnC,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;wBAClC,uDAAuD;wBACvD,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,YAAY,EAAE,CAAC;4BACjD,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC;4BACnC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;wBAC5B,CAAC;6BAAM,CAAC;4BACP,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;wBAC7C,CAAC;oBACF,CAAC;oBAED,4CAA4C;oBAC5C,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;wBAC5B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;oBAC5B,CAAC;gBACF,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;gBAClC,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAE7B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC;QAEM,wBAAmB,GAAG,KAAK,EAAE,OAAsB,EAAE,EAAE;YAC9D,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClC,qEAAqE;gBACrE,4DAA4D;gBAC5D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;oBAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;oBAChE,MAAM,IAAI,CAAC,WAAW,CAAC;wBACtB,MAAM,CACL,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACnB,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC;qBAChD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,wEAAwE;QACxE,+DAA+D;QAC/D,4BAAuB,GAAG,QAAQ,CAAC,CAAC,OAA8B,EAAE,EAAE;YACrE,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7B,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,SAAI,GAAG,CAAC,OAAsB,EAAE,EAAE;YACjC,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,CACX,MAAM,EACN,oDAAoD,EACpD,OAAO,CACP,CAAC;gBACF,OAAO;YACR,CAAC;YACD,sDAAsD;YACtD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACtB,KAAK,iBAAiB;oBACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBAC9C,KAAK,MAAM,CAAC;gBACZ,KAAK,WAAW;oBACf,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBACpC,KAAK,IAAI;oBACR,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBACrB,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;oBACpC,CAAC;oBACD,MAAM;YACR,CAAC;QACF,CAAC,CAAC;QAEF,UAAK,GAAG,KAAK,IAAI,EAAE;YAClB,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO;YACR,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAC3C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;QACzB,CAAC,CAAC;QAOF,YAAO,GAAG,GAAG,EAAE;YACd,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,CAAC,CAAC;QASF,4BAA4B;QACpB,gBAAW,GAAG,KAAK,IAAI,EAAE;YAChC,sEAAsE;YACtE,0EAA0E;YAC1E,6EAA6E;YAC7E,IAAI,CAAC,WAAW,CAAC;gBAChB,MAAM,CACL,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CACnB,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACzD,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,eAAe,EAAE;aAC5D,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,wEAAwE;QACxE,yCAAyC;QACjC,sBAAiB,GAAG,KAAK,IAAI,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;YACzC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC3B,CAAC,CAAC;QAEF,aAAQ,GAAG,KAAK,IAAI,EAAE;YACrB,MAAM,IAAI,CAAC,WAAW,CAAC;gBACtB,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,eAAe,EAAE;aAC5D,CAAC,CAAC;QACJ,CAAC,CAAC;QA5LD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC;YAC9B,QAAQ;SACR,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IAMD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IA4HD,IAAI;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IACzB,CAAC;IAMD,SAAS;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,cAAc;QACb,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IA6BD,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IACD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;CACD"}

package/dist/esm/sync/Sync.d.ts

@@ -1,8 +1,8 @@
 import { ClientMessage, DocumentBaseline, EventSubscriber, FileData, Operation, ServerMessage } from '@verdant-web/common';
-import { PresenceManager } from './PresenceManager.js';
+import { Context } from '../context/context.js';
 import { FilePullResult, FileUploadResult } from './FileSync.js';
+import { PresenceManager } from './PresenceManager.js';
 import { ServerSyncEndpointProviderConfig } from './ServerSyncEndpointProvider.js';
-import { Context } from '../context/context.js';
 type SyncEvents = {
     onlineChange: (isOnline: boolean) => void;
     syncingChange: (syncing: boolean) => void;

package/dist/esm/sync/Sync.js

@@ -1,10 +1,10 @@
 import { EventSubscriber, ReplicaType, rewriteAuthzOriginator, VerdantError, } from '@verdant-web/common';
-import { HANDLE_MESSAGE, PresenceManager } from './PresenceManager.js';
+import { attemptToRegisterBackgroundSync } from './background.js';
 import { FileSync } from './FileSync.js';
+import { HANDLE_MESSAGE, PresenceManager } from './PresenceManager.js';
 import { PushPullSync } from './PushPullSync.js';
 import { ServerSyncEndpointProvider, } from './ServerSyncEndpointProvider.js';
 import { WebSocketSync } from './WebSocketSync.js';
-import { attemptToRegisterBackgroundSync } from './background.js';
 export class NoSync extends EventSubscriber {
     send() { }
     async start() { }
@@ -73,11 +73,11 @@ export class ServerSync extends EventSubscriber {
                         baselines: message.baselines,
                     });
                     if (message.globalAckTimestamp) {
-                        await this.ctx.meta.setGlobalAck(message.globalAckTimestamp);
+                        await (await this.ctx.meta).setGlobalAck(message.globalAckTimestamp);
                     }
                     break;
                 case 'global-ack':
-                    await this.ctx.meta.setGlobalAck(message.timestamp);
+                    await (await this.ctx.meta).setGlobalAck(message.timestamp);
                     break;
                 case 'sync-resp':
                     this._activelySyncing = true;
@@ -88,9 +88,9 @@ export class ServerSync extends EventSubscriber {
                         reset: message.overwriteLocalData,
                     });
                     if (message.globalAckTimestamp) {
-                        await this.ctx.meta.setGlobalAck(message.globalAckTimestamp);
+                        await (await this.ctx.meta).setGlobalAck(message.globalAckTimestamp);
                     }
-                    await this.ctx.meta.updateLastSynced(message.ackedTimestamp);
+                    await (await this.ctx.meta).updateLastSynced(message.ackedTimestamp);
                     this._activelySyncing = false;
                     this.emit('syncingChange', false);
                     this._hasSynced = true;
@@ -98,11 +98,11 @@ export class ServerSync extends EventSubscriber {
                     break;
                 case 'need-since':
                     this.emit('serverReset', message.since);
-                    this.ctx.files.onServerReset(message.since);
-                    this.activeSync.send(await this.ctx.meta.messageCreator.createSyncStep1(message.since));
+                    (await this.ctx.files).onServerReset(message.since);
+                    this.activeSync.send(await (await this.ctx.meta).messageCreator.createSyncStep1(message.since));
                     break;
                 case 'server-ack':
-                    await this.ctx.meta.updateLastSynced(message.timestamp);
+                    await (await this.ctx.meta).updateLastSynced(message.timestamp);
             }
             // avoid rebroadcasting messages
             if (source === 'network') {
@@ -112,13 +112,13 @@ export class ServerSync extends EventSubscriber {
                 });
             }
             // update presence if necessary
-            this.presence[HANDLE_MESSAGE](await this.ctx.meta.getLocalReplica(), message);
+            this.presence[HANDLE_MESSAGE](await (await this.ctx.meta).getLocalReplica(), message);
         };
         this.handleOnlineChange = async (online) => {
             this.emit('onlineChange', online);
             // if online, attempt to upload any unsynced files.
             if (online) {
-                const unsyncedFiles = await this.ctx.files.listUnsynced();
+                const unsyncedFiles = await (await this.ctx.files).listUnsynced();
                 const results = await Promise.allSettled(unsyncedFiles.map((file) => this.fileSync.uploadFile(file)));
                 if (results.some((r) => r.status === 'rejected')) {
                     this.ctx.log('error', 'Failed to upload unsynced files', results
@@ -128,7 +128,7 @@ export class ServerSync extends EventSubscriber {
             }
         };
         this.handlePresenceUpdate = async (data) => {
-            this.send(await this.ctx.meta.messageCreator.createPresenceUpdate(data));
+            this.send(await (await this.ctx.meta).messageCreator.createPresenceUpdate(data));
         };
         this.setMode = (transport) => {
             if (transport === 'realtime' && !this.canDoRealtime) {
@@ -169,7 +169,7 @@ export class ServerSync extends EventSubscriber {
                 if (message.type === 'sync' || message.type === 'op') {
                     rewriteAuthzOriginator(message, userId);
                 }
-                await this.activeSync.send(message);
+                this.activeSync.send(message);
                 (_b = this.onOutgoingMessage) === null || _b === void 0 ? void 0 : _b.call(this, message);
             }
         };
@@ -222,9 +222,11 @@ export class ServerSync extends EventSubscriber {
             });
         };
         this.start = () => {
+            this.ctx.log('info', 'Starting sync');
             return this.activeSync.start();
         };
         this.stop = () => {
+            this.ctx.log('info', 'Stopping sync');
             return this.activeSync.stop();
         };
         this.destroy = () => {
@@ -275,6 +277,7 @@ export class ServerSync extends EventSubscriber {
             this.broadcastChannel = new BroadcastChannel(`verdant-${ctx.namespace}`);
             this.broadcastChannel.addEventListener('message', this.handleBroadcastChannelMessage);
         }
+        ctx.log('info', 'Sync initialized with transport:', initialTransport !== null && initialTransport !== void 0 ? initialTransport : 'pull');
         if (initialTransport === 'realtime') {
             this.activeSync = this.webSocketSync;
         }
@@ -282,7 +285,7 @@ export class ServerSync extends EventSubscriber {
             this.activeSync = this.pushPullSync;
         }
         this.presence.subscribe('update', this.handlePresenceUpdate);
-        ctx.meta.events.subscribe('syncMessage', this.send);
+        ctx.internalEvents.subscribe('outgoingSyncMessage', this.send);
         this.webSocketSync.subscribe('message', this.handleMessage);
         this.webSocketSync.subscribe('onlineChange', this.handleOnlineChange);
         this.pushPullSync.subscribe('message', this.handleMessage);