document-drive 1.0.0-alpha.73 → 1.0.0-alpha.74

package/package.json

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

package/src/server/index.ts

@@ -432,7 +432,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     public async getSynchronizationUnitIdInfo(
         driveId: string,
         syncId: string
-    ): Promise<Omit<SynchronizationUnit, "revision" | "lastUpdated"> | undefined> {
+    ): Promise<SynchronizationUnitQuery | undefined> {
         const drive = await this.getDrive(driveId);
         const node = drive.state.global.nodes.find(
             node =>
@@ -605,9 +605,18 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     }
 
     async deleteDrive(id: string) {
-        this.stopSyncRemoteDrive(id);
-        await this.cache.deleteDocument('drives', id);
-        return this.storage.deleteDrive(id);
+        const result = await Promise.allSettled([
+            this.stopSyncRemoteDrive(id),
+            this.listenerStateManager.removeDrive(id),
+            this.cache.deleteDocument('drives', id),
+            this.storage.deleteDrive(id)
+        ]);
+
+        result.forEach(r => {
+            if (r.status === "rejected") {
+                throw r.reason;
+            }
+        });
     }
 
     getDrives() {

package/src/server/listener/manager.ts

@@ -53,7 +53,7 @@ export class ListenerManager extends BaseListenerManager {
         driveId: string,
         listenerId: string
     ): Promise<ITransmitter | undefined> {
-        return this.transmitters[driveId]?.[listenerId];
+        return Promise.resolve(this.transmitters[driveId]?.[listenerId]);
     }
 
     async addListener(listener: Listener) {
@@ -106,7 +106,7 @@ export class ListenerManager extends BaseListenerManager {
         const driveTransmitters = this.transmitters[drive] || {};
         driveTransmitters[listener.listenerId] = transmitter;
         this.transmitters[drive] = driveTransmitters;
-        return transmitter;
+        return Promise.resolve(transmitter);
     }
 
     async removeListener(driveId: string, listenerId: string) {
@@ -115,7 +115,7 @@ export class ListenerManager extends BaseListenerManager {
             return false;
         }
 
-        return driveMap.delete(listenerId);
+        return Promise.resolve(driveMap.delete(listenerId));
     }
 
     async removeSyncUnits(driveId: string, syncUnits: Pick<SynchronizationUnit, "syncId">[]) {
@@ -128,6 +128,7 @@ export class ListenerManager extends BaseListenerManager {
                 listener.syncUnits.delete(syncUnit.syncId);
             }
         }
+        return Promise.resolve();
     }
 
     async updateSynchronizationRevisions(
@@ -203,6 +204,8 @@ export class ListenerManager extends BaseListenerManager {
         } else {
             listener.syncUnits.set(syncId, { listenerRev, lastUpdated });
         }
+
+        return Promise.resolve();
     }
 
     triggerUpdate = debounce(
@@ -243,7 +246,7 @@ export class ListenerManager extends BaseListenerManager {
 
                     const opData: OperationUpdate[] = [];
                     try {
-                        const data = await this.drive.getOperationData( // DEAL WITH INVALID SYNC ID ERROR
+                        const data = await this.drive.getOperationData( // TODO - join queries, DEAL WITH INVALID SYNC ID ERROR
                             driveId,
                             syncUnit.syncId,
                             {
@@ -413,6 +416,14 @@ export class ListenerManager extends BaseListenerManager {
         }
     }
 
+    async removeDrive(driveId: string): Promise<void> {
+        this.listenerState.delete(driveId);
+        const transmitters = this.transmitters[driveId];
+        if (transmitters) {
+            await Promise.all(Object.values(transmitters).map(t => t.disconnect?.()));
+        }
+    }
+
     getListener(driveId: string, listenerId: string): Promise<ListenerState> {
         const drive = this.listenerState.get(driveId);
         if (!drive) throw new Error('Drive not found');

package/src/server/listener/transmitter/internal.ts

@@ -12,6 +12,7 @@ import { logger } from '../../../utils/logger';
 
 export interface IReceiver {
     transmit: (strands: InternalTransmitterUpdate[]) => Promise<void>;
+    disconnect: () => Promise<void>;
 }
 
 export type InternalTransmitterUpdate<
@@ -88,4 +89,8 @@ export class InternalTransmitter implements ITransmitter {
     setReceiver(receiver: IReceiver) {
         this.receiver = receiver;
     }
+
+    async disconnect(): Promise<void> {
+        await this.receiver?.disconnect();
+    }
 }

package/src/server/listener/transmitter/types.ts

@@ -6,6 +6,7 @@ import { ListenerRevision, StrandUpdate } from '../..';
 
 export interface ITransmitter {
     transmit(strands: StrandUpdate[]): Promise<ListenerRevision[]>;
+    disconnect?(): Promise<void>;
 }
 
 export interface InternalTransmitterService extends ITransmitter {

package/src/server/types.ts

@@ -351,6 +351,7 @@ export abstract class BaseListenerManager {
     }
 
     abstract initDrive(drive: DocumentDriveDocument): Promise<void>;
+    abstract removeDrive(driveId: DocumentDriveState["id"]): Promise<void>;
 
     abstract addListener(listener: Listener): Promise<ITransmitter>;
     abstract removeListener(