hfs 0.49.0-alpha2 → 0.49.0-alpha4

package/src/serveFile.js

@@ -38,7 +38,7 @@ function serveFileNode(ctx, node) {
     }
 }
 exports.serveFileNode = serveFileNode;
-const mimeCfg = (0, config_1.defineConfig)('mime', { '*': 'auto' });
+const mimeCfg = (0, config_1.defineConfig)('mime', { '*': vfs_1.MIME_AUTO });
 async function serveFile(ctx, source, mime, content) {
     if (!source)
         return;

package/src/serveGuiFiles.js

@@ -42,6 +42,7 @@ const customHtml_1 = require("./customHtml");
 const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("./config");
 const lang_1 = require("./lang");
+const vfs_1 = require("./vfs");
 const logGui = (0, config_1.defineConfig)('log_gui', false);
 // in case of dev env we have our static files within the 'dist' folder'
 const DEV_STATIC = process.env.DEV ? 'dist/' : '';
@@ -69,7 +70,7 @@ function serveStatic(uri) {
         if (content === null)
             return ctx.status = const_1.HTTP_NOT_FOUND;
         if (!serveApp)
-            return (0, serveFile_1.serveFile)(ctx, fullPath, 'auto', content);
+            return (0, serveFile_1.serveFile)(ctx, fullPath, vfs_1.MIME_AUTO, content);
         // we don't cache the index as it's small and may prevent plugins change to apply
         ctx.body = await treatIndex(ctx, uri, String(content));
     };

package/src/update.js

@@ -63,15 +63,22 @@ function updateSupported() {
     return const_1.IS_BINARY;
 }
 exports.updateSupported = updateSupported;
-async function update(tag) {
+async function update(tag = '') {
     if (!updateSupported())
-        throw "only binary versions are supported for now";
+        throw "only binary versions supports automatic update for now";
     let updateSource = await localUpdateAvailable() && (0, fs_1.createReadStream)(LOCAL_UPDATE);
     if (!updateSource) {
+        if (/^\d/.test(tag)) // work even if the tag is passed without the initial 'v' (useful for console commands)
+            tag = 'v' + tag;
         const update = !tag ? (await getUpdates())[0]
-            : await (0, github_1.getRepoInfo)(const_1.HFS_REPO + '/releases/tags/' + tag);
+            : await (0, github_1.getRepoInfo)(const_1.HFS_REPO + '/releases/tags/' + tag).catch(e => {
+                if (e.message === '404')
+                    console.error("version not found");
+                else
+                    throw e;
+            });
         if (!update)
-            throw "no update found";
+            throw "update not found";
         const assetSearch = { win32: 'windows', darwin: 'mac', linux: 'linux' }[process.platform];
         if (!assetSearch)
             throw "this feature doesn't support your platform: " + process.platform;
@@ -109,7 +116,8 @@ async function update(tag) {
         console.log('quitting');
         setTimeout(() => process.exit()); // give time to return (and caller to complete, eg: rest api to reply)
     }
-    catch (_a) {
+    catch (e) {
+        console.error((e === null || e === void 0 ? void 0 : e.message) || String(e));
         plugins_1.pluginsWatcher.unpause();
     }
 }

package/src/util-files.js

@@ -45,9 +45,7 @@ async function isDirectory(path) {
     try {
         return (await promises_1.default.stat(path)).isDirectory();
     }
-    catch (_a) {
-        return false;
-    }
+    catch (_a) { }
 }
 exports.isDirectory = isDirectory;
 async function readFileBusy(path) {
@@ -138,8 +136,9 @@ async function* dirStream(path, deep = 0) {
 exports.dirStream = dirStream;
 async function unzip(stream, cb) {
     let pending = Promise.resolve();
-    return new Promise(resolve => stream.pipe(unzip_stream_1.default.Parse())
+    return new Promise((resolve, reject) => stream.pipe(unzip_stream_1.default.Parse())
         .on('end', () => pending.then(resolve))
+        .on('error', reject)
         .on('entry', (entry) => pending = pending.then(async () => {
         const { path, type } = entry;
         const dest = await (0, misc_1.try_)(() => cb(path), e => {
@@ -150,7 +149,7 @@ async function unzip(stream, cb) {
             return entry.autodrain();
         console.debug('unzip', dest);
         await prepareFolder(dest);
-        const thisFile = entry.pipe((0, fs_1.createWriteStream)(dest));
+        const thisFile = entry.pipe((0, fs_1.createWriteStream)(dest).on('error', reject));
         await (0, stream_1.once)(thisFile, 'finish');
     })));
 }

package/src/util-http.js

@@ -36,9 +36,7 @@ function httpStream(url, { body, ...options } = {}) {
         }).on('error', e => {
             reject(req.res || e);
         });
-        if (body)
-            req.write(body);
-        req.end();
+        req.end(body);
     });
 }
 exports.httpStream = httpStream;

package/src/vfs.js

@@ -36,13 +36,14 @@ function permsFromParent(parent, child) {
 }
 exports.permsFromParent = permsFromParent;
 function inheritFromParent(parent, child) {
-    var _a, _b;
+    var _a, _b, _c;
     Object.assign(child, permsFromParent(parent, child));
     if (typeof parent.mime === 'object' && typeof child.mime === 'object')
         lodash_1.default.defaults(child.mime, parent.mime);
     else
         (_a = child.mime) !== null && _a !== void 0 ? _a : (child.mime = parent.mime);
     (_b = child.accept) !== null && _b !== void 0 ? _b : (child.accept = parent.accept);
+    (_c = child.default) !== null && _c !== void 0 ? _c : (child.default = parent.default);
     return child;
 }
 function isSameFilenameAs(name) {
@@ -167,8 +168,11 @@ function hasPermission(node, perm, ctx) {
 exports.hasPermission = hasPermission;
 function statusCodeForMissingPerm(node, perm, ctx, assign = true) {
     const ret = getCode();
-    if (ret && assign)
+    if (ret && assign) {
         ctx.status = ret;
+        if (ret === const_1.HTTP_UNAUTHORIZED) // this is necessary to support standard urls with credentials
+            ctx.set('WWW-Authenticate', 'Basic'); // we support basic authentication
+    }
     return ret;
     function getCode() {
         if (!node.source && perm === 'can_upload') // Upload possible only if we know where to store. First check node.source because is supposedly faster.

package/src/watchLoad.js

@@ -15,8 +15,12 @@ function watchLoad(path, parser, { failedOnFirstAttempt, immediateFirst } = {})
     let retry;
     let last;
     install(true);
-    const save = (0, misc_1.debounceAsync)((data) => promises_1.default.writeFile(path, data, 'utf8'));
-    return { unwatch, save };
+    const save = (0, misc_1.debounceAsync)(async (data, { reparse = false } = {}) => {
+        await promises_1.default.writeFile(path, data, 'utf8');
+        if (reparse)
+            await parser(data);
+    });
+    return { unwatch, save, getText: () => last, getPath: () => path };
     function install(first = false) {
         try {
             watcher = (0, fs_1.watch)(path, () => {