hfs 0.46.1 → 0.47.0-alpha6

package/src/config.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveConfigAsap = exports.setConfig = exports.getWholeConfig = exports.getConfig = exports.configKeyExists = exports.defineConfig = void 0;
+exports.saveConfigAsap = exports.setConfig = exports.getWholeConfig = exports.getConfig = exports.configKeyExists = exports.defineConfig = exports.currentVersion = exports.versionToScalar = void 0;
 const events_1 = __importDefault(require("events"));
 const const_1 = require("./const");
 const watchLoad_1 = require("./watchLoad");
@@ -48,27 +48,30 @@ if (!(0, fs_1.existsSync)(filePath) && (0, fs_1.existsSync)(legacyPosition))
         catch (_b) { }
     }
 // takes a semver like 1.2.3-alpha1, but alpha and beta numbers must share the number progression
-const versionToScalar = lodash_1.default.memoize((ver) => {
-    var _a;
-    const [official, beta] = ver.split('-');
-    const numbers = official.split('.').map(Number);
-    if (numbers.length !== 3)
+exports.versionToScalar = lodash_1.default.memoize((ver) => {
+    // this regexp is supposed to be resistant to optional leading "v" and an optional custom name after a space
+    const res = /^v?(\d+)\.(\d+)\.(\d+)(?:-\D+([0-9.]+))?/.exec(ver);
+    if (!res)
         return NaN;
-    const officialScalar = numbers.reduce((acc, x, i) => acc + x * 1000 ** (2 - i), 0); // 1000 gives 3 digits for each number
-    const betaScalar = 1 / (beta && Number((_a = /\d+/.exec(beta)) === null || _a === void 0 ? void 0 : _a[0]) || Infinity); // beta tends to 0, while non-beta is 0
+    const [, a, b, c, beta] = res.map(Number);
+    const officialScalar = c + b * 1E3 + a * 1E6; // gives 3 digits for each number
+    const betaScalar = 1 / (1 + beta || Infinity); // beta tends to 0, while non-beta is 0. +1 to make it work even in case of alpha0
     return officialScalar - betaScalar;
 });
 class Version extends String {
     olderThan(otherVersion) {
-        return versionToScalar(this.valueOf()) < versionToScalar(otherVersion);
+        return (0, exports.versionToScalar)(this.valueOf()) < (0, exports.versionToScalar)(otherVersion);
+    }
+    getScalar() {
+        return (0, exports.versionToScalar)(this.valueOf());
     }
 }
 const CONFIG_CHANGE_EVENT_PREFIX = 'new.';
-const currentVersion = new Version(const_1.VERSION);
+exports.currentVersion = new Version(const_1.VERSION);
 const configVersion = defineConfig('version', const_1.VERSION, v => new Version(v));
 function defineConfig(k, defaultValue, compiler) {
     configProps[k] = { defaultValue };
-    let compiled = compiler === null || compiler === void 0 ? void 0 : compiler(defaultValue, { version: currentVersion, defaultValue });
+    let compiled = compiler === null || compiler === void 0 ? void 0 : compiler(defaultValue, { version: exports.currentVersion, defaultValue });
     const ret = {
         key() {
             return k;
@@ -112,7 +115,7 @@ function defineConfig(k, defaultValue, compiler) {
 }
 exports.defineConfig = defineConfig;
 function configKeyExists(k) {
-    return k in configProps;
+    return configProps.hasOwnProperty(k);
 }
 exports.configKeyExists = configKeyExists;
 const stack = [];
@@ -162,7 +165,7 @@ function setConfig(newCfg, save) {
     if (version !== const_1.VERSION) // be sure to save version
         (0, exports.saveConfigAsap)();
     function apply(k, newV, isDefault = false) {
-        return setConfig1(k, newV, save === undefined, argCfg && k in argCfg || isDefault ? currentVersion : version);
+        return setConfig1(k, newV, save === undefined, argCfg && k in argCfg || isDefault ? exports.currentVersion : version);
     }
 }
 exports.setConfig = setConfig;

package/src/connections.js

@@ -6,7 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConnection = exports.socket2connection = exports.getConnections = exports.newConnection = exports.normalizeIp = exports.Connection = void 0;
 const events_1 = __importDefault(require("./events"));
-const lodash_1 = __importDefault(require("lodash"));
 class Connection {
     constructor(socket) {
         this.socket = socket;
@@ -49,9 +48,9 @@ function socket2connection(socket) {
 }
 exports.socket2connection = socket2connection;
 function updateConnection(conn, change) {
-    // if no change is detected, skip update. ctx is a special case
-    if (!change.ctx && Object.entries(change).every(([k, v]) => lodash_1.default.isEqual(v, conn[k])))
-        return;
+    var _a;
+    if (change.op)
+        (_a = change.opProgress) !== null && _a !== void 0 ? _a : (change.opProgress = change.opOffset || 0);
     Object.assign(conn, change);
     events_1.default.emit('connectionUpdated', conn, change);
 }

package/src/consoleLog.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.consoleLog = void 0;
+const events_1 = __importDefault(require("./events"));
+exports.consoleLog = [];
+for (const k of ['log', 'warn', 'error']) {
+    const original = console[k];
+    console[k] = (...args) => {
+        const rec = { ts: new Date(), k, msg: args.join(' ') };
+        exports.consoleLog.push(rec);
+        events_1.default.emit('console', rec);
+        return original(...args);
+    };
+}

package/src/const.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.APP_PATH = exports.IS_BINARY = exports.IS_WINDOWS = exports.HTTP_SERVER_ERROR = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = exports.HFS_REPO = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.DAY = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.argv = void 0;
+exports.APP_PATH = exports.IS_BINARY = exports.IS_WINDOWS = exports.HTTP_SERVER_ERROR = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = exports.HFS_REPO = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.DAY = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.argv = void 0;
 const minimist_1 = __importDefault(require("minimist"));
 const fs = __importStar(require("fs"));
 const os_1 = require("os");
@@ -38,11 +38,12 @@ exports.DEV = process.env.DEV || exports.argv.dev ? 'DEV' : '';
 exports.ORIGINAL_CWD = process.cwd();
 exports.HFS_STARTED = new Date();
 const PKG_PATH = (0, path_1.join)(__dirname, '..', 'package.json');
-exports.BUILD_TIMESTAMP = "2023-07-08T18:00:25.802Z";
+exports.BUILD_TIMESTAMP = "2023-08-03T13:37:16.289Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
+exports.RUNNING_BETA = exports.VERSION.includes('-');
 exports.DAY = 86400000;
-exports.API_VERSION = 8.23;
+exports.API_VERSION = 8.3;
 exports.COMPATIBLE_API_VERSION = 1; // while changes in the api are not breaking, this number stays the same, otherwise it is made equal to API_VERSION
 exports.HFS_REPO = 'rejetto/hfs';
 exports.SPECIAL_URI = '/~/';

package/src/frontEndApis.js

@@ -53,13 +53,19 @@ exports.frontEndApis = {
             }
         });
     },
-    async get_file_details({ uri }, ctx) {
-        apiAssertTypes({ string: { uri } });
-        const node = await (0, vfs_1.urlToNode)(uri, ctx);
-        if (!node)
-            return new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND);
+    async get_file_details({ uris }, ctx) {
+        if (typeof (uris === null || uris === void 0 ? void 0 : uris[0]) !== 'string')
+            return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad uris');
         return {
-            upload: node.source && await (0, upload_1.getUploadMeta)(node.source).catch(() => undefined)
+            details: Promise.all(uris.map(async (uri) => {
+                if (typeof uri !== 'string')
+                    return false; // false means error
+                const node = await (0, vfs_1.urlToNode)(uri, ctx);
+                if (!node)
+                    return false;
+                const upload = node.source && await (0, upload_1.getUploadMeta)(node.source).catch(() => undefined);
+                return upload && { upload };
+            }))
         };
     },
     async create_folder({ uri, name }, ctx) {
@@ -127,8 +133,9 @@ function notifyClient(ctx, name, data) {
 exports.notifyClient = notifyClient;
 const NOTIFICATION_PREFIX = 'notificationChannel:';
 function apiAssertTypes(paramsByType) {
-    for (const [type, params] of Object.entries(paramsByType))
-        for (const [name, val] of Object.entries(params))
-            if (typeof val !== type)
-                throw new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'bad ' + name);
+    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

@@ -36,7 +36,7 @@ async function downloadPlugin(repo, branch = '', overwrite) {
             return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
         const folder2repo = getFolder2repo();
         const folder = overwrite ? lodash_1.default.findKey(folder2repo, x => x === repo) // use existing folder
-            : short in folder2repo ? repo.replace('/', '-') // longer form only if another plugin is using short form
+            : folder2repo.hasOwnProperty(short) ? repo.replace('/', '-') // longer form only if another plugin is using short form
                 : short;
         const installPath = plugins_1.PATH + '/' + folder;
         const GITHUB_ZIP_ROOT = short + '-' + branch; // GitHub puts everything within this folder

package/src/index.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 const koa_1 = __importDefault(require("koa"));
 const koa_mount_1 = __importDefault(require("koa-mount"));
+require("./consoleLog");
 const apiMiddleware_1 = require("./apiMiddleware");
 const const_1 = require("./const");
 const frontEndApis_1 = require("./frontEndApis");
@@ -24,7 +25,8 @@ const assert_1 = require("assert");
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
 const koa_session_1 = __importDefault(require("koa-session"));
-(0, assert_1.ok)(lodash_1.default.intersection(Object.keys(frontEndApis_1.frontEndApis), Object.keys(adminApis_1.adminApis)).length === 0); // they share same endpoints
+(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)

package/src/langs/embedded.js

@@ -13,4 +13,6 @@ const hfs_lang_zh_tw_json_1 = __importDefault(require("./hfs-lang-zh-tw.json"));
 const hfs_lang_fr_json_1 = __importDefault(require("./hfs-lang-fr.json"));
 const hfs_lang_pt_json_1 = __importDefault(require("./hfs-lang-pt.json"));
 const hfs_lang_vi_json_1 = __importDefault(require("./hfs-lang-vi.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 };
+const hfs_lang_es_json_1 = __importDefault(require("./hfs-lang-es.json"));
+const hfs_lang_nl_json_1 = __importDefault(require("./hfs-lang-nl.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 };

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

@@ -0,0 +1,118 @@
+{
+    "author": "Eidy Estupiñan Varona",
+    "version": 1.0,
+    "hfs_version": "0.46.0",
+    "translate": {
+        "Select": "Seleccionar",
+        "n_files": "{n,plural,one{# archivo} other {# archivos}}",
+        "n_folders": "{n,plural,one{# carpeta} other{# carpetas}}",
+        "filter_count": "{n,plural, one{# filtrado} other{# filtrados}}",
+        "select_count": "{n,plural, one{# seleccionado} other{# seleccionados}}",
+        "filter_placeholder": "Escriba aquí para filtrar la lista a continuación",
+        "Select some files": "Seleccione algunos archivos",
+        "zip_checkboxes": "Use casillas de verificación para seleccionar los archivos, luego puede usar la opción Zip nuevamente",
+        "zip_tooltip_selected": "Descargue los elementos seleccionados como un solo archivo zip",
+        "zip_tooltip_whole": "Descargue la lista completa (sin filtrar) como un solo archivo zip. Si selecciona algunos elementos, solo se descargarán esos.",
+        "zip_confirm_search": "¿Descargar TODOS los resultados de esta búsqueda como archivo ZIP?",
+        "zip_confirm_folder": "¿Descargar toda la carpeta como archivo Zip?",
+        "select_tooltip": "La selección se aplica a \"Zip\" y \"Eliminar\" (cuando esté disponible), pero también puede filtrar la lista",
+        "delete_hint": "Para eliminar, primero debe seleccionar",
+        "delete_confirm": "Eliminar {n,plural, one {# elemento} other {# elementos}}?",
+        "delete_completed": "Eliminado: {n} completado",
+        "delete_failed": ", {n,plural, one {# fallo} other{# fallaron}}",
+        "delete_select": "Seleccione algo para eliminar",
+        "Delete": "Eliminar",
+        "Options": "Opciones",
+        "Search": "Buscar",
+        "Zip": "Zip",
+        "search_msg": "Buscar esta carpeta y subcarpetas",
+        "Searching": "Buscando",
+        "Searched": "Buscado",
+        "Clear search": "Limpiar búsqueda",
+        "Interrupted": "Interrumpido",
+        "stopped_before": "stopped_before",
+        "empty_list": "Lista vacia",
+        "filter_none": "No filtrado",
+        "Admin-panel": "Administración",
+        "Login": "Acceder",
+        "Username": "Usuario",
+        "Password": "Contraseña",
+        "login_untrusted": "Acceso abortado: la identidad del servidor no es confiable",
+        "login_bad_credentials": "Credenciales no válidas",
+        "login_bad_cookies": "Las Cookies no funcionan - acceso fallido",
+        "User panel": "Panel de usuario",
+        "Change password": "Cambiar contraseña",
+        "enter_pass": "Nueva contraseña",
+        "enter_pass2": "Confirmación",
+        "pass2_mismatch": "Error: Las contraseñas no coinciden. cambio abortado.",
+        "password_changed": "Contraseña cambiada",
+        "Logout": "Salir",
+        "connection error": "Error de conexión",
+        "Full timestamp:": "Fecha - Hora completa",
+        "Search was interrupted": "La búsqueda fue interrumpida",
+        "Stop list": "Detener Lista",
+        "upload_starting": "Su descarga debería iniciar ahora",
+        "wrong_account": "La cuenta {u} no tiene acceso, prueba otra",
+        "no_upload_here": "No tiene permisos para subir a la carpeta actual",
+        "Create folder": "Crear carpeta",
+        "Pick files": "Seleccioanr archivo",
+        "Pick folder": "Seleccionar carpeta",
+        "send_files": "Enviar {n,plural,one {# archivo} other{# archivos}}, {size}",
+        "Clear": "Limpiar",
+        "failed_upload": "No se puede subir {name}",
+        "confirm_resume": "Continuar subida?",
+        "file too large": "archivo demasiado grande",
+        "Enter folder name": "Nombre de la carpeta",
+        "Successfully created": "Creado satisfactoriamente",
+        "enter_folder": "Entre la carpeta",
+        "folder_exists": "Ya existe una carpeta con ese nombre",
+        "Sort by": "Ordenar por",
+        "name": "nombre",
+        "extension": "extensión",
+        "size": "tamaño",
+        "time": "fecha",
+        "Invert order": "Invertir orden",
+        "Folders first": "Carpetas primero",
+        "Numeric names": "Nombres numéricos",
+        "theme:": "Tema",
+        "auto": "auto",
+        "light": "Claro",
+        "dark": "Oscuro",
+        "parent folder": "Carpeta superior",
+        "home": "inicio",
+        "Continue": "Continuar",
+        "Confirm": "Confirmar",
+        "Don't": "Cancelar",
+        "Warning": "Alerta",
+        "Error": "Error",
+        "Info": "Info",
+        "Unauthorized": "No autorizado",
+        "Forbidden": "Denegado",
+        "Not found": "No encontrado",
+        "Server error": "Server error",
+        "Upload": "Subir",
+        "upload_concluded": "Subida completada",
+        "upload_finished": "{n} completado ({size})",
+        "upload_errors": "{n} fallido",
+        "upload_file_rejected": "Algunos archivos no fueron aceptados",
+        "File menu": "Archivo",
+        "Folder menu": "Carpeta",
+        "Name": "Nombre",
+        "file_open": "Abrir",
+        "Download": "Descargar",
+        "Missing permission": "No dispone de permisos",
+        "Reload": "Recargar",
+        "Get list": "Obtener lista",
+        "Skip existing files": "Saltar archivos existentes",
+        "Size": "Tamaño",
+        "Timestamp": "Feha - Hora",
+        "Show": "Mostrar",
+        "Loading failed": "Carga fallida",
+        "Rename": "Renombrar",
+        "Tiles mode:": "Cantidad elementos",
+        "off": "Apagado",
+        "Operation successful": "Operación Completada",
+        "Uploader": "Subido por",
+        "Download counter": "Contador de descargas"
+    }
+}

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

@@ -1,7 +1,7 @@
 {
     "author": "Massimo Melina",
-    "version": 1.6,
-    "hfs_version": "0.46.0",
+    "version": 1.7,
+    "hfs_version": "0.47.0",
     "translate": {
         "Select": "Seleziona",
         "n_files": "{n} file",
@@ -64,10 +64,10 @@
         "Successfully created": "Creazione riuscita",
         "enter_folder": "Accedi alla nuova cartella",
         "folder_exists": "Questo nome esiste già",
-        "Sort by": "Ordinamento",
+        "Sort by:": "Ordina per {by}",
         "name": "nome",
         "extension": "estensione",
-        "size": "dimensioni",
+        "size": "dimensione",
         "time": "data/ora",
         "Invert order": "Inverti ordine",
         "Folders first": "Prima le cartelle",
@@ -107,6 +107,8 @@
         "off": "no",
         "Operation successful": "Operazione riuscita",
         "Uploader": "Upload da",
-        "Download counter": "Download conteggiati"
+        "Download counter": "Download conteggiati",
+        "Switch _z_oom mode": "Cambia _z_oom",
+        "_F_ull screen": "Pieno schermo (_F_)"
     }
 }

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

@@ -0,0 +1,118 @@
+{
+    "author": "H.F.P. Pit - PH5HP",
+    "version": 1.0,
+    "hfs_version": "0.46.0",
+    "translate": {
+        "Select": "Selecteer",
+        "n_files": "{n,plural,one{# bestand} other{# bestanden}}",
+        "n_folders": "{n,plural,one{# map} other{# mappen}}",
+        "filter_count": "{n,plural, one{# gefilterd} other{# gefilterd}}",
+        "select_count": "{n,plural, one{# geselecteerd} other{# geselecteerd}}",
+        "filter_placeholder": "Typ hier om de lijst hieronder te filteren",
+        "Select some files": "Selecteer enige bestanden",
+        "zip_checkboxes": "Gebruik checkboxes om de bestanden te selecteren, daarna kunt U Zip opnieuw gebruiken",
+        "zip_tooltip_selected": "Download geselecteerde elementen als 1 zip bestand",
+        "zip_tooltip_whole": "Download de hele lijst (niet gefilterd) als 1 zip bestand. Als U sommige elementen selecteerd, dan zullen alleen die gedownload worden.",
+        "zip_confirm_search": "Download ALLE resultaten van deze zoekopdracht als een ZIP archief?",
+        "zip_confirm_folder": "Download de HELE map als een ZIP archief?",
+        "select_tooltip": "Selection applies to \"Zip\" and \"Delete\" (when available), but you can also filter the list",
+        "delete_hint": "Om te verwijderen, klik eerst op Select",
+        "delete_confirm": "Verwijder {n,plural, one{# item} other{# items}}?",
+        "delete_completed": "Verwijderen: {n} voltooid",
+        "delete_failed": ", {n,plural, one{# mislukt} other{# mislukt}}",
+        "delete_select": "Selecteer iets om te verwijderen",
+        "Delete": "Verwijder",
+        "Options": "Opties",
+        "Search": "Zoek",
+        "Zip": "Zip",
+        "search_msg": "Doorzoek deze map en sub-mappen",
+        "Searching": "Aan het zoeken",
+        "Searched": "Gezocht",
+        "Clear search": "Verwijder zoekopdracht",
+        "Interrupted": "Onderbroken",
+        "stopped_before": "stopped_before",
+        "empty_list": "lege_lijst",
+        "filter_none": "filter_niets",
+        "Admin-panel": "Admin-panel",
+        "Login": "Inloggen",
+        "Username": "Gebruikersnaam",
+        "Password": "Password",
+        "login_untrusted": "Inloggen afgebroken: server identiteit kan niet worden vertrouwd",
+        "login_bad_credentials": "Ontoereikende bevoegdheden",
+        "login_bad_cookies": "Cookies werken niet - inloggen mislukt",
+        "User panel": "Gebruikers paneel",
+        "Change password": "Verander password",
+        "enter_pass": "Geef nieuw password",
+        "enter_pass2": "Geef opnieuw hetzelfde nieuwe password",
+        "pass2_mismatch": "Het 2e password dat U hebt ingegeven komt niet met de 1e overeen. Procedure afgebroken.",
+        "password_changed": "password_veranderd",
+        "Logout": "Log uit",
+        "connection error": "connectie fout",
+        "Full timestamp:": "Volledige timestamp:",
+        "Search was interrupted": "Zoeken is onderbroken",
+        "Stop list": "Stop lijst",
+        "upload_starting": "Uw download zou nu moeten starten",
+        "wrong_account": "Account {u} heeft geen toegang, probeer een andere",
+        "no_upload_here": "Geen upload toestemming voor de huidige map",
+        "Create folder": "Creeer map",
+        "Pick files": "Kies bestand",
+        "Pick folder": "Kies map",
+        "send_files": "Verzonden {n,plural,one{# bestand} other{# bestanden}}, {grootte}",
+        "Clear": "Clear",
+        "failed_upload": "Kon het niet uploaden {name}",
+        "confirm_resume": "Upload hervatten?",
+        "file too large": "bestand te groot",
+        "Enter folder name": "Geef map naam in",
+        "Successfully created": "Succesvol gecreeerd",
+        "enter_folder": "Ga naar de map",
+        "folder_exists": "Map met dezelfde naam bestaan al",
+        "Sort by": "Gesorteerd op",
+        "name": "naam",
+        "extension": "extensie",
+        "size": "grootte",
+        "time": "tijd",
+        "Invert order": "Inveer volgorde",
+        "Folders first": "Mappen eerst",
+        "Numeric names": "Numerieke namen",
+        "theme:": "thema:",
+        "auto": "auto",
+        "light": "licht",
+        "dark": "donker",
+        "parent folder": "map terug",
+        "home": "thuis",
+        "Continue": "Doorgaan",
+        "Confirm": "Bevestig",
+        "Don't": "Niet doen",
+        "Warning": "Waarschuwing",
+        "Error": "Fout",
+        "Info": "Info",
+        "Unauthorized": "Niet ge-authoriseerd",
+        "Forbidden": "Verboden",
+        "Not found": "Niet gevonden",
+        "Server error": "Server fout",
+        "Upload": "Upload",
+        "upload_concluded": "Upload afgesloten:",
+        "upload_finished": "{n} voltooid ({size})",
+        "upload_errors": "{n} niet voltooid",
+        "upload_file_rejected": "Sommige bestanden zijn niet geaccepteerd",
+        "File menu": "Bestand menu",
+        "Folder menu": "Map menu",
+        "Name": "Naam",
+        "file_open": "Open",
+        "Download": "Download",
+        "Missing permission": "Toestemming ontbreekt",
+        "Reload": "Herlaad",
+        "Get list": "Laad lijst",
+        "Skip existing files": "Sla bestaande bestanden over",
+        "Size": "Grootte",
+        "Timestamp": "Timestamp",
+        "Show": "Laat zien",
+        "Loading failed": "Laden mislukt",
+        "Rename": "Herbenoemen",
+        "Tiles mode:": "Tegels mode:",
+        "off": "uit",
+        "Operation successful": "Operatie succesvol",
+        "Uploader": "Uploader",
+        "Download counter": "Download teller"
+    }
+}

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

@@ -1,7 +1,7 @@
 {
     "author": "Mefistofell, SanokKule",
-    "version": 1.97,
-    "hfs_version": "0.46.0",
+    "version": 1.98,
+    "hfs_version": "0.47.0",
     "translate": {
         "Select": "Выбор",
         "n_files": "{n,plural, one{1 файл} few{# файла} other{# файлов}}",
@@ -66,7 +66,7 @@
         "Successfully created": "Успешно создано",
         "enter_folder": "Перейти в папку",
         "folder_exists": "Папка уже существует",
-        "Sort by": "Сортировка по",
+        "Sort by:": "Сортировка по: {by}",
         "name": "имени",
         "extension": "расширению",
         "size": "размеру",

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

@@ -1,7 +1,7 @@
 {
-    "author": "yx3016",
-    "version": 1.1,
-    "hfs_version": "0.40.1",
+    "author": "yx3016 & MircoH0",
+    "version": 1.2,
+    "hfs_version": "0.46.0",
     "translate": {
         "Select": "选择",
         "n_files": "{n} 个文件",
@@ -85,14 +85,34 @@
         "Don't": "取消",
         "Warning": "警告",
         "Error": "错误",
+        "Info": "信息",
         "Unauthorized": "未授权",
         "Forbidden": "禁止",
         "Not found": "未找到",
         "Server error": "服务器错误",
         "Upload": "上传",
-        "Upload terminated": "上传已终止",
+        "upload_concluded": "上传已终止:",
         "upload_finished": "上传{n} 结束 ({size})",
         "upload_errors": "上传失败{n} 失败",
-        "download counter": "download 计数"
+        "upload_file_rejected": "部分文件被服务器拒绝接收",
+        "File menu": "文件菜单",
+        "Folder menu": "文件夹菜单",
+        "Name": "名称",
+        "file_open": "打开",
+        "Download": "下载",
+        "Missing permission": "权限缺失",
+        "Reload": "刷新",
+        "Get list": "生成列表",
+        "Skip existing files": "跳过已存在的文件",
+        "Size": "大小",
+        "Timestamp": "时间戳",
+        "Show": "显示",
+        "Loading failed": "加载失败",
+        "Rename": "重命名",
+        "Tiles mode:": "图标平铺模式:",
+        "off": "关闭",
+        "Operation successful": "操作执行成功",
+        "Uploader": "上传者",
+        "Download counter": "下载计数"
     }
 }

package/src/log.js

@@ -70,7 +70,7 @@ class Logger {
 const accessLogger = new Logger('log');
 const accessErrorLog = new Logger('error_log');
 exports.loggers = [accessLogger, accessErrorLog];
-(0, config_1.defineConfig)('log', 'logs/access.log').sub(path => {
+(0, config_1.defineConfig)(accessLogger.name, 'logs/access.log').sub(path => {
     console.debug('access log file: ' + (path || 'disabled'));
     accessLogger.setPath(path);
 });
@@ -86,7 +86,9 @@ const logMw = async (ctx, next) => {
     const now = new Date();
     await next();
     console.debug(ctx.status, ctx.method, ctx.originalUrl);
-    Promise.race([(0, stream_1.once)(ctx.res, 'finish'), (0, stream_1.once)(ctx.res, 'close')]).then(() => {
+    // don't await, as we don't want to hold the middlewares chain
+    ctx.state.completed = Promise.race([(0, stream_1.once)(ctx.res, 'finish'), (0, stream_1.once)(ctx.res, 'close')]);
+    ctx.state.completed.then(() => {
         var _a, _b, _c, _d, _e;
         if (ctx.state.dont_log)
             return;
@@ -111,7 +113,7 @@ const logMw = async (ctx, next) => {
                     (0, fs_1.renameSync)(path, path + '-' + postfix);
                 }
                 catch (e) { // ok, rename failed, but this doesn't mean we ain't gonna log
-                    console.error(e);
+                    console.error(String(e || e.message));
                 }
                 stream = logger.reopen(); // keep variable updated
                 if (!stream)

package/src/middlewares.js

@@ -222,9 +222,9 @@ const prepareState = async (ctx, next) => {
     ctx.state.account = (_a = await getHttpAccount(ctx)) !== null && _a !== void 0 ? _a : (0, perm_1.getAccount)((_b = ctx.session) === null || _b === void 0 ? void 0 : _b.username, false);
     const conn = ctx.state.connection = (0, connections_1.socket2connection)(ctx.socket);
     ctx.state.revProxyPath = ctx.get('x-forwarded-prefix');
-    await next();
     if (conn)
-        (0, connections_1.updateConnection)(conn, { ctx });
+        (0, connections_1.updateConnection)(conn, { ctx, op: undefined });
+    await next();
 };
 exports.prepareState = prepareState;
 async function getHttpAccount(ctx) {

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.try_ = exports.stream2string = exports.tryJson = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.with_ = exports.hasProp = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.removeStarting = exports.enforceFinal = exports.debounceAsync = void 0;
+exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.with_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.removeStarting = exports.enforceFinal = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -166,6 +166,10 @@ function typedKeys(o) {
     return Object.keys(o);
 }
 exports.typedKeys = typedKeys;
+function typedEntries(o) {
+    return Object.entries(o);
+}
+exports.typedEntries = typedEntries;
 function hasProp(obj, key) {
     return key in obj;
 }

package/src/perm.js

@@ -62,7 +62,7 @@ async function updateAccount(account, changer) {
     if (account.belongs) {
         account.belongs = (0, misc_1.wantArray)(account.belongs);
         lodash_1.default.remove(account.belongs, b => {
-            if (b in accounts)
+            if (accounts.hasOwnProperty(b))
                 return;
             console.error(`account ${username} belongs to non-existing ${b}`);
             return true;