@silexlabs/silex 3.0.1-0 → 3.0.1

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAqBH,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;AAyDhB,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,oBAAJ,IAAI,QAEf;AAoDD;;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.DEV_MESSAGE = exports.SILEX_VERSION = 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,8 +22,34 @@ 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';
 exports.API_WEBSITE_META_READ = '/meta';
 exports.API_WEBSITE_META_WRITE = '/meta';
+try {
+    exports.SILEX_VERSION = SILEX_VERSION_ENV;
+}
+catch (e) {
+    exports.SILEX_VERSION = exports.SILEX_VERSION || '3.0.0';
+}
+exports.DEV_MESSAGE = `
+__________________________________________________________
+
+  Create static websites visually, with dynamic content,
+  in the free spirit of the web.
+  
+  ███████ ██ ██      ███████ ██   ██     ██    ██ ██████
+  ██      ██ ██      ██       ██ ██      ██    ██      ██
+  ███████ ██ ██      █████     ███       ██    ██  █████
+       ██ ██ ██      ██       ██ ██       ██  ██       ██
+  ███████ ██ ███████ ███████ ██   ██       ████   ██████ ${exports.SILEX_VERSION.slice(1)}
+  
+  Users are expected to contribute:
+  
+  * Web designers: https://docs.silex.me/en/user/contribute
+  * Developers: https://docs.silex.me/en/dev/contribute
+  
+__________________________________________________________
+`;

package/dist/server/plugins/server/Cache.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withCache = exports.noCache = void 0;
+exports.noCache = noCache;
+exports.withCache = withCache;
 function noCache(req, res, next) {
     res.header('Cache-Control', 'private,no-cache,no-store,must-revalidate,proxy-revalidate');
     res.header('Expires', '-1');
     res.header('Pragma', 'no-cache');
     next();
 }
-exports.noCache = noCache;
 function withCache(req, res, next) {
-    res.header('Cache-Control', 'public,max-age=86400,immutable');
-    next();
+    if (req.url.endsWith('.html') || req.url.endsWith('/')) {
+        noCache(req, res, next);
+    }
+    else {
+        res.header('Cache-Control', 'public,max-age=86400,immutable');
+        next();
+    }
 }
-exports.withCache = withCache;

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const express_1 = require("express");
 const Cache_1 = require("../../plugins/server/Cache");
 const connectorApi_1 = __importDefault(require("./connectorApi"));
@@ -17,4 +18,3 @@ function default_1(config) {
     router.use(constants_1.API_PUBLICATION_PATH, (0, publicationApi_1.default)(config));
     return router;
 }
-exports.default = default_1;

package/dist/server/server/api/connectorApi.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const express_1 = require("express");
 const constants_1 = require("../../constants");
 const validation_1 = require("../utils/validation");
@@ -14,7 +15,17 @@ function default_1(config) {
     router.post(constants_1.API_CONNECTOR_LOGOUT, routeLogout);
     return router;
 }
