hfs 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -24,7 +24,7 @@
     "test": "node --import tsx --test tests/test.ts",
     "test-with-server": "sh -c 'npm run port-is-free && tsc && rm -rf tests/work tests/tmp && (node dist/src --cwd tests/work --config tests & echo $! > .server_pid) && sleep 2 && node --import tsx --test \"$@\" tests/test.ts; _exit=$?; if [ -f ./.server_pid ]; then SERVER_PID=$(cat ./.server_pid); kill \"$SERVER_PID\" 2>/dev/null || true; rm -f ./.server_pid; fi; exit $_exit' --",
     "port-is-free": "node -e \"const port=process.argv[1]||8081;process.exit(await fetch('http://localhost:'+port).then(() => console.log('BUSY')||1, () => 0))\" --",
-    "test-ui": "npx playwright test frontend && npx playwright test serial && npx playwright test admin-vfs",
+    "test-ui": "npm run port-is-free -- 8081 && rm -rf tests/work tests/work2 && npx playwright test frontend && npx playwright test serial && npx playwright test admin-vfs",
     "test-with-ui": "sh -c 'npm run port-is-free -- 3005 && npm run start-frontend & npm run port-is-free -- 3006 && npm run start-admin & cross-env TEST_WITH_UI=1 npx playwright test --ui \"$@\"' --",
     "pub": "cd dist && npm publish",
     "dist": "STASHED=; if ! git diff-index --quiet HEAD --; then git stash push -m 'dist' && STASHED=1; fi; CI=1 FORCE_COLOR=1 npm run dist-uncommitted || (EXIT_CODE=$?; [ -n \"$STASHED\" ] && git stash pop; exit $EXIT_CODE); [ -n \"$STASHED\" ] && git stash pop",
@@ -82,7 +82,8 @@
   },
   "dependencies": {
     "@gregoranders/csv": "^0.0.13",
-    "@rejetto/kvstorage": "^0.17.2",
+    "@rejetto/kvstorage": "^0.17.7",
+    "@rejetto/nat-upnp": "^2.1.3",
     "acme-client": "^5.4.0",
     "busboy": "^1.6.0",
     "crc-32": "^1.2.2",
@@ -102,7 +103,6 @@
     "lodash": "^4.17.21",
     "mime-types": "*",
     "minimist": "^1.2.8",
-    "nat-upnp-rejetto": "^2.1.2",
     "node-forge": "^1.3.1",
     "open": "^8.4.0",
     "picomatch": "^4.0.3",

package/src/first.js

@@ -1,22 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quitting = void 0;
 exports.onProcessExit = onProcessExit;
 exports.onFirstEvent = onFirstEvent;
+const lodash_1 = __importDefault(require("lodash"));
+const assert_1 = __importDefault(require("assert"));
 const cbsOnExit = new Set();
-function onProcessExit(cb) {
-    cbsOnExit.add(cb);
-    return () => cbsOnExit.delete(cb);
+function onProcessExit(cb, order = 10) {
+    (0, assert_1.default)(Number.isInteger(order) && order >= 0, 'order must be an integer >= 0');
+    const rec = { cb, order };
+    cbsOnExit.add(rec);
+    return () => cbsOnExit.delete(rec);
 }
 exports.quitting = false;
 // 'exit' event is handled as the last resort, but it's not compatible with async callbacks
-onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP'], signal => {
+onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP'], async (signal) => {
     console.log('Quitting with signal:', signal || 'unknown');
     exports.quitting = true;
-    return Promise.allSettled(Array.from(cbsOnExit).map(cb => cb(signal))).then(() => {
-        console.debug('Process exit');
-        process.exit(0);
-    });
+    const byOrder = lodash_1.default.groupBy(Array.from(cbsOnExit), 'order'); // this will be inherently ordered because keys are positive integers
+    for (const recs of Object.values(byOrder))
+        await Promise.allSettled(recs.map(({ cb }) => {
+            try {
+                return cb(signal);
+            }
+            // keep exit moving even when a synchronous cleanup fails after partially shutting down
+            catch (e) {
+                console.error("Error while quitting", e);
+                return Promise.reject(e);
+            }
+        }));
+    console.debug('Process exit');
+    process.exit(0);
 });
 // keep calling cb in a sync fashion – returning a promise instead would break the code for argv.updating (update.ts)
 function onFirstEvent(emitter, events, cb) {

package/src/listen.js

@@ -70,8 +70,8 @@ const consoleLog_1 = require("./consoleLog");
 const first_1 = require("./first");
 let httpSrv;
 let httpsSrv;
-// update relaunch can keep a bridge process alive, so we proactively close listeners here to release ports before the next binary binds
-(0, first_1.onProcessExit)(() => Promise.all([stopServer(httpSrv), stopServer(httpsSrv)]));
+// the update relaunch can keep a bridge process alive, so we proactively close listeners here to release ports before the next binary binds; do it before (5) the storage file is closed, because sockets write there
+(0, first_1.onProcessExit)(() => Promise.all([stopServer(httpSrv), stopServer(httpsSrv)]), 5);
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', true);
 exports.baseUrl = (0, config_1.defineConfig)(misc_1.CFG.base_url, '', x => /(?<=\/\/)[^\/]+/.exec(x)?.[0]); // compiled is host only
 async function getBaseUrlOrDefault() {

package/src/nat.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNatInfo = exports.getPublicIps = exports.upnpClient = exports.defaultBaseUrl = void 0;
 const valtio_1 = require("valtio");
-const nat_upnp_rejetto_1 = require("nat-upnp-rejetto");
+const nat_upnp_1 = require("@rejetto/nat-upnp");
 const debounceAsync_1 = require("./debounceAsync");
 const cross_1 = require("./cross");
 const github_1 = require("./github");
@@ -30,7 +30,7 @@ exports.defaultBaseUrl = (0, valtio_1.proxy)({
         return `${this.proto}://${(0, cross_1.ipForUrl)(ip || 'localhost')}${!port || port === defPort ? '' : ':' + port}`;
     }
 });
-exports.upnpClient = new nat_upnp_rejetto_1.Client({ timeout: 4_000 });
+exports.upnpClient = new nat_upnp_1.Client({ timeout: 4_000 });
 const originalMethod = exports.upnpClient.getGateway;
 // other client methods call getGateway too, so this will ensure they reuse this same result
 exports.upnpClient.getGateway = (0, debounceAsync_1.debounceAsync)(() => originalMethod.apply(exports.upnpClient), { retain: cross_1.HOUR, retainFailure: 30_000 });

package/src/update.js

@@ -181,7 +181,18 @@ async function update(tagOrUrl = '') {
             catch { }
             (0, fs_1.renameSync)(bin, oldBin);
             if (!preserveTerminal) {
-                (0, fs_1.renameSync)(newBin, (0, path_1.join)(binPath, binFile));
+                try {
+                    renameSyncWithBusyRetry(newBin, (0, path_1.join)(binPath, binFile));
+                }
+                catch (e) {
+                    try {
+                        (0, fs_1.renameSync)(oldBin, bin);
+                    } // restore the service target because hfs.exe was already moved aside
+                    catch (rollbackError) {
+                        console.error("Couldn't restore original binary after failed update", rollbackError);
+                    }
+                    throw e;
+                }
                 console.log("Updated binary in place, exiting for process supervisor to restart");
                 return;
             }
@@ -197,6 +208,19 @@ async function update(tagOrUrl = '') {
         throw e?.message || String(e);
     }
 }
+function renameSyncWithBusyRetry(src, dest) {
+    const sleepSyncBuffer = new Int32Array(new SharedArrayBuffer(4));
+    for (let retry = 0;; retry++) {
+        try {
+            return (0, fs_1.renameSync)(src, dest);
+        }
+        catch (e) {
+            if (e?.code !== 'EBUSY' || retry >= 20)
+                throw e;
+            Atomics.wait(sleepSyncBuffer, 0, 0, 500);
+        }
+    }
+}
 if (argv_1.argv.updating) { // we were launched with a temporary name, restore original name to avoid breaking references
     const bin = process.execPath;
     const dest = (0, path_1.join)((0, path_1.dirname)(bin), argv_1.argv.updating);

package/src/util-files.js

@@ -27,7 +27,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const const_1 = require("./const");
-const events_1 = require("events");
+const promises_2 = require("stream/promises");
 const stat_1 = require("./stat");
 // @ts-ignore
 const unzip_stream_1 = __importDefault(require("unzip-stream"));
@@ -115,7 +115,7 @@ async function unzip(stream, cb) {
             return entry.autodrain();
         console.debug('Unzip', dest);
         const thisFile = entry.pipe(await createSafeWriteStream(dest));
-        await (0, events_1.once)(thisFile, 'finish');
+        await (0, promises_2.finished)(thisFile);
     })));
 }
 async function ensureParentFolder(path, dirnameIt = true) {

package/src/vfs.js

@@ -162,12 +162,13 @@ async function getNodeByName(name, parent, assumeMissingToBeFolder = false) {
         return ret;
     }
 }
