@silexlabs/silex 3.0.0-alpha.97 → 3.0.0

package/src/ts/plugins/server/GitlabConnector.ts

@@ -21,6 +21,7 @@ import { ConnectorFile, ConnectorFileContent, StatusCallback, StorageConnector,
 import { ApiError, ConnectorType, ConnectorUser, WebsiteData, WebsiteId, WebsiteMeta, WebsiteMetaFileContent } from '../../types'
 import fetch from 'node-fetch'
 import crypto, { createHash } from 'crypto'
+import { join } from 'path'
 
 /**
  * Gitlab connector
@@ -193,7 +194,7 @@ export default class GitlabConnector implements StorageConnector {
   // **
   // Convenience methods for the Gitlab API
   private getAssetPath(path: string): string {
-    return encodeURIComponent(`${this.options.assetsFolder}${path}`)
+    return encodeURIComponent(join(this.options.assetsFolder, path))
   }
 
   private async createFile(session: GitlabSession, websiteId: WebsiteId, path: string, content: string, isBase64 = false): Promise<void> {
@@ -220,6 +221,24 @@ export default class GitlabConnector implements StorageConnector {
     })
   }
 
+  async readFile(session: GitlabSession, websiteId: string, fileName: string): Promise<Buffer> {
+    const safePath = fileName.replace(/^\//, '')
+    // Call the API
+    const url = `https://gitlab.com/api/v4/projects/${websiteId}/repository/files/${safePath}?ref=${this.options.branch}&access_token=${session.gitlab?.token?.access_token}`
+    const response = await fetch(url, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+    const json = await response.json()
+    if(!response.ok) throw new ApiError(`Error reading file "${fileName}" from Gitlab: ${json?.message ?? json?.error ?? response.statusText}`, response.status)
+    // From base64 string to buffer
+    const buf = Buffer.from(json.content, 'base64')
+    // Return the image bytes
+    return buf
+  }
+
   /*
    * Get the meta repo path for the current user
    * The meta repo contains a JSON file which contains the list of websites
@@ -273,20 +292,10 @@ export default class GitlabConnector implements StorageConnector {
     let json: { message: string, error: string } | any
     // Handle the case when the server returns an non-JSON response (e.g. 400 Bad Request)
     const text = await response.text()
-    try {
-      json = JSON.parse(text)
-    } catch (e) {
-      if(!response.ok) {
-        // A real error
-        throw e
-      } else {
-        // Useless error linked to the fact that the response is not JSON
-        console.error('Gitlab API error (3) - could not parse response', response.status, response.statusText, {url, method, body, params, text})
-        return text
-      }
-    }
     if(!response.ok) {
-      if (response.status === 401 && session?.gitlab?.token?.refresh_token) {
+      if (text.includes('A file with this name doesn\'t exist')) {
+        throw new ApiError('Gitlab API error (5): Not Found', 404)
+      } else if (response.status === 401 && session?.gitlab?.token?.refresh_token) {
         // Refresh the token
         const token = session?.gitlab?.token
         const body = {
@@ -320,10 +329,21 @@ export default class GitlabConnector implements StorageConnector {
         }
       } else {
         const message = typeof json?.message === 'object' ? Object.entries(json.message).map(entry => entry.join(' ')).join(' ') : json?.message ?? json?.error ?? response.statusText
-        console.error('Gitlab API error (1)', response.status, response.statusText, {message})
         throw new ApiError(`Gitlab API error (1): ${message}`, response.status)
       }
     }
+    try {
+      json = JSON.parse(text)
+    } catch (e) {
+      if(!response.ok) {
+        // A real error
+        throw e
+      } else {
+        // Useless error linked to the fact that the response is not JSON
+        console.error('Gitlab API error (3) - could not parse response', response.status, response.statusText, {url, method, body, params, text})
+        return text
+      }
+    }
     return json
   }
 
@@ -501,7 +521,6 @@ export default class GitlabConnector implements StorageConnector {
       branch: this.options.branch,
       commit_message: 'Update website data from Silex',
       content: JSON.stringify(websiteData),
-      file_path: WEBSITE_DATA_FILE,
       id: websiteId,
     })
   }
@@ -527,6 +546,37 @@ export default class GitlabConnector implements StorageConnector {
     //})
   }
 
+  async duplicateWebsite(session: GitlabSession, websiteId: string): Promise<void> {
+    // Get the repo meta data
+    const meta = await this.getWebsiteMeta(session, websiteId)
+    // List all the repository files
+    const blobs = await this.callApi(session, `api/v4/projects/${websiteId}/repository/tree`, 'GET', null, {
+      recursive: true,
+    })
+    const files = blobs
+      .filter(item => item.type === 'blob')
+      .map(item => item.path)
+    // Create a new repo
+    const newId = await this.createWebsite(session, {
+      ...meta,
+      name: meta.name + ' Copy ' + new Date().toISOString().replace(/T.*/, '') + ' ' + Math.random().toString(36).substring(2, 4),
+    })
+    // Upload all files
+    for(const file of files) {
+      const path = encodeURIComponent(file)
+      const content = await this.readFile(session, websiteId, path)
+      // From buffer to string
+      const contentStr = content.toString('base64')
+      switch(file) {
+      case WEBSITE_DATA_FILE:
+        await this.updateFile(session, newId, path, contentStr, true)
+        break
+      default:
+        await this.createFile(session, newId, path, contentStr, true)
+      }
+    }
+  }
+
   async getWebsiteMeta(session: GitlabSession, websiteId: WebsiteId): Promise<WebsiteMeta> {
     //const file = await this.callApi(session, `api/v4/projects/${this.getMetaRepoPath(session)}/repository/files/${this.options.metaRepoFile}`, 'GET', null, {
     //  ref: this.options.branch,
@@ -598,12 +648,14 @@ export default class GitlabConnector implements StorageConnector {
     for (const file of files) {
       // Convert to base64
       const content = (await contentToBuffer(file.content)).toString('base64')
+      const path = this.getAssetPath(file.path)
+
       try {
-        await this.updateFile(session, websiteId, this.getAssetPath(file.path), content, true)
+        await this.updateFile(session, websiteId, path, content, true)
       } catch (e) {
         // If the file does not exist, create it
         if (e.statusCode === 404 || e.httpStatusCode === 404 || e.message.endsWith('A file with this name doesn\'t exist')) {
-          await this.createFile(session, websiteId, this.getAssetPath(file.path), content, true)
+          await this.createFile(session, websiteId, path, content, true)
         } else {
           throw e
         }
@@ -614,20 +666,7 @@ export default class GitlabConnector implements StorageConnector {
   async readAsset(session: GitlabSession, websiteId: string, fileName: string): Promise<ConnectorFileContent> {
     // Remove leading slash
     const finalPath = this.getAssetPath(fileName)
-    // Call the API
-    const url = `https://gitlab.com/api/v4/projects/${websiteId}/repository/files/${finalPath}?ref=${this.options.branch}&access_token=${session.gitlab?.token?.access_token}`
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    })
-    const json = await response.json()
-    if(!response.ok) throw new ApiError(`Gitlab API error: ${json?.message ?? json?.error ?? response.statusText}`, response.status)
-    // From base64 string to buffer
-    const buf = Buffer.from(json.content, 'base64')
-    // Return the image bytes
-    return buf
+    return this.readFile(session, websiteId, finalPath)
   }
 
   async deleteAssets(session: GitlabSession, websiteId: string, fileNames: string[]): Promise<void> {

package/src/ts/server/api/publicationApi.ts

@@ -124,15 +124,15 @@ export default function (config: ServerConfig): Router {
 
       // Load the content if necessary
       const filesList: ConnectorFile[] = await Promise.all(files.map(async (file: ClientSideFile) => {
-        const prefix = API_WEBSITE_ASSET_READ
         const fileWithContent = file as ClientSideFileWithContent
         const fileWithSrc = file as ClientSideFileWithSrc
         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),
+          // Destination
+          path: file.permalink ?? file.path,
+          // Content
+          content: fileWithContent.content ?? await storage.readAsset(session, websiteId, fileWithSrc.src),
         }
       }))
 

package/src/ts/server/api/websiteApi.ts

@@ -18,13 +18,13 @@
 import { Router } from 'express'
 import formidable from 'formidable'
 import PersistentFile from 'formidable/src/PersistentFile'
-import { API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_DELETE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_LIST, API_WEBSITE_CREATE, API_PATH, API_WEBSITE_PATH } from '../../constants'
+import { API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_DELETE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_LIST, API_WEBSITE_CREATE, API_PATH, API_WEBSITE_PATH, API_WEBSITE_DUPLICATE } from '../../constants'
 import { createReadStream } from 'fs'
-import { ApiError, ApiWebsiteAssetsReadParams, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteReadQuery, ApiWebsiteReadResponse, ApiWebsiteWriteBody, ApiWebsiteWriteQuery, ConnectorId, ConnectorType, WebsiteMeta, WebsiteData, WebsiteId, ApiWebsiteListQuery, ApiWebsiteListResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, WebsiteMetaFileContent, ApiWebsiteMetaWriteResponse, ApiWebsiteWriteResponse, ApiWebsiteCreateQuery, ApiWebsiteCreateBody } from '../../types'
+import { ApiError, ApiWebsiteAssetsReadParams, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteReadQuery, ApiWebsiteReadResponse, ApiWebsiteWriteBody, ApiWebsiteWriteQuery, ConnectorId, ConnectorType, WebsiteMeta, WebsiteData, WebsiteId, ApiWebsiteListQuery, ApiWebsiteListResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, WebsiteMetaFileContent, ApiWebsiteMetaWriteResponse, ApiWebsiteWriteResponse, ApiWebsiteCreateQuery, ApiWebsiteCreateBody, ApiWebsiteDuplicateQuery } from '../../types'
 import { ConnectorFile, ConnectorFileContent, ConnectorSession, StorageConnector, getConnector } from '../connectors/connectors'
 import { Readable } from 'stream'
 import { requiredParam } from '../utils/validation'
-import { basename } from 'path'
+import { basename, join } from 'path'
 import { ServerConfig } from '../config'
 import { ServerEvent, WebsiteStoreEndEventType, WebsiteStoreStartEventType, WebsiteAssetStoreStartEventType, WebsiteAssetStoreEndEventType } from '../events'
 
@@ -226,6 +226,23 @@ export default function (config: ServerConfig, opts = {}): Router {
     }
   })
 
+  // Duplicate website
+  router.post(API_WEBSITE_DUPLICATE, async (req, res) => {
+    try {
+      const query: ApiWebsiteDuplicateQuery = req.query as any
+      const websiteId= requiredParam<WebsiteId>(query.websiteId, 'New website id')
+      await duplicateWebsite(req['session'], websiteId, query.connectorId)
+      res.status(200).json({ message: 'Website duplicated' } as ApiError)
+    } catch (e) {
+      console.error('Error duplicating website data', e)
+      if (e.httpStatusCode) {
+        res.status(e.httpStatusCode).json({ message: e.message } as ApiError)
+      } else {
+        res.status(500).json({ message: e.message } as ApiError)
+      }
+    }
+  })
+
   // Load assets
   router.get(API_WEBSITE_ASSET_READ + '/:path', async (req, res) => {
     {
@@ -261,11 +278,10 @@ export default function (config: ServerConfig, opts = {}): Router {
     try {
       // Check input
       const query: ApiWebsiteAssetsWriteQuery = req.query as any
-      const websiteId= requiredParam<WebsiteId>(query.websiteId as WebsiteId, 'Website id')
+      const websiteId = requiredParam<WebsiteId>(query.websiteId as WebsiteId, 'Website id')
 
       // Get the file data from the request
       const form = formidable({
-        filename: (name, ext, part, _form) => `${name}${ext}`,
         multiples: true,
         keepExtensions: true,
       })
@@ -278,7 +294,7 @@ export default function (config: ServerConfig, opts = {}): Router {
             console.error('Error parsing upload data', err)
             reject(new ApiError('Error parsing upload data: ' + err.message, 400))
           } else {
-            const files = ([].concat(_files['files[]']) as PersistentFile[])
+            const files = ([].concat(_files['files[]'] as PersistentFile) as PersistentFile[])
               .map(file => file.toJSON())
               .map(file => ({
                 path: `/${file.originalFilename}`,
@@ -301,9 +317,12 @@ export default function (config: ServerConfig, opts = {}): Router {
       // Return the file URLs to insert in the website
       // As expected by grapesjs (https://grapesjs.com/docs/modules/Assets.html#uploading-assets)
       const data = result.map(path =>
-        // FIXME: We should return path without this line, as it is saved, not as it is displayed
-        baseUrl + API_PATH + API_WEBSITE_PATH + API_WEBSITE_ASSET_READ
-        + path
+        join(
+        // We should return path without this line, as it is saved, not as it is displayed
+        // But this url is sent straight to grapesjs, so we need to return the url as it is displayed
+          baseUrl, API_PATH, API_WEBSITE_PATH, API_WEBSITE_ASSET_READ,
+          path,
+        )
         + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}` // As expected by wesite API (readAsset)
       )
 
@@ -388,6 +407,17 @@ export default function (config: ServerConfig, opts = {}): Router {
     return storageConnector.deleteWebsite(session, websiteId)
   }
 
+  /**
+   * Duplicate a website
+   */
+  async function duplicateWebsite(session: any, websiteId: string, connectorId?: string): Promise<void> {
+    // Get the desired connector
+    const storageConnector = await getStorageConnector(session, connectorId)
+
+    // Duplicate the website
+    return storageConnector.duplicateWebsite(session, websiteId)
+  }
+
   /**
    * Read an asset
    */

package/src/ts/server/cli.ts

@@ -25,11 +25,12 @@ const options = 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'],
@@ -46,9 +47,10 @@ if(options['url']) process.env.SILEX_URL = options['url']
 if(options['host']) process.env.SILEX_HOST = options['host']
 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']) process.env.SILEX_SESSION_SECRET = options['session-secret']
 if(options['ssl-port']) process.env.SILEX_SSL_PORT = options['ssl-port']

package/src/ts/server/config.ts

@@ -25,7 +25,7 @@
  */
 
 import { Config, Plugin } from '@silexlabs/silex-plugins'
-import { resolve } from 'path'
+import { join, resolve } from 'path'
 import { CLIENT_CONFIG_FILE_NAME } from '../constants'
 import { Application, Request, Response, Router } from 'express'
 import { readFile } from 'fs/promises'
@@ -50,7 +50,7 @@ export class ServerConfig extends Config {
   public port = process.env.SILEX_PORT
   public debug = process.env.SILEX_DEBUG === 'true'
   public url = process.env.SILEX_URL?.replace(/\/$/, '') ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`
-  public userConfigPath: Plugin | undefined = process.env.SILEX_CONFIG
+  public userConfigPath: Plugin | undefined = process.env.SILEX_SERVER_CONFIG
   public configFilePath: Plugin = resolve(__dirname, '../../../.silex.js')
 
   // All connectors or just the storage or hosting connectors
@@ -176,13 +176,13 @@ export class ServerConfig extends Config {
     // Add default storage connectors
     if (!this.storageConnectors.length) {
       this.addStorageConnector(new FsStorage(null, {
-        path: process.env.SILEX_FS_ROOT,
+        path: process.env.SILEX_FS_ROOT || join(process.cwd(), '/silex/storage'),
       }))
     }
     // Add default hosting connectors
     if (!this.hostingConnectors.length) {
       this.addHostingConnector(new FsHosting(null, {
-        path: process.env.SILEX_FS_ROOT,
+        path: process.env.SILEX_FS_HOSTING_ROOT || join(process.cwd(), '/silex/hosting'),
       }))
     }
   }

package/src/ts/server/connectors/FsHosting.ts

@@ -15,6 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import fs from 'fs/promises'
 import { ConnectorFile, StorageConnector, HostingConnector, StatusCallback, ConnectorSession, contentToString, toConnectorData, ConnectorFileContent} from './connectors'
 import { join } from 'path'
 import { FsStorage } from './FsStorage'
@@ -23,21 +24,26 @@ import { JobManager } from '../jobs'
 
 type FsSession = ConnectorSession
 
-interface FsOptions {
-  path?: string
-}
-
 export class FsHosting extends FsStorage implements HostingConnector<FsSession> {
   connectorId = 'fs-hosting'
   displayName = 'File system hosting'
   connectorType = ConnectorType.HOSTING
 
+  protected async initFs() {
+    const stat = await fs.stat(this.options.path).catch(() => null)
+    if (!stat) {
+      await fs.mkdir(join(this.options.path, 'assets'), { recursive: true })
+      await fs.mkdir(join(this.options.path, 'css'), { recursive: true })
+      console.info(`> [FsHosting] Created folders assets/ and css/ in ${this.options.path}`)
+    }
+  }
+
   async publish(session: FsSession, id: WebsiteId, files: ConnectorFile[], {startJob, jobSuccess, jobError}: JobManager): Promise<JobData> {
     const job = startJob(`Publishing to ${this.displayName}`) as PublicationJobData
     job.logs = [[`Publishing to ${this.displayName}`]]
     job.errors = [[]]
     // Call write without id or folder so that it goes in / (path will be modified by publication transformers)
-    this.write(session, '', files, '', async ({status, message}) => {
+    await this.write(session, '', files, '', async ({status, message}) => {
       // Update the job status
       job.status = status
       job.message = message

package/src/ts/server/connectors/FsStorage.ts

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import fs, { stat } from 'fs/promises'
+import fs from 'fs/promises'
 import { createWriteStream } from 'fs'
 import { ConnectorFile, StorageConnector, StatusCallback, ConnectorSession, toConnectorData, ConnectorFileContent} from './connectors'
 import { dirname, join } from 'path'
@@ -35,6 +35,22 @@ if(!globalThis.__dirname) {
   console.info('Redefining __dirname', globalThis.__dirname)
 }
 
+// Copy a folder recursively
+async function copyDir(src, dest) {
+  await fs.mkdir(dest, { recursive: true })
+  const entries = await fs.readdir(src, { withFileTypes: true })
+
+  for (const entry of entries) {
+    const srcPath = join(src, entry.name)
+    const destPath = join(dest, entry.name)
+
+    entry.isDirectory() ?
+      await copyDir(srcPath, destPath) :
+      await fs.copyFile(srcPath, destPath)
+  }
+}
+
+
 type FsSession = ConnectorSession
 
 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'
@@ -64,7 +80,7 @@ export class FsStorage implements StorageConnector<FsSession> {
     this.initFs()
   }
 
-  private async initFs() {
+  protected async initFs() {
     const stat = await fs.stat(this.options.path).catch(() => null)
     if (!stat) {
       // create data folder with a default website
@@ -72,6 +88,7 @@ export class FsStorage implements StorageConnector<FsSession> {
       await fs.mkdir(join(this.options.path, id, this.options.assetsFolder), { recursive: true })
       await this.setWebsiteMeta({}, id, { name: 'Default website', connectorUserSettings: {} })
       await this.updateWebsite({}, id, defaultWebsiteData)
+      console.info(`> [FsStorage] Created ${id} in ${this.options.path}`)
     }
   }
 
@@ -136,7 +153,7 @@ export class FsStorage implements StorageConnector<FsSession> {
   async getWebsiteMeta(session: FsSession, id: WebsiteId): Promise<WebsiteMeta> {
     const websiteId = requiredParam<WebsiteId>(id, 'website id')
     // Get stats for website folder
-    const fileStat = await stat(join(this.options.path, websiteId))
+    const fileStat = await fs.stat(join(this.options.path, websiteId))
     const path = join(this.options.path, websiteId, WEBSITE_META_DATA_FILE)
     // Get meta file
     const content = await fs.readFile(path)
@@ -182,6 +199,18 @@ export class FsStorage implements StorageConnector<FsSession> {
     return fs.rmdir(path, { recursive: true })
   }
 
+  async duplicateWebsite(session: FsSession, websiteId: WebsiteId): Promise<void> {
+    const newWebsiteId = uuid()
+    const from = join(this.options.path, websiteId)
+    const to = 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: any): Promise<WebsiteMeta[]> {
     const list = await fs.readdir(this.options.path)
     return Promise.all(list.map(async fileName => {
@@ -210,7 +239,7 @@ export class FsStorage implements StorageConnector<FsSession> {
         fileStatus.message = 'Writing'
         this.updateStatus(filesStatuses, JobStatus.IN_PROGRESS, statusCbk)
         try {
-          await fs.writeFile(path, file.content, 'binary')
+          await fs.writeFile(path, file.content)
         } catch(err) {
           fileStatus.message = `Error (${err})`
           this.updateStatus(filesStatuses, JobStatus.IN_PROGRESS, statusCbk)

package/src/ts/server/connectors/connectors.ts

@@ -86,6 +86,7 @@ export interface StorageConnector<Session extends ConnectorSession = ConnectorSe
   createWebsite(session: Session, data: WebsiteMetaFileContent): Promise<WebsiteId>
   updateWebsite(session: Session, websiteId: WebsiteId, data: WebsiteData): Promise<void>
   deleteWebsite(session: Session, websiteId: WebsiteId): Promise<void>
+  duplicateWebsite(session: Session, websiteId: WebsiteId): Promise<void>
   // CRUD on assets
   writeAssets(session: Session, websiteId: WebsiteId, files: ConnectorFile[], status?: StatusCallback): Promise<string[] | void>
   readAsset(session: Session, websiteId: WebsiteId, fileName: string): Promise<ConnectorFileContent>
@@ -102,7 +103,6 @@ export interface StorageConnector<Session extends ConnectorSession = ConnectorSe
 export interface HostingConnector<Session extends ConnectorSession = ConnectorSession> extends Connector<Session> {
   publish(session: Session, websiteId: WebsiteId, files: ConnectorFile[], jobManager: JobManager): Promise<JobData> // Pass the jobManager as plugins do not neccessarily share the same module instance
   getUrl(session: Session, websiteId: WebsiteId): Promise<string>
-
 }
 
 export function toConnectorEnum(type: string | ConnectorType): ConnectorType {

package/src/ts/server/jobs.ts

@@ -22,6 +22,7 @@ const TIME_TO_KEEP_AFTER_STOP = 60*10*1000 // 10 min
 
 // Store the jobs in memory
 const jobs = new Array<JobData>()
+const timers = new WeakMap<JobData, NodeJS.Timeout>()
 
 // Key which will change on server restart
 const processKey = Math.ceil(Math.random() * 1000000)
@@ -60,7 +61,8 @@ export function jobError(id: JobId, message = ''): boolean {
 // Remove a job from memory
 // This is also used in unit tests to avoid memory lea
 export function killJob(job: JobData) {
-  clearTimeout(job._timeout)
+  clearTimeout(timers.get(job))
+  timers.delete(job)
   jobs.splice(jobs.findIndex(j => job.jobId === j.jobId), 1)
 }
 
@@ -70,7 +72,7 @@ function end(id: JobId, status: JobStatus, message = ''): boolean {
   if(job) {
     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/src/ts/types.ts

@@ -58,6 +58,7 @@ export type ApiWebsiteCreateQuery = { connectorId?: ConnectorId }
 export type ApiWebsiteCreateBody = WebsiteMetaFileContent
 export type ApiWebsiteCreateResponse = { message: string }
 export type ApiWebsiteDeleteQuery = { websiteId: WebsiteId, connectorId?: ConnectorId }
+export type ApiWebsiteDuplicateQuery = { websiteId: WebsiteId, connectorId?: ConnectorId }
 export type ApiWebsiteMetaReadQuery = { websiteId: WebsiteId, connectorId?: ConnectorId }
 export type ApiWebsiteMetaReadResponse = WebsiteMeta
 export type ApiWebsiteMetaWriteQuery = { websiteId: WebsiteId, connectorId?: ConnectorId }
@@ -201,6 +202,12 @@ export enum ClientSideFileType {
   HTML = 'html',
   ASSET = 'asset',
   CSS = 'css',
+  OTHER = 'other',
+}
+
+export enum Initiator {
+  HTML = 'html',
+  CSS = 'css',
 }
 
 /**
@@ -208,26 +215,22 @@ export enum ClientSideFileType {
  */
 export interface ClientSideFileWithPermalink {
   path: string, // Path in the connector
-  permalink: string, // Used to link to the file
+  permalink?: string, // Defaults to path, this the path where the file is served, it is used to link to the file
   type: ClientSideFileType,
 }
 
 /**
  * Type for a client side file when the content is available as a string
  */
-export interface ClientSideFileWithContent {
-  path: string,
+export interface ClientSideFileWithContent extends ClientSideFileWithPermalink {
   content: string, // Not buffer because it's sent from the client in JSON
-  type: ClientSideFileType
 }
 
 /**
  * Type for a client side file when the content is in the connector
  */
-export interface ClientSideFileWithSrc {
-  path: string,
+export interface ClientSideFileWithSrc extends ClientSideFileWithPermalink {
   src: string, // Where to download the file, a path for the storage connector
-  type: ClientSideFileType
 }
 
 /**

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

@@ -1,85 +0,0 @@
-import { ConnectorId, JobId, PublicationJobData, WebsiteId, ConnectorData, ConnectorType, WebsiteData, ClientSideFile, PublicationData, ConnectorUser, WebsiteMeta, WebsiteMetaFileContent, ConnectorOptions } from '../types';
-export declare enum ApiRoute {
-    PUBLICATION_PUBLISH = "/api/publication/",
-    PUBLICATION_STATUS = "/api/publication/publication/status",
-    CONNECTOR_USER = "/api/connector/user",
-    CONNECTOR_LOGOUT = "/api/connector/logout",
-    CONNECTOR_LIST = "/api/connector/",
-    WEBSITE_READ = "/api/website/",
-    WEBSITE_WRITE = "/api/website/",
-    WEBSITE_DELETE = "/api/website/",
-    WEBSITE_CREATE = "/api/website/",
-    WEBSITE_LIST = "/api/website/",
-    WEBSITE_ASSETS_READ = "/api/website/assets",
-    WEBSITE_ASSETS_WRITE = "/api/website/assets",
-    WEBSITE_META_READ = "/api/website/meta",
-    WEBSITE_META_WRITE = "/api/website/meta"
-}
-export declare function setServerUrl(url: string): void;
-export declare function getServerUrl(): string;
-export declare function getUser({ type, connectorId }: {
-    type: ConnectorType;
-    connectorId?: ConnectorId;
-}): Promise<ConnectorUser>;
-export declare function logout({ type, connectorId }: {
-    type: ConnectorType;
-    connectorId?: ConnectorId;
-}): Promise<void>;
-export declare function publish({ websiteId, hostingId, storageId, data, options }: {
-    websiteId: WebsiteId;
-    hostingId: ConnectorId;
-    storageId: ConnectorId;
-    data: PublicationData;
-    options: ConnectorOptions;
-}): Promise<[url: string, job: PublicationJobData]>;
-export declare function publicationStatus({ jobId }: {
-    jobId: JobId;
-}): Promise<PublicationJobData>;
-export declare function connectorList({ type }: {
-    type: ConnectorType;
-}): Promise<ConnectorData[]>;
-export declare function websiteList({ connectorId }: {
-    connectorId?: ConnectorId;
-}): Promise<WebsiteMeta[]>;
-export declare function websiteLoad({ websiteId, connectorId }: {
-    websiteId: WebsiteId;
-    connectorId?: ConnectorId;
-}): Promise<WebsiteData>;
-export declare function websiteSave({ websiteId, data, connectorId }: {
-    websiteId: WebsiteId;
-    data: WebsiteData;
-    connectorId?: ConnectorId;
-}): Promise<void>;
-export declare function websiteDelete({ websiteId, connectorId }: {
-    websiteId: WebsiteId;
-    connectorId?: ConnectorId;
-}): Promise<void>;
-export declare function websiteCreate({ websiteId, data, connectorId }: {
-    websiteId: WebsiteId;
-    data: WebsiteMetaFileContent;
-    connectorId?: ConnectorId;
-}): Promise<void>;
-export declare function websiteMetaWrite({ websiteId, data, connectorId }: {
-    websiteId: WebsiteId;
-    data: WebsiteMetaFileContent;
-    connectorId?: ConnectorId;
-}): Promise<void>;
-export declare function websiteMetaRead({ websiteId, connectorId }: {
-    websiteId: WebsiteId;
-    connectorId?: ConnectorId;
-}): Promise<WebsiteMeta>;
-export declare function websiteAssetsLoad({ path, websiteId, connectorId }: {
-    path: string;
-    websiteId: WebsiteId;
-    connectorId: ConnectorId;
-}): Promise<string>;
-/**
- * Not used directly, grapesjs handles the upload
- * @see assetManager in src/ts/client/grapesjs/index.ts
- */
-export declare function websiteAssetsSave({ websiteId, connectorId, files }: {
-    websiteId: WebsiteId;
-    connectorId: ConnectorId;
-    files: ClientSideFile[];
-}): Promise<string[]>;
-export declare function api<ReqQuery, ReqBody, ResBody>(route: ApiRoute | string, method: string, query?: ReqQuery, payload?: ReqBody): Promise<ResBody>;