@silexlabs/silex 3.7.0 → 3.9.0-canary.2

package/dist/{plugins/server/plugins/server → server/server/plugins}/GitlabConnector.js

@@ -1,20 +1,4 @@
 "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/>.
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -31,43 +15,34 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeGitBlobSha = computeGitBlobSha;
-const constants_1 = require("../../constants");
-const connectors_1 = require("../../server/connectors/connectors");
-const types_1 = require("../../types");
-const node_fetch_1 = __importDefault(require("node-fetch"));
+const constants_js_1 = require("../../common/constants.js");
+const connectors_js_1 = require("../connectors/connectors.js");
+const types_js_1 = require("../../common/types.js");
 const crypto_1 = __importStar(require("crypto"));
 const path_1 = require("path");
-const https_1 = require("https");
-const websiteDataSerialization_1 = require("../../server/utils/websiteDataSerialization");
-/**
- * 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 websiteDataSerialization_js_1 = require("../utils/websiteDataSerialization.js");
 const MAX_BATCH_UPLOAD_SIZE = 100;
-const MAX_BODY_SIZE_KB = 8 * 1000 * 1024; // 8MB (note that 10 MB PNG → becomes ~13.3 MB → ❌ often too big for Gitlab)
+const MAX_BODY_SIZE_KB = 8 * 1000 * 1024;
 const WEBSITE_DATA_FILE_FORMAT_VERSION = '1.0.0';
-// 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"
@@ -127,26 +102,26 @@ const encodedSvg = encodeURIComponent(svg);
 const ICON = '/assets/gitlab.png';
 function computeGitBlobSha(content, binary) {
     const contentBuffer = binary
-        ? Buffer.from(content, 'base64') // for binary files
-        : Buffer.from(content, 'utf8'); // for text files
+        ? Buffer.from(content, 'base64')
+        : Buffer.from(content, 'utf8');
     const header = `blob ${contentBuffer.length}\0`;
     const full = Buffer.concat([Buffer.from(header), contentBuffer]);
     return crypto_1.default.createHash('sha1').update(full).digest('hex');
 }
 function sanitizeGitlabPath(name) {
     return name
-        .normalize('NFD') // separate accents
-        .replace(/[\u0300-\u036f]/g, '') // remove accents
-        .replace(/[^a-zA-Z0-9._-]/g, '-') // only allow allowed characters
-        .replace(/^[-_.]+/, '') // no starting '-', '_' or '.'
-        .replace(/[-_.]+$/, '') // no ending '-', '_' or '.'
-        .replace(/\.git$|\.atom$/i, '') // forbidden endings
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .replace(/[^a-zA-Z0-9._-]/g, '-')
+        .replace(/^[-_.]+/, '')
+        .replace(/[-_.]+$/, '')
+        .replace(/\.git$|\.atom$/i, '')
         .toLowerCase();
 }
 class GitlabConnector {
     config;
     connectorId = 'gitlab';
-    connectorType = types_1.ConnectorType.STORAGE;
+    connectorType = types_js_1.ConnectorType.STORAGE;
     displayName = 'GitLab';
     icon = ICON;
     disableLogout = false;
@@ -158,10 +133,8 @@ class GitlabConnector {
         this.options = {
             branch: 'main',
             assetsFolder: 'assets',
-            //metaRepo: 'silex-meta',
-            //metaRepoFile: 'websites.json',
             repoPrefix: 'silex_',
-            scope: 'api', // 'api+read_api+read_user+read_repository+write_repository+email+sudo+profile+openid'
+            scope: 'api',
             ...opts,
         };
         if (!this.options.clientId)
@@ -171,10 +144,8 @@ class GitlabConnector {
         if (!this.options.domain)
             throw new Error('Missing Gitlab domain');
         if (!this.options.timeOut)
-            this.options.timeOut = 15000; /* default value */
+            this.options.timeOut = 15000;
     }
