hfs 0.47.3 → 0.48.0-alpha2

package/src/config.js

@@ -14,7 +14,6 @@ const misc_1 = require("./misc");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const events_2 = __importDefault(require("./events"));
-const os_1 = require("os");
 const promises_1 = require("fs/promises");
 const FILE = 'config.yaml';
 // keep definition of config properties
@@ -34,19 +33,6 @@ const filePath = (0, misc_1.with_)(const_1.argv.config || process.env.HFS_CONFIG
     catch (_a) { }
     return p;
 });
-const legacyPosition = (0, path_1.join)((0, os_1.homedir)(), FILE); // this was happening with npx on Windows for some time. Remove around v0.47
-if (!(0, fs_1.existsSync)(filePath) && (0, fs_1.existsSync)(legacyPosition))
-    try {
-        (0, fs_1.renameSync)(legacyPosition, filePath);
-        console.log("moved from legacy position", legacyPosition);
-    }
-    catch (_a) {
-        try { // attempt copying, in case moving the source file proves to be impractical
-            (0, fs_1.copyFileSync)(legacyPosition, filePath);
-            console.log("copied from legacy position", legacyPosition);
-        }
-        catch (_b) { }
-    }
 // takes a semver like 1.2.3-alpha1, but alpha and beta numbers must share the number progression
 exports.versionToScalar = lodash_1.default.memoize((ver) => {
     // this regexp is supposed to be resistant to optional leading "v" and an optional custom name after a space
@@ -71,7 +57,7 @@ exports.currentVersion = new Version(const_1.VERSION);
 const configVersion = defineConfig('version', const_1.VERSION, v => new Version(v));
 function defineConfig(k, defaultValue, compiler) {
     configProps[k] = { defaultValue };
-    let compiled = compiler === null || compiler === void 0 ? void 0 : compiler(defaultValue, { version: exports.currentVersion, defaultValue });
+    let compiled = compiler === null || compiler === void 0 ? void 0 : compiler(defaultValue, { k, version: exports.currentVersion, defaultValue });
     const ret = {
         key() {
             return k;
@@ -81,7 +67,7 @@ function defineConfig(k, defaultValue, compiler) {
         },
         sub(cb) {
             if (started) // initial event already passed, we'll make the first call
-                cb(getConfig(k), { was: defaultValue, defaultValue, version: configVersion.compiled() });
+                cb(getConfig(k), { k, was: defaultValue, defaultValue, version: configVersion.compiled() });
             const eventName = CONFIG_CHANGE_EVENT_PREFIX + k;
             return (0, misc_1.onOff)(cfgEvents, {
                 [eventName]() {

package/src/const.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_PATH = exports.IS_BINARY = exports.IS_WINDOWS = exports.HTTP_SERVER_ERROR = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = exports.HFS_REPO = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.DAY = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.argv = void 0;
+exports.APP_PATH = exports.IS_BINARY = exports.IS_MAC = exports.IS_WINDOWS = exports.HTTP_SERVICE_UNAVAILABLE = exports.HTTP_SERVER_ERROR = exports.HTTP_FAILED_DEPENDENCY = exports.HTTP_FOOL = exports.HTTP_RANGE_NOT_SATISFIABLE = exports.HTTP_PAYLOAD_TOO_LARGE = exports.HTTP_CONFLICT = exports.HTTP_NOT_ACCEPTABLE = exports.HTTP_METHOD_NOT_ALLOWED = exports.HTTP_NOT_FOUND = exports.HTTP_FORBIDDEN = exports.HTTP_UNAUTHORIZED = exports.HTTP_BAD_REQUEST = exports.HTTP_NOT_MODIFIED = exports.HTTP_TEMPORARY_REDIRECT = exports.HTTP_PARTIAL_CONTENT = exports.HTTP_NO_CONTENT = exports.HTTP_OK = exports.PLUGINS_PUB_URI = exports.API_URI = exports.ADMIN_URI = exports.FRONTEND_URI = exports.SPECIAL_URI = exports.HFS_REPO = exports.COMPATIBLE_API_VERSION = exports.API_VERSION = exports.DAY = exports.RUNNING_BETA = exports.VERSION = exports.BUILD_TIMESTAMP = exports.HFS_STARTED = exports.ORIGINAL_CWD = exports.DEV = exports.argv = void 0;
 const minimist_1 = __importDefault(require("minimist"));
 const fs = __importStar(require("fs"));
 const os_1 = require("os");
@@ -38,7 +38,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 = "2023-08-29T08:36:23.856Z";
+exports.BUILD_TIMESTAMP = "2023-09-07T17:51:10.938Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');
@@ -68,7 +68,9 @@ exports.HTTP_RANGE_NOT_SATISFIABLE = 416;
 exports.HTTP_FOOL = 418;
 exports.HTTP_FAILED_DEPENDENCY = 424;
 exports.HTTP_SERVER_ERROR = 500;
+exports.HTTP_SERVICE_UNAVAILABLE = 503;
 exports.IS_WINDOWS = process.platform === 'win32';
+exports.IS_MAC = process.platform === 'darwin';
 exports.IS_BINARY = !(0, path_1.basename)(process.execPath).includes('node'); // this won't be node if pkg was used
 exports.APP_PATH = (0, path_1.dirname)(exports.IS_BINARY ? process.execPath : __dirname);
 // we want this to be the first stuff to be printed, then we print it in this module, that is executed at the beginning

package/src/cross.js

@@ -0,0 +1,221 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.repeat = exports.asyncGeneratorToArray = exports.filterMapGenerator = exports.throw_ = exports.hasProp = exports.typedEntries = exports.typedKeys = exports.objRenameKey = exports.randomId = exports.getOrSet = exports.waitFor = exports.newObj = exports.removeStarting = exports.findDefined = exports.isOrderedEqual = exports.swap = exports.tryJson = exports.basename = exports.pendingPromise = exports._log = exports.wantArray = exports.formatPerc = exports.with_ = exports.try_ = exports.setHidden = exports.onlyTruthy = exports.truthy = exports.enforceFinal = exports.objSameKeys = exports.wait = exports.prefix = exports.formatBytes = exports.MINUTE = exports.WIKI_URL = exports.REPO_URL = void 0;
+// This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+// all content here is shared between client and server
+const lodash_1 = __importDefault(require("lodash"));
+exports.REPO_URL = 'https://github.com/rejetto/hfs/';
+exports.WIKI_URL = exports.REPO_URL + 'wiki/';
+exports.MINUTE = 60000;
+const MULTIPLIERS = ['', 'K', 'M', 'G', 'T'];
+function formatBytes(n, { post = 'B', k = 1024, digits = NaN } = {}) {
+    if (isNaN(Number(n)) || n < 0)
+        return '';
+    const i = n && Math.floor(Math.log2(n) / Math.log2(k));
+    n /= k ** i;
+    const nAsString = i && !isNaN(digits) ? n.toFixed(digits)
+        : lodash_1.default.round(n, isNaN(digits) ? (n >= 100 ? 0 : 1) : digits);
+    return nAsString + ' ' + (MULTIPLIERS[i] || '') + post;
+} // formatBytes
+exports.formatBytes = formatBytes;
+function prefix(pre, v, post = '') {
+    return v ? pre + v + post : '';
+}
+exports.prefix = prefix;
+function wait(ms, val) {
+    return new Promise(res => setTimeout(res, ms, val));
+}
+exports.wait = wait;
+function objSameKeys(src, newValue) {
+    return Object.fromEntries(Object.entries(src).map(([k, v]) => [k, newValue(v, k)]));
+}
+exports.objSameKeys = objSameKeys;
+function enforceFinal(sub, s) {
+    return !s || s.endsWith(sub) ? s : s + sub;
+}
+exports.enforceFinal = enforceFinal;
+function truthy(value) {
+    return Boolean(value);
+}
+exports.truthy = truthy;
+function onlyTruthy(arr) {
+    return arr.filter(truthy);
+}
+exports.onlyTruthy = onlyTruthy;
+function setHidden(dest, src) {
+    return Object.defineProperties(dest, newObj(src, value => ({
+        enumerable: false,
+        writable: true,
+        value,
+    })));
+}
+exports.setHidden = setHidden;
+function try_(cb, onException) {
+    try {
+        return cb();
+    }
+    catch (e) {
+        return onException === null || onException === void 0 ? void 0 : onException(e);
+    }
+}
+exports.try_ = try_;
+function with_(par, cb) {
+    return cb(par);
+}
+exports.with_ = with_;
+function formatPerc(p) {
+    return (p * 100).toFixed(1) + '%';
+}
+exports.formatPerc = formatPerc;
+function wantArray(x) {
+    return x == null ? [] : Array.isArray(x) ? x : [x];
+}
+exports.wantArray = wantArray;
+function _log(...args) {
+    console.log('**', ...args);
+    return args[args.length - 1];
+}
+exports._log = _log;
+function pendingPromise() {
+    let takeOut;
+    const ret = new Promise((resolve, reject) => takeOut = { resolve, reject });
+    return Object.assign(ret, takeOut);
+}
+exports.pendingPromise = pendingPromise;
+function basename(path) {
+    return path.slice(path.lastIndexOf('/') + 1 || path.lastIndexOf('\\') + 1);
+}
+exports.basename = basename;
+function tryJson(s) {
+    try {
+        return s && JSON.parse(s);
+    }
+    catch (_a) { }
+}
+exports.tryJson = tryJson;
+function swap(obj, k1, k2) {
+    const temp = obj[k1];
+    obj[k1] = obj[k2];
+    obj[k2] = temp;
+    return obj;
+}
+exports.swap = swap;
+function isOrderedEqual(a, b) {
+    return lodash_1.default.isEqualWith(a, b, (a1, b1) => {
+        if (!lodash_1.default.isPlainObject(a1) || !lodash_1.default.isPlainObject(b1))
+            return;
+        const ka = Object.keys(a1);
+        const kb = Object.keys(b1);
+        return ka.length === kb.length && ka.every((ka1, i) => {
+            const kb1 = kb[i];
+            return ka1 === kb1 && isOrderedEqual(a1[ka1], b1[kb1]);
+        });
+    });
+}
+exports.isOrderedEqual = isOrderedEqual;
+function findDefined(a, cb) {
+    if (a)
+        for (const k in a) {
+            const ret = cb(a[k], k);
+            if (ret !== undefined)
+                return ret;
+        }
+}
+exports.findDefined = findDefined;
+function removeStarting(sub, s) {
+    return s.startsWith(sub) ? s.slice(sub.length) : s;
+}
+exports.removeStarting = removeStarting;
+function newObj(src, returnNewValue, recur = false) {
+    if (!src)
+        return {};
+    const pairs = Object.entries(src).map(([k, v]) => {
+        if (typeof k === 'symbol')
+            return;
+        let _k = k;
+        const curDepth = typeof recur === 'number' ? recur : 0;
+        let newV = returnNewValue(v, k, (newK) => {
+            _k = newK;
+            return true; // for convenient expression concatenation
+        }, curDepth);
+        if ((recur !== false || returnNewValue.length === 4) // if callback is using depth parameter, then it wants recursion
+            && lodash_1.default.isPlainObject(newV)) // is it recurrable?
+            newV = newObj(newV, returnNewValue, curDepth + 1);
+        return _k !== undefined && [_k, newV];
+    });
+    return Object.fromEntries(onlyTruthy(pairs));
+}
+exports.newObj = newObj;
+async function waitFor(cb, { interval = 200, timeout = Infinity } = {}) {
+    const started = Date.now();
+    while (1) {
+        const res = await cb();
+        if (res)
+            return res;
+        if (Date.now() - started >= timeout)
+            return;
+        await wait(interval);
+    }
+}
+exports.waitFor = waitFor;
+function getOrSet(o, k, creator) {
+    return k in o ? o[k]
+        : (o[k] = creator());
+}
+exports.getOrSet = getOrSet;
+// 10 chars is 51+bits, 8 is 41+bits
+function randomId(len = 10) {
+    if (len > 10)
+        return randomId(10) + randomId(len - 10);
+    return Math.random()
+        .toString(36)
+        .substring(2, 2 + len)
+        .replace(/l/g, 'L'); // avoid confusion reading l1
+}
+exports.randomId = randomId;
+function objRenameKey(o, from, to) {
+    if (!o || !o.hasOwnProperty(from) || from === to)
+        return;
+    o[to] = o[from];
+    delete o[from];
+    return true;
+}
+exports.objRenameKey = objRenameKey;
+function typedKeys(o) {
+    return Object.keys(o);
+}
+exports.typedKeys = typedKeys;
+function typedEntries(o) {
+    return Object.entries(o);
+}
+exports.typedEntries = typedEntries;
+function hasProp(obj, key) {
+    return key in obj;
+}
+exports.hasProp = hasProp;
+function throw_(err) {
+    throw err;
+}
+exports.throw_ = throw_;
+async function* filterMapGenerator(generator, filterMap) {
+    for await (const x of generator) {
+        const res = await filterMap(x);
+        if (res !== undefined)
+            yield res;
+    }
+}
+exports.filterMapGenerator = filterMapGenerator;
+async function asyncGeneratorToArray(generator) {
+    const ret = [];
+    for await (const x of generator)
+        ret.push(x);
+    return ret;
+}
+exports.asyncGeneratorToArray = asyncGeneratorToArray;
+function repeat(every, cb) {
+    Promise.allSettled([cb()]).then(() => setTimeout(() => repeat(every, cb), every));
+}
+exports.repeat = repeat;

package/src/customHtml.js

@@ -1,36 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveCustomHtml = exports.getSection = exports.watchLoadCustomHtml = exports.newCustomHtmlState = exports.customHtmlState = exports.customHtmlSections = void 0;
-const fs_1 = require("fs");
-const events_1 = __importDefault(require("./events"));
+exports.saveCustomHtml = exports.getSection = exports.watchLoadCustomHtml = exports.customHtmlState = exports.customHtmlSections = void 0;
 const misc_1 = require("./misc");
-const frontEndApis_1 = require("./frontEndApis");
 const watchLoad_1 = require("./watchLoad");
 const vanilla_1 = require("valtio/vanilla"); // without /vanilla we trigger react dependency
 const promises_1 = require("fs/promises");
 const plugins_1 = require("./plugins");
+const FILE = 'custom.html';
 exports.customHtmlSections = ['beforeHeader', 'afterHeader', 'afterMenuBar', 'afterList',
     'top', 'bottom', 'afterEntryName', 'beforeLogin'];
 exports.customHtmlState = (0, vanilla_1.proxy)({
-    sections: newCustomHtmlState()
+    sections: watchLoadCustomHtml().state
 });
-function newCustomHtmlState() {
-    return new Map();
-}
-exports.newCustomHtmlState = newCustomHtmlState;
-const FILE = 'custom.html';
-if (!(0, fs_1.existsSync)(FILE))
-    events_1.default.once('config ready', () => {
-        const legacy = (0, misc_1.prefix)('[beforeHeader]\n', frontEndApis_1.customHeader.get());
-        (0, fs_1.writeFileSync)(FILE, legacy);
-        frontEndApis_1.customHeader.set(''); // get rid of it
-    });
-watchLoadCustomHtml(exports.customHtmlState.sections);
-function watchLoadCustomHtml(state, folder = '') {
-    return (0, watchLoad_1.watchLoad)((0, misc_1.prefix)('', folder, '/') + FILE, data => {
+function watchLoadCustomHtml(folder = '') {
+    const state = new Map();
+    const res = (0, watchLoad_1.watchLoad)((0, misc_1.prefix)('', folder, '/') + FILE, data => {
         var _a;
         const re = /^\[(\w+)] *$/gm;
         state.clear();
@@ -46,6 +30,7 @@ function watchLoadCustomHtml(state, folder = '') {
             name = match === null || match === void 0 ? void 0 : match[1];
         } while (name);
     });
+    return Object.assign(res, { state });
 }
 exports.watchLoadCustomHtml = watchLoadCustomHtml;
 function getSection(name) {

package/src/debounceAsync.js

@@ -2,19 +2,22 @@
 // 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 } = {}) {
+function debounceAsync(callback, wait = 100, options = {}) {
+    const { leading = false, maxWait = Infinity, cancelable = false } = options;
     let started = 0; // latest callback invocation
     let runningCallback; // latest callback invocation result
     let runningDebouncer; // latest wrapper invocation
     let waitingSince = 0; // we are delaying invocation since
-    let whoIsWaiting; // args' array object identifies the pending instance, and incidentally stores args
-    const interceptingWrapper = (...args) => runningDebouncer = debouncer.apply(null, args);
+    let whoIsWaiting; // args object identifies the pending instance, and incidentally stores args
+    const interceptingWrapper = (...args) => runningDebouncer = debouncer(...args);
     return Object.assign(interceptingWrapper, {
-        cancel: () => {
-            waitingSince = 0;
-            whoIsWaiting = undefined;
-        },
         flush: () => runningCallback !== null && runningCallback !== void 0 ? runningCallback : exec(),
+        ...cancelable && {
+            cancel() {
+                waitingSince = 0;
+                whoIsWaiting = undefined;
+            }
+        }
     });
     async function debouncer(...args) {
         if (runningCallback)
@@ -33,11 +36,11 @@ function debounceAsync(callback, wait = 100, { leading = false, maxWait = Infini
     }
     async function exec() {
         if (!whoIsWaiting)
-            return;
+            return undefined;
         waitingSince = 0;
         started = Date.now();
         try {
-            runningCallback = callback.apply(null, whoIsWaiting);
+            runningCallback = callback(...whoIsWaiting);
             return await runningCallback; // await necessary to go-finally at the right time and even on exceptions
         }
         finally {

package/src/frontEndApis.js

@@ -27,11 +27,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyClient = exports.frontEndApis = exports.customHeader = 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 util_files_1 = require("./util-files");
 const const_1 = require("./const");
@@ -39,9 +38,8 @@ const vfs_1 = require("./vfs");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const upload_1 = require("./upload");
-exports.customHeader = (0, config_1.defineConfig)('custom_header', '');
 exports.frontEndApis = {
-    file_list: api_file_list_1.file_list,
+    get_file_list: api_file_list_1.get_file_list,
     ...api_auth,
     get_notifications({ channel }, ctx) {
         apiAssertTypes({ string: { channel } });

package/src/github.js

@@ -13,6 +13,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const const_1 = require("./const");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
+const fs_1 = require("fs");
 const DIST_ROOT = 'dist';
 const downloading = {};
 function downloadProgress(id, status) {
@@ -23,45 +24,60 @@ function downloadProgress(id, status) {
     events_1.default.emit('pluginDownload_' + id, status);
 }
 async function downloadPlugin(repo, branch = '', overwrite) {
+    var _a, _b, _c;
     if (downloading[repo])
         return new apiMiddleware_1.ApiError(const_1.HTTP_CONFLICT, "already downloading");
     console.log('downloading plugin', repo);
     downloadProgress(repo, true);
     try {
+        if (repo.includes('//')) { // custom repo
+            const pl = (0, plugins_1.findPluginByRepo)(repo);
+            if (!pl)
+                return new apiMiddleware_1.ApiError(const_1.HTTP_BAD_REQUEST, "bad repo");
+            const customRepo = (((_b = (_a = pl).getData) === null || _b === void 0 ? void 0 : _b.call(_a)) || pl).repo;
+            let url = customRepo === null || customRepo === void 0 ? void 0 : customRepo.zip;
+            if (!url)
+                return new apiMiddleware_1.ApiError(const_1.HTTP_SERVER_ERROR, "bad plugin");
+            if (!url.includes('//'))
+                url = customRepo.web + url;
+            return await go(url, pl === null || pl === void 0 ? void 0 : pl.id, (_c = customRepo.zipRoot) !== null && _c !== void 0 ? _c : DIST_ROOT);
+        }
         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
-            : folder2repo.hasOwnProperty(short) ? repo.replace('/', '-') // longer form only if another plugin is using short form
+        const folder = overwrite ? lodash_1.default.findKey(getFolder2repo(), x => x === repo) // use existing folder
+            : getFolder2repo().hasOwnProperty(short) ? repo.replace('/', '-') // longer form only if another plugin is using short form, to avoid overwriting
                 : short;
-        const installPath = plugins_1.PATH + '/' + folder;
         const GITHUB_ZIP_ROOT = short + '-' + branch; // GitHub puts everything within this folder
-        const rootWithinZip = GITHUB_ZIP_ROOT + '/' + DIST_ROOT;
-        const foldersToCopy = [
-            rootWithinZip + '-' + process.platform + '-' + process.arch,
-            rootWithinZip + '-' + process.platform,
-            rootWithinZip,
-        ].map(x => x + '/');
-        // this zip doesn't have content-length, so we cannot produce progress event
-        const stream = await (0, misc_1.httpsStream)(`https://github.com/${repo}/archive/refs/heads/${branch}.zip`);
-        const MAIN = 'plugin.js';
-        await (0, misc_1.unzip)(stream, async (path) => {
-            const folder = foldersToCopy.find(x => path.startsWith(x));
-            if (!folder || path.endsWith('/'))
-                return false;
-            let dest = path.slice(folder.length);
-            if (dest === MAIN) // avoid being possibly loaded before the download is complete
-                dest += plugins_1.DISABLING_POSTFIX;
-            dest = (0, path_1.join)(installPath, dest);
-            return (0, promises_1.rm)(dest, { force: true }).then(() => dest, () => false);
-        });
-        const main = (0, path_1.join)(installPath, MAIN);
-        await (0, promises_1.rename)(main + plugins_1.DISABLING_POSTFIX, main); // we are good now, restore name
-        return folder;
+        return await go(`https://github.com/${repo}/archive/refs/heads/${branch}.zip`, folder, GITHUB_ZIP_ROOT + '/' + DIST_ROOT);
+        async function go(url, folder, zipRoot) {
+            const installPath = plugins_1.PATH + '/' + folder;
+            const foldersToCopy = [
+                zipRoot + '-' + process.platform + '-' + process.arch,
+                zipRoot + '-' + process.platform,
+                zipRoot,
+            ].map(x => x + '/');
+            // github zip doesn't have content-length, so we cannot produce progress event
+            const stream = await (0, misc_1.httpStream)(url);
+            const MAIN = 'plugin.js';
+            await (0, misc_1.unzip)(stream, async (path) => {
+                const folder = foldersToCopy.find(x => path.startsWith(x));
+                if (!folder || path.endsWith('/'))
+                    return false;
+                let dest = path.slice(folder.length);
+                if (dest === MAIN) // avoid being possibly loaded before the download is complete
+                    dest += plugins_1.DISABLING_POSTFIX;
+                dest = (0, path_1.join)(installPath, dest);
+                return (0, promises_1.rm)(dest, { force: true }).then(() => dest, () => false);
+            });
+            const main = (0, path_1.join)(installPath, MAIN);
+            await (0, promises_1.rename)(main + plugins_1.DISABLING_POSTFIX, main) // we are good now, restore name
+                .catch(e => { throw e.code !== 'ENOENT' ? e : new apiMiddleware_1.ApiError(const_1.HTTP_FAILED_DEPENDENCY, "missing main file"); });
+            return folder;
+        }
     }
     finally {
         downloadProgress(repo, undefined);
@@ -73,16 +89,39 @@ function getRepoInfo(id) {
 }
 exports.getRepoInfo = getRepoInfo;
 function readGithubFile(uri) {
-    return (0, misc_1.httpsString)('https://raw.githubusercontent.com/' + uri)
+    return (0, misc_1.httpString)('https://raw.githubusercontent.com/' + uri)
         .then(res => res.body);
 }
 exports.readGithubFile = readGithubFile;
 async function readOnlinePlugin(repo, branch = '') {
-    branch || (branch = (await getRepoInfo(repo)).default_branch);
-    const res = await readGithubFile(`${repo}/${branch}/${DIST_ROOT}/plugin.js`);
-    const pl = (0, plugins_1.parsePluginSource)(repo, res); // use 'repo' as 'id' client-side
-    pl.branch = branch || undefined;
-    return pl;
+    if (typeof repo !== 'string') { // non-github plugin
+        const folder = lodash_1.default.findKey(getFolder2repo(), x => x === repo);
+        if (!folder)
+            throw Error();
+        const pl = (0, plugins_1.getPluginInfo)(folder);
+        let { main } = pl.repo;
+        if (!main)
+            throw Error("missing repo.main");
+        if (!main.includes('//'))
+            main = pl.repo.web + main;
+        const res = await (0, misc_1.httpString)(main);
+        if (!res.ok)
+            throw Error("bad repo.main");
+        return (0, plugins_1.parsePluginSource)(main, res.body); // use 'repo' as 'id' client-side
+    }
+    const branches = branch ? [branch] : (async function* () {
+        var _a;
+        yield 'main'; // getRepoInfo consumes github-api-quota, so give 'main' a shot first, and if it fails we'll ask
+        yield (_a = (await getRepoInfo(repo))) === null || _a === void 0 ? void 0 : _a.default_branch;
+    })();
+    for await (const b of branches) {
+        const res = await readGithubFile(`${repo}/${b}/${DIST_ROOT}/plugin.js`);
+        if (!res)
+            continue;
+        const pl = (0, plugins_1.parsePluginSource)(repo, res); // use 'repo' as 'id' client-side
+        pl.branch = b || undefined;
+        return pl;
+    }
 }
 exports.readOnlinePlugin = readOnlinePlugin;
 function getFolder2repo() {
@@ -93,7 +132,7 @@ function getFolder2repo() {
 exports.getFolder2repo = getFolder2repo;
 async function apiGithub(uri) {
     try {
-        const res = await (0, misc_1.httpsString)('https://api.github.com/' + uri, {
+        const res = await (0, misc_1.httpString)('https://api.github.com/' + uri, {
             headers: {
                 'User-Agent': 'HFS',
                 Accept: 'application/vnd.github.v3+json',
@@ -118,7 +157,7 @@ async function* searchPlugins(text = '') {
         if ((_a = projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.plugins_blacklist) === null || _a === void 0 ? void 0 : _a.includes(repo))
             continue;
         let pl = await readOnlinePlugin(repo, it.default_branch);
-        if (!pl.apiRequired)
+        if (!(pl === null || pl === void 0 ? void 0 : pl.apiRequired))
             continue; // mandatory field
         if (pl.badApi) { // we try other branches (starting with 'api')
             const res = await apiGithub('repos/' + it.full_name + '/branches');
@@ -126,14 +165,16 @@ async function* searchPlugins(text = '') {
                 .filter((x) => typeof x === 'string' && x.startsWith('api'))
                 .sort().reverse();
             for (const branch of branches) {
-                pl = await readOnlinePlugin(it, branch);
+                pl = await readOnlinePlugin(repo, branch);
+                if (!pl)
+                    continue;
                 if (!pl.apiRequired)
                     pl.badApi = '-';
                 if (!pl.badApi)
                     break;
             }
         }
-        if (pl.badApi)
+        if (!pl || pl.badApi)
             continue;
         Object.assign(pl, {
             downloading: downloading[repo],
@@ -145,14 +186,19 @@ async function* searchPlugins(text = '') {
 exports.searchPlugins = searchPlugins;
 // centralized hosted information, to be used as little as possible
 let cache;
+const FN = 'central.json';
+let latest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', FN), 'utf8')); // initially built-in is our latest
 function getProjectInfo() {
-    return cache || (cache = readGithubFile(const_1.HFS_REPO + '/main/central.json').then(x => {
+    return cache || (cache = readGithubFile(const_1.HFS_REPO + '/main/' + FN)
+        .catch(() => latest) // fall back to latest
+        .then(x => {
         if (!x)
             throw x; // go catch
-        setTimeout(() => cache = null, const_1.DAY); // invalidate cache
-        return JSON.parse(x);
+        setTimeout(() => cache = undefined, const_1.DAY); // invalidate cache
+        return latest = JSON.parse(x);
     }).catch(() => {
-        setTimeout(() => cache = null, 10000);
+        setTimeout(() => cache = undefined, 10000); // invalidate cache sooner on errors
+        return latest;
     }));
 }
 exports.getProjectInfo = getProjectInfo;

package/src/langs/embedded.js

@@ -16,4 +16,5 @@ const hfs_lang_vi_json_1 = __importDefault(require("./hfs-lang-vi.json"));
 const hfs_lang_es_json_1 = __importDefault(require("./hfs-lang-es.json"));
 const hfs_lang_nl_json_1 = __importDefault(require("./hfs-lang-nl.json"));
 const hfs_lang_el_json_1 = __importDefault(require("./hfs-lang-el.json"));
-exports.default = { it: hfs_lang_it_json_1.default, zh: hfs_lang_zh_json_1.default, ru: hfs_lang_ru_json_1.default, sr: hfs_lang_sr_json_1.default, ko: hfs_lang_ko_json_1.default, ms: hfs_lang_ms_json_1.default, 'zh-tw': hfs_lang_zh_tw_json_1.default, fr: hfs_lang_fr_json_1.default, pt: hfs_lang_pt_json_1.default, vi: hfs_lang_vi_json_1.default, es: hfs_lang_es_json_1.default, nl: hfs_lang_nl_json_1.default, el: hfs_lang_el_json_1.default };
+const hfs_lang_de_json_1 = __importDefault(require("./hfs-lang-de.json"));
+exports.default = { it: hfs_lang_it_json_1.default, zh: hfs_lang_zh_json_1.default, ru: hfs_lang_ru_json_1.default, sr: hfs_lang_sr_json_1.default, ko: hfs_lang_ko_json_1.default, ms: hfs_lang_ms_json_1.default, 'zh-tw': hfs_lang_zh_tw_json_1.default, fr: hfs_lang_fr_json_1.default, pt: hfs_lang_pt_json_1.default, vi: hfs_lang_vi_json_1.default, es: hfs_lang_es_json_1.default, nl: hfs_lang_nl_json_1.default, el: hfs_lang_el_json_1.default, de: hfs_lang_de_json_1.default };