@silexlabs/silex 3.0.6 → 3.0.8

package/dist/client/silex-lib/src/ts/client/grapesjs/upload-progress.d.ts

@@ -0,0 +1,2 @@
+import { Editor } from 'grapesjs';
+export default function pluginUploadProgress(editor: Editor): void;

package/dist/client/silex-lib/src/ts/constants.d.ts

@@ -3,6 +3,7 @@
  */
 export declare const WEBSITE_DATA_FILE = "website.json";
 export declare const WEBSITE_META_DATA_FILE = "meta.json";
+export declare const WEBSITE_PAGES_FOLDER = "src";
 export declare const DEFAULT_WEBSITE_ID = "default";
 export declare const DEFAULT_LANGUAGE = "en";
 export declare const CLIENT_CONFIG_FILE_NAME = "silex.js";

package/dist/plugins/server/constants.d.ts

@@ -3,6 +3,7 @@
  */
 export declare const WEBSITE_DATA_FILE = "website.json";
 export declare const WEBSITE_META_DATA_FILE = "meta.json";
+export declare const WEBSITE_PAGES_FOLDER = "src";
 export declare const DEFAULT_WEBSITE_ID = "default";
 export declare const DEFAULT_LANGUAGE = "en";
 export declare const CLIENT_CONFIG_FILE_NAME = "silex.js";

package/dist/plugins/server/constants.js

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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_PAGES_FOLDER = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
 /**
  * @fileoverview define constants for Silex client and server
  */
 exports.WEBSITE_DATA_FILE = 'website.json';
 exports.WEBSITE_META_DATA_FILE = 'meta.json';
+exports.WEBSITE_PAGES_FOLDER = 'src';
 exports.DEFAULT_WEBSITE_ID = 'default';
 exports.DEFAULT_LANGUAGE = 'en';
 exports.CLIENT_CONFIG_FILE_NAME = 'silex.js';

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ts/constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH;;GAEG;AAEU,QAAA,iBAAiB,GAAG,cAAc,CAAA;AAClC,QAAA,sBAAsB,GAAG,WAAW,CAAA;AAEpC,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEpC,QAAA,QAAQ,GAAG,MAAM,CAAA;AAEjB,QAAA,kBAAkB,GAAG,YAAY,CAAA;AACjC,QAAA,kBAAkB,GAAG,OAAO,CAAA;AAC5B,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,sBAAsB,GAAG,WAAW,CAAA;AACpC,QAAA,4BAA4B,GAAG,iBAAiB,CAAA;AAEhD,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAC7B,QAAA,sBAAsB,GAAG,qBAAqB,CAAA;AAE9C,QAAA,gBAAgB,GAAG,UAAU,CAAA;AAC7B,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,iBAAiB,GAAG,GAAG,CAAA;AACvB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,qBAAqB,GAAG,YAAY,CAAA;AACpC,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,sBAAsB,GAAG,SAAS,CAAA;AAClC,QAAA,wBAAwB,GAAG,SAAS,CAAA;AACpC,QAAA,qBAAqB,GAAG,OAAO,CAAA;AAC/B,QAAA,sBAAsB,GAAG,OAAO,CAAA;AAO7C,IAAI,CAAC;IAAC,qBAAa,GAAG,iBAAiB,CAAA;AAAC,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACnD,4BAA4B;IAC5B,qBAAa,GAAG,qBAAa,IAAI,OAAO,CAAA;AAC1C,CAAC;AAEY,QAAA,WAAW,GAAG;;;;;;;;;;2DAUgC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;;;;;;;;CAQhF,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ts/constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH;;GAEG;AAEU,QAAA,iBAAiB,GAAG,cAAc,CAAA;AAClC,QAAA,sBAAsB,GAAG,WAAW,CAAA;AACpC,QAAA,oBAAoB,GAAG,KAAK,CAAA;AAE5B,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEpC,QAAA,QAAQ,GAAG,MAAM,CAAA;AAEjB,QAAA,kBAAkB,GAAG,YAAY,CAAA;AACjC,QAAA,kBAAkB,GAAG,OAAO,CAAA;AAC5B,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,sBAAsB,GAAG,WAAW,CAAA;AACpC,QAAA,4BAA4B,GAAG,iBAAiB,CAAA;AAEhD,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAC7B,QAAA,sBAAsB,GAAG,qBAAqB,CAAA;AAE9C,QAAA,gBAAgB,GAAG,UAAU,CAAA;AAC7B,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,iBAAiB,GAAG,GAAG,CAAA;AACvB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,qBAAqB,GAAG,YAAY,CAAA;AACpC,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,sBAAsB,GAAG,SAAS,CAAA;AAClC,QAAA,wBAAwB,GAAG,SAAS,CAAA;AACpC,QAAA,qBAAqB,GAAG,OAAO,CAAA;AAC/B,QAAA,sBAAsB,GAAG,OAAO,CAAA;AAO7C,IAAI,CAAC;IAAC,qBAAa,GAAG,iBAAiB,CAAA;AAAC,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACnD,4BAA4B;IAC5B,qBAAa,GAAG,qBAAa,IAAI,OAAO,CAAA;AAC1C,CAAC;AAEY,QAAA,WAAW,GAAG;;;;;;;;;;2DAUgC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;;;;;;;;CAQhF,CAAA"}

