hfs 3.2.1 → 3.3.0-alpha1

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

@@ -0,0 +1,182 @@
+{
+    "author": "Flis666",
+    "version": 1.0,
+    "hfs_version": "0.57.5",
+    "translate": {
+        "Select": "Wybierz",
+        "n_files": "{n,plural,one{# plik} other{# plików}}",
+        "n_folders": "{n,plural,one{# folder} other{# foldery}}",
+        "filter_count": "{n,plural,one{# filtered} other{# filtered}}",
+        "select_count": "{n,plural, one{# selected} other{# selected}}",
+        "filter_placeholder": "Wpisz tutaj, aby filtrować listę poniżej",
+        "Select some files": "Wybierz kilka plików",
+        "zip_checkboxes": "Użyj pól wyboru, aby zaznaczyć pliki, a następnie możesz ponownie użyć opcji Zip",
+        "zip_tooltip_selected": "Pobierz wybrane elementy jako pojedynczy plik zip",
+        "zip_tooltip_whole": "Pobierz całą listę (nieprzefiltrowaną) jako pojedynczy plik zip. Jeśli zaznaczysz niektóre elementy, pobrane zostaną tylko te.",
+        "zip_confirm_search": "Pobrać WSZYSTKIE wyniki tego wyszukiwania jako archiwum ZIP?",
+        "zip_confirm_folder": "Pobrać CAŁY folder jako archiwum ZIP?",
+        "select_tooltip": "Wybór dotyczy opcji „Zip” i „Usuń” (jeśli są dostępne), ale możesz także filtrować listę",
+        "delete_hint": "Aby usunąć, najpierw kliknij Wybierz",
+        "delete_confirm": "Usunąć {n,plural,one{# pozycję} other{# pozycje}}?",
+        "delete_completed": "Usuwanie: {n} zakończone",
+        "delete_failed": ", {n,plural,one{# failed} other{# failed}}",
+        "delete_select": "Wybierz coś do usunięcia",
+        "Delete": "Usuń",
+        "Options": "Opcje",
+        "Search": "Szukaj",
+        "Zip": "Zip",
+        "search_msg": "Przeszukaj ten folder i podfoldery",
+        "Searching": "Wyszukiwanie",
+        "Searched": "Przeszukano",
+        "Clear search": "Wyczyść wyszukiwanie",
+        "Interrupted": "Przerwane",
+        "stopped_before": "Zatrzymane przed znalezieniem czegokolwiek",
+        "empty_list": "Nic tu nie ma",
+        "filter_none": "Brak dopasowań dla tego filtra",
+        "Admin-panel": "Panel administracyjny",
+        "Login": "Zaloguj",
+        "Username": "Nazwa użytkownika",
+        "Password": "Hasło",
+        "login_untrusted": "Logowanie przerwane: tożsamość serwera nie może być uznana za wiarygodną",
+        "login_bad_credentials": "Nieprawidłowe dane logowania",
+        "login_bad_cookies": "Ciasteczka nie działają - logowanie nie powiodło się",
+        "User panel": "Panel użytkownika",
+        "Change password": "Zmień hasło",
+        "enter_pass": "Wprowadź nowe hasło",
+        "enter_pass2": "POWTÓRZ to samo nowe hasło",
+        "pass2_mismatch": "Drugie hasło, które wprowadziłeś, nie pasuje do pierwszego. Procedura przerwana.",
+        "password_changed": "hasło_zmienione",
+        "Logout": "Wyloguj",
+        "connection error": "błąd połączenia",
+        "Full timestamp:": "Pełny znacznik czasu:",
+        "Search was interrupted": "Wyszukiwanie zostało przerwane",
+        "Stop list": "Lista zatrzymań",
+        "download_starting": "Twój pobieranie powinno teraz rozpocząć się",
+        "wrong_account": "Konto {u} nie ma dostępu, spróbuj inne",
+        "no_upload_here": "Brak uprawnień do przesyłania w bieżącym folderze",
+        "Create folder": "Utwórz folder",
+        "Pick files": "Wybierz pliki",
+        "Pick folder": "Wybierz folder",
+        "ready_to_upload": "{n,plural,one{# plik} other{# pliki}}, {size}, gotowe do przesłania",
+        "Send": "Wyślij",
+        "Clear": "Wyczyść",
+        "failed_upload": "Nie można przesłać {name}",
+        "file too large": "plik jest zbyt duży",
+        "Enter folder name": "Wprowadź nazwę folderu",
+        "Successfully created": "Pomyślnie utworzono",
+        "enter_folder": "Wejdź do folderu",
+        "folder_exists": "Folder o tej samej nazwie już istnieje",
+        "Sort by:": "Sortuj według: {by}",
+        "name": "nazwa",
+        "extension": "rozszerzenie",
+        "size": "rozmiar",
+        "time": "czas",
+        "Invert order": "Odwróć kolejność",
+        "Folders first": "Najpierw foldery",
+        "Numeric names": "Nazwy numeryczne",
+        "theme:": "motyw:",
+        "auto": "auto",
+        "light": "jasny",
+        "dark": "ciemny",
+        "parent folder": "folder nadrzędny",
+        "home": "dom",
+        "Continue": "Kontynuuj",
+        "Confirm": "Potwierdź",
+        "Don't": "Nie",
+        "Warning": "Ostrzeżenie",
+        "Error": "Błąd",
+        "Info": "Informacja",
+        "Unauthorized": "Nieautoryzowany",
+        "Forbidden": "Zabronione",
+        "Not found": "Nie znaleziono",
+        "Server error": "Błąd serwera",
+        "Upload": "Prześlij",
+        "upload_concluded": "Przesyłanie zakończone:",
+        "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",
+        "file_open": "Otwórz",
+        "Download": "Pobierz",
+        "Missing permission": "Brak uprawnień",
+        "Reload": "Przeładuj",
+        "Get list": "Pobierz listę",
+        "Skip existing files": "Pomiń istniejące pliki",
+        "Size": "Rozmiar",
+        "Timestamp": "Znacznik czasu",
+        "Show": "Pokaż",
+        "Loading failed": "Nieudane ładowanie",
+        "Rename": "Zmień nazwę",
+        "Tiles mode:": "Tryb kafelków:",
+        "off": "wyłączony",
+        "Operation successful": "Operacja zakończona sukcesem",
+        "Uploader": "Przesyłający",
+        "Download counter": "Licznik pobierań",
+        "Switch zoom mode": "Przełącz tryb powiększenia",
+        "Full screen": "Pełny ekran",
+        "File Show help": "Pomoc dotycząca pliku",
+        "showHelpMain": "Możesz użyć klawiatury do niektórych działań:",
+        "showHelp_←/→": "←/→",
+        "showHelp_↑/↓": "↑/↓",
+        "showHelp_space": "spacja",
+        "showHelp_←/→_body": "Przejdź do poprzedniego/następnego pliku",
+        "showHelp_↑/↓_body": "Przewiń wysokie obrazy",
+        "Destination": "Cel",
+        "in_queue": "{n} w kolejce",
+        "enter_comment": "Komentarz dla {name}",
+        "Comment": "Komentarz",
+        "upload_dd_hint": "Możesz przesyłać pliki, przeciągając je na liście plików",
+        "Upload not available": "Przesyłanie niedostępne",
+        "Cut": "Wytnij",
+        "n_items": "{n,plural,one{# pozycję} other{# pozycje}}",
+        "move_results": "{good} przeniesiono, {bad} nieudanych",
+        "after_cut": "Twoje zaznaczenie jest teraz w schowku.\nPrzejdź do folderu docelowego, aby wkleić.",
+        "Cancel clipboard": "Anuluj schowek",
+        "to_clipboard_source": "Powrót do folderu źródłowego",
+        "Paste": "Wklej",
+        "clipboard_list": "Elementy w schowku:",
+        "Close": "Zamknij",
+        "Folder": "Folder",
+        "Web page": "Strona internetowa",
+        "Link": "Link",
+        "Auto-play": "Auto-odtwarzanie",
+        "autoplay_seconds": "Sekundy do oczekiwania na obrazy",
+        "Select all": "Wybierz wszystko",
+        "go_first": "Przejdź do pierwszego elementu",
+        "go_last": "Przejdź do ostatniego elementu",
+        "Shuffle": "Tasuj",
+        "Repeat": "Powtarzaj",
+        "showHelpListShortcut": "Z listy plików kliknij i przytrzymaj {key}, aby szybko pokazać",
+        "Invalid value": "Nieprawidłowa wartość",
+        "upload_interrupted": "{n} Przerwane",
+        "Overwrite policy": "Polityka nadpisania",
+        "Rename to avoid overwriting": "Zmień nazwę, aby uniknąć nadpisania",
+        "Overwrite existing files": "Nadpisz istniejące pliki",
+        "Menu": "Menu",
+        "clipboard": "Schowek ({content})",
+        "to_clipboard_source_tooltip": "Przejdź do folderu zawierającego elementy ze schowka",
+        "more_items": "{n} więcej elementów",
+        "Show details": "Pokaż szczegóły",
+        "upload_conflict": "już istnieje",
+        "Logged in": "Zalogowano",
+        "Logged out": "Wylogowano",
+        "Cancel": "Anuluj",
+        "allow_session_ip_change": "Zezwalaj na zmianę adresu IP podczas tej sesji",
+        "focus_hint": "Wpisując tekst na klawiaturze, możesz wyszukiwać i wybierać elementy na liście.",
+        "copy_links": "Kopiuj linki",
+        "Calculate": "Oblicz",
+        "Creation": "Utworzenie",
+        "creation": "utworzenie",
+        "required_change_password": "Musisz zmienić swoje hasło",
+        "Wildcards": "Symbole wieloznaczne",
+        "Considering resume": "Rozważanie wznowienia",
+        "Yes": "Tak",
+        "No": "Nie",
+        "esc_again": "Naciśnij ESC dwukrotnie do zamkniecia",
+        "insufficient storage": "za mało miejsca",
+        "Account disabled": "Konto wyłączone"
+    }
+}

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;
@@ -160,7 +162,6 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
                 const cn = certObj.subject?.CN;
                 if (cn)
                     console.log("Certificate loaded for", certObj.altNames?.join(' + ') || cn);
