hfs 0.48.0-alpha2 → 0.48.0-alpha4

package/src/frontEndApis.js

@@ -38,11 +38,12 @@ const vfs_1 = require("./vfs");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const upload_1 = require("./upload");
+const misc_1 = require("./misc");
 exports.frontEndApis = {
     get_file_list: api_file_list_1.get_file_list,
     ...api_auth,
     get_notifications({ channel }, ctx) {
-        apiAssertTypes({ string: { channel } });
+        (0, misc_1.apiAssertTypes)({ string: { channel } });
         const list = new apiMiddleware_1.SendListReadable();
         list.ready(); // on chrome109 EventSource doesn't emit 'open' until something is sent
         return list.events(ctx, {
@@ -67,7 +68,7 @@ exports.frontEndApis = {
         };
     },
     async create_folder({ uri, name }, ctx) {
-        apiAssertTypes({ string: { uri, name } });
+        (0, misc_1.apiAssertTypes)({ string: { uri, name } });
         if (!(0, util_files_1.isValidFileName)(name) || (0, util_files_1.dirTraversal)(name))
             return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad name');
         const parentNode = await (0, vfs_1.urlToNode)(uri, ctx);
@@ -84,7 +85,7 @@ exports.frontEndApis = {
         }
     },
     async delete({ uri }, ctx) {
-        apiAssertTypes({ string: { uri } });
+        (0, misc_1.apiAssertTypes)({ string: { uri } });
         const node = await (0, vfs_1.urlToNode)(uri, ctx);
         if (!node)
             throw new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND);
@@ -101,7 +102,7 @@ exports.frontEndApis = {
         }
     },
     async rename({ uri, dest }, ctx) {
-        apiAssertTypes({ string: { uri, dest } });
+        (0, misc_1.apiAssertTypes)({ string: { uri, dest } });
         if (dest.includes('/') || (0, util_files_1.dirTraversal)(dest))
             throw new apiMiddleware_1.ApiError(const_1.HTTP_FORBIDDEN);
         const node = await (0, vfs_1.urlToNode)(uri, ctx);
@@ -130,10 +131,3 @@ function notifyClient(ctx, name, data) {
 }
 exports.notifyClient = notifyClient;
 const NOTIFICATION_PREFIX = 'notificationChannel:';
-function apiAssertTypes(paramsByType) {
-    for (const [types, params] of Object.entries(paramsByType))
-        for (const type of types.split('_'))
-            for (const [name, val] of Object.entries(params))
-                if (typeof val !== type)
-                    throw new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad ' + name);
-}

package/src/github.js

@@ -23,8 +23,17 @@ function downloadProgress(id, status) {
         downloading[id] = status;
     events_1.default.emit('pluginDownload_' + id, status);
 }
-async function downloadPlugin(repo, branch = '', overwrite) {
+// determine default branch, possibly without consuming api quota
+async function getGithubDefaultBranch(repo) {
+    var _a;
+    const res = await (0, misc_1.httpString)(`https://github.com/${repo}/archive/refs/heads/main.zip`, { method: 'HEAD' });
+    return res.ok ? 'main'
+        : (_a = (await getRepoInfo(repo))) === null || _a === void 0 ? void 0 : _a.default_branch;
+}
+async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
     var _a, _b, _c;
+    if (typeof repo !== 'string')
+        repo = repo.main;
     if (downloading[repo])
         return new apiMiddleware_1.ApiError(const_1.HTTP_CONFLICT, "already downloading");
     console.log('downloading plugin', repo);
@@ -42,9 +51,7 @@ async function downloadPlugin(repo, branch = '', overwrite) {
                 url = customRepo.web + url;
             return await go(url, pl === null || pl === void 0 ? void 0 : pl.id, (_c = customRepo.zipRoot) !== null && _c !== void 0 ? _c : DIST_ROOT);
         }
-        const rec = await getRepoInfo(repo);
-        if (!branch)
-            branch = rec.default_branch;
+        branch || (branch = await getGithubDefaultBranch(repo));
         const short = repo.split('/')[1]; // second part, repo without the owner
         if (!short)
             return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
@@ -75,7 +82,7 @@ async function downloadPlugin(repo, branch = '', overwrite) {
             });
             const main = (0, path_1.join)(installPath, MAIN);
             await (0, promises_1.rename)(main + plugins_1.DISABLING_POSTFIX, main) // we are good now, restore name
-                .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY, "missing main file"); });
+                .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_NOT_ACCEPTABLE, "missing main file"); });
             return folder;
         }
     }
