@speedkit/cli 2.62.1 → 2.64.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [2.64.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.63.0...v2.64.0) (2024-11-01)
+
+
+### Features
+
+* **deploy:** add preDeployCheck for customVariation and customDevice ([eda9271](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/eda92715c21963a97b907795fecaa06e579d5629))
+
+# [2.63.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.62.1...v2.63.0) (2024-11-01)
+
+
+### Bug Fixes
+
+* create dashboardEndpoint also without aws-credentials ([38ccbf9](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/38ccbf9d83b9d9fc3d37cbcbe3196e1509ffdaff))
+
+
+### Features
+
+* **onboarding:** make documentHandler errors more verbose ([cfb7e44](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/cfb7e448491ae7469addfd2370167a303f381851))
+
 ## [2.62.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.62.0...v2.62.1) (2024-11-01)
 
 

package/README.md

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

package/dist/helpers/safe.js

@@ -13,10 +13,14 @@ async function safeAsync(promise) {
         return { data, success: true };
     }
     catch (error) {
-        if (error instanceof Error) {
+        if (error instanceof Error || isError(error)) {
             return { success: false, error: error.message, errorObj: error };
         }
-        return { success: false, error: "Something went wrong", errorObj: error };
+        return {
+            success: false,
+            error: "Something went wrong: " + error?.message,
+            errorObj: error,
+        };
     }
 }
 function safeSync(function_) {
@@ -25,9 +29,18 @@ function safeSync(function_) {
         return { data, success: true };
     }
     catch (error) {
-        if (error instanceof Error) {
+        if (error instanceof Error || isError(error)) {
             return { success: false, error: error.message, errorObj: error };
         }
         return { success: false, error: "Something went wrong", errorObj: error };
     }
 }
+function isError(error) {
+    if (!("message" in error)) {
+        return false;
+    }
+    if (!("stack" in error)) {
+        return false;
+    }
+    return true;
+}

package/dist/services/deploy/checks/pre-deploy/device-detection-changed-check.d.ts

@@ -0,0 +1,18 @@
+import { FileListInterface, CustomerConfig } from "../../../integration-api";
+import { CliServiceInterface } from "../../../cli";
+import { ConfigApiService } from "../../../config-api";
+export declare class DeviceDetectionChangedCheck {
+    private cli;
+    private fileList;
+    private configApi;
+    private customerConfig;
+    private configName;
+    private isProduction;
+    constructor(cli: CliServiceInterface, fileList: FileListInterface, configApi: ConfigApiService, customerConfig: CustomerConfig, configName: string, isProduction: boolean);
+    check(): Promise<void>;
+    private checkForChangedDeviceDetection;
+    private evaluateLocalAndRemoteSpeedKit;
+    private getActiveInstallResource;
+    private buildBrowserMock;
+    safeFileContentWrapper(fileContent: string): string;
+}

package/dist/services/deploy/checks/pre-deploy/device-detection-changed-check.js

@@ -0,0 +1,189 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceDetectionChangedCheck = void 0;
+const tslib_1 = require("tslib");
+const cli_1 = require("../../../cli");
+const files_1 = require("../../../../models/files");
+const vm = tslib_1.__importStar(require("node:vm"));
+const safe_1 = require("../../../../helpers/safe");
+const evaluate_sk_config_error_1 = require("../../error/evaluate-sk-config-error");
+class DeviceDetectionChangedCheck {
+    cli;
+    fileList;
+    configApi;
+    customerConfig;
+    configName;
+    isProduction;
+    constructor(cli, fileList, configApi, customerConfig, configName, isProduction) {
+        this.cli = cli;
+        this.fileList = fileList;
+        this.configApi = configApi;
+        this.customerConfig = customerConfig;
+        this.configName = configName;
+        this.isProduction = isProduction;
+    }
+    async check() {
+        if (
+        // do not check for environments other than production
+        !this.isProduction ||
+            // do not check if speedKitConfigFile is not to be deployed
+            !this.fileList.hasFile(files_1.INTEGRATION_FILES.CONFIG.SPEED_KIT) ||
+            this.fileList
+                .getByName(files_1.INTEGRATION_FILES.CONFIG.SPEED_KIT)
+                .shouldSkipFile()) {
+            return;
+        }
+        const activeInstallResource = await this.getActiveInstallResource();
+        // do not check if there is no active install resource to be updated
+        if (!activeInstallResource) {
+            return;
+        }
+        this.cli.startAction("Checking for customDeviceDetection");
+        const speedKitConfigFile = this.fileList.getByName(files_1.INTEGRATION_FILES.CONFIG.SPEED_KIT);
+        const activeSpeedKitConfig = activeInstallResource[speedKitConfigFile.remoteKey];
+        const changesResponse = (0, safe_1.safe)(() => {
+            return this.checkForChangedDeviceDetection(speedKitConfigFile, activeSpeedKitConfig);
+        });
+        if (changesResponse.success === false) {
+            this.cli.endAction(cli_1.CliActionStatus.FAILED);
+            this.cli.writeError(`Unable to evaluate changes: ${changesResponse.error}`);
+            return;
+        }
+        const changes = changesResponse.data.map((value) => {
+            return "config_SpeedKit." + value;
+        });
+        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+        if (changes.length === 0) {
+            return;
+        }
+        // this.cli.table(changes, { origin: {}, type: {}, old: {}, new: {} });
+        const result = await this.cli.confirm(`Detected change in ${changes.join(" | ")}. ${this.cli.style.red("Was this checked by QA?")}`, false);
+        if (!result) {
+            this.cli.exit(0);
+        }
+    }
+    checkForChangedDeviceDetection(speedKitConfigFile, activeSpeedKitConfig) {
+        const changes = [];
+        const { localSpeedKit, remoteSpeedKit } = this.evaluateLocalAndRemoteSpeedKit(this.customerConfig.origins[0], speedKitConfigFile, activeSpeedKitConfig);
+        if ((localSpeedKit.detectDevice && !remoteSpeedKit.detectDevice) ||
+            (!localSpeedKit.detectDevice && remoteSpeedKit.detectDevice)) {
+            changes.push("detectDevice");
+        }
+        if (localSpeedKit.detectDevice &&
+            remoteSpeedKit.detectDevice &&
+            localSpeedKit.detectDevice.toString() !==
+                remoteSpeedKit.detectDevice.toString()) {
+            changes.push("detectDevice");
+        }
+        if ((localSpeedKit.customVariation && !remoteSpeedKit.customVariation) ||
+            (!localSpeedKit.customVariation && remoteSpeedKit.customVariation)) {
+            changes.push("customVariation");
+        }
+        if (localSpeedKit.customVariation && remoteSpeedKit.customVariation) {
+            const localFunctionsAsString = localSpeedKit.customVariation
+                .map((rule) => {
+                return rule.variationFunction.toString();
+            })
+                .join("|");
+            const remoteFunctionsAsString = remoteSpeedKit.customVariation
+                .map((rule) => {
+                return rule.variationFunction.toString();
+            })
+                .join("|");
+            if (localFunctionsAsString !== remoteFunctionsAsString) {
+                changes.push("customVariation");
+            }
+        }
+        return changes;
+    }
+    evaluateLocalAndRemoteSpeedKit(origin, speedKitConfigFile, activeSpeedKitConfig) {
+        const localBrowserContext = this.buildBrowserMock(origin, this.customerConfig.app);
+        vm.runInNewContext(this.safeFileContentWrapper(speedKitConfigFile.getContent()), localBrowserContext, {
+            filename: speedKitConfigFile.path,
+            displayErrors: false,
+            breakOnSigint: true,
+        });
+        const remoteBrowserContext = this.buildBrowserMock(origin, this.customerConfig.app);
+        vm.runInNewContext(this.safeFileContentWrapper(activeSpeedKitConfig), remoteBrowserContext, {
+            displayErrors: false,
+            breakOnSigint: true,
+        });
+        if (localBrowserContext.vmError !== null) {
+            throw new evaluate_sk_config_error_1.EvaluateSkConfigError(`[config_Speedkit.js] ${localBrowserContext.vmError?.message}`);
+        }
+        if (remoteBrowserContext.vmError !== null) {
+            throw new evaluate_sk_config_error_1.EvaluateSkConfigError(`[remote_config] ${JSON.stringify(remoteBrowserContext.vmError?.message)}`);
+        }
+        const localSpeedKit = localBrowserContext.window.speedKit;
+        const remoteSpeedKit = remoteBrowserContext.window.speedKit;
+        return { localSpeedKit, remoteSpeedKit };
+    }
+    async getActiveInstallResource() {
+        const activeInstallResourceResponse = await (0, safe_1.safe)(this.configApi.getActiveInstall(this.configName));
+        if (activeInstallResourceResponse.success !== true) {
+            this.cli.endAction(cli_1.CliActionStatus.FAILED);
+            this.cli.writeError("Could not load active install resource");
+            this.cli.exit(1);
+            return;
+        }
+        return activeInstallResourceResponse.data;
+    }
+    buildBrowserMock(origin, app) {
+        const originUrl = new URL(origin);
+        const window = {
+            location: originUrl,
+            APP: app,
+            speedKit: {
+                split: undefined,
+                splitTestId: undefined,
+            },
+            serviceWorkerUrl: "",
+            screen: { width: 0, height: 0 },
+            devicePixelRatio: 1,
+            navigator: {
+                userAgent: "",
+                connection: {},
+                cookieEnabled: false,
+                languages: [],
+                online: true,
+            },
+            top: {},
+        };
+        window.top = window;
+        const document = {
+            cookie: "",
+            querySelector: () => { },
+            querySelectorAll: () => { },
+            createElement: () => { },
+            addEventListener: () => { },
+            head: {},
+            body: {},
+        };
+        document.head = document;
+        document.body = document;
+        return {
+            vmError: null,
+            ...window,
+            window,
+            document,
+            navigator: { userAgent: "" },
+            localStorage: {
+                getItem: () => { },
+                setItem: () => { },
+            },
+            JSON: JSON,
+            decodeURIComponent: decodeURIComponent,
+            URL: URL,
+        };
+    }
+    safeFileContentWrapper(fileContent) {
+        return `
+      try{
+        ${fileContent}
+      } catch (error){
+        vmError = error
+      }
+    `;
+    }
+}
+exports.DeviceDetectionChangedCheck = DeviceDetectionChangedCheck;

package/dist/services/deploy/deploy-service-factory.js

@@ -17,6 +17,7 @@ const integration_api_1 = require("../integration-api");
 const split_change_check_1 = require("./checks/pre-deploy/split-change-check");
 const config_api_1 = require("../config-api");
 const deprecated_deployment_detection_check_1 = require("./checks/post-deploy/deprecated-deployment-detection-check");
+const device_detection_changed_check_1 = require("./checks/pre-deploy/device-detection-changed-check");
 class DeployServiceFactory {
     context;
     cliConfig;
@@ -50,6 +51,7 @@ class DeployServiceFactory {
             new server_config_handler_1.default(configApi, diffService, cliService),
         ], cliService, [
             new split_change_check_1.SplitChangeCheck(cliService, files, configApi, customer, configName, this.context.isProduction),
+            new device_detection_changed_check_1.DeviceDetectionChangedCheck(cliService, files, configApi, customer, configName, this.context.isProduction),
         ], this.getPostDeployChecks(files, cliService, configApi, customer.app), this.context.dryRun);
     }
     getConfigApi(app) {

package/dist/services/deploy/deploy-service-model.d.ts

@@ -10,3 +10,20 @@ export type Change = {
     old: string;
     new: string;
 };
+export type speedKitVariationRule = {
+    contentType?: string[];
+    host?: string[];
+    pathname?: Array<string | RegExp>;
+    url?: Array<string | RegExp>;
+};
+export type speedKitVariationRules = {
+    rules?: speedKitVariationRule;
+    variationFunction: (request: Request, device: string, cookies: Map<string, string>) => string;
+};
+export type speedKit = {
+    split: number;
+    splitTestId: string;
+    userAgentDetection?: boolean;
+    detectDevice?: (doc: Document) => string | null;
+    customVariation?: speedKitVariationRules[];
+};

package/dist/services/document-handler-runtime/document-handler-server.js

@@ -6,7 +6,6 @@ const document_handler_runtime_context_1 = require("./context/document-handler-r
 const required_file_not_found_error_1 = tslib_1.__importDefault(require("./error/required-file-not-found-error"));
 const database_mock_1 = tslib_1.__importDefault(require("./templates/database-mock"));
 const vm = tslib_1.__importStar(require("node:vm"));
-const vm_error_1 = require("../onboarding/error/vm-error");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const files_1 = require("../../models/files");
 // documentHandlerDependencies
@@ -15,6 +14,7 @@ const request_1 = require("./server/request");
 const document_handler_response_1 = require("./server/document-handler-response");
 const safe_1 = require("../../helpers/safe");
 const vm_empty_response_error_1 = require("../onboarding/error/vm-empty-response-error");
+const document_handler_transform_error_1 = require("../onboarding/error/document-handler-transform-error");
 class DocumentHandlerServer {
     customerConfig;
     files;
@@ -50,6 +50,7 @@ class DocumentHandlerServer {
             CUSTOM_STYLES: this.getStyles(),
             ...this.getContextVars(),
             ...this.createNodeVmContext(),
+            skErrorContext: {},
         };
         const customDocumentHandlerFile = this.files.getByName(files_1.INTEGRATION_FILES.CUSTOM.DOCUMENT_HANDLER);
         if (customDocumentHandlerFile.path) {
@@ -77,10 +78,10 @@ class DocumentHandlerServer {
             }
             return vmResponse.data;
         }
-        throw new vm_error_1.VmError(vmResponse.error + JSON.stringify(vmResponse.errorObj));
+        throw new document_handler_transform_error_1.DocumentHandlerTransformError(vmResponse.errorObj);
     }
     getTransformFunctionWrapper() {
-        return `\n\npost(db, skInternalRequest, skInternalResponse).catch((err)=>{reject(err);});`;
+        return `\n\npost(db, skInternalRequest, skInternalResponse).catch((error)=>reject(error));`;
     }
     async buildDocumentHandler() {
         this.documentHandlerCode = await this.getDocumentHandler();

package/dist/services/onboarding/dashboard/diff-against-current-page.d.ts

@@ -1,10 +1,12 @@
 import { DiffService } from "../../diff";
 import { DocumentHandlerServer } from "../../document-handler-runtime/document-handler-server";
 import { Crawler } from "../virtual-orestes-app/crawler";
+import { CliService } from "../../cli";
 export declare class DiffAgainstCurrentPage {
     private diffService;
     private documentHandlerRuntime;
     private crawler;
-    constructor(diffService: DiffService, documentHandlerRuntime: DocumentHandlerServer, crawler: Crawler);
+    private cli;
+    constructor(diffService: DiffService, documentHandlerRuntime: DocumentHandlerServer, crawler: Crawler, cli: CliService);
     postDiff(currentHtml: string, currentUrl: string, variant?: string, transform?: boolean): Promise<boolean>;
 }

package/dist/services/onboarding/dashboard/diff-against-current-page.js

@@ -1,21 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiffAgainstCurrentPage = void 0;
+const cli_1 = require("../../cli");
 class DiffAgainstCurrentPage {
     diffService;
     documentHandlerRuntime;
     crawler;
-    constructor(diffService, documentHandlerRuntime, crawler) {
+    cli;
+    constructor(diffService, documentHandlerRuntime, crawler, cli) {
         this.diffService = diffService;
         this.documentHandlerRuntime = documentHandlerRuntime;
         this.crawler = crawler;
+        this.cli = cli;
     }
     async postDiff(currentHtml, currentUrl, variant = "DEFAULT", transform = false) {
+        this.cli.writeWarning(`received diff for url: ${currentUrl}`);
+        this.cli.startAction(`fetch remote`);
         const originResponse = await this.crawler.fetchRemote(currentUrl, variant.toUpperCase());
         let originHtml = await originResponse?.text();
         if (!originHtml) {
+            this.cli.endAction(cli_1.CliActionStatus.FAILED);
             throw new Error("Could not fetch remote page");
         }
+        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+        this.cli.startAction(`transform documents`);
         if (transform) {
             // todo check if the currentHTML is already transformed
             const currentDocumentHandlerResponse = await this.documentHandlerRuntime.transform(currentHtml, variant, currentUrl, {});
@@ -23,6 +31,7 @@ class DiffAgainstCurrentPage {
             const originDocumentHandlerResponse = await this.documentHandlerRuntime.transform(originHtml, variant, currentUrl, {});
             originHtml = originDocumentHandlerResponse.body;
         }
+        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
         const remoteFilePath = await this.diffService.writeContentToTemporalFile(`remote-${variant}`, originHtml);
         const localFilePath = await this.diffService.writeContentToTemporalFile("current", currentHtml);
         return await this.diffService.executeDiff(localFilePath, remoteFilePath);

package/dist/services/onboarding/error/document-handler-transform-error.d.ts

@@ -0,0 +1,3 @@
+export declare class DocumentHandlerTransformError extends Error {
+    constructor(error: Error);
+}

package/dist/services/onboarding/error/document-handler-transform-error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentHandlerTransformError = void 0;
+class DocumentHandlerTransformError extends Error {
+    constructor(error) {
+        super(error.message);
+        this.stack = error.stack;
+        this.cause = error.cause;
+    }
+}
+exports.DocumentHandlerTransformError = DocumentHandlerTransformError;

package/dist/services/onboarding/onboarding-service-factory.js

@@ -124,14 +124,12 @@ class OnboardingServiceFactory {
             new speed_kit_install_js_1.SpeedKitInstallJs(customerConfig, files.getByName(files_1.INTEGRATION_FILES.BUILD.INSTALL)),
             new customer_service_worker_js_1.CustomerServiceWorkerJs(customerConfig),
             new speed_kit_service_worker_js_1.SpeedKitServiceWorkerJs(customerConfig, files.getByName(files_1.INTEGRATION_FILES.CUSTOM.SW)),
+            new dashboard_request_1.DashboardRequest(new dashboard_1.Dashboard(customerConfig, parameterQueryBuilder, athenaClient, requestDiffService, new diff_against_current_page_1.DiffAgainstCurrentPage(DiffService, documentHandler, crawler, cli), cache)),
         ];
         if (this.context.local) {
             const orestesApp = new virtual_orestes_app_1.VirtualOrestesApp(customerConfig, crawler, documentHandler, cache, cli);
             handlers.push(new speed_kit_asset_request_1.SpeedKitAssetRequest(customerConfig, orestesApp), new speed_kit_rum_pi_request_1.SpeedKitRumPiRequest(customerConfig, cache, cli));
         }
-        if (athenaClient) {
-            handlers.push(new dashboard_request_1.DashboardRequest(new dashboard_1.Dashboard(customerConfig, parameterQueryBuilder, athenaClient, requestDiffService, new diff_against_current_page_1.DiffAgainstCurrentPage(DiffService, documentHandler, crawler), cache)));
-        }
         return new fetch_event_handler_1.FetchEventHandler(handlers, customerConfig, cli, configApi);
     }
     async getSpeedKitServerConfig(configApi, cli) {

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

@@ -79,12 +79,10 @@ class VirtualOrestesApp {
         return baqendResponse;
     }
     returnErrorResponse(customResponse, customHeaders) {
-        let message = `could not transform html - ${customResponse.error}`;
-        if (customResponse.errorObj) {
-            message = customResponse.errorObj.message;
-        }
-        this.cli.writeError(message);
-        this.cli.writeError(JSON.stringify(customResponse.errorObj));
+        const message = `Could not transform html: - ${customResponse.error}`;
+        this.cli.writeError(`[VirtualOrestes]: ${message}`);
+        this.cli.comment(customResponse.errorObj.stack);
+        this.cli.writeWarning("Suggestion: check files: config_documentHandler.es6 | custom_documentHandler.js");
         customHeaders.push({ name: "x-error", value: message });
         return new baqend_response_1.BaqendResponse(message, null, customHeaders, 500);
     }

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.62.1"
+  "version": "2.64.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.62.1",
+  "version": "2.64.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"