@kollors/deep-json-server 1.0.0-rc.6 → 1.0.0-rc.8

package/dist/src/server/storage-lock.js

@@ -1,116 +1,120 @@
 import { randomUUID } from 'node:crypto';
-import { mkdir, readFile, rmdir, stat, unlink, writeFile } from 'node:fs/promises';
-import { canonicalPath } from '../core/paths.js';
-import { isSystemError } from '../core/utils.js';
-const INCOMPLETE_LOCK_GRACE_MS = 2000;
-export const databaseLockPath = (path) => `${path}.deep-json-server.lock`;
+import { constants } from 'node:fs';
+import { lstat, open, unlink } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import { basename, dirname, extname, join } from 'node:path';
+import { canonicalEntryPath, canonicalPath, validateExportPaths } from '../core/paths.js';
+import { isObject, isSystemError } from '../core/utils.js';
+/** Имя одного файла блокировки рядом с источником: /data/catalog.json → /data/catalog-lock.json. */
+export const databaseLockPath = (path) => join(dirname(path), `${basename(path, extname(path))}-lock.json`);
+const LOCK_TYPE = 'deep-json-server-lock';
+const LOCK_PREFIX = `{"type":"${LOCK_TYPE}",`;
+const sameFile = (left, right) => left.dev === right.dev && left.ino === right.ino;
 const missing = (error) => isSystemError(error) && error.code === 'ENOENT';
