@silexlabs/silex 3.0.0-alpha.96 → 3.0.0

package/dist/plugins/server/types.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobStatus = exports.ConnectorType = exports.ClientSideFileType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
+exports.JobStatus = exports.ConnectorType = exports.Initiator = exports.ClientSideFileType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
 class ApiError extends Error {
     httpStatusCode;
     constructor(message, httpStatusCode) {
@@ -57,7 +57,13 @@ var ClientSideFileType;
     ClientSideFileType["HTML"] = "html";
     ClientSideFileType["ASSET"] = "asset";
     ClientSideFileType["CSS"] = "css";
+    ClientSideFileType["OTHER"] = "other";
 })(ClientSideFileType || (exports.ClientSideFileType = ClientSideFileType = {}));
+var Initiator;
+(function (Initiator) {
+    Initiator["HTML"] = "html";
+    Initiator["CSS"] = "css";
+})(Initiator || (exports.Initiator = Initiator = {}));
 /**
  * Enum to express if the connector is a storage or a hosting
  */

package/dist/plugins/server/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAmBH,MAAa,QAAS,SAAQ,KAAK;IACY;IAA7C,YAAY,OAAe,EAAkB,cAAsB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAD6B,mBAAc,GAAd,cAAc,CAAQ;QAEjE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF;AALD,4BAKC;AA+CD,KAAK;AACL,cAAc;AACD,QAAA,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AAuDhB,0BAA0B;AAC1B,oDAAoD;AACpD,4BAA4B;AAC5B,GAAG;AACH,EAAE;AACF,8BAA8B;AAC9B,iBAAiB;AACjB,qBAAqB;AACrB,0CAA0C;AAC1C,4BAA4B;AAC5B,GAAG;AAEH,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,oBAAJ,IAAI,QAEf;AAkCD,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,iCAAW,CAAA;AACb,CAAC,EAJW,kBAAkB,kCAAlB,kBAAkB,QAI7B;AA+CD;;GAEG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAuDD;;GAEG;AACH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAmBH,MAAa,QAAS,SAAQ,KAAK;IACY;IAA7C,YAAY,OAAe,EAAkB,cAAsB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAD6B,mBAAc,GAAd,cAAc,CAAQ;QAEjE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF;AALD,4BAKC;AAgDD,KAAK;AACL,cAAc;AACD,QAAA,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AAuDhB,0BAA0B;AAC1B,oDAAoD;AACpD,4BAA4B;AAC5B,GAAG;AACH,EAAE;AACF,8BAA8B;AAC9B,iBAAiB;AACjB,qBAAqB;AACrB,0CAA0C;AAC1C,4BAA4B;AAC5B,GAAG;AAEH,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,oBAAJ,IAAI,QAEf;AAkCD,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,iCAAW,CAAA;IACX,qCAAe,CAAA;AACjB,CAAC,EALW,kBAAkB,kCAAlB,kBAAkB,QAK7B;AAED,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,wBAAW,CAAA;AACb,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AA2CD;;GAEG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAuDD;;GAEG;AACH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB"}

package/dist/server/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
+exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DUPLICATE = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
 exports.WEBSITE_DATA_FILE = 'website.json';
 exports.WEBSITE_META_DATA_FILE = 'meta.json';
 exports.DEFAULT_WEBSITE_ID = 'default';
@@ -22,6 +22,7 @@ exports.API_WEBSITE_READ = '/';
 exports.API_WEBSITE_WRITE = '/';
 exports.API_WEBSITE_CREATE = '/';
 exports.API_WEBSITE_DELETE = '/';
+exports.API_WEBSITE_DUPLICATE = '/duplicate';
 exports.API_WEBSITE_LIST = '/';
 exports.API_WEBSITE_ASSET_READ = '/assets';
 exports.API_WEBSITE_ASSETS_WRITE = '/assets';

package/dist/server/server/api/publicationApi.js

@@ -74,16 +74,14 @@ function default_1(config) {
             const hostingConnector = await getHostingConnector(session, config, hostingId);
             const storage = await getStorageConnector(session, config, storageId);
             const filesList = await Promise.all(files.map(async (file) => {
-                const prefix = constants_1.API_WEBSITE_ASSET_READ;
                 const fileWithContent = file;
                 const fileWithSrc = file;
                 if (!fileWithContent.content && !fileWithSrc.src)
                     throw new PublicationError('Missing content or src in file', 400);
-                const src = fileWithSrc.src?.startsWith(prefix) ? fileWithSrc.src.substring(prefix.length) : fileWithSrc.src;
+                const src = fileWithSrc.src;
                 return {
-                    path: file.path,
-                    content: fileWithContent.content ??
-                        await storage.readAsset(session, websiteId, src),
+                    path: file.permalink ?? file.path,
+                    content: fileWithContent.content ?? await storage.readAsset(session, websiteId, fileWithSrc.src),
                 };
             }));
             res.json({

package/dist/server/server/api/websiteApi.js

@@ -175,6 +175,23 @@ function default_1(config, opts = {}) {
             }
         }
     });
