@hachej/boring-files 0.4.46 → 0.4.48

package/dist/workspace.js

@@ -8,6 +8,7 @@ import { journalConnectionOf, sqliteBatchOf } from './sqlite-batch.js';
 import { isTemporary, mediaTypeOf, temporaryFileName } from './file-types.js';
 export { isTemporary } from './file-types.js';
 const sameBytes = (left, right) => left.length === right.length && left.every((byte, index) => byte === right[index]);
+const ASIDE_FOLDER_MAX_AGE_MS = 60 * 60 * 1000;
 const queues = new WeakMap();
 /** One queue per file system object: two providers over the same `fs` share it. */
 function queueFor(fs) {
@@ -158,16 +159,40 @@ export function createWorkspaceProvider(options) {
         return { kind: 'file', bytes, revision: await blobRevision(bytes) };
     }
     /**
-     * A folder exists through its files: the one a move or delete left empty goes, up to the first that still holds something. Best effort and
-     * never recursive, so a file landing meanwhile stays; a file system that cannot remove a directory that way (Pi's Node one) keeps the folder.
+     * A folder exists through its files: the one a move or delete left empty goes, up to the first that still holds something. Best effort, and
+     * never recursive on the folder itself, so a file landing meanwhile stays. A file system that cannot remove a directory that way (Pi's Node one)
+     * has it renamed aside first: no new file can land there, and it is only deleted if it is still empty, otherwise it goes back.
      */
+    const removeAside = async (folder) => {
+        const aside = `${folder.slice(0, folder.lastIndexOf('/'))}/${temporaryFileName(randomUUID())}`;
+        const moved = await fs.renameFile(folder, aside, fsContext()).catch(() => undefined);
+        if (!moved?.ok)
+            return false;
+        const left = await fs.listDir(aside, fsContext()).catch(() => undefined);
+        if (left?.ok && !left.value.length)
+            return (await fs.remove(aside, { recursive: true }, fsContext()).catch(() => undefined))?.ok === true;
+        if ((await fs.renameFile(aside, folder, fsContext()).catch(() => undefined))?.ok)
+            return false;
+        // Another writer recreated the folder meanwhile: what landed joins it, entry by entry, and a name already taken there stays aside rather than overwrite.
+        const present = await fs.listDir(folder, fsContext()).catch(() => undefined);
+        if (!present?.ok || !left?.ok)
+            return false;
+        const taken = new Set(present.value.map(entry => entry.name));
+        for (const entry of left.value)
+            if (!taken.has(entry.name))
+                await fs.renameFile(entry.path, `${folder}/${entry.name}`, fsContext()).catch(() => undefined);
+        const rest = await fs.listDir(aside, fsContext()).catch(() => undefined);
+        if (rest?.ok && !rest.value.length)
+            await fs.remove(aside, { recursive: true }, fsContext()).catch(() => undefined);
+        return false;
+    };
     const pruneEmptied = async (path) => {
         for (let folder = path.slice(0, Math.max(0, path.lastIndexOf('/'))); folder; folder = folder.slice(0, Math.max(0, folder.lastIndexOf('/')))) {
             const listed = await fs.listDir(absolute(folder), fsContext()).catch(() => undefined);
             if (!listed?.ok || listed.value.length)
                 return;
             const gone = await fs.remove(absolute(folder), { recursive: false }, fsContext()).catch(() => undefined);
-            if (!gone?.ok)
+            if (!gone?.ok && !await removeAside(absolute(folder)))
                 return;
         }
     };
@@ -180,8 +205,15 @@ export function createWorkspaceProvider(options) {
                 return;
             for (const entry of listing.value) {
                 if (entry.kind === 'directory') {
-                    if (entry.name !== '.git' && entry.name !== 'node_modules')
-                        await walk(entry.path);
+                    if (entry.name === '.git' || entry.name === 'node_modules')
+                        continue;
+                    await walk(entry.path);
+                    // A folder set aside by a process that died: removed only if nothing landed in it. Old enough that no running provider is still pruning it.
+                    if (isTemporary(entry.path) && entry.mtimeMs < startedAt - ASIDE_FOLDER_MAX_AGE_MS) {
+                        const left = await fs.listDir(entry.path, fsContext());
+                        if (left.ok && !left.value.length)
+                            await fs.remove(entry.path, { recursive: true }, fsContext());
+                    }
                 }
                 else if (entry.kind === 'file' && isTemporary(entry.path) && entry.mtimeMs < startedAt)
                     await fs.remove(entry.path, { force: true }, fsContext());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hachej/boring-files",
-  "version": "0.4.46",
+  "version": "0.4.48",
   "license": "MIT",
   "private": false,
   "type": "module",