hfs 3.3.0-rc8 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "3.3.0-rc8",
+  "version": "3.3.1",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -10,7 +10,7 @@
   "license": "GPL-3.0",
   "author": "Massimo Melina <a@rejetto.com>",
   "scripts": {
-    "watch-server": "cross-env DEV=1 nodemon --ignore tests/ --watch src -e ts,tsx --exec tsx src",
+    "watch-server": "cross-env DEV=1 nodemon --ignore tests/ --watch src -e ts,tsx,json --exec tsx src",
     "watch-server-proxied": "cross-env FRONTEND_PROXY=3005 ADMIN_PROXY=3006 npm run watch-server",
     "watch-server-full": "npm run start --workspace=frontend & npm run start --workspace=admin & cross-env FRONTEND_PROXY=3005 ADMIN_PROXY=3006 npm run watch-server",
     "start-frontend": "npm run start --workspace=frontend",
@@ -21,7 +21,7 @@
     "build-admin": "npm run build --workspace=admin",
     "prepare-test": "mkdir -p tests/work tests/tmp && cp tests/config.yaml tests/work/config.yaml && cp tests/alfa.txt tests/tmp/alfa.txt",
     "server-for-test": "npm run prepare-test && node dist/src --cwd tests/work --config tests/work/config.yaml --debug",
-    "server-for-test-dev": "npm run prepare-test && cross-env DEV=1 FRONTEND_PROXY=3005 ADMIN_PROXY=3006 nodemon --ignore tests/ --watch src -e ts,tsx --exec tsx src -- --cwd tests/work --config tests",
+    "server-for-test-dev": "npm run prepare-test && cross-env DEV=1 FRONTEND_PROXY=3005 ADMIN_PROXY=3006 nodemon --ignore tests/ --watch src -e ts,tsx,json --exec tsx src -- --cwd tests/work --config tests",
     "test": "sh -c 'npm run port-is-free >/dev/null && { echo \"no server\"; exit 1; }; node --import tsx --test \"$@\" tests/test.ts' --",
     "test-with-server": "sh -c 'npm run port-is-free && tsc && rm -rf tests/work tests/tmp && npm run prepare-test && (node dist/src --cwd tests/work --config tests/work/config.yaml & 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))\" --",

package/src/config.js

@@ -139,7 +139,7 @@ async function setConfig(newCfg, save) {
     const version = lodash_1.default.isString(newCfg.version) ? new Version(newCfg.version) : undefined;
     const considerEnvs = !process.env['HFS_ENV_BOOTSTRAP'] || !started && lodash_1.default.isEmpty(newCfg);
     // first time we consider also CLI args
-    const argCfg = !started && lodash_1.default.pickBy((0, cross_1.newObj)(configProps, (_x, k) => (0, cross_1.tryJson)(k in argv_1.argv ? argv_1.argv[k] : considerEnvs ? process.env['HFS_' + k.toUpperCase().replaceAll('-', '_')] : '', lodash_1.default.identity)), x => x !== undefined);
+    const argCfg = !started && lodash_1.default.pickBy((0, cross_1.newObj)(configProps, (_x, k) => (0, cross_1.tryJson)(k in argv_1.argv ? argv_1.argv[k] : considerEnvs ? process.env['HFS_' + k.toUpperCase().replaceAll('-', '_')] : undefined, lodash_1.default.identity)), x => x !== undefined);
     if (!lodash_1.default.isEmpty(argCfg)) {
         (0, exports.saveConfigAsap)(); // don't set `save` argument, as it would interfere below, at check `save===false`
         Object.assign(newCfg, argCfg);

package/src/perm.js

@@ -65,8 +65,13 @@ createAdminConfig.sub(v => {
     if (!v)
         return;
     createAdminConfig.set('');
-    // we can't createAdmin right away, as its changes will be lost after return, when our caller (setConfig) applies undefined properties. setTimeout is good enough, as the process is sync.
-    setTimeout(() => createAdmin(v));
+    // creating admin inside this subscriber can lose the account when setConfig later applies accounts or its default
+    // configReady waits for the full async startup; a timer alone cannot guarantee that defaults have been applied
+    // the timer keeps creation deferred on reloads, when configReady is already resolved, but does not await async reloads
+    setTimeout(async () => {
+        await config_1.configReady;
+        await createAdmin(v);
+    });
 });
 async function createAdmin(password, username = 'admin') {
     const acc = await addAccount(username, { admin: true, password }, true);

package/src/webdav.js

@@ -36,7 +36,7 @@ const WEBDAV_HINT_HEADERS = ['depth', 'destination', 'overwrite', 'translate', '
 const KNOWN_UA = /webdav|miniredir|davclnt|microsoft office|ms-office/i;
 const LOCK_DEFAULT_SECONDS = 3600;
 const LOCK_MAX_SECONDS = cross_1.DAY / 1000;
-const xmlParser = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false, removeNSPrefix: true, trimValues: true });
+const xmlParser = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false, removeNSPrefix: true, trimValues: true, parseTagValue: false }); // don't parse values, to preserve leading zeros so Windows file attributes are recognized as hexadecimal
 const PROPPATCH_PROTECTED_LIVE_PROPS = new Set([
     'creationdate', 'displayname', 'getcontentlanguage', 'getcontentlength', 'getcontenttype',
     'getetag', 'getlastmodified', 'lockdiscovery', 'resourcetype', 'supportedlock',