document-drive 1.0.0-alpha.43 → 1.0.0-alpha.45

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.43",
+    "version": "1.0.0-alpha.45",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -32,8 +32,8 @@
         "test:watch": "vitest watch"
     },
     "peerDependencies": {
-        "document-model": "^1.0.45",
-        "document-model-libs": "^1.34.0"
+        "document-model": "^1.0.52",
+        "document-model-libs": "^1.36.0"
     },
     "optionalDependencies": {
         "@prisma/client": "5.11.0",
@@ -60,8 +60,8 @@
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
-        "document-model": "^1.0.45",
-        "document-model-libs": "^1.34.0",
+        "document-model": "^1.0.52",
+        "document-model-libs": "^1.36.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",

package/src/server/index.ts

@@ -219,9 +219,16 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     }
 
     async initialize() {
+        const errors: Error[] = [];
         const drives = await this.getDrives();
         for (const drive of drives) {
-            await this._initializeDrive(drive);
+            await this._initializeDrive(drive).catch(error => {
+                logger.error(
+                    `Error initializing drive ${drive}`,
+                    error
+                );
+                errors.push(error as Error);
+            });
         }
 
         // if network connect comes online then
@@ -238,6 +245,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
             });
         }
+
+        return errors.length === 0 ? null : errors;
     }
 
     private async _initializeDrive(driveId: string) {
@@ -855,6 +864,10 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 };
             });
 
+            if (document) {
+                this.cache.setDocument(drive, id, document).catch(logger.error);
+            }
+
             // gets all the different scopes and branches combinations from the operations
             const { scopes, branches } = [
                 ...operationsApplied,
@@ -903,12 +916,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 throw error;
             }
 
-            if (document) {
-                this.cache.setDocument(drive, id, document).catch(logger.error);
-            } else {
-                logger.warn("Successfully applied operations but no document returned");
-            }
-
             return {
                 status: 'SUCCESS',
                 document,
@@ -1013,6 +1020,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 throw error ?? new Error('Invalid Document Drive document');
             }
 
+            this.cache.setDocument("drives", drive, document).catch(logger.error);
+
             for (const operation of operationsApplied) {
                 switch (operation.type) {
                     case 'ADD_LISTENER': {
@@ -1077,12 +1086,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 throw error;
             }
 
-            if (document) {
-                this.cache.setDocument("drives", drive, document).catch(logger.error);;
-            } else {
-                logger.warn("Successfully applied operations but no drive returned");
-            }
-
             return {
                 status: 'SUCCESS',
                 document,