package/dist/plugins/server/page.d.ts

@@ -0,0 +1,2 @@
+export declare function getPageSlug(pageName: any): any;
+export declare function getPageLink(pageName: any): string;

package/dist/plugins/server/page.js

@@ -0,0 +1,35 @@
+"use strict";
+/*
+ * 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/>.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageSlug = getPageSlug;
+exports.getPageLink = getPageLink;
+// Page related functions
+// This is used on the client and the server
+function getPageSlug(pageName) {
+    return (pageName || 'index')
+        .toLowerCase()
+        .replace(/[^a-z0-9 -]/g, '')
+        // Collapse whitespace and replace by -
+        .replace(/\s+/g, '-')
+        // Collapse dashes
+        .replace(/-+/g, '-');
+}
+function getPageLink(pageName) {
+    return `./${getPageSlug(pageName)}.html`;
+}
+//# sourceMappingURL=page.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/ts/page.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAIH,kCAQC;AACD,kCAEC;AAbD,yBAAyB;AACzB,4CAA4C;AAC5C,SAAgB,WAAW,CAAC,QAAQ;IAClC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;SACzB,WAAW,EAAE;SACb,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;QAC5B,uCAAuC;SACtC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QACrB,kBAAkB;SACjB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC;AACD,SAAgB,WAAW,CAAC,QAAQ;IAClC,OAAO,KAAK,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAA;AAC1C,CAAC"}

package/dist/plugins/server/plugins/server/GitlabConnector.d.ts

@@ -1,11 +1,6 @@
 import { ServerConfig } from '../../server/config';
 import { ConnectorFile, ConnectorFileContent, StatusCallback, StorageConnector } from '../../server/connectors/connectors';
 import { ConnectorType, ConnectorUser, WebsiteData, WebsiteId, WebsiteMeta, WebsiteMetaFileContent } from '../../types';
-/**
- * Gitlab connector
- * @fileoverview Gitlab connector for Silex, connect to the user's Gitlab account to store websites
- * @see https://docs.gitlab.com/ee/api/oauth2.html
- */
 export interface GitlabOptions {
     clientId: string;
     clientSecret: string;
@@ -94,7 +89,9 @@ export default class GitlabConnector implements StorageConnector {
     /**
      * Call the Gitlab API with the user's token and handle errors
      */
-    callApi(session: GitlabSession, path: string, method?: 'POST' | 'GET' | 'PUT' | 'DELETE', body?: GitlabWriteFile | GitlabGetToken | GitlabWebsiteName | GitlabCreateBranch | GitlabGetTags | GitlabCreateTag | GitlabFetchCommits | null, params?: any): Promise<any>;
+    callApi(session: GitlabSession, path: string, method?: 'POST' | 'GET' | 'PUT' | 'DELETE', requestBody?: GitlabWriteFile | GitlabGetToken | GitlabWebsiteName | GitlabCreateBranch | GitlabGetTags | GitlabCreateTag | GitlabFetchCommits | null, params?: any): Promise<any>;
+    private projectPathCache;
+    downloadRawFile(session: GitlabSession, projectId: string, filePath: string): Promise<Buffer>;
     private generateCodeVerifier;
     private generateCodeChallenge;
     private getRedirect;
@@ -122,14 +119,27 @@ export default class GitlabConnector implements StorageConnector {
     logout(session: GitlabSession): Promise<void>;
     getUser(session: GitlabSession): Promise<ConnectorUser>;
     listWebsites(session: GitlabSession): Promise<WebsiteMeta[]>;
+    /**
+     * Read the website data
+     * The website data file is named `website.json` and the pages are named `page-{id}.json`
+     * The pages are stored in the `src` folder by default
+     */
     readWebsite(session: GitlabSession, websiteId: string): Promise<WebsiteData>;
+    /**
+     * Create a new website, i.e. a new Gitlab repository with an empty website data file
+     */
     createWebsite(session: GitlabSession, websiteMeta: WebsiteMetaFileContent): Promise<WebsiteId>;
+    /**
+     * Update the website data
+     * Split the website data into 1 file per page + 1 file for the website data itself
+     * Use gitlab batch API to create/update the files
+     */
     updateWebsite(session: GitlabSession, websiteId: WebsiteId, websiteData: WebsiteData): Promise<void>;
     deleteWebsite(session: GitlabSession, websiteId: WebsiteId): Promise<void>;
     duplicateWebsite(session: GitlabSession, websiteId: string): Promise<void>;
     getWebsiteMeta(session: GitlabSession, websiteId: WebsiteId): Promise<WebsiteMeta>;
     setWebsiteMeta(session: GitlabSession, websiteId: WebsiteId, websiteMeta: WebsiteMetaFileContent): Promise<void>;
-    writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback | undefined): Promise<void>;
+    writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback): Promise<void>;
     readAsset(session: GitlabSession, websiteId: string, fileName: string): Promise<ConnectorFileContent>;
     deleteAssets(session: GitlabSession, websiteId: string, fileNames: string[]): Promise<void>;
 }

