hfs 0.52.0-alpha3 → 0.52.0-beta4

package/frontend/assets/{sha512-iUJsiv7j.js → sha512-I2H28VIm.js}

@@ -1,4 +1,4 @@
-import{g as OF,c as UF}from"./index-25y2vRgI.js";function gF(sF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
+import{g as OF,c as UF}from"./index-SY22o0dA.js";function gF(sF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
  * [js-sha512]{@link https://github.com/emn178/js-sha512}
  *
  * @version 0.8.0

package/frontend/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=0" />
     <link href="/fontello.css" rel="stylesheet" />
     <script src="//polyfill.io/v3/polyfill.min.js?features=es2022%2Ces2021%2Ces2020%2Ces2019%2Ces2018%2Ces2017"></script>
-    <script type="module" crossorigin src="/assets/index-25y2vRgI.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-9d6fXdcb.css">
+    <script type="module" crossorigin src="/assets/index-SY22o0dA.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Kys6yJtN.css">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.52.0-alpha3",
+  "version": "0.52.0-beta4",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/src/api.get_file_list.js

@@ -28,7 +28,7 @@ const get_file_list = async ({ uri = '/', offset, limit, search, c, onlyFolders,
         return fail(const_1.HTTP_METHOD_NOT_ALLOWED);
     offset = Number(offset);
     limit = Number(limit);
-    const filter = (0, misc_1.pattern2filter)(search);
+    const filter = (0, misc_1.pattern2filter)(String(search || ''));
     const walker = (0, vfs_1.walkNode)(node, { ctx: admin ? undefined : ctx, onlyFolders, depth: search ? Infinity : 0 });
     const onDirEntryHandlers = (0, plugins_1.mapPlugins)(plug => plug.onDirEntry);
     const can_upload = admin || (0, vfs_1.hasPermission)(node, 'can_upload', ctx);

package/src/api.log.js

@@ -8,11 +8,24 @@ const consoleLog_1 = require("./consoleLog");
 const cross_1 = require("./cross");
 const events_1 = __importDefault(require("./events"));
 const log_1 = require("./log");
-const fs_1 = require("fs");
-const readline_1 = __importDefault(require("readline"));
 const misc_1 = require("./misc");
 const SendList_1 = require("./SendList");
+const serveFile_1 = require("./serveFile");
 exports.default = {
+    async get_log_file({ file = 'log', range = '' }, ctx) {
+        const log = lodash_1.default.find(log_1.loggers, { name: file });
+        if (!log)
+            throw cross_1.HTTP_NOT_FOUND;
+        if (!log.path)
+            throw cross_1.HTTP_NOT_ACCEPTABLE;
+        ctx.attachment(log.path);
+        if (range)
+            ctx.request.header.range = `bytes=${range}`;
+        if (ctx.method === 'POST') // this would cause method_not_allowed
+            ctx.method = 'GET';
+        await (0, serveFile_1.serveFile)(ctx, log.path);
+        return null;
+    },
     get_log({ file = 'log' }, ctx) {
         return new SendList_1.SendListReadable({
             bufferTime: 10,
@@ -27,48 +40,15 @@ exports.default = {
                     events_1.default.on('console', x => list.add(x));
                     return;
                 }
-                const logger = log_1.loggers.find(l => l.name === file);
-                if (!logger)
+                if (!lodash_1.default.find(log_1.loggers, { name: file }))
                     return list.error(cross_1.HTTP_NOT_FOUND, true);
-                const input = (0, fs_1.createReadStream)(logger.path);
-                input.on('error', async (e) => {
-                    if (e.code === 'ENOENT') // ignore ENOENT, consider it an empty log
-                        return list.ready();
-                    list.error(e.code || e.message);
-                });
-                input.on('end', () => list.ready());
-                input.on('ready', () => {
-                    readline_1.default.createInterface({ input }).on('line', line => {
-                        if (ctx.aborted)
-                            return input.close();
-                        const obj = parse(line);
-                        if (obj)
-                            list.add(obj);
-                    }).on('close', () => {
-                        ctx.res.once('close', (0, misc_1.onOff)(events_1.default, {
-                            [logger.name](entry) {
-                                list.add(entry);
-                            }
-                        }));
-                    });
-                });
+                list.ready();
+                ctx.res.once('close', (0, misc_1.onOff)(events_1.default, {
+                    [file](entry) {
+                        list.add(entry);
+                    }
+                }));
             }
         });
-        function parse(line) {
-            const m = /^(.+?) (.+?) (.+?) \[(.{11}):(.{14})] "(\w+) ([^"]+) HTTP\/\d.\d" (\d+) (-|\d+) ?(.*)/.exec(line);
-            if (!m)
-                return;
-            const [, ip, , user, date, time, method, uri, status, length, extra] = m;
-            return {
-                ip,
-                user: user === '-' ? undefined : user,
-                ts: new Date(date + ' ' + time),
-                method,
-                uri,
-                status: Number(status),
-                length: length === '-' ? undefined : Number(length),
-                extra: (0, cross_1.tryJson)((0, cross_1.tryJson)(extra)) || undefined,
-            };
-        }
     },
 };

package/src/apiMiddleware.js

@@ -44,11 +44,15 @@ function apiMiddleware(apis) {
                         else if (typeof (v === null || v === void 0 ? void 0 : v[0]) === 'string')
                             v.forEach((x, i) => fixUri(v, i));
             res = await apiFun(params, ctx);
+            if (res === null)
+                return;
             function fixUri(obj, k) {
                 obj[k] = (0, misc_1.removeStarting)(ctx.state.revProxyPath, obj[k]);
             }
         }
         catch (e) {
+            if (typeof e === 'number')
+                e = new ApiError(const_1.HTTP_NOT_FOUND);
             res = e;
         }
         if (isAsyncGenerator(res))

package/src/const.js

@@ -45,7 +45,7 @@ exports.DEV = process.env.DEV || exports.argv.dev ? 'DEV' : '';
 exports.ORIGINAL_CWD = process.cwd();
 exports.HFS_STARTED = new Date();
 const PKG_PATH = (0, path_1.join)(__dirname, '..', 'package.json');
-exports.BUILD_TIMESTAMP = "2024-02-04T18:56:19.667Z";
+exports.BUILD_TIMESTAMP = "2024-02-11T10:59:36.071Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/cross.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = exports.waitFor = exports.newObj = exports.findDefined = exports.isOrderedEqual = exports.swap = exports.tryJson = exports.dirname = exports.basename = exports.pendingPromise = exports._dbg = exports._log = exports.wantArray = exports.formatPerc = exports.with_ = exports.try_ = exports.setHidden = exports.onlyTruthy = exports.truthy = exports.splitAt = exports.strinsert = exports.removeStarting = exports.enforceFinal = exports.objSameKeys = exports.haveTimeout = exports.wait = exports.prefix = exports.formatSpeed = exports.formatBytes = exports.isWhoObject = exports.PERM_KEYS = exports.defaultPerms = exports.WHO_ANY_ACCOUNT = exports.WHO_NO_ONE = exports.WHO_ANYONE = exports.LIST = exports.CFG = exports.THEME_OPTIONS = exports.SORT_BY_OPTIONS = exports.FRONTEND_OPTIONS = exports.MAX_TILE_SIZE = exports.DAY = exports.HOUR = exports.MINUTE = exports.WIKI_URL = exports.REPO_URL = void 0;
-exports.shortenAgent = exports.replace = exports.matches = exports.makeMatcher = exports.runAt = exports.pathEncode = exports.promiseBestEffort = exports.escapeHTML = exports.ipForUrl = exports.isIpLan = exports.isIpLocalHost = exports.xlate = exports.isEqualLax = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = void 0;
+exports.shortenAgent = exports.inCommon = exports.replace = exports.matches = exports.makeMatcher = exports.runAt = exports.pathEncode = exports.promiseBestEffort = exports.escapeHTML = exports.ipForUrl = exports.isIpLan = exports.isIpLocalHost = exports.xlate = exports.isEqualLax = exports.isWindowsDrive = exports.isIP = exports.isPrimitive = exports.formatTimestamp = exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = void 0;
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 // all content here is shared between client and server
 const lodash_1 = __importDefault(require("lodash"));
@@ -405,6 +405,14 @@ function replace(s, symbols, delimiter = '') {
     return s;
 }
 exports.replace = replace;
+function inCommon(a, b) {
+    let i = 0;
+    const n = a.length;
+    while (i < n && a[i] === b[i])
+        i++;
+    return i;
+}
+exports.inCommon = inCommon;
 function shortenAgent(agent) {
     var _a;
     return lodash_1.default.findKey(BROWSERS, re => re.test(agent))

package/src/errorPages.js

@@ -10,7 +10,7 @@ function getErrorSections() {
 }
 exports.getErrorSections = getErrorSections;
 // to be used with errors whose recipient is possibly human
-async function sendErrorPage(ctx, code) {
+async function sendErrorPage(ctx, code = ctx.status) {
     var _a, _b;
     ctx.type = 'text';
     ctx.set('content-disposition', ''); // reset ctx.attachment
@@ -23,7 +23,7 @@ async function sendErrorPage(ctx, code) {
         return;
     const trans = (_a = Object.values(lang)[0]) === null || _a === void 0 ? void 0 : _a.translate;
     ctx.body = (_b = trans === null || trans === void 0 ? void 0 : trans[msg]) !== null && _b !== void 0 ? _b : msg;
-    const errorPage = (0, customHtml_1.getSection)(String(ctx.status));
+    const errorPage = (0, customHtml_1.getSection)(ctx.status === cross_1.HTTP_UNAUTHORIZED ? 'unauthorized' : String(ctx.status));
     if (!errorPage)
         return;
     if (errorPage.includes('<'))

package/src/frontEndApis.js

@@ -148,9 +148,15 @@ exports.frontEndApis = {
                 const srcNode = await (0, vfs_1.urlToNode)(src, ctx);
                 if (!srcNode)
                     return const_1.HTTP_NOT_FOUND;
+                const s = srcNode.source;
+                const d = (0, path_1.join)(destNode.source, (0, path_1.basename)(srcNode.source));
                 return (0, vfs_1.statusCodeForMissingPerm)(srcNode, 'can_delete', ctx)
-                    || (0, promises_1.rename)(srcNode.source, (0, path_1.join)(destNode.source, (0, path_1.basename)(srcNode.source)))
-                        .catch(e => e.code || String(e));
+                    || (0, promises_1.rename)(s, d).catch(async (e) => {
+                        if (e.code !== 'EXDEV')
+                            throw e; // exdev = different drive
+                        await (0, promises_1.copyFile)(s, d);
+                        await (0, promises_1.unlink)(s);
+                    }).catch(e => e.code || String(e));
             }))
         };
     },

package/src/langs/hfs-lang-it.json

@@ -140,6 +140,7 @@
         "go_last": "Vai alla fine",
         "Shuffle": "Riproduzione casuale",
         "Repeat": "Ripeti a fine lista",
-        "showHelpListShortcut": "Dalla lista dei file, clicca tenendo {key} per accedere velocemente al File Show"
+        "showHelpListShortcut": "Dalla lista dei file, clicca tenendo {key} per accedere velocemente al File Show",
+        "Invalid value": "Valore non valido"
     }
 }