+    router.post(constants_1.API_WEBSITE_DUPLICATE, async (req, res) => {
+        try {
+            const query = req.query;
+            const websiteId = (0, validation_1.requiredParam)(query.websiteId, 'New website id');
+            await duplicateWebsite(req['session'], websiteId, query.connectorId);
+            res.status(200).json({ message: 'Website duplicated' });
+        }
+        catch (e) {
+            console.error('Error duplicating website data', e);
+            if (e.httpStatusCode) {
+                res.status(e.httpStatusCode).json({ message: e.message });
+            }
+            else {
+                res.status(500).json({ message: e.message });
+            }
+        }
+    });
     router.get(constants_1.API_WEBSITE_ASSET_READ + '/:path', async (req, res) => {
         {
             try {
@@ -207,7 +224,6 @@ function default_1(config, opts = {}) {
             const query = req.query;
             const websiteId = (0, validation_1.requiredParam)(query.websiteId, 'Website id');
             const form = (0, formidable_1.default)({
-                filename: (name, ext, part, _form) => `${name}${ext}`,
                 multiples: true,
                 keepExtensions: true,
             });
@@ -232,10 +248,10 @@ function default_1(config, opts = {}) {
             config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_START, { files, websiteId, connectorId });
             const result = await writeAssets(req['session'], websiteId, files, connectorId);
             const baseUrl = new URL(config.url).pathname.replace(/\/$/, '');
+            const data = result.map(path => (0, path_1.join)(baseUrl, constants_1.API_PATH, constants_1.API_WEBSITE_PATH, constants_1.API_WEBSITE_ASSET_READ, path)
+                + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}`);
             res.json({
-                data: result.map(path => baseUrl + constants_1.API_PATH + constants_1.API_WEBSITE_PATH + constants_1.API_WEBSITE_ASSET_READ
-                    + path
-                    + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}`),
+                data,
             });
             config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_END, null);
         }
@@ -276,6 +292,10 @@ function default_1(config, opts = {}) {
         const storageConnector = await getStorageConnector(session, connectorId);
         return storageConnector.deleteWebsite(session, websiteId);
     }
+    async function duplicateWebsite(session, websiteId, connectorId) {
+        const storageConnector = await getStorageConnector(session, connectorId);
+        return storageConnector.duplicateWebsite(session, websiteId);
+    }
     async function readAsset(session, websiteId, fileName, connectorId) {
         const storageConnector = await getStorageConnector(session, connectorId);
         return storageConnector.readAsset(session, websiteId, `/${fileName}`);
@@ -287,9 +307,8 @@ function default_1(config, opts = {}) {
             path: file.path.replace('/assets/', '/'),
         }));
         const result = await storageConnector.writeAssets(session, websiteId, cleanPathFiles);