-const smartUncFolderDetection = (0, config_1.defineConfig)('smart_unc_folder_detection', true);
+const smartUncFolderDetection = (0, config_1.defineConfig)('smart_unc_folder_detection', false);
 async function setIsFolder(node) {
     if (!node.source)
         return;
-    const isFolder = smartUncFolderDetection.get() && (0, misc_1.getUncHost)(node.source) ? !(0, path_1.basename)(node.source).includes('.') // no dot = folder – not very reliable but fast for unreachable unc hosts, and you can opt-out
-        : /[\\/]$/.test(node.source) || await nodeStats(node).then(x => x?.isDirectory(), () => undefined);
+    const isFolder = /[\\/]$/.test(node.source)
+        || smartUncFolderDetection.get() && (0, misc_1.getUncHost)(node.source) && !(0, path_1.basename)(node.source).includes('.') // no dot = folder; not very reliable but fast for unreachable unc hosts, and it's an opt-in
+        || await nodeStats(node).then(x => x?.isDirectory(), () => undefined);
     (0, misc_1.setHidden)(node, { isFolder });
     return isFolder;
 }

package/src/webdav.js

@@ -75,9 +75,12 @@ const webdav = async (ctx, next) => {
     const ua = ctx.get('user-agent');
     if (path.includes('/._') && ua?.startsWith('WebDAVFS')) { // too much spam from Finder for these files that can contain metas
         ctx.state.dontLog = true;
+        ctx.state.webdavDetected = true;
         return ctx.status = cross_1.HTTP_FORBIDDEN;
     }
     const isWebdavAuthRequest = WEBDAV_METHODS.has(ctx.method) || WEBDAV_HINT_HEADERS.some(h => ctx.get(h));
+    if (isWebdavAuthRequest)
+        ctx.state.webdavDetected = true;
     if (isWebdavAuthRequest && ua && (0, auth_1.getCurrentUsername)(ctx))
         webdavDetectedAgents.try(webdavAgentKey(ctx, ua), () => true);
     if (ctx.method === 'OPTIONS') {