-                const now = new Date();
                 const from = new Date(certObj.validFrom);
                 const to = new Date(certObj.validTo);
                 updateError(); // error will change at from and to dates of the certificate
@@ -173,6 +174,7 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
                 function updateError() {
                     if (!httpsSrv)
                         return;
+                    const now = new Date();
                     httpsSrv.error = from > now ? "certificate not valid yet" : to < now ? "certificate expired" : undefined;
                 }
             }
@@ -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
@@ -142,9 +142,11 @@ const prepareState = async (ctx, next) => {
 };
 exports.prepareState = prepareState;
 function failAllowNet(ctx, a) {
-    const cached = ctx.session?.allowNet; // won't reflect changes until session is terminated
+    // a cached mask is valid only for the identity that stored it
+    const sameAccount = ctx.session?.username === (0, perm_1.normalizeUsername)(a?.username || '');
+    const cached = sameAccount ? ctx.session?.allowNet : undefined;
     const mask = cached ?? (0, perm_1.getFromAccount)(a || '', a => a.allow_net);
-    if (!cached && mask && ctx.session?.username)
+    if (sameAccount && !cached && mask)
         ctx.session.allowNet = mask; // must be deleted on logout by setLoggedIn
     const ret = mask && !(0, misc_1.netMatches)(ctx.ip, mask, true);
     if (ret)

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
@@ -144,8 +144,10 @@ 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) => {
         if (err)
             return reject(err);
-        if (!const_1.IS_WINDOWS)
-            return resolve(out.match(const_1.IS_MAC ? /default +([\d.]+)/ : /^0\.0\.0\.0 +([\d.]+)/)?.[1]);
+        if (!const_1.IS_WINDOWS) {
+            // linux route output starts with headers, so its default-route pattern must be multiline
+            return resolve(out.match(const_1.IS_MAC ? /default +([\d.]+)/ : /^0\.0\.0\.0 +([\d.]+)/m)?.[1]);
+        }
         const sortedByMetric = lodash_1.default.sortBy([...out.matchAll(/(?:0\.0\.0\.0 +){2}([\d.]+)\s+[\d.]+\s+(\d+)/g)], x => Number(x[2]));
         resolve(sortedByMetric[0]?.[1]); // take ip with lowest metric
     }));

