hfs 0.29.0 → 0.29.1-rc2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.29.0",
+  "version": "0.29.1-rc2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",
@@ -16,7 +16,7 @@
     "start-frontend": "npm run start --workspace=frontend",
     "start-admin": "npm run start --workspace=admin",
     "build-all": "npm audit --omit=dev && rm -rf dist && npm i && npm run build-server && npm run build-frontend && npm run build-admin && echo COMPLETED",
-    "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && touch package.json && cp -v -r package.json README* LICENSE* plugins dist && find dist -name .DS_Store -delete",
+    "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && touch package.json && cp -v -r package.json README* LICENSE* plugins dist && find dist -name .DS_Store -delete && node afterbuild.js",
     "build-frontend": "npm run build --workspace=frontend",
     "build-admin": "npm run build --workspace=admin",
     "server-for-test": "node dist/src --cwd . --config tests",

package/src/QuickZipStream.js

@@ -1,5 +1,28 @@
 "use strict";
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -12,7 +35,7 @@ const assert_1 = __importDefault(require("assert"));
 const ZIP64_SIZE_LIMIT = 0xffffffff;
 const ZIP64_NUMBER_LIMIT = 0xffff;
 let crc32function;
-import('@node-rs/crc32').then(lib => crc32function = lib.crc32, () => {
+Promise.resolve().then(() => __importStar(require('@node-rs/crc32'))).then(lib => crc32function = lib.crc32, () => {
     console.log('using generic lib for crc32');
     crc32function = buffer_crc32_1.unsigned;
 });

package/src/commands.js

@@ -33,7 +33,7 @@ function parseCommandLine(line) {
         return console.error("cannot understand entered command, try 'help'");
     if (cmd.cb.length > params.length)
         return console.error("insufficient parameters, expected: " + cmd.params);
-    cmd.cb(...params).then(() => console.log("+++ command executed"), (err) => {
+    Promise.resolve(cmd.cb(...params)).then(() => console.log("+++ command executed"), (err) => {
         if (typeof err === 'string')
             console.error("command failed:", err);
         else
@@ -43,7 +43,7 @@ function parseCommandLine(line) {
 const commands = {
     help: {
         params: '',
-        async cb() {
+        cb() {
             console.log("supported commands:", ...lodash_1.default.map(commands, ({ params }, name) => '\n - ' + name + ' ' + params));
         }
     },
@@ -77,7 +77,7 @@ const commands = {
     },
     config: {
         params: '<key> <value>',
-        async cb(key, value) {
+        cb(key, value) {
             const conf = (0, config_1.getConfigDefinition)(key);
             if (!conf)
                 throw "specified key doesn't exist";
@@ -91,7 +91,7 @@ const commands = {
     },
     'show-config': {
         params: '<key>',
-        async cb(key) {
+        cb(key) {
             const conf = (0, config_1.getConfigDefinition)(key);
             if (!conf)
                 throw "specified key doesn't exist";
@@ -100,7 +100,7 @@ const commands = {
     },
     quit: {
         params: '',
-        async cb() {
+        cb() {
             process.exit(0);
         }
     },
@@ -117,7 +117,7 @@ const commands = {
     },
     version: {
         params: '',
-        async cb() {
+        cb() {
             console.log(const_1.VERSION);
             console.log(const_1.BUILD_TIMESTAMP);
         }

package/src/const.js

@@ -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 = fs.statSync(PKG_PATH).mtime.toISOString();
+exports.BUILD_TIMESTAMP = "2023-01-27T14:09:35.790Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.DAY = 86400000;

package/src/plugins.js

@@ -224,7 +224,7 @@ async function rescan() {
             try {
                 const alreadyRunning = plugins[id];
                 console.log(alreadyRunning ? "reloading plugin" : "loading plugin", id);
-                const { init, ...data } = await import(module);
+                const { init, ...data } = await Promise.resolve().then(() => __importStar(require(module)));
                 delete data.default;
                 deleteModule(require.resolve(module)); // avoid caching at next import
                 calculateBadApi(data);

package/src/serveGuiFiles.js

@@ -1,5 +1,28 @@
 "use strict";
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -66,7 +89,7 @@ function serveProxied(port, uri) {
         return;
     console.debug('proxied on port', port);
     let proxy;
-    import('koa-better-http-proxy').then(lib => // dynamic import to avoid having this in final distribution
+    Promise.resolve().then(() => __importStar(require('koa-better-http-proxy'))).then(lib => // dynamic import to avoid having this in final distribution
      proxy = lib.default('127.0.0.1:' + port, {
         proxyReqPathResolver: (ctx) => shouldServeApp(ctx) ? '/' : ctx.path,
         userResDecorator(res, data, ctx) {