document-drive 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "0.0.14",
+    "version": "0.0.16",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",

package/src/storage/filesystem.ts

@@ -4,17 +4,11 @@ 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 { check, lock } from 'proper-lockfile';
 import sanitize from 'sanitize-filename';
 import { isDocumentDrive } from '../utils';
 import { IDriveStorage } from './types';
 
-function ensureDir(dir: string) {
-    if (!existsSync(dir)) {
-        mkdirSync(dir, { recursive: true });
-    }
-}
-
 type FSError = {
     errno: number;
     code: string;
@@ -22,8 +16,32 @@ type FSError = {
     path: string;
 };
 
-function lockFile(path: string) {
-    return lock(path, { fs, retries: 3, realpath: false });
+function ensureDir(dir: string) {
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+}
+
+async function lockFile(path: string, retries = 10) {
+    // eslint-disable-next-line no-constant-condition
+    if (retries > 0) {
+        try {
+            const locked = await check(path);
+            if (locked) {
+                throw new Error('File is locked');
+            }
+        } catch (error) {
+            await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for 1 second before checking again
+            return lockFile(path, retries - 1);
+        }
+    }
+
+    return lock(path, {
+        fs,
+        retries: 3,
+        realpath: false,
+        onCompromised: () => {}
+    });
 }
 
 export class FilesystemStorage implements IDriveStorage {