hfs 0.53.0-alpha1 → 0.53.0-alpha2

package/frontend/assets/{sha512-legacy-C1fsQ1Io.js → sha512-legacy-DYmEZJfO.js}

@@ -1,4 +1,4 @@
-System.register(["./index-legacy-DBpnLaOV.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
+System.register(["./index-legacy-C21Ot_ue.js"],(function(h,t){"use strict";var i,s;return{setters:[function(h){i=h.g,s=h.c}],execute:function(){function t(h,t){for(var i=function(){var i=t[s];if("string"!=typeof i&&!Array.isArray(i)){var r=function(t){if("default"!==t&&!(t in h)){var s=Object.getOwnPropertyDescriptor(i,t);s&&Object.defineProperty(h,t,s.get?s:{enumerable:!0,get:function(){return i[t]}})}};for(var e in i)r(e)}},s=0;s<t.length;s++)i();return Object.freeze(Object.defineProperty(h,Symbol.toStringTag,{value:"Module"}))}var r={exports:{}};
 /*
        * [js-sha512]{@link https://github.com/emn178/js-sha512}
        *

package/frontend/index.html

@@ -11,6 +11,6 @@
     <div id="root"></div>
     <script nomodule>document.getElementById('root').innerText = "Please use a newer browser"</script>
     <script crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-DMrMt_pQ.js"></script>
-    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-DBpnLaOV.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-C21Ot_ue.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.53.0-alpha1",
+  "version": "0.53.0-alpha2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/plugins/antibrute/plugin.js

@@ -1,6 +1,6 @@
 exports.version = 3
 exports.description = "Introduce increasing delays between login attempts."
-exports.apiRequired = 8.81 // attemptingLogin
+exports.apiRequired = 8.8 // attemptingLogin
 
 exports.config = {
     increment: { type: 'number', min: 1, defaultValue: 5, unit: "seconds", helperText: "How longer user must wait for each login attempt" },
@@ -30,7 +30,6 @@ exports.init = api => {
                 if (rec.attempts > api.getConfig('blockAfter') && !isLocalHost(ctx)) {
                     const hours = api.getConfig('blockForHours')
                     const newRule = { ip, comment: "From antibrute plugin", expire: hours ? new Date(now.getTime() + hours * HOUR) : undefined }
-                    console.log({ hours, newRule })
                     block.set(x => [...x, newRule])
                 }
                 clearTimeout(rec.timer)
@@ -39,7 +38,7 @@ exports.init = api => {
                     ctx.set('x-anti-brute-force', wait)
                     await new Promise(resolve => setTimeout(resolve, wait))
                 }
-                rec.timer = setTimeout(() => delete byIp[ip], max * 10) // no memory leak
+                rec.timer = setTimeout(() => delete byIp[ip], 24 * HOUR) // no memory leak
             },
             login: ctx => {
                 if (ctx.state.account)

package/src/api.plugins.js

@@ -10,7 +10,6 @@ const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
 const misc_1 = require("./misc");
 const apiMiddleware_1 = require("./apiMiddleware");
-const events_1 = __importDefault(require("./events"));
 const promises_1 = require("fs/promises");
 const github_1 = require("./github");
 const const_1 = require("./const");
@@ -91,29 +90,33 @@ const apis = {
     get_online_plugins({ text }, ctx) {
         return new SendList_1.SendListReadable({
             async doAtStart(list) {
+                const repos = [];
+                list.events(ctx, {
+                    pluginInstalled: p => {
+                        if (repos.includes(p.repo))
+                            list.update({ id: p.repo }, { installed: true });
+                    },
+                    pluginUninstalled: folder => {
+                        const repo = (0, github_1.getFolder2repo)()[folder];
+                        if (typeof repo !== 'string')
+                            return; // custom repo
+                        if (repos.includes(repo))
+                            list.update({ id: repo }, { installed: false });
+                    },
+                    pluginDownload({ id, status }) {
+                        if (repos.includes(id))
+                            list.update({ id }, { downloading: status !== null && status !== void 0 ? status : null });
+                    }
+                });
                 try {
-                    // avoid creating N listeners on ctx.req, and getting a warning
-                    const undo = [];
-                    ctx.req.once('close', () => undo.forEach(x => x()));
-                    const folder2repo = (0, github_1.getFolder2repo)();
-                    for await (const pl of await (0, github_1.searchPlugins)(text)) {
+                    const already = Object.values((0, github_1.getFolder2repo)()).map(String);
+                    for await (const pl of await (0, github_1.searchPlugins)(text, { skipRepos: already })) {
                         const repo = pl.repo || pl.id; // .repo property can be more trustworthy in case github user renamed and left the previous link in 'repo'
-                        if (lodash_1.default.includes(folder2repo, repo))
-                            continue; // don't include installed plugins
                         const missing = await (0, plugins_1.getMissingDependencies)(pl);
                         if (missing.length)
                             pl.missing = missing;
                         list.add(pl);
-                        // watch for events about this plugin, until this request is closed
-                        undo.push(lodash_1.default.flow(events_1.default.on('pluginInstalled', p => {
-                            if (p.repo === repo)
-                                list.update({ id: repo }, { installed: true });
-                        }), events_1.default.on('pluginUninstalled', folder => {
-                            if (repo === (0, github_1.getFolder2repo)()[folder])
-                                list.update({ id: repo }, { installed: false });
-                        }), events_1.default.on('pluginDownload_' + repo, status => {
-                            list.update({ id: repo }, { downloading: status !== null && status !== void 0 ? status : null });
-                        })));
+                        repos.push(repo);
                     }
                 }
                 catch (err) {

package/src/const.js

@@ -45,7 +45,7 @@ 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 = "2024-05-06T22:10:28.456Z";
+exports.BUILD_TIMESTAMP = "2024-05-08T10:54:50.461Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/github.js

@@ -21,7 +21,7 @@ function downloadProgress(id, status) {
         delete downloading[id];
     else
         downloading[id] = status;
-    events_1.default.emit('pluginDownload_' + id, status);
+    events_1.default.emit('pluginDownload', { id, status });
 }
 // determine default branch, possibly without consuming api quota
 async function getGithubDefaultBranch(repo) {
@@ -161,13 +161,29 @@ async function apiGithub(uri) {
             : e;
     });
 }
-async function searchPlugins(text = '') {
+async function* apiGithubPaginated(uri) {
+    const PAGE_SIZE = 100;
+    let page = 1;
+    let n = 0;
+    while (1) {
+        const res = await apiGithub(uri + `&page=${page++}&per_page=${PAGE_SIZE}`);
+        for (const x of res.items)
+            yield x;
+        const now = res.items.length;
+        n += now;
+        if (!now || n >= res.total_count)
+            break;
+    }
+}
+async function searchPlugins(text = '', { skipRepos = [''] } = {}) {
     const projectInfo = await (0, exports.getProjectInfo)();
-    const list = await apiGithub('search/repositories?q=topic:hfs-plugin+' + encodeURI(text));
-    return new misc_1.AsapStream(list.items.map(async (it) => {
+    const list = await Promise.all(['', 'user:'].map(specifier => // search text with multiple specifiers
+     (0, misc_1.asyncGeneratorToArray)(apiGithubPaginated(`search/repositories?q=topic:hfs-plugin+${specifier}${encodeURI(text)}`))))
+        .then(all => all.flat()); // make it a single array
+    return new misc_1.AsapStream(list.map(async (it) => {
         var _a, _b;
         const repo = it.full_name;
-        if ((_a = projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.plugins_blacklist) === null || _a === void 0 ? void 0 : _a.includes(repo))
+        if (((_a = projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.plugins_blacklist) === null || _a === void 0 ? void 0 : _a.includes(repo)) || skipRepos.includes(repo))
             return;
         const pl = await readOnlineCompatiblePlugin(repo, it.default_branch).catch(() => undefined);
         if (!pl)

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.getMissingDependencies = exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.mapPlugins = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.findPluginByRepo = exports.getPluginInfo = exports.setPluginConfig = exports.startPlugin = exports.stopPlugin = exports.enablePlugin = exports.isPluginEnabled = exports.isPluginRunning = exports.STORAGE_FOLDER = exports.DISABLING_SUFFIX = exports.PATH = void 0;
+exports.getMissingDependencies = exports.parsePluginSource = exports.rescan = exports.pluginsConfig = exports.enablePlugins = exports.pluginsWatcher = exports.getAvailablePlugins = exports.mapPlugins = exports.SERVER_CODE_ID = exports.Plugin = exports.pluginsMiddleware = exports.getPluginConfigFields = exports.findPluginByRepo = exports.getPluginInfo = exports.setPluginConfig = exports.startPlugin = exports.stopPlugin = exports.enablePlugin = exports.isPluginEnabled = exports.isPluginRunning = exports.STORAGE_FOLDER = exports.DISABLING_SUFFIX = exports.PATH = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const watchLoad_1 = require("./watchLoad");
 const lodash_1 = __importDefault(require("lodash"));
@@ -232,7 +232,7 @@ class Plugin {
         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));
-            if (!reloading && id !== SERVER_CODE_ID) // we already printed 'reloading'
+            if (!reloading && id !== exports.SERVER_CODE_ID) // we already printed 'reloading'
                 console.log('unloaded plugin', id);
         }
         catch (e) {
@@ -244,12 +244,12 @@ class Plugin {
     }
 }
 exports.Plugin = Plugin;
-const SERVER_CODE_ID = '.';
+exports.SERVER_CODE_ID = '.'; // a name that will surely be not found among plugin folders
 const serverCode = (0, config_1.defineConfig)('server_code', '', async (script, { k }) => {
     const res = {};
     try {
         new Function('exports', script)(res); // parse
-        return new Plugin(SERVER_CODE_ID, '', await initPlugin(res), lodash_1.default.noop); // '.' is a name that will surely be not found among plugin folders
+        return new Plugin(exports.SERVER_CODE_ID, '', await initPlugin(res), lodash_1.default.noop);
     }
     catch (e) {
         return console.error(k + ':', e.message || String(e));
@@ -260,7 +260,7 @@ serverCode.sub(() => { var _a; return (_a = serverCode.compiled()) === null || _
 function mapPlugins(cb, includeServerCode = true) {
     const entries = Object.entries(plugins);
     return entries.map(([plName, pl]) => {
-        if (!includeServerCode && plName === SERVER_CODE_ID)
+        if (!includeServerCode && plName === exports.SERVER_CODE_ID)
             return;
         try {
             return cb(pl, plName);

package/src/serveGuiFiles.js

@@ -91,7 +91,7 @@ async function treatIndex(ctx, filesUri, body) {
     ctx.set('etag', '');
     ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate');
     ctx.type = 'html';
-    const isFrontend = filesUri === const_1.FRONTEND_URI;
+    const isFrontend = filesUri === const_1.FRONTEND_URI ? ' ' : ''; // as a string will allow neater code later
     const pub = ctx.state.revProxyPath + const_1.PLUGINS_PUB_URI;
     // expose plugins' configs that are declared with 'frontend' attribute
     const plugins = Object.fromEntries((0, misc_1.onlyTruthy)((0, plugins_1.mapPlugins)((pl, name) => {
@@ -114,7 +114,7 @@ async function treatIndex(ctx, filesUri, body) {
         const isOpen = !isClose;
         if (isHead && isOpen)
             return all + `
-                    ${!isFrontend ? '' : `
+                    ${isFrontend && `
                         <title>${adminApis_1.title.get()}</title>
                         <link rel="shortcut icon" href="/favicon.ico?${timestamp}" />
                     ` + (0, customHtml_1.getSection)('htmlHead')}
@@ -125,6 +125,7 @@ async function treatIndex(ctx, filesUri, body) {
                 SPECIAL_URI: const_1.SPECIAL_URI, PLUGINS_PUB_URI: const_1.PLUGINS_PUB_URI, FRONTEND_URI: const_1.FRONTEND_URI,
                 session: session instanceof apiMiddleware_1.ApiError ? null : session,
                 plugins,
+                loadScripts: Object.fromEntries((0, plugins_1.mapPlugins)((p, id) => { var _a; return [id, (_a = p.frontend_js) === null || _a === void 0 ? void 0 : _a.map(f => f.includes('//') ? f : pub + id + '/' + f)]; })),
                 prefixUrl: ctx.state.revProxyPath,
                 dontOverwriteUploading: upload_1.dontOverwriteUploading.get(),
                 customHtml: lodash_1.default.omit(Object.fromEntries(customHtml_1.customHtmlState.sections), ['top', 'bottom']),
@@ -136,20 +137,16 @@ async function treatIndex(ctx, filesUri, body) {
                 `;
         if (isBody && isOpen)
             return all + `
-                    ${!isFrontend ? '' : (0, customHtml_1.getSection)('top')}
+                    ${isFrontend && (0, customHtml_1.getSection)('top')}
                     <style>
                     :root {
-                        ${lodash_1.default.map(plugins, (configs, pluginName) => lodash_1.default.map(configs, (v, k) => `--${pluginName}-${k}: ${serializeCss(v)};`).join('\n')).join('')}
+                        ${lodash_1.default.map(plugins, (configs, pluginName) => // make plugin configs accessible via css
+             lodash_1.default.map(configs, (v, k) => `--${pluginName}-${k}: ${serializeCss(v)};`).join('\n')).join('')}
                     }
                     </style>
-                    ${!isFrontend ? '' : (0, plugins_1.mapPlugins)((plug, id) => {
+                    ${isFrontend && (0, plugins_1.mapPlugins)((plug, id) => {
                 var _a;
                 return (_a = plug.frontend_css) === null || _a === void 0 ? void 0 : _a.map(f => `<link rel='stylesheet' type='text/css' href='${f.includes('//') ? f : pub + id + '/' + f}' plugin=${JSON.stringify(id)}/>`);
-            })
-                .flat().filter(Boolean).join('\n')}
-                    ${!isFrontend ? '' : (0, plugins_1.mapPlugins)((plug, id) => {
-                var _a;
-                return (_a = plug.frontend_js) === null || _a === void 0 ? void 0 : _a.map(f => `<script defer plugin=${JSON.stringify(id)} src='${f.includes('//') ? f : pub + id + '/' + f}'></script>`);
             })
                 .flat().filter(Boolean).join('\n')}
                 `;