document-drive 0.0.16 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "0.0.16",
+    "version": "0.0.17",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -30,7 +30,6 @@
         "localforage": "^1.10.0"
     },
     "dependencies": {
-        "proper-lockfile": "^4.1.2",
         "sanitize-filename": "^1.6.3"
     },
     "devDependencies": {
@@ -46,6 +45,7 @@
         "localforage": "^1.10.0",
         "prettier": "^3.1.0",
         "prettier-plugin-organize-imports": "^3.2.4",
+        "tsx": "^4.6.2",
         "typescript": "^5.3.2",
         "vitest": "^0.34.6"
     }

package/src/storage/filesystem.ts

@@ -4,7 +4,6 @@ import type { Dirent } from 'fs';
 import { existsSync, mkdirSync } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
-import { check, lock } from 'proper-lockfile';
 import sanitize from 'sanitize-filename';
 import { isDocumentDrive } from '../utils';
 import { IDriveStorage } from './types';
@@ -22,28 +21,6 @@ function ensureDir(dir: string) {
     }
 }
 
-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 {
     private basePath: string;
     private drivesPath: string;
@@ -108,16 +85,15 @@ export class FilesystemStorage implements IDriveStorage {
 
     async saveDocument(drive: string, id: string, document: Document) {
         const documentPath = this._buildDocumentPath(drive, id);
-        const releaseLock = existsSync(documentPath)
-            ? await lockFile(documentPath)
-            : undefined;
+        let handle: fs.FileHandle | undefined = undefined;
         try {
             await ensureDir(path.dirname(documentPath));
-            return fs.writeFile(documentPath, JSON.stringify(document), {
+            handle = await fs.open(documentPath, 'w');
+            await fs.writeFile(handle, JSON.stringify(document), {
                 encoding: 'utf-8'
             });
         } finally {
-            releaseLock?.();
+            await handle?.close();
         }
     }