-exports.default = default_1;
+function validateStatus(status, _default = 500) {
+    if (!status) {
+        console.warn(`Status code is undefined, returning default ${_default}`);
+        return _default;
+    }
+    status = parseInt(status.toString());
+    if (status >= 100 && status < 600)
+        return status;
+    console.warn(`Invalid status code ${status}, returning default ${_default}}`);
+    return _default;
+}
 async function routeUser(req, res) {
     try {
         const config = (0, validation_1.requiredParam)(req.app.get('config'), 'Config object on express js APP');
@@ -44,8 +55,8 @@ async function routeUser(req, res) {
         res.json(user);
     }
     catch (error) {
-        console.error('Error in the login status request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+        console.error('Error in the user request', error, error.code);
+        res.status(validateStatus(error.code ?? error.httpStatusCode, 500)).json({
             error: true,
             message: error.message,
         });
@@ -64,7 +75,7 @@ async function routeListConnectors(req, res) {
         }
         catch (error) {
             console.error('Error while listing connectors', error);
-            res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+            res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
                 error: true,
                 message: 'Error while listing connectors: ' + error.message,
             });
@@ -72,7 +83,7 @@ async function routeListConnectors(req, res) {
     }
     catch (error) {
         console.error('Error in the list connectors request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the list connectors request: ' + error.message,
         });
@@ -89,7 +100,7 @@ async function routeLogin(req, res) {
         if (!connector)
             throw new Error(`Connector not found ${connectorId} ${type}`);
         if (await connector.isLoggedIn(session)) {
-            res.redirect(`${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?connectorId=${connectorId}&type=${type}`);
+            res.redirect(`${config.url}${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?connectorId=${connectorId}&type=${type}`);
             return;
         }
         const oauthUrl = await connector.getOAuthUrl(session);
@@ -98,14 +109,14 @@ async function routeLogin(req, res) {
         }
         else {
             const redirectTo = await connector.getSettingsForm(session, '') ?
-                `${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_SETTINGS}?connectorId=${connectorId}&type=${type}` :
-                `${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?connectorId=${connectorId}&type=${type}`;
+                `${config.url}${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_SETTINGS}?connectorId=${connectorId}&type=${type}` :
+                `${config.url}${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?connectorId=${connectorId}&type=${type}`;
             res.send(await connector.getLoginForm(session, redirectTo));
         }
     }
     catch (error) {
         console.error('Error in the login request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the login request: ' + error.message,
         });
@@ -133,12 +144,12 @@ async function routeLoginSuccess(req, res) {
                 ...body,
             });
         }
-        res.send(getEndAuthHtml('Logged in', false, connectorId, connector.getOptions(body)));
+        res.send(getEndAuthHtml('Logged in', false, connectorId, type, connector.getOptions(body)));
     }
     catch (error) {
         res
-            .status(error?.code ?? error?.httpStatusCode ?? 500)
-            .send(getEndAuthHtml(error.message, true));
+            .status(validateStatus(error?.code ?? error?.httpStatusCode, 500))
+            .send(getEndAuthHtml(error.message, true, req.query.connectorId, req.query.type));
     }
 }
 async function routeLogout(req, res) {
@@ -160,7 +171,7 @@ async function routeLogout(req, res) {
         }
         catch (error) {
             console.error('Error while logging out', error);
-            res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+            res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
                 error: true,
                 message: 'Error while logging out: ' + error.message,
             });
@@ -169,36 +180,154 @@ async function routeLogout(req, res) {
     }
     catch (error) {
         console.error('Error in the logout request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the logout request: ' + error.message,
         });
         return;
     }
 }