-async function ownerOf(path) {
-    try {
-        const value = JSON.parse(await readFile(path, 'utf8'));
-        if (typeof value === 'object' && value !== null && 'pid' in value && 'token' in value && Number.isSafeInteger(value.pid) && typeof value.token === 'string')
-            return value;
-    }
-    catch (error) {
-        if (!missing(error) && !(error instanceof SyntaxError))
-            throw error;
-    }
-    return undefined;
-}
-function processExists(pid) {
-    if (pid < 1)
-        return false;
-    try {
-        process.kill(pid, 0);
+/** Разрешает старые метаданные и незавершённую запись, но не перезаписывает посторонний JSON. */
+function isLockContent(content) {
+    if (!content)
         return true;
+    try {
+        const value = JSON.parse(content);
+        return isObject(value) && value.type === LOCK_TYPE;
     }
-    catch (error) {
-        if (isSystemError(error) && error.code === 'ESRCH')
-            return false;
-        if (isSystemError(error) && error.code === 'EPERM')
-            return true;
-        throw error;
-    }
-}
-async function removeOwnedLock(directory, token) {
-    const ownerPath = `${directory}/owner.json`;
-    const owner = await ownerOf(ownerPath);
-    if (!owner) {
-        try {
-            await stat(directory);
-        }
-        catch (error) {
-            if (missing(error))
-                return;
-            throw error;
-        }
+    catch {
+        return LOCK_PREFIX.startsWith(content) || content.startsWith(LOCK_PREFIX);
     }
-    if (owner?.token !== token)
-        throw new Error(`Database lock was changed: ${directory}`);
-    await unlink(ownerPath);
-    await rmdir(directory);
 }
-/** Удерживает блокировку дисковой базы до закрытия сервера и восстанавливает её после остановки процесса. */
-export async function acquireDatabaseLock(databasePath) {
-    const path = await canonicalPath(databasePath);
-    const directory = databaseLockPath(path);
-    const recovery = `${directory}.recovery`;
-    const ownerPath = `${directory}/owner.json`;
-    const busy = () => new Error(`Database is already in use by another server: ${path}`);
-    for (let attempt = 0; attempt < 3; attempt++) {
+/** Удерживает системную блокировку дескриптора; после аварии ОС освобождает её автоматически. */
+async function acquireLock(path, source) {
+    // Нативный модуль нужен только дисковым серверам, а не генераторам схем или memory storage.
+    const { tryLock } = createRequire(import.meta.url)('fs-native-extensions');
+    const busy = () => new Error(`Storage is already in use by another server: ${source}`);
+    for (let attempt = 0; attempt < 5; attempt++) {
+        const handle = await open(path, constants.O_CREAT | constants.O_RDWR | (constants.O_NOFOLLOW ?? 0), 0o600);
+        let retained = false;
         try {
-            await mkdir(directory);
-            const token = randomUUID();
-            try {
-                await writeFile(ownerPath, JSON.stringify({ pid: process.pid, token }), { flag: 'wx' });
+            const identity = await handle.stat();
+            if (!identity.isFile() || identity.nlink > 1)
+                throw new Error(`Storage lock must be a regular file without hard links: ${path}`);
+            // LockFileEx запрещает чтение заблокированных байтов другим дескриптором: на Windows
+            // блокируем байт за метаданными, чтобы JSON владельца оставался доступен для чтения.
+            if (!(process.platform === 'win32' ? tryLock(handle.fd, 4096, 1) : tryLock(handle.fd)))
+                throw busy();
+            // Предыдущий владелец мог удалить файл после нашего open(), но до tryLock().
+            // Старый inode не защищает новый путь: в таком случае открываем файл заново.
+            const current = await lstat(path).catch((error) => {
+                if (missing(error))
+                    return undefined;
+                throw error;
+            });
+            if (!current || !sameFile(identity, current))
+                continue;
+            if (current.size > 4096 || !isLockContent(await handle.readFile('utf8')))
+                throw new Error(`Storage lock path contains an unrelated file: ${path}`);
+            const content = Buffer.from(`${JSON.stringify({ type: LOCK_TYPE, pid: process.pid, token: randomUUID() })}\n`);
+            await handle.truncate(0);
+            for (let offset = 0; offset < content.length;) {
+                const { bytesWritten } = await handle.write(content, offset, content.length - offset, offset);
+                if (!bytesWritten)
+                    throw new Error(`Cannot write storage lock: ${path}`);
+                offset += bytesWritten;
+            }
+            let closing;
+            retained = true;
+            return () => (closing ??= (async () => {
                 try {
-                    await stat(recovery);
-                    await removeOwnedLock(directory, token);
-                    continue;
-                }
-                catch (error) {
-                    if (!missing(error))
+                    const current = await lstat(path).catch((error) => {
+                        if (missing(error))
+                            return undefined;
                         throw error;
+                    });
+                    if (current) {
+                        if (!sameFile(identity, current))
+                            throw new Error(`Storage lock was changed: ${path}`);
+                        // Не снимаем блокировку до unlink; конкуренты проверяют inode после захвата.
+                        await unlink(path);
+                    }
                 }
-                return () => removeOwnedLock(directory, token);
-            }
-            catch (error) {
-                if ((await ownerOf(ownerPath))?.token === token)
-                    await removeOwnedLock(directory, token);
-                else
-                    await rmdir(directory).catch(() => undefined);
-                throw error;
-            }
-        }
-        catch (error) {
-            if (!isSystemError(error) || error.code !== 'EEXIST')
-                throw error;
-        }
-        const owner = await ownerOf(ownerPath);
-        if (owner && processExists(owner.pid))
-            throw busy();
-        if (!owner && Date.now() - (await stat(directory)).mtimeMs < INCOMPLETE_LOCK_GRACE_MS)
-            throw busy();
-        try {
-            await mkdir(recovery);
-        }
-        catch (error) {
-            if (isSystemError(error) && error.code === 'EEXIST')
-                throw busy();
-            throw error;
-        }
-        try {
-            const current = await ownerOf(ownerPath);
-            if (current && processExists(current.pid))
-                throw busy();
-            if (current)
-                await unlink(ownerPath);
-            await rmdir(directory);
+                finally {
+                    await handle.close();
+                }
+            })());
         }
         finally {
-            await rmdir(recovery);
+            if (!retained)
+                await handle.close();
         }
     }
     throw busy();
 }
+/** Блокирует все записываемые источники и освобождает уже полученные блокировки при ошибке. */
+export async function acquireStorageLocks(sources, inputs = sources) {
+    const entries = await Promise.all(sources.map(async (source) => [await canonicalEntryPath(source), await canonicalPath(source)]));
+    const owners = new Map();
+    for (const entry of entries)
+        for (const source of entry)
+            owners.set(databaseLockPath(source), source);
+    const paths = [...owners.keys()].sort();
+    await validateExportPaths(paths, [...sources, ...inputs]);
+    const releases = [];
+    let closing;
+    const release = () => (closing ??= (async () => {
+        const results = await Promise.allSettled(releases.reverse().map((close) => close()));
+        const errors = results.filter((result) => result.status === 'rejected').map((result) => result.reason);
+        if (errors.length)
+            throw new AggregateError(errors, 'Cannot release storage locks');
+    })());
+    try {
+        for (const path of paths)
+            releases.push(await acquireLock(path, owners.get(path)));
+    }
+    catch (error) {
+        await release();
+        throw error;
+    }
+    return { paths, release };
+}
+/** Блокирует дисковую базу, включая путь ссылки, который заменяется атомарной записью. */
+export async function acquireDatabaseLock(databasePath) {
+    return (await acquireStorageLocks([databasePath])).release;
+}
 //# sourceMappingURL=storage-lock.js.map

package/dist/src/server/storage-lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage-lock.js","sourceRoot":"","sources":["../../../src/server/storage-lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage-lock.js","sourceRoot":"","sources":["../../../src/server/storage-lock.ts"],"names":[],"mappings":"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"}

package/examples/database.json

@@ -2,37 +2,31 @@
   "countries": [
     {
       "id": "1",
-      "isArchived": false,
       "name": "Ardenia"
     },
     {
       "id": "2",
-      "isArchived": false,
       "name": "Veloria"
     }
   ],
   "genres": [
     {
       "id": "1",
-      "isArchived": false,
       "name": "Crime",
       "parentIds": []
     },
     {
       "id": "2",
-      "isArchived": false,
       "name": "Gangster",
       "parentIds": ["1"]
     },
     {
       "id": "3",
-      "isArchived": false,
       "name": "Drama",
       "parentIds": []
     },
     {
       "id": "4",
-      "isArchived": false,
       "name": "Comedy",
       "parentIds": []
     }
@@ -54,7 +48,6 @@
       "coverSrc": "https://example.com/covers/shadows-of-ardenia.jpg",
       "description": "An heiress in a port city uncovers a plot involving two rival families.",
       "id": "1",
-      "isArchived": false,
       "publisherIds": ["2"],
       "title": "Shadows of Ardenia"
     },
@@ -63,7 +56,6 @@
       "coverSrc": "https://example.com/covers/northern-star.jpg",
       "description": "A night clerk at an old hotel gets drawn into the search for a missing painting.",
       "id": "2",
-      "isArchived": false,
       "publisherIds": ["1"],
       "title": "Midnight at the Northern Star"
     }
@@ -71,12 +63,10 @@
   "publishers": [
     {
       "id": "1",
-      "isArchived": false,
       "name": "Northlight Studio"
     },
     {
       "id": "2",
-      "isArchived": false,
       "name": "Aurora Pictures"
     }
   ],
@@ -85,15 +75,13 @@
       "bornAt": "1988-03-14",
       "countryId": "1",
       "fullName": "Mira Volkova",
-      "id": "1",
-      "isArchived": false
+      "id": "1"
     },
     {
       "bornAt": "1991-11-02",
       "countryId": "2",
       "fullName": "Leon Vetrov",
-      "id": "2",
-      "isArchived": false
+      "id": "2"
     }
   ]
 }

package/examples/schema.json

@@ -9,9 +9,6 @@
           "primary": true,
           "generated": "uuid"
         },
