windows-development-sandbox 1.4.0 → 1.4.3

package/dist/host/workspace-view/view.js

@@ -11,53 +11,31 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
-import { z } from 'zod';
-import { readValid, writeJsonAtomic } from '../../shared/rundir.js';
+import { JsonFile } from '../../shared/io/index.js';
 import { IgnoreRules } from './rules.js';
-const Manifest = z.record(z.string().max(1024), z.tuple([z.number(), z.number(), z.number(), z.number()]));
-/** Most entries one walk looks at: a sandbox can create files faster than they are worth syncing. */
-const MAX_ENTRIES = 300000;
-const stamp = (file) => {
-    try {
-        const s = fs.lstatSync(file);
-        return s.isFile() ? [s.size, Math.round(s.mtimeMs)] : [-1, -1];
-    }
-    catch {
-        return [-1, -1];
-    }
-};
-const sameContent = (a, b) => {
-    const hash = (f) => crypto.createHash('sha256').update(fs.readFileSync(f)).digest('hex');
-    try {
-        return fs.statSync(a).size === fs.statSync(b).size && hash(a) === hash(b);
-    }
-    catch {
-        return false;
-    }
-};
-/** A path from an event or the manifest: relative, forward slashes, no way out of the root. */
-const safeRel = (rel) => {
-    const clean = rel.replace(/\\/g, '/').replace(/^\/+/, '');
-    if (!clean || clean.length > 1000 || clean.split('/').some((p) => p === '..' || p === '' || p.includes(':')))
-        return null;
-    return clean;
-};
+import { ManifestSchema, MAX_ENTRIES, safeRel, stamp, sameContent } from './view-state.js';
 export class WorkspaceView {
     o;
     rules;
     seen;
+    stateFile;
     constructor(o) {
         this.o = o;
         this.rules = new IgnoreRules(o.host, o.exclude, o.include);
-        this.seen = readValid(Manifest, o.state) ?? {};
+        this.stateFile = new JsonFile(ManifestSchema, o.state);
+        this.seen = this.stateFile.read() ?? {};
     }
     /** Where a project's view and its sync state live: <storage>\views\<id> and <storage>\views\<id>.json. */
     static pathsFor(storageRoot, host) {
-        const id = path.basename(host).replace(/[^A-Za-z0-9._-]/g, '_') + '-' + crypto.createHash('sha256').update(path.resolve(host).toLowerCase()).digest('hex').slice(0, 8);
+        const id = path.basename(host).replace(/[^A-Za-z0-9._-]/g, '_') +
+            '-' +
+            crypto.createHash('sha256').update(path.resolve(host).toLowerCase()).digest('hex').slice(0, 8);
         const view = path.join(storageRoot, 'views', id);
         return { host, view, state: view + '.json' };
     }
-    abs(root, rel) { return path.join(root, ...rel.split('/')); }
+    abs(root, rel) {
+        return path.join(root, ...rel.split('/'));
+    }
     /** Creates the view (with its .git file) and brings it fully in step with the project. */
     prepare() {
         fs.mkdirSync(this.o.view, { recursive: true });
@@ -73,7 +51,9 @@ export class WorkspaceView {
         const files = [];
         // An ignored folder is only entered when one of your include patterns could match inside it; then only files those
         // patterns let in are taken.
-        const queue = [{ rel: under, ignored: under !== '' && this.rules.isIgnored(under, true) }];
+        const queue = [
+            { rel: under, ignored: under !== '' && this.rules.isIgnored(under, true) },
+        ];
         let count = 0;
         while (queue.length) {
             const { rel, ignored } = queue.shift();
@@ -120,12 +100,14 @@ export class WorkspaceView {
                 this.rules.reset();
                 return this.syncAll();
             }
-            const isDir = [this.o.host, this.o.view].some((root) => { try {
-                return fs.lstatSync(this.abs(root, rel)).isDirectory();
-            }
-            catch {
-                return false;
-            } });
+            const isDir = [this.o.host, this.o.view].some((root) => {
+                try {
+                    return fs.lstatSync(this.abs(root, rel)).isDirectory();
+                }
+                catch {
+                    return false;
+                }
+            });
             if (isDir) {
                 if (this.rules.isIgnored(rel, true) && !this.rules.mayIncludeInside(rel))
                     continue;
@@ -155,7 +137,7 @@ export class WorkspaceView {
                 this.o.note?.('could not sync ' + rel + ': ' + (e instanceof Error ? e.message : String(e)));
             }
         }
-        writeJsonAtomic(this.o.state, this.seen);
+        this.stateFile.write(this.seen);
         return stats;
     }
     syncOne(rel, stats) {
@@ -164,10 +146,14 @@ export class WorkspaceView {
         const [hs, hm] = stamp(hostFile);
         const [vs, vm] = stamp(viewFile);
         const before = this.seen[rel];
-        const record = () => { const h = stamp(hostFile); const v = stamp(viewFile); if (h[0] < 0 && v[0] < 0)
-            delete this.seen[rel];
-        else
-            this.seen[rel] = [h[0], h[1], v[0], v[1]]; };
+        const record = () => {
+            const h = stamp(hostFile);
+            const v = stamp(viewFile);
+            if (h[0] < 0 && v[0] < 0)
+                delete this.seen[rel];
+            else
+                this.seen[rel] = [h[0], h[1], v[0], v[1]];
+        };
         if (hs < 0 && vs < 0) {
             delete this.seen[rel];
             return;
@@ -203,11 +189,14 @@ export class WorkspaceView {
         }
         // Yours stays in the project; the sandbox's version is kept next to it, and the view gets yours.
         const ext = path.extname(hostFile);
-        const conflict = hostFile.slice(0, hostFile.length - ext.length) + '.sandbox-conflict-' + new Date().toISOString().replace(/\D/g, '').slice(0, 14) + ext;
+        const conflict = hostFile.slice(0, hostFile.length - ext.length) +
+            '.sandbox-conflict-' +
+            new Date().toISOString().replace(/\D/g, '').slice(0, 14) +
+            ext;
         fs.copyFileSync(viewFile, conflict);
         this.carry(hostFile, viewFile, false, stats, 'toView');
         stats.conflicts++;
-        this.o.note?.('both sides changed ' + rel + ': kept yours, the sandbox\'s version is ' + path.basename(conflict));
+        this.o.note?.('both sides changed ' + rel + ": kept yours, the sandbox's version is " + path.basename(conflict));
         record();
     }
     /** Copies (keeping the file time) or deletes on the other side. */
@@ -269,13 +258,20 @@ export class WorkspaceView {
             timer ??= setTimeout(flush, 300);
         };
         const watchers = [this.o.host, this.o.view].map((dir) => fs.watch(dir, { recursive: true }, onEvent));
-        const full = setInterval(() => { try {
-            this.syncAll();
-        }
-        catch (e) {
-            this.o.note?.('full sync failed: ' + (e instanceof Error ? e.message : String(e)));
-        } }, fullEveryMs);
-        return () => { watchers.forEach((w) => w.close()); clearInterval(full); clearTimeout(timer); if (pending.size)
-            flush(); };
+        const full = setInterval(() => {
+            try {
+                this.syncAll();
+            }
+            catch (e) {
+                this.o.note?.('full sync failed: ' + (e instanceof Error ? e.message : String(e)));
+            }
+        }, fullEveryMs);
+        return () => {
+            watchers.forEach((w) => w.close());
+            clearInterval(full);
+            clearTimeout(timer);
+            if (pending.size)
+                flush();
+        };
     }
 }