@@ -109,19 +116,13 @@ async function readOnlinePlugin(repo, branch = '') {
             throw Error("bad repo.main");
         return (0, plugins_1.parsePluginSource)(main, res.body); // use 'repo' as 'id' client-side
     }
-    const branches = branch ? [branch] : (async function* () {
-        var _a;
-        yield 'main'; // getRepoInfo consumes github-api-quota, so give 'main' a shot first, and if it fails we'll ask
-        yield (_a = (await getRepoInfo(repo))) === null || _a === void 0 ? void 0 : _a.default_branch;
-    })();
-    for await (const b of branches) {
-        const res = await readGithubFile(`${repo}/${b}/${DIST_ROOT}/plugin.js`);
-        if (!res)
-            continue;
-        const pl = (0, plugins_1.parsePluginSource)(repo, res); // use 'repo' as 'id' client-side
-        pl.branch = b || undefined;
-        return pl;
-    }
+    branch || (branch = await getGithubDefaultBranch(repo));
+    const res = await readGithubFile(`${repo}/${branch}/${DIST_ROOT}/plugin.js`);
+    if (!res)
+        throw Error("missing plugin.js");
+    const pl = (0, plugins_1.parsePluginSource)(repo, res); // use 'repo' as 'id' client-side
+    pl.branch = branch;
+    return pl;
 }
 exports.readOnlinePlugin = readOnlinePlugin;
 function getFolder2repo() {
@@ -148,19 +149,19 @@ async function apiGithub(uri) {
             : e;
     }
 }
