hfs 3.1.1 → 3.1.2

package/src/first.js

@@ -1,31 +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 => {
-        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);
-        }
-    })).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/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') {