hfs 3.2.2 → 3.3.0-alpha1

package/src/ddns.js

@@ -73,10 +73,7 @@ async function get_dynamic_dns_error() {
             if (last)
                 this.push(last); // start by sending current state
             unsub = events_1.default.on('dynamicDnsError', x => this.push(x)); // send updates, if any. This simplified way to manage the data stream is acceptable for this case of extremely low throughput
-        },
-        async destroy() {
-            unsub();
-            this.push(null);
+            this.once('close', unsub);
         }
     });
 }

package/src/events.js

@@ -19,10 +19,7 @@ class BetterEventEmitter {
             this.emit(e + LISTENERS_SUFFIX, cbs, listener);
         }
         if (callNow)
-            try {
-                listener();
-            }
-            catch { }
+            Promise.resolve().then(listener).catch(console.error);
         return () => {
             for (const e of event) {
                 const cbs = this.listeners.get(e);

package/src/fileAttr.js

@@ -35,7 +35,7 @@ async function storeFileAttr(path, k, v) {
         return true;
     }
     // fallback to our kv-storage
-    return await exports.fileAttrDb.put(fileAttrKey(path, k), v)?.catch((e) => {
+    return await exports.fileAttrDb.put(fileAttrKey(path, k), v)?.then(() => true, (e) => {
         console.error("Couldn't store metadata on", path, String(e.message || e));
         return false;
     }) ?? true; // if put is undefined, the value was already there

package/src/frontEndApis.js

@@ -20,6 +20,7 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const upload_1 = require("./upload");
 const misc_1 = require("./misc");
+const uploadOwners_1 = require("./uploadOwners");
 const config_1 = require("./config");
 const comments_1 = require("./comments");
 const SendList_1 = require("./SendList");
@@ -99,7 +100,7 @@ exports.frontEndApis = {
             throw new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND);
         if ((0, vfs_1.isRoot)(node) || !(0, util_files_1.isValidFileName)(dest))
             return new apiMiddleware_1.ApiError(const_1.HTTP_FORBIDDEN);
-        await requestedRename(node, dest, ctx);
+        await requestedRename(node, dest, ctx, uri);
         return {};
     },
     async move_files({ uri_from, uri_to }, ctx) {
@@ -126,7 +127,8 @@ exports.frontEndApis = {
             return new apiMiddleware_1.ApiError(const_1.HTTP_UNAUTHORIZED);
         if (!node.source)
             return new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY);
-        await (0, comments_1.setCommentFor)(node.source, comment);
+        if (!await (0, comments_1.setCommentFor)(node.source, comment))
+            return new apiMiddleware_1.ApiError(const_1.HTTP_SERVER_ERROR);
         return {};
     },
     async get_folder_size_partial({ id }) {
@@ -199,11 +201,12 @@ async function moveFiles(uri_from, uri_to, ctx, override) {
                     await (0, promises_1.copyFile)(src, dest);
                     await (0, promises_1.unlink)(src);
                 }).then(() => (0, misc_1.moveStoredFileAttrs)(src, dest))
+                    .then(() => (0, uploadOwners_1.moveUploadOwner)(from1, (0, misc_1.join)(uri_to, destName)))
                     .catch(e => e.code || String(e));
         }))
     };
 }
