document-drive 0.0.10 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "0.0.10",
+    "version": "0.0.12",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -30,9 +30,11 @@
         "localforage": "^1.10.0"
     },
     "dependencies": {
+        "proper-lockfile": "^4.1.2",
         "sanitize-filename": "^1.6.3"
     },
     "devDependencies": {
+        "@types/proper-lockfile": "^4.1.4",
         "@typescript-eslint/eslint-plugin": "^6.12.0",
         "@typescript-eslint/parser": "^6.12.0",
         "@vitest/coverage-v8": "^0.34.6",

package/src/storage/filesystem.ts

@@ -3,8 +3,8 @@ import { Document } from 'document-model/document';
 import type { Dirent } from 'fs';
 import { existsSync, mkdirSync } from 'fs';
 import fs from 'fs/promises';
-
 import path from 'path';
+import { lock } from 'proper-lockfile';
 import sanitize from 'sanitize-filename';
 import { isDocumentDrive } from '../utils';
 import { IDriveStorage } from './types';
@@ -22,6 +22,10 @@ type FSError = {
     path: string;
 };
 
+function lockFile(path: string) {
+    return lock(path, { fs, retries: 3 });
+}
+
 export class FilesystemStorage implements IDriveStorage {
     private basePath: string;
     private drivesPath: string;
@@ -78,19 +82,23 @@ export class FilesystemStorage implements IDriveStorage {
                 { encoding: 'utf-8' }
             );
             return JSON.parse(content);
-        } catch {
+        } catch (error) {
+            console.error(error);
             throw new Error(`Document with id ${id} not found`);
         }
     }
 
     async saveDocument(drive: string, id: string, document: Document) {
         const documentPath = this._buildDocumentPath(drive, id);
-        await ensureDir(path.dirname(documentPath));
-        return fs.writeFile(
-            this._buildDocumentPath(drive, id),
-            JSON.stringify(document),
-            { encoding: 'utf-8' }
-        );
+        const releaseLock = await lockFile(documentPath);
+        try {
+            await ensureDir(path.dirname(documentPath));
+            return fs.writeFile(documentPath, JSON.stringify(document), {
+                encoding: 'utf-8'
+            });
+        } finally {
+            releaseLock();
+        }
     }
 
     async deleteDocument(drive: string, id: string) {
@@ -120,8 +128,8 @@ export class FilesystemStorage implements IDriveStorage {
         let document: Document;
         try {
             document = await this.getDocument(FilesystemStorage.DRIVES_DIR, id);
-        } catch (error) {
-            throw new Error(`Drive with id ${id} not found: ${error}`);
+        } catch {
+            throw new Error(`Drive with id ${id} not found`);
         }
         if (isDocumentDrive(document)) {
             return document;