document-drive 1.0.0-alpha.34 → 1.0.0-alpha.36

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.34",
+    "version": "1.0.0-alpha.36",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -31,7 +31,7 @@
     },
     "peerDependencies": {
         "@prisma/client": "5.11.0",
-        "document-model": "^1.0.35",
+        "document-model": "^1.0.41",
         "document-model-libs": "^1.18.1",
         "localforage": "^1.10.0",
         "sequelize": "^6.35.2",
@@ -55,7 +55,7 @@
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
-        "document-model": "^1.0.36",
+        "document-model": "^1.0.41",
         "document-model-libs": "^1.24.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",

package/src/server/index.ts

@@ -36,7 +36,7 @@ import {
     merge,
     precedes,
     removeExistingOperations,
-    reshuffleByTimestampAndIndex,
+    reshuffleByTimestamp,
     sortOperations
 } from '../utils/document-helpers';
 import { requestPublicDrive } from '../utils/graphql';
@@ -557,7 +557,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             const newHistory =
                 tail.length < 1
                     ? invertedTrunk
-                    : merge(trunk, invertedTrunk, reshuffleByTimestampAndIndex);
+                    : merge(trunk, invertedTrunk, reshuffleByTimestamp);
 
             const lastOriginalOperation = trunk[trunk.length - 1];
 
@@ -581,11 +581,23 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             }
 
             for (const nextOperation of newOperations) {
+                let skipHashValidation = false;
+
+                // when dealing with a merge (tail.length > 0) we have to skip hash validation
+                // for the operations that were re-indexed (previous hash becomes invalid due the new position in the history)
+                if (tail.length > 0) {
+                    skipHashValidation = [...invertedTrunk, ...tail].some(
+                        invertedTrunkOp =>
+                            invertedTrunkOp.hash === nextOperation.hash
+                    );
+                }
+
                 try {
                     const appliedResult = await this._performOperation<T, A>(
                         drive,
                         document,
-                        nextOperation
+                        nextOperation,
+                        skipHashValidation
                     );
                     document = appliedResult.document;
                     signals.push(...appliedResult.signals);
@@ -639,7 +651,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     private async _performOperation<T extends Document, A extends Action>(
         drive: string,
         documentStorage: DocumentStorage<T>,
-        operation: Operation<A | BaseAction>
+        operation: Operation<A | BaseAction>,
+        skipHashValidation = false
     ) {
         const documentModel = this._getDocumentModel(
             documentStorage.documentType
@@ -700,7 +713,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             );
         } else if (
             operation.type !== 'NOOP' &&
-            appliedOperation[0]!.hash !== operation.hash
+            appliedOperation[0]!.hash !== operation.hash &&
+            !skipHashValidation
         ) {
             throw new OperationError(
                 'CONFLICT',

package/src/storage/browser.ts

@@ -15,10 +15,10 @@ export class BrowserStorage implements IDriveStorage {
     static SEP = ':';
     static DRIVES_KEY = 'DRIVES';
 
-    constructor() {
+    constructor(namespace?: string) {
         this.db = import('localforage').then(localForage =>
             localForage.default.createInstance({
-                name: BrowserStorage.DBName
+                name: namespace ? `${namespace}:${BrowserStorage.DBName}` : BrowserStorage.DBName
             })
         );
     }