package/src/outboundProxy.js

@@ -5,7 +5,15 @@ const util_http_1 = require("./util-http");
 const util_os_1 = require("./util-os");
 const const_1 = require("./const");
 const cross_1 = require("./cross");
+const node_net_1 = require("node:net");
+(0, config_1.defineConfig)(cross_1.CFG.outbound_interface, '', v => {
+    if (!v || (0, node_net_1.isIP)(v))
+        return util_http_1.httpStream.defaultLocalAddress = v || undefined;
+    console.warn("Invalid outbound interface IP", v);
+    util_http_1.httpStream.defaultLocalAddress = undefined;
+});
 const outboundProxy = (0, config_1.defineConfig)(cross_1.CFG.outbound_proxy, '', v => {
+    util_http_1.httpStream.defaultProxy = undefined;
     if (!v)
         return;
     try {

package/src/perm.js

@@ -59,7 +59,7 @@ function getAccount(username, normalize = true) {
 function saveSrpInfo(account, salt, verifier) {
     account.srp = String(salt) + '|' + String(verifier);
 }
-const createAdminConfig = (0, config_1.defineConfig)('create-admin', '');
+const createAdminConfig = (0, config_1.defineConfig)(misc_1.CFG['create-admin'], '');
 createAdminConfig.sub(v => {
     if (!v)
         return;
@@ -79,7 +79,9 @@ async function updateAccount(account, change) {
         await change?.(account);
     else {
         const u = normalizeUsername(change.username || '');
-        if (u && u !== usernameWas && getAccount(u))
+        if (!u)
+            delete change.username;
+        else if (u !== usernameWas && getAccount(u))
             throw "username already exists";
         Object.assign(account, lodash_1.default.mapValues(change, x => x || undefined));
     }
@@ -111,7 +113,7 @@ async function updateAccount(account, change) {
         saveAccountsAsap();
 }
 const saveAccountsAsap = config_1.saveConfigAsap;
-exports.accounts = (0, config_1.defineConfig)('accounts', {});
+exports.accounts = (0, config_1.defineConfig)(misc_1.CFG.accounts, {});
 exports.accounts.sub(lodash_1.default.debounce(obj => {
     // consider some validation here, in case of manual edit of the config
     lodash_1.default.each(obj, (rec, k) => {