@powerhousedao/reactor-api 6.0.0-dev.4 → 6.0.0-dev.41

package/dist/test/two-reactor-gql-catchup-duplicate.test.js

@@ -0,0 +1,264 @@
+import { CompositeChannelFactory, ConsoleLogger, driveCollectionId, JobStatus, ReactorEventTypes, ReactorBuilder, SyncBuilder, } from "@powerhousedao/reactor";
+import { driveDocumentModelModule } from "document-drive";
+import { documentModelDocumentModelModule, } from "document-model";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { createResolverBridge } from "./utils/gql-resolver-bridge.js";
+async function waitForJobCompletion(reactor, jobId, timeoutMs = 5000) {
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeoutMs) {
+        const status = await reactor.getJobStatus(jobId);
+        if (status.status === JobStatus.READ_READY) {
+            return;
+        }
+        if (status.status === JobStatus.FAILED) {
+            throw new Error(`Job failed: ${status.error?.message || "Unknown"}`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 50));
+    }
+    throw new Error(`Job did not complete within ${timeoutMs}ms`);
+}
+async function waitForOperationsReady(eventBus, documentId, timeoutMs = 5000) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+            unsubscribe();
+            reject(new Error(`OPERATIONS_READY event for document ${documentId} not received within ${timeoutMs}ms`));
+        }, timeoutMs);
+        const unsubscribe = eventBus.subscribe(ReactorEventTypes.JOB_READ_READY, (type, event) => {
+            const hasDocument = event.operations.some((op) => op.context.documentId === documentId);
+            if (hasDocument) {
+                clearTimeout(timeout);
+                unsubscribe();
+                resolve();
+            }
+        });
+    });
+}
+/**
+ * Creates a unique key for an operation using id + index + skip.
+ * Per deriveOperationId, the same operation ID can appear with different index values.
+ * A true duplicate is identified by the combination of id + index + skip.
+ */
+function createOperationKey(op) {
+    return `${op.operation.id}:${op.operation.index}:${op.operation.skip}`;
+}
+/**
+ * Creates a collector that subscribes to OPERATIONS_READY events and tracks
+ * operations for a specific document, detecting duplicates.
+ */
+function collectOperationsReady(eventBus, documentId, timeoutMs = 10000) {
+    const operationKeys = new Set();
+    const allOperations = [];
+    const duplicates = [];
+    let waitResolve = null;
+    let waitCount = 0;
+    const unsubscribe = eventBus.subscribe(ReactorEventTypes.JOB_READ_READY, (type, event) => {
+        for (const op of event.operations) {
+            if (op.context.documentId !== documentId) {
+                continue;
+            }
+            const key = createOperationKey(op);
+            allOperations.push(op);
+            if (operationKeys.has(key)) {
+                duplicates.push(op);
+            }
+            else {
+                operationKeys.add(key);
+            }
+        }
+        if (waitResolve && allOperations.length >= waitCount) {
+            waitResolve();
+            waitResolve = null;
+        }
+    });
+    return {
+        operationKeys,
+        allOperations,
+        duplicates,
+        waitForCount: (count) => {
+            if (allOperations.length >= count) {
+                return Promise.resolve();
+            }
+            waitCount = count;
+            return new Promise((resolve, reject) => {
+                waitResolve = resolve;
+                setTimeout(() => {
+                    if (waitResolve) {
+                        waitResolve = null;
+                        reject(new Error(`Expected ${count} operations but received ${allOperations.length} within ${timeoutMs}ms`));
+                    }
+                }, timeoutMs);
+            });
+        },
+        stop: () => {
+            unsubscribe();
+        },
+    };
+}
+/**
+ * Creates a collector that subscribes to JOB_FAILED events and tracks failures
+ * that indicate duplicate operations (document already exists errors).
+ */
+function collectDuplicateFailures(eventBus) {
+    const failures = [];
+    const unsubscribe = eventBus.subscribe(ReactorEventTypes.JOB_FAILED, (type, event) => {
+        if (event.error.message.includes("already exists")) {
+            failures.push(event);
+        }
+    });
+    return {
+        failures,
+        stop: () => {
+            unsubscribe();
+        },
+    };
+}
+async function setupTwoReactors() {
+    const syncManagerRegistry = new Map();
+    const resolverBridge = createResolverBridge(syncManagerRegistry);
+    const logger = new ConsoleLogger(["test"]);
+    const channelFactoryA = new CompositeChannelFactory(logger);
+    const channelFactoryB = new CompositeChannelFactory(logger);
+    const models = [
+        driveDocumentModelModule,
+        documentModelDocumentModelModule,
+    ];
+    const reactorAModule = await new ReactorBuilder()
+        .withDocumentModels(models)
+        .withSync(new SyncBuilder().withChannelFactory(channelFactoryA))
+        .buildModule();
+    const reactorA = reactorAModule.reactor;
+    const eventBusA = reactorAModule.eventBus;
+    const syncManagerA = reactorAModule.syncModule.syncManager;
+    const reactorBModule = await new ReactorBuilder()
+        .withDocumentModels(models)
+        .withSync(new SyncBuilder().withChannelFactory(channelFactoryB))
+        .buildModule();
+    const reactorB = reactorBModule.reactor;
+    const eventBusB = reactorBModule.eventBus;
+    const syncManagerB = reactorBModule.syncModule.syncManager;
+    syncManagerRegistry.set("reactora", syncManagerA);
+    syncManagerRegistry.set("reactorb", syncManagerB);
+    return {
+        reactorA,
+        reactorB,
+        eventBusA,
+        eventBusB,
+        syncManagerA,
+        syncManagerB,
+        resolverBridge,
+    };
+}
+describe("Two-Reactor GQL Catchup Duplicate Operations Bug", () => {
+    let reactorA;
+    let reactorB;
+    let eventBusA;
+    let eventBusB;
+    let syncManagerA;
+    let resolverBridge;
+    beforeEach(async () => {
+        const setup = await setupTwoReactors();
+        reactorA = setup.reactorA;
+        reactorB = setup.reactorB;
+        eventBusA = setup.eventBusA;
+        eventBusB = setup.eventBusB;
+        syncManagerA = setup.syncManagerA;
+        resolverBridge = setup.resolverBridge;
+    });
+    afterEach(() => {
+        reactorA.kill();
+        reactorB.kill();
+    });
+    it("should not produce duplicate operations when remote is removed and re-added", async () => {
+        const driveDocument = driveDocumentModelModule.utils.createDocument();
+        const collectionId = driveCollectionId("main", driveDocument.header.id);
+        const jobInfo = await reactorA.create(driveDocument);
+        await waitForJobCompletion(reactorA, jobInfo.id);
+        const gqlParamsToB = {
+            url: "http://reactorB/graphql",
+            pollIntervalMs: 100,
+            maxFailures: 10,
+            retryBaseDelayMs: 50,
+            fetchFn: resolverBridge,
+        };
+        const filter = {
+            documentId: [],
+            scope: [],
+            branch: "main",
+        };
+        const readyPromiseB = waitForOperationsReady(eventBusB, driveDocument.header.id);
+        await syncManagerA.add("remoteB", collectionId, { type: "gql", parameters: gqlParamsToB }, filter);
+        await readyPromiseB;
+        const resultA = await reactorA.getOperations(driveDocument.header.id, {
+            branch: "main",
+        });
+        const opsA = Object.values(resultA).flatMap((scope) => scope.results);
+        expect(opsA.length).toBeGreaterThan(0);
+        const resultB = await reactorB.getOperations(driveDocument.header.id, {
+            branch: "main",
+        });
+        const opsB = Object.values(resultB).flatMap((scope) => scope.results);
+        expect(opsB.length).toBe(opsA.length);
+        const operationCollector = collectOperationsReady(eventBusA, driveDocument.header.id, 15000);
+        const failureCollector = collectDuplicateFailures(eventBusA);
+        try {
+            await syncManagerA.remove("remoteB");
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            await syncManagerA.add("remoteB", collectionId, { type: "gql", parameters: gqlParamsToB }, filter);
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+            expect(operationCollector.duplicates.length, "Duplicate operations were received via OPERATIONS_READY events").toBe(0);
+            expect(failureCollector.failures.length, "Duplicate operations caused 'document already exists' failures - this indicates the catchup backfill bug").toBe(0);
+        }
+        finally {
+            operationCollector.stop();
+            failureCollector.stop();
+        }
+    }, 20000);
+    it("should not produce duplicate operations after multiple remove/re-add cycles", async () => {
+        const driveDocument = driveDocumentModelModule.utils.createDocument();
+        const collectionId = driveCollectionId("main", driveDocument.header.id);
+        const jobInfo = await reactorA.create(driveDocument);
+        await waitForJobCompletion(reactorA, jobInfo.id);
+        await reactorA.execute(driveDocument.header.id, "main", [
+            driveDocumentModelModule.actions.setDriveName({ name: "Test Drive" }),
+            driveDocumentModelModule.actions.addFolder({
+                id: "folder-1",
+                name: "Folder 1",
+                parentFolder: null,
+            }),
+        ]);
+        const gqlParamsToB = {
+            url: "http://reactorB/graphql",
+            pollIntervalMs: 100,
+            maxFailures: 10,
+            retryBaseDelayMs: 50,
+            fetchFn: resolverBridge,
+        };
+        const filter = {
+            documentId: [],
+            scope: [],
+            branch: "main",
+        };
+        const readyPromiseB = waitForOperationsReady(eventBusB, driveDocument.header.id);
+        await syncManagerA.add("remoteB", collectionId, { type: "gql", parameters: gqlParamsToB }, filter);
+        await readyPromiseB;
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        const operationCollector = collectOperationsReady(eventBusA, driveDocument.header.id, 30000);
+        const failureCollector = collectDuplicateFailures(eventBusA);
+        try {
+            for (let cycle = 0; cycle < 3; cycle++) {
+                await syncManagerA.remove("remoteB");
+                await new Promise((resolve) => setTimeout(resolve, 200));
+                await syncManagerA.add("remoteB", collectionId, { type: "gql", parameters: gqlParamsToB }, filter);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+            expect(operationCollector.duplicates.length, "Duplicate operations were received via OPERATIONS_READY events").toBe(0);
+            expect(failureCollector.failures.length, "Duplicate operations caused 'document already exists' failures after 3 remove/re-add cycles - this indicates the catchup backfill bug").toBe(0);
+        }
+        finally {
+            operationCollector.stop();
+            failureCollector.stop();
+        }
+    }, 45000);
+});
+//# sourceMappingURL=two-reactor-gql-catchup-duplicate.test.js.map

package/dist/test/two-reactor-gql-catchup-duplicate.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"two-reactor-gql-catchup-duplicate.test.js","sourceRoot":"","sources":["../../test/two-reactor-gql-catchup-duplicate.test.ts"],"names":[],"mappings":"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"}

