document-drive 1.0.0-alpha.65 → 1.0.0-alpha.67

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.65",
+    "version": "1.0.0-alpha.67",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -34,8 +34,8 @@
         "test:watch": "vitest watch"
     },
     "peerDependencies": {
-        "document-model": "1.3.0",
-        "document-model-libs": "^1.53.1"
+        "document-model": "^1.4.0",
+        "document-model-libs": "^1.57.0"
     },
     "optionalDependencies": {
         "@prisma/client": "5.14.0",
@@ -65,8 +65,8 @@
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
-        "document-model": "^1.3.0",
-        "document-model-libs": "^1.53.1",
+        "document-model": "^1.4.0",
+        "document-model-libs": "^1.57.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",
@@ -79,6 +79,7 @@
         "sequelize": "^6.37.2",
         "sqlite3": "^5.1.7",
         "typescript": "^5.4.4",
-        "vitest": "^1.5.0"
-    }
+        "vitest": "^1.6.0"
+    },
+    "packageManager": "pnpm@9.1.4+sha256.30a1801ac4e723779efed13a21f4c39f9eb6c9fbb4ced101bce06b422593d7c9"
 }

package/src/server/index.ts

@@ -103,6 +103,18 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         this.storage = storage;
         this.cache = cache;
         this.queueManager = queueManager;
+
+        this.storage.setStorageDelegate?.({
+            getCachedOperations: async (drive, id) => {
+                try {
+                    const document = await this.cache.getDocument(drive, id);
+                    return document?.operations;
+                } catch (error) {
+                    logger.error(error);
+                    return undefined;
+                }
+            }
+        })
     }
 
     private updateSyncStatus(

package/src/storage/prisma.ts

@@ -21,7 +21,7 @@ import type {
 import { IBackOffOptions, backOff } from 'exponential-backoff';
 import { ConflictOperationError } from '../server/error';
 import { logger } from '../utils/logger';
-import { DocumentDriveStorage, DocumentStorage, IDriveStorage } from './types';
+import { DocumentDriveStorage, DocumentStorage, IDriveStorage, IStorageDelegate } from './types';
 
 type Transaction =
     | Omit<
@@ -90,6 +90,7 @@ type ExtendedPrismaClient = ReturnType<
 
 export class PrismaStorage implements IDriveStorage {
     private db: ExtendedPrismaClient;
+    private delegate: IStorageDelegate | undefined;
 
     constructor(db: PrismaClient, options?: PrismaStorageOptions) {
         const backOffOptions = options?.transactionRetryBackoff;
@@ -99,6 +100,10 @@ export class PrismaStorage implements IDriveStorage {
         });
     }
 
+    setStorageDelegate(delegate: IStorageDelegate): void {
+        this.delegate = delegate;
+    }
+
     async createDrive(id: string, drive: DocumentDriveStorage): Promise<void> {
         // drive for all drive documents
         await this.createDocument('drives', id, drive as DocumentStorage);
@@ -362,12 +367,26 @@ export class PrismaStorage implements IDriveStorage {
             throw new Error(`Document with id ${id} not found`);
         }
 
+        const cachedOperations = await this.delegate?.getCachedOperations(driveId, id) ?? {
+            global: [],
+            local: []
+        };
+        const scopeIndex = Object.keys(cachedOperations).reduceRight<Record<OperationScope, number>>((acc, value) => {
+            const scope = value as OperationScope;
+            const lastIndex = cachedOperations[scope]?.at(-1)?.index ?? -1;
+            acc[scope] = lastIndex;
+            return acc;
+        }, { global: -1, local: -1 });
+
+        const conditions = Object.entries(scopeIndex).map(([scope, index]) => `("scope" = '${scope}' AND "index" > ${index})`);
+        conditions.push(`("scope" NOT IN (${Object.keys(cachedOperations).map(s => `'${s}'`).join(", ")}))`);
+
         // retrieves operations with resulting state
         // for the last operation of each scope
-        const operations = await prisma.$queryRaw<
+        // TODO prevent SQL injection
+        const queryOperations = await prisma.$queryRawUnsafe<
             Prisma.$OperationPayload['scalars'][]
-        >`
-            WITH ranked_operations AS (
+        >(`WITH ranked_operations AS (
             SELECT
                 *,
                 ROW_NUMBER() OVER (PARTITION BY scope ORDER BY index DESC) AS rn
@@ -390,21 +409,23 @@ export class PrismaStorage implements IDriveStorage {
                 ELSE NULL
             END AS "resultingState"
             FROM ranked_operations
-            WHERE "driveId" = ${driveId} AND "documentId" = ${id}
+            WHERE "driveId" = $1 AND "documentId" = $2
+            AND (${conditions.join(' OR ')})
             ORDER BY scope, index;
-        `;
-
-        const operationIds = operations.map(o => o.id);
+        `, driveId, id);
+        const operationIds = queryOperations.map(o => o.id)
         const attachments = await prisma.attachment.findMany({
             where: {
                 operationId: {
                     in: operationIds
                 }
-            }
+            },
         });
 
+        // TODO add attachments from cached operations
         const fileRegistry: FileRegistry = {};
-        const operationsByScope = operations.reduce<DocumentOperations<Action>>(
+
+        const operationsByScope = queryOperations.reduce<DocumentOperations<Action>>(
             (acc, operation) => {
                 const scope = operation.scope as OperationScope;
                 if (!acc[scope]) {
@@ -420,10 +441,7 @@ export class PrismaStorage implements IDriveStorage {
                 acc[scope].push(result);
                 return acc;
             },
-            {
-                global: [],
-                local: []
-            }
+            cachedOperations
         );
 
         const dbDoc = result;
@@ -445,9 +463,6 @@ export class PrismaStorage implements IDriveStorage {
             >,
             attachments: {}
         };
-
-
-
         return doc;
     }
 

package/src/storage/types.ts

@@ -3,12 +3,12 @@ import type {
     DocumentDriveDocument,
 } from 'document-model-libs/document-drive';
 import type {
+    Action,
     BaseAction,
     Document,
     DocumentHeader,
-    ExtendedState,
+    DocumentOperations,
     Operation,
-    State
 } from 'document-model/document';
 
 export type DocumentStorage<D extends Document = Document> = Omit<
@@ -18,6 +18,10 @@ export type DocumentStorage<D extends Document = Document> = Omit<
 
 export type DocumentDriveStorage = DocumentStorage<DocumentDriveDocument>;
 
+export interface IStorageDelegate {
+    getCachedOperations(drive: string, id: string): Promise<DocumentOperations<Action> | undefined>;
+}
+
 export interface IStorage {
     checkDocumentExists(drive: string, id: string): Promise<boolean>;
     getDocuments: (drive: string) => Promise<string[]>;
@@ -43,8 +47,8 @@ export interface IStorage {
     ): Promise<void>;
     deleteDocument(drive: string, id: string): Promise<void>;
     getOperationResultingState?(drive: string, id: string, index: number, scope: string, branch: string): Promise<unknown>;
+    setStorageDelegate?(delegate: IStorageDelegate): void;
 }
-
 export interface IDriveStorage extends IStorage {
     getDrives(): Promise<string[]>;
     getDrive(id: string): Promise<DocumentDriveStorage>;