-function getEndAuthHtml(message, error, connectorId, options) {
+function getEndAuthHtml(message, error, connectorId, connectorType, options) {
     const data = {
         type: 'login',
         error,
         message,
         connectorId,
+        connectorType,
         options,
     };
+    const status = error ? 'Error' : 'Success';
     return `
-    <html>
+    <!DOCTYPE html><html lang="en">
       <head>
-        <script>
-          if(window.opener) {
-            window.opener.postMessage(${JSON.stringify(data)}, '*')
-            window.close()
-          } else {
-            window.location.href = '/'
+        <title>Authentication ${status}</title>
+        <style>
+          :root {
+            --primaryColor: #333333;
+            --secondaryColor: #ddd;
+            --tertiaryColor: #8873FE;
+            --quaternaryColor: #A291FF;
+            --darkerPrimaryColor: #292929;
+            --lighterPrimaryColor: #575757;
+          }
+
+          body {
+            font-family: Arial, sans-serif;
+            text-align: center;
+            margin: 50px;
+            color: var(--primaryColor);
+            background-color: var(--secondaryColor);
+          }
+
+          h1 {
+            color: var(--tertiaryColor);
+          }
+
+          p {
+            font-size: 18px;
+          }
+
+          a {
+            color: var(--tertiaryColor);
+            text-decoration: none;
+          }
+
+          a:hover {
+            text-decoration: underline;
+          }
+
+          .container {
+            max-width: 600px;
+            margin: auto;
+          }
+
+          .button {
+            display: inline-block;
+            margin-top: 20px;
+            padding: 10px 20px;
+            font-size: 16px;
+            color: var(--secondaryColor);
+            background-color: var(--tertiaryColor);
+            border: none;
+            border-radius: 5px;
+            text-decoration: none;
+            cursor: pointer;
+          }
+
+          .button:hover {
+            background-color: var(--quaternaryColor); /* Slightly lighter shade of tertiary color */
+          }
+
+          .error {
+            display: none;
+            margin-top: 20px;
+            padding: 15px;
+            border: 1px solid var(--tertiaryColor);
+            border-radius: 5px;
+            text-wrap: wrap;
           }
-        </script>
+
+        </style>
       </head>
       <body>
-        <p>${message}</p>
-        <p>Close this window or <a href="/">go back to /</a></p>
+        <div class="container">
+          <div id="message">
+            <h1>Authentication ${status}</h1>
+            <p>${error ? '' : message}</p>
+          </div>
+          ${error ? `
+            <p><a data-link-to href="/">click here to continue</a>.</p>
+            <a data-link-to href="/" class="button">Retry</a>
+            <pre id="error-container" class="error">${message}</pre>
+            <script>
+              document.getElementById('error-container').style.display = "block";
+              fetch("${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGOUT}?connectorId=${connectorId}&type=${connectorType}", {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                  credentials: 'include', // sends the cookies with the request
+                },
+              })
+              if(window.opener && window.opener !== window) {
+                const linksTo = document.querySelectorAll('[data-link-to]');
+                linksTo.forEach(link => {
+                  link.addEventListener('click', (e) => {
+                    e.preventDefault();
+                    const data = ${JSON.stringify(data)};
+                    window.opener.postMessage(data, '*');
+                    window.close();
+                  });
+                });
+              }
+            </script>
+          ` : `
+            <p>If this window doesn’t close automatically, <a href="/">click here to return to the homepage</a>.</p>
+            <a href="/" class="button">Go to Homepage</a>
+            <pre id="error-container" class="error"></pre>
+            <script>
+              const data = ${JSON.stringify(data)};
+              const errorContainer = document.getElementById('error-container');
+              const messageContainer = document.getElementById('message');
+
+              // Check if the window was opened programmatically and is valid
+              if (window.opener && window.opener !== window) {
+                try {
+                  // Send a postMessage to the opener
+                  window.opener.postMessage(data, '*');
+                  // Attempt to close the window
+                  window.close();
+                } catch (e) {
+                  // Display error message if closing fails
+                  errorContainer.innerText = "Unable to close the window. Please close it manually.";
+                  errorContainer.style.display = "block";
+                }
+              } else {
+                messageContainer.innerHTML = '<h1>Redirecting, please wait...</h1>';
+                window.location.href = '/'
+              }
+            </script>
+          `}
+        </div>
       </body>
     </html>
   `;

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

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStorageConnector = exports.getHostingConnector = exports.PublicationError = void 0;
+exports.PublicationError = void 0;
+exports.getHostingConnector = getHostingConnector;
+exports.getStorageConnector = getStorageConnector;
+exports.default = default_1;
 const express_1 = require("express");
 const constants_1 = require("../../constants");
-const jobs_1 = require("../jobs");
 const types_1 = require("../../types");
 const connectors_1 = require("../connectors/connectors");
 const validation_1 = require("../utils/validation");
 const events_1 = require("../events");
+const jobs_1 = require("../jobs");
 class PublicationError extends Error {
     code;
     constructor(message, code) {
@@ -27,7 +30,6 @@ async function getHostingConnector(session, config, connectorId) {
     }
     return hostingConnector;
 }
-exports.getHostingConnector = getHostingConnector;
 async function getStorageConnector(session, config, connectorId) {
     const storageConnector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId);
     if (!storageConnector) {
@@ -38,7 +40,6 @@ async function getStorageConnector(session, config, connectorId) {
     }
     return storageConnector;
 }
-exports.getStorageConnector = getStorageConnector;
 function default_1(config) {
     const router = (0, express_1.Router)();
     router.get(constants_1.API_PUBLICATION_STATUS, async function (req, res) {
@@ -66,35 +67,27 @@ function default_1(config) {
             const hostingId = (0, validation_1.requiredParam)(query.hostingId, 'hostingId in query');
             const session = (0, validation_1.requiredParam)(req['session'], 'session on express request');
             const data = body;
-            const { files, publication, assets } = data;
-            if (!files || !publication || !assets) {
-                throw new PublicationError('Missing data from request: files, publication or assets', 400);
+            const { files } = data;
+            if (!files) {
+                throw new PublicationError('Missing files in body', 400);
             }
             config.emit(events_1.ServerEvent.PUBLISH_START, data);
             const hostingConnector = await getHostingConnector(session, config, hostingId);
             const storage = await getStorageConnector(session, config, storageId);
-            const assetsFiles = await Promise.all(assets.map(async (asset) => {
-                if (!asset.path)
-                    throw new PublicationError('Missing path in asset', 400);
-                if (!asset.src)
-                    throw new PublicationError('Missing src in asset', 400);
-                const prefix = constants_1.API_WEBSITE_ASSET_READ.replace(/^\//, '');
-                const src = asset.src.startsWith(prefix) ? asset.src.substring(prefix.length) : asset.src;
+            const filesList = await Promise.all(files.map(async (file) => {
+                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;
                 return {
-                    path: asset.path,
-                    content: await storage.readAsset(session, websiteId, src),
+                    path: file.permalink ?? file.path,
+                    content: fileWithContent.content ?? await storage.readAsset(session, websiteId, fileWithSrc.src),
                 };
             }));
-            const filesList = files.flatMap(file => ([{
-                    path: file.htmlPath,
-                    content: file.html,
-                }, {
-                    path: file.cssPath,
-                    content: file.css,
-                }])).concat(assetsFiles);
             res.json({
                 url: await hostingConnector.getUrl(session, websiteId),
-                job: await hostingConnector.publish(session, websiteId, filesList),
+                job: await hostingConnector.publish(session, websiteId, filesList, jobs_1.jobManager),
             });
         }
         catch (err) {
@@ -111,4 +104,3 @@ function default_1(config) {
     });
     return router;
 }
-exports.default = default_1;

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const express_1 = require("express");
 const formidable_1 = __importDefault(require("formidable"));
 const constants_1 = require("../../constants");
@@ -175,6 +176,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 +225,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,
             });
@@ -230,11 +247,12 @@ function default_1(config, opts = {}) {
                 });
             });
             config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_START, { files, websiteId, connectorId });
-            await writeAssets(req['session'], websiteId, files, 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: files.map(file => constants_1.API_PATH + constants_1.API_WEBSITE_PATH + constants_1.API_WEBSITE_ASSET_READ
-                    + file.path
-                    + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}`),
+                data,
             });
             config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_END, null);
         }
@@ -275,6 +293,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}`);
@@ -285,9 +307,9 @@ function default_1(config, opts = {}) {
             ...file,
             path: file.path.replace('/assets/', '/'),
         }));
-        await storageConnector.writeAssets(session, websiteId, cleanPathFiles);
-        return files.map(({ path }) => `${path}?websiteId=${websiteId}`);
+        const result = await storageConnector.writeAssets(session, websiteId, cleanPathFiles);
+        return files
+            .map(({ path }, idx) => result && result[idx] ? result[idx] : path);
     }
     return router;
 }
