@silexlabs/silex 3.7.0 → 3.9.0-canary.2

package/dist/server/server/config.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerConfig = void 0;
-const silex_plugins_1 = require("@silexlabs/silex-plugins");
+const index_js_1 = require("../common/silex-plugins/index.js");
 const path_1 = require("path");
-const constants_1 = require("../constants");
+const constants_js_1 = require("../common/constants.js");
 const promises_1 = require("fs/promises");
-const connectors_1 = require("./connectors/connectors");
-const FsStorage_1 = require("./connectors/FsStorage");
-const types_1 = require("../types");
-const FsHosting_1 = require("./connectors/FsHosting");
-class ServerConfig extends silex_plugins_1.Config {
+const connectors_js_1 = require("./connectors/connectors.js");
+const FsStorage_js_1 = require("./connectors/FsStorage.js");
+const types_js_1 = require("../common/types.js");
+const FsHosting_js_1 = require("./connectors/FsHosting.js");
+class ServerConfig extends index_js_1.Config {
     expressOptions = {
         jsonLimit: process.env.SILEX_EXPRESS_JSON_LIMIT,
         textLimit: process.env.SILEX_EXPRESS_TEXT_LIMIT,
@@ -22,16 +22,16 @@ class ServerConfig extends silex_plugins_1.Config {
     debug = process.env.SILEX_DEBUG === 'true';
     url = process.env.SILEX_URL?.replace(/\/$/, '') ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
     userConfigPath = process.env.SILEX_SERVER_CONFIG;
-    configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
+    configFilePath = (0, path_1.resolve)(__dirname, '../../../server/deploy/.silex.js');
     getConnectors(type = null) {
         if (!type) {
             const allConnectors = this.getStorageConnectors().concat(this.getHostingConnectors());
             return [...new Set(allConnectors)];
         }
-        const connectorType = (0, connectors_1.toConnectorEnum)(type.toString());
+        const connectorType = (0, connectors_js_1.toConnectorEnum)(type.toString());
         switch (connectorType) {
-            case types_1.ConnectorType.HOSTING: return this.getHostingConnectors();
-            case types_1.ConnectorType.STORAGE: return this.getStorageConnectors();
+            case types_js_1.ConnectorType.HOSTING: return this.getHostingConnectors();
+            case types_js_1.ConnectorType.STORAGE: return this.getStorageConnectors();
             default: throw new Error(`Unknown connector type ${type}`);
         }
     }
@@ -54,12 +54,12 @@ class ServerConfig extends silex_plugins_1.Config {
     }
     getHostingConnectors() { return this.hostingConnectors; }
     async addRoutes(app) {
-        const path = process.env.SILEX_CLIENT_CONFIG;
+        const path = process.env.SILEX_CLIENT_CONFIG || (0, path_1.resolve)(__dirname, '../../../server/deploy/client-config.js');
         if (path) {
-            console.info(`> Serving client side config ${path} at ${constants_1.CLIENT_CONFIG_FILE_NAME}`);
+            console.info(`> Serving client side config ${path} at ${constants_js_1.CLIENT_CONFIG_FILE_NAME}`);
             try {
                 let clientConfig = (await (0, promises_1.readFile)(path)).toString();
-                app.get(`/${constants_1.CLIENT_CONFIG_FILE_NAME}`, async (req, res) => {
+                app.get(`/${constants_js_1.CLIENT_CONFIG_FILE_NAME}`, async (req, res) => {
                     if (this.debug) {
                         console.info('[Debug mode] Reloading config file', path);
                         clientConfig = (await (0, promises_1.readFile)(path)).toString();
@@ -71,7 +71,7 @@ class ServerConfig extends silex_plugins_1.Config {
             }
             catch (e) {
                 console.error(`Error loading client config file ${path}`, e);
-                throw new Error(`Error loading client config file ${path}: ${e.message}`);
+                throw new Error(`Error loading client config file ${path}: ${e.message}`, { cause: e });
             }
         }
     }
@@ -86,7 +86,7 @@ class ServerConfig extends silex_plugins_1.Config {
                 await this.addPlugin(this.userConfigPath, {});
             }
             catch (e) {
-                throw new Error(`\nUser config file ${this.userConfigPath} error:\n\n\t${e.message}\n\n`);
+                throw new Error(`\nUser config file ${this.userConfigPath} error:\n\n\t${e.message}\n\n`, { cause: e });
             }
         }
     }
@@ -100,18 +100,18 @@ class ServerConfig extends silex_plugins_1.Config {
                 console.info('> /!\\ Config file not found', this.configFilePath);
             }
             else {
-                throw new Error(`Error in config file ${this.configFilePath}: ${e.message}`);
+                throw new Error(`Error in config file ${this.configFilePath}: ${e.message}`, { cause: e });
             }
         }
     }
     async initDefaultConnectors() {
         if (!this.storageConnectors.length) {
-            this.addStorageConnector(new FsStorage_1.FsStorage(null, {
+            this.addStorageConnector(new FsStorage_js_1.FsStorage(null, {
                 path: process.env.SILEX_FS_ROOT || (0, path_1.join)(process.cwd(), '/silex/storage'),
             }));
         }
         if (!this.hostingConnectors.length) {
-            this.addHostingConnector(new FsHosting_1.FsHosting(null, {
+            this.addHostingConnector(new FsHosting_js_1.FsHosting(null, {
                 path: process.env.SILEX_FS_HOSTING_ROOT || (0, path_1.join)(process.cwd(), '/silex/hosting'),
             }));
         }

package/dist/server/server/connectors/FsHosting.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsHosting = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
-const FsStorage_1 = require("./FsStorage");
-const types_1 = require("../../types");
-class FsHosting extends FsStorage_1.FsStorage {
+const FsStorage_js_1 = require("./FsStorage.js");
+const types_js_1 = require("../../common/types.js");
+class FsHosting extends FsStorage_js_1.FsStorage {
     connectorId = 'fs-hosting';
     displayName = 'File system hosting';
-    connectorType = types_1.ConnectorType.HOSTING;
+    connectorType = types_js_1.ConnectorType.HOSTING;
     async initFs() {
         const stat = await promises_1.default.stat(this.options.path).catch(() => null);
         if (!stat) {
@@ -28,10 +28,10 @@ class FsHosting extends FsStorage_1.FsStorage {
             job.status = status;
             job.message = message;
             job.logs[0].push(message);
-            if (status === types_1.JobStatus.SUCCESS) {
+            if (status === types_js_1.JobStatus.SUCCESS) {
                 jobSuccess(job.jobId, message);
             }
-            else if (status === types_1.JobStatus.ERROR) {
+            else if (status === types_js_1.JobStatus.ERROR) {
                 job.errors[0].push(message);
                 jobError(job.jobId, message);
             }

package/dist/server/server/connectors/FsStorage.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsStorage = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = require("fs");
-const connectors_1 = require("./connectors");
+const connectors_js_1 = require("./connectors.js");
 const path_1 = require("path");
-const types_1 = require("../../types");
+const types_js_1 = require("../../common/types.js");
 const os_1 = require("os");
-const validation_1 = require("../utils/validation");
-const constants_1 = require("../../constants");
+const validation_js_1 = require("../utils/validation.js");
+const constants_js_1 = require("../../common/constants.js");
 const stream_1 = require("stream");
 const uuid_1 = require("uuid");
-const websiteDataSerialization_1 = require("../utils/websiteDataSerialization");
+const websiteDataSerialization_js_1 = require("../utils/websiteDataSerialization.js");
 if (!globalThis.__dirname) {
-    globalThis.__dirname = (0, path_1.dirname)(process.cwd() + '/src/ts/server/connectors/FsStorage.ts');
+    globalThis.__dirname = (0, path_1.dirname)(process.cwd() + '/server/connectors/FsStorage.ts');
     console.info('Redefining __dirname', globalThis.__dirname);
 }
 async function copyDir(src, dest) {
@@ -38,7 +38,7 @@ class FsStorage {
     icon = FILE_ICON;
     disableLogout = true;
     options;
-    connectorType = types_1.ConnectorType.STORAGE;
+    connectorType = types_js_1.ConnectorType.STORAGE;
     color = '#ffffff';
     background = '#006400';
     constructor(config, opts) {
@@ -50,13 +50,13 @@ class FsStorage {
         this.initFs();
     }
     async initFs() {
-        const defaultSite = (0, path_1.join)(this.options.path, constants_1.DEFAULT_WEBSITE_ID);
+        const defaultSite = (0, path_1.join)(this.options.path, constants_js_1.DEFAULT_WEBSITE_ID);
         const stat = await promises_1.default.stat(defaultSite).catch(() => null);
         if (!stat) {
             await promises_1.default.mkdir((0, path_1.join)(defaultSite, this.options.assetsFolder), { recursive: true });
-            await this.setWebsiteMeta({}, constants_1.DEFAULT_WEBSITE_ID, { name: 'Default website', connectorUserSettings: {} });
-            await this.updateWebsite({}, constants_1.DEFAULT_WEBSITE_ID, types_1.EMPTY_WEBSITE);
-            console.info(`> [FsStorage] Created ${constants_1.DEFAULT_WEBSITE_ID} in ${this.options.path}`);
+            await this.setWebsiteMeta({}, constants_js_1.DEFAULT_WEBSITE_ID, { name: 'Default website', connectorUserSettings: {} });
+            await this.updateWebsite({}, constants_js_1.DEFAULT_WEBSITE_ID, types_js_1.EMPTY_WEBSITE);
+            console.info(`> [FsStorage] Created ${constants_js_1.DEFAULT_WEBSITE_ID} in ${this.options.path}`);
         }
     }
     updateStatus(filesStatuses, status, statusCbk) {
@@ -69,7 +69,7 @@ class FsStorage {
         return files.map(file => ({
             file,
             message: 'Waiting',
-            status: types_1.JobStatus.IN_PROGRESS,
+            status: types_js_1.JobStatus.IN_PROGRESS,
         }));
     }
     getOptions(formData) {
@@ -92,19 +92,19 @@ class FsStorage {
         return {
             name: username,
             picture: USER_ICON,
-            storage: await (0, connectors_1.toConnectorData)(session, this),
+            storage: await (0, connectors_js_1.toConnectorData)(session, this),
         };
     }
     async setWebsiteMeta(session, id, data) {
-        const websiteId = (0, validation_1.requiredParam)(id, 'website id');
-        const content = (0, websiteDataSerialization_1.stringify)(data);
-        const path = (0, path_1.join)(this.options.path, id, constants_1.WEBSITE_META_DATA_FILE);
+        const websiteId = (0, validation_js_1.requiredParam)(id, 'website id');
+        const content = (0, websiteDataSerialization_js_1.stringify)(data);
+        const path = (0, path_1.join)(this.options.path, id, constants_js_1.WEBSITE_META_DATA_FILE);
         await promises_1.default.writeFile(path, content);
     }
     async getWebsiteMeta(session, id) {
-        const websiteId = (0, validation_1.requiredParam)(id, 'website id');
+        const websiteId = (0, validation_js_1.requiredParam)(id, 'website id');
         const fileStat = await promises_1.default.stat((0, path_1.join)(this.options.path, websiteId));
-        const path = (0, path_1.join)(this.options.path, websiteId, constants_1.WEBSITE_META_DATA_FILE);
+        const path = (0, path_1.join)(this.options.path, websiteId, constants_js_1.WEBSITE_META_DATA_FILE);
         const content = await promises_1.default.readFile(path);
         const meta = await JSON.parse(content.toString());
         return {
@@ -120,12 +120,12 @@ class FsStorage {
         const id = (0, uuid_1.v4)();
         await promises_1.default.mkdir((0, path_1.join)(this.options.path, id, this.options.assetsFolder), { recursive: true });
         await this.setWebsiteMeta(session, id, meta);
-        await this.updateWebsite(session, id, types_1.EMPTY_WEBSITE);
+        await this.updateWebsite(session, id, types_js_1.EMPTY_WEBSITE);
         return id;
     }
     async readWebsite(session, websiteId) {
-        const id = (0, validation_1.requiredParam)(websiteId, 'website id');
-        const path = (0, path_1.join)(this.options.path, id, constants_1.WEBSITE_DATA_FILE);
+        const id = (0, validation_js_1.requiredParam)(websiteId, 'website id');
+        const path = (0, path_1.join)(this.options.path, id, constants_js_1.WEBSITE_DATA_FILE);
         const content = await promises_1.default.readFile(path);
         const websiteDataContent = content.toString();
         const parsedData = JSON.parse(websiteDataContent);
@@ -134,13 +134,13 @@ class FsStorage {
             const pageContent = await promises_1.default.readFile(fullPath);
             return pageContent.toString();
         };
-        return await (0, websiteDataSerialization_1.merge)(websiteDataContent, pageLoader);
+        return await (0, websiteDataSerialization_js_1.merge)(websiteDataContent, pageLoader);
     }
     async updateWebsite(session, websiteId, data) {
-        const id = (0, validation_1.requiredParam)(websiteId, 'website id');
+        const id = (0, validation_js_1.requiredParam)(websiteId, 'website id');
         const websitePath = (0, path_1.join)(this.options.path, id);
-        const filesToWrite = (0, websiteDataSerialization_1.split)(data);
-        const pagesFolder = (0, websiteDataSerialization_1.getPagesFolder)(data);
+        const filesToWrite = (0, websiteDataSerialization_js_1.split)(data);
+        const pagesFolder = (0, websiteDataSerialization_js_1.getPagesFolder)(data);
         await promises_1.default.mkdir(websitePath, { recursive: true });
         const hasPageFiles = filesToWrite.some(f => f.path.startsWith(pagesFolder));
         if (hasPageFiles) {
@@ -166,9 +166,9 @@ class FsStorage {
         }
     }
     async deleteWebsite(session, websiteId) {
-        const id = (0, validation_1.requiredParam)(websiteId, 'website id');
+        const id = (0, validation_js_1.requiredParam)(websiteId, 'website id');
         const path = (0, path_1.join)(this.options.path, id);
-        return promises_1.default.rmdir(path, { recursive: true });
+        return promises_1.default.rm(path, { recursive: true, force: true });
     }
     async duplicateWebsite(session, websiteId) {
         const newWebsiteId = (0, uuid_1.v4)();
@@ -204,34 +204,34 @@ class FsStorage {
             const path = (0, path_1.join)(this.options.path, id, assetsFolder, file.path);
             if (typeof file.content === 'string' || Buffer.isBuffer(file.content)) {
                 fileStatus.message = 'Writing';
-                this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
                 try {
                     await promises_1.default.writeFile(path, file.content);
                 }
                 catch (err) {
                     fileStatus.message = `Error (${err})`;
-                    this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                    this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
                     error = err;
                     continue;
                 }
                 fileStatus.message = 'Success';
-                this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
             }
             else if (file.content instanceof stream_1.Readable) {
                 fileStatus.message = 'Writing';
-                this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
                 const writeStream = (0, fs_1.createWriteStream)(path);
                 file.content.pipe(writeStream);
                 await new Promise((resolve) => {
                     writeStream.on('finish', () => {
                         fileStatus.message = 'Success';
-                        this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                        this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
                         resolve(file);
                     });
                     writeStream.on('error', err => {
                         console.error('writeStream error', err);
                         fileStatus.message = `Error (${err})`;
-                        this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
+                        this.updateStatus(filesStatuses, types_js_1.JobStatus.IN_PROGRESS, statusCbk);
                         error = err;
                         resolve(file);
                     });
@@ -242,7 +242,7 @@ class FsStorage {
                 throw new Error('Invalid file content: ' + typeof file.content);
             }
         }
-        this.updateStatus(filesStatuses, error ? types_1.JobStatus.ERROR : types_1.JobStatus.SUCCESS, statusCbk);
+        this.updateStatus(filesStatuses, error ? types_js_1.JobStatus.ERROR : types_js_1.JobStatus.SUCCESS, statusCbk);
         if (error)
             throw error;
     }
@@ -252,7 +252,7 @@ class FsStorage {
         }
     }
     async readAsset(session, websiteId, fileName) {
-        const id = (0, validation_1.requiredParam)(websiteId, 'website id');
+        const id = (0, validation_js_1.requiredParam)(websiteId, 'website id');
         const path = (0, path_1.join)(this.options.path, id, this.options.assetsFolder, fileName);
         return await promises_1.default.readFile(path);
     }

package/dist/server/server/connectors/connectors.js

@@ -7,11 +7,11 @@ exports.contentToString = contentToString;
 exports.contentToBuffer = contentToBuffer;
 exports.contentToReadable = contentToReadable;
 const stream_1 = require("stream");
-const types_1 = require("../../types");
+const types_js_1 = require("../../common/types.js");
 function toConnectorEnum(type) {
-    const result = types_1.ConnectorType[type.toString().toUpperCase()];
+    const result = types_js_1.ConnectorType[type.toString().toUpperCase()];
     if (!result)
-        throw new Error(`Unknown connector type ${type}. It should be one of ${Object.keys(types_1.ConnectorType).join(', ')}`);
+        throw new Error(`Unknown connector type ${type}. It should be one of ${Object.keys(types_js_1.ConnectorType).join(', ')}`);
     return result;
 }
 async function getConnector(config, session, type, connectorId) {

package/dist/server/server/expose.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.events = void 0;
-exports.events = __importStar(require("./events"));
+exports.events = __importStar(require("./events.js"));

package/dist/server/server/express.js

@@ -11,7 +11,7 @@ const compression_1 = __importDefault(require("compression"));
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const cookie_session_1 = __importDefault(require("cookie-session"));
 const cors_1 = __importDefault(require("cors"));
-const events_1 = require("./events");
+const events_js_1 = require("./events.js");
 function create(config) {
     const app = (0, express_1.default)();
     app.set('config', config);
@@ -36,10 +36,10 @@ function create(config) {
 }
 async function start(app) {
     const config = app.get('config');
-    config.emit(events_1.ServerEvent.STARTUP_START, { app });
+    config.emit(events_js_1.ServerEvent.STARTUP_START, { app });
     return new Promise((resolve, reject) => {
         app.listen(config.port, () => {
-            config.emit(events_1.ServerEvent.STARTUP_END, { app });
+            config.emit(events_js_1.ServerEvent.STARTUP_END, { app });
             resolve(app);
         });
     });

package/dist/server/server/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -30,20 +40,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = silex;
-const silexApp = __importStar(require("./express"));
-const api_1 = __importDefault(require("./api/api"));
-const config_1 = require("./config");
+const silexApp = __importStar(require("./express.js"));
+const api_js_1 = __importDefault(require("./api/api.js"));
+const config_js_1 = require("./config.js");
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = require("path");
-const constants_1 = require("../constants");
-__exportStar(require("./expose"), exports);
+const constants_js_1 = require("../common/constants.js");
+__exportStar(require("./expose.js"), exports);
 async function silex() {
-    console.info(constants_1.DEV_MESSAGE);
+    console.info(constants_js_1.DEV_MESSAGE);
     console.info(`Node version: ${process.version}`);
     console.info(`CWD: ${process.cwd()}`);
     const curDirEnv = dotenv_1.default.config();
     if (curDirEnv.error) {
-        if (curDirEnv.error['code'] === 'ENOENT') {
+        if (curDirEnv.error.code === 'ENOENT') {
             console.info('> No .env file found in current directory');
         }
         else {
@@ -56,7 +66,7 @@ async function silex() {
     const DEFAULT_ENV_FILE = (0, path_1.join)(__dirname, '../../../.env.default');
     const rootDirEnv = dotenv_1.default.config({ path: DEFAULT_ENV_FILE });
     if (rootDirEnv.error) {
-        if (rootDirEnv.error['code'] === 'ENOENT') {
+        if (rootDirEnv.error.code === 'ENOENT') {
             throw new Error(`\n\nFailed to load default env vars. File not found ${DEFAULT_ENV_FILE}\n\n`);
         }
         else {
@@ -64,12 +74,12 @@ async function silex() {
         }
     }
     console.info('> Default env vars loaded');
-    const config = new config_1.ServerConfig();
+    const config = new config_js_1.ServerConfig();
     const app = silexApp.create(config);
     await config.addRoutes(app);
     await config.loadConfigFiles();
     await config.initDefaultConnectors();
-    app.use('/api', (0, api_1.default)(config));
+    app.use('/api', (0, api_js_1.default)(config));
     await silexApp.start(app);
     console.info(`\nSilex is ready, open http://localhost:${config.port} in your browser\n`);
     if (config.debug) {
@@ -77,8 +87,8 @@ async function silex() {
     }
 }
 async function startLiverReload() {
-    const { createServer } = await Promise.resolve().then(() => __importStar(require('livereload')));
-    const { resolve } = await Promise.resolve().then(() => __importStar(require('path')));
+    const { createServer } = await import('livereload');
+    const { resolve } = await import('path');
     const dist = resolve(__dirname, '../../client');
     const server = createServer({
         delay: 0,

package/dist/server/server/jobs.js

@@ -6,7 +6,7 @@ exports.getJob = getJob;
 exports.jobSuccess = jobSuccess;
 exports.jobError = jobError;
 exports.killJob = killJob;
-const types_1 = require("../types");
+const types_js_1 = require("../common/types.js");
 const TIME_TO_KEEP_AFTER_STOP = 60 * 10 * 1000;
 const jobs = new Array();
 const timers = new WeakMap();
@@ -16,7 +16,7 @@ function startJob(message = '') {
     const jobId = `${processKey}_${++nextJobId}`;
     const job = {
         jobId,
-        status: types_1.JobStatus.IN_PROGRESS,
+        status: types_js_1.JobStatus.IN_PROGRESS,
         message: message
     };
     jobs.push(job);
@@ -26,10 +26,10 @@ function getJob(id) {
     return jobs.find(job => job.jobId === id);
 }
 function jobSuccess(id, message = '') {
-    return end(id, types_1.JobStatus.SUCCESS, message);
+    return end(id, types_js_1.JobStatus.SUCCESS, message);
 }
 function jobError(id, message = '') {
-    return end(id, types_1.JobStatus.ERROR, message);
+    return end(id, types_js_1.JobStatus.ERROR, message);
 }
 function killJob(job) {
     clearTimeout(timers.get(job));

package/dist/{plugins/server/plugins/server → server/server/plugins}/DownloadConnector.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const archiver_1 = __importDefault(require("archiver"));
-const types_1 = require("../../types");
+const types_js_1 = require("../../common/types.js");
 const os_1 = require("os");
-const events_1 = require("../../server/events");
+const path_1 = require("path");
+const events_js_1 = require("../events.js");
 const ZIP_ICON = '/assets/download.png';
 class default_1 {
     connectorId = 'download-connector';
@@ -15,23 +12,33 @@ class default_1 {
     icon = ZIP_ICON;
     disableLogout = false;
     options;
-    connectorType = types_1.ConnectorType.HOSTING;
+    connectorType = types_js_1.ConnectorType.HOSTING;
     color = '#ffffff';
     background = '#006400';
     constructor(config) {
-        // Add a route to serve the zip file
-        config.on(events_1.ServerEvent.STARTUP_END, ({ app }) => {
+        config.on(events_js_1.ServerEvent.STARTUP_END, ({ app }) => {
             app.get('/download/:tmpZipFile', async (req, res) => {
-                const path = `${(0, os_1.tmpdir)()}/${req.params.tmpZipFile}`;
+                const tmpZipFile = req.params.tmpZipFile;
+                if ((0, path_1.basename)(tmpZipFile) !== tmpZipFile) {
+                    res.status(400).send('Invalid download file');
+                    return;
+                }
+                const path = (0, path_1.join)((0, os_1.tmpdir)(), tmpZipFile);
                 res.sendFile(path, {}, (err) => {
                     if (err) {
                         console.error('[DownloadConnector] Error while sending file', err);
-                        res.status(500).send(`
+                        if (!res.headersSent)
+                            res.status(500).send(`
               <h1>Error</h1>
               <p>There was an error while getting the zip file of your website</p>
               <p>${err.message}</p>
             `);
+                        return;
                     }
+                    (0, fs_1.unlink)(path, (unlinkErr) => {
+                        if (unlinkErr)
+                            console.error('[DownloadConnector] Error while deleting temporary zip file', unlinkErr);
+                    });
                 });
             });
         });
@@ -61,47 +68,36 @@ class default_1 {
     }
     async startPublishingInBackground(session, websiteId, files, job) {
         const fileName = `${websiteId}-${Date.now()}-${Math.random().toString(36).substring(7)}.zip`;
+        const { ZipArchive } = await import('archiver');
         return new Promise((resolve, reject) => {
             let resolved = false;
             try {
-                // Generate a temporary path for the zip file, in the OS tmp folder, with the website id, the date and random string
                 const path = `${(0, os_1.tmpdir)()}/${fileName}`;
-                // create a file to stream archive data to.
                 const output = (0, fs_1.createWriteStream)(path);
-                const archive = (0, archiver_1.default)('zip', {
-                    zlib: { level: 9 } // Sets the compression level.
+                const archive = new ZipArchive({
+                    zlib: { level: 9 }
                 });
-                // Listen to archive events
-                // listen for all archive data to be written
-                // 'close' event is fired only when a file descriptor is involved
                 output.on('close', function () {
                     !resolved && resolve(path);
                     resolved = true;
                 });
-                // good practice to catch warnings (ie stat failures and other non-blocking errors)
                 archive.on('warning', function (err) {
                     if (err.code === 'ENOENT') {
-                        // log warning
                     }
                     else {
                         !resolved && reject(err);
                         resolved = true;
                     }
                 });
-                // good practice to catch this error explicitly
                 archive.on('error', function (err) {
                     !resolved && reject(err);
                     resolved = true;
                 });
-                // pipe archive data to the filey
                 archive.pipe(output);
-                // append files
                 for (const file of files) {
                     job.message = `Adding ${file.path} to the zip file`;
-                    // Handle content as string, buffer or readable
                     archive.append(file.content, { name: file.path });
                 }
-                // finalize the archive (ie we are done appending files but streams have to finish yet)
                 job.message = 'Finalizing the zip file';
                 return archive.finalize()
                     .then(() => path);
@@ -109,14 +105,14 @@ class default_1 {
             catch (err) {
                 console.error('Error while creating the zip file', err);
                 job.message = `Error while creating the zip file: ${err.message}`;
-                job.status = types_1.JobStatus.ERROR;
+                job.status = types_js_1.JobStatus.ERROR;
                 !resolved && reject(err);
                 resolved = true;
             }
         })
             .then(path => {
             job.message = `Zip file created, <a href="/download/${fileName}" target="_blank">download it now</a>`;
-            job.status = types_1.JobStatus.SUCCESS;
+            job.status = types_js_1.JobStatus.SUCCESS;
         });
     }
     async getUrl(session, websiteId) {
@@ -124,4 +120,3 @@ class default_1 {
     }
 }
 exports.default = default_1;
-//# sourceMappingURL=DownloadConnector.js.map