hfs 0.45.0 → 0.46.0

package/src/log.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.log = exports.loggers = void 0;
+exports.logMw = exports.loggers = void 0;
 const stream_1 = require("stream");
 const config_1 = require("./config");
 const fs_1 = require("fs");
@@ -38,6 +38,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const util_files_1 = require("./util-files");
 const perm_1 = require("./perm");
 const misc_1 = require("./misc");
+const events_1 = __importDefault(require("./events"));
 class Logger {
     constructor(name) {
         this.name = name;
@@ -80,54 +81,56 @@ errorLogFile.sub(path => {
 });
 const logRotation = (0, config_1.defineConfig)('log_rotation', 'weekly');
 const dontLogNet = (0, config_1.defineConfig)('dont_log_net', '127.0.0.1|::1', v => (0, misc_1.makeNetMatcher)(v));
-function log() {
-    const debounce = lodash_1.default.debounce(cb => cb(), 1000);
-    return async (ctx, next) => {
-        const now = new Date();
-        await next();
-        console.debug(ctx.status, ctx.method, ctx.path);
-        Promise.race([(0, stream_1.once)(ctx.res, 'finish'), (0, stream_1.once)(ctx.res, 'close')]).then(() => {
-            var _a, _b, _c, _d;
-            if (dontLogNet.compiled()(ctx.ip))
-                return;
-            const isError = ctx.status >= 400;
-            const logger = isError && accessErrorLog || accessLogger;
-            const rotate = (_a = logRotation.get()) === null || _a === void 0 ? void 0 : _a[0];
-            let { stream, last, path } = logger;
-            if (!stream)
-                return;
-            logger.last = now;
-            if (rotate && last) { // rotation enabled and a file exists?
-                const passed = Number(now) - Number(last)
-                    - 3600000; // be pessimistic and count a possible DST change
-                if (rotate === 'm' && (passed >= 31 * const_1.DAY || now.getMonth() !== last.getMonth())
-                    || rotate === 'd' && (passed >= const_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
-                    || rotate === 'w' && (passed >= 7 * const_1.DAY || now.getDay() < last.getDay())) {
-                    stream.end();
-                    const postfix = last.getFullYear() + '-' + doubleDigit(last.getMonth() + 1) + '-' + doubleDigit(last.getDate());
-                    try { // other logging requests shouldn't happen while we are renaming. Since this is very infrequent we can tolerate solving this by making it sync.
-                        (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);
-                    }
-                    stream = logger.reopen(); // keep variable updated
-                    if (!stream)
-                        return;
+const debounce = lodash_1.default.debounce(cb => cb(), 1000);
+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(() => {
+        var _a, _b, _c, _d, _e;
+        if (ctx.state.dont_log)
+            return;
+        if (dontLogNet.compiled()(ctx.ip))
+            return;
+        const isError = ctx.status >= 400;
+        const logger = isError && accessErrorLog || accessLogger;
+        const rotate = (_a = logRotation.get()) === null || _a === void 0 ? void 0 : _a[0];
+        let { stream, last, path } = logger;
+        if (!stream)
+            return;
+        logger.last = now;
+        if (rotate && last) { // rotation enabled and a file exists?
+            const passed = Number(now) - Number(last)
+                - 3600000; // be pessimistic and count a possible DST change
+            if (rotate === 'm' && (passed >= 31 * const_1.DAY || now.getMonth() !== last.getMonth())
+                || rotate === 'd' && (passed >= const_1.DAY || now.getDate() !== last.getDate()) // checking passed will solve the case when the day of the month is the same but a month has passed
+                || rotate === 'w' && (passed >= 7 * const_1.DAY || now.getDay() < last.getDay())) {
+                stream.end();
+                const postfix = last.getFullYear() + '-' + doubleDigit(last.getMonth() + 1) + '-' + doubleDigit(last.getDate());
+                try { // other logging requests shouldn't happen while we are renaming. Since this is very infrequent we can tolerate solving this by making it sync.
+                    (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);
+                }
+                stream = logger.reopen(); // keep variable updated
+                if (!stream)
+                    return;
             }
-            const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s\n'; // Apache's Common Log Format
-            const a = now.toString().split(' ');
-            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);
-            const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
-            debounce(() => // once in a while we check if the file is still good (not deleted, etc), or we'll reopen it
-             (0, promises_1.stat)(logger.path).catch(() => logger.reopen())); // async = smoother but we may lose some entries
-            stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, ctx.path, ctx.req.httpVersion, ctx.status, (_d = length === null || length === void 0 ? void 0 : length.toString()) !== null && _d !== void 0 ? _d : '-'));
-        });
-    };
-}
-exports.log = log;
+        }
+        const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s\n'; // Apache's Common Log Format
+        const a = now.toString().split(' ');
+        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);
+        const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
+        const uri = (_d = ctx.originalUrl) === null || _d === void 0 ? void 0 : _d.replace(/&?csrf=[^&]+/, ''); // temporary workaround. To avoid csrf in url we need to stop using EventSource.
+        events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri }));
+        debounce(() => // once in a while we check if the file is still good (not deleted, etc), or we'll reopen it
+         (0, promises_1.stat)(logger.path).catch(() => logger.reopen())); // async = smoother but we may lose some entries
+        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, (_e = length === null || length === void 0 ? void 0 : length.toString()) !== null && _e !== void 0 ? _e : '-'));
+    });
+};
+exports.logMw = logMw;
 function doubleDigit(n) {
     return n > 9 ? n : '0' + n;
 }