-        "isArchived": {
-          "type": "boolean"
-        },
         "name": {
           "type": "string"
         },
@@ -29,9 +26,6 @@
           "primary": true,
           "generated": "uuid"
         },
-        "isArchived": {
-          "type": "boolean"
-        },
         "name": {
           "type": "string"
         },
@@ -68,9 +62,6 @@
         "description": {
           "type": "string"
         },
-        "isArchived": {
-          "type": "boolean"
-        },
         "title": {
           "type": "string",
           "required": true
@@ -118,9 +109,6 @@
           "primary": true,
           "generated": "uuid"
         },
-        "isArchived": {
-          "type": "boolean"
-        },
         "name": {
           "type": "string"
         },
@@ -147,9 +135,6 @@
           "type": "string",
           "required": true
         },
-        "isArchived": {
-          "type": "boolean"
-        },
         "avatarSrc": {
           "type": "string",
           "format": "uri"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kollors/deep-json-server",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "description": "JSON mock server with schema-driven REST, GraphQL, OpenAPI generation and file uploads",
   "type": "module",
   "main": "./dist/index.js",
@@ -37,6 +37,7 @@
     "README.ru.md",
     "CHANGELOG.md",
     "MIGRATION.md",
+    "MIGRATION.ru.md",
     "examples"
   ],
   "scripts": {
@@ -58,6 +59,7 @@
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "fastify": "^5.12.3",
+    "fs-native-extensions": "^1.5.1",
     "graphql": "^16.14.2",
     "lowdb": "^7.0.1",
     "mercurius": "^16.10.0",