@silexlabs/silex 3.0.0-alpha.41 → 3.0.0-alpha.43

package/dist/plugins/client/plugins/client/publicationRenderer.js

@@ -0,0 +1,128 @@
+import { getPageSlug } from '../../page.js';
+import { onAll } from '../../client/utils.js';
+import { ClientEvent } from '../../client/events.js';
+export default (config, opts = {}) => {
+    const options = {
+        autoHomePage: false,
+        ...opts,
+        html: {
+            frontMatter: false,
+            ext: '.html',
+            url: '/',
+            path: './',
+            ...opts.html,
+        },
+        css: {
+            frontMatter: false,
+            ext: '.css',
+            url: '/css',
+            path: './css',
+            ...opts.css,
+        },
+        assets: {
+            url: '/',
+            path: './',
+            ...opts.assets,
+        },
+    };
+    config.on(ClientEvent.STARTUP_END, ({ editor }) => {
+        editor.on(ClientEvent.PUBLISH_START, () => {
+            // Update assets URL to display outside the editor
+            const assetsFolderUrl = options.assets.url;
+            if (assetsFolderUrl) {
+                // Concat the paths, handles the trailing and leading slashes
+                const publishedUrl = path => `${assetsFolderUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+                // New URLs for assets, according to site config
+                onAll(editor, c => {
+                    // Attributes
+                    if (c.get('type') === 'image') {
+                        const src = c.get('src');
+                        c.set('tmp-src', src);
+                        c.set('src', publishedUrl(src));
+                    }
+                    //// Inline styles
+                    //// This is handled by the editor.Css.getAll loop
+                    //const bgUrl = c.getStyle()['background-image']?.match(/url\('(.*)'\)/)?.pop()
+                    //if(bgUrl) {
+                    //  c.set('tmp-bg-url', bgUrl)
+                    //  c.setStyle({
+                    //    ...c.getStyle(),
+                    //    'background-image': `url('${publishedUrl(bgUrl)}')`,
+                    //  })
+                    //}
+                });
+                editor.Css.getAll()
+                    .forEach(c => {
+                    const bgUrl = c.getStyle()['background-image']?.match(/url\('(.*)'\)/)?.pop();
+                    if (bgUrl) {
+                        c.setStyle({
+                            ...c.getStyle(),
+                            'background-image': `url('${publishedUrl(bgUrl)}')`,
+                        });
+                        c.set('tmp-bg-url-css', bgUrl);
+                    }
+                });
+            }
+            editor.Pages.getAll().forEach(page => {
+                if (page.get('type') === 'main' && options?.autoHomePage) {
+                    page.set('slug', 'index');
+                }
+                else {
+                    page.set('slug', getPageSlug(page.get('name') || page.get('type')));
+                }
+            });
+        });
+        editor.on(ClientEvent.PUBLISH_END, () => {
+            const assetsFolderUrl = options.assets.url;
+            // Reset asset URLs
+            if (assetsFolderUrl) {
+                onAll(editor, c => {
+                    if (c.get('type') === 'image' && c.has('tmp-src')) {
+                        c.set('src', c.get('tmp-src'));
+                        c.set('tmp-src');
+                    }
+                    //// This is handled by the editor.Css.getAll loop
+                    //if(c.getStyle()['background-image'] && c.has('tmp-bg-url')) {
+                    //  c.setStyle({
+                    //    ...c.getStyle(),
+                    //    'background-image': `url('${c.get('tmp-bg-url')}')`,
+                    //  })
+                    //  c.set('tmp-bg-url')
+                    //}
+                });
+                editor.Css.getAll()
+                    .forEach(c => {
+                    if (c.has('tmp-bg-url-css')) {
+                        c.setStyle({
+                            ...c.getStyle(),
+                            'background-image': `url('${c.get('tmp-bg-url-css')}')`,
+                        });
+                        c.set('tmp-bg-url-css');
+                    }
+                });
+            }
+        });
+        editor.on(ClientEvent.PUBLISH_DATA, data => {
+            data.pages.forEach((page, idx) => {
+                const file = data.files[idx];
+                // CSS
+                file.cssPath = file.cssPath.replace(/\.css$/, options.css.ext);
+                file.cssPath = options.css.path + file.cssPath;
+                if (options.css.frontMatter) {
+                    file.css = `---\npermalink: ${options.css.url}/${page.slug}.css\n---\n${file.css}`;
+                }
+                // HTML
+                file.htmlPath = file.htmlPath.replace(/\.html$/, options.html.ext);
+                file.htmlPath = options.html.path + file.htmlPath;
+                if (options.html.frontMatter) {
+                    file.html = `---\npermalink: ${options.html.url}/${page.slug}.html\n---\n${file.html}`;
+                }
+            });
+            data.assets.forEach((asset, idx) => {
+                asset.path = options.assets.path + asset.src;
+                // The rest is handled by the editor.Css.getAll loop
+            });
+        });
+    });
+};
+//# sourceMappingURL=publicationRenderer.js.map

package/dist/plugins/client/plugins/client/publicationRenderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publicationRenderer.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/publicationRenderer.ts"],"names":[],"mappings":"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"}

package/dist/plugins/client/plugins/client/template.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (config: any, opts?: any) => Promise<void>;
+export default _default;

package/dist/plugins/client/plugins/client/template.js

@@ -0,0 +1,186 @@
+/*
+ * Silex website builder, free/libre no-code tool for makers.
+ * Copyright (c) 2023 lexoyo and Silex Labs foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+//import {html, render} from 'lit-html'
+//import {styleMap} from 'lit-html/directives/style-map.js'
+//import { onAll } from '@silexlabs/silex/dist/client/utils.js'
+import { onAll } from '../../client/utils.js';
+import { ServerEvent } from '../../server/events.js';
+//// @ts-ignore
+//import {html, render} from '/node_modules/lit-html/lit-html.js'
+//// @ts-ignore
+//import {styleMap} from '/node_modules/lit-html/directives/style-map.js'
+const silex = window['silex'];
+const pluginName = 'template';
+const templateType = 'templateType';
+const templateKey = 'template';
+export default async (config, opts = {}) => {
+    // @ts-ignore
+    const { html, render } = await import('/node_modules/lit-html/lit-html.js');
+    // @ts-ignore
+    const { styleMap } = await import('/node_modules/lit-html/directives/style-map.js');
+    config.on(ServerEvent.STARTUP_END, () => {
+        const editor = silex.getEditor();
+        // Add the new trait to all component types
+        editor.DomComponents.getTypes().map(type => {
+            const originalType = editor.DomComponents.getType(type.id);
+            editor.DomComponents.addType(type.id, {
+                model: {
+                    defaults: {
+                        traits: [
+                            // Keep the type original traits
+                            ...originalType.model.prototype.defaults.traits,
+                            // Add the new trait
+                            {
+                                label: false,
+                                type: templateType,
+                                name: pluginName,
+                            },
+                        ]
+                    }
+                }
+            });
+        });
+        function doRender(el) {
+            const template = editor.getSelected()?.get(templateKey) || {};
+            const taStyle = opts.styles?.textarea ?? styleMap({
+                backgroundColor: 'var(--darkerPrimaryColor)',
+            });
+            const sepStyle = opts.styles?.sep ?? styleMap({ height: '10px' });
+            const labels = {
+                before: html `<strong>Before</strong> the element`,
+                replace: html `<strong>Replace</strong> the element's children`,
+                after: html `<strong>After</strong> the element`,
+                attributes: html `HTML attributes`,
+                classname: html `CSS classes`,
+                style: html `CSS styles`,
+            };
+            render(html `
+      <div>
+        <h3>Template</h3>
+        <p>This will be inserted in the published version</p>
+      </div>
+      ${['classname', 'attributes', 'style'].map(id => html `
+      <label>
+        ${labels[id]}
+        <input
+          id="template-${id}"
+          .value=${template[id] || ''}
+          style=${taStyle}
+          />
+      </label>
+      `)}
+      ${['before', 'replace', 'after'].map(id => html `
+        <label
+          for="template-${id}"
+          >${labels[id]}</label>
+        <textarea
+          id="template-${id}"
+          style=${taStyle}
+          .value=${template[id] || ''}
+          ></textarea>
+      `)}
+    `, el);
+        }
+        editor.TraitManager.addType(templateType, {
+            createInput({ trait }) {
+                // Create a new element container and add some content
+                const el = document.createElement('div');
+                el.classList.add('gjs-one-bg');
+                // update the UI when a page is added/renamed/removed
+                editor.on('page', () => doRender(el));
+                doRender(el);
+                // this will be the element passed to onEvent and onUpdate
+                return el;
+            },
+            // Update the component based on UI changes
+            // `elInput` is the result HTMLElement you get from `createInput`
+            onEvent({ elInput, component, event }) {
+                const template = {
+                    before: elInput.querySelector('#template-before').value,
+                    replace: elInput.querySelector('#template-replace').value,
+                    after: elInput.querySelector('#template-after').value,
+                    attributes: elInput.querySelector('#template-attributes').value,
+                    classname: elInput.querySelector('#template-classname').value,
+                    style: elInput.querySelector('#template-style').value,
+                };
+                // Store the new template
+                if (Object.values(template).filter(val => !!val && !!cleanup(val)).length > 0) {
+                    component.set(templateKey, template);
+                }
+                else {
+                    component.set(templateKey);
+                }
+            },
+            // Update UI on the component change
+            onUpdate({ elInput, component }) {
+                doRender(elInput);
+            },
+        });
+        // Make html attribute
+        // Quote strings, no values for boolean
+        function makeAttribute(key, value) {
+            switch (typeof value) {
+                case 'boolean': return value ? key : '';
+                default: return `${key}="${value}"`;
+            }
+        }
+        // Remove empty lines in templates
+        function cleanup(template) {
+            return template
+                // split in lines
+                .split('\n')
+                // remove lines with only spaces
+                .map(line => line.trim())
+                .filter(line => !!line)
+                // put back together
+                .join('\n');
+        }
+        editor.on(ServerEvent.PUBLISH_START, () => {
+            // Insert templates
+            onAll(editor, c => {
+                const template = c.get(templateKey);
+                const toHTML = c.toHTML;
+                const classes = c.getClasses();
+                const before = cleanup(template?.before || '');
+                const replace = cleanup(template?.replace || '');
+                const after = cleanup(template?.after || '');
+                const classname = cleanup(template?.classname || '');
+                const style = cleanup(template?.style || '');
+                const attributes = cleanup(template?.attributes || '');
+                // Store the initial method
+                if (!c.has('tmpHtml'))
+                    c.set('tmpHtml', toHTML);
+                // Override the method
+                c.toHTML = () => {
+                    return `${before}${c.get('tagName') ? `<${c.get('tagName')}
+            ${Object.entries(c.get('attributes')).map(([key, value]) => makeAttribute(key, value)).join(' ')}
+            ${classes.length || classname ? `class="${classes.join(' ')} ${classname}"` : ''}
+            ${attributes}
+            ${style ? `style="${style}"` : ''}
+            >` : ''}${replace || c.getInnerHTML()}${c.get('tagName') ? `</${c.get('tagName')}>` : ''}${after}`;
+                };
+            });
+        });
+        editor.on(ServerEvent.PUBLISH_END, () => {
+            onAll(editor, c => {
+                // Restore the original method
+                c.toHTML = c.get('tmpHtml');
+            });
+        });
+    });
+};
+//# sourceMappingURL=template.js.map

package/dist/plugins/client/plugins/client/template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/template.ts"],"names":[],"mappings":"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"}

package/dist/plugins/client/server/config.d.ts

@@ -0,0 +1,59 @@
+/**
+ * @fileoverview This is where the default config is defined. Also use this object as an event emitter to listen to Silex events
+ * The values can be overriden with env vars or before passing the config to Silex
+ */
+/**
+ * @class default config for Silex server
+ */
+import { Config, Plugin } from '@silexlabs/silex-plugins';
+import { Application } from 'express';
+import { HostingConnector, StorageConnector } from './connectors/connectors';
+import { Connector } from './connectors/connectors';
+import { ConnectorType } from '../types';
+/**
+ * Config types definitions
+ */
+export declare class ServerConfig extends Config {
+    expressOptions: {
+        jsonLimit: string;
+        textLimit: string;
+        urlencodedLimit: string;
+        sessionName: string;
+        sessionSecret: string;
+        cors: string;
+    };
+    port: string;
+    debug: boolean;
+    url: string;
+    userConfigPath: Plugin | undefined;
+    configFilePath: Plugin;
+    getConnectors(type?: ConnectorType | string | null): Connector[];
+    private storageConnectors;
+    addStorageConnector(storage: StorageConnector | StorageConnector[]): void;
+    setStorageConnectors(storageConnectors: StorageConnector[]): void;
+    getStorageConnectors(): StorageConnector[];
+    private hostingConnectors;
+    addHostingConnector(hosting: HostingConnector | HostingConnector[]): void;
+    setHostingConnectors(hostings: HostingConnector[]): void;
+    getHostingConnectors(): HostingConnector[];
+    /**
+     * Add routes to serve the client config file
+     */
+    addRoutes(app: Application): Promise<void>;
+    /**
+     * Load config files
+     * This is the main config file and the user config file
+     */
+    loadConfigFiles(): Promise<void>;
+    /**
+     * Load user config file
+     * This is the config file passed as env var CONFIG
+     */
+    loadUserConfig(): Promise<void>;
+    /**
+     * Load .silex.js in the root folder
+     * This is the main config file
+     */
+    loadSilexConfig(): Promise<void>;
+    initDefaultConnectors(): Promise<void>;
+}

package/dist/plugins/client/server/config.js

@@ -0,0 +1,178 @@
+/*
+ * Silex website builder, free/libre no-code tool for makers.
+ * Copyright (c) 2023 lexoyo and Silex Labs foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+/**
+ * @fileoverview This is where the default config is defined. Also use this object as an event emitter to listen to Silex events
+ * The values can be overriden with env vars or before passing the config to Silex
+ */
+/**
+ * @class default config for Silex server
+ */
+import { Config } from '@silexlabs/silex-plugins';
+import { resolve } from 'path';
+import { CLIENT_CONFIG_FILE_NAME } from '../constants';
+import { readFile } from 'fs/promises';
+import { toConnectorEnum } from './connectors/connectors';
+import { FsStorage } from './connectors/FsStorage';
+import { ConnectorType } from '../types';
+import { FsHosting } from './connectors/FsHosting';
+/**
+ * Config types definitions
+ */
+export class ServerConfig extends Config {
+    expressOptions = {
+        jsonLimit: process.env.SILEX_EXPRESS_JSON_LIMIT,
+        textLimit: process.env.SILEX_EXPRESS_TEXT_LIMIT,
+        urlencodedLimit: process.env.SILEX_EXPRESS_URLENCODED_LIMIT,
+        sessionName: process.env.SILEX_SESSION_NAME,
+        sessionSecret: process.env.SILEX_SESSION_SECRET,
+        cors: process.env.SILEX_CORS_URL,
+    };
+    port = process.env.SILEX_PORT;
+    debug = process.env.SILEX_DEBUG === 'true';
+    url = `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
+    userConfigPath = process.env.SILEX_CONFIG;
+    configFilePath = resolve(__dirname, '../../../.silex.js');
+    // All connectors or just the storage or hosting connectors
+    getConnectors(type = null) {
+        // All connectors including storage and hosting connectors
+        if (!type) {
+            // Concat storage and hosting connectors
+            const allConnectors = this.getStorageConnectors().concat(this.getHostingConnectors());
+            // Remove duplicates (if a connector is both a storage and a hosting connector)
+            return [...new Set(allConnectors)];
+        }
+        // Convert to enum in case it is a string
+        const connectorType = toConnectorEnum(type.toString());
+        // Only one type of connector
+        switch (connectorType) {
+            case ConnectorType.HOSTING: return this.getHostingConnectors();
+            case ConnectorType.STORAGE: return this.getStorageConnectors();
+            default: throw new Error(`Unknown connector type ${type}`);
+        }
+    }
+    // Storage connectors to store the website data and assets
+    storageConnectors = [];
+    addStorageConnector(storage) {
+        this.setStorageConnectors(this.storageConnectors.concat(storage));
+    }
+    setStorageConnectors(storageConnectors) {
+        this.storageConnectors = storageConnectors;
+    }
+    getStorageConnectors() {
+        return this.storageConnectors;
+    }
+    // Hosting connectors to publish the website online
+    hostingConnectors = [];
+    addHostingConnector(hosting) {
+        this.setHostingConnectors(this.hostingConnectors.concat(hosting));
+    }
+    setHostingConnectors(hostings) {
+        this.hostingConnectors = hostings;
+    }
+    getHostingConnectors() { return this.hostingConnectors; }
+    /**
+     * Add routes to serve the client config file
+     */
+    async addRoutes(app) {
+        const path = process.env.SILEX_CLIENT_CONFIG;
+        if (path) {
+            console.log(`> Serving client side config ${path} at ${CLIENT_CONFIG_FILE_NAME}`);
+            try {
+                // Load the client config file
+                let clientConfig = (await readFile(path)).toString();
+                // Serve the config file
+                app.get(`/${CLIENT_CONFIG_FILE_NAME}`, async (req, res) => {
+                    // Reload each time in debug mode
+                    if (this.debug) {
+                        console.log('[Debug mode] Reloading config file', path);
+                        clientConfig = (await readFile(path)).toString();
+                    }
+                    // Send the config file
+                    res
+                        .contentType('application/javascript')
+                        .send(clientConfig);
+                });
+            }
+            catch (e) {
+                console.error(`Error loading client config file ${path}`, e);
+                throw new Error(`Error loading client config file ${path}: ${e.message}`);
+            }
+        }
+    }
+    /**
+     * Load config files
+     * This is the main config file and the user config file
+     */
+    async loadConfigFiles() {
+        // Load the user config file
+        await this.loadUserConfig();
+        // Load the main config file
+        await this.loadSilexConfig();
+    }
+    /**
+     * Load user config file
+     * This is the config file passed as env var CONFIG
+     */
+    async loadUserConfig() {
+        if (this.userConfigPath) {
+            console.log('> Loading user config', this.userConfigPath);
+            try {
+                // Initiate the process with the config file which is just another plugin
+                await this.addPlugin(this.userConfigPath, {});
+            }
+            catch (e) {
+                throw new Error(`User config file ${this.userConfigPath} error: ${e.message}`);
+            }
+        }
+    }
+    /**
+     * Load .silex.js in the root folder
+     * This is the main config file
+     */
+    async loadSilexConfig() {
+        console.log('> Loading config', this.configFilePath);
+        try {
+            // Initiate the process with the config file which is just another plugin
+            await this.addPlugin(this.configFilePath, {});
+        }
+        catch (e) {
+            console.log(e.requireStack[0]);
+            // Check if the error is about the config file not found and not another module not found in the config file
+            if (e.code === 'MODULE_NOT_FOUND' && (!e.requireStack || !e.requireStack.find(path => path === this.configFilePath))) {
+                console.info('> /!\\ Config file not found', this.configFilePath);
+            }
+            else {
+                throw new Error(`Error in config file ${this.configFilePath}: ${e.message}`);
+            }
+        }
+    }
+    async initDefaultConnectors() {
+        // Add default storage connectors
+        if (!this.storageConnectors.length) {
+            this.addStorageConnector(new FsStorage(null, {
+                path: process.env.SILEX_FS_ROOT,
+            }));
+        }
+        // Add default hosting connectors
+        if (!this.hostingConnectors.length) {
+            this.addHostingConnector(new FsHosting(null, {
+                path: process.env.SILEX_FS_ROOT,
+            }));
+        }
+    }
+}
+//# sourceMappingURL=config.js.map

package/dist/plugins/client/server/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/ts/server/config.ts"],"names":[],"mappings":"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"}

package/dist/plugins/client/server/connectors/FsHosting.d.ts

@@ -0,0 +1,13 @@
+import { ConnectorFile, HostingConnector, ConnectorSession } from './connectors';
+import { FsStorage } from './FsStorage';
+import { ConnectorType, JobData, WebsiteId } from '../../types';
+type FsSession = ConnectorSession;
+export declare class FsHosting extends FsStorage implements HostingConnector<FsSession> {
+    connectorId: string;
+    displayName: string;
+    icon: string;
+    connectorType: ConnectorType;
+    publish(session: FsSession, id: WebsiteId, files: ConnectorFile[]): Promise<JobData>;
+    getUrl(session: FsSession, id: WebsiteId): Promise<string>;
+}
+export {};

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

@@ -0,0 +1,51 @@
+/*
+ * Silex website builder, free/libre no-code tool for makers.
+ * Copyright (c) 2023 lexoyo and Silex Labs foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import { join } from 'path';
+import { jobError, jobSuccess, startJob } from '../jobs';
+import { FsStorage } from './FsStorage';
+import { ConnectorType, JobStatus } from '../../types';
+export class FsHosting extends FsStorage {
+    connectorId = 'fs-hosting';
+    displayName = 'File system hosting';
+    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';
+    connectorType = ConnectorType.HOSTING;
+    async publish(session, id, files) {
+        const job = startJob(`Publishing to ${this.displayName}`);
+        job.logs = [[`Publishing to ${this.displayName}`]];
+        job.errors = [[]];
+        this.writeAssets(session, id, files, async ({ status, message }) => {
+            // Update the job status
+            job.status = status;
+            job.message = message;
+            job.logs[0].push(message);
+            if (status === JobStatus.SUCCESS) {
+                jobSuccess(job.jobId, message);
+            }
+            else if (status === JobStatus.ERROR) {
+                job.errors[0].push(message);
+                jobError(job.jobId, message);
+            }
+        });
+        return job;
+    }
+    async getUrl(session, id) {
+        const filePath = join(this.options.path, id, 'index.html');
+        const fileUrl = new URL(filePath, 'file://');
+        return fileUrl.toString();
+    }
+}
+//# sourceMappingURL=FsHosting.js.map

package/dist/plugins/client/server/connectors/FsHosting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FsHosting.js","sourceRoot":"","sources":["../../../../../src/ts/server/connectors/FsHosting.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,aAAa,EAAW,SAAS,EAAiC,MAAM,aAAa,CAAA;AAQ9F,MAAM,OAAO,SAAU,SAAQ,SAAS;IACtC,WAAW,GAAG,YAAY,CAAA;IAC1B,WAAW,GAAG,qBAAqB,CAAA;IACnC,IAAI,GAAG,+aAA+a,CAAA;IACtb,aAAa,GAAG,aAAa,CAAC,OAAO,CAAA;IAErC,KAAK,CAAC,OAAO,CAAC,OAAkB,EAAE,EAAa,EAAE,KAAsB;QACrE,MAAM,GAAG,GAAG,QAAQ,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAuB,CAAA;QAC/E,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAClD,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAA;QACjB,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE;YAC/D,wBAAwB;YACxB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;YACnB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;YACrB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACzB,IAAG,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE;gBAC/B,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aAC/B;iBAAM,IAAG,MAAM,KAAK,SAAS,CAAC,KAAK,EAAE;gBACpC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC3B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aAC7B;QACH,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAkB,EAAE,EAAa;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,YAAY,CAAC,CAAA;QAC1D,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC5C,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC;CACF"}