package/src/middlewares.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.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.sendErrorPage = exports.serveGuiAndSharedFiles = exports.headRequests = exports.gzipper = exports.sessionDuration = void 0;
+exports.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.baseUrl = exports.sendErrorPage = exports.serveGuiAndSharedFiles = exports.headRequests = exports.gzipper = exports.sessionDuration = void 0;
 const koa_compress_1 = __importDefault(require("koa-compress"));
 const const_1 = require("./const");
 const const_2 = require("./const");
@@ -159,13 +159,13 @@ const errorMessages = {
     [const_1.HTTP_UNAUTHORIZED]: "Unauthorized",
     [const_1.HTTP_FORBIDDEN]: "Forbidden",
 };
-const baseUrl = (0, config_1.defineConfig)('base_url', '');
+exports.baseUrl = (0, config_1.defineConfig)('base_url', '');
 async function sendFolderList(node, ctx) {
     let { depth = 0, folders, prepend } = ctx.query;
     ctx.type = 'text';
     if (prepend === undefined || prepend === '*') { // * = force auto-detection even if we have baseUrl set
         const { URL } = ctx;
-        const base = prepend === undefined && baseUrl.get()
+        const base = prepend === undefined && exports.baseUrl.get()
             || URL.protocol + '//' + URL.host + ctx.state.revProxyPath;
         prepend = base + ctx.originalUrl.split('?')[0];
     }
@@ -179,6 +179,13 @@ async function sendFolderList(node, ctx) {
 let proxyDetected;
 const someSecurity = async (ctx, next) => {
     ctx.request.ip = (0, connections_1.normalizeIp)(ctx.ip);
+    // don't allow sessions to change ip
+    const ss = ctx.session;
+    if (ss === null || ss === void 0 ? void 0 : ss.username)
+        if (!ss.ip)
+            ss.ip = ctx.ip;
+        else if (ss.ip !== ctx.ip)
+            delete ss.username;
     try {
         if ((0, misc_1.dirTraversal)(decodeURI(ctx.path)))
             return ctx.status = const_1.HTTP_FOOL;

package/src/plugins.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.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.mapPlugins = exports.getPluginInfo = exports.setPluginConfig = exports.enablePlugin = exports.isPluginRunning = exports.DISABLING_POSTFIX = exports.PATH = void 0;
+exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.findPluginByRepo = exports.mapPlugins = exports.getPluginInfo = exports.setPluginConfig = exports.startPlugin = exports.stopPlugin = exports.enablePlugin = exports.isPluginEnabled = exports.isPluginRunning = exports.STORAGE_FOLDER = exports.DISABLING_POSTFIX = exports.PATH = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const watchLoad_1 = require("./watchLoad");
 const lodash_1 = __importDefault(require("lodash"));
@@ -44,18 +44,48 @@ const path_1 = require("path");
 const customHtml_1 = require("./customHtml");
 exports.PATH = 'plugins';
 exports.DISABLING_POSTFIX = '-disabled';
+exports.STORAGE_FOLDER = 'storage';
 const plugins = {};
 function isPluginRunning(id) {
     var _a;
-    return (_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.started;
+    return Boolean((_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.started);
 }
 exports.isPluginRunning = isPluginRunning;
+function isPluginEnabled(id) {
+    return exports.enablePlugins.get().includes(id);
+}
+exports.isPluginEnabled = isPluginEnabled;
 function enablePlugin(id, state = true) {
-    exports.enablePlugins.set(arr => arr.includes(id) === state ? arr
-        : state ? [...arr, id]
-            : arr.filter((x) => x !== id));
+    if (state && !getPluginInfo(id))
+        throw Error('miss');
+    exports.enablePlugins.set(arr => {
+        if (arr.includes(id) === state)
+            return arr;
+        console.log("switching plugin", id, state ? "on" : "off");
+        return arr.includes(id) === state ? arr
+            : state ? [...arr, id]
+                : arr.filter((x) => x !== id);
+    });
 }
 exports.enablePlugin = enablePlugin;
+async function stopPlugin(id) {
+    enablePlugin(id, false);
+    await waitRunning(id, false);
+}
+exports.stopPlugin = stopPlugin;
+async function startPlugin(id) {
+    enablePlugin(id);
+    await waitRunning(id);
+}
+exports.startPlugin = startPlugin;
+async function waitRunning(id, state = true) {
+    while (isPluginRunning(id) !== state) {
+        await (0, misc_1.wait)(500);
+        const error = getError(id);
+        if (error)
+            throw Error(error);
+    }
+}
 // nullish values are equivalent to defaultValues
 function setPluginConfig(id, changes) {
     exports.pluginsConfig.set(allConfigs => {
@@ -83,53 +113,56 @@ function mapPlugins(cb) {
     }).filter(x => x !== undefined);
 }
 exports.mapPlugins = mapPlugins;
+function findPluginByRepo(repo) {
+    return lodash_1.default.find(plugins, pl => { var _a; return ((_a = pl.getData()) === null || _a === void 0 ? void 0 : _a.repo) === repo; })
+        || lodash_1.default.find(availablePlugins, { repo });
+}
+exports.findPluginByRepo = findPluginByRepo;
 function getPluginConfigFields(id) {
     var _a;
     return (_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.getData().config;
 }
 exports.getPluginConfigFields = getPluginConfigFields;
-function pluginsMiddleware() {
-    return async (ctx, next) => {
-        var _a;
-        const after = {};
-        // run middleware plugins
-        for (const [id, pl] of Object.entries(plugins))
-            try {
-                const res = await ((_a = pl.middleware) === null || _a === void 0 ? void 0 : _a.call(pl, ctx));
-                if (res === true)
-                    ctx.pluginStopped = true;
-                if (typeof res === 'function')
-                    after[id] = res;
-            }
-            catch (e) {
-                printError(id, e);
-            }
-        // expose public plugins' files
-        const { path } = ctx;
-        if (!ctx.pluginStopped) {
-            if (path.startsWith(const_1.PLUGINS_PUB_URI)) {
-                const a = path.substring(const_1.PLUGINS_PUB_URI.length).split('/');
-                const name = a.shift();
-                if (plugins.hasOwnProperty(name)) // do it only if the plugin is loaded
-                    await (0, serveFile_1.serveFile)(ctx, plugins[name].folder + '/public/' + a.join('/'), 'auto');
-                return;
-            }
-            await next();
+const pluginsMiddleware = async (ctx, next) => {
+    var _a;
+    const after = {};
+    // run middleware plugins
+    for (const [id, pl] of Object.entries(plugins))
+        try {
+            const res = await ((_a = pl.middleware) === null || _a === void 0 ? void 0 : _a.call(pl, ctx));
+            if (res === true)
+                ctx.pluginStopped = true;
+            if (typeof res === 'function')
+                after[id] = res;
         }
-        for (const [id, f] of Object.entries(after))
-            try {
-                await f();
-            }
-            catch (e) {
-                printError(id, e);
-            }
-    };
-    function printError(id, e) {
-        console.log('error middleware plugin', id, String(e));
-        console.debug(e);
+        catch (e) {
+            printError(id, e);
+        }
+    // expose public plugins' files
+    const { path } = ctx;
+    if (!ctx.pluginStopped) {
+        if (path.startsWith(const_1.PLUGINS_PUB_URI)) {
+            const a = path.substring(const_1.PLUGINS_PUB_URI.length).split('/');
+            const name = a.shift();
+            if (plugins.hasOwnProperty(name)) // do it only if the plugin is loaded
+                await (0, serveFile_1.serveFile)(ctx, plugins[name].folder + '/public/' + a.join('/'), 'auto');
+            return;
+        }
+        await next();
     }
-}
+    for (const [id, f] of Object.entries(after))
+        try {
+            await f();
+        }
+        catch (e) {
+            printError(id, e);
+        }
+};
 exports.pluginsMiddleware = pluginsMiddleware;
+function printError(id, e) {
+    console.log(`error middleware plugin ${id}: ${(e === null || e === void 0 ? void 0 : e.message) || e}`);
+    console.debug(e);
+}
 class Plugin {
     constructor(id, folder, data, unwatch) {
         this.id = id;
@@ -139,9 +172,6 @@ class Plugin {
         this.started = new Date();
         if (!data)
             throw 'invalid data';
-        if (plugins[id])
-            throw "unload first: " + id;
-        plugins[id] = this;
         this.data = data = { ...data }; // clone to make object modifiable. Objects coming from import are not.
         // some validation
         for (const k of ['frontend_css', 'frontend_js']) {
@@ -154,6 +184,10 @@ class Plugin {
             }
         }
     }
+    get version() {
+        var _a;
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.version;
+    }
     get middleware() {
         var _a;
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.middleware;
@@ -175,6 +209,9 @@ class Plugin {
     }
     async unload(reloading = false) {
         var _a, _b;
+        if (!this.started)
+            return;
+        this.started = null;
         const { id } = this;
         try {
             await ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.unload) === null || _b === void 0 ? void 0 : _b.call(_a));
@@ -184,14 +221,9 @@ class Plugin {
         catch (e) {
             console.log('error unloading plugin', id, String(e));
         }
-        delete plugins[id];
-        if (reloading)
-            return;
+        if (this.data)
+            this.data.unload = undefined;
         this.unwatch();
-        if (availablePlugins[id])
-            events_1.default.emit('pluginStopped', availablePlugins[id]);
-        else
-            events_1.default.emit('pluginUninstalled', id);
     }
 }
 exports.Plugin = Plugin;
@@ -210,57 +242,86 @@ exports.pluginsWatcher = (0, misc_1.watchDir)(exports.PATH, rescanAsap);
 exports.enablePlugins = (0, config_1.defineConfig)('enable_plugins', ['antibrute']);
 exports.enablePlugins.sub(rescanAsap);
 exports.pluginsConfig = (0, config_1.defineConfig)('plugins_config', {});
+const pluginWatchers = new Map();
 async function rescan() {
     console.debug('scanning plugins');
-    const found = [];
-    const foundDisabled = {};
-    const MASK = exports.PATH + '/*/plugin.js'; // be sure to not use path.join as fast-glob doesn't work with \
-    const pluginSources = [MASK];
+    const patterns = [exports.PATH + '/*'];
     if (const_1.APP_PATH !== process.cwd())
-        pluginSources.push((0, misc_1.adjustStaticPathForGlob)(const_1.APP_PATH) + '/' + MASK);
-    for (const f of await (0, fast_glob_1.default)(pluginSources)) {
-        const id = f.split('/').slice(-2)[0];
-        if (id.endsWith(exports.DISABLING_POSTFIX))
-            continue;
-        if (!exports.enablePlugins.get().includes(id)) {
-            try {
-                const source = await (0, promises_1.readFile)(f, 'utf8');
-                foundDisabled[id] = parsePluginSource(id, source);
-            }
-            catch (_a) { }
+        patterns.push((0, misc_1.adjustStaticPathForGlob)(const_1.APP_PATH) + '/' + patterns[0]);
+    const met = [];
+    for (const { path, dirent } of await (0, fast_glob_1.default)(patterns, { onlyFiles: false, suppressErrors: true, objectMode: true })) {
+        if (!dirent.isDirectory() || path.endsWith(exports.DISABLING_POSTFIX))
             continue;
-        }
-        if (found.includes(id)) // not twice
-            continue;
-        found.push(id);
-        if (!plugins[id]) // already loaded
-            loadPlugin(id, f);
-    }
-    for (const [id, p] of Object.entries(foundDisabled)) {
-        const a = availablePlugins[id];
-        if ((0, misc_1.same)(a, p))
+        const id = path.split('/').slice(-1)[0];
+        met.push(id);
+        const w = pluginWatchers.get(id);
+        if (w)
             continue;
-        availablePlugins[id] = p;
-        if (a)
-            events_1.default.emit('pluginUpdated', p);
-        else if (!plugins[id])
-            events_1.default.emit('pluginInstalled', p);
+        console.debug('plugin watch', id);
+        pluginWatchers.set(id, watchPlugin(id, (0, path_1.join)(path, 'plugin.js')));
     }
-    for (const id in availablePlugins)
-        if (!foundDisabled[id] && !found.includes(id) && !plugins[id]) {
-            delete availablePlugins[id];
-            events_1.default.emit('pluginUninstalled', id);
+    for (const [id, cancelWatcher] of pluginWatchers.entries())
+        if (!met.includes(id)) {
+            enablePlugin(id, false);
+            console.debug('plugin unwatch', id);
+            cancelWatcher();
+            pluginWatchers.delete(id);
         }
-    for (const [id, p] of Object.entries(plugins))
-        if (!found.includes(id))
-            await p.unload();
 }
 exports.rescan = rescan;
-function loadPlugin(id, path) {
+function watchPlugin(id, path) {
     const module = (0, path_1.resolve)(path);
-    const { unwatch } = (0, watchLoad_1.watchLoad)(path, async () => {
+    let starting;
+    exports.enablePlugins.sub(() => {
+        if (!getPluginInfo(id))
+            return; // not loaded yet
+        const enabled = isPluginEnabled(id);
+        if (enabled !== isPluginRunning(id))
+            return enabled ? start() : stop();
+    });
+    const { unwatch } = (0, watchLoad_1.watchLoad)(module, async (source) => {
+        const notRunning = availablePlugins[id];
+        if (!source)
+            return onUninstalled();
+        if (isPluginEnabled(id))
+            return start();
+        const p = parsePluginSource(id, source);
+        if ((0, misc_1.same)(notRunning, p))
+            return;
+        availablePlugins[id] = p;
+        events_1.default.emit(notRunning ? 'pluginUpdated' : 'pluginInstalled', p);
+    });
+    return () => {
+        unwatch();
+        return onUninstalled();
+    };
+    async function onUninstalled() {
+        await stop();
+        delete availablePlugins[id];
+        events_1.default.emit('pluginUninstalled', id);
+    }
+    async function markItAvailable() {
+        delete plugins[id];
+        const source = await (0, promises_1.readFile)(module, 'utf8');
+        availablePlugins[id] = parsePluginSource(id, source);
+    }
+    async function stop() {
+        await starting;
+        const p = plugins[id];
+        if (!p)
+            return;
+        await p.unload();
+        await markItAvailable();
+        events_1.default.emit('pluginStopped', p);
+    }
+    async function start() {
         var _a;
+        if (starting)
+            return;
         try {
+            starting = (0, misc_1.pendingPromise)();
+            if (getPluginInfo(id))
+                setError(id, '');
             const alreadyRunning = plugins[id];
             console.log(alreadyRunning ? "reloading plugin" : "loading plugin", id);
             const { init, ...data } = await (_a = module, Promise.resolve().then(() => __importStar(require(_a))));
@@ -271,14 +332,17 @@ function loadPlugin(id, path) {
                 console.log("plugin", id, data.badApi);
             await (alreadyRunning === null || alreadyRunning === void 0 ? void 0 : alreadyRunning.unload(true));
             console.debug("starting plugin", id);
+            const storageDir = (0, path_1.resolve)(module, '..', exports.STORAGE_FOLDER) + (const_1.IS_WINDOWS ? '\\' : '/');
+            await (0, promises_1.mkdir)(storageDir, { recursive: true });
             const res = await (init === null || init === void 0 ? void 0 : init.call(null, {
                 srcDir: __dirname,
+                storageDir,
                 const: Const,
                 require,
                 getConnections: connections_1.getConnections,
                 events: events_1.default,
                 log(...args) {
-                    console.log('plugin', id, ':', ...args);
+                    console.log('plugin', id + ':', ...args);
                 },
                 getConfig: (cfgKey) => { var _a, _b, _c, _d, _e; return (_c = (_b = (_a = exports.pluginsConfig.get()) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b[cfgKey]) !== null && _c !== void 0 ? _c : (_e = (_d = data.config) === null || _d === void 0 ? void 0 : _d[cfgKey]) === null || _e === void 0 ? void 0 : _e.defaultValue; },
                 setConfig: (cfgKey, value) => setPluginConfig(id, { [cfgKey]: value }),
@@ -298,13 +362,16 @@ function loadPlugin(id, path) {
                     });
                 },
                 getHfsConfig: config_1.getConfig,
+                customApiCall(method, params) {
+                    return mapPlugins(pl => { var _a, _b; return (_b = (_a = pl.getData().customApi) === null || _a === void 0 ? void 0 : _a[method]) === null || _b === void 0 ? void 0 : _b.call(_a, params); });
+                }
             }));
             const folder = (0, path_1.dirname)(module);
             Object.assign(data, res, {
                 customHtml: (0, customHtml_1.newCustomHtmlState)()
             });
             const customHtmlWatcher = (0, customHtml_1.watchLoadCustomHtml)(data.customHtml, folder);
-            const plugin = new Plugin(id, folder, data, lodash_1.default.flow(unwatch, customHtmlWatcher.unwatch));
+            const plugin = plugins[id] = new Plugin(id, folder, data, customHtmlWatcher.unwatch);
             if (alreadyRunning)
                 events_1.default.emit('pluginUpdated', Object.assign(lodash_1.default.pick(plugin, 'started'), getPluginInfo(id)));
             else {
@@ -315,9 +382,23 @@ function loadPlugin(id, path) {
             }
         }
         catch (e) {
-            console.log("plugin error:", e);
+            await markItAvailable();
+            e = e.message || String(e);
+            console.log(`plugin error: ${id}:`, e);
+            setError(id, e);
         }
-    });
+        finally {
+            starting === null || starting === void 0 ? void 0 : starting.resolve();
+            starting = undefined;
+        }
+    }
+}
+function getError(id) {
+    return getPluginInfo(id).error;
+}
+function setError(id, error) {
+    getPluginInfo(id).error = error;
+    events_1.default.emit('pluginUpdated', { id, error });
 }
 function deleteModule(id) {
     var _a;
@@ -344,12 +425,14 @@ function deleteModule(id) {
 }
 (0, misc_1.onProcessExit)(() => Promise.allSettled(mapPlugins(pl => pl.unload())));
 function parsePluginSource(id, source) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const pl = { id };
     pl.description = (0, misc_1.tryJson)((_a = /exports.description *= *(".*")/.exec(source)) === null || _a === void 0 ? void 0 : _a[1]);
     pl.repo = (_b = /exports.repo *= *"(.*)"/.exec(source)) === null || _b === void 0 ? void 0 : _b[1];
     pl.version = (_d = Number((_c = /exports.version *= *(\d*\.?\d+)/.exec(source)) === null || _c === void 0 ? void 0 : _c[1])) !== null && _d !== void 0 ? _d : undefined;
     pl.apiRequired = (_f = (0, misc_1.tryJson)((_e = /exports.apiRequired *= *([ \d.,[\]]+)/.exec(source)) === null || _e === void 0 ? void 0 : _e[1])) !== null && _f !== void 0 ? _f : undefined;
+    pl.depend = (_h = (0, misc_1.tryJson)((_g = /exports.depend *= *(\[.*\])/m.exec(source)) === null || _g === void 0 ? void 0 : _g[1])) === null || _h === void 0 ? void 0 : _h.filter((x) => typeof x.repo === 'string' && x.version === undefined || typeof x.version === 'number'
+        || console.warn("plugin dependency discarded", x));
     if (Array.isArray(pl.apiRequired) && (pl.apiRequired.length !== 2 || !pl.apiRequired.every(lodash_1.default.isFinite))) // validate [from,to] form
         pl.apiRequired = undefined;
     calculateBadApi(pl);

package/src/serveFile.js

@@ -14,6 +14,7 @@ const misc_1 = require("./misc");
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
+const connections_1 = require("./connections");
 const allowedReferer = (0, config_1.defineConfig)('allowed_referer', '');
 function serveFileNode(ctx, node) {
     var _a;
@@ -27,15 +28,15 @@ function serveFileNode(ctx, node) {
         if (ref && ref !== host() // automatic accept if referer is basically the hosting domain
             && !(0, misc_1.matches)(ref, allowed))
             return ctx.status = const_1.HTTP_FORBIDDEN;
-        function host() {
-            const s = ctx.get('host');
-            return s[0] === '[' ? s.slice(1, s.indexOf(']')) : s === null || s === void 0 ? void 0 : s.split(':')[0];
-        }
     }
     ctx.vfsNode = node; // useful to tell service files from files shared by the user
     if ('dl' in ctx.query) // please, download
         ctx.attachment(name);
     return serveFile(ctx, source || '', mimeString);
+    function host() {
+        const s = ctx.get('host');
+        return s[0] === '[' ? s.slice(1, s.indexOf(']')) : s === null || s === void 0 ? void 0 : s.split(':')[0];
+    }
 }
 exports.serveFileNode = serveFileNode;
 const mimeCfg = (0, config_1.defineConfig)('mime', { '*': 'auto' });
@@ -65,8 +66,15 @@ async function serveFile(ctx, source, mime, content) {
             return ctx.status = const_1.HTTP_NOT_MODIFIED;
         if (content !== undefined)
             return ctx.body = content;
-        const range = getRange(ctx, stats.size);
+        const { size } = stats;
+        const range = getRange(ctx, size);
         ctx.body = (0, fs_1.createReadStream)(source, range);
+        if (ctx.vfsNode)
+            (0, connections_1.updateConnection)(ctx.state.connection, {
+                op: 'download',
+                opTotal: stats.size,
+                opOffset: range && (range.start / size),
+            });
     }
     catch (e) {
         return ctx.status = const_1.HTTP_NOT_FOUND;