document-drive 1.0.0-alpha.25 → 1.0.0-alpha.26

package/package.json

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

package/src/server/index.ts

@@ -209,7 +209,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     }
 
     async initialize() {
-        await this.listenerStateManager.init();
         const drives = await this.getDrives();
         for (const drive of drives) {
             await this._initializeDrive(drive);
@@ -223,22 +222,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             await this.startSyncRemoteDrive(driveId);
         }
 
-        for (const listener of drive.state.local.listeners) {
-            await this.listenerStateManager.addListener({
-                driveId,
-                block: listener.block,
-                filter: {
-                    branch: listener.filter.branch ?? [],
-                    documentId: listener.filter.documentId ?? [],
-                    documentType: listener.filter.documentType ?? [],
-                    scope: listener.filter.scope ?? []
-                },
-                listenerId: listener.listenerId,
-                system: listener.system,
-                callInfo: listener.callInfo ?? undefined,
-                label: listener.label ?? ''
-            });
-        }
+        await this.listenerStateManager.initDrive(drive);
     }
 
     public async getSynchronizationUnits(

package/src/server/listener/manager.ts

@@ -1,5 +1,5 @@
 import {
-    ListenerCallInfo,
+    DocumentDriveDocument,
     ListenerFilter
 } from 'document-model-libs/document-drive';
 import { OperationScope } from 'document-model/document';
@@ -372,33 +372,28 @@ export class ListenerManager extends BaseListenerManager {
         return false;
     }
 
-    async init() {
-        const drives = await this.drive.getDrives();
-        for (const driveId of drives) {
-            const drive = await this.drive.getDrive(driveId);
-            const {
-                state: {
-                    local: { listeners }
-                }
-            } = drive;
-
-            for (const listener of listeners) {
-                this.addListener({
-                    block: listener.block,
-                    driveId,
-                    filter: {
-                        branch: listener.filter.branch ?? [],
-                        documentId: listener.filter.documentId ?? [],
-                        documentType: listener.filter.documentType,
-                        scope: listener.filter.scope ?? []
-                    },
-                    listenerId: listener.listenerId,
-                    system: listener.system,
-                    callInfo:
-                        (listener.callInfo as ListenerCallInfo) ?? undefined,
-                    label: listener.label ?? ''
-                });
+    async initDrive(drive: DocumentDriveDocument) {
+        const {
+            state: {
+                local: { listeners }
             }
+        } = drive;
+
+        for (const listener of listeners) {
+            await this.addListener({
+                block: listener.block,
+                driveId: drive.state.global.id,
+                filter: {
+                    branch: listener.filter.branch ?? [],
+                    documentId: listener.filter.documentId ?? [],
+                    documentType: listener.filter.documentType,
+                    scope: listener.filter.scope ?? []
+                },
+                listenerId: listener.listenerId,
+                system: listener.system,
+                callInfo: listener.callInfo ?? undefined,
+                label: listener.label ?? ''
+            });
         }
     }
 

package/src/server/types.ts

@@ -267,7 +267,7 @@ export abstract class BaseListenerManager {
         this.listenerState = listenerState;
     }
 
-    abstract init(): Promise<void>;
+    abstract initDrive(drive: DocumentDriveDocument): Promise<void>;
 
     abstract addListener(listener: Listener): Promise<ITransmitter>;
     abstract removeListener(