package/dist/test/two-reactor-gql-sync.test.js

@@ -1,4 +1,4 @@
-import { CompositeChannelFactory, ConsoleLogger, JobStatus, OperationEventTypes, ReactorBuilder, SyncBuilder, } from "@powerhousedao/reactor";
+import { CompositeChannelFactory, ConsoleLogger, driveCollectionId, JobStatus, ReactorBuilder, ReactorEventTypes, SyncBuilder, } from "@powerhousedao/reactor";
 import { driveDocumentModelModule } from "document-drive";
 import { documentModelDocumentModelModule, } from "document-model";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
@@ -7,7 +7,7 @@ async function waitForJobCompletion(reactor, jobId, timeoutMs = 5000) {
     const startTime = Date.now();
     while (Date.now() - startTime < timeoutMs) {
         const status = await reactor.getJobStatus(jobId);
-        if (status.status === JobStatus.READ_MODELS_READY) {
+        if (status.status === JobStatus.READ_READY) {
             return;
         }
         if (status.status === JobStatus.FAILED) {
@@ -23,7 +23,7 @@ async function waitForOperationsReady(eventBus, documentId, timeoutMs = 5000) {
             unsubscribe();
             reject(new Error(`OPERATIONS_READY event for document ${documentId} not received within ${timeoutMs}ms`));
         }, timeoutMs);
-        const unsubscribe = eventBus.subscribe(OperationEventTypes.OPERATIONS_READY, (type, event) => {
+        const unsubscribe = eventBus.subscribe(ReactorEventTypes.JOB_READ_READY, (type, event) => {
             const hasDocument = event.operations.some((op) => op.context.documentId === documentId);
             if (hasDocument) {
                 clearTimeout(timeout);
@@ -33,24 +33,7 @@ async function waitForOperationsReady(eventBus, documentId, timeoutMs = 5000) {
         });
     });
 }
-async function waitForMultipleOperationsReady(eventBus, expectedCount, timeoutMs = 10000) {
-    return new Promise((resolve, reject) => {
-        let count = 0;
-        const timeout = setTimeout(() => {
-            unsubscribe();
-            reject(new Error(`Expected ${expectedCount} OPERATIONS_READY events but received ${count} within ${timeoutMs}ms`));
-        }, timeoutMs);
-        const unsubscribe = eventBus.subscribe(OperationEventTypes.OPERATIONS_READY, () => {
-            count++;
-            if (count >= expectedCount) {
-                clearTimeout(timeout);
-                unsubscribe();
-                resolve();
-            }
-        });
-    });
-}
-async function setupTwoReactorsWithGqlChannel() {
+async function setupTwoReactors() {
     const syncManagerRegistry = new Map();
     const resolverBridge = createResolverBridge(syncManagerRegistry);
     const logger = new ConsoleLogger(["test"]);
@@ -76,6 +59,18 @@ async function setupTwoReactorsWithGqlChannel() {
     const syncManagerB = reactorBModule.syncModule.syncManager;
     syncManagerRegistry.set("reactora", syncManagerA);
     syncManagerRegistry.set("reactorb", syncManagerB);
+    return {
+        reactorA,
+        reactorB,
+        eventBusA,
+        eventBusB,
+        syncManagerA,
+        syncManagerB,
+        resolverBridge,
+    };
+}
+async function setupSyncForDrive(syncManagerA, driveId, resolverBridge) {
+    const collectionId = driveCollectionId("main", driveId);
     const filter = {
         documentId: [],
         scope: [],
@@ -88,22 +83,23 @@ async function setupTwoReactorsWithGqlChannel() {
         retryBaseDelayMs: 50,
         fetchFn: resolverBridge,
     };
-    // ReactorA adds remote pointing to B
-    // touchChannel automatically creates receiving channel on B
-    await syncManagerA.add("remoteB", "collection1", { type: "gql", parameters: gqlParamsToB }, filter);
-    return { reactorA, reactorB, eventBusA, eventBusB };
+    await syncManagerA.add(`remoteB-${driveId}`, collectionId, { type: "gql", parameters: gqlParamsToB }, filter);
 }
 describe("Two-Reactor Sync with GqlChannel", () => {
     let reactorA;
     let reactorB;
     let eventBusA;
     let eventBusB;
+    let syncManagerA;
+    let resolverBridge;
     beforeEach(async () => {
-        const setup = await setupTwoReactorsWithGqlChannel();
+        const setup = await setupTwoReactors();
         reactorA = setup.reactorA;
         reactorB = setup.reactorB;
         eventBusA = setup.eventBusA;
         eventBusB = setup.eventBusB;
+        syncManagerA = setup.syncManagerA;
+        resolverBridge = setup.resolverBridge;
     });
     afterEach(() => {
         reactorA.kill();
@@ -111,6 +107,7 @@ describe("Two-Reactor Sync with GqlChannel", () => {
     });
     it("should sync operation from ReactorA to ReactorB via GqlChannel", async () => {
         const document = driveDocumentModelModule.utils.createDocument();
+        await setupSyncForDrive(syncManagerA, document.header.id, resolverBridge);
         const readyPromise = waitForOperationsReady(eventBusB, document.header.id);
         const jobInfo = await reactorA.create(document);
         await waitForJobCompletion(reactorA, jobInfo.id);
@@ -130,10 +127,11 @@ describe("Two-Reactor Sync with GqlChannel", () => {
         }
         const docA = await reactorA.get(document.header.id, { branch: "main" });
         const docB = await reactorB.get(document.header.id, { branch: "main" });
-        expect(docA.document).toEqual(docB.document);
+        expect(docA).toEqual(docB);
     });
     it("should sync operation from ReactorB to ReactorA via GqlChannel", async () => {
         const document = driveDocumentModelModule.utils.createDocument();
+        await setupSyncForDrive(syncManagerA, document.header.id, resolverBridge);
         const readyPromise = waitForOperationsReady(eventBusA, document.header.id);
         const jobInfo = await reactorB.create(document);
         await waitForJobCompletion(reactorB, jobInfo.id);
@@ -153,10 +151,9 @@ describe("Two-Reactor Sync with GqlChannel", () => {
         }
         const docA = await reactorA.get(document.header.id, { branch: "main" });
         const docB = await reactorB.get(document.header.id, { branch: "main" });
-        expect(docA.document).toEqual(docB.document);
+        expect(docA).toEqual(docB);
     });
     it("should sync multiple documents with concurrent operations from both reactors", async () => {
-        // Create 4 documents (2 for each reactor)
         const docA1 = driveDocumentModelModule.utils.createDocument();
         const docA2 = driveDocumentModelModule.utils.createDocument();
         const docB1 = driveDocumentModelModule.utils.createDocument();
@@ -167,12 +164,16 @@ describe("Two-Reactor Sync with GqlChannel", () => {
             docB1.header.id,
             docB2.header.id,
         ];
-        // Set up listeners for docs to sync to the other reactor
+        await Promise.all([
+            setupSyncForDrive(syncManagerA, docA1.header.id, resolverBridge),
+            setupSyncForDrive(syncManagerA, docA2.header.id, resolverBridge),
+            setupSyncForDrive(syncManagerA, docB1.header.id, resolverBridge),
+            setupSyncForDrive(syncManagerA, docB2.header.id, resolverBridge),
+        ]);
         const readyOnB_A1 = waitForOperationsReady(eventBusB, docA1.header.id);
         const readyOnB_A2 = waitForOperationsReady(eventBusB, docA2.header.id);
         const readyOnA_B1 = waitForOperationsReady(eventBusA, docB1.header.id);
         const readyOnA_B2 = waitForOperationsReady(eventBusA, docB2.header.id);
-        // Create documents on their respective reactors
         const [jobA1, jobA2] = await Promise.all([
             reactorA.create(docA1),
             reactorA.create(docA2),
@@ -181,16 +182,13 @@ describe("Two-Reactor Sync with GqlChannel", () => {
             reactorB.create(docB1),
             reactorB.create(docB2),
         ]);
-        // Wait for all creates to complete on source reactors
         await Promise.all([
             waitForJobCompletion(reactorA, jobA1.id),
             waitForJobCompletion(reactorA, jobA2.id),
             waitForJobCompletion(reactorB, jobB1.id),
             waitForJobCompletion(reactorB, jobB2.id),
         ]);
-        // Wait for all docs to sync to the other reactor
         await Promise.all([readyOnB_A1, readyOnB_A2, readyOnA_B1, readyOnA_B2]);
-        // Now fire concurrent modify operations on each doc
         void reactorA.execute(docA1.header.id, "main", [
             driveDocumentModelModule.actions.setDriveName({ name: "Drive A1" }),
             driveDocumentModelModule.actions.addFolder({
@@ -223,7 +221,6 @@ describe("Two-Reactor Sync with GqlChannel", () => {
                 parentFolder: null,
             }),
         ]);
-        // Poll until all 4 documents are synced on both reactors
         const startTime = Date.now();
         const timeout = 25000;
         let synced = false;
@@ -239,8 +236,6 @@ describe("Two-Reactor Sync with GqlChannel", () => {
                         branch: "main",
                     });
                     const opsB = Object.values(resultB).flatMap((scope) => scope.results);
-                    // Each doc should have at least 2 ops (create + execute with actions)
-                    // and both reactors should have same count
                     if (opsA.length < 2 ||
                         opsB.length < 2 ||
                         opsA.length !== opsB.length) {
@@ -249,7 +244,6 @@ describe("Two-Reactor Sync with GqlChannel", () => {
                     }
                 }
                 catch {
-                    // Document may not exist on one reactor yet
                     allDocsSynced = false;
                     break;
                 }
@@ -261,7 +255,6 @@ describe("Two-Reactor Sync with GqlChannel", () => {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         expect(synced).toBe(true);
-        // Verify operation equality for all 4 documents
         for (const docId of allDocIds) {
             const resultA = await reactorA.getOperations(docId, { branch: "main" });
             const opsA = Object.values(resultA).flatMap((scope) => scope.results);
@@ -273,76 +266,70 @@ describe("Two-Reactor Sync with GqlChannel", () => {
                 expect(opsB[i]).toEqual(opsA[i]);
             }
         }
-        // Verify document state equality for all 4 documents
         for (const docId of allDocIds) {
             const docFromA = await reactorA.get(docId, { branch: "main" });
             const docFromB = await reactorB.get(docId, { branch: "main" });
-            expect(docFromA.document).toEqual(docFromB.document);
+            expect(docFromA).toEqual(docFromB);
         }
     }, 30000);
-    it("should handle concurrent modifications to the same document from both reactors", async () => {
-        const doc = driveDocumentModelModule.utils.createDocument();
-        const readyPromise = waitForOperationsReady(eventBusB, doc.header.id);
-        const createJob = await reactorA.create(doc);
-        await waitForJobCompletion(reactorA, createJob.id);
+    it("should include key/dependsOn in poll response for batch operations", async () => {
+        const driveDoc = driveDocumentModelModule.utils.createDocument();
+        await setupSyncForDrive(syncManagerA, driveDoc.header.id, resolverBridge);
+        const readyPromise = waitForOperationsReady(eventBusA, driveDoc.header.id);
+        const createJob = await reactorB.create(driveDoc);
+        await waitForJobCompletion(reactorB, createJob.id);
         await readyPromise;
-        const docOnB = await reactorB.get(doc.header.id, { branch: "main" });
-        expect(docOnB.document).toBeDefined();
-        void reactorA.execute(doc.header.id, "main", [
-            driveDocumentModelModule.actions.setDriveName({ name: "Name from A" }),
-        ]);
-        void reactorB.execute(doc.header.id, "main", [
-            driveDocumentModelModule.actions.setDriveName({ name: "Name from B" }),
-        ]);
-        void reactorA.execute(doc.header.id, "main", [
-            driveDocumentModelModule.actions.addFolder({
-                id: "folder-a",
-                name: "Folder from A",
-                parentFolder: null,
-            }),
-        ]);
-        void reactorB.execute(doc.header.id, "main", [
-            driveDocumentModelModule.actions.addFolder({
-                id: "folder-b",
-                name: "Folder from B",
-                parentFolder: null,
-            }),
-        ]);
+        const batchResult = await reactorB.executeBatch({
+            jobs: [
+                {
+                    key: "rename",
+                    documentId: driveDoc.header.id,
+                    scope: "global",
+                    branch: "main",
+                    actions: [
+                        driveDocumentModelModule.actions.setDriveName({
+                            name: "Renamed Drive",
+                        }),
+                    ],
+                    dependsOn: [],
+                },
+                {
+                    key: "add-folder",
+                    documentId: driveDoc.header.id,
+                    scope: "global",
+                    branch: "main",
+                    actions: [
+                        driveDocumentModelModule.actions.addFolder({
+                            id: "folder-1",
+                            name: "Folder 1",
+                            parentFolder: null,
+                        }),
+                    ],
+                    dependsOn: ["rename"],
+                },
+            ],
+        });
+        for (const jobInfo of Object.values(batchResult.jobs)) {
+            await waitForJobCompletion(reactorB, jobInfo.id);
+        }
         const startTime = Date.now();
-        const timeout = 15000;
-        let synced = false;
+        const timeout = 10000;
+        let statesSynced = false;
         while (Date.now() - startTime < timeout) {
-            const resultA = await reactorA.getOperations(doc.header.id, {
-                branch: "main",
-            });
-            const opsA = Object.values(resultA).flatMap((scope) => scope.results);
-            const resultB = await reactorB.getOperations(doc.header.id, {
-                branch: "main",
-            });
-            const opsB = Object.values(resultB).flatMap((scope) => scope.results);
-            if (opsA.length > 1 && opsB.length > 1 && opsA.length === opsB.length) {
-                synced = true;
+            const docA = await reactorA.get(driveDoc.header.id, { branch: "main" });
+            const docB = await reactorB.get(driveDoc.header.id, { branch: "main" });
+            if (docA &&
+                docB &&
+                JSON.stringify(docA.state) === JSON.stringify(docB.state)) {
+                statesSynced = true;
                 break;
             }
-            await new Promise((resolve) => setTimeout(resolve, 100));
-        }
-        expect(synced).toBe(true);
-        const resultA = await reactorA.getOperations(doc.header.id, {
-            branch: "main",
-        });
-        const opsA = Object.values(resultA).flatMap((scope) => scope.results);
-        const resultB = await reactorB.getOperations(doc.header.id, {
-            branch: "main",
-        });
-        const opsB = Object.values(resultB).flatMap((scope) => scope.results);
-        expect(opsA.length).toBeGreaterThan(0);
-        expect(opsB.length).toBe(opsA.length);
-        for (let i = 0; i < opsA.length; i++) {
-            expect(opsB[i]).toEqual(opsA[i]);
+            await new Promise((resolve) => setTimeout(resolve, 50));
         }
-        const docFromA = await reactorA.get(doc.header.id, { branch: "main" });
-        const docFromB = await reactorB.get(doc.header.id, { branch: "main" });
-        expect(docFromA.document).toEqual(docFromB.document);
-    }, 20000);
+        expect(statesSynced).toBe(true);
+        const docA = await reactorA.get(driveDoc.header.id, { branch: "main" });
+        const docB = await reactorB.get(driveDoc.header.id, { branch: "main" });
+        expect(docA.state).toEqual(docB.state);
+    }, 15000);
 });
 //# sourceMappingURL=two-reactor-gql-sync.test.js.map