hfs 0.26.9 → 0.29.0

package/src/api.monitor.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,6 +24,7 @@ const apis = {
         const list = new apiMiddleware_1.SendListReadable({ addAtStart: (0, connections_1.getConnections)().map(c => serializeConnection(c)) });
         const throttledUpdate = lodash_1.default.throttle(update, 1000 / 20); // try to avoid clogging with updates
         const state = Symbol('state'); // undefined=added, Timeout=add-pending, false=removed
+        list.props({ you: ctx.ip });
         return list.events(ctx, {
             connection(conn) {
                 conn[state] = setTimeout(() => add(conn), 100);

package/src/api.plugins.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/api.vfs.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -10,10 +10,9 @@ const promises_1 = require("fs/promises");
 const apiMiddleware_1 = require("./apiMiddleware");
 const path_1 = require("path");
 const misc_1 = require("./misc");
-const child_process_1 = require("child_process");
-const util_1 = require("util");
 const const_1 = require("./const");
 const micromatch_1 = require("micromatch");
+const util_os_1 = require("./util-os");
 // to manipulate the tree we need the original node
 async function urlToNodeOriginal(uri) {
     const n = await (0, vfs_1.urlToNode)(uri);
@@ -21,7 +20,10 @@ async function urlToNodeOriginal(uri) {
 }
 const apis = {
     async get_vfs() {
-        return { root: vfs_1.vfs && await recur(vfs_1.vfs) };
+        return {
+            root: vfs_1.vfs && await recur(vfs_1.vfs),
+            defaultPerms: vfs_1.defaultPerms,
+        };
         async function recur(node) {
             const dir = await (0, vfs_1.nodeIsDirectory)(node);
             const stats = {};
@@ -49,8 +51,8 @@ const apis = {
     async set_vfs({ uri, props }) {
         const n = await urlToNodeOriginal(uri);
         if (!n)
-            return new apiMiddleware_1.ApiError(404, 'path not found');
-        props = pickProps(props, ['name', 'source', 'can_see', 'can_read', 'masks', 'default']);
+            return new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND, 'path not found');
+        props = pickProps(props, ['name', 'source', 'masks', 'default', ...Object.keys(vfs_1.defaultPerms)]);
         props = (0, misc_1.objSameKeys)(props, v => v === null ? undefined : v); // null is a way to serialize undefined, that will restore default values
         if (props.masks && typeof props.masks !== 'object')
             delete props.masks;
@@ -63,35 +65,35 @@ const apis = {
     async add_vfs({ under, source, name }) {
         const n = under ? await urlToNodeOriginal(under) : vfs_1.vfs;
         if (!n)
-            return new apiMiddleware_1.ApiError(404, 'invalid under');
+            return new apiMiddleware_1.ApiError(const_1.HTTP_NOT_FOUND, 'invalid under');
         if (n.isTemp || !await (0, vfs_1.nodeIsDirectory)(n))
-            return new apiMiddleware_1.ApiError(const_1.FORBIDDEN, 'invalid under');
+            return new apiMiddleware_1.ApiError(const_1.HTTP_NOT_ACCEPTABLE, 'invalid under');
         if ((0, misc_1.isWindowsDrive)(source))
             source += '\\'; // slash must be included, otherwise it will refer to the cwd of that drive
         const a = n.children || (n.children = []);
         if (source && a.find(x => x.source === source))
-            return new apiMiddleware_1.ApiError(409, 'already present');
+            return new apiMiddleware_1.ApiError(const_1.HTTP_CONFLICT, 'already present');
         a.unshift({ source, name });
         await (0, vfs_1.saveVfs)();
         return {};
     },
     async del_vfs({ uris }) {
         if (!uris || !Array.isArray(uris))
-            return new apiMiddleware_1.ApiError(400, 'invalid uris');
+            return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, 'invalid uris');
         return {
             errors: await Promise.all(uris.map(async (uri) => {
                 if (typeof uri !== 'string')
-                    return 400;
+                    return const_1.HTTP_BAD_REQUEST;
                 const node = await urlToNodeOriginal(uri);
                 if (!node)
-                    return 404;
+                    return const_1.HTTP_NOT_FOUND;
                 const parent = (0, path_1.dirname)(uri);
                 const parentNode = await urlToNodeOriginal(parent);
                 if (!parentNode)
-                    return const_1.FORBIDDEN;
+                    return const_1.HTTP_NOT_ACCEPTABLE;
                 const { children } = parentNode;
                 if (!children) // shouldn't happen
-                    return 500;
+                    return const_1.HTTP_SERVER_ERROR;
                 const idx = children.indexOf(node);
                 children.splice(idx, 1);
                 (0, vfs_1.saveVfs)();
@@ -112,7 +114,7 @@ const apis = {
     async *ls({ path, files = true, fileMask }, ctx) {
         if (!path && const_1.IS_WINDOWS) {
             try {
-                for (const n of await getDrives())
+                for (const n of await (0, util_os_1.getDrives)())
                     yield { add: { n, k: 'd' } };
             }
             catch (error) {
@@ -158,7 +160,3 @@ function pickProps(o, keys) {
                 ret[k] = o[k] === null || o[k] === '' ? undefined : o[k];
     return ret;
 }
-async function getDrives() {
-    const { stdout } = await (0, util_1.promisify)(child_process_1.exec)('wmic logicaldisk get name');
-    return stdout.split('\n').slice(1).map(x => x.trim()).filter(Boolean);
-}

package/src/apiMiddleware.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,7 +13,7 @@ const const_1 = require("./const");
 const lodash_1 = __importDefault(require("lodash"));
 class ApiError extends Error {
     constructor(status, message) {
-        super(typeof message === 'string' ? message : message === null || message === void 0 ? void 0 : message.message);
+        super(typeof message === 'string' ? message : message && message instanceof Error ? message.message : JSON.stringify(message));
         this.status = status;
     }
 }
@@ -22,21 +22,25 @@ function apiMiddleware(apis) {
     return async (ctx) => {
         const { params } = ctx;
         console.debug('API', ctx.method, ctx.path, { ...params });
-        if (!apis.hasOwnProperty(ctx.path)) {
+        const apiFun = apis.hasOwnProperty(ctx.path) && apis[ctx.path];
+        if (!apiFun) {
             ctx.body = 'invalid api';
-            return ctx.status = 404;
+            return ctx.status = const_1.HTTP_NOT_FOUND;
         }
+        ctx.params = ctx.method === 'POST' ? (0, misc_1.tryJson)(await (0, misc_1.stream2string)(ctx.req))
+            : (0, misc_1.objSameKeys)(ctx.query, x => Array.isArray(x) ? x : (0, misc_1.tryJson)(x));
+        console.debug('API', ctx.method, ctx.path, { ...ctx.params });
         const csrf = ctx.cookies.get('csrf');
         // we don't rely on SameSite cookie option because it's https-only
-        let res = csrf && csrf !== params.csrf ? new ApiError(const_1.UNAUTHORIZED, 'csrf')
-            : await apis[ctx.path](params || {}, ctx);
+        let res = csrf && csrf !== ctx.params.csrf ? new ApiError(const_1.HTTP_UNAUTHORIZED, 'csrf')
+            : await apiFun(ctx.params || {}, ctx);
         if (isAsyncGenerator(res))
             res = (0, misc_1.asyncGeneratorToReadable)(res);
         if (res instanceof stream_1.Readable) { // Readable, we'll go SSE-mode
             res.pipe((0, sse_1.default)(ctx));
-            const stillRes = res; // satisfy ts
+            const resAsReadable = res; // satisfy ts
             ctx.req.on('close', () => // by closing the generated stream, creator of the stream will know the request is over without having to access anything else
-             stillRes.destroy());
+             resAsReadable.destroy());
             return;
         }
         if (res instanceof ApiError) {
@@ -45,7 +49,7 @@ function apiMiddleware(apis) {
         }
         if (res instanceof Error) { // generic exception
             ctx.body = String(res);
-            return ctx.status = 400;
+            return ctx.status = const_1.HTTP_BAD_REQUEST;
         }
         ctx.body = res;
     };
@@ -95,6 +99,9 @@ class SendListReadable extends stream_1.Readable {
     custom(data) {
         this._push(data);
     }
+    props(props) {
+        this._push({ props });
+    }
     error(msg, close = false) {
         this._push({ error: msg });
         this.lastError = msg;

package/src/block.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/commands.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/config.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -147,7 +147,8 @@ function setConfig1(k, newV, saveChanges = true) {
     var _a;
     if (lodash_1.default.isPlainObject(newV))
         newV = lodash_1.default.pickBy(newV, x => x !== undefined);
-    if ((0, misc_1.same)(newV, (_a = configProps[k]) === null || _a === void 0 ? void 0 : _a.defaultValue))
+    const def = (_a = configProps[k]) === null || _a === void 0 ? void 0 : _a.defaultValue;
+    if ((0, misc_1.same)(newV !== null && newV !== void 0 ? newV : null, def !== null && def !== void 0 ? def : null))
         newV = undefined;
     if (started && (0, misc_1.same)(newV, state[k]))
         return; // no change

package/src/connections.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/const.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -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_WINDOWS = exports.UNAUTHORIZED = exports.FORBIDDEN = exports.NO_CONTENT = exports.METHOD_NOT_ALLOWED = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.SESSION_DURATION = exports.DAY = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.argv = void 0;
+exports.APP_PATH = exports.IS_WINDOWS = exports.HTTP_SERVER_ERROR = 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.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.SESSION_DURATION = exports.DAY = 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");
@@ -50,10 +50,22 @@ exports.FRONTEND_URI = exports.SPECIAL_URI + 'frontend/';
 exports.ADMIN_URI = exports.SPECIAL_URI + 'admin/';
 exports.API_URI = exports.SPECIAL_URI + 'api/';
 exports.PLUGINS_PUB_URI = exports.SPECIAL_URI + 'plugins/';
-exports.METHOD_NOT_ALLOWED = 405;
-exports.NO_CONTENT = 204;
-exports.FORBIDDEN = 403;
-exports.UNAUTHORIZED = 401;
+exports.HTTP_OK = 200;
+exports.HTTP_NO_CONTENT = 204;
+exports.HTTP_PARTIAL_CONTENT = 206;
+exports.HTTP_TEMPORARY_REDIRECT = 302;
+exports.HTTP_NOT_MODIFIED = 304;
+exports.HTTP_BAD_REQUEST = 400;
+exports.HTTP_UNAUTHORIZED = 401;
+exports.HTTP_FORBIDDEN = 403;
+exports.HTTP_NOT_FOUND = 404;
+exports.HTTP_METHOD_NOT_ALLOWED = 405;
+exports.HTTP_NOT_ACCEPTABLE = 406;
+exports.HTTP_CONFLICT = 409;
+exports.HTTP_PAYLOAD_TOO_LARGE = 413;
+exports.HTTP_RANGE_NOT_SATISFIABLE = 416;
+exports.HTTP_FOOL = 418;
+exports.HTTP_SERVER_ERROR = 500;
 exports.IS_WINDOWS = process.platform === 'win32';
 const IS_BINARY = !(0, path_1.basename)(process.argv0).includes('node'); // this won't be node if pkg was used
 exports.APP_PATH = (0, path_1.dirname)(IS_BINARY ? process.argv0 : __dirname);
@@ -62,7 +74,7 @@ if (exports.DEV)
     console.clear();
 else
     console.debug = () => { };
-console.log(`HFS ~ HTTP File Server - Copyright 2021-2022, Massimo Melina <a@rejetto.com>`);
+console.log(`HFS ~ HTTP File Server - Copyright 2021-2023, Massimo Melina <a@rejetto.com>`);
 console.log(`License https://www.gnu.org/licenses/gpl-3.0.txt`);
 console.log('started', exports.HFS_STARTED.toLocaleString(), exports.DEV);
 console.log('version', exports.VERSION || '-');

package/src/crypt.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/debounceAsync.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 Object.defineProperty(exports, "__esModule", { value: true });
 // like lodash.debounce, but also avoids async invocations to overlap
 function debounceAsync(callback, wait = 100, { leading = false, maxWait = Infinity } = {}) {

package/src/events.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/src/frontEndApis.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -23,16 +23,37 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.frontEndApis = void 0;
+exports.notifyClient = exports.frontEndApis = void 0;
+const apiMiddleware_1 = require("./apiMiddleware");
 const api_file_list_1 = require("./api.file_list");
 const api_auth = __importStar(require("./api.auth"));
 const config_1 = require("./config");
+const events_1 = __importDefault(require("./events"));
 const customHeader = (0, config_1.defineConfig)('custom_header');
 exports.frontEndApis = {
     file_list: api_file_list_1.file_list,
     ...api_auth,
     config() {
         return Object.fromEntries([customHeader].map(x => [x.key(), x.get()]));
+    },
+    get_notifications({ channel }, ctx) {
+        const list = new apiMiddleware_1.SendListReadable();
+        list.ready(); // on chrome109 EventSource doesn't emit 'open' until something is sent
+        return list.events(ctx, {
+            [NOTIFICATION_PREFIX + channel](name, data) {
+                list.custom({ name, data });
+            }
+        });
     }
 };
+function notifyClient(ctx, name, data) {
+    const { notificationChannel } = ctx.query;
+    if (notificationChannel)
+        events_1.default.emit(NOTIFICATION_PREFIX + notificationChannel, name, data);
+}
+exports.notifyClient = notifyClient;
+const NOTIFICATION_PREFIX = 'notificationChannel:';

package/src/github.js

@@ -1,4 +1,5 @@
 "use strict";
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,6 +10,7 @@ const misc_1 = require("./misc");
 const plugins_1 = require("./plugins");
 const apiMiddleware_1 = require("./apiMiddleware");
 const lodash_1 = __importDefault(require("lodash"));
+const const_1 = require("./const");
 const DIST_ROOT = 'dist/';
 const downloading = {};
 function downloadProgress(id, status) {
@@ -20,12 +22,14 @@ function downloadProgress(id, status) {
 }
 async function downloadPlugin(repo, branch = '', overwrite) {
     if (downloading[repo])
-        return new apiMiddleware_1.ApiError(409, "already downloading");
+        return new apiMiddleware_1.ApiError(const_1.HTTP_CONFLICT, "already downloading");
     downloadProgress(repo, true);
     const rec = await getRepoInfo(repo);
     if (!branch)
         branch = rec.default_branch;
     const short = repo.split('/')[1]; // second part, repo without the owner
+    if (!short)
+        return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
     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

package/src/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,6 +23,7 @@ const config_1 = require("./config");
 const assert_1 = require("assert");
 const lodash_1 = __importDefault(require("lodash"));
 const misc_1 = require("./misc");
+//import body from 'koa-better-body'
 (0, assert_1.ok)(lodash_1.default.intersection(Object.keys(frontEndApis_1.frontEndApis), Object.keys(adminApis_1.adminApis)).length === 0); // they share same endpoints
 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 });
@@ -33,16 +34,17 @@ exports.app.use(middlewares_1.someSecurity)
     .use((0, log_1.log)())
     .use(throttler_1.throttler)
     .use(middlewares_1.gzipper)
-    .use(middlewares_1.paramsDecoder)
     .use((0, plugins_1.pluginsMiddleware)())
     .use((0, koa_mount_1.default)(const_1.API_URI, (0, apiMiddleware_1.apiMiddleware)({ ...frontEndApis_1.frontEndApis, ...adminApis_1.adminApis })))
+    //.use(body({ multipart: false }))
     .use(middlewares_1.serveGuiAndSharedFiles)
     .on('error', errorHandler);
 function errorHandler(err) {
     const { code } = err;
     if (const_1.DEV && code === 'ENOENT' && err.path.endsWith('sockjs-node'))
         return; // spam out dev stuff
-    if (code === 'ECANCELED' || code === 'ECONNRESET' || code === 'ECONNABORTED' || code === 'EPIPE')
+    if (code === 'ECANCELED' || code === 'ECONNRESET' || code === 'ECONNABORTED' || code === 'EPIPE'
+        || code === 'HPE_INVALID_EOF_STATE')
         return; // someone interrupted, don't care
     console.error('server error', err);
 }

package/src/listen.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -132,6 +132,8 @@ function startServer(srv, { port, host }) {
         try {
             if (port < 0 || !host && !await testIpV4()) // !host means ipV4+6, and if v4 port alone is busy we won't be notified of the failure, so we'll first test it on its own
                 return resolve(0);
+            // from a few tests, this seems enough to support the expect-100 http/1.1 mechanism, at least with curl -T, not used by chrome|firefox anyway
+            srv.on('checkContinue', (req, res) => srv.emit('request', req, res));
             port = await listen(host);
             if (port)
                 console.log(srv.name, "serving on", host || "any network", ':', port);
@@ -223,9 +225,10 @@ function printUrls(port, proto) {
         if (!nets || ignore.test(name))
             continue;
         lodash_1.default.remove(nets, 'internal');
-        if (!nets.length)
+        const first = nets[0];
+        if (!first)
             continue;
-        const best = lodash_1.default.find(nets, { family: 'IPv4' }) || nets[0];
+        const best = lodash_1.default.find(nets, { family: 'IPv4' }) || first;
         const appendPort = port === (proto === 'https' ? 443 : 80) ? '' : ':' + port;
         let { address } = best;
         if (address.includes(':'))

package/src/log.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -35,7 +35,7 @@ const promises_1 = require("fs/promises");
 const const_1 = require("./const");
 const events_1 = __importDefault(require("./events"));
 const lodash_1 = __importDefault(require("lodash"));
-const path_1 = require("path");
+const util_files_1 = require("./util-files");
 const perm_1 = require("./perm");
 class Logger {
     constructor(name) {
@@ -54,8 +54,8 @@ class Logger {
             this.last = stats.mtime || stats.ctime;
         }
         catch (_b) {
-            await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true })
-                .catch(() => console.log("cannot create folder for", path));
+            if (await (0, util_files_1.prepareFolder)(path) === false)
+                console.log("cannot create folder for", path);
         }
         this.reopen();
     }
@@ -81,7 +81,7 @@ const logRotation = (0, config_1.defineConfig)('log_rotation', 'weekly');
 function log() {
     const debounce = lodash_1.default.debounce(cb => cb(), 1000);
     return async (ctx, next) => {
-        var _a;
+        var _a, _b;
         await next();
         const isError = ctx.status >= 400;
         const logger = isError && accessErrorLog || accessLogger;
@@ -112,7 +112,7 @@ function log() {
             }
         }
         const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s\n'; // Apache's Common Log Format
-        const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + a[5].slice(3);
+        const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + ((_b = a[5]) === null || _b === void 0 ? void 0 : _b.slice(3));
         const user = (0, perm_1.getCurrentUsername)(ctx);
         events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status', 'length']), { user, ts: now, uri: ctx.path }));
         console.debug(ctx.status, ctx.method, ctx.path);

package/src/middlewares.js

@@ -1,10 +1,10 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.serveGuiAndSharedFiles = exports.sessions = exports.headRequests = exports.gzipper = void 0;
+exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.serveGuiAndSharedFiles = exports.sessions = exports.headRequests = exports.gzipper = void 0;
 const koa_compress_1 = __importDefault(require("koa-compress"));
 const koa_session_1 = __importDefault(require("koa-session"));
 const const_1 = require("./const");
@@ -22,6 +22,10 @@ const connections_1 = require("./connections");
 const basic_auth_1 = __importDefault(require("basic-auth"));
 const tssrp6a_1 = require("tssrp6a");
 const api_auth_1 = require("./api.auth");
+const path_1 = require("path");
+const promises_1 = require("stream/promises");
+const formidable_1 = __importDefault(require("formidable"));
+const upload_1 = require("./upload");
 exports.gzipper = (0, koa_compress_1.default)({
     threshold: 2048,
     gzip: { flush: require('zlib').constants.Z_SYNC_FLUSH },
@@ -66,9 +70,33 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         return ctx.redirect(const_1.ADMIN_URI);
     if (path.startsWith(const_1.ADMIN_URI))
         return serveAdminPrefixed(ctx, next);
+    if (ctx.method === 'PUT') { // curl -T file url/
+        const decPath = decodeURI(path);
+        let rest = (0, path_1.basename)(decPath);
+        const folder = await (0, vfs_1.urlToNode)((0, path_1.dirname)(decPath), ctx, vfs_1.vfs, v => rest = v + '/' + rest);
+        if (!folder)
+            return ctx.status = const_1.HTTP_NOT_FOUND;
+        const dest = (0, upload_1.uploadWriter)(folder, rest, ctx);
+        if (dest) {
+            await (0, promises_1.pipeline)(ctx.req, dest);
+            ctx.body = {};
+        }
+        return;
+    }
     const node = await (0, vfs_1.urlToNode)(path, ctx);
     if (!node)
-        return ctx.status = 404;
+        return ctx.status = const_1.HTTP_NOT_FOUND;
+    if (ctx.method === 'POST') { // curl -F upload=@file url/
+        ctx.body = {};
+        const form = (0, formidable_1.default)({
+            maxFileSize: Infinity,
+            //@ts-ignore wrong in the .d.ts file
+            fileWriteStreamHandler: f => (0, upload_1.uploadWriter)(node, f.originalFilename, ctx)
+        });
+        form.parse(ctx.req);
+        await (0, stream_1.once)(form, 'end').catch(() => { });
+        return;
+    }
     const canRead = (0, vfs_1.hasPermission)(node, 'can_read', ctx);
     const isFolder = await (0, vfs_1.nodeIsDirectory)(node);
     if (isFolder && !path.endsWith('/'))
@@ -78,7 +106,7 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
             : next();
     if (!canRead) {
         ctx.status = (0, vfs_1.cantReadStatusCode)(node);
-        if (ctx.status === const_1.FORBIDDEN)
+        if (ctx.status === const_1.HTTP_FORBIDDEN)
             return;
         const browserDetected = ctx.get('Upgrade-Insecure-Requests') || ctx.get('Sec-Fetch-Mode'); // ugh, heuristics
         if (!browserDetected) // we don't want to trigger basic authentication on browsers, it's meant for download managers only
@@ -151,25 +179,3 @@ async function srpCheck(username, password) {
     const clientRes2 = await clientRes1.step2(BigInt(salt), BigInt(pubKey));
     return await step1.step2(clientRes2.A, clientRes2.M1).then(() => true, () => false);
 }
-// unify get/post parameters, with JSON decoding to not be limited to strings
-const paramsDecoder = async (ctx, next) => {
-    ctx.params = ctx.method === 'POST' ? (0, misc_1.tryJson)(await getReqData(ctx.req))
-        : (0, misc_1.objSameKeys)(ctx.query, x => Array.isArray(x) ? x : (0, misc_1.tryJson)(x));
-    await next();
-};
-exports.paramsDecoder = paramsDecoder;
-async function getReqData(req) {
-    return new Promise((resolve, reject) => {
-        let data = '';
-        req.on('data', chunk => data += chunk);
-        req.on('error', reject);
-        req.on('end', () => {
-            try {
-                resolve(data);
-            }
-            catch (e) {
-                reject(e);
-            }
-        });
-    });
-}

package/src/misc.js

@@ -1,5 +1,5 @@
 "use strict";
-// This file is part of HFS - Copyright 2021-2022, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -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.tryJson = exports.same = exports.isLocalHost = exports.with_ = 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.wait = exports.objSameKeys = exports.setHidden = exports.prefix = exports.enforceFinal = exports.debounceAsync = void 0;
+exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.isLocalHost = exports.with_ = 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.wait = exports.objSameKeys = exports.setHidden = exports.prefix = exports.enforceFinal = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -158,3 +158,28 @@ function tryJson(s) {
     catch (_a) { }
 }
 exports.tryJson = tryJson;
+async function stream2string(stream) {
+    return new Promise((resolve, reject) => {
+        let data = '';
+        stream.on('data', chunk => data += chunk);
+        stream.on('error', reject);
+        stream.on('end', () => {
+            try {
+                resolve(data);
+            }
+            catch (e) {
+                reject(e);
+            }
+        });
+    });
+}
+exports.stream2string = stream2string;
+function try_(cb, onException) {
+    try {
+        return cb();
+    }
+    catch (e) {
+        return onException === null || onException === void 0 ? void 0 : onException(e);
+    }
+}
+exports.try_ = try_;