@speedkit/cli 2.38.0 → 2.39.0

package/dist/services/onboarding/dashboard/index.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dashboard = void 0;
 const tslib_1 = require("tslib");
 const baqend_response_1 = require("../browser/baqend-response");
-const node_fs_1 = require("node:fs");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const safe_1 = require("../../../helpers/safe");
 const json2csv_1 = tslib_1.__importDefault(require("json2csv"));
 class Dashboard {
@@ -23,31 +21,24 @@ class Dashboard {
     }
     async getResponse(request) {
         const url = new URL(request.url);
-        if (url.pathname === "/") {
-            const filePath = node_path_1.default.join(__dirname, "./frontend-dist", "index.html");
-            const content = (0, node_fs_1.readFileSync)(filePath, { encoding: "utf-8" });
-            return new baqend_response_1.BaqendResponse(content);
+        const requestOrigin = request.headers["Origin"] || "*";
+        if ("Access-Control-Request-Method" in request.headers) {
+            return this.createBaqendResponse(requestOrigin, "preflight");
         }
-        if (url.pathname.startsWith("/assets/")) {
-            const filePath = node_path_1.default.join(__dirname, "./frontend-dist", url.pathname);
-            const content = (0, node_fs_1.readFileSync)(filePath, { encoding: "utf-8" });
-            let contentType = "application/javascript; charset=UTF-8";
-            if (url.pathname.includes(".css")) {
-                contentType = "text/css";
-            }
-            return new baqend_response_1.BaqendResponse(content, contentType);
+        if (request.method !== "POST" && request.method !== "GET") {
+            return this.createBaqendResponse(requestOrigin, "unsupported method");
         }
         if (url.pathname.startsWith("/query/create")) {
-            return new baqend_response_1.BaqendResponse(JSON.stringify({ query: this.parameterQueryBuilder.getQuery() }), "application/json; charset=UTF-8");
+            return this.createBaqendResponse(requestOrigin, JSON.stringify({ query: this.parameterQueryBuilder.getQuery() }), "application/json; charset=UTF-8");
         }
         if (url.pathname.startsWith("/query/execute")) {
             const postData = request.postData;
             const data = JSON.parse(postData);
             const response = await (0, safe_1.safe)(this.athenaClient.getResult(data.query, []));
             if (response.success === true) {
-                return new baqend_response_1.BaqendResponse(JSON.stringify(response.data), "application/json; charset=UTF-8");
+                return this.createBaqendResponse(requestOrigin, JSON.stringify(response.data), "application/json; charset=UTF-8");
             }
-            return new baqend_response_1.BaqendResponse(response.error, null, [{ name: "x-error", value: response.error }], 500);
+            return this.createBaqendResponse(requestOrigin, response.error, null, [{ name: "x-error", value: response.error }], 500);
         }
         // @todo reImplement getLastResult
         if (url.pathname.startsWith("/query/download")) {
@@ -63,7 +54,7 @@ class Dashboard {
                     "example3",
                 ],
             });
-            return new baqend_response_1.BaqendResponse(csv, "application/csv", [
+            return this.createBaqendResponse(requestOrigin, csv, "application/csv", [
                 {
                     name: "Content-disposition",
                     value: `attachment; filename=parameter-${this.customerConfig.app}.csv`,
@@ -71,21 +62,31 @@ class Dashboard {
             ]);
         }
         if (url.pathname.startsWith("/api/config")) {
-            return new baqend_response_1.BaqendResponse(JSON.stringify(this.customerConfig), "application/json; charset=UTF-8");
+            return this.createBaqendResponse(requestOrigin, JSON.stringify(this.customerConfig), "application/json; charset=UTF-8");
         }
         if (url.pathname.startsWith("/diff")) {
             const postData = request.postData;
             const data = JSON.parse(postData);
-            return await this.requestDiffService.postDiff(data.url, data.paramKeys);
+            return this.requestDiffService.postDiff(requestOrigin, data.url, data.paramKeys, data.autoDiff);
         }
         if (url.pathname.startsWith("/cache/get")) {
             const response = [];
             for (const [url, baqendResponse] of this.cache.getAll()) {
                 response.push({ url, response: baqendResponse });
             }
-            return new baqend_response_1.BaqendResponse(JSON.stringify(response), "application/json; charset=UTF-8");
+            return this.createBaqendResponse(requestOrigin, JSON.stringify(response), "application/json; charset=UTF-8");
         }
-        return new baqend_response_1.BaqendResponse("Not implemented");
+        return this.createBaqendResponse(requestOrigin, "Not implemented");
+    }
+    createBaqendResponse(origin, body, contentType, headers = [], status) {
+        headers.push({
+            name: "Access-Control-Allow-Origin",
+            value: origin,
+        }, {
+            name: "Access-Control-Allow-Headers",
+            value: "Content-Type,Access-Control-Allow-Origin,origin",
+        });
+        return new baqend_response_1.BaqendResponse(body, contentType, headers, status);
     }
 }
 exports.Dashboard = Dashboard;

package/dist/services/onboarding/dashboard/request-diff-service.d.ts

@@ -5,9 +5,10 @@ export declare class RequestDiffService {
     private diffService;
     private documentHandlerRuntime;
     constructor(diffService: DiffService, documentHandlerRuntime: DocumentHandlerServer);
-    postDiff(url: string, parametersString: string, autoCheck?: boolean): Promise<BaqendResponse>;
+    postDiff(requestOrigin: string, url: string, parametersString: string, autoCheck?: boolean): Promise<BaqendResponse>;
     private diffLocal;
     private doOriginVsContentDiff;
     private fetchHtml;
     private createUrlsForDiff;
+    private createBaqendResponse;
 }

package/dist/services/onboarding/dashboard/request-diff-service.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestDiffService = void 0;
+const tslib_1 = require("tslib");
 const baqend_response_1 = require("../browser/baqend-response");
 const safe_1 = require("../../../helpers/safe");
+const node_https_1 = require("node:https");
+const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 class RequestDiffService {
     diffService;
     documentHandlerRuntime;
@@ -10,7 +14,7 @@ class RequestDiffService {
         this.diffService = diffService;
         this.documentHandlerRuntime = documentHandlerRuntime;
     }
-    async postDiff(url, parametersString, autoCheck = false) {
+    async postDiff(requestOrigin, url, parametersString, autoCheck = false) {
         const parameters = parametersString
             .replace("[", "")
             .replace("]", "")
@@ -21,15 +25,15 @@ class RequestDiffService {
         const { urlWithParam, urlWithoutParam } = this.createUrlsForDiff(url, parameters);
         const result = await (0, safe_1.safe)(this.diffLocal(urlWithParam, urlWithoutParam, autoCheck));
         if (result.success === true) {
-            return new baqend_response_1.BaqendResponse(JSON.stringify({
+            return this.createBaqendResponse(requestOrigin, JSON.stringify({
                 status: "success",
                 isIdentical: result.data,
             }), "application/json; charset=UTF-8");
         }
-        return new baqend_response_1.BaqendResponse(JSON.stringify({
+        return this.createBaqendResponse(requestOrigin, JSON.stringify({
             status: "error",
             error: result.error,
-        }), "application/json; charset=UTF-8", null, 500);
+        }), "application/json; charset=UTF-8", [], 500);
     }
     async diffLocal(urlWithParameter, urlWithoutParameter, checkIsEqual = false) {
         const htmlWithParameter = await this.fetchHtml(urlWithParameter);
@@ -56,8 +60,22 @@ class RequestDiffService {
         return await this.diffService.executeDiff(local, origin);
     }
     async fetchHtml(url) {
-        const response = await fetch(url);
-        return await response.text();
+        const agent = new node_https_1.Agent({
+            rejectUnauthorized: false,
+            keepAlive: true,
+            secureOptions: node_crypto_1.default.constants.SSL_OP_LEGACY_SERVER_CONNECT,
+        });
+        const response = await (0, safe_1.safe)((0, node_fetch_1.default)(url, {
+            agent: agent,
+            headers: {
+                "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.79 Safari/537.36 SpeedKitCrawler/1.0",
+            },
+        }));
+        if (response.success !== true) {
+            console.log(response.errorObj);
+            throw response.errorObj;
+        }
+        return response.data.text();
     }
     createUrlsForDiff(urlWithParameter, parameters) {
         const url = new URL(urlWithParameter);
@@ -72,5 +90,15 @@ class RequestDiffService {
             urlWithoutParam: urlWithoutParameter,
         };
     }
+    createBaqendResponse(requestOrigin, body, contentType, headers = [], status) {
+        headers.push({
+            name: "Access-Control-Allow-Origin",
+            value: requestOrigin,
+        }, {
+            name: "Access-Control-Allow-Headers",
+            value: "Content-Type,Access-Control-Allow-Origin,origin",
+        });
+        return new baqend_response_1.BaqendResponse(body, contentType, headers, status);
+    }
 }
 exports.RequestDiffService = RequestDiffService;

package/dist/services/onboarding/error/browser-extension-error.d.ts

@@ -0,0 +1,5 @@
+import { PrettyPrintableError } from "@oclif/core/lib/errors";
+export declare class BrowserExtensionError extends Error implements PrettyPrintableError {
+    readonly code = "BROWSER_EXTENSION_ERROR";
+    readonly suggestions: string[];
+}

package/dist/services/onboarding/error/browser-extension-error.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BrowserExtensionError = void 0;
+class BrowserExtensionError extends Error {
+    code = "BROWSER_EXTENSION_ERROR";
+    suggestions = [
+        "check paths in env $CHROME_EXTENSION_PATHS",
+        "or",
+        `"chromeExtensionPaths:" in .config/speed-kit-cli/config.js`,
+    ];
+}
+exports.BrowserExtensionError = BrowserExtensionError;

package/dist/services/onboarding/fetch-event-handler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchEventHandler = void 0;
 const tslib_1 = require("tslib");
+const onboarding_model_1 = require("./onboarding-model");
 const puppeteer_core_1 = require("puppeteer-core");
 const abort_response_1 = require("./browser/abort-response");
 const cli_1 = require("../cli");
@@ -19,8 +20,8 @@ class FetchEventHandler {
         this.client = client;
     }
     async handleRequestFetchEvents(target) {
-        const browserClient = await target.createCDPSession();
-        await browserClient.send("Fetch.enable", {
+        const cdpSession = await target.createCDPSession();
+        await (0, safe_1.safe)(cdpSession.send("Fetch.enable", {
             handleAuthRequests: true,
             //see: https://chromedevtools.github.io/devtools-protocol/tot/Fetch#type-RequestPattern
             patterns: [
@@ -29,16 +30,16 @@ class FetchEventHandler {
                 }),
                 ...this.getAuthPattern(),
             ],
-        });
-        browserClient.on("Fetch.authRequired", async (event) => {
-            const response = await (0, safe_1.safe)(this.onFetchAuthRequired(event, browserClient));
+        }));
+        cdpSession.on(onboarding_model_1.BROWSER_EVENTS.FETCH_AUTH_REQUIRED, async (event) => {
+            const response = await (0, safe_1.safe)(this.onFetchAuthRequired(event, cdpSession));
             if (response.success === true) {
                 return response.data;
             }
             this.cli.writeError(response.error);
         });
-        browserClient.on("Fetch.requestPaused", async (event) => {
-            const response = await (0, safe_1.safe)(this.onFetchRequestPaused(event, browserClient));
+        cdpSession.on(onboarding_model_1.BROWSER_EVENTS.FETCH_REQUEST_PAUSED, async (event) => {
+            const response = await (0, safe_1.safe)(this.onFetchRequestPaused(event, cdpSession));
             if (response.success === true) {
                 return;
             }
@@ -62,32 +63,30 @@ class FetchEventHandler {
             return !pattern.resourceType || pattern.resourceType === resourceType;
         });
     }
-    async onFetchRequestPaused(event, browserClient) {
+    async onFetchRequestPaused(event, cdpSession) {
         const requestId = event.requestId;
         for (const fetchEvent of this.browserFetchEvents) {
             // check if current request could be handled
             if (!this.canHandlePattern(fetchEvent, event.request.url, event.resourceType, event.responseHeaders ? "Response" : "Request")) {
                 continue;
             }
-            const response = await fetchEvent.handle(event, browserClient);
+            const response = await fetchEvent.handle(event, cdpSession);
             if (!response) {
                 continue;
             }
             if (response instanceof abort_response_1.AbortResponse) {
-                await browserClient.send("Fetch.failRequest", {
+                return cdpSession.send("Fetch.failRequest", {
                     requestId: requestId,
                     errorReason: response.errorReason,
                 });
-                return;
             }
-            await browserClient.send("Fetch.fulfillRequest", {
+            return cdpSession.send("Fetch.fulfillRequest", {
                 ...response,
                 requestId,
             });
-            return;
         }
         //see: https://chromedevtools.github.io/devtools-protocol/tot/Fetch#method-continueRequest
-        await browserClient.send("Fetch.continueRequest", {
+        return cdpSession.send("Fetch.continueRequest", {
             requestId: requestId,
         });
     }

package/dist/services/onboarding/onboarding-model.d.ts

@@ -3,6 +3,32 @@ import { Protocol } from "puppeteer-core";
 import { UserCliConfig } from "../../helpers/cli-config";
 import { AbortResponse } from "./browser/abort-response";
 import { FlagInput } from "@oclif/core/lib/interfaces/parser";
+export declare const BROWSER_EVENTS: {
+    DISCONNECTED: string;
+    FETCH_AUTH_REQUIRED: string;
+    FETCH_REQUEST_PAUSED: string;
+};
+export declare const CDP_SESSION: {
+    EVENTS: {
+        SERVICE_WORKER: {
+            REGISTRATION_UPDATED: string;
+        };
+    };
+    MESSAGE: {
+        SERVICE_WORKER: {
+            ENABLE: string;
+            UNREGISTER: string;
+        };
+        STORAGE: {
+            CLEAR_COOKIES: string;
+            CLEAR_DATA: string;
+        };
+        EMULATION: {
+            CLEAR_DEVICE: string;
+            CLEAR_GEOLOCATION: string;
+        };
+    };
+};
 export declare class BrowserContext {
     readonly domain: string;
     readonly chromeFlags?: string[];
@@ -10,7 +36,6 @@ export declare class BrowserContext {
     userAgent?: string;
     readonly browserArgs: string[];
     readonly chromePath: string;
-    startParameterDashboard: boolean;
     constructor(domain: string, chromeFlags?: string[], userConfig?: UserCliConfig, userAgent?: string);
 }
 export interface FetchRequestPausedEventHandler {
@@ -22,14 +47,15 @@ export declare class OnboardingContext {
     readonly configName: string;
     readonly domain: string;
     readonly local: boolean;
-    readonly verboseLevel?: boolean;
     readonly ignoreContentSecurityPolicy: boolean;
+    readonly cliPath: string;
+    readonly verboseLevel?: boolean;
     static flags: FlagInput;
     readonly DEFAULT_DF_PATH = "https://www.baqend.com/speed-kit/latest/dynamic-fetcher.js";
     readonly DEFAULT_DOCUMENT_HANDLER_PATH = "https://www.baqend.com/speed-kit-handler/latest/DocumentHandler.js";
     readonly DEFAULT_SNIPPET_PATH = "https://www.baqend.com/speed-kit/latest/snippet.js";
     readonly DEFAULT_SW_PATH = "https://www.baqend.com/speed-kit/latest/sw.js";
-    constructor(customerPath: string, configName: string, domain: string, local: boolean, verboseLevel?: boolean, ignoreContentSecurityPolicy?: boolean);
+    constructor(customerPath: string, configName: string, domain: string, local: boolean, ignoreContentSecurityPolicy: boolean, cliPath: string, verboseLevel?: boolean);
 }
 export type SpeedKitServerConfigAuthentication = {
     password: string;
@@ -69,6 +95,10 @@ export type SpeedKitServerConfig = {
         variations: SpeedKitServerConfigVariation;
     };
 };
+export type DevelopmentToolsMessage = {
+    id: string;
+    data: any;
+};
 export declare const USER_AGENT: {
     DESKTOP: string;
     MOBILE: string;

package/dist/services/onboarding/onboarding-model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpeedKitInstallRegex = exports.USER_AGENT = exports.OnboardingContext = exports.BrowserContext = void 0;
+exports.SpeedKitInstallRegex = exports.USER_AGENT = exports.OnboardingContext = exports.BrowserContext = exports.CDP_SESSION = exports.BROWSER_EVENTS = void 0;
 const core_1 = require("@oclif/core");
 const cli_parameters_1 = require("../../models/cli-parameters");
 const DEFAULT_BROWSER_ARGS = [
@@ -8,6 +8,32 @@ const DEFAULT_BROWSER_ARGS = [
     "--no-first-run",
     "--disable-infobars",
 ];
+exports.BROWSER_EVENTS = {
+    DISCONNECTED: "disconnected",
+    FETCH_AUTH_REQUIRED: "Fetch.authRequired",
+    FETCH_REQUEST_PAUSED: "Fetch.requestPaused",
+};
+exports.CDP_SESSION = {
+    EVENTS: {
+        SERVICE_WORKER: {
+            REGISTRATION_UPDATED: "ServiceWorker.workerRegistrationUpdated",
+        },
+    },
+    MESSAGE: {
+        SERVICE_WORKER: {
+            ENABLE: "ServiceWorker.enable",
+            UNREGISTER: "ServiceWorker.unregister",
+        },
+        STORAGE: {
+            CLEAR_COOKIES: "Storage.clearCookies",
+            CLEAR_DATA: "Storage.clearDataForOrigin",
+        },
+        EMULATION: {
+            CLEAR_DEVICE: "Emulation.clearDeviceMetricsOverride",
+            CLEAR_GEOLOCATION: "Emulation.clearGeolocationOverride",
+        },
+    },
+};
 class BrowserContext {
     domain;
     chromeFlags;
@@ -15,7 +41,6 @@ class BrowserContext {
     userAgent;
     browserArgs;
     chromePath;
-    startParameterDashboard = false;
     constructor(domain, chromeFlags, userConfig, userAgent) {
         this.domain = domain;
         this.chromeFlags = chromeFlags;
@@ -44,8 +69,9 @@ class OnboardingContext {
     configName;
     domain;
     local;
-    verboseLevel;
     ignoreContentSecurityPolicy;
+    cliPath;
+    verboseLevel;
     static flags = {
         ...cli_parameters_1.CLI_CONFIG_NAME,
         [cli_parameters_1.CLIParameters.Domain]: core_1.Flags.string({
@@ -72,13 +98,14 @@ class OnboardingContext {
     DEFAULT_DOCUMENT_HANDLER_PATH = "https://www.baqend.com/speed-kit-handler/latest/DocumentHandler.js";
     DEFAULT_SNIPPET_PATH = "https://www.baqend.com/speed-kit/latest/snippet.js";
     DEFAULT_SW_PATH = "https://www.baqend.com/speed-kit/latest/sw.js";
-    constructor(customerPath, configName, domain, local, verboseLevel, ignoreContentSecurityPolicy = false) {
+    constructor(customerPath, configName, domain, local, ignoreContentSecurityPolicy = false, cliPath, verboseLevel) {
         this.customerPath = customerPath;
         this.configName = configName;
         this.domain = domain;
         this.local = local;
-        this.verboseLevel = verboseLevel;
         this.ignoreContentSecurityPolicy = ignoreContentSecurityPolicy;
+        this.cliPath = cliPath;
+        this.verboseLevel = verboseLevel;
     }
 }
 exports.OnboardingContext = OnboardingContext;

package/dist/services/onboarding/onboarding-service-factory.d.ts

@@ -6,6 +6,7 @@ export declare class OnboardingServiceFactory {
     private cliConfig;
     constructor(context: OnboardingContext, cliConfig: UserCliConfig);
     getService(): Promise<OnboardingService>;
+    private prepareMessagehandler;
     private buildInstallResource;
     private getAthenaClient;
     private getConfigApi;

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

@@ -32,6 +32,9 @@ const onboarding_service_1 = require("./onboarding-service");
 const cache_1 = require("./request-cache/cache");
 const install_speed_kit_html_template_1 = require("./templates/install-speed-kit-html-template");
 const install_speed_kit_js_template_1 = require("./templates/install-speed-kit-js-template");
+// import { TodoCollector } from "./todo-collector";
+const extension_validator_1 = require("./browser/extension/extension-validator");
+const devtools_extension_api_1 = require("./browser/extension/devtools-extension-api");
 const todo_collector_1 = require("./todo-collector");
 const crawler_1 = require("./virtual-orestes-app/crawler");
 const virtual_orestes_app_1 = require("./virtual-orestes-app");
@@ -60,11 +63,27 @@ class OnboardingServiceFactory {
         const skTemplate = new install_speed_kit_js_template_1.InstallSpeedKitJsTemplate();
         const speedKitInstallContext = new speed_kit_install_context_1.SpeedKitInstallContext(customerConfig, this.context.configName, files, bundler, skTemplate, this.context.local);
         await this.buildInstallResource(speedKitInstallContext, files, cli);
+        const extensionPaths = await new extension_validator_1.ExtensionValidator(this.cliConfig, this.context.cliPath, cli).getValidBrowserExtensionPaths();
+        this.cliConfig.chromeExtensionPaths = extensionPaths.join(",");
         const browserContext = new onboarding_model_1.BrowserContext(domainToStart, customerConfig.chromeFlags || [], this.cliConfig);
         const fileWatcher = new file_watcher_1.FileWatcher(cli, customerConfig, files, documentHandler, browserContext, cache);
-        const fetchHandler = await this.getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext);
+        const athenaClient = (await this.getAthenaClient()) || null;
+        const fetchHandler = await this.getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext, athenaClient);
+        const messageHandler = this.prepareMessagehandler(athenaClient, files);
+        return new onboarding_service_1.OnboardingService(browserContext, customerConfig, fetchHandler, fileWatcher, cli, messageHandler);
+    }
+    prepareMessagehandler(athenaClient, files) {
+        const messageHandler = new devtools_extension_api_1.DevtoolsExtensionApi();
+        messageHandler.addMessage({
+            id: "athena",
+            data: { client: !!athenaClient },
+        });
         const fileTodoCollector = new todo_collector_1.TodoCollector(files.getInstallResources());
-        return new onboarding_service_1.OnboardingService(browserContext, customerConfig, fetchHandler, fileWatcher, cli, fileTodoCollector);
+        messageHandler.addMessage({
+            id: "todo",
+            data: [...fileTodoCollector.getOpenTasks()],
+        });
+        return messageHandler;
     }
     async buildInstallResource(speedKitInstallContext, files, cli) {
         cli.startAction("build file install_resource");
@@ -89,7 +108,7 @@ class OnboardingServiceFactory {
         const configApiContext = new config_api_context_1.default(app);
         return new config_api_service_factory_1.default(configApiContext).getService();
     }
-    async getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext) {
+    async getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext, athenaClient) {
         const configApi = this.getConfigApi(customerConfig.app);
         const serverConfig = await this.getSpeedKitServerConfig(configApi, cli);
         const parameterQueryBuilder = new parameter_query_builder_1.ParameterQueryBuilder(customerConfig, files.getByName(files_1.INTEGRATION_FILES.CONFIG.SPEED_KIT));
@@ -107,7 +126,6 @@ class OnboardingServiceFactory {
             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));
         }
-        const athenaClient = await this.getAthenaClient();
         if (athenaClient) {
             handlers.push(new dashboard_request_1.DashboardRequest(new dashboard_1.Dashboard(customerConfig, parameterQueryBuilder, athenaClient, requestDiffService, cache)));
         }

package/dist/services/onboarding/onboarding-service.d.ts

@@ -3,7 +3,7 @@ import { BrowserContext } from "./onboarding-model";
 import { FetchEventHandler } from "./fetch-event-handler";
 import { FileWatcher } from "./file-events/file-watcher";
 import { CliService } from "../cli";
-import { TodoCollector } from "./todo-collector";
+import { DevtoolsExtensionApi } from "./browser/extension/devtools-extension-api";
 /**
  * Represents the OnboardingService which is responsible for setting up the browser to test a config using Puppeteer.
  */
@@ -13,9 +13,9 @@ export declare class OnboardingService {
     private fetchEventHandler;
     private fileWatcher;
     private cli;
-    private taskCollector;
+    private developmentToolsMessages;
     private reinstallOnNextNavigate;
-    constructor(browserContext: BrowserContext, customerConfig: CustomerConfig, fetchEventHandler: FetchEventHandler, fileWatcher: FileWatcher, cli: CliService, taskCollector: TodoCollector);
+    constructor(browserContext: BrowserContext, customerConfig: CustomerConfig, fetchEventHandler: FetchEventHandler, fileWatcher: FileWatcher, cli: CliService, developmentToolsMessages: DevtoolsExtensionApi);
     /**
      * prepare puppeteerBrowser, add eventListeners and start
      */

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnboardingService = void 0;
 const tslib_1 = require("tslib");
 const puppeteer_extra_1 = tslib_1.__importDefault(require("puppeteer-extra"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const onboarding_model_1 = require("./onboarding-model");
 const cli_1 = require("../cli");
 const safe_1 = require("../../helpers/safe");
 /**
@@ -15,15 +15,15 @@ class OnboardingService {
     fetchEventHandler;
     fileWatcher;
     cli;
-    taskCollector;
+    developmentToolsMessages;
     reinstallOnNextNavigate = false;
-    constructor(browserContext, customerConfig, fetchEventHandler, fileWatcher, cli, taskCollector) {
+    constructor(browserContext, customerConfig, fetchEventHandler, fileWatcher, cli, developmentToolsMessages) {
         this.browserContext = browserContext;
         this.customerConfig = customerConfig;
         this.fetchEventHandler = fetchEventHandler;
         this.fileWatcher = fileWatcher;
         this.cli = cli;
-        this.taskCollector = taskCollector;
+        this.developmentToolsMessages = developmentToolsMessages;
     }
     /**
      * prepare puppeteerBrowser, add eventListeners and start
@@ -33,10 +33,6 @@ class OnboardingService {
         const browser = await this.prepareBrowser();
         const page = await this.preparePage(browser);
         this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
-        if (this.browserContext.startParameterDashboard) {
-            const { goto } = await browser.newPage();
-            await goto("http://skonboarding.local/");
-        }
         await this.navigate(page, `${this.customerConfig.scope}speed-kit-install.html?url=${this.customerConfig.scope}`);
     }
     async prepareBrowser() {
@@ -52,7 +48,7 @@ class OnboardingService {
                 await this.fetchEventHandler.handleRequestFetchEvents(target);
             }
         }
-        browser.on("disconnected", () => {
+        browser.on(onboarding_model_1.BROWSER_EVENTS.DISCONNECTED, () => {
             this.cli.writeError("Browser disconnected, shutting down");
             process.exit(-1);
         });
@@ -60,14 +56,18 @@ class OnboardingService {
     }
     async preparePage(browser) {
         const page = await this.findPage(browser);
-        await this.prepareCleanState(page);
+        await (0, safe_1.safe)(this.prepareCleanState(page));
         this.registerFileWatcher(page);
         this.registerReinstallSpeedKitOnNavigate(page);
-        page.on("framenavigated", async (_frame) => {
-            // inject open Todos from configFiles
-            const tasks = this.taskCollector.getOpenTasks();
-            await (0, safe_1.safe)(page.evaluate(`window.skOnboarding = ${JSON.stringify(tasks)}`));
+        this.developmentToolsMessages.addMessage({
+            id: "cli",
+            data: `config loaded for app "${this.customerConfig.app}"`,
         });
+        const messages = this.developmentToolsMessages.messages;
+        await page.evaluateOnNewDocument((messages) => {
+            // @ts-expect-error unknown method getSkCliMessages
+            window.skCliMessages = messages;
+        }, messages);
         return page;
     }
     async findPage(browser) {
@@ -80,27 +80,33 @@ class OnboardingService {
         return browser.newPage();
     }
     async prepareCleanState(page) {
-        const pageClient = await page.target().createCDPSession();
-        pageClient.on("ServiceWorker.workerRegistrationUpdated", ({ registrations, }) => {
-            for (const registration of registrations) {
-                if (registration.isDeleted) {
-                    this.cli.writeWarning((0, chalk_1.default) `{yellow Unregistered Service Worker} at {bold ${registration.scopeURL}} (${registration.registrationId})`);
-                }
-            }
-        });
+        const cdpSession = await page.target().createCDPSession();
         // cleanUp old serviceWorkers
-        await pageClient.send("ServiceWorker.enable");
-        await pageClient.send("ServiceWorker.unregister", {
+        await cdpSession.send("ServiceWorker.enable");
+        await cdpSession.send("ServiceWorker.unregister", {
             scopeURL: this.browserContext.domain,
         });
         // clear storage for a clean start
-        await pageClient.send("Storage.clearCookies");
-        await pageClient.send("Storage.clearDataForOrigin", {
+        await cdpSession.send("Storage.clearCookies");
+        await cdpSession.send("Storage.clearDataForOrigin", {
             origin: this.browserContext.domain,
             storageTypes: "all",
         });
-        await pageClient.send("Emulation.clearDeviceMetricsOverride");
-        await pageClient.send("Emulation.clearGeolocationOverride");
+        await cdpSession.send("Emulation.clearDeviceMetricsOverride");
+        await cdpSession.send("Emulation.clearGeolocationOverride");
+        (0, safe_1.safe)(() => {
+            cdpSession.on(onboarding_model_1.CDP_SESSION.EVENTS.SERVICE_WORKER.REGISTRATION_UPDATED, ({ registrations, }) => {
+                for (const registration of registrations) {
+                    if (registration.isDeleted) {
+                        this.developmentToolsMessages.addMessage({
+                            id: "serviceWorker",
+                            data: `Unregistered Service Worker at ${registration.scopeURL} id: ${registration.registrationId}`,
+                        });
+                        this.cli.writeWarning(`${this.cli.style.yellow("Unregistered Service Worker")} at ${this.cli.style.bold(registration.scopeURL)} (${registration.registrationId})`);
+                    }
+                }
+            });
+        });
     }
     async reinstallSpeedKit(page, pathname) {
         const url = new URL(page.url());
@@ -129,8 +135,7 @@ class OnboardingService {
     }
     async navigate(page, pathname) {
         const goto = new URL(pathname, `${this.browserContext.domain}`);
-        await page.goto(goto.toString());
-        await page.bringToFront();
+        await (0, safe_1.safe)(page.goto(goto.toString()));
     }
 }
 exports.OnboardingService = OnboardingService;