hfs 0.55.4 → 0.56.0-alpha2

package/src/log.js

@@ -56,7 +56,7 @@ class Logger {
             return this.stream = undefined;
         try {
             const stats = await (0, promises_1.stat)(path);
-            this.last = stats.mtime || stats.ctime;
+            this.last = stats.mtime || stats.birthtime;
         }
         catch (_b) {
             if (await (0, util_files_1.prepareFolder)(path) === false)

package/src/middlewares.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionMiddleware = exports.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.cloudflareDetected = exports.headRequests = exports.gzipper = exports.sessionDuration = void 0;
+exports.sessionMiddleware = exports.paramsDecoder = exports.failAllowNet = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.cloudflareDetected = exports.headRequests = exports.gzipper = exports.sessionDuration = void 0;
 const koa_compress_1 = __importDefault(require("koa-compress"));
 const const_1 = require("./const");
 const misc_1 = require("./misc");
@@ -106,7 +106,7 @@ const prepareState = async (ctx, next) => {
     // calculate these once and for all
     ctx.state.connection = (0, connections_1.socket2connection)(ctx.socket);
     const a = ctx.state.account = await urlLogin() || await getHttpAccount() || (0, perm_1.getAccount)((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username, false);
-    if (a && !(0, perm_1.accountCanLogin)(a))
+    if (a && (!(0, perm_1.accountCanLogin)(a) || failAllowNet(ctx, a))) // enforce allow_net also after login
         ctx.state.account = undefined;
     ctx.state.revProxyPath = ctx.get('x-forwarded-prefix');
     (0, connections_1.updateConnectionForCtx)(ctx);
@@ -147,6 +147,15 @@ const prepareState = async (ctx, next) => {
     }
 };
 exports.prepareState = prepareState;
+function failAllowNet(ctx, a) {
+    var _a, _b;
+    const cached = (_a = ctx.session) === null || _a === void 0 ? void 0 : _a.allowNet; // won't reflect changes until session is terminated
+    const mask = cached !== null && cached !== void 0 ? cached : (0, perm_1.getFromAccount)(a || '', a => a.allow_net);
+    if (!cached && mask && ((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username))
+        ctx.session.allowNet = mask; // must be deleted on logout by setLoggedIn
+    return mask && !(0, misc_1.netMatches)(ctx.ip, mask, true);
+}
+exports.failAllowNet = failAllowNet;
 const paramsDecoder = async (ctx, next) => {
     ctx.state.params = ctx.method === 'POST' && ctx.originalUrl.startsWith(const_1.API_URI)
         && ((0, misc_1.tryJson)(await (0, misc_1.stream2string)(ctx.req)) || {});

package/src/misc.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteNode = exports.createStreamLimiter = exports.apiAssertTypes = exports.AsapStream = exports.asyncGeneratorToReadable = exports.same = exports.makeNetMatcher = exports.isLocalHost = exports.pattern2filter = void 0;
+exports.deleteNode = exports.createStreamLimiter = exports.apiAssertTypes = exports.AsapStream = exports.asyncGeneratorToReadable = exports.same = exports.makeNetMatcher = exports.netMatches = exports.isLocalHost = exports.pattern2filter = void 0;
 const path_1 = require("path");
 const assert_1 = __importDefault(require("assert"));
 __exportStar(require("./util-http"), exports);
@@ -36,6 +36,7 @@ const vfs_1 = require("./vfs");
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
 const comments_1 = require("./comments");
+const lodash_1 = __importDefault(require("lodash"));
 function pattern2filter(pattern) {
     const matcher = (0, cross_1.makeMatcher)(pattern.includes('*') ? pattern // if you specify *, we'll respect its position
         : pattern.split('|').map(x => `*${x}*`).join('|'));
@@ -47,6 +48,11 @@ function isLocalHost(c) {
     return ip && (0, cross_1.isIpLocalHost)(ip);
 }
 exports.isLocalHost = isLocalHost;
+// this will memory-leak over mask, so be careful with what you use this
+function netMatches(ip, mask, emptyMaskReturns = false) {
+    return lodash_1.default.memoize(makeNetMatcher, (a, b) => `${a}\t${b ? 1 : 0}`)(mask, emptyMaskReturns)(ip); // cache the matcher
+}
+exports.netMatches = netMatches;
 function makeNetMatcher(mask, emptyMaskReturns = false) {
     var _a;
     if (!mask)

package/src/nat.js

@@ -92,7 +92,7 @@ exports.getNatInfo = (0, debounceAsync_1.debounceAsync)(async () => {
         externalPort,
         proto: ((_c = status === null || status === void 0 ? void 0 : status.https) === null || _c === void 0 ? void 0 : _c.listening) ? 'https' : ((_d = status === null || status === void 0 ? void 0 : status.http) === null || _d === void 0 ? void 0 : _d.listening) ? 'http' : '',
     };
-});
+}, { reuseRunning: true });
 (0, exports.getNatInfo)();
 function findGateway() {
     return new Promise((resolve, reject) => (0, child_process_1.exec)(const_1.IS_WINDOWS || const_1.IS_MAC ? 'netstat -rn' : 'route -n', (err, out) => {

package/src/outboundProxy.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("./config");
+const node_url_1 = require("node:url");
+const util_http_1 = require("./util-http");
+const util_os_1 = require("./util-os");
+const events_1 = __importDefault(require("./events"));
+const const_1 = require("./const");
+const cross_1 = require("./cross");
+// don't move this in util-http, where it would mostly belong, as a require to config.ts would prevent tests using util-http
+const outboundProxy = (0, config_1.defineConfig)('outbound_proxy', '', v => {
+    try {
+        (0, node_url_1.parse)(v);
+        util_http_1.httpStream.defaultProxy = v;
+    }
+    catch (_a) {
+        console.warn("invalid URL", v);
+        return '';
+    }
+});
+events_1.default.once('configReady', async (startedWithoutConfig) => {
+    var _a, _b, _c, _d;
+    if (!const_1.IS_WINDOWS || !startedWithoutConfig)
+        return;
+    // try to read Windows system setting for proxy
+    const out = await (0, util_os_1.reg)('query', 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings');
+    if (!((_a = /ProxyEnable.+(\d)/.exec(out)) === null || _a === void 0 ? void 0 : _a[1]))
+        return;
+    const read = (_b = /ProxyServer.+?([\d:.]+)/.exec(out)) === null || _b === void 0 ? void 0 : _b[1];
+    if (!read)
+        return;
+    // it can be like "IP:PORT" or "http=IP:PORT;https=IP:PORT;ftp=IP:PORT"
+    const url = (0, cross_1.prefix)('https://', (_c = /https=([\d:.]+)/.exec(out)) === null || _c === void 0 ? void 0 : _c[1]) // prefer https
+        || (0, cross_1.prefix)('http://', (_d = /http=([\d:.]+)/.exec(out)) === null || _d === void 0 ? void 0 : _d[1])
+        || !read.includes('=') && 'http://' + read; // simpler form
+    if (!url)
+        return;
+    outboundProxy.set(url);
+    console.log("detected proxy", read);
+});

package/src/plugins.js

@@ -52,6 +52,7 @@ const lang_1 = require("./lang");
 const i18n_1 = require("./i18n");
 const perm_1 = require("./perm");
 const auth_1 = require("./auth");
+const icons_1 = require("./icons");
 exports.PATH = 'plugins';
 exports.DISABLING_SUFFIX = '-disabled';
 exports.STORAGE_FOLDER = 'storage';
@@ -110,9 +111,8 @@ function setPluginConfig(id, changes) {
 }
 exports.setPluginConfig = setPluginConfig;
 function getPluginInfo(id) {
-    var _a;
-    const running = (_a = plugins.get(id)) === null || _a === void 0 ? void 0 : _a.getData();
-    return running && Object.assign(running, { id }) || availablePlugins[id];
+    const running = plugins.get(id);
+    return running && { ...running.getData(), ...running } || availablePlugins[id];
 }
 exports.getPluginInfo = getPluginInfo;
 function findPluginByRepo(repo) {
@@ -139,6 +139,7 @@ async function initPlugin(pl, morePassedToInit) {
         getConnections: connections_1.getConnections,
         events: events_1.default,
         log: console.log,
+        setError(msg) { setError((morePassedToInit === null || morePassedToInit === void 0 ? void 0 : morePassedToInit.id) || 'server_code', msg); },
         getHfsConfig: config_1.getConfig,
         customApiCall,
         notifyClient: frontEndApis_1.notifyClient,
@@ -148,7 +149,9 @@ async function initPlugin(pl, morePassedToInit) {
         getCurrentUsername: auth_1.getCurrentUsername,
         ...morePassedToInit
     }));
-    return Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
+    Object.assign(pl, typeof res === 'function' ? { unload: res } : res);
+    events_1.default.emit('pluginInitialized', pl);
+    return pl;
 }
 const already = new Set();
 function warnOnce(msg) {
@@ -208,12 +211,12 @@ const pluginsMiddleware = async (ctx, next) => {
         catch (e) {
             printError(id, e);
         }
+    function printError(id, e) {
+        console.log(`error middleware plugin ${id}: ${(e === null || e === void 0 ? void 0 : e.message) || e}`);
+        console.debug(e);
+    }
 };
 exports.pluginsMiddleware = pluginsMiddleware;
-function printError(id, e) {
-    console.log(`error middleware plugin ${id}: ${(e === null || e === void 0 ? void 0 : e.message) || e}`);
-    console.debug(e);
-}
 events_1.default.once('app', () => Object.assign(index_1.app.context, {
     isStopped: false,
     stop() { return this.isStopped = true; }
@@ -280,7 +283,7 @@ class Plugin {
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.onDirEntry;
     }
     getData() {
-        return { ...this.data };
+        return this.data;
     }
     async unload(reloading = false) {
         var _a, _b;
@@ -425,9 +428,8 @@ function watchPlugin(id, path) {
     };
     async function onUninstalled() {
         await stop();
-        const was = getPluginInfo(id);
-        if (!was)
-            return;
+        if (!getPluginInfo(id))
+            return; // already missing
         delete availablePlugins[id];
         events_1.default.emit('pluginUninstalled', id);
     }
@@ -474,6 +476,7 @@ function watchPlugin(id, path) {
             await (0, promises_1.mkdir)(storageDir, { recursive: true });
             const dbs = [];
             await initPlugin(pluginData, {
+                id,
                 srcDir: __dirname,
                 storageDir,
                 async openDb(filename, options) {
@@ -516,7 +519,9 @@ function watchPlugin(id, path) {
             const folder = (0, path_1.dirname)(module);
             const { sections, unwatch } = (0, customHtml_1.watchLoadCustomHtml)(folder);
             pluginData.getCustomHtml = () => Object.assign(Object.fromEntries(sections), (0, misc_1.callable)(pluginData.customHtml) || {});
+            const unwatchIcons = (0, icons_1.watchIconsFolder)(folder, v => plugin.icons = v);
             const plugin = new Plugin(id, folder, pluginData, async () => {
+                unwatchIcons();
                 unwatch();
                 await Promise.allSettled(dbs.map(x => x.close()));
                 dbs.length = 0;
@@ -536,7 +541,6 @@ function watchPlugin(id, path) {
             const parsed = (_a = e.stack) === null || _a === void 0 ? void 0 : _a.split('\n\n'); // this form is used by syntax-errors inside the plugin, which is useful to show
             const where = (parsed === null || parsed === void 0 ? void 0 : parsed.length) > 1 ? `\n${parsed[0]}` : '';
             e = e.message + where || String(e);
-            console.log(`plugin error: ${id}:`, e);
             setError(id, e);
         }
         finally {
@@ -552,12 +556,19 @@ function getError(id) {
     var _a;
     return (_a = getPluginInfo(id)) === null || _a === void 0 ? void 0 : _a.error;
 }
+// returns true if there's an error, and it has changed
 function setError(id, error) {
     const info = getPluginInfo(id);
     if (!info)
         return;
+    if (info.error === error)
+        return;
     info.error = error;
-    events_1.default.emit('pluginUpdated', { id, error });
+    events_1.default.emit('pluginUpdated', info);
+    if (!error)
+        return;
+    console.log(`plugin error: ${id}:`, error);
+    return true;
 }
 function deleteModule(id) {
     var _a;

package/src/serveGuiAndSharedFiles.js

@@ -21,11 +21,14 @@ const koa_mount_1 = __importDefault(require("koa-mount"));
 const listen_1 = require("./listen");
 const misc_1 = require("./misc");
 const basicWeb_1 = require("./basicWeb");
+const icons_1 = require("./icons");
+const plugins_1 = require("./plugins");
 const serveFrontendFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.FRONTEND_PROXY, cross_const_1.FRONTEND_URI);
 const serveFrontendPrefixed = (0, koa_mount_1.default)(cross_const_1.FRONTEND_URI.slice(0, -1), serveFrontendFiles);
 const serveAdminFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.ADMIN_PROXY, cross_const_1.ADMIN_URI);
 const serveAdminPrefixed = (0, koa_mount_1.default)(cross_const_1.ADMIN_URI.slice(0, -1), serveAdminFiles);
 const serveGuiAndSharedFiles = async (ctx, next) => {
+    var _a;
     const { path } = ctx;
     // dynamic import on frontend|admin (used for non-https login) while developing (vite4) is not producing a relative path
     if (const_1.DEV && path.startsWith('/node_modules/')) {
@@ -40,6 +43,18 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
     if (path.startsWith(cross_const_1.ADMIN_URI))
         return (0, adminApis_1.allowAdmin)(ctx) ? serveAdminPrefixed(ctx, next)
             : (0, errorPages_1.sendErrorPage)(ctx, cross_const_1.HTTP_FORBIDDEN);
+    if (path.startsWith(cross_const_1.ICONS_URI)) {
+        const a = path.substring(cross_const_1.ICONS_URI.length).split('/');
+        const iconName = a.at(-1);
+        if (!iconName)
+            return;
+        const plugin = a.length > 1 && (0, plugins_1.getPluginInfo)(a[0]); // an extra level in the path indicates a plugin
+        const file = plugin ? (_a = plugin.icons) === null || _a === void 0 ? void 0 : _a[iconName] : icons_1.customizedIcons === null || icons_1.customizedIcons === void 0 ? void 0 : icons_1.customizedIcons[iconName];
+        if (!file)
+            return;
+        ctx.state.considerAsGui = true;
+        return (0, serveFile_1.serveFile)(ctx, (0, path_1.join)((plugin === null || plugin === void 0 ? void 0 : plugin.folder) || '', icons_1.ICONS_FOLDER, file), const_1.MIME_AUTO);
+    }
     if (ctx.method === 'PUT') { // curl -T file url/
         const decPath = decodeURIComponent(path);
         let rest = (0, path_1.basename)(decPath);

package/src/serveGuiFiles.js

@@ -19,6 +19,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("./config");
 const lang_1 = require("./lang");
 const upload_1 = require("./upload");
+const icons_1 = require("./icons");
 const size1024 = (0, config_1.defineConfig)(misc_1.CFG.size_1024, false, x => misc_1.formatBytes.k = x ? 1024 : 1000); // we both configure formatBytes, and also provide a compiled version (number instead of boolean)
 const splitUploads = (0, config_1.defineConfig)(misc_1.CFG.split_uploads, 0);
 exports.logGui = (0, config_1.defineConfig)(misc_1.CFG.log_gui, false);
@@ -107,6 +108,7 @@ async function treatIndex(ctx, filesUri, body) {
                 forceTheme: (0, plugins_1.mapPlugins)(p => lodash_1.default.isString(p.isTheme) ? p.isTheme : undefined).find(Boolean),
                 customHtml: lodash_1.default.omit((0, customHtml_1.getAllSections)(), ['top', 'bottom', 'htmlHead', 'style']),
                 ...(0, misc_1.newObj)(misc_1.FRONTEND_OPTIONS, (v, k) => (0, config_1.getConfig)(k)),
+                icons: Object.assign({}, ...(0, plugins_1.mapPlugins)(p => iconsToObj(p.icons, p.id + '/')), iconsToObj(icons_1.customizedIcons)),
                 lang
             }, null, 4).replace(/<(\/script)/g, '<"+"$1') /*avoid breaking our script container*/}
                     document.documentElement.setAttribute('ver', HFS.VERSION.split('-')[0])
@@ -116,6 +118,9 @@ async function treatIndex(ctx, filesUri, body) {
                         <link rel="shortcut icon" href="/favicon.ico?${timestamp}" />
                     ${(0, customHtml_1.getSection)('htmlHead')}`}
                 `;
+        function iconsToObj(icons, pre = '') {
+            return icons && (0, misc_1.objSameKeys)(icons, (v, k) => const_1.ICONS_URI + pre + k);
+        }
         if (isBody && isOpen)
             return `${all}
                     ${isFrontend && (0, customHtml_1.getSection)('top')}

package/src/update.js

@@ -93,7 +93,7 @@ function localUpdateAvailable() {
 }
 exports.localUpdateAvailable = localUpdateAvailable;
 async function updateSupported() {
-    return argv_1.argv.forceupdate || const_1.IS_BINARY && !await util_os_1.RUNNING_AS_SERVICE;
+    return process.env.DISABLE_UPDATE ? false : (argv_1.argv.forceupdate || const_1.IS_BINARY && !await util_os_1.RUNNING_AS_SERVICE);
 }
 exports.updateSupported = updateSupported;
 async function update(tagOrUrl = '') {

package/src/upload.js

@@ -20,10 +20,21 @@ const lodash_1 = __importDefault(require("lodash"));
 const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
 const expiringCache_1 = require("./expiringCache");
+const first_1 = require("./first");
 exports.deleteUnfinishedUploadsAfter = (0, config_1.defineConfig)('delete_unfinished_uploads_after', 86400);
 exports.minAvailableMb = (0, config_1.defineConfig)('min_available_mb', 100);
 exports.dontOverwriteUploading = (0, config_1.defineConfig)('dont_overwrite_uploading', true);
 const waitingToBeDeleted = {};
+(0, first_1.onProcessExit)(() => {
+    if (!Object.keys(waitingToBeDeleted).length)
+        return;
+    console.log("removing unfinished uploads");
+    for (const path in waitingToBeDeleted)
+        try {
+            fs_1.default.rmSync(path, { force: true });
+        }
+        catch (_a) { }
+});
 const ATTR_UPLOADER = 'uploader';
 function getUploadMeta(path) {
     return (0, misc_1.loadFileAttr)(path, ATTR_UPLOADER);
@@ -148,7 +159,7 @@ function uploadWriter(base, baseUri, path, ctx) {
         writeStream.once('close', async () => {
             try {
                 await new Promise(res => fileStream.close(res)); // this only seem to be necessary on Windows
-                if (ctx.req.aborted) {
+                if (ctx.isAborted()) {
                     if (resumableTempName && !resumableLost && !resuming) // we don't want to be left with 2 temp files
                         return (0, promises_1.rm)(tempName);
                     const sec = exports.deleteUnfinishedUploadsAfter.get();

package/src/util-files.js

@@ -31,7 +31,7 @@ async function readFileBusy(path) {
     });
 }
 exports.readFileBusy = readFileBusy;
-function watchDir(dir, cb) {
+function watchDir(dir, cb, atStart = false) {
     let watcher;
     let paused = false;
     try {
@@ -56,6 +56,8 @@ function watchDir(dir, cb) {
             console.debug(String(e));
         }
     }
+    if (atStart)
+        controlledCb();
     return {
         working() { return Boolean(watcher); },
         stop() { watcher === null || watcher === void 0 ? void 0 : watcher.close(); },

package/src/util-http.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpStream = exports.httpWithBody = exports.httpString = exports.stream2string = void 0;
+const node_url_1 = require("node:url");
 const node_https_1 = __importDefault(require("node:https"));
 const node_http_1 = __importDefault(require("node:http"));
 const node_stream_1 = require("node:stream");
@@ -23,25 +24,31 @@ async function httpWithBody(url, options) {
     });
 }
 exports.httpWithBody = httpWithBody;
-function httpStream(url, { body, jar, noRedirect, httpThrow, ...options } = {}) {
+function httpStream(url, { body, jar, noRedirect, httpThrow, proxy, ...options } = {}) {
     return new Promise((resolve, reject) => {
-        var _a, _b, _c;
-        var _d, _e;
+        var _a, _b, _c, _d;
+        var _e, _f, _g;
+        proxy !== null && proxy !== void 0 ? proxy : (proxy = httpStream.defaultProxy);
         (_a = options.headers) !== null && _a !== void 0 ? _a : (options.headers = {});
         if (body) {
             options.method || (options.method = 'POST');
             if (lodash_1.default.isPlainObject(body)) {
-                (_b = (_d = options.headers)['content-type']) !== null && _b !== void 0 ? _b : (_d['content-type'] = 'application/json');
+                (_b = (_e = options.headers)['content-type']) !== null && _b !== void 0 ? _b : (_e['content-type'] = 'application/json');
                 body = JSON.stringify(body);
             }
             if (!(body instanceof node_stream_1.Readable))
-                (_c = (_e = options.headers)['content-length']) !== null && _c !== void 0 ? _c : (_e['content-length'] = Buffer.byteLength(body));
+                (_c = (_f = options.headers)['content-length']) !== null && _c !== void 0 ? _c : (_f['content-length'] = Buffer.byteLength(body));
         }
         if (jar)
             options.headers.cookie = lodash_1.default.map(jar, (v, k) => `${k}=${v}; `).join('')
                 + (options.headers.cookie || ''); // preserve parameter
-        const proto = url.startsWith('https:') ? node_https_1.default : node_http_1.default;
-        const req = proto.request(url, options, res => {
+        Object.assign(options, lodash_1.default.pick((0, node_url_1.parse)(proxy || url), ['hostname', 'port', 'path', 'protocol']));
+        if (proxy) {
+            options.path = url;
+            (_d = (_g = options.headers).host) !== null && _d !== void 0 ? _d : (_g.host = (0, node_url_1.parse)(url).host || undefined);
+        }
+        const proto = options.protocol === 'https:' ? node_https_1.default : node_http_1.default;
+        const req = proto.request(options, res => {
             var _a;
             var _b;
             console.debug("http responded", res.statusCode, "to", url);

package/src/util-os.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RUNNING_AS_SERVICE = exports.runCmd = exports.getDrives = exports.getDiskSpaces = exports.getDiskSpace = exports.cmdEscape = exports.bashEscape = exports.getDiskSpaceSync = void 0;
+exports.reg = exports.RUNNING_AS_SERVICE = exports.runCmd = exports.getDrives = exports.getDiskSpaces = exports.getDiskSpace = exports.cmdEscape = exports.bashEscape = exports.getDiskSpaceSync = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const child_process_1 = require("child_process");
@@ -93,3 +93,7 @@ exports.RUNNING_AS_SERVICE = const_1.IS_WINDOWS && getWindowsServicePids().then(
     console.log("couldn't determine if we are running as a service");
     console.debug(e);
 });
+function reg(...pars) {
+    return (0, util_1.promisify)(child_process_1.execFile)('reg', pars).then(x => x.stdout);
+}
+exports.reg = reg;

package/src/vfs.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parentMaskApplier = exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsLink = exports.hasDefaultFile = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.getNodeByName = exports.urlToNode = exports.applyParentToChild = exports.isSameFilenameAs = exports.permsFromParent = void 0;
+exports.parentMaskApplier = exports.masksCouldGivePermission = exports.walkNode = exports.statusCodeForMissingPerm = exports.hasPermission = exports.nodeIsLink = exports.hasDefaultFile = exports.nodeIsDirectory = exports.getNodeName = exports.saveVfs = exports.vfs = exports.getNodeByName = exports.nodeStats = exports.urlToNode = exports.applyParentToChild = exports.isSameFilenameAs = exports.permsFromParent = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
 const misc_1 = require("./misc");
@@ -112,6 +112,7 @@ async function nodeStats(ret) {
     (0, misc_1.setHidden)(ret, { stats });
     return stats;
 }
+exports.nodeStats = nodeStats;
 async function isHiddenFile(path) {
     return const_1.IS_WINDOWS ? new Promise(res => fswin_1.default.getAttributes(path, x => res(x === null || x === void 0 ? void 0 : x.IS_HIDDEN)))
         : path[0] === '.';
@@ -144,6 +145,14 @@ async function getNodeByName(name, parent) {
 exports.getNodeByName = getNodeByName;
 exports.vfs = {};
 (0, config_1.defineConfig)('vfs', {}).sub(data => exports.vfs = (function recur(node) {
+    const { masks } = node;
+    lodash_1.default.each(masks, (v, mask) => {
+        if (v.maskOnly) {
+            masks[`${mask}|${v.maskOnly}|`] = v = lodash_1.default.omit(v, 'maskOnly');
+            delete masks[mask];
+        }
+        recur(v);
+    });
     if (node.children)
         for (const c of node.children)
             recur(c);
@@ -273,9 +282,9 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
     try {
         let lastDir = prefixPath.slice(0, -1) || '.';
         parentsCache.set(lastDir, parent);
-        for await (const entry of (0, misc_1.dirStream)(source, { depth, onlyFolders, onlyFiles, hidden: showHiddenFiles.get() })) {
-            if (ctx === null || ctx === void 0 ? void 0 : ctx.req.aborted)
-                return;
+        for await (const entry of (0, misc_1.dirStream)(source, { depth, onlyFolders, hidden: showHiddenFiles.get() })) {
+            if (ctx === null || ctx === void 0 ? void 0 : ctx.isAborted())
+                break;
             const { path } = entry;
             const isFolder = entry.isDirectory();
             const name = prefixPath + (((_a = parent.rename) === null || _a === void 0 ? void 0 : _a[path]) || path);
@@ -294,7 +303,7 @@ async function* walkNode(parent, { ctx, depth = Infinity, prefixPath = '', requi
             };
             if (isFolder) // store it even if we can't see it (masks), as its children can be produced by dirStream
                 parentsCache.set(name, item);
-            if (await canSee(item))
+            if (!(onlyFiles && isFolder) && await canSee(item))
                 yield item;
             (_b = entry.closingBranch) === null || _b === void 0 ? void 0 : _b.then(p => parentsCache.delete(p || '.'));
         }
@@ -320,11 +329,21 @@ function masksCouldGivePermission(masks, perm) {
 }
 exports.masksCouldGivePermission = masksCouldGivePermission;
 function parentMaskApplier(parent) {
-    const matchers = (0, misc_1.onlyTruthy)(lodash_1.default.map(parent.masks, (v, k) => {
+    const matchers = (0, misc_1.onlyTruthy)(lodash_1.default.map(parent.masks, (mods, k) => {
+        if (!mods)
+            return;
+        const mustBeFolder = (() => {
+            if (k.at(-1) !== '|')
+                return; // parse special flag syntax as suffix |FLAG| inside the key. This allows specifying different flags with the same mask using separate keys. To avoid syntax conflicts with the rest of the file-mask, we look for an ending pipe, as it has no practical use. Ending-pipe was preferred over starting-pipe to leave the rest of the logic (inheritMasks) untouched.
+            const i = k.lastIndexOf('|', k.length - 2);
+            if (i < 0)
+                return;
+            const type = k.slice(i + 1, -1);
+            k = k.slice(0, i); // remove
+            return type === 'folders';
+        })();
         k = k.startsWith('**/') ? k.slice(3) : !k.includes('/') ? k : ''; // ** globstar matches also zero subfolders, so this mask must be applied here too
-        const { maskOnly, ...mods } = v || {};
-        // k is stored into the object for debugging purposes
-        return k && { k, mods, matcher: (0, misc_1.makeMatcher)(k), mustBeFolder: maskOnly && (maskOnly === 'folders') };
+        return k && { mods, matcher: (0, misc_1.makeMatcher)(k), mustBeFolder };
     }));
     return async (item, virtualBasename = getNodeName(item)) => {
         let isFolder = undefined;

package/src/watchLoad.js

@@ -8,16 +8,17 @@ exports.watchLoad = void 0;
 const fs_1 = require("fs");
 const promises_1 = __importDefault(require("fs/promises"));
 const misc_1 = require("./misc");
+const debounceAsync_1 = require("./debounceAsync");
 const events_1 = require("./events");
 function watchLoad(path, parser, { failedOnFirstAttempt, immediateFirst } = {}) {
     let doing = false;
     let watcher;
-    const debounced = (0, misc_1.debounceAsync)(load, { wait: 500, maxWait: 1000 });
+    const debounced = (0, debounceAsync_1.debounceAsync)(load, { wait: 500, maxWait: 1000 });
     let retry;
     let last;
     const emitter = new events_1.BetterEventEmitter();
     install(true);
-    const save = (0, misc_1.debounceAsync)(async (data, { reparse = false } = {}) => {
+    const save = (0, debounceAsync_1.debounceAsync)(async (data, { reparse = false } = {}) => {
         await promises_1.default.writeFile(path, data, 'utf8');
         last = data;
         if (reparse)

package/src/zip.js

@@ -29,6 +29,8 @@ async function zipStreamFromFolder(node, ctx) {
     const walker = !list ? (0, vfs_1.walkNode)(node, { ctx, requiredPerm: 'can_archive' })
         : (async function* () {
             for await (const uri of list) {
+                if (ctx.isAborted())
+                    return;
                 const subNode = await (0, vfs_1.urlToNode)(uri, ctx, node);
                 if (!subNode)
                     continue;
@@ -51,7 +53,7 @@ async function zipStreamFromFolder(node, ctx) {
             return; // the fact you see it doesn't mean you can get it
         const { source } = el;
         const name = (0, vfs_1.getNodeName)(el);
-        if (ctx.req.aborted || !filter(name))
+        if (!filter(name))
             return;
         try {
             if (el.isFolder)
@@ -64,7 +66,7 @@ async function zipStreamFromFolder(node, ctx) {
             return {
                 path: name,
                 size: st.size,
-                ts: st.mtime || st.ctime,
+                ts: st.mtime || st.birthtime,
                 mode: st.mode,
                 sourcePath: source,
                 getData: () => (0, fs_1.createReadStream)(source, { start: 0, end: Math.max(0, st.size - 1) })