document-drive 1.0.0-alpha.71 → 1.0.0-alpha.72

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.71",
+    "version": "1.0.0-alpha.72",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",

package/src/server/index.ts

@@ -87,7 +87,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         DocumentDriveState['id'],
         Map<Trigger['id'], CancelPullLoop>
     >();
-    private syncStatus = new Map<DocumentDriveState['id'], SyncStatus>();
+    private syncStatus = new Map<string, SyncStatus>();
 
     private queueManager: IQueueManager;
 
@@ -186,6 +186,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         const drive = await this.getDrive(driveId);
         let driveTriggers = this.triggerMap.get(driveId);
 
+        const syncUnits = await this.getSynchronizationUnits(driveId);
+
         for (const trigger of drive.state.local.triggers) {
             if (driveTriggers?.get(trigger.id)) {
                 continue;
@@ -196,6 +198,11 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             }
 
             this.updateSyncStatus(driveId, 'SYNCING');
+
+            for (const syncUnit of syncUnits) {
+                this.updateSyncStatus(syncUnit.syncId, 'SYNCING');
+            }
+
             if (PullResponderTransmitter.isPullResponderTrigger(trigger)) {
                 const cancelPullLoop = PullResponderTransmitter.setupPull(
                     driveId,
@@ -211,12 +218,31 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                         );
                     },
                     revisions => {
-                        const errorRevision = revisions.find(
+                        const errorRevision = revisions.filter(
                             r => r.status !== 'SUCCESS'
                         );
-                        if (!errorRevision) {
+                        if (errorRevision.length < 1) {
                             this.updateSyncStatus(driveId, 'SUCCESS');
                         }
+
+                        for (const syncUnit of syncUnits) {
+                            const fileErrorRevision = errorRevision.find(
+                                r => r.documentId === syncUnit.documentId
+                            );
+
+                            if (fileErrorRevision) {
+                                this.updateSyncStatus(
+                                    syncUnit.syncId,
+                                    fileErrorRevision.status,
+                                    fileErrorRevision.error
+                                );
+                            } else {
+                                this.updateSyncStatus(
+                                    syncUnit.syncId,
+                                    'SUCCESS'
+                                );
+                            }
+                        }
                     }
                 );
                 driveTriggers.set(trigger.id, cancelPullLoop);
@@ -226,9 +252,18 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     }
 
     private async stopSyncRemoteDrive(driveId: string) {
+        const syncUnits = await this.getSynchronizationUnits(driveId);
+        const fileNodes = syncUnits
+            .filter(syncUnit => syncUnit.documentId !== '')
+            .map(syncUnit => syncUnit.documentId);
+
         const triggers = this.triggerMap.get(driveId);
         triggers?.forEach(cancel => cancel());
         this.updateSyncStatus(driveId, null);
+
+        for (const fileNode of fileNodes) {
+            this.updateSyncStatus(fileNode, null);
+        }
         return this.triggerMap.delete(driveId);
     }
 
@@ -1075,21 +1110,37 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 .updateSynchronizationRevisions(
                     drive,
                     syncUnits,
-                    () => this.updateSyncStatus(drive, 'SYNCING'),
+                    () => {
+                        this.updateSyncStatus(drive, 'SYNCING');
+
+                        for (const syncUnit of syncUnits) {
+                            this.updateSyncStatus(syncUnit.syncId, 'SYNCING');
+                        }
+                    },
                     this.handleListenerError.bind(this),
                     forceSync
                 )
-                .then(
-                    updates =>
-                        updates.length &&
-                        this.updateSyncStatus(drive, 'SUCCESS')
-                )
+                .then(updates => {
+                    updates.length && this.updateSyncStatus(drive, 'SUCCESS');
+
+                    for (const syncUnit of syncUnits) {
+                        this.updateSyncStatus(syncUnit.syncId, 'SUCCESS');
+                    }
+                })
                 .catch(error => {
                     logger.error(
                         'Non handled error updating sync revision',
                         error
                     );
                     this.updateSyncStatus(drive, 'ERROR', error as Error);
+
+                    for (const syncUnit of syncUnits) {
+                        this.updateSyncStatus(
+                            syncUnit.syncId,
+                            'ERROR',
+                            error as Error
+                        );
+                    }
                 });
 
             // after applying all the valid operations,throws
@@ -1208,6 +1259,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         const signals: SignalResult[] = [];
         let error: Error | undefined;
 
+        const prevSyncUnits = await this.getSynchronizationUnits(drive);
+
         try {
             await this._addDriveOperations(drive, async documentStorage => {
                 const result = await this._processOperations<
@@ -1247,6 +1300,19 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 }
             }
 
+            const syncUnits = await this.getSynchronizationUnits(drive);
+
+            const prevSyncUnitsIds = prevSyncUnits.map(unit => unit.syncId);
+            const syncUnitsIds = syncUnits.map(unit => unit.syncId);
+
+            const newSyncUnits = syncUnitsIds.filter(
+                syncUnitId => !prevSyncUnitsIds.includes(syncUnitId)
+            );
+
+            const removedSyncUnits = prevSyncUnitsIds.filter(
+                syncUnitId => !syncUnitsIds.includes(syncUnitId)
+            );
+
             // update listener cache
             const lastOperation = operationsApplied
                 .filter(op => op.scope === 'global')
@@ -1268,21 +1334,49 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                                 revision: lastOperation.index
                             }
                         ],
-                        () => this.updateSyncStatus(drive, 'SYNCING'),
+                        () => {
+                            this.updateSyncStatus(drive, 'SYNCING');
+
+                            for (const syncUnitId of [
+                                ...newSyncUnits,
+                                ...removedSyncUnits
+                            ]) {
+                                this.updateSyncStatus(syncUnitId, 'SYNCING');
+                            }
+                        },
                         this.handleListenerError.bind(this),
                         forceSync
                     )
-                    .then(
-                        updates =>
-                            updates.length &&
-                            this.updateSyncStatus(drive, 'SUCCESS')
-                    )
+                    .then(updates => {
+                        if (updates.length) {
+                            this.updateSyncStatus(drive, 'SUCCESS');
+
+                            for (const syncUnitId of newSyncUnits) {
+                                this.updateSyncStatus(syncUnitId, 'SUCCESS');
+                            }
+
+                            for (const syncUnitId of removedSyncUnits) {
+                                this.updateSyncStatus(syncUnitId, null);
+                            }
+                        }
+                    })
                     .catch(error => {
                         logger.error(
                             'Non handled error updating sync revision',
                             error
                         );
                         this.updateSyncStatus(drive, 'ERROR', error as Error);
+
+                        for (const syncUnitId of [
+                            ...newSyncUnits,
+                            ...removedSyncUnits
+                        ]) {
+                            this.updateSyncStatus(
+                                syncUnitId,
+                                'ERROR',
+                                error as Error
+                            );
+                        }
                     });
             }