document-drive 1.0.0-alpha.38 → 1.0.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.38",
+    "version": "1.0.0-alpha.39",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -13,6 +13,8 @@
         "./storage/filesystem": "./src/storage/filesystem.ts",
         "./storage/memory": "./src/storage/memory.ts",
         "./storage/prisma": "./src/storage/prisma.ts",
+        "./cache/redis": "./src/cache/redis.ts",
+        "./cache/memory": "./src/cache/memory.ts",
         "./utils": "./src/utils/index.ts",
         "./utils/graphql": "./src/utils/graphql.ts",
         "./logger": "./src/utils/logger.ts"
@@ -30,8 +32,8 @@
         "test:watch": "vitest watch"
     },
     "peerDependencies": {
-        "document-model": "^1.0.41",
-        "document-model-libs": "^1.31.0"
+        "document-model": "^1.0.42",
+        "document-model-libs": "^1.32.0"
     },
     "optionalDependencies": {
         "@prisma/client": "5.11.0",
@@ -58,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.41",
-        "document-model-libs": "^1.31.0",
+        "document-model": "^1.0.42",
+        "document-model-libs": "^1.32.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",
@@ -72,6 +74,6 @@
         "sequelize": "^6.37.2",
         "sqlite3": "^5.1.7",
         "typescript": "^5.4.4",
-        "vitest": "^1.4.0"
+        "vitest": "^1.5.0"
     }
 }

package/src/server/index.ts

@@ -223,6 +223,21 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         for (const drive of drives) {
             await this._initializeDrive(drive);
         }
+
+        // if network connect comes online then
+        // triggers the listeners update
+        if (typeof window !== "undefined") {
+            window.addEventListener('online', () => {
+                this.listenerStateManager.triggerUpdate(false,
+                    this.handleListenerError.bind(this)).catch(error => {
+                        logger.error(
+                            'Non handled error updating listeners',
+                            error
+                        );
+                    });
+
+            });
+        }
     }
 
     private async _initializeDrive(driveId: string) {
@@ -470,7 +485,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     async getDrive(drive: string, options?: GetDocumentOptions) {
         try {
             const document = await this.cache.getDocument("drives", drive);
-            if (document) {
+            if (document && isDocumentDrive(document)) {
                 return document;
             }
         } catch (e) {
@@ -493,6 +508,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 `Document with id ${drive} is not a Document Drive`
             );
         } else {
+            this.cache.setDocument("drives", drive, document).catch(logger.error);
             return document;
         }
     }
@@ -511,13 +527,15 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
         const documentModel = this._getDocumentModel(header.documentType);
 
-        return baseUtils.replayDocument(
+        const document = baseUtils.replayDocument(
             initialState,
             filterOperationsByRevision(operations, options?.revisions),
             documentModel.reducer,
             undefined,
             header
         );
+        this.cache.setDocument(drive, id, document).catch(logger.error);
+        return document;
     }
 
     getDocuments(drive: string) {
@@ -556,8 +574,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         const operationsApplied: Operation<A | BaseAction>[] = [];
         const operationsUpdated: Operation<A | BaseAction>[] = [];
         const signals: SignalResult[] = [];
-
         let document: T = this._buildDocument(storageDocument);
+
         let error: OperationError | undefined; // TODO: replace with an array of errors/consistency issues
         const operationsByScope = groupOperationsByScope(operations);
 
@@ -601,7 +619,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     updatedOperationIndex = firstNewOperation.index;
                 }
             }
-
             for (const nextOperation of newOperations) {
                 let skipHashValidation = false;
 
@@ -615,7 +632,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 }
 
                 try {
-                    const appliedResult = await this._performOperation<T, A>(
+                    const appliedResult = await this._performOperation(
                         drive,
                         document,
                         nextOperation,
@@ -670,16 +687,15 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         ) as T;
     }
 
-    private async _performOperation<T extends Document, A extends Action>(
+    private async _performOperation<T extends Document>(
         drive: string,
-        documentStorage: DocumentStorage<T>,
-        operation: Operation<A | BaseAction>,
+        document: T,
+        operation: Operation,
         skipHashValidation = false
     ) {
         const documentModel = this._getDocumentModel(
-            documentStorage.documentType
+            document.documentType
         );
-        const document = this._buildDocument(documentStorage);
 
         const signalResults: SignalResult[] = [];
         let newDocument = document;

package/src/storage/prisma.ts

@@ -215,18 +215,14 @@ export class PrismaStorage implements IDriveStorage {
             header: DocumentHeader;
             updatedOperations?: Operation[] | undefined;
         } | null = null;
-
         await this.db.$transaction(async tx => {
             const document = await this.getDocument(drive, id, tx);
-
             if (!document) {
                 throw new Error(`Document with id ${id} not found`);
             }
-
             result = await callback(document);
 
             const { operations, header, updatedOperations } = result;
-
             return this._addDocumentOperations(
                 tx,
                 drive,