hfs 0.47.2 → 0.48.0-alpha1

package/src/plugins.js

@@ -114,8 +114,12 @@ function mapPlugins(cb) {
 }
 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 });
+    return lodash_1.default.find(plugins, pl => match(pl.getData()))
+        || lodash_1.default.find(availablePlugins, match);
+    function match(rec) {
+        var _a, _b;
+        return repo === ((_b = (_a = rec === null || rec === void 0 ? void 0 : rec.repo) === null || _a === void 0 ? void 0 : _a.main) !== null && _b !== void 0 ? _b : rec === null || rec === void 0 ? void 0 : rec.repo);
+    }
 }
 exports.findPluginByRepo = findPluginByRepo;
 function getPluginConfigFields(id) {
@@ -123,11 +127,35 @@ function getPluginConfigFields(id) {
     return (_a = plugins[id]) === null || _a === void 0 ? void 0 : _a.getData().config;
 }
 exports.getPluginConfigFields = getPluginConfigFields;
+const serverCode = (0, config_1.defineConfig)('server_code', '', async (script, { k }) => {
+    const res = {};
+    try {
+        new Function('exports', script)(res); // parse
+        return await initPlugin(res);
+    }
+    catch (e) {
+        return console.error(k + ':', e.message || String(e));
+    }
+});
+async function initPlugin(pl, more) {
+    var _a;
+    return Object.assign(pl, await ((_a = pl.init) === null || _a === void 0 ? void 0 : _a.call(pl, {
+        const: Const,
+        Const,
+        require,
+        getConnections: connections_1.getConnections,
+        events: events_1.default,
+        log: console.log,
+        getHfsConfig: config_1.getConfig,
+        customApiCall,
+        ...more
+    })));
+}
 const pluginsMiddleware = async (ctx, next) => {
     var _a;
     const after = {};
     // run middleware plugins
-    for (const [id, pl] of Object.entries(plugins))
+    for (const [id, pl] of Object.entries(plugins).concat([['.', await serverCode.compiled()]]))
         try {
             const res = await ((_a = pl.middleware) === null || _a === void 0 ? void 0 : _a.call(pl, ctx));
             if (res === true)
@@ -324,27 +352,22 @@ function watchPlugin(id, path) {
                 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))));
-            delete data.default;
+            const pluginData = await (_a = module, Promise.resolve().then(() => __importStar(require(_a))));
             deleteModule(require.resolve(module)); // avoid caching at next import
-            calculateBadApi(data);
-            if (data.badApi)
-                console.log("plugin", id, data.badApi);
+            calculateBadApi(pluginData);
+            if (pluginData.badApi)
+                console.log("plugin", id, pluginData.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, {
+            await initPlugin(pluginData, {
                 srcDir: __dirname,
                 storageDir,
-                const: Const,
-                require,
-                getConnections: connections_1.getConnections,
-                events: events_1.default,
                 log(...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; },
+                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 = pluginData.config) === null || _d === void 0 ? void 0 : _d[cfgKey]) === null || _e === void 0 ? void 0 : _e.defaultValue; },
                 setConfig: (cfgKey, value) => setPluginConfig(id, { [cfgKey]: value }),
                 subscribeConfig(cfgKey, cb) {
                     let last = this.getConfig(cfgKey);
@@ -357,21 +380,15 @@ function watchPlugin(id, path) {
                             cb(last = now);
                         }
                         catch (e) {
-                            console.log('plugin', id, String(e));
+                            this.log(String(e));
                         }
                     });
                 },
-                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 = plugins[id] = new Plugin(id, folder, data, customHtmlWatcher.unwatch);
+            const folder = (0, path_1.dirname)(module);
+            const { state, unwatch } = (0, customHtml_1.watchLoadCustomHtml)(folder);
+            pluginData.customHtml = state;
+            const plugin = plugins[id] = new Plugin(id, folder, pluginData, unwatch);
             if (alreadyRunning)
                 events_1.default.emit('pluginUpdated', Object.assign(lodash_1.default.pick(plugin, 'started'), getPluginInfo(id)));
             else {
@@ -393,6 +410,9 @@ function watchPlugin(id, path) {
         }
     }
 }
+function 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); });
+}
 function getError(id) {
     return getPluginInfo(id).error;
 }
@@ -428,7 +448,7 @@ function parsePluginSource(id, source) {
     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.repo = (0, misc_1.tryJson)((_b = /exports.repo *= *(.*);? *$/m.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'

package/src/update.js

@@ -79,7 +79,7 @@ async function update(tag) {
             throw "asset not found";
         const url = asset.browser_download_url;
         console.log("downloading", url);
-        updateSource = await (0, misc_1.httpsStream)(url);
+        updateSource = await (0, misc_1.httpStream)(url);
     }
     const bin = process.execPath;
     const binPath = (0, path_1.dirname)(bin);

package/src/util-http.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpsStream = exports.httpsString = void 0;
+exports.httpStream = exports.httpString = void 0;
+const node_http_1 = __importDefault(require("node:http"));
 const node_https_1 = __importDefault(require("node:https"));
 const const_1 = require("./const");
-function httpsString(url, options) {
-    return httpsStream(url, options).then(res => new Promise(resolve => {
+function httpString(url, options) {
+    return httpStream(url, options).then(res => new Promise(resolve => {
         let buf = '';
         res.on('data', chunk => buf += chunk.toString());
         res.on('end', () => resolve(Object.assign(res, {
@@ -17,16 +18,18 @@ function httpsString(url, options) {
         })));
     }));
 }
-exports.httpsString = httpsString;
-function httpsStream(url, { body, ...options } = {}) {
+exports.httpString = httpString;
+function httpStream(url, { body, ...options } = {}) {
     return new Promise((resolve, reject) => {
         if (body)
             options.method || (options.method = 'POST');
-        const req = node_https_1.default.request(url, options, res => {
+        const proto = url.startsWith('https:') ? node_https_1.default : node_http_1.default;
+        const req = proto.request(url, options, res => {
+            console.debug("http responded", res.statusCode, "to", url);
             if (!res.statusCode || res.statusCode >= 400)
                 return reject(new Error(String(res.statusCode), { cause: res }));
             if (res.statusCode === const_1.HTTP_TEMPORARY_REDIRECT && res.headers.location)
-                return resolve(httpsStream(res.headers.location, options));
+                return resolve(httpStream(res.headers.location, options));
             resolve(res);
         }).on('error', e => {
             reject(req.res || e);
@@ -36,4 +39,4 @@ function httpsStream(url, { body, ...options } = {}) {
         req.end();
     });
 }
-exports.httpsStream = httpsStream;
+exports.httpStream = httpStream;

package/src/util-os.js

@@ -16,7 +16,7 @@ function getFreeDiskSync(path) {
             throw Error('miss');
         return Number((_a = /FreeSpace=(\d+)/.exec(one)) === null || _a === void 0 ? void 0 : _a[1]);
     }
-    const out = (0, misc_1.try_)(() => (0, child_process_1.execSync)(`df -k ${path}`).toString(), err => {
+    const out = (0, misc_1.try_)(() => (0, child_process_1.execSync)(`df -k "${path}"`).toString(), err => {
         throw err.status === 1 ? Error('miss')
             : err.status === 127 ? Error('unsupported')
                 : err;