@speedkit/cli 2.72.0 → 2.73.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.73.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.73.0...v2.73.1) (2025-01-08)
+
+
+### Bug Fixes
+
+* **onboarding:** fallback to utf8 if unsupported charset is detected ([425cfb4](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/425cfb46862e5f1b7ed722fb9e603a98171f4398))
+* **onboarding:** implement iconv-lite to get rid of charsetIssues ([1a0db84](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/1a0db846c0461fc9faec25d041f8dc46f5b33252))
+
+# [2.73.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.72.0...v2.73.0) (2025-01-08)
+
+
+### Features
+
+* **customer-config:** add blacklist rule for kameleoon's graphical editor mode ([1bf310a](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/1bf310aba197e6f562c444a7ad590f28dbc47004))
+
 # [2.72.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.71.0...v2.72.0) (2024-12-18)
 
 

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.72.0 linux-x64 node-v20.18.1
+@speedkit/cli/2.73.1 linux-x64 node-v20.18.1
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/services/customer-config/templates/config_SpeedKit.js.hbs

@@ -204,6 +204,7 @@
         url: [
           /[?&](_=1\d{12})/, // jQuery code execution callbacks
           /[?&]nocache/i,
+          /[?&]kameleoon=true/i, // = Kameleoon's graphical editor mode is active
 
           // GTM:
           "www.googletagmanager.com/gtm.js",

package/dist/services/onboarding/fetch-events/customer-domain-document-response.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomerDomainDocumentResponse = void 0;
+const tslib_1 = require("tslib");
 const onboarding_model_1 = require("../onboarding-model");
 const origin_response_1 = require("../browser/origin-response");
+const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
+const SUPPORTED_CHARSETS = new Set(["ascii", "utf8", "utf16le", "latin1"]);
 /**
  * Intercepts any request to the customersOrigin and equivalent requests to baqendAssetApi
  * @implements {FetchRequestPausedEventHandler}
@@ -59,7 +62,11 @@ class CustomerDomainDocumentResponse {
         if (!this.isHtmlContentHeader(event.responseHeaders)) {
             return;
         }
-        let text = await this.getHtmlContent(client, event);
+        const contentType = event.responseHeaders.find((headerRecord) => {
+            return headerRecord.name.toLowerCase() === "content-type";
+        })?.["value"] || "";
+        const charset = contentType.split("charset=")?.[1]?.trim() || "utf-8";
+        let text = await this.getHtmlContent(client, event, charset);
         if (!this.isValidHtmlContent(text)) {
             return;
         }
@@ -75,6 +82,12 @@ class CustomerDomainDocumentResponse {
         const content = this.removeContentSecurityPolicy
             ? this.removeContentSecurityMetaTag(text)
             : text;
+        // replace origin contentTypeCharset with utf-8 as this is what it's converted to now
+        for (const header of headers) {
+            if (header.name.toLowerCase().includes("content-type")) {
+                header.value = header.value.replace(charset, "utf-8");
+            }
+        }
         return new origin_response_1.OriginResponse(content, headers, event.responseStatusCode);
     }
     isValidHtmlContent(text) {
@@ -92,18 +105,19 @@ class CustomerDomainDocumentResponse {
         })?.["value"];
         return contentType && contentType.includes("text/html");
     }
-    async getHtmlContent(client, event) {
-        const contentType = event.responseHeaders.find((headerRecord) => {
-            return headerRecord.name.toLowerCase() === "content-type";
-        })?.["value"] || "";
-        let charset = contentType.split("charset=")?.[1] || "utf-8";
+    async getHtmlContent(client, event, charset) {
         const { body, base64Encoded } = await client.send("Fetch.getResponseBody", {
             requestId: event.requestId,
         });
+        // create text from base64Encoded
         if (base64Encoded) {
-            if (charset.includes("ISO-8859")) {
-                charset = "latin1";
+            // make use of iconv if charset is not supported by node:buffer
+            if (!SUPPORTED_CHARSETS.has(charset)) {
+                return iconv_lite_1.default
+                    .decode(Buffer.from(body, "base64"), charset.toLowerCase())
+                    .toString();
             }
+            // @ts-expect-error string is not valid
             return Buffer.from(body, "base64").toString(charset);
         }
         return body;

package/dist/services/onboarding/virtual-orestes-app/index.d.ts

@@ -13,6 +13,7 @@ export declare class VirtualOrestesApp {
     private cli;
     constructor(customerConfig: CustomerConfig, crawler: Crawler, documentHandler: DocumentHandlerServer, cache: Cache, cli: CliService);
     fetchAssetResponse(event: Protocol.Fetch.RequestPausedEvent): Promise<Partial<Protocol.Fetch.FulfillRequestRequest> | AbortResponse>;
+    private getResponseText;
     private returnErrorResponse;
     private convertResponseHeadersToOrestesFormat;
     private returnRedirect;

package/dist/services/onboarding/virtual-orestes-app/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VirtualOrestesApp = void 0;
+const tslib_1 = require("tslib");
 const baqend_response_1 = require("../browser/baqend-response");
 const safe_1 = require("../../../helpers/safe");
 const onboarding_model_1 = require("../onboarding-model");
+const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
 class VirtualOrestesApp {
     customerConfig;
     crawler;
@@ -44,7 +46,7 @@ class VirtualOrestesApp {
         if (response.status > 300 && response.status < 400) {
             return this.returnRedirect(customHeaders, response, event);
         }
-        const responseContent = await response.text();
+        const responseContent = await this.getResponseText(response);
         if (!this.isHtmlContentHeader(response.headers) ||
             !this.isValidHtmlContent(responseContent)) {
             const customResponse = new baqend_response_1.BaqendResponse(responseContent, response.headers.get("Content-Type") || null, customHeaders);
@@ -78,6 +80,16 @@ class VirtualOrestesApp {
         this.cache.addEntry(event.request.url, baqendResponse);
         return baqendResponse;
     }
+    async getResponseText(response) {
+        const contentType = response.headers.get("content-type") || "";
+        const charset = contentType.split("charset=")?.[1]?.trim() || "utf-8";
+        if (charset.toLowerCase() !== "utf-8") {
+            return iconv_lite_1.default
+                .decode(Buffer.from(await response.arrayBuffer()), charset.toLowerCase())
+                .toString();
+        }
+        return await response.text();
+    }
     returnErrorResponse(customResponse, customHeaders) {
         const message = `Could not transform html: - ${customResponse.error}`;
         this.cli.writeError(`[VirtualOrestes]: ${message}`);

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.72.0"
+  "version": "2.73.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.72.0",
+  "version": "2.73.1",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -70,14 +70,14 @@
     "@oclif/core": "^3.23",
     "@oclif/plugin-autocomplete": "^3.0",
     "@oclif/plugin-help": "^6.2.19",
-    "@oclif/plugin-not-found": "^3.2.30",
-    "@oclif/plugin-warn-if-update-available": "^3.1.26",
+    "@oclif/plugin-not-found": "^3.2.31",
+    "@oclif/plugin-warn-if-update-available": "^3.1.28",
     "baqend": "^4.1.0",
     "chalk": "^4.1.2",
     "clipboardy-cjs": "^3.0.0",
     "css-select": "5.1.0",
     "deepmerge": "^4.3.1",
-    "diff": "^5.1.0",
+    "diff": "^5.2.0",
     "dom-serializer": "2.0.0",
     "domhandler": "5.0.3",
     "domutils": "^3.1",
@@ -96,7 +96,8 @@
     "strip-comments": "^2.0.1",
     "uuid": "^9.0.1",
     "esbuild": "^0.20.2",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "iconv-lite": "^0.6.3"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.8.1",
@@ -106,7 +107,7 @@
     "@oclif/test": "^3",
     "@types/chai": "^4.3.10",
     "@types/fs-extra": "^9.0.13",
-    "@types/mocha": "^10.0",
+    "@types/mocha": "^10.0.10",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^20.12.7",
     "@types/uuid": "^9.0.8",
@@ -121,7 +122,7 @@
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
     "memfs": "^4.8.0",
-    "mocha": "^10.1.0",
+    "mocha": "^10.8.2",
     "mocha-junit-reporter": "^2.2.1",
     "mock-fs": "^5.2.0",
     "nock": "^13.5.6",