-        return files.map(({ path }, idx) => `${result && result[idx]
-            ? `/${result[idx].replace(/^\//, '')}`
-            : path}?websiteId=${websiteId}`);
+        return files
+            .map(({ path }, idx) => result && result[idx] ? result[idx] : path);
     }
     return router;
 }

package/dist/server/server/cli.js

@@ -11,11 +11,12 @@ const options = (0, cli_1.parse)({
     'host': ['', 'Sets the host param of the express module "cookie-session".', 'string'],
     'port': ['p', 'Port to listen to', 'int'],
     'protocol': ['', 'Sets the protocol param of the express module "cookie-session".', 'string'],
-    'config': ['c', 'Path for the server side config file to load at startup', 'file'],
-    'client-config': ['', 'Path to client config file to be served on .silex-client.js', 'string'],
-    'fs-root': ['', 'Path to the root folder where to store websites. Used by the default connector (fs).', 'string'],
+    'server-config': ['s', 'Path for the server side config file to load at startup', 'file'],
+    'client-config': ['c', 'Path to client config file to be served on .silex-client.js', 'file'],
+    'fs-root': ['', 'Path to the root folder where to store websites. Used by the default storage connector (fs).', 'string'],
+    'fs-hosting-root': ['', 'Path to the root folder where to publish websites. Used by the default hosting connector (fs).', 'string'],
     'session-name': ['', 'Sets the name param of the express module "cookie-session".', 'string'],
-    'session-secret': ['s', 'Session secret', 'string'],
+    'session-secret': ['', 'Session secret', 'string'],
     'ssl-port': [false, 'Port to listen to for SSL/HTTPS', 'int'],
     'force-https': [false, 'Force HTTPS', 'boolean'],
     'ssl-private-key': [false, 'Path to private key for SSL', 'file'],
@@ -35,12 +36,14 @@ if (options.port)
     process.env.SILEX_PORT = options.port;
 if (options['protocol'])
     process.env.SILEX_PROTOCOL = options['protocol'];
-if (options.config)
-    process.env.SILEX_CONFIG = options.config;
+if (options['server-config'])
+    process.env.SILEX_SERVER_CONFIG = options['server-config'];
 if (options['client-config'])
     process.env.SILEX_CLIENT_CONFIG = options['client-config'];
 if (options['fs-root'])
     process.env.SILEX_FS_ROOT = options['fs-root'];
+if (options['fs-hosting-root'])
+    process.env.SILEX_FS_HOSTING_ROOT = options['fs-hosting-root'];
 if (options['session-name'])
     process.env.SILEX_SESSION_NAME = options['session-name'];
 if (options['session-secret'])

package/dist/server/server/config.js

@@ -21,7 +21,7 @@ class ServerConfig extends silex_plugins_1.Config {
     port = process.env.SILEX_PORT;
     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_CONFIG;
+    userConfigPath = process.env.SILEX_SERVER_CONFIG;
     configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
     getConnectors(type = null) {
         if (!type) {
@@ -107,12 +107,12 @@ class ServerConfig extends silex_plugins_1.Config {
     async initDefaultConnectors() {
         if (!this.storageConnectors.length) {
             this.addStorageConnector(new FsStorage_1.FsStorage(null, {
-                path: process.env.SILEX_FS_ROOT,
+                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, {
-                path: process.env.SILEX_FS_ROOT,
+                path: process.env.SILEX_FS_HOSTING_ROOT || (0, path_1.join)(process.cwd(), '/silex/hosting'),
             }));
         }
     }

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

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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");
@@ -8,11 +12,19 @@ class FsHosting extends FsStorage_1.FsStorage {
     connectorId = 'fs-hosting';
     displayName = 'File system hosting';
     connectorType = types_1.ConnectorType.HOSTING;
+    async initFs() {
+        const stat = await promises_1.default.stat(this.options.path).catch(() => null);
+        if (!stat) {
+            await promises_1.default.mkdir((0, path_1.join)(this.options.path, 'assets'), { recursive: true });
+            await promises_1.default.mkdir((0, path_1.join)(this.options.path, 'css'), { recursive: true });
+            console.info(`> [FsHosting] Created folders assets/ and css/ in ${this.options.path}`);
+        }
+    }
     async publish(session, id, files, { startJob, jobSuccess, jobError }) {
         const job = startJob(`Publishing to ${this.displayName}`);
         job.logs = [[`Publishing to ${this.displayName}`]];
         job.errors = [[]];
-        this.write(session, '', files, '', async ({ status, message }) => {
+        await this.write(session, '', files, '', async ({ status, message }) => {
             job.status = status;
             job.message = message;
             job.logs[0].push(message);

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

@@ -1,30 +1,10 @@
 "use strict";
-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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsStorage = void 0;
-const promises_1 = __importStar(require("fs/promises"));
+const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = require("fs");
 const connectors_1 = require("./connectors");
 const path_1 = require("path");
@@ -38,6 +18,17 @@ if (!globalThis.__dirname) {
     globalThis.__dirname = (0, path_1.dirname)(process.cwd() + '/src/ts/server/connectors/FsStorage.ts');
     console.info('Redefining __dirname', globalThis.__dirname);
 }
+async function copyDir(src, dest) {
+    await promises_1.default.mkdir(dest, { recursive: true });
+    const entries = await promises_1.default.readdir(src, { withFileTypes: true });
+    for (const entry of entries) {
+        const srcPath = (0, path_1.join)(src, entry.name);
+        const destPath = (0, path_1.join)(dest, entry.name);
+        entry.isDirectory() ?
+            await copyDir(srcPath, destPath) :
+            await promises_1.default.copyFile(srcPath, destPath);
+    }
+}
 const USER_ICON = 'data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' height=\'1em\' viewBox=\'0 0 448 512\'%3E%3Cpath d=\'M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z\'/%3E%3C/svg%3E';
 const FILE_ICON = 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22currentColor%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%3E%3Cpath%20d%3D%22M6%202L6%2022%2018%2022%2018%207%2012%202%206%202Z%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M18%202L12%202%2012%208%2018%208%2018%202Z%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E';
 class FsStorage {
@@ -64,6 +55,7 @@ class FsStorage {
             await promises_1.default.mkdir((0, path_1.join)(this.options.path, id, this.options.assetsFolder), { recursive: true });
             await this.setWebsiteMeta({}, id, { name: 'Default website', connectorUserSettings: {} });
             await this.updateWebsite({}, id, types_1.defaultWebsiteData);
+            console.info(`> [FsStorage] Created ${id} in ${this.options.path}`);
         }
     }
     updateStatus(filesStatuses, status, statusCbk) {
@@ -110,7 +102,7 @@ class FsStorage {
     }
     async getWebsiteMeta(session, id) {
         const websiteId = (0, validation_1.requiredParam)(id, 'website id');
-        const fileStat = await (0, promises_1.stat)((0, path_1.join)(this.options.path, websiteId));
+        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 content = await promises_1.default.readFile(path);
         const meta = await JSON.parse(content.toString());
@@ -146,6 +138,17 @@ class FsStorage {
         const path = (0, path_1.join)(this.options.path, id);
         return promises_1.default.rmdir(path, { recursive: true });
     }
+    async duplicateWebsite(session, websiteId) {
+        const newWebsiteId = (0, uuid_1.v4)();
+        const from = (0, path_1.join)(this.options.path, websiteId);
+        const to = (0, path_1.join)(this.options.path, newWebsiteId);
+        await copyDir(from, to);
+        const meta = await this.getWebsiteMeta(session, websiteId);
+        await this.setWebsiteMeta(session, newWebsiteId, {
+            ...meta,
+            name: `${meta.name} copy`,
+        });
+    }
     async listWebsites(session) {
         const list = await promises_1.default.readdir(this.options.path);
         return Promise.all(list.map(async (fileName) => {
@@ -171,7 +174,7 @@ class FsStorage {
                 fileStatus.message = 'Writing';
                 this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
                 try {
-                    await promises_1.default.writeFile(path, file.content, 'binary');
+                    await promises_1.default.writeFile(path, file.content);
                 }
                 catch (err) {
                     fileStatus.message = `Error (${err})`;

package/dist/server/server/jobs.js

@@ -4,6 +4,7 @@ exports.jobManager = exports.killJob = exports.jobError = exports.jobSuccess = e
 const types_1 = require("../types");
 const TIME_TO_KEEP_AFTER_STOP = 60 * 10 * 1000;
 const jobs = new Array();
+const timers = new WeakMap();
 const processKey = Math.ceil(Math.random() * 1000000);
 let nextJobId = 0;
 function startJob(message = '') {
@@ -30,7 +31,8 @@ function jobError(id, message = '') {
 }
 exports.jobError = jobError;
 function killJob(job) {
-    clearTimeout(job._timeout);
+    clearTimeout(timers.get(job));
+    timers.delete(job);
     jobs.splice(jobs.findIndex(j => job.jobId === j.jobId), 1);
 }
 exports.killJob = killJob;
@@ -40,7 +42,7 @@ function end(id, status, message = '') {
         job.status = status;
         if (message)
             job.message = message;
-        job._timeout = setTimeout(() => killJob(job), TIME_TO_KEEP_AFTER_STOP);
+        timers.set(job, setTimeout(() => killJob(job), TIME_TO_KEEP_AFTER_STOP));
         return true;
     }
     return false;

package/dist/server/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobStatus = exports.ConnectorType = exports.ClientSideFileType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
+exports.JobStatus = exports.ConnectorType = exports.Initiator = exports.ClientSideFileType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
 class ApiError extends Error {
     httpStatusCode;
     constructor(message, httpStatusCode) {
@@ -20,7 +20,13 @@ var ClientSideFileType;
     ClientSideFileType["HTML"] = "html";
     ClientSideFileType["ASSET"] = "asset";
     ClientSideFileType["CSS"] = "css";
+    ClientSideFileType["OTHER"] = "other";
 })(ClientSideFileType || (exports.ClientSideFileType = ClientSideFileType = {}));
+var Initiator;
+(function (Initiator) {
+    Initiator["HTML"] = "html";
+    Initiator["CSS"] = "css";
+})(Initiator || (exports.Initiator = Initiator = {}));
 var ConnectorType;
 (function (ConnectorType) {
     ConnectorType["STORAGE"] = "STORAGE";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.96",
+  "version": "3.0.0",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -16,7 +16,6 @@
     "src/",
     "public",
     ".silex.js",
-    ".silex",
     ".env.default",
     "package.json",
     "package-lock.json",
@@ -77,9 +76,11 @@
   },
   "scripts": {
     "release": "",
+    "dev": "run-p watch start:debug start:http-server",
     "watch": "npm-watch",
     "start": "node dist/server/server/",
-    "start:debug": "cross-env SILEX_FS_ROOT=`pwd`/.silex cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/server/",
+    "start:debug": "cross-env SILEX_FS_ROOT=`pwd`/silex SILEX_DEBUG=true SILEX_CLIENT_CONFIG=examples/client-config-transformers.js nodemon --watch dist/server dist/server/server/",
+    "start:http-server": "http-server silex/hosting",
     "prepublishOnly": "$npm_execpath run lint && $npm_execpath test && $npm_execpath run build",
     "preversion": "$npm_execpath run prepublishOnly",
     "build": "run-s build:css:release build:html build:client:release build:server:release build:plugins:client build:plugins:server",
@@ -100,18 +101,18 @@
     "test:watch": "$npm_execpath test -- --watch"
   },
   "dependencies": {
-    "@fontsource/ubuntu": "^5.0.5",
-    "@fortawesome/fontawesome-free": "6.4.0",
-    "@gitbeaker/rest": "^39.7.0",
-    "@silexlabs/grapesjs-fonts": "1.0.12",
-    "@silexlabs/grapesjs-loading": "1.0.8",
-    "@silexlabs/grapesjs-storage-rate-limit": "^1.0.7",
-    "@silexlabs/grapesjs-symbols": "1.0.30",
+    "@fontsource/ubuntu": "^5.0.8",
+    "@fortawesome/fontawesome-free": "6.4.2",
+    "@silexlabs/grapesjs-filter-styles": "^1.0.0",
+    "@silexlabs/grapesjs-fonts": "^1.0.15",
+    "@silexlabs/grapesjs-loading": "1.0.9",
+    "@silexlabs/grapesjs-storage-rate-limit": "^1.0.8",
+    "@silexlabs/grapesjs-symbols": "1.0.39",
     "@silexlabs/grapesjs-ui-suggest-classes": "1.0.23",
     "@silexlabs/silex-plugins": "1.0.10",
-    "@types/archiver": "^5.3.2",
+    "@types/archiver": "^6.0.1",
     "adm-zip": "0.5.10",
-    "archiver": "^5.3.1",
+    "archiver": "^6.0.1",
     "basic-ftp": "^5.0.3",
     "body-parser": "1.20.2",
     "cli": "1.0.1",
@@ -124,46 +125,49 @@
     "dotenv": "^16.3.1",
     "express": "4.18.2",
     "express-force-ssl": "0.3.2",
-    "formidable": "2.1.1",
+    "formidable": "3.5.1",
     "fs-extra": "^11.1.1",
-    "grapesjs": "0.21.2",
+    "grapesjs": "0.21.7",
     "grapesjs-blocks-basic": "1.0.2",
     "grapesjs-custom-code": "1.0.2",
     "grapesjs-plugin-forms": "2.0.6",
-    "grapesjs-style-filter": "1.0.2",
+    "grapesjs-style-bg": "^2.0.2",
+    "grapesjs-style-border": "1.0.4",
+    "grapesjs-style-filter": "^1.0.2",
     "html-minifier": "^4.0.0",
-    "lit-html": "2.7.4",
+    "lit-html": "3.0.2",
     "mkdirp": "3.0.1",
     "node_modules-path": "2.0.7",
     "node-fetch": "2.6.9",
     "normalize.css": "8.0.1",
     "object-path": "0.11.8",
     "promise-sequential": "1.1.1",
-    "sass": "1.63.6",
+    "sass": "1.69.5",
     "serve-static": "1.15.0",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@types/express": "4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/node": "20.3.1",
-    "@typescript-eslint/eslint-plugin": "5.60.0",
-    "@typescript-eslint/parser": "5.60.0",
+    "@types/express": "4.17.21",
+    "@types/jest": "^29.5.8",
+    "@types/node": "20.9.0",
+    "@typescript-eslint/eslint-plugin": "6.10.0",
+    "@typescript-eslint/parser": "6.10.0",
     "css-loader": "6.8.1",
-    "eslint": "8.43.0",
+    "eslint": "8.53.0",
     "file-loader": "6.2.0",
-    "jest": "29.5.0",
-    "jest-environment-jsdom": "29.5.0",
+    "http-server": "^14.1.1",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "livereload": "0.9.3",
-    "nodemon": "2.0.22",
+    "nodemon": "3.0.1",
     "npm-run-all": "4.1.5",
     "npm-watch": "0.11.0",
     "pug-cli": "1.0.0-alpha6",
     "style-loader": "3.3.3",
-    "ts-jest": "29.1.0",
-    "ts-loader": "9.4.3",
-    "typescript": "5.1.3",
-    "webpack": "5.88.0",
+    "ts-jest": "29.1.1",
+    "ts-loader": "9.5.0",
+    "typescript": "5.2.2",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4"
   },
   "repository": {

package/src/css/_variables.scss

@@ -11,15 +11,16 @@ $topBarHeight: 40px;
 $projectBarWidth: 35px;
 $projectPanelWidth: 13%;
 $projectPanelMinWidth: 150px;
-$viewsPanelWidth: 15%; // 15% is grapesjs default
+$viewsPanelWidth: 25%; // 15% is grapesjs default
 $footerHeight: 30px;
-$transitionSpeedMedium: .35s;
-$transitionSpeedSlow: .5s;
+$transitionSpeedMedium: .15s;
+$transitionSpeedSlow: .30s;
 $prefix: 'gjs-';
 $pn-prefix: '#{$prefix}pn-';
 $cv-prefix: '#{$prefix}cv-';
 $z-dialog-inline: 10;
 $z-loader: 10;
+$z-views-options-buttons: 5;
 
 $fontFamily: 'Ubuntu', sans-serif;
 
@@ -30,4 +31,5 @@ $fontFamily: 'Ubuntu', sans-serif;
   --quaternaryColor: #{$quaternaryColor};
   --darkerPrimaryColor: #{$darkerPrimaryColor};
   --lighterPrimaryColor: #{$lighterPrimaryColor};
+  --viewsPanelWidth: #{$viewsPanelWidth};
 }

package/src/css/dialog.scss

@@ -18,19 +18,24 @@
   background-color: variables.$primaryColor;
   z-index: variables.$z-dialog-inline;
   border-radius: 3px;
-  border: 2px solid rgba(0, 0, 0, 0.25);
+  border: 2px solid variables.$lighterPrimaryColor;
+  box-shadow: 0 0 10px 0 variables.$lighterPrimaryColor;
   display: flex;
   flex-direction: column;
   header {
     padding: 10px;
+    border-bottom: 1px solid variables.$lighterPrimaryColor;
   }
   main {
     flex-grow: 1;
     padding: 10px;
+    max-height: 50vh;
+    overflow-y: auto;
   }
   footer {
     padding: 10px;
     text-align: right;
+    border-top: 1px solid variables.$lighterPrimaryColor;
   }
   a {
     color: variables.$quaternaryColor;
@@ -39,3 +44,19 @@
     margin: 0;
   }
 }
+
+.silex-help {
+  margin: 10px 0;
+  padding: 10px;
+  border: 1px solid variables.$lighterPrimaryColor;
+  border-radius: 3px;
+  background-color: variables.$lighterPrimaryColor;
+  color: variables.$secondaryColor;
+  font-size: small;
+  p {
+    margin: 0;
+  }
+  a {
+    color: variables.$quaternaryColor;
+  }
+}

package/src/css/fonts.scss

@@ -0,0 +1,31 @@
+@use "variables" as *;
+.fonts-dialog {
+  .gjs-mdl-dialog {
+    width: 100%;
+    max-width: unset;
+    min-height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  .gjs-mdl-content {
+    flex: 1 1 auto;
+  }
+  .silex-form__element {
+    margin-bottom: 80px;
+  }
+  .silex-list li {
+    border-bottom: none;
+  }
+  h2 {
+    border-radius: 0;
+    background-color: transparent;
+  }
+  footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20px !important;
+    background-color: $primaryColor;
+  }
+}

package/src/css/footer.scss

@@ -3,7 +3,7 @@
 .gjs-pn-footer {
   bottom: 0;
   left: $projectBarWidth;
-  right: $viewsPanelWidth;
+  right: var(--viewsPanelWidth);
   display: flex;
   justify-content: space-between;
   align-items: center;