-    // **
-    // Convenience methods for the Gitlab API
     getAssetPath(path, encode = true) {
         const resolvedPath = (0, path_1.join)(this.options.assetsFolder, path);
         if (encode)
@@ -186,7 +157,6 @@ class GitlabConnector {
         return gitlabDomainRegexp.test(this.options.domain);
     }
     async createFile(session, websiteId, path, content, isBase64 = false) {
-        // Remove leading slash
         const safePath = path.replace(/^\//, '');
         const encodePath = decodeURIComponent(path);
         return this.callApi({
@@ -203,7 +173,6 @@ class GitlabConnector {
         });
     }
     async updateFile(session, websiteId, path, content, isBase64 = false) {
-        // Remove leading slash
         const safePath = path.replace(/^\//, '');
         const encodePath = decodeURIComponent(path);
         return this.callApi({
@@ -213,22 +182,17 @@ class GitlabConnector {
             requestBody: {
                 id: websiteId,
                 branch: this.options.branch,
-                content: await (0, connectors_1.contentToString)(content),
+                content: await (0, connectors_js_1.contentToString)(content),
                 commit_message: `Update website asset ${encodePath} from Silex`,
                 encoding: isBase64 ? 'base64' : undefined,
             }
         });
     }
     async readFile(session, websiteId, fileName) {
-        // Remove leading slash
         const safePath = fileName.replace(/^\//, '');
         return this.downloadRawFile(session, websiteId, safePath);
     }
-    /**
-     * Call the Gitlab API with the user's token and handle errors
-     */
-    async callApi({ session, path, method = 'GET', requestBody = null, params = {}, responseHeaders = {}, // Will get the response heaaders
-     }) {
+    async callApi({ session, path, method = 'GET', requestBody = null, params = {}, responseHeaders = {}, }) {
         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('&');
@@ -239,7 +203,6 @@ class GitlabConnector {
         if (method === 'GET' && requestBody) {
             console.error('[GitlabConnector] Invalid GET request: GET requests should not have a body', { url, method, body: requestBody, params });
         }
-        // With or without body
         let response;
         const body = requestBody ? JSON.stringify(requestBody) : undefined;
         try {
@@ -254,12 +217,10 @@ class GitlabConnector {
                 });
             }
             response = await this.fetchWithRetry(url, requestBody && method !== 'GET' ? {
-                agent: this.getAgent(),
                 method,
                 headers,
                 body,
             } : {
-                agent: this.getAgent(),
                 method,
                 headers,
             });
@@ -274,11 +235,9 @@ class GitlabConnector {
                 session,
                 stack: e?.stack || new Error().stack,
             });
-            throw new types_1.ApiError(`Could not reach Gitlab API: ${e.message || e}`, 500);
+            throw new types_js_1.ApiError(`Could not reach Gitlab API: ${e.message || e}`, 500);
         }
-        // Pass the response headers to the caller
         response.headers.forEach((value, name) => responseHeaders[name] = value);
-        // Handle the case when the server returns a non-JSON response (e.g. 400 Bad Request)
         const text = await async function () {
             try {
                 return await response.text();
@@ -293,7 +252,7 @@ class GitlabConnector {
                     params,
                     error: e
                 });
-                throw new types_1.ApiError(`Gitlab API: Could not read response body (${e.message})`, 500);
+                throw new types_js_1.ApiError(`Gitlab API: Could not read response body (${e.message})`, 500);
             }
         }();
         if (!response.ok) {
@@ -307,10 +266,9 @@ class GitlabConnector {
                 responseText: text
             });
             if (text.includes('A file with this name doesn\'t exist')) {
-                throw new types_1.ApiError('Gitlab API: File not found', 404);
+                throw new types_js_1.ApiError('Gitlab API: File not found', 404);
             }
             else if (response.status === 401 && this.getSessionToken(session).token?.refresh_token) {
-                // Refresh the token
                 const token = this.getSessionToken(session).token;
                 const body = {
                     grant_type: 'refresh_token',
@@ -318,8 +276,7 @@ class GitlabConnector {
                     client_id: this.options.clientId,
                     client_secret: this.options.clientSecret,
                 };
-                const response = await (0, node_fetch_1.default)(this.options.domain + '/oauth/token', {
-                    agent: this.getAgent(),
+                const response = await fetch(this.options.domain + '/oauth/token', {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
@@ -352,7 +309,7 @@ class GitlabConnector {
                         refresh_token: token?.refresh_token
                     });
                     this.logout(session);
-                    throw new types_1.ApiError(`Gitlab API: Could not refresh token (${message})`, response.status);
+                    throw new types_js_1.ApiError(`Gitlab API: Could not refresh token (${message})`, response.status);
                 }
             }
             else {
@@ -367,11 +324,9 @@ class GitlabConnector {
                     responseText: text,
                     message
                 });
-                throw new types_1.ApiError(`Gitlab API error: ${message} (${text})`, response.status);
+                throw new types_js_1.ApiError(`Gitlab API error: ${message} (${text})`, response.status);
             }
         }
-        // Some endpoints (e.g. /jobs/:id/trace) return plain text rather than JSON.
-        // Skip JSON.parse when the server says the response isn't JSON.
         const contentType = response.headers.get('content-type') ?? '';
         if (response.ok && !contentType.includes('application/json')) {
             return text;
@@ -403,16 +358,12 @@ class GitlabConnector {
         const token = this.getSessionToken(session).token?.access_token;
         const domain = this.options.domain;
         const branch = this.options.branch;
-        // Construct the raw URL
-        // GET /projects/:id/repository/files/:file_path/raw
         const rawUrl = `${domain}/api/v4/projects/${projectId}/repository/files/${encodeURIComponent(filePath)}/raw?ref=${branch}&access_token=${token}`;
-        const fileRes = await this.fetchWithRetry(rawUrl, {
-            agent: this.getAgent(),
-        });
+        const fileRes = await this.fetchWithRetry(rawUrl, {});
         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);
+            throw new types_js_1.ApiError('GitLab returned HTML instead of file (unauthorized or not found).', 401);
         }
         if (!fileRes.ok) {
             const errText = await fileRes.text();
@@ -423,7 +374,7 @@ class GitlabConnector {
                     url: rawUrl,
                     responseText: errText
                 });
-                throw new types_1.ApiError(`GitLab raw file not found: filePath="${filePath}" (status ${fileRes.status})`, 404);
+                throw new types_js_1.ApiError(`GitLab raw file not found: filePath="${filePath}" (status ${fileRes.status})`, 404);
             }
             console.error('[GitlabConnector] Failed to fetch raw file from GitLab', {
                 filePath,
@@ -432,15 +383,15 @@ class GitlabConnector {
                 statusText: fileRes.statusText,
                 responseText: errText
             });
-            throw new types_1.ApiError(`Failed to fetch raw file from GitLab: filePath="${filePath}" - ${fileRes.statusText} (${errText})`, fileRes.status);
+            throw new types_js_1.ApiError(`Failed to fetch raw file from GitLab: filePath="${filePath}" - ${fileRes.statusText} (${errText})`, fileRes.status);
         }
         try {
-            const buffer = await fileRes.buffer();
+            const buffer = Buffer.from(await fileRes.arrayBuffer());
             return buffer;
         }
         catch (e) {
             console.error('[GitlabConnector] Error reading binary content from GitLab raw file', e);
-            throw new types_1.ApiError('Failed to read binary content from GitLab raw file', 500);
+            throw new types_js_1.ApiError('Failed to read binary content from GitLab raw file', 500);
         }
     }
     generateCodeVerifier() {
@@ -453,55 +404,34 @@ class GitlabConnector {
     async generateCodeChallenge(verifier) {
         const hashed = (0, crypto_1.createHash)('sha256').update(verifier).digest();
         let base64Url = hashed.toString('base64');
-        // Replace '+' with '-', '/' with '_', and remove '='
         base64Url = base64Url.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
         return base64Url;
     }
     getRedirect() {
         const params = `connectorId=${this.connectorId}&type=${this.connectorType}`;
-        return `${this.config.url}${constants_1.API_PATH}${constants_1.API_CONNECTOR_PATH}${constants_1.API_CONNECTOR_LOGIN_CALLBACK}?${params}`;
-    }
-    // Force IPv4 when running locally
-    getAgent() {
-        if (this.config.url.startsWith('http://localhost')) {
-            return new https_1.Agent({
-                family: 4,
-            });
-        }
-        return undefined;
+        return `${this.config.url}${constants_js_1.API_PATH}${constants_js_1.API_CONNECTOR_PATH}${constants_js_1.API_CONNECTOR_LOGIN_CALLBACK}?${params}`;
     }
-    // GitLab returns transient 5xx (e.g. 500, 503 "Upstream Gitaly has been exhausted")
-    // on raw-file fetches even for valid repos. Retry with exponential backoff + jitter.
     async fetchWithRetry(url, init = {}, maxRetries = 3) {
         let response;
         for (let attempt = 0; attempt <= maxRetries; attempt++) {
-            response = await (0, node_fetch_1.default)(url, init);
+            response = await fetch(url, init);
             if (response.status < 500 || attempt === maxRetries)
                 return response;
-            // Drain the body so the connection can be reused
             try {
                 await response.text();
             }
-            catch { /* ignore */ }
+            catch { }
             const backoffMs = Math.min(8000, 500 * Math.pow(2, attempt)) + Math.floor(Math.random() * 500);
             console.warn(`[GitlabConnector] GitLab returned ${response.status} on ${url.split('?')[0]}, retrying in ${backoffMs}ms (attempt ${attempt + 1}/${maxRetries})`);
             await new Promise(resolve => setTimeout(resolve, backoffMs));
         }
         return response;
     }
-    /**
-     * Get the OAuth URL to redirect the user to
-     * The URL should look like
-     * https://gitlab.example.com/oauth/authorize?client_id=APP_ID&redirect_uri=REDIRECT_URI&response_type=code&state=STATE&scope=REQUESTED_SCOPES&code_challenge=CODE_CHALLENGE&code_challenge_method=S256
-     * OAuth2 Step #1 from https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-with-proof-key-for-code-exchange-pkce
-     */
     async getOAuthUrl(session) {
         const redirect_uri = encodeURIComponent(this.getRedirect());
         const state = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
         const codeVerifier = this.generateCodeVerifier();
-        // Create the code challenge
         const codeChallenge = await this.generateCodeChallenge(codeVerifier);
-        // Store the code verifier and code challenge in the session
         this.setSessionToken(session, {
             ...this.getSessionToken(session),
             state,
@@ -520,7 +450,7 @@ class GitlabConnector {
         delete session[this.connectorId];
     }
     getOptions(formData) {
-        return {}; // FIXME: store branch
+        return {};
     }
     async getLoginForm(session, redirectTo) {
         return null;
@@ -531,15 +461,8 @@ class GitlabConnector {
     async isLoggedIn(session) {
         return !!this.getSessionToken(session).token;
     }
-    /**
-     * Get the token from return code
-     * Set the token in the session
-     * OAuth2 Step #2 from https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-with-proof-key-for-code-exchange-pkce
-     */
     async setToken(session, loginResult) {
         const sessionToken = this.getSessionToken(session);
-        // Handle state that may be JSON with redirect info or a plain string
-        // Redirect info is when the user is comming from the /fork/ page of the dashboard
         let receivedState = loginResult.state;
         try {
             const parsed = JSON.parse(loginResult.state);
@@ -548,22 +471,20 @@ class GitlabConnector {
             }
         }
         catch {
-            // Plain text
         }
         if (!receivedState || receivedState !== sessionToken?.state) {
             this.logout(session);
-            throw new types_1.ApiError('Invalid state', 401);
+            throw new types_js_1.ApiError('Invalid state', 401);
         }
         if (!sessionToken?.codeVerifier) {
             this.logout(session);
-            throw new types_1.ApiError('Missing code verifier', 401);
+            throw new types_js_1.ApiError('Missing code verifier', 401);
         }
         if (!sessionToken?.codeChallenge) {
             this.logout(session);
-            throw new types_1.ApiError('Missing code challenge', 401);
+            throw new types_js_1.ApiError('Missing code challenge', 401);
         }
-        const response = await (0, node_fetch_1.default)(this.options.domain + '/oauth/token', {
-            agent: this.getAgent(),
+        const response = await fetch(this.options.domain + '/oauth/token', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -578,17 +499,14 @@ class GitlabConnector {
             }),
         });
         const token = await response.json();
-        // Store the token in the session
         this.setSessionToken(session, {
             ...this.getSessionToken(session),
             token,
         });
-        // We need to get the user ID for listWebsites
         const user = await this.callApi({
             session,
             path: 'api/v4/user'
         });
-        // Store the user details in the session
         this.setSessionToken(session, {
             ...this.getSessionToken(session),
             userId: user.id,
@@ -607,16 +525,15 @@ class GitlabConnector {
             name: user.name,
             email: user.email,
             picture: user.avatar_url,
-            storage: await (0, connectors_1.toConnectorData)(session, this),
+            storage: await (0, connectors_js_1.toConnectorData)(session, this),
         };
     }
     async listWebsites(session) {
         const userId = this.getSessionToken(session).userId;
         if (!userId) {
             this.logout(session);
-            throw new types_1.ApiError('Missing Gitlab user ID. User not logged in?', 401);
+            throw new types_js_1.ApiError('Missing Gitlab user ID. User not logged in?', 401);
         }
-        // Handle multiple pages
         let page = 1;
         let totalPages = 1;
         const projects = [];
@@ -633,7 +550,6 @@ class GitlabConnector {
             });
             projects.push(...pageProjects);
             page++;
-            // Get the total number of pages from the response headers
             const total = responseHeaders['x-total-pages'];
             if (total) {
                 totalPages = parseInt(total, 10);
@@ -651,24 +567,15 @@ 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 websiteDataBuf = await this.downloadRawFile(session, websiteId, constants_1.WEBSITE_DATA_FILE);
+        const websiteDataBuf = await this.downloadRawFile(session, websiteId, constants_js_1.WEBSITE_DATA_FILE);
         const websiteDataContent = websiteDataBuf.toString('utf8');
-        // Use the common merge function to reconstruct website data
         const pageLoader = async (pagePath) => {
             const pageBuffer = await this.downloadRawFile(session, websiteId, pagePath);
             return pageBuffer.toString('utf8');
         };
-        return await (0, websiteDataSerialization_1.merge)(websiteDataContent, pageLoader);
+        return await (0, websiteDataSerialization_js_1.merge)(websiteDataContent, pageLoader);
     }
-    /**
-     * 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,
@@ -678,64 +585,39 @@ class GitlabConnector {
                 name: this.options.repoPrefix + websiteMeta.name,
             }
         });
-        await this.createFile(session, project.id, constants_1.WEBSITE_DATA_FILE, (0, websiteDataSerialization_1.stringify)(types_1.EMPTY_WEBSITE));
-        //await this.createFile(session, project.id, WEBSITE_META_DATA_FILE, JSON.stringify(websiteMeta))
-        //await this.updateWebsite(session, project.id, {} as WebsiteData)
-        //await this.setWebsiteMeta(session, project.id, websiteMeta)
+        await this.createFile(session, project.id, constants_js_1.WEBSITE_DATA_FILE, (0, websiteDataSerialization_js_1.stringify)(types_js_1.EMPTY_WEBSITE));
         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 batchActions = [];
-        // **
-        // Handle the legacy sites that have no pagesFolder
-        // We want them to use "pages/" by default despite their files being in "src/" for now
         let isLegacySite = !websiteData.pagesFolder;
-        // **
-        // Backward compatibility case
-        // The second time a legacy site is saved, the new `pages/` folder has been created
-        // but the front end still doesn't have the `pagesFolder` key
-        // This will be the case until the front end reloads
         if (isLegacySite) {
             const rootFiles = await this.ls({
                 session,
                 websiteId,
-                path: constants_1.WEBSITE_PAGES_FOLDER,
+                path: constants_js_1.WEBSITE_PAGES_FOLDER,
                 recursive: false,
             });
             if (rootFiles.size) {
-                // Here the new `pages/` folder has been created already
                 isLegacySite = false;
-                websiteData.pagesFolder = constants_1.WEBSITE_PAGES_FOLDER;
+                websiteData.pagesFolder = constants_js_1.WEBSITE_PAGES_FOLDER;
             }
         }
-        // **
-        // List existing files in the OLD pages folder (to detect files to delete)
         const existingFiles = await this.ls({
             session,
             websiteId,
-            path: (0, websiteDataSerialization_1.getPagesFolder)(websiteData),
+            path: (0, websiteDataSerialization_js_1.getPagesFolder)(websiteData),
             recursive: false,
         });
-        // **
-        // Force pagesFolder to 'pages' for writing if not defined
         if (isLegacySite) {
-            websiteData.pagesFolder = constants_1.WEBSITE_PAGES_FOLDER;
+            websiteData.pagesFolder = constants_js_1.WEBSITE_PAGES_FOLDER;
         }
-        // **
-        // Use the common split function to create files
-        const filesToWrite = (0, websiteDataSerialization_1.split)(websiteData);
-        // **
-        // Process each file to create/update
+        const filesToWrite = (0, websiteDataSerialization_js_1.split)(websiteData);
         for (const file of filesToWrite) {
             const filePath = file.path;
             const content = file.content;
             const newSha = computeGitBlobSha(content, false);
-            const existingSha = existingFiles.get(filePath) || (filePath === constants_1.WEBSITE_DATA_FILE ? 'always-update' : undefined);
+            const existingSha = existingFiles.get(filePath) || (filePath === constants_js_1.WEBSITE_DATA_FILE ? 'always-update' : undefined);
             if (existingSha) {
                 if (existingSha !== newSha) {
                     batchActions.push({
@@ -743,7 +625,7 @@ class GitlabConnector {
                         file_path: filePath,
                         content,
                     });
-                } // else: skip unchanged file
+                }
             }
             else {
                 batchActions.push({
@@ -753,8 +635,6 @@ class GitlabConnector {
                 });
             }
         }
-        // **
-        // Delete pages that are not in the new website data
         const pathsToWrite = filesToWrite.map(f => f.path);
         for (const filePath of existingFiles.keys()) {
             if (!pathsToWrite.includes(filePath)) {
@@ -764,8 +644,6 @@ class GitlabConnector {
                 });
             }
         }
-        // **
-        // Perform a batch commit
         return this.callApi({
             session,
             path: `api/v4/projects/${websiteId}/repository/commits`,
@@ -778,14 +656,12 @@ class GitlabConnector {
         });
     }
     async deleteWebsite(session, websiteId) {
-        // Delete repo
         await this.callApi({
             session,
             path: `api/v4/projects/${websiteId}`,
             method: 'DELETE',
         });
     }
-    // Fork the repo (user's own project)
     async duplicateWebsite(session, websiteId) {
         const meta = await this.getWebsiteMeta(session, websiteId);
         const forkName = `${meta.name} Copy ${new Date().toISOString().slice(0, 10)} ${Math.random().toString(36).substring(2, 4)}`;
@@ -796,29 +672,18 @@ class GitlabConnector {
             method: 'POST',
             requestBody: {
                 name: this.options.repoPrefix + forkName,
-                /* @ts-ignore */
                 path: safePath,
-                /* @ts-ignore */
                 namespace: meta.namespace?.id || undefined,
             },
         });
         return forkedProject.id;
     }
-    /**
-     * Fork an external/public GitLab project (from any user/organization)
-     * @param session - The user session
-     * @param gitlabUrl - The project path in the "username/repo" format
-     * @returns The new website ID (project ID)
-     */
     async forkWebsite(session, gitlabUrl) {
-        // Only accept "username/repo" pattern (no URLs)
         const projectPath = gitlabUrl.trim();
         if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(projectPath)) {
-            throw new types_1.ApiError('Invalid project path. Use the "username/repo" format.', 400);
+            throw new types_js_1.ApiError('Invalid project path. Use the "username/repo" format.', 400);
         }
-        // URL-encode the project path for the API
         const encodedPath = encodeURIComponent(projectPath);
-        // First, get the source project info to extract its name
         let sourceProject;
         try {
             sourceProject = await this.callApi({
@@ -829,30 +694,26 @@ class GitlabConnector {
         }
         catch (e) {
             if (e.httpStatusCode === 404) {
-                throw new types_1.ApiError(`Project not found: ${projectPath}. Make sure the project exists and is public or you have access to it.`, 404);
+                throw new types_js_1.ApiError(`Project not found: ${projectPath}. Make sure the project exists and is public or you have access to it.`, 404);
             }
             throw e;
         }
-        // Generate a unique name for the fork
         const sourceName = sourceProject.name.replace(this.options.repoPrefix, '');
         const forkName = `${sourceName} ${new Date().toISOString().slice(0, 10)} ${Math.random().toString(36).substring(2, 4)}`;
         const safePath = sanitizeGitlabPath(this.options.repoPrefix + forkName);
-        // Fork the project to the user's namespace
         const forkedProject = await this.callApi({
             session,
             path: `api/v4/projects/${encodedPath}/fork`,
             method: 'POST',
             requestBody: {
                 name: this.options.repoPrefix + forkName,
-                /* @ts-ignore */
                 path: safePath,
                 visibility: 'private',
             },
         });
-        // Wait for the fork to complete (GitLab forks asynchronously)
         const forkedProjectId = forkedProject.id.toString();
-        const maxAttempts = 30; // 30 attempts * 2 seconds = 60 seconds max
-        const pollInterval = 2000; // 2 seconds
+        const maxAttempts = 30;
+        const pollInterval = 2000;
         for (let attempt = 0; attempt < maxAttempts; attempt++) {
             const project = await this.callApi({
                 session,
@@ -863,9 +724,8 @@ class GitlabConnector {
                 return forkedProjectId;
             }
             if (project.import_status === 'failed') {
-                throw new types_1.ApiError(`Fork failed: ${project.import_error || 'Unknown error'}`, 500);
+                throw new types_js_1.ApiError(`Fork failed: ${project.import_error || 'Unknown error'}`, 500);
             }
-            // Status is 'scheduled' or 'started', wait and retry
             await new Promise(resolve => setTimeout(resolve, pollInterval));
         }
         return forkedProjectId;
@@ -875,24 +735,19 @@ class GitlabConnector {
             session,
             path: `api/v4/projects/${websiteId}`
         });
-        // Defaults
         let pagesUrl = undefined;
         let pagesVisibility = undefined;
         let lastJob = undefined;
-        // Try to get GitLab Pages info
         try {
             const pages = await this.callApi({
                 session,
                 path: `api/v4/projects/${websiteId}/pages`
             });
             pagesUrl = pages.url;
-            // pages.access_control_level may be present; fallback to project.visibility if not
             pagesVisibility = pages.access_control_level || project.visibility;
         }
         catch (e) {
-            // If pages are not enabled or call fails, ignore and leave undefined
         }
-        // Try to get last relevant job (prefer 'pages' job, otherwise most recent job)
         try {
             const jobs = await this.callApi({
                 session,
@@ -914,9 +769,7 @@ class GitlabConnector {
             }
         }
         catch (e) {
-            // With no jobs, leave lastJob undefined
         }
-        // Fork info - fetch the forked-from project to get license
         let forkedFrom = undefined;
         if (project.forked_from_project) {
             let license = undefined;
@@ -929,7 +782,6 @@ class GitlabConnector {
                 license = templateProject.license?.name || templateProject.license?.nickname || templateProject.license?.key;
             }
             catch (e) {
-                // Template may be private or inaccessible
             }
             forkedFrom = {
                 id: String(project.forked_from_project.id),
@@ -958,7 +810,6 @@ class GitlabConnector {
         return result;
     }
     async setWebsiteMeta(session, websiteId, websiteMeta) {
-        // Rename the repo if needed
         const oldMeta = await this.getWebsiteMeta(session, websiteId);
         if (websiteMeta.name !== oldMeta.name) {
             await this.callApi({
@@ -972,20 +823,18 @@ class GitlabConnector {
         }
     }
     async writeAssets(session, websiteId, files, status, removeUnlisted = false) {
-        status && await status({ message: `Preparing ${files.length} files`, status: types_1.JobStatus.IN_PROGRESS });
-        // List all the files in assets folder
+        status && await status({ message: `Preparing ${files.length} files`, status: types_js_1.JobStatus.IN_PROGRESS });
         const existingFiles = await this.ls({
             session,
             websiteId,
             recursive: true,
             path: this.options.assetsFolder,
         });
-        // Create the actions for the batch
         const filesToUpload = [];
         const filesToKeep = new Set(files.map(file => this.getAssetPath(file.path, false)));
         for (const file of files) {
             const filePath = this.getAssetPath(file.path, false);
-            const content = (await (0, connectors_1.contentToBuffer)(file.content)).toString('base64');
+            const content = (await (0, connectors_js_1.contentToBuffer)(file.content)).toString('base64');
             const existingSha = existingFiles.get(filePath);
             const newSha = computeGitBlobSha(content, true);
             if (existingSha) {
@@ -996,7 +845,7 @@ class GitlabConnector {
                         content,
                         encoding: 'base64',
                     });
-                } // else: skip unchanged file
+                }
             }
             else {
                 filesToUpload.push({
@@ -1007,7 +856,6 @@ class GitlabConnector {
                 });
             }
         }
-        // Optionally remove unlisted files
         if (removeUnlisted) {
             for (const [existingFilePath] of existingFiles) {
                 if (!filesToKeep.has(existingFilePath)) {
@@ -1018,25 +866,22 @@ class GitlabConnector {
                 }
             }
         }
-        // Split the files into chunks to avoid the number of files limit
         const chunks = [];
         for (let i = 0; i < filesToUpload.length; i += MAX_BATCH_UPLOAD_SIZE) {
             chunks.push(filesToUpload.slice(i, i + MAX_BATCH_UPLOAD_SIZE));
         }
-        // Notify the user if nothing changed
         if (chunks.length === 0) {
             console.info('No files to upload');
-            status && await status({ message: 'No files to upload', status: types_1.JobStatus.SUCCESS });
+            status && await status({ message: 'No files to upload', status: types_js_1.JobStatus.SUCCESS });
             return;
         }
-        // Upload the files in chunks
         for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
             const chunk = chunks[chunkIndex];
             if (chunks.length > 1) {
-                status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Uploading ${chunk.length} files`, status: types_1.JobStatus.IN_PROGRESS });
+                status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Uploading ${chunk.length} files`, status: types_js_1.JobStatus.IN_PROGRESS });
             }
             else {
-                status && await status({ message: `Uploading ${files.length} file(s)`, status: types_1.JobStatus.IN_PROGRESS });
+                status && await status({ message: `Uploading ${files.length} file(s)`, status: types_js_1.JobStatus.IN_PROGRESS });
             }
             try {
                 await this.callApi({
@@ -1052,11 +897,11 @@ class GitlabConnector {
             }
             catch (e) {
                 console.error(`Batch ${chunkIndex + 1} failed`, e);
-                status && await status({ message: `Error in batch ${chunkIndex + 1}`, status: types_1.JobStatus.ERROR });
+                status && await status({ message: `Error in batch ${chunkIndex + 1}`, status: types_js_1.JobStatus.ERROR });
                 throw e;
             }
         }
-        status && await status({ message: `All ${files.length} files uploaded`, status: types_1.JobStatus.SUCCESS });
+        status && await status({ message: `All ${files.length} files uploaded`, status: types_js_1.JobStatus.SUCCESS });
     }
     async readAsset(session, websiteId, fileName) {
         const finalPath = this.getAssetPath(fileName, false);
@@ -1078,35 +923,6 @@ class GitlabConnector {
             }
         });
     }
-    /*
-     * 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
-    //  }
-    //}
-    /**
-     * List all the files in a folder
-     * The result is a map of file paths to their SHA
-     */
     async ls({ session, websiteId, recursive = false, path, }) {
         const existingPaths = new Map();
         let page = 1;
@@ -1131,25 +947,18 @@ class GitlabConnector {
                 });
             }
             catch (e) {
-                // Allow 404 errors
-                // This happens when the folder does not exist
-                // In git this just means the files don't exist yet
                 if (e.statusCode !== 404 && e.httpStatusCode !== 404) {
                     throw e;
                 }
             }
-            // Filter the files
             tree
                 .filter(item => item.type === 'blob')
                 .forEach(item => existingPaths.set(item.path, item.id));
-            // Check if we need to keep going
             const maxPages = responseHeaders['x-total-pages'] ? parseInt(responseHeaders['x-total-pages'], 10) : 1;
             keepGoing = page < maxPages;
             page++;
         }
-        // Return the set of existing paths
         return existingPaths;
     }
 }
 exports.default = GitlabConnector;
-//# sourceMappingURL=GitlabConnector.js.map