package/src/misc.js

@@ -20,7 +20,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiAssertTypes = exports.AsapStream = exports.asyncGeneratorToReadable = exports.same = exports.makeNetMatcher = exports.isLocalHost = exports.onOff = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = void 0;
 const path_1 = require("path");
-const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
 __exportStar(require("./util-http"), exports);
 __exportStar(require("./util-files"), exports);
@@ -51,8 +50,8 @@ function onFirstEvent(emitter, events, cb) {
 }
 exports.onFirstEvent = onFirstEvent;
 function pattern2filter(pattern) {
-    const re = new RegExp(lodash_1.default.escapeRegExp(pattern), 'i');
-    return (s) => !s || !pattern || re.test((0, path_1.basename)(s));
+    const matcher = (0, cross_1.makeMatcher)(pattern.includes('*') ? pattern : `*${pattern}*`); // if you specify *, we'll respect its position
+    return (s) => !s || !pattern || matcher((0, path_1.basename)(s));
 }
 exports.pattern2filter = pattern2filter;
 // install multiple handlers and returns a handy 'uninstall' function which requires no parameter. Pass a map {event:handler}

package/src/nat.js

@@ -66,12 +66,13 @@ exports.getPublicIps = (0, debounceAsync_1.debounceAsync)(async () => {
 exports.getNatInfo = (0, debounceAsync_1.debounceAsync)(async () => {
     var _a, _b, _c, _d;
     const gettingIps = (0, exports.getPublicIps)(); // don't wait, do it in parallel
-    const res = await exports.upnpClient.getGateway().catch(() => null);
+    const res = await (0, cross_1.haveTimeout)(10000, exports.upnpClient.getGateway()).catch(() => null);
     const status = await (0, listen_1.getServerStatus)();
     const mappings = res && await (0, cross_1.haveTimeout)(5000, exports.upnpClient.getMappings()).catch(() => null);
     console.debug('mappings found', mappings === null || mappings === void 0 ? void 0 : mappings.map(x => x.description));
     const gatewayIp = res ? new URL(res.gateway.description).hostname : await findGateway().catch(() => undefined);
-    const localIp = (res === null || res === void 0 ? void 0 : res.address) || (await (0, listen_1.getIps)())[0];
+    const localIps = await (0, listen_1.getIps)(false);
+    const localIp = (res === null || res === void 0 ? void 0 : res.address) || gatewayIp ? lodash_1.default.maxBy(localIps, x => (0, cross_1.inCommon)(x, gatewayIp)) : localIps[0];
     const internalPort = ((_a = status === null || status === void 0 ? void 0 : status.https) === null || _a === void 0 ? void 0 : _a.listening) && status.https.port || ((_b = status === null || status === void 0 ? void 0 : status.http) === null || _b === void 0 ? void 0 : _b.listening) && status.http.port || undefined;
     const mapped = lodash_1.default.find(mappings, x => x.private.host === localIp && x.private.port === internalPort);
     const externalPort = mapped === null || mapped === void 0 ? void 0 : mapped.public.port;

package/src/serveFile.js

@@ -122,7 +122,7 @@ function applyRange(ctx, totalSize = ctx.response.length) {
         return ctx.throw(const_1.HTTP_BAD_REQUEST, 'bad range');
     const max = totalSize - 1;
     const start = bytes[0] ? Number(bytes[0]) : Math.max(0, totalSize - Number(bytes[1])); // a negative start is relative to the end
-    const end = bytes[0] ? Number(bytes[1] || max) : max;
+    const end = (bytes[0] && bytes[1]) ? Math.min(max, Number(bytes[1])) : max;
     // we don't support last-bytes without knowing max
     if (isNaN(end) && isNaN(max) || end > max || start > max) {
         ctx.status = const_1.HTTP_RANGE_NOT_SATISFIABLE;

package/src/serveGuiAndSharedFiles.js

@@ -88,7 +88,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         return !node.source ? (0, errorPages_1.sendErrorPage)(ctx, cross_const_1.HTTP_METHOD_NOT_ALLOWED)
             : !(0, vfs_1.statusCodeForMissingPerm)(node, 'can_read', ctx) ? (0, serveFile_1.serveFileNode)(ctx, node)
                 : ctx.status !== cross_const_1.HTTP_UNAUTHORIZED ? null
-                    : !path.endsWith('/') ? ctx.set('WWW-Authenticate', 'Basic') // this is necessary to support standard urls with credentials. Final / means we are dealing with default file...
+                    : !path.endsWith('/') ? (ctx.set('WWW-Authenticate', 'Basic'), (0, errorPages_1.sendErrorPage)(ctx)) // this is necessary to support standard urls with credentials. Final / means we are dealing with default file...
                         : (ctx.state.serveApp = true) && serveFrontendFiles(ctx, next); // ...for which we still provide fancy login
     if (!path.endsWith('/'))
         return ctx.redirect(ctx.state.revProxyPath + ctx.originalUrl.replace(/(\?|$)/, '/$1')); // keep query-string, if any