-async function requestedRename(node, newName, ctx) {
+async function requestedRename(node, newName, ctx, uri = ctx.path) {
     if (!node)
         throw new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND);
     // requestedRename is exported, so keep disk rename confinement here even when callers pre-validate
@@ -223,6 +226,7 @@ async function requestedRename(node, newName, ctx) {
             const destSource = (0, path_1.join)((0, path_1.dirname)(node.source), newName);
             await (0, promises_1.rename)(node.source, destSource);
             await (0, misc_1.moveStoredFileAttrs)(node.source, destSource);
+            await (0, uploadOwners_1.moveUploadOwner)(uri, (0, misc_1.join)((0, path_1.dirname)(uri), (0, misc_1.pathEncode)(newName)));
             (0, comments_1.getCommentFor)(node.source).then(c => {
                 if (!c)
                     return;

package/src/geo.js

@@ -15,12 +15,18 @@ const enabled = (0, config_1.defineConfig)(misc_1.CFG.geo_enable, false);
 const allow = (0, config_1.defineConfig)(misc_1.CFG.geo_allow, null);
 const list = (0, config_1.defineConfig)(misc_1.CFG.geo_list, []);
 const allowUnknown = (0, config_1.defineConfig)(misc_1.CFG.geo_allow_unknown, false);
-enabled.sub(checkFiles);
+const ignoreNet = (0, config_1.defineConfig)(misc_1.CFG.geo_ignore_net, '', v => (0, misc_1.makeNetMatcher)(v));
+let filesCheck = Promise.resolve();
+enabled.sub(() => {
+    filesCheck = checkFiles().catch((e) => console.error('Failed to load geo-ip db:', e?.message || String(e)));
+});
 setInterval(checkFiles, misc_1.DAY); // keep updated at run-time
 // benchmark: memoize can make this 44x faster
 exports.ip2country = lodash_1.default.memoize((ip) => ip2location.getCountryShortAsync(ip).then(v => v === '-' ? '' : v, () => ''));
 const geoFilter = async (ctx, next) => {
-    if (enabled.get() && !(0, misc_1.isLocalHost)(ctx) && !(0, misc_1.isIpLan)(ctx.ip)) {
+    if (enabled.get() && !(0, misc_1.isLocalHost)(ctx) && !(0, misc_1.isIpLan)(ctx.ip) && !ignoreNet.compiled()(ctx.ip)) {
+        if (!isOpen()) // keep startup independent of the geo db download, but don't classify external requests before the db had a chance to load
+            await filesCheck;
         const { connection } = ctx.state;
         const country = connection.country ??= await (0, exports.ip2country)(ctx.ip);
         if (country)

package/src/github.js

@@ -122,18 +122,19 @@ async function downloadPlugin(repo, { branch = '', overwrite = false } = {}) {
             if (wasRunning)
                 await (0, plugins_1.stopPlugin)(folder); // stop old
             // move data, and consider late release of the resource, up to a few seconds
-            await (0, misc_1.retry)(() => (0, promises_1.rename)((0, path_1.join)(installPath, plugins_1.STORAGE_FOLDER), (0, path_1.join)(tempInstallPath, plugins_1.STORAGE_FOLDER))
-                .then(() => 1, e => e.code === 'ENOENT'));
+            await (0, misc_1.retry)(() => (0, promises_1.rename)((0, path_1.join)(installPath, plugins_1.STORAGE_FOLDER), (0, path_1.join)(tempInstallPath, plugins_1.STORAGE_FOLDER)).catch(e => {
+                if (e.code !== 'ENOENT')
+                    throw e;
+            }));
             // delete old folder (if any), but it may fail in the presence of .node files, so we rename it first as a precaution (clearing require.cache doesn't help). Especially on Windows, it may be impossible to delete dll files until our process is terminated (in which case, retrying is useless).
             const deleteMe = installPath + plugins_1.DELETE_ME_SUFFIX;
-            await (0, misc_1.retry)(() => (0, promises_1.rename)(installPath, deleteMe).then(() => 1, (e) => {
-                if (e.code === 'ENOENT')
-                    return 1; // nothing to do
-                console.warn("Error renaming old plugin folder:", String(e));
-            }));
-            await (0, misc_1.retry)(() => (0, promises_1.rm)(deleteMe, { recursive: true, force: true /*ignore ENOENT*/ }).then(() => 1, e => {
-                console.warn("Error deleting old plugin folder:", String(e));
+            await (0, misc_1.retry)(() => (0, promises_1.rename)(installPath, deleteMe).catch(e => {
+                if (e.code !== 'ENOENT')
+                    throw e;
             }));
+            // a disabled leftover cannot block replacement and will be cleaned at startup
+            await (0, misc_1.retry)(() => (0, promises_1.rm)(deleteMe, { recursive: true, force: true /*ignore ENOENT*/ }))
+                .catch(e => console.warn("Error deleting old plugin folder:", String(e)));
             // final replace
             await (0, promises_1.rename)(tempInstallPath, installPath)
                 .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_NOT_ACCEPTABLE, "missing main file"); });

package/src/index.js

@@ -86,7 +86,7 @@ process.on('uncaughtException', (err) => {
 // this warning is scaring users, and has been removed in node 20.12.0 https://github.com/nodejs/node/pull/51204
 const original = process.emitWarning;
 process.emitWarning = warn => String(warn).startsWith('An error event has already been emitted') || original.call(process, warn);
-(0, config_1.defineConfig)('proxies', 0).sub(n => {
+(0, config_1.defineConfig)(misc_1.CFG.proxies, 0).sub(n => {
     exports.app.proxy = n > 0;
     exports.app.maxIpsCount = n;
 });

package/src/ips.js

@@ -14,9 +14,30 @@ exports.ips = new kvstorage_1.KvStorage({
 });
 (0, first_1.onProcessExit)(() => exports.ips.close());
 const trackIpsMw = async (ctx, next) => {
-    if (exports.ips.isOpen() && !(0, misc_1.isLocalHost)(ctx))
-        exports.ips.put(ctx.ip, { ts: new Date, country: ctx.state.connection.country });
-    await next();
+    const tracking = exports.ips.isOpen() && !(0, misc_1.isLocalHost)(ctx);
+    const ts = new Date;
+    const country = ctx.state.connection.country;
+    let failed = false;
+    // defer storage update until downstream middlewares have assigned status or thrown
+    try {
+        await next();
+    }
+    catch (e) {
+        failed = true;
+        throw e;
+    }
+    finally {
+        if (tracking) {
+            // keep the counter update here so failures from downstream middlewares are counted with the final status
+            const was = exports.ips.getSync(ctx.ip);
+            void exports.ips.put(ctx.ip, {
+                ts,
+                country,
+                served: (was?.served || 0) + (failed || ctx.status >= 400 ? 0 : 1),
+                failed: (was?.failed || 0) + (failed || ctx.status >= 400 ? 1 : 0),
+            }).catch(e => console.error("Couldn't track IP", ctx.ip, String(e)));
+        }
+    }
 };
 exports.trackIpsMw = trackIpsMw;
 trackIps.sub(v => {

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} تم رفعه ({size})",
         "upload_errors": "{n} فشلوا",
         "upload_file_rejected": "بعض الملفات لم تُقبل",
+        "delete_unfinished_upload": "هل تريد إزالة الرفع غير المكتمل؟",
         "File menu": "قائمة الملف",
         "Folder menu": "قائمة المجلد",
         "Name": "الاسم",

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

@@ -94,6 +94,7 @@
         "upload_finished": "{n} завършени ({size})",
         "upload_errors": "{n} неуспешни",
         "upload_file_rejected": "Някои файлове не бяха приети",
+        "delete_unfinished_upload": "Премахване на незавършеното качване?",
         "File menu": "Меню на файл",
         "Folder menu": "Меню на папка",
         "Name": "Име",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} fertig ({size})",
         "upload_errors": "{n} fehlgeschlagen",
         "upload_file_rejected": "Einige Dateien wurden nicht akzeptiert",
+        "delete_unfinished_upload": "Unvollständigen Upload entfernen?",
         "File menu": "Dateimenü",
         "Folder menu": "Ordnermenü",
         "Name": "Name",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} ολοκληρώθηκαν ({size})",
         "upload_errors": "{n} απέτυχαν",
         "upload_file_rejected": "Κάποια αρχεία δεν γίνονται δεκτά",
+        "delete_unfinished_upload": "Να αφαιρεθεί η ημιτελής μεταφόρτωση;",
         "File menu": "Μενού αρχείου",
         "Folder menu": "Μενού φακέλου",
         "Name": "Όνομα",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} completado ({size})",
         "upload_errors": "{n} fallido",
         "upload_file_rejected": "Algunos archivos no fueron aceptados",
+        "delete_unfinished_upload": "¿Eliminar la subida sin terminar?",
         "File menu": "Archivo",
         "Folder menu": "Carpeta",
         "Name": "Nombre",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} tiedostoa tai kansiota lähetetty onnistuneesti ({size})",
         "upload_errors": "{n} epäonnistui",
         "upload_file_rejected": "Joitakin tiedostoja ei hyväksytty",
+        "delete_unfinished_upload": "Poistetaanko keskeneräinen lähetys?",
         "File menu": "Tiedostovalikko",
         "Folder menu": "Kansiovalikko",
         "Name": "Nimi",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} terminé(s) ({size})",
         "upload_errors": "{n} échoués",
         "upload_file_rejected": "Certains fichiers ont été refusés",
+        "delete_unfinished_upload": "Supprimer l'envoi inachevé ?",
         "File menu": "Menu du fichier",
         "Folder menu": "Menu du dossier",
         "Name": "Nom",

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

@@ -97,6 +97,7 @@
         "upload_finished": "{n} kész ({size})",
         "upload_errors": "{n} sikertelen",
         "upload_file_rejected": "Egyes fájlokat nem sikerült feltölteni",
+        "delete_unfinished_upload": "Eltávolítja a befejezetlen feltöltést?",
         "download counter": "letöltés számláló",
         "File menu": "Fájl menü",
         "Folder menu": "Mappa menü",

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

@@ -89,6 +89,7 @@
         "upload_finished": "{n,plural, one{# riuscito} other{# riusciti}} ({size})",
         "upload_errors": "{n,plural, one{# fallito} other{# falliti}}",
         "upload_file_rejected": "Alcuni file non sono stati accettati",
+        "delete_unfinished_upload": "Rimuovere l'upload incompleto?",
         "File menu": "Menu file",
         "Folder menu": "Menu cartella",
         "Name": "Nome",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n}個完了 ({size})",
         "upload_errors": "{n} 失敗",
         "upload_file_rejected": "一部のファイルは受け入れられませんでした",
+        "delete_unfinished_upload": "未完了のアップロードを削除しますか？",
         "File menu": "ファイルメニュー",
         "Folder menu": "フォルダメニュー",
         "Name": "名前",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n}개 파일 완료 ({size})",
         "upload_errors": "{n}개 파일 실패",
         "upload_file_rejected": "일부 파일은 업로드되지 않았습니다.",
+        "delete_unfinished_upload": "완료되지 않은 업로드를 제거할까요?",
         "File menu": "파일 메뉴",
         "Folder menu": "폴더 메뉴",
         "Name": "이름",

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

@@ -95,6 +95,7 @@
         "upload_finished": "{n} baigta ({size})",
         "upload_errors": "{n} nepavyko",
         "upload_file_rejected": "Kai kurie failai nebuvo priimti",
+        "delete_unfinished_upload": "Pašalinti nebaigtą įkėlimą?",
         "File menu": "Failo meniu",
         "Folder menu": "Aplanko meniu",
         "Name": "Pavadinimas",

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

@@ -59,6 +59,7 @@
         "upload_finished": "{n} selesai ({size})",
         "upload_errors": "{n} gagal",
         "upload_file_rejected": "Beberapa fail tidak diterima",
+        "delete_unfinished_upload": "Alih keluar muat naik yang belum selesai?",
         "ready_to_upload": "{n,plural,one{# fail} other{# fail}}, {size}, sedia untuk dimuat naik",
         "Send": "Hantar",
         "download counter": "pengira muat turun",

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

@@ -95,6 +95,7 @@
         "upload_finished": "{n} voltooid ({size})",
         "upload_errors": "{n} niet voltooid",
         "upload_file_rejected": "Sommige bestanden zijn niet geaccepteerd",
+        "delete_unfinished_upload": "Onvoltooide upload verwijderen?",
         "File menu": "Bestand menu",
         "Folder menu": "Map menu",
         "Name": "Naam",

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

@@ -95,6 +95,7 @@
         "upload_finished": "{n} zakończonych ({size})",
         "upload_errors": "{n} nieudanych",
         "upload_file_rejected": "Niektóre pliki nie zostały zaakceptowane",
+        "delete_unfinished_upload": "Usunąć niedokończone przesyłanie?",
         "File menu": "Menu pliku",
         "Folder menu": "Menu folderu",
         "Name": "Nazwa",

package/src/langs/hfs-lang-pt-br.json

@@ -95,6 +95,7 @@
         "upload_finished": "{n} finalizado ({size})",
         "upload_errors": "{n} faliu",
         "upload_file_rejected": "Alguns arquivos não foram aceitos",
+        "delete_unfinished_upload": "Remover o envio inacabado?",
         "File menu": "Menu de arquivo",
         "Folder menu": "Menu de Pasta",
         "Name": "Nome",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} terminat ({size})",
         "upload_errors": "{n} eșuat",
         "upload_file_rejected": "Unele fișiere nu au fost acceptate",
+        "delete_unfinished_upload": "Eliminați încărcarea neterminată?",
         "File menu": "Meniu fișier",
         "Folder menu": "Meniu folder",
         "Name": "Nume",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n,plural, one{# файл загружен} few{# файла загружено} many{# файлов загружено}} ({size})",
         "upload_errors": "{n,plural, one{# файл} few{# файла} many{# файлов}} неуспешно",
         "upload_file_rejected": "Некоторые файлы не были приняты",
+        "delete_unfinished_upload": "Удалить незавершённую загрузку?",
         "File menu": "Меню файла",
         "Folder menu": "Меню папки",
         "Name": "Имя",

package/src/langs/hfs-lang-sr-latn.json

@@ -95,6 +95,7 @@
         "upload_finished": "{n} završeno ({size})",
         "upload_errors": "{n,plural, one{# nije uspeo} other{# neuspešna}}",
         "upload_file_rejected": "Neke datoteke nisu prihvaćene",
+        "delete_unfinished_upload": "Ukloniti nedovršeno otpremanje?",
         "File menu": "Meni datoteke",
         "Folder menu": "Meni fascikle",
         "Name": "Ime",

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

@@ -98,6 +98,7 @@
         "upload_finished": "{n} пребачен(о) ({size})",
         "upload_errors": "{n} неуспешно пребачен(их)",
         "upload_file_rejected": "Нека документа нису прихваћена",
+        "delete_unfinished_upload": "Уклонити недовршено отпремање?",
         "download counter": "бројач преузимања",
         "File menu": "Мени документа",
         "Folder menu": "Мени фолдера",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} เสร็จสิ้น ({size})",
         "upload_errors": "{n} ล้มเหลว",
         "upload_file_rejected": "บางไฟล์ไม่ได้รับการยอมรับ",
+        "delete_unfinished_upload": "ลบการอัปโหลดที่ยังไม่เสร็จหรือไม่?",
         "File menu": "เมนูไฟล์",
         "Folder menu": "เมนูโฟลเดอร์",
         "Name": "ชื่อ",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n} tamamlandı ({size})",
         "upload_errors": "{n} başarısız",
         "upload_file_rejected": "Bazı dosyalar kabul edilmiyor",
+        "delete_unfinished_upload": "Tamamlanmamış yüklemeyi kaldır?",
         "File menu": "Dosya Menüsü",
         "Folder menu": "Klasör Menüsü",
         "Name": "İsim",

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

@@ -96,6 +96,7 @@
         "upload_finished": "{n,plural, one{# файл завантажено} few{# файли завантажено} many{# файлів завантажено}} ({size})",
         "upload_errors": "{n,plural, one{# файл} few{# файли} many{# файлів}} неуспішно",
         "upload_file_rejected": "Деякі файли не були прийняті",
+        "delete_unfinished_upload": "Видалити незавершене завантаження?",
         "File menu": "Меню файлу",
         "Folder menu": "Меню теки",
         "Name": "Назва",

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

@@ -97,6 +97,7 @@
         "upload_finished": "{n} thành công ({size})",
         "upload_errors": "{n} thất bại",
         "upload_file_rejected": "Một số file bị cấm...",
+        "delete_unfinished_upload": "Xóa bản upload chưa hoàn tất?",
         "Download counter": "Bộ đếm download",
         "File menu": "Menu",
         "Folder menu": "Menu",

package/src/langs/hfs-lang-zh-tw.json

@@ -96,6 +96,7 @@
         "upload_finished": "{n} 個檔案完成 ({size})",
         "upload_errors": "{n} 失敗",
         "upload_file_rejected": "部分檔案不被允許",
+        "delete_unfinished_upload": "要移除未完成的上傳嗎？",
         "File menu": "檔案選單",
         "Folder menu": "資料夾選單",
         "Name": "名稱",

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

@@ -96,6 +96,7 @@
         "upload_finished": "上传{n} 完成 ({size})",
         "upload_errors": "上传失败{n} 次",
         "upload_file_rejected": "部分文件被服务器拒绝接收",
+        "delete_unfinished_upload": "要移除未完成的上传吗？",
         "File menu": "文件菜单",
         "Folder menu": "文件夹菜单",
         "Name": "名称",

package/src/listen.js

@@ -69,11 +69,12 @@ const argv_1 = require("./argv");
 const consoleLog_1 = require("./consoleLog");
 const first_1 = require("./first");
 const fileAttr_1 = require("./fileAttr");
+const uploadOwners_1 = require("./uploadOwners");
 let httpSrv;
 let 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);
+const openBrowserAtStart = (0, config_1.defineConfig)(misc_1.CFG.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() {
     return exports.baseUrl.get() || await nat_1.defaultBaseUrl.get();
@@ -87,7 +88,7 @@ const commonServerOptions = {
 };
 // these are properties that can be assigned to the server object
 const commonServerAssign = { headersTimeout: 30_000, timeout: misc_1.MINUTE }; // 'headersTimeout' is not recognized by type lib, and 'timeout' is not effective when passed in parameters
-const readyToListen = Promise.all([persistence_1.storedMap.isOpening(), fileAttr_1.fileAttrDb.isOpening(), events_1.default.once('app')]);
+const readyToListen = Promise.all([persistence_1.storedMap.isOpening(), fileAttr_1.fileAttrDb.isOpening(), uploadOwners_1.uploadOwners.isOpening(), events_1.default.once('app')]);
 const considerHttp = (0, misc_1.debounceAsync)(async () => {
     await readyToListen;
     void stopServer(httpSrv);
@@ -109,8 +110,8 @@ const considerHttp = (0, misc_1.debounceAsync)(async () => {
     }
 });
 let openOnce = true;
-exports.portCfg = (0, config_1.defineConfig)('port', 80);
-const listenInterface = (0, config_1.defineConfig)('listen_interface', '');
+exports.portCfg = (0, config_1.defineConfig)(misc_1.CFG.port, 80);
+const listenInterface = (0, config_1.defineConfig)(misc_1.CFG.listen_interface, '');
 (0, config_1.subMultipleConfigs)(considerHttp, [exports.portCfg, listenInterface]);
 function openAdmin() {
     for (const srv of [httpSrv, httpsSrv]) {
@@ -123,7 +124,7 @@ function openAdmin() {
         const baseUrl = `${srv.name}://${hostname}:${a.port}`;
         (0, open_1.default)(baseUrl + const_1.ADMIN_URI, { wait: true }).catch(async (e) => {
             console.debug(String(e));
-            console.warn("Cannot launch browser on this machine >PLEASE< open your browser and reach one of these (you may need a different address)", ...Object.values(await getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
+            console.warn("Cannot launch browser on this machine – open your browser and reach one of these (you may need a different address)", ...Object.values(await getUrls()).flat().map(x => '\n - ' + x + const_1.ADMIN_URI));
             if (!(0, adminApis_1.anyAccountCanLoginAdmin)())
                 (0, consoleLog_1.consoleHint)(`you can enter this command: create-admin YOUR_PASSWORD`);
         });
@@ -138,7 +139,8 @@ function getCertObject() {
     const all = new crypto_1.X509Certificate(c);
     const some = lodash_1.default.pick(all, ['subject', 'issuer', 'validFrom', 'validTo']);
     const ret = lodash_1.default.mapValues(some, v => v?.includes('=') ? Object.fromEntries(v.split('\n').map(x => x.split('='))) : v);
-    return Object.assign(ret, { altNames: all.subjectAltName?.replace(/DNS:/g, '').split(/, */) });
+    return Object.assign(ret, { altNames: all.subjectAltName?.split(/, */)
+            .map(x => x.replace(/^(?:DNS:|IP Address:)/, '')) });
 }
 const considerHttps = (0, misc_1.debounceAsync)(async () => {
     await readyToListen;
@@ -205,8 +207,8 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     nat_1.defaultBaseUrl.proto = 'https';
     nat_1.defaultBaseUrl.port = getCurrentPort(httpsSrv) ?? 0;
 }, { wait: 200 }); // give time to have key and cert ready
-exports.cert = (0, config_1.defineConfig)('cert', '', load);
-exports.privateKey = (0, config_1.defineConfig)('private_key', '', load);
+exports.cert = (0, config_1.defineConfig)(misc_1.CFG.cert, '', load);
+exports.privateKey = (0, config_1.defineConfig)(misc_1.CFG.private_key, '', load);
 const httpsNeeds = [exports.cert, exports.privateKey];
 function load(v, { object }) {
     object.watcher?.unwatch();
@@ -216,7 +218,7 @@ function load(v, { object }) {
     object.watcher = (0, watchLoad_1.watchLoad)(v, x => object.setCompiled(x), { immediateFirst: true });
     return '';
 }
-exports.httpsPortCfg = (0, config_1.defineConfig)('https_port', const_1.PORT_DISABLED);
+exports.httpsPortCfg = (0, config_1.defineConfig)(misc_1.CFG.https_port, const_1.PORT_DISABLED);
 (0, config_1.subMultipleConfigs)(considerHttps, [exports.httpsPortCfg, listenInterface, ...httpsNeeds]);
 const genericInterfaceNames = {
     '0.0.0.0': "any IPv4",
@@ -273,12 +275,14 @@ function startServer(srv, { port, host }) {
                 srv.error = String(e);
                 srv.busy = undefined;
                 const { code } = e;
-                if (code)
+                // share the lookup with status readers, but classify the error from its resolved result
+                if (code === 'EADDRINUSE' || code === 'EACCES')
                     srv.busy = (0, find_process_1.default)('port', port).then(res => res?.map(x => (0, misc_1.prefix)("Service", x.name === 'svchost.exe' && x.cmd.split(x.name)[1]?.trim()) || x.name).join(' + '), () => '');
-                if (code === 'EACCES' && port < 1024 && !srv.busy) // on Windows, when port is used by a service, we get EACCES
+                const busy = await srv.busy;
+                if (code === 'EACCES' && port < 1024 && !busy) // on Windows, when port is used by a service, we get EACCES
                     srv.error = `lacking permission on port ${port}, try with permission (${const_1.IS_WINDOWS ? 'administrator' : 'sudo'}) or port > 1024`;
-                if (code === 'EADDRINUSE' || srv.busy)
-                    srv.error = `port ${port} busy: ${await srv.busy || "unknown process"}`;
+                if (code === 'EADDRINUSE' || busy)
+                    srv.error = `port ${port} busy: ${busy || "unknown process"}`;
                 if (!silence)
                     console.error(srv.name, srv.error);
                 resolve(0);

package/src/log.js

@@ -82,8 +82,14 @@ class Logger {
         this.reopen();
     }
     reopen() {
-        return this.stream = (0, util_files_1.createFileWithPath)(this.path, { flags: 'a' })
-            ?.on('error', () => this.stream = undefined);
+        const { path } = this;
+        const s = this.stream = (0, util_files_1.createFileWithPath)(path, { flags: 'a' });
+        s?.on('error', e => {
+            if (this.stream === s) // a late error from an old stream must not detach its replacement
+                this.stream = undefined;
+            console.error("Cannot write log file", path, String(e));
+        });
+        return s;
     }
 }
 // we'll have names same as config keys. These are used also by the get_log api.
@@ -103,6 +109,7 @@ const logRotation = (0, config_1.defineConfig)(misc_1.CFG.log_rotation, 'weekly'
 const dontLogNet = (0, config_1.defineConfig)(misc_1.CFG.dont_log_net, '127.0.0.1|::1', v => (0, misc_1.makeNetMatcher)(v));
 const logUA = (0, config_1.defineConfig)(misc_1.CFG.log_ua, false);
 const logSpam = (0, config_1.defineConfig)(misc_1.CFG.log_spam, false);
+const logHost = (0, config_1.defineConfig)(misc_1.CFG.log_host, false);
 const debounce = lodash_1.default.debounce(cb => cb(), 1000); // with this technique, i'll be able to debounce some code respecting the references in its closure
 const logMw = async (ctx, next) => {
     const reqStart = new Date(); // request start
@@ -176,6 +183,8 @@ const logMw = async (ctx, next) => {
             ctx.logExtra({ country: conn.country });
         if (logUA.get())
             ctx.logExtra({ ua: ctx.get('user-agent') || undefined });
+        if (logHost.get())
+            ctx.logExtra({ host: ctx.get('host') || undefined });
         const extra = ctx.state.logExtra;
         if (events_2.default.anyListener(logger.name)) // small optimization: this event can happen often, while most times there's no listener, and the parameters object is constructed pointlessly. A benchmark measured it 20% faster (just the line), while maybe it was not necessary.
             events_2.default.emit(logger.name, { ctx, length, user, ts: reqEnd, uri, extra });

package/src/middlewares.js

@@ -21,10 +21,10 @@ const config_1 = require("./config");
 const koa_session_1 = __importDefault(require("koa-session"));
 const index_1 = require("./index");
 const events_1 = __importDefault(require("./events"));
-const forceHttps = (0, config_1.defineConfig)('force_https', true);
-(0, config_1.defineConfig)('ignore_proxies', false);
-const allowAuthorizationHeader = (0, config_1.defineConfig)('authorization_header', true);
-exports.sessionDuration = (0, config_1.defineConfig)('session_duration', Number(process.env.SESSION_DURATION) || misc_1.DAY / 1000, v => v * 1000);
+const forceHttps = (0, config_1.defineConfig)(misc_1.CFG.force_https, true);
+(0, config_1.defineConfig)(misc_1.CFG.ignore_proxies, false);
+const allowAuthorizationHeader = (0, config_1.defineConfig)(misc_1.CFG.authorization_header, true);
+exports.sessionDuration = (0, config_1.defineConfig)(misc_1.CFG.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 }, // flush is necessary for SSE, at least in Chrome145

package/src/misc.js

@@ -120,15 +120,15 @@ function asyncGeneratorToReadable(generator) {
     const iterator = generator[Symbol.asyncIterator]();
     return new stream_1.Readable({
         objectMode: true,
-        destroy() {
-            void iterator.return?.();
+        destroy(error, callback) {
+            Promise.resolve(iterator.return?.()).then(() => callback(error), callback);
         },
         read() {
             iterator.next().then(it => {
                 if (it.done)
                     this.emit('ending');
                 return this.push(it.done ? null : it.value);
-            });
+            }, e => this.destroy(e));
         }
     });
 }

package/src/multipartUpload.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleMultipartUpload = handleMultipartUpload;
 const busboy_1 = __importDefault(require("busboy"));
-const events_1 = require("events");
 const vfs_1 = require("./vfs");
 const path_1 = require("path");
 const upload_1 = require("./upload");
@@ -46,7 +45,7 @@ async function handleMultipartUpload(ctx, node) {
         ctx.status = cross_const_1.HTTP_BAD_REQUEST;
     });
     ctx.req.pipe(bb);
-    await (0, events_1.once)(bb, 'finish');
+    await new Promise(res => (0, first_1.onFirstEvent)(bb, ['finish', 'error'], res)); // parser errors are handled above as 400 and must complete the request without rejecting
     await Promise.all(fileJobs);
     if (!ctx.state.uploads?.length) {
         if (!errors.length)

package/src/nat.js

@@ -33,7 +33,7 @@ exports.defaultBaseUrl = (0, valtio_1.proxy)({
         return `${this.proto}://${(0, cross_1.ipForUrl)(ip || 'localhost')}${!port || port === defPort ? '' : ':' + port}`;
     }
 });
-exports.mappedPort = (0, config_1.defineConfig)('mapped_port', 0);
+exports.mappedPort = (0, config_1.defineConfig)(cross_1.CFG.mapped_port, 0);
 exports.upnpEnabled = (0, config_1.defineConfig)(cross_1.CFG.upnp_enabled, true);
 let upnpClient;
 // poll external ip – when UPnP is enabled, asking the modem is inexpensive, so it can be done often