package/dist/plugins/server/plugins/server/GitlabConnector.js

@@ -49,6 +49,22 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const crypto_1 = __importStar(require("crypto"));
 const path_1 = require("path");
 const https_1 = require("https");
+const page_1 = require("../../page");
+/**
+ * Gitlab connector
+ * @fileoverview Gitlab connector for Silex, connect to the user's Gitlab account to store websites
+ * @see https://docs.gitlab.com/ee/api/oauth2.html
+ */
+const MAX_BATCH_UPLOAD_SIZE = 100;
+// interface MetaRepoFileContent {
+//   websites: {
+//     [websiteId: string]: {
+//       meta: WebsiteMetaFileContent,
+//       createdAt: string,
+//       updatedAt: string,
+//     }
+//   }
+// }
 const svg = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -138,8 +154,11 @@ class GitlabConnector {
     }
     // **
     // Convenience methods for the Gitlab API
-    getAssetPath(path) {
-        return encodeURIComponent((0, path_1.join)(this.options.assetsFolder, path));
+    getAssetPath(path, encode = true) {
+        const resolvedPath = (0, path_1.join)(this.options.assetsFolder, path);
+        if (encode)
+            return encodeURIComponent(resolvedPath);
+        return resolvedPath;
     }
     isUsingOfficialInstance() {
         const gitlabDomainRegexp = /(^|\b)(gitlab\.com)($|\b)/;
@@ -170,53 +189,14 @@ class GitlabConnector {
         });
     }
     async readFile(session, websiteId, fileName) {
+        // Remove leading slash
         const safePath = fileName.replace(/^\//, '');
-        // Call the API
-        const url = `${this.options.domain}/api/v4/projects/${websiteId}/repository/files/${safePath}?ref=${this.options.branch}&access_token=${this.getSessionToken(session).token?.access_token}`;
-        const response = await (0, node_fetch_1.default)(url, {
-            agent: this.getAgent(),
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
-        const json = await response.json();
-        if (!response.ok)
-            throw new types_1.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
-     */
-    //private getMetaRepoPath(session: GitlabSession): string {
-    //  if(!this.getSessionToken(session).username) throw new ApiError('Missing Gitlab user ID. User not logged in?', 401)
-    //  return encodeURIComponent(`${this.getSessionToken(session).username}/${this.options.metaRepo}`)
-    //}
-    ///**
-    // * Initialize the storage with a meta repo
-    // */
-    //private async initStorage(session: GitlabSession): Promise<void> {
-    //  // Create the meta repo
-    //  try {
-    //    const project = await this.callApi(session, 'api/v4/projects/', 'POST', {
-    //      name: this.options.metaRepo,
-    //    }) as any
-    //    return this.createFile(session, this.getMetaRepoPath(session), this.options.metaRepoFile, JSON.stringify({
-    //      websites: {}
-    //    } as MetaRepoFileContent))
-    //  } catch (e) {
-    //    console.error('Could not init storage', e.statusCode, e.httpStatusCode, e)
-    //    throw e
-    //  }
-    //}
+        return this.downloadRawFile(session, websiteId, safePath);
+    }
     /**
      * Call the Gitlab API with the user's token and handle errors
      */
-    async callApi(session, path, method = 'GET', body = null, params = {}) {
+    async callApi(session, path, method = 'GET', requestBody = null, params = {}) {
         const token = this.getSessionToken(session).token;
         const tokenParam = token ? `access_token=${token.access_token}&` : '';
         const paramsStr = Object.entries(params).map(([k, v]) => `${k}=${encodeURIComponent(v.toString())}`).join('&');
@@ -224,17 +204,21 @@ class GitlabConnector {
         const headers = {
             'Content-Type': 'application/json',
         };
-        if (method === 'GET' && body) {
-            console.error('Gitlab API error (4) - GET request with body', { url, method, body, params });
+        if (method === 'GET' && requestBody) {
+            console.error('Gitlab API error (4) - GET request with body', { url, method, body: requestBody, params });
         }
         // With or without body
         let response;
+        const body = requestBody ? JSON.stringify(requestBody) : undefined;
         try {
-            response = await (0, node_fetch_1.default)(url, body && method !== 'GET' ? {
+            if (body && Buffer.byteLength(body) > 1024 * 100) {
+                console.warn('Gitlab API warning - body too big', Buffer.byteLength(body), 'bytes', { url, method, params });
+            }
+            response = await (0, node_fetch_1.default)(url, requestBody && method !== 'GET' ? {
                 agent: this.getAgent(),
                 method,
                 headers,
-                body: body ? JSON.stringify(body) : undefined
+                body,
             } : {
                 agent: this.getAgent(),
                 method,
@@ -243,12 +227,20 @@ class GitlabConnector {
         }
         catch (e) {
             console.error('Gitlab API error (0)', e);
-            throw new types_1.ApiError(`Gitlab API error (0): ${e.message} ${e.code} ${e.name} ${e.type}`, 500);
+            throw new types_1.ApiError(`Gitlab API error (0): ${e.message} ${e.text} ${e.code} ${e.name} ${e.type}`, 500);
         }
-        let json;
         // Handle the case when the server returns a non-JSON response (e.g. 400 Bad Request)
-        const text = await response.text();
+        const text = await async function () {
+            try {
+                return await response.text();
+            }
+            catch (e) {
+                console.error('Gitlab API error (6) - could not parse response', response.status, response.statusText, { url, method, body: requestBody, params }, e);
+                throw new types_1.ApiError(`Gitlab API error (6): response body not available. ${e.message}`, 500);
+            }
+        }();
         if (!response.ok) {
+            console.error('Gitlab API error (7) - response not ok', response.status, response.statusText, { url, method, body: requestBody, params, text: text });
             if (text.includes('A file with this name doesn\'t exist')) {
                 throw new types_1.ApiError('Gitlab API error (5): Not Found', 404);
             }
@@ -290,11 +282,12 @@ class GitlabConnector {
                 }
             }
             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, { url, method, body, params, text, message });
-                throw new types_1.ApiError(`Gitlab API error (1): ${message}`, response.status);
+                const message = response.statusText;
+                console.error('Gitlab API error (1)', response.status, response.statusText, { url, method, body: requestBody, params, text: text, message });
+                throw new types_1.ApiError(`Gitlab API error (1): ${message} (${text})`, response.status);
             }
         }
+        let json;
         try {
             json = JSON.parse(text);
         }
@@ -305,12 +298,74 @@ class GitlabConnector {
             }
             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 });
+                console.error('Gitlab API error (3) - could not parse response', response.status, response.statusText, { url, method, body: requestBody, params, text: text });
                 return text;
             }
         }
         return json;
     }
+    // Cache for projects path
+    projectPathCache = new Map();
+    async downloadRawFile(session, projectId, filePath) {
+        const token = this.getSessionToken(session).token?.access_token;
+        const domain = this.options.domain;
+        const branch = this.options.branch;
+        // Get the project path with namespace
+        let pathWithNamespace = this.projectPathCache.get(projectId);
+        if (!pathWithNamespace) {
+            const metaUrl = `${domain}/api/v4/projects/${projectId}`;
+            const metaRes = await (0, node_fetch_1.default)(metaUrl, {
+                agent: this.getAgent(),
+                headers: {
+                    'Authorization': `Bearer ${token}`,
+                },
+            });
+            const metaText = await metaRes.text();
+            if (!metaRes.ok) {
+                console.error('GitLab raw error (meta)', metaRes.status, metaRes.statusText, { metaUrl, metaText });
+                throw new types_1.ApiError(`GitLab raw error (meta): ${metaRes.statusText}`, metaRes.status);
+            }
+            try {
+                const meta = JSON.parse(metaText);
+                pathWithNamespace = meta.path_with_namespace;
+            }
+            catch (e) {
+                throw new types_1.ApiError('GitLab raw error (meta): could not parse project info', 500);
+            }
+            // Limit cache size, remove least recently used
+            this.projectPathCache.set(projectId, pathWithNamespace);
+            if (this.projectPathCache.size > 500) {
+                this.projectPathCache.delete(this.projectPathCache.keys().next().value);
+            }
+        }
+        // Construct the raw URL
+        // GET /projects/:id/repository/files/:file_path/raw
+        const rawUrl = `${domain}/api/v4/projects/${encodeURIComponent(pathWithNamespace)}/repository/files/${encodeURIComponent(filePath)}/raw?ref=${branch}&access_token=${token}`;
+        const fileRes = await (0, node_fetch_1.default)(rawUrl, {
+            agent: this.getAgent(),
+        });
+        const contentType = fileRes.headers.get('content-type');
+        if (contentType?.includes('text/html')) {
+            const html = await fileRes.text();
+            throw new types_1.ApiError('GitLab returned HTML instead of file (unauthorized or not found).', 401);
+        }
+        if (!fileRes.ok) {
+            const errText = await fileRes.text();
+            if (errText.includes('not found') || fileRes.status === 404) {
+                throw new types_1.ApiError('GitLab raw error (5): Not Found', 404);
+            }
+            console.error('GitLab raw error (1)', fileRes.status, fileRes.statusText, { rawUrl, errText });
+            throw new types_1.ApiError(`GitLab raw error (1): ${fileRes.statusText} (${errText})`, fileRes.status);
+        }
+        try {
+            const buffer = await fileRes.buffer();
+            return buffer;
+        }
+        catch (e) {
+            console.error('GitLab raw error (3): could not read buffer', e);
+            throw new types_1.ApiError('GitLab raw error (3): failed to read binary content', 500);
+        }
+    }
     generateCodeVerifier() {
         return crypto_1.default.randomBytes(64).toString('base64')
             .replace(/\+/g, '-')
@@ -480,15 +535,41 @@ class GitlabConnector {
             connectorUserSettings: {},
         }));
     }
+    /**
+     * Read the website data
+     * The website data file is named `website.json` and the pages are named `page-{id}.json`
+     * The pages are stored in the `src` folder by default
+     */
     async readWebsite(session, websiteId) {
-        const result = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_DATA_FILE}`, 'GET', null, {
-            ref: this.options.branch,
-        });
-        const { content } = result;
-        const contentDecoded = Buffer.from(content, 'base64').toString('utf8');
-        const websiteData = JSON.parse(contentDecoded);
-        return websiteData;
+        const websiteDataBuf = await this.downloadRawFile(session, websiteId, constants_1.WEBSITE_DATA_FILE);
+        const websiteData = JSON.parse(websiteDataBuf.toString('utf8'));
+        // If the website pages are not in the main file, we need to read them
+        // This happens when the website was just created
+        // Let grapesjs create the pages in the frontend
+        if (!websiteData.pages) {
+            return websiteData;
+        }
+        // Load each page in parallel
+        const pages = await Promise.all(websiteData.pages.map(async (page) => {
+            if (page.isFile) {
+                const name = (0, page_1.getPageSlug)(page.name);
+                const fileName = (`${((0, page_1.getPageSlug)(page.name))}-${page.id}`);
+                const filePath = `${constants_1.WEBSITE_PAGES_FOLDER}/${fileName}.json`;
+                const pageContent = await this.downloadRawFile(session, websiteId, filePath);
+                const res = JSON.parse(pageContent.toString('utf8'));
+                return res;
+            }
+            return page;
+        }));
+        // Read each page file if needed
+        return {
+            ...websiteData,
+            pages,
+        };
     }
+    /**
+     * Create a new website, i.e. a new Gitlab repository with an empty website data file
+     */
     async createWebsite(session, websiteMeta) {
         const project = await this.callApi(session, 'api/v4/projects/', 'POST', {
             name: this.options.repoPrefix + websiteMeta.name,
@@ -499,13 +580,70 @@ class GitlabConnector {
         //await this.setWebsiteMeta(session, project.id, websiteMeta)
         return project.id;
     }
+    /**
+     * Update the website data
+     * Split the website data into 1 file per page + 1 file for the website data itself
+     * Use gitlab batch API to create/update the files
+     */
     async updateWebsite(session, websiteId, websiteData) {
-        const project = await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${constants_1.WEBSITE_DATA_FILE}`, 'PUT', {
+        const batchActions = [];
+        // List existing files in the pages folder
+        let existingFiles = [];
+        try {
+            const files = await this.callApi(session, `api/v4/projects/${websiteId}/repository/tree`, 'GET', null, {
+                path: constants_1.WEBSITE_PAGES_FOLDER,
+                recursive: false,
+            });
+            existingFiles = files.map(file => file.path);
+        }
+        catch (e) {
+            if (e.statusCode !== 404 && e.httpStatusCode !== 404) {
+                throw e;
+            }
+        }
+        // Prepare actions for each page
+        const pages = websiteData.pages.map((page) => {
+            const file_name = encodeURIComponent(`${((0, page_1.getPageSlug)(page.name))}-${page.id}`);
+            const file_path = (`${constants_1.WEBSITE_PAGES_FOLDER}/${file_name}.json`);
+            const content = JSON.stringify(page);
+            // Determine whether to create or update the file
+            if (existingFiles.includes(file_path)) {
+                batchActions.push({
+                    action: 'update',
+                    file_path,
+                    content,
+                });
+            }
+            else {
+                batchActions.push({
+                    action: 'create',
+                    file_path,
+                    content,
+                });
+            }
+            return {
+                name: page.name,
+                id: page.id,
+                isFile: true,
+            };
+        });
+        // Prepare the main website data file
+        const websiteDataWithGitlabPages = {
+            ...websiteData,
+            pages,
+        };
+        batchActions.push({
+            action: 'update',
+            file_path: constants_1.WEBSITE_DATA_FILE,
+            content: JSON.stringify(websiteDataWithGitlabPages),
+        });
+        // Perform a single batch commit
+        const batch = {
             branch: this.options.branch,
             commit_message: 'Update website data from Silex',
-            content: JSON.stringify(websiteData),
-            id: websiteId,
-        });
+            actions: batchActions,
+        };
+        await this.callApi(session, `api/v4/projects/${websiteId}/repository/commits`, 'POST', batch);
     }
     async deleteWebsite(session, websiteId) {
         // Delete repo
@@ -524,7 +662,6 @@ class GitlabConnector {
         //  branch: this.options.branch,
         //  commit_message: `Delete meta data of ${data.meta.name} (${websiteId}) from Silex`,
         //  content: JSON.stringify(metaRepo),
-        //  file_path: this.options.metaRepoFile,
         //})
     }
     async duplicateWebsite(session, websiteId) {
@@ -544,10 +681,10 @@ class GitlabConnector {
         });
         // Upload all files
         for (const file of files) {
-            const path = encodeURIComponent(file);
-            const content = await this.readFile(session, websiteId, path);
+            const content = await this.readFile(session, websiteId, file);
             // From buffer to string
             const contentStr = content.toString('base64');
+            const path = encodeURIComponent(file);
             switch (file) {
                 case constants_1.WEBSITE_DATA_FILE:
                     await this.updateFile(session, newId, path, contentStr, true);
@@ -586,24 +723,6 @@ class GitlabConnector {
         };
     }
     async setWebsiteMeta(session, websiteId, websiteMeta) {
-        //// Load the meta repo data
-        //const file = await this.callApi(session, `api/v4/projects/${this.getMetaRepoPath(session)}/repository/files/${this.options.metaRepoFile}`, 'GET', null, {
-        //  ref: this.options.branch,
-        //})
-        //const metaRepo = JSON.parse(Buffer.from(file.content, 'base64').toString('utf8')) as MetaRepoFileContent
-        //// Update or create the website meta data
-        //metaRepo.websites[websiteId] = {
-        //  updatedAt: new Date().toISOString(),
-        //  createdAt: metaRepo.websites[websiteId]?.createdAt ?? new Date().toISOString(),
-        //  meta: websiteMeta,
-        //}
-        //// Save the meta repo data
-        //const project = await this.callApi(session, `api/v4/projects/${this.getMetaRepoPath(session)}/repository/files/${this.options.metaRepoFile}`, 'PUT', {
-        //  branch: this.options.branch,
-        //  commit_message: `Update website meta data of ${websiteMeta.name} (${websiteId}) from Silex`,
-        //  content: JSON.stringify(metaRepo),
-        //  file_path: this.options.metaRepoFile,
-        //})
         // Rename the repo if needed
         const oldMeta = await this.getWebsiteMeta(session, websiteId);
         if (websiteMeta.name !== oldMeta.name) {
@@ -611,41 +730,63 @@ class GitlabConnector {
                 name: this.options.repoPrefix + websiteMeta.name,
             });
         }
-        //// Update the metadata file
-        //await this.callApi(session, `api/v4/projects/${websiteId}/repository/files/${WEBSITE_META_DATA_FILE}`, 'PUT', {
-        //  branch: this.options.branch,
-        //  commit_message: 'Update website meta data from Silex',
-        //  content: JSON.stringify(websiteMeta),
-        //  file_path: WEBSITE_META_DATA_FILE,
-        //  id: websiteId,
-        //})
     }
     async writeAssets(session, websiteId, files, status) {
-        status && await status({ message: 'in progress...', status: types_1.JobStatus.IN_PROGRESS });
-        // For each file
-        for (const file of files) {
-            // Convert to base64
-            const content = (await (0, connectors_1.contentToBuffer)(file.content)).toString('base64');
-            const path = this.getAssetPath(file.path);
+        status && await status({ message: `Preparing ${files.length} files`, status: types_1.JobStatus.IN_PROGRESS });
+        // List all the files in the repo
+        const existingPaths = new Set();
+        let page = 1;
+        let keepGoing = true;
+        while (keepGoing) {
+            const tree = await this.callApi(session, `api/v4/projects/${websiteId}/repository/tree`, 'GET', null, {
+                recursive: true,
+                per_page: 100,
+                page,
+            });
+            for (const f of tree) {
+                if (f.type === 'blob')
+                    existingPaths.add(f.path);
+            }
+            keepGoing = tree.length === 100;
+            page++;
+        }
+        // Split the files into chunks to avoid the number of files limit
+        const chunks = [];
+        for (let i = 0; i < files.length; i += MAX_BATCH_UPLOAD_SIZE) {
+            chunks.push(files.slice(i, i + MAX_BATCH_UPLOAD_SIZE));
+        }
+        for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
+            const chunk = chunks[chunkIndex];
+            status && await status({ message: `Uploading batch ${chunkIndex + 1}/${chunks.length}`, status: types_1.JobStatus.IN_PROGRESS });
+            // Create the actions for the batch
+            const actions = await Promise.all(chunk.map(async (file) => {
+                const content = (await (0, connectors_1.contentToBuffer)(file.content)).toString('base64');
+                const file_path = this.getAssetPath(file.path, false);
+                const actionType = existingPaths.has(file_path) ? 'update' : 'create';
+                return {
+                    action: actionType,
+                    file_path,
+                    content,
+                    encoding: 'base64',
+                };
+            }));
             try {
-                await this.updateFile(session, websiteId, path, content, true);
+                await this.callApi(session, `api/v4/projects/${websiteId}/repository/commits`, 'POST', {
+                    branch: 'main',
+                    commit_message: `Batch update assets (${chunkIndex + 1}/${chunks.length})`,
+                    actions,
+                });
             }
             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, path, content, true);
-                }
-                else {
-                    status && await status({ message: 'Error', status: types_1.JobStatus.ERROR });
-                    throw e;
-                }
+                console.error(`Batch ${chunkIndex + 1} failed`, e);
+                status && await status({ message: `Error in batch ${chunkIndex + 1}`, status: types_1.JobStatus.ERROR });
+                throw e;
             }
         }
-        status && await status({ message: 'Successfull', status: types_1.JobStatus.SUCCESS });
+        status && await status({ message: 'All files uploaded successfully', status: types_1.JobStatus.SUCCESS });
     }
     async readAsset(session, websiteId, fileName) {
-        // Remove leading slash
-        const finalPath = this.getAssetPath(fileName);
+        const finalPath = this.getAssetPath(fileName, false);
         return this.readFile(session, websiteId, finalPath);
     }
     async deleteAssets(session, websiteId, fileNames) {