-async function* searchPlugins(text = '') {
-    var _a, _b;
+async function searchPlugins(text = '') {
     const projectInfo = await getProjectInfo();
-    const res = await apiGithub('search/repositories?q=topic:hfs-plugin+' + encodeURI(text));
-    for (const it of res.items) {
+    const list = await apiGithub('search/repositories?q=topic:hfs-plugin+' + encodeURI(text));
+    return new misc_1.AsapStream(list.items.map(async (it) => {
+        var _a, _b;
         const repo = it.full_name;
         if ((_a = projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.plugins_blacklist) === null || _a === void 0 ? void 0 : _a.includes(repo))
-            continue;
+            return;
         let pl = await readOnlinePlugin(repo, it.default_branch);
         if (!(pl === null || pl === void 0 ? void 0 : pl.apiRequired))
-            continue; // mandatory field
+            return; // mandatory field
         if (pl.badApi) { // we try other branches (starting with 'api')
-            const res = await apiGithub('repos/' + it.full_name + '/branches');
+            const res = await apiGithub('repos/' + repo + '/branches');
             const branches = res.map((x) => x === null || x === void 0 ? void 0 : x.name)
                 .filter((x) => typeof x === 'string' && x.startsWith('api'))
                 .sort().reverse();
@@ -175,13 +176,13 @@ async function* searchPlugins(text = '') {
             }
         }
         if (!pl || pl.badApi)
-            continue;
+            return;
         Object.assign(pl, {
             downloading: downloading[repo],
             license: (_b = it.license) === null || _b === void 0 ? void 0 : _b.spdx_id,
         }, lodash_1.default.pick(it, ['pushed_at', 'stargazers_count', 'default_branch']));
-        yield pl;
-    }
+        return pl;
+    }));
 }
 exports.searchPlugins = searchPlugins;
 // centralized hosted information, to be used as little as possible
@@ -194,7 +195,7 @@ function getProjectInfo() {
         .then(x => {
         if (!x)
             throw x; // go catch
-        setTimeout(() => cache = undefined, const_1.DAY); // invalidate cache
+        setTimeout(() => cache = undefined, misc_1.DAY); // invalidate cache
         return latest = JSON.parse(x);
     }).catch(() => {
         setTimeout(() => cache = undefined, 10000); // invalidate cache sooner on errors

package/src/index.js

@@ -25,11 +25,13 @@ const assert_1 = require("assert");
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
 const koa_session_1 = __importDefault(require("koa-session"));
+const api_net_1 = require("./api.net");
 (0, assert_1.ok)(lodash_1.default.intersection(Object.keys(frontEndApis_1.frontEndApis), Object.keys(adminApis_1.adminApis)).length === 0); // they share same endpoints, don't clash
 process.title = 'HFS ' + const_1.VERSION;
 const keys = ((_a = process.env.COOKIE_SIGN_KEYS) === null || _a === void 0 ? void 0 : _a.split(',')) || [(0, misc_1.randomId)(30)];
 exports.app = new koa_1.default({ keys });
 exports.app.use(middlewares_1.someSecurity)
+    .use(api_net_1.acmeMiddleware)
     .use((0, koa_session_1.default)({ key: 'hfs_$id', signed: true, rolling: true, sameSite: 'lax' }, exports.app))
     .use(middlewares_1.prepareState)
     .use(middlewares_1.gzipper)

package/src/langs/embedded.js

@@ -17,4 +17,5 @@ const hfs_lang_es_json_1 = __importDefault(require("./hfs-lang-es.json"));
 const hfs_lang_nl_json_1 = __importDefault(require("./hfs-lang-nl.json"));
 const hfs_lang_el_json_1 = __importDefault(require("./hfs-lang-el.json"));
 const hfs_lang_de_json_1 = __importDefault(require("./hfs-lang-de.json"));
-exports.default = { it: hfs_lang_it_json_1.default, zh: hfs_lang_zh_json_1.default, ru: hfs_lang_ru_json_1.default, sr: hfs_lang_sr_json_1.default, ko: hfs_lang_ko_json_1.default, ms: hfs_lang_ms_json_1.default, 'zh-tw': hfs_lang_zh_tw_json_1.default, fr: hfs_lang_fr_json_1.default, pt: hfs_lang_pt_json_1.default, vi: hfs_lang_vi_json_1.default, es: hfs_lang_es_json_1.default, nl: hfs_lang_nl_json_1.default, el: hfs_lang_el_json_1.default, de: hfs_lang_de_json_1.default };
+const hfs_lang_fi_json_1 = __importDefault(require("./hfs-lang-fi.json"));
+exports.default = { it: hfs_lang_it_json_1.default, zh: hfs_lang_zh_json_1.default, ru: hfs_lang_ru_json_1.default, sr: hfs_lang_sr_json_1.default, ko: hfs_lang_ko_json_1.default, ms: hfs_lang_ms_json_1.default, 'zh-tw': hfs_lang_zh_tw_json_1.default, fr: hfs_lang_fr_json_1.default, pt: hfs_lang_pt_json_1.default, vi: hfs_lang_vi_json_1.default, es: hfs_lang_es_json_1.default, nl: hfs_lang_nl_json_1.default, el: hfs_lang_el_json_1.default, de: hfs_lang_de_json_1.default, fi: hfs_lang_fi_json_1.default };

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

@@ -0,0 +1,131 @@
+{
+    "author": "Pultsari",
+    "version": 1.0,
+    "hfs_version": "0.47.0",
+    "translate": {
+        "Select": "Valitse",
+        "n_files": "{n,plural,one{# tiedosto} other{# tiedostoa}}",
+        "n_folders": "{n,plural,one{# kansio} other{# kansiota}}",
+        "filter_count": "{n,plural, one{# suodatettu} other{# suodatettu}}",
+        "select_count": "{n,plural, one{# valittu} other{# valittu}}",
+        "filter_placeholder": "Kirjoita tähän suodattaaksesi listasta",
+        "Select some files": "Valitse joitakin tiedostoja tai kansioita",
+        "zip_checkboxes": "Käytä valintaruutuja valitaksesi ladattavat tiedostot ja kansiot, sitten voit ladata pakatun zip tiedoston",
+        "zip_tooltip_selected": "Lataa valitut tiedostot ja kansiot pakatussa zip tiedostossa",
+        "zip_tooltip_whole": "Lataa ja pakkaa kaikki (suodattamattomana) yhtenä zip tiedostona. Jos valitset vain joitakin tiedostoja tai kansioita, pakataan ja ladataan vain ne.",
+        "zip_confirm_search": "Haluatko ladata kaikki haun tulokset pakattuna zip tiedostona?",
+        "zip_confirm_folder": "Haluatko ladata aivan kaiken pakattuna zip tiedostona?",
+        "select_tooltip": "Valinnat koskevat pakattua zip tiedostoa ja tiedostojen poistamista (kun sallittu), sen lisäksi voit suodattaa listaa.",
+        "delete_hint": "Poistaaksesi tiedostoja tai kansioita, klikkaa ensin Valitse yläpalkista",
+        "delete_confirm": "Poista {n,plural, one{# valittu tiedosto tai kansio} other{# valittua tiedostoa tai / ja kansiota}}?",
+        "delete_completed": "{n} tiedostoa tai / ja kansiota poistettu",
+        "delete_failed": ", {n,plural, one{# epäonnistui} other{# epäonnistui}}",
+        "delete_select": "Valitse tiedostoja tai / ja kansioita poistettavaksi",
+        "Delete": "Poista",
+        "Options": "Asetukset",
+        "Search": "Haku",
+        "Zip": "Zip",
+        "search_msg": "Hae tästä kansiosta ja alikansioista",
+        "Searching": "Haetaan",
+        "Searched": "Haettu",
+        "Clear search": "Tyhjennä haku",
+        "Interrupted": "Keskeytetty",
+        "stopped_before": "pysäytetty ennen",
+        "empty_list": "Tyhjä",
+        "filter_none": "Ei tuloksia",
+        "Admin-panel": "Hallintapaneeli",
+        "Login": "Kirjaudu",
+        "Username": "Käyttäjätunnus",
+        "Password": "Salasana",
+        "login_untrusted": "Kirjautuminen keskeytetty:: palvelimen identiteettiin ei voida luottaa",
+        "login_bad_credentials": "Käyttäjätunnus tai salasana virheellinen.",
+        "login_bad_cookies": "Evästeet eivät toimi - kirjautuminen epäonnistui",
+        "User panel": "Hallintapaneeli",
+        "Change password": "Vaihda salasana",
+        "enter_pass": "Kirjoita uusi salasana",
+        "enter_pass2": "Kirjoita uusi salasana uudelleen",
+        "pass2_mismatch": "Toinen kirjoittamasi salasana ei vastannut ensimmäistä. Salasanan vaihtaminen keskeytetty.",
+        "password_changed": "Salasana vaihdettu",
+        "Logout": "Kirjaudu ulos",
+        "connection error": "Yhteysvirhe",
+        "Full timestamp:": "Täysi aikaleima:",
+        "Search was interrupted": "Haku keskeytetty",
+        "Stop list": "Pysäytä listaus",
+        "upload_starting": "Aloitetaan lataaminen",
+        "wrong_account": "Tilillä {u} ei ole pääsyä, kokeile toista",
+        "no_upload_here": "Ei lähetysoikeutta tähän kansioon",
+        "Create folder": "Tee uusi kansio",
+        "Pick files": "Valitse lähetettävät tiedostot",
+        "Pick folder": "Valitse lähetettävä kansio",
+        "send_files": "Lähetä {n,plural,one{# tiedosto} other{# tiedostot}}, {size}",
+        "Clear": "Tyhjennä",
+        "failed_upload": "Lähetys epäonnistui {name}",
+        "confirm_resume": "Jatketaanko lähetystä?",
+        "file too large": "Tiedoston koko on liian suuri",
+        "Enter folder name": "Kirjoita kansion nimi",
+        "Successfully created": "Kansio luotu onnistuneesti",
+        "enter_folder": "Siirry kansioon",
+        "folder_exists": "Kansio samalla nimellä on jo olemassa",
+        "Sort by:": "Lajittele: {by}",
+        "name": "nimen mukaan",
+        "extension": "tiedostopäätteen mukaan",
+        "size": "koon mukaan",
+        "time": "ajan mukaan",
+        "Invert order": "Käänteinen järjestys",
+        "Folders first": "Kansiot ensin",
+        "Numeric names": "Numeroidut nimet",
+        "theme:": "Teema:",
+        "auto": "auto",
+        "light": "vaalea",
+        "dark": "tumma",
+        "parent folder": "Ylempi kansio",
+        "home": "Koti",
+        "Continue": "Jatka",
+        "Confirm": "Vahvista",
+        "Don't": "Älä",
+        "Warning": "Varoitus",
+        "Error": "Virhe",
+        "Info": "Tiedoksi",
+        "Unauthorized": "Ei lupaa",
+        "Forbidden": "Kielletty",
+        "Not found": "Ei löydy",
+        "Server error": "Palvelinvirhe",
+        "Upload": "Lähetä",
+        "upload_concluded": "Lähetys päättyi:",
+        "upload_finished": "{n} tiedostoa tai kansiota lähetetty onnistuneesti ({size})",
+        "upload_errors": "{n} epäonnistui",
+        "upload_file_rejected": "Joitakin tiedostoja ei hyväksytty",
+        "File menu": "Tiedostovalikko",
+        "Folder menu": "Kansiovalikko",
+        "Name": "Nimi",
+        "file_open": "Avaa",
+        "Download": "Lataa",
+        "Missing permission": "Oikeudet puuuttuvat",
+        "Reload": "Päivitä",
+        "Get list": "Näytä listana",
+        "Skip existing files": "Ohita jo olemassa olevat tiedostot",
+        "Size": "Koko",
+        "Timestamp": "Aikaleima",
+        "Show": "Näytä",
+        "Loading failed": "Lataaminen epäonnistui",
+        "Rename": "Nimeä uudelleen",
+        "Tiles mode:": "Kuvakkeiden koko:",
+        "off": "pienin",
+        "Operation successful": "Suoritettu onnistuneesti",
+        "Uploader": "Lähettäjä",
+        "Download counter": "Latauslaskuri",
+        "Switch zoom mode": "Vaihda zoomaus tilaa",
+        "Full screen": "Koko näyttö",
+        "File Show help": "Ohjeita",
+        "showHelpMain": "Voit käyttää näppäimistöä joihinkin toimintoihin:",
+        "showHelp_←/→": "←/→",
+        "showHelp_↑/↓": "↑/↓",
+        "showHelp_space": "välilyönti",
+        "showHelp_←/→_body": "siirry edelliseen/seuraavaan tiedostoon",
+        "showHelp_↑/↓_body": "vieritä korkeita kuvia",
+        "showHelp_space_body": "valitse",
+        "showHelp_D_body": "lataa",
+        "showHelp_Z_body": "vaihda zoomauksen tilaa",
+        "showHelp_F_body": "koko näyttö"
+    }
+}

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

@@ -119,6 +119,8 @@
         "showHelp_D_body": "download",
         "showHelp_Z_body": "cambia modalità zoom",
         "showHelp_F_body": "pieno schermo",
+        "Destination": "Destinazione",
+        "in_queue": "{n} in coda",
         "": "PLUGINS SECTION",
         "": "PLUGIN thumbnails",
         "Enable tiles mode": "Modalità griglia",

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

@@ -1,7 +1,7 @@
 {
     "author": "Mefistofell, SanokKule",
-    "version": 2.0,
-    "hfs_version": "0.47.0",
+    "version": 2.1,
+    "hfs_version": "0.48.0",
     "translate": {
         "Select": "Выбор",
         "n_files": "{n,plural, one{1 файл} few{# файла} other{# файлов}}",
@@ -15,7 +15,7 @@
         "zip_tooltip_whole": "Выбрать файлы для скачивания в zip-архиве. Если файлы не выбраны, то будет скачана вся папка",
         "zip_confirm_search": "Скачать все результаты поиска в одном zip-архиве",
         "zip_confirm_folder": "Скачать всю папку как zip-архив?",
-        "select_tooltip": "Выбор применяется к \"Zip\" и \"Удалить\" (если доступно), но также список можно отфильтровать",
+        "select_tooltip": "Позволяет выбрать файлы для скачивания или удаления, а так же использовать фильтры для быстрого поиска",
         "delete_hint": "Для удаления файлов сначала нажмите Выбор",
         "delete_confirm": "Удалить {n,plural, =1{элемент} one{# элемент} few{# элемента} many{# элементов} other{# элементов}}?",
         "delete_completed": "{n,plural, one{Удалён} other{Удалено}} {n,plural, one{# элемент} few{# элемента} many{# элементов} other{# элементов}}",
@@ -116,7 +116,7 @@
         "Download counter": "Счётчик загрузок",
         "Switch zoom mode": "Переключить увеличение",
         "Full screen": "Полный экран",
-        "File Show help": "Помощь меню просмотра файла",
+        "File Show help": "Помощь",
         "showHelpMain": "Для некоторых действий можно использовать клавиатуру:",
         "showHelp_←/→": "←/→",
         "showHelp_↑/↓": "↑/↓",
@@ -126,6 +126,12 @@
         "showHelp_space_body": "выбрать файл",
         "showHelp_D_body": "скачать",
         "showHelp_Z_body": "переключение увеличения",
-        "showHelp_F_body": "полноэкранный режим"
+        "showHelp_F_body": "полноэкранный режим",
+        "Destination": "Назначение",
+        "in_queue": "{n} в очереди",
+        "": "PLUGINS SECTION",
+        "": "PLUGIN thumbnails",
+        "Enable tiles mode": "Просмотр в режиме плиток",
+        "thumbnails_switchBack": "Изменить вид можно в настройках"
     }
 }

package/src/listen.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrls = exports.getIps = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = exports.getHttpsWorkingPort = void 0;
+exports.getUrls = exports.getIps = exports.getServerStatus = exports.stopServer = exports.startServer = exports.httpsPortCfg = exports.privateKey = exports.cert = exports.getCertObject = exports.openAdmin = exports.portCfg = exports.getHttpsWorkingPort = void 0;
 const http = __importStar(require("http"));
 const config_1 = require("./config");
 const index_1 = require("./index");
@@ -56,7 +56,7 @@ exports.portCfg.sub(async (port) => {
     while (!index_1.app)
         await (0, misc_1.wait)(100);
     stopServer(httpSrv).then();
-    httpSrv = Object.assign(http.createServer(index_1.app.callback()), { name: 'http' });
+    httpSrv = Object.assign(http.createServer({ requestTimeout: 0 }, index_1.app.callback()), { name: 'http' });
     port = await startServer(httpSrv, { port });
     if (!port)
         return;
@@ -82,6 +82,12 @@ function openAdmin() {
     console.log("openAdmin failed");
 }
 exports.openAdmin = openAdmin;
+function getCertObject() {
+    const o = new crypto_1.X509Certificate(httpsOptions.cert);
+    const some = lodash_1.default.pick(o, ['subject', 'issuer', 'validFrom', 'validTo']);
+    return (0, misc_1.objSameKeys)(some, v => (v === null || v === void 0 ? void 0 : v.includes('=')) ? Object.fromEntries(v.split('\n').map(x => x.split('='))) : v);
+}
+exports.getCertObject = getCertObject;
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
     var _a, _b, _c;
     stopServer(httpsSrv).then();
@@ -91,8 +97,8 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
             await (0, misc_1.wait)(100);
         httpsSrv = Object.assign(https.createServer(port === PORT_DISABLED ? {} : { key: httpsOptions.private_key, cert: httpsOptions.cert }, index_1.app.callback()), { name: 'https' });
         if (port >= 0) {
-            const cert = new crypto_1.X509Certificate(httpsOptions.cert);
-            const cn = (_a = cert.subject.split('CN=')[1]) === null || _a === void 0 ? void 0 : _a.split('\n')[0];
+            const cert = getCertObject();
+            const cn = (_a = cert.subject) === null || _a === void 0 ? void 0 : _a.CN;
             if (cn)
                 console.log("certificate loaded for", cn);
             const now = new Date();
@@ -119,9 +125,9 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     httpsSrv.on('connection', connections_1.newConnection);
     printUrls(httpsSrv.name);
 });
-const cert = (0, config_1.defineConfig)('cert', '');
-const privateKey = (0, config_1.defineConfig)('private_key', '');
-const httpsNeeds = [cert, privateKey];
+exports.cert = (0, config_1.defineConfig)('cert', '');
+exports.privateKey = (0, config_1.defineConfig)('private_key', '');
+const httpsNeeds = [exports.cert, exports.privateKey];
 const httpsOptions = { cert: '', private_key: '' };
 for (const cfg of httpsNeeds) {
     let unwatch;
@@ -170,7 +176,7 @@ function startServer(srv, { port, host }) {
     }
     function listen(host) {
         return new Promise(async (resolve, reject) => {
-            srv === null || srv === void 0 ? void 0 : srv.listen({ port, host }, () => {
+            srv === null || srv === void 0 ? void 0 : srv.on('error', onError).listen({ port, host }, () => {
                 const ad = srv.address();
                 if (!ad)
                     return reject('no address');
@@ -178,8 +184,12 @@ function startServer(srv, { port, host }) {
                     srv.close();
                     return reject('type of socket not supported');
                 }
+                srv.removeListener('error', onError); // necessary in case someone calls stop/start many times
                 resolve(ad.port);
-            }).on('error', async (e) => {
+            });
+            async function onError(e) {
+                if (!srv)
+                    return;
                 srv.error = String(e);
                 srv.busy = undefined;
                 const { code } = e;
@@ -191,10 +201,11 @@ function startServer(srv, { port, host }) {
                 const k = (srv === httpSrv ? exports.portCfg : exports.httpsPortCfg).key();
                 console.log(` >> try specifying a different port, enter this command: config ${k} 8011`);
                 resolve(0);
-            });
+            }
         });
     }
 }
+exports.startServer = startServer;
 function stopServer(srv) {
     return new Promise(resolve => {
         if (!(srv === null || srv === void 0 ? void 0 : srv.listening))
@@ -209,19 +220,22 @@ function stopServer(srv) {
         });
     });
 }
+exports.stopServer = stopServer;
 async function getServerStatus() {
     return {
         http: await serverStatus(httpSrv, exports.portCfg.get()),
         https: await serverStatus(httpsSrv, exports.httpsPortCfg.get()),
     };
-    async function serverStatus(h, configuredPort) {
+    async function serverStatus(srv, configuredPort) {
         var _a;
-        const busy = await (h === null || h === void 0 ? void 0 : h.busy);
+        const busy = await (srv === null || srv === void 0 ? void 0 : srv.busy);
         await (0, misc_1.wait)(0); // simple trick to wait for also .error to be updated. If this trickery becomes necessary elsewhere, then we should make also error a Promise.
         return {
-            ...lodash_1.default.pick(h, ['listening', 'error']),
+            ...lodash_1.default.pick(srv, ['listening', 'error']),
             busy,
-            port: ((_a = h === null || h === void 0 ? void 0 : h.address()) === null || _a === void 0 ? void 0 : _a.port) || configuredPort,
+            port: ((_a = srv === null || srv === void 0 ? void 0 : srv.address()) === null || _a === void 0 ? void 0 : _a.port) || configuredPort,
+            configuredPort,
+            srv,
         };
     }
 }
@@ -232,7 +246,7 @@ async function getIps() {
         && v4first((0, misc_1.onlyTruthy)(nets.map(net => !net.internal && net.address)))[0] // for each interface we consider only 1 address
     )).flat();
     const e = await api_net_1.externalIp;
-    if (e)
+    if (e && !ips.includes(e))
         ips.unshift(e);
     return v4first(ips)
         .filter((x, i, a) => a.length > 1 || !x.startsWith('169.254')); // 169.254 = dhcp failure on the interface, but keep it if it's our only one

package/src/log.js

@@ -33,7 +33,6 @@ const config_1 = require("./config");
 const fs_1 = require("fs");
 const util = __importStar(require("util"));
 const promises_1 = require("fs/promises");
-const const_1 = require("./const");
 const lodash_1 = __importDefault(require("lodash"));
 const util_files_1 = require("./util-files");
 const perm_1 = require("./perm");
@@ -104,9 +103,9 @@ const logMw = async (ctx, next) => {
         if (rotate && last) { // rotation enabled and a file exists?
             const passed = Number(now) - Number(last)
                 - 3600000; // be pessimistic and count a possible DST change
-            if (rotate === 'm' && (passed >= 31 * const_1.DAY || now.getMonth() !== last.getMonth())
-                || rotate === 'd' && (passed >= const_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
-                || rotate === 'w' && (passed >= 7 * const_1.DAY || now.getDay() < last.getDay())) {
+            if (rotate === 'm' && (passed >= 31 * misc_1.DAY || now.getMonth() !== last.getMonth())
+                || rotate === 'd' && (passed >= misc_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
+                || rotate === 'w' && (passed >= 7 * misc_1.DAY || now.getDay() < last.getDay())) {
                 stream.end();
                 const postfix = last.getFullYear() + '-' + doubleDigit(last.getMonth() + 1) + '-' + doubleDigit(last.getDate());
                 try { // other logging requests shouldn't happen while we are renaming. Since this is very infrequent we can tolerate solving this by making it sync.
@@ -126,7 +125,7 @@ const logMw = async (ctx, next) => {
         const user = (0, perm_1.getCurrentUsername)(ctx);
         const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
         const uri = ctx.originalUrl;
-        const extra = ctx.state.includesLastByte && ctx.vfsNode && { dl: 1 }
+        const extra = ctx.state.includesLastByte && ctx.vfsNode && ctx.res.finished && { dl: 1 }
             || ctx.state.uploadPath && { ul: ctx.state.uploadPath, size: ctx.state.uploadSize }
             || undefined;
         events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri, extra }));

package/src/middlewares.js

@@ -32,7 +32,7 @@ const config_1 = require("./config");
 const lang_1 = require("./lang");
 const forceHttps = (0, config_1.defineConfig)('force_https', true);
 const ignoreProxies = (0, config_1.defineConfig)('ignore_proxies', false);
-exports.sessionDuration = (0, config_1.defineConfig)('session_duration', Number(process.env.SESSION_DURATION) || const_1.DAY / 1000, v => v * 1000);
+exports.sessionDuration = (0, config_1.defineConfig)('session_duration', Number(process.env.SESSION_DURATION) || misc_1.DAY / 1000, v => v * 1000);
 exports.gzipper = (0, koa_compress_1.default)({
     threshold: 2048,
     gzip: { flush: zlib_1.constants.Z_SYNC_FLUSH },
@@ -213,7 +213,7 @@ const someSecurity = async (ctx, next) => {
 exports.someSecurity = someSecurity;
 // limited to http proxies
 function getProxyDetected() {
-    if ((proxyDetected === null || proxyDetected === void 0 ? void 0 : proxyDetected.state.when) < Date.now() - const_1.DAY)
+    if ((proxyDetected === null || proxyDetected === void 0 ? void 0 : proxyDetected.state.when) < Date.now() - misc_1.DAY)
         proxyDetected = undefined;
     return !ignoreProxies.get() && proxyDetected
         && { from: proxyDetected.ip, for: proxyDetected.get('X-Forwarded-For') };

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.asyncGeneratorToReadable = exports.stream2string = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.onOff = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.debounceAsync = void 0;
+exports.apiAssertTypes = exports.AsapStream = exports.asyncGeneratorToReadable = exports.stream2string = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.onOff = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -30,6 +30,8 @@ const micromatch_1 = require("micromatch");
 const node_net_1 = require("node:net");
 const debounceAsync_1 = __importDefault(require("./debounceAsync"));
 exports.debounceAsync = debounceAsync_1.default;
+const apiMiddleware_1 = require("./apiMiddleware");
+const const_1 = require("./const");
 const cbs = new Set();
 function onProcessExit(cb) {
     cbs.add(cb);
@@ -83,7 +85,7 @@ function makeNetMatcher(mask, emptyMaskReturns = false) {
         all[0] = all[0].slice(1);
     const bl = new node_net_1.BlockList();
     for (const x of all) {
-        const m = /^([.:\d]+)(?:\/(\d+)|-(.+)|)$/.exec(x);
+        const m = /^([.:\da-f]+)(?:\/(\d+)|-(.+)|)$/i.exec(x);
         if (!m) {
             console.warn("error in network mask", x);
             continue;
@@ -147,3 +149,28 @@ function asyncGeneratorToReadable(generator) {
     });
 }
 exports.asyncGeneratorToReadable = asyncGeneratorToReadable;
+// produces as soon as a promise resolves, not sequentially
+class AsapStream extends stream_1.Readable {
+    constructor(promises) {
+        super({ objectMode: true });
+        this.promises = promises;
+        this.finished = false;
+    }
+    _read() {
+        if (this.finished)
+            return;
+        this.finished = true;
+        for (const p of this.promises)
+            p.then(data => this.push(data), e => this.emit('error', e));
+        Promise.allSettled(this.promises).then(() => this.push(null));
+    }
+}
+exports.AsapStream = AsapStream;
+function apiAssertTypes(paramsByType) {
+    for (const [types, params] of Object.entries(paramsByType))
+        for (const type of types.split('_'))
+            for (const [name, val] of Object.entries(params))
+                if (typeof val !== type)
+                    throw new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad ' + name);
+}
+exports.apiAssertTypes = apiAssertTypes;