-exports.default = default_1;

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

@@ -20,8 +20,8 @@ class ServerConfig extends silex_plugins_1.Config {
     };
     port = process.env.SILEX_PORT;
     debug = process.env.SILEX_DEBUG === 'true';
-    url = process.env.SILEX_URL ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
-    userConfigPath = process.env.SILEX_CONFIG;
+    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');
     getConnectors(type = null) {
         if (!type) {
@@ -56,12 +56,12 @@ class ServerConfig extends silex_plugins_1.Config {
     async addRoutes(app) {
         const path = process.env.SILEX_CLIENT_CONFIG;
         if (path) {
-            console.log(`> Serving client side config ${path} at ${constants_1.CLIENT_CONFIG_FILE_NAME}`);
+            console.info(`> Serving client side config ${path} at ${constants_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) => {
                     if (this.debug) {
-                        console.log('[Debug mode] Reloading config file', path);
+                        console.info('[Debug mode] Reloading config file', path);
                         clientConfig = (await (0, promises_1.readFile)(path)).toString();
                     }
                     res
@@ -81,7 +81,7 @@ class ServerConfig extends silex_plugins_1.Config {
     }
     async loadUserConfig() {
         if (this.userConfigPath) {
-            console.log('> Loading user config', this.userConfigPath);
+            console.info('> Loading user config', this.userConfigPath);
             try {
                 await this.addPlugin(this.userConfigPath, {});
             }
@@ -91,12 +91,11 @@ class ServerConfig extends silex_plugins_1.Config {
         }
     }
     async loadSilexConfig() {
-        console.log('> Loading config', this.configFilePath);
+        console.info('> Loading config', this.configFilePath);
         try {
             await this.addPlugin(this.configFilePath, {});
         }
         catch (e) {
-            console.log(e.requireStack[0]);
             if (e.code === 'MODULE_NOT_FOUND' && (!e.requireStack || !e.requireStack.find(path => path === this.configFilePath))) {
                 console.info('> /!\\ Config file not found', this.configFilePath);
             }
@@ -108,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'),
             }));
         }
     }