@speedkit/cli 2.9.0 → 2.11.0

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

@@ -2,10 +2,10 @@
 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 cli_1 = require("../cli");
+const puppeteer_extra_1 = tslib_1.__importDefault(require("puppeteer-extra"));
 const safe_1 = require("../../helpers/safe");
+const cli_1 = require("../cli");
 /**
  * Represents the OnboardingService which is responsible for setting up the browser to test a config using Puppeteer.
  */
@@ -29,58 +29,52 @@ class OnboardingService {
      * prepare puppeteerBrowser, add eventListeners and start
      */
     async run() {
-        this.cli.startAction('prepare browser');
+        this.cli.startAction("prepare browser");
         const browser = await this.prepareBrowser();
         const page = await this.preparePage(browser);
         this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
         if (this.browserContext.startParameterDashboard) {
-            await (await browser.newPage()).goto('http://skonboarding.local/');
+            // eslint-disable-next-line unicorn/no-await-expression-member
+            await (await browser.newPage()).goto("http://skonboarding.local/");
         }
         await this.navigate(page, `${this.customerConfig.scope}speed-kit-install.html?url=${this.customerConfig.scope}`);
     }
+    async findPage(browser) {
+        if (!browser)
+            throw new Error("Please start a browser first.");
+        const [page] = await browser.pages();
+        if (page) {
+            return page;
+        }
+        return browser.newPage();
+    }
+    async navigate(page, pathname) {
+        const goto = new URL(pathname, `${this.browserContext.domain}`);
+        await page.goto(goto.toString());
+        await page.bringToFront();
+    }
     async prepareBrowser() {
         const browser = await puppeteer_extra_1.default.launch({
-            devtools: true,
+            args: this.browserContext.browserArgs,
             defaultViewport: null,
-            headless: false,
+            devtools: true,
             executablePath: this.browserContext.chromePath,
-            args: this.browserContext.browserArgs,
+            headless: false /* ignoreDefaultArgs: true, */,
         });
         for (const target of browser.targets()) {
-            if (target.type() === 'browser') {
+            if (target.type() === "browser") {
                 await this.fetchEventHandler.handleRequestFetchEvents(target);
             }
         }
-        browser.on('disconnected', () => {
-            this.cli.writeError('Browser disconnected, shutting down');
+        browser.on("disconnected", () => {
+            this.cli.writeError("Browser disconnected, shutting down");
             process.exit(-1);
         });
         return browser;
     }
-    async preparePage(browser) {
-        const page = await this.findPage(browser);
-        await this.prepareCleanState(page);
-        this.registerFileWatcher(page);
-        this.registerReinstallSpeedKitOnNavigate(page);
-        // inject open Todos from configFiles
-        page.on('framenavigated', async (frame) => {
-            const tasks = this.taskCollector.getOpenTasks();
-            await (0, safe_1.safe)(page.evaluate(`window.skOnboarding = ${JSON.stringify(tasks)}`));
-        });
-        return page;
-    }
-    async findPage(browser) {
-        if (!browser)
-            throw new Error('Please start a browser first.');
-        const [page] = await browser.pages();
-        if (page) {
-            return page;
-        }
-        return browser.newPage();
-    }
     async prepareCleanState(page) {
         const pageClient = await page.target().createCDPSession();
-        pageClient.on('ServiceWorker.workerRegistrationUpdated', ({ registrations }) => {
+        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})`);
@@ -89,21 +83,29 @@ class OnboardingService {
         });
         // cleanUp old serviceWorkers
         await pageClient.send("ServiceWorker.enable");
-        await pageClient.send("ServiceWorker.unregister", { scopeURL: this.browserContext.domain });
+        await pageClient.send("ServiceWorker.unregister", {
+            scopeURL: this.browserContext.domain,
+        });
         // clear storage for a clean start
-        await pageClient.send('Storage.clearCookies');
-        await pageClient.send("Storage.clearDataForOrigin", { origin: this.browserContext.domain, storageTypes: 'all' });
+        await pageClient.send("Storage.clearCookies");
+        await pageClient.send("Storage.clearDataForOrigin", {
+            origin: this.browserContext.domain,
+            storageTypes: "all",
+        });
         await pageClient.send("Emulation.clearDeviceMetricsOverride");
         await pageClient.send("Emulation.clearGeolocationOverride");
     }
-    async reinstallSpeedKit(page, pathname) {
-        const url = new URL(page.url());
-        let target = url.href;
-        if (!pathname.includes('/speed-kit-install.html')) {
-            target = `${this.customerConfig.scope}speed-kit-install.html?url=${encodeURIComponent(target)}`;
-        }
-        this.reinstallOnNextNavigate = false;
-        await this.navigate(page, target);
+    async preparePage(browser) {
+        const page = await this.findPage(browser);
+        await this.prepareCleanState(page);
+        this.registerFileWatcher(page);
+        this.registerReinstallSpeedKitOnNavigate(page);
+        // inject open Todos from configFiles
+        page.on("framenavigated", async (_frame) => {
+            const tasks = this.taskCollector.getOpenTasks();
+            await (0, safe_1.safe)(page.evaluate(`window.skOnboarding = ${JSON.stringify(tasks)}`));
+        });
+        return page;
     }
     registerFileWatcher(page) {
         this.fileWatcher.addCallbackOnFileChange(page, async () => {
@@ -111,7 +113,7 @@ class OnboardingService {
         });
     }
     registerReinstallSpeedKitOnNavigate(page) {
-        page.on('framenavigated', async (frame) => {
+        page.on("framenavigated", async (frame) => {
             if (frame.parentFrame() !== null) {
                 return;
             }
@@ -121,10 +123,14 @@ class OnboardingService {
             }
         });
     }
-    async navigate(page, pathname) {
-        const goto = new URL(pathname, `${this.browserContext.domain}`);
-        await page.goto(goto.toString());
-        await page.bringToFront();
+    async reinstallSpeedKit(page, pathname) {
+        const url = new URL(page.url());
+        let target = url.href;
+        if (!pathname.includes("/speed-kit-install.html")) {
+            target = `${this.customerConfig.scope}speed-kit-install.html?url=${encodeURIComponent(target)}`;
+        }
+        this.reinstallOnNextNavigate = false;
+        await this.navigate(page, target);
     }
 }
 exports.OnboardingService = OnboardingService;

package/dist/services/onboarding/request-cache/cache.d.ts

@@ -1,5 +1,5 @@
-import { BaqendResponse } from "../browser/baqend-response";
 import { CliService } from "../../cli";
+import { BaqendResponse } from "../browser/baqend-response";
 /**
  * This class represents a cache for storing responses from the localDocumentHandler.
  */
@@ -7,9 +7,9 @@ export declare class Cache {
     private cli;
     private inMemoryCache;
     constructor(cli: CliService);
+    addEntry(requestUri: string, response: BaqendResponse): void;
+    clear(): void;
     getAll(): IterableIterator<[string, BaqendResponse]>;
     getEntry(requestUri: string): BaqendResponse | void;
-    addEntry(requestUri: string, response: BaqendResponse): void;
     removeEntry(requestUri: string): void;
-    clear(): void;
 }

package/dist/services/onboarding/request-cache/cache.js

@@ -10,6 +10,13 @@ class Cache {
     constructor(cli) {
         this.cli = cli;
     }
+    addEntry(requestUri, response) {
+        this.inMemoryCache.set(requestUri, response);
+    }
+    clear() {
+        this.cli.writeWarning("clear request-caches");
+        this.inMemoryCache.clear();
+    }
     getAll() {
         return this.inMemoryCache.entries();
     }
@@ -18,15 +25,8 @@ class Cache {
             return this.inMemoryCache.get(requestUri);
         }
     }
-    addEntry(requestUri, response) {
-        this.inMemoryCache.set(requestUri, response);
-    }
     removeEntry(requestUri) {
         this.inMemoryCache.delete(requestUri);
     }
-    clear() {
-        this.cli.writeWarning('clear request-caches');
-        this.inMemoryCache.clear();
-    }
 }
 exports.Cache = Cache;

package/dist/services/onboarding/server-config/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerConfig = void 0;
-const cli_1 = require("../../cli");
 const safe_1 = require("../../../helpers/safe");
+const cli_1 = require("../../cli");
 class ServerConfig {
     cli;
     client;
@@ -18,7 +18,7 @@ class ServerConfig {
         return JSON.parse(serverConfig);
     }
     async getServerConfig() {
-        this.cli.startAction('wait for credentials from server-config');
+        this.cli.startAction("wait for credentials from server-config");
         const serverConfigResponse = await (0, safe_1.safe)(this.client.getServerConfig());
         if (serverConfigResponse.success === false) {
             this.cli.endAction(cli_1.CliActionStatus.FAILED);

package/dist/services/onboarding/todo-collector.d.ts

@@ -1,9 +1,9 @@
 import { FileInterface } from "../integration-api/integration-api-model";
 export type task = {
-    todo: string;
     context: string;
     file: string;
     line: number;
+    todo: string;
 };
 /**
  * Represents a TodoCollector class that collects open tasks from files.

package/dist/services/onboarding/todo-collector.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TodoCollector = void 0;
 const virtual_file_1 = require("../integration-api/struct/virtual-file");
-const TODO_MATCH = /(todo[^(\r\n|\r|\n)]*)((?:\r\n|\r|\n)[^(\r\n|\r|\n)]*(?:\r\n|\r|\n)[^(\r\n|\r|\n)]*(?:\r\n|\r|\n)[^(\r\n|\r|\n)]*)/i;
+const TODO_MATCH = /(todo[^\n\r()|]*)((?:(?:\r\n|\r|\n)[^\n\r()|]*){3})/i;
 /**
  * Represents a TodoCollector class that collects open tasks from files.
  * This files will then be injected to the current open page, so you or the browser-extension can access and display them
@@ -13,7 +13,7 @@ class TodoCollector {
         this.files = files;
     }
     getOpenTasks() {
-        const configFiles = this.files.filter(file => {
+        const configFiles = this.files.filter((file) => {
             return !(file.type instanceof virtual_file_1.VirtualFile);
         });
         const tasks = [];
@@ -21,10 +21,10 @@ class TodoCollector {
             const content = configFile.getContent();
             content.replace(TODO_MATCH, (taskString, task, taskContext) => {
                 tasks.push({
-                    todo: task,
                     context: encodeURI(taskContext),
                     file: configFile.name,
-                    line: this.lineNumber(task, content)
+                    line: this.lineNumber(task, content),
+                    todo: task,
                 });
                 return taskString;
             });
@@ -36,8 +36,10 @@ class TodoCollector {
     }
     lineNumberByIndex(index, string) {
         // RegExp
-        var line = 0, match, re = /(^)[\S\s]/gm;
-        while (match = re.exec(string)) {
+        let line = 0;
+        let match;
+        const re = /(^)[\S\s]/gm;
+        while ((match = re.exec(string))) {
             if (match.index > index)
                 break;
             line++;

package/dist/services/prewarm-service.js

@@ -23,7 +23,7 @@ class PrewarmService {
                 authorization: `BAT ${token}`,
                 'Accept-Encoding': 'gzip, deflate, br',
             },
-            timeout: 10000,
+            timeout: 10_000,
         });
     }
     // eslint-disable-next-line max-params
@@ -41,7 +41,7 @@ class PrewarmService {
                 authorization: `BAT ${token}`,
                 'Accept-Encoding': 'gzip, deflate, br',
             },
-            timeout: 10000,
+            timeout: 10_000,
         });
     }
     static chunk(arr, len) {

package/oclif.manifest.json

@@ -104,14 +104,6 @@
           "multiple": false,
           "type": "option"
         },
-        "slackToken": {
-          "char": "t",
-          "description": "Slack hook found on 1Pass",
-          "name": "slackToken",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "artifacts": {
           "char": "a",
           "description": "Whitelist of files to deploy",
@@ -126,6 +118,14 @@
           "name": "dryRun",
           "allowNo": false,
           "type": "boolean"
+        },
+        "slackToken": {
+          "char": "t",
+          "description": "Slack hook found on 1Pass",
+          "name": "slackToken",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -696,5 +696,5 @@
       ]
     }
   },
-  "version": "2.9.0"
+  "version": "2.11.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.9.0",
+  "version": "2.11.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -59,14 +59,14 @@
   "types": "dist/index.d.ts",
   "type": "commonjs",
   "dependencies": {
-    "@aws-sdk/client-athena": "^3.204.0",
+    "@aws-sdk/client-athena": "^3.529",
     "@inquirer/prompts": "^3.0",
-    "@oclif/core": "^3.20",
+    "@oclif/core": "^3.23",
     "@oclif/plugin-autocomplete": "^3.0",
     "@oclif/plugin-help": "^6.0",
     "@oclif/plugin-not-found": "^3.0",
     "@oclif/plugin-warn-if-update-available": "^3.0",
-    "axios": "^1.4.0",
+    "axios": "^1.6",
     "baqend": "^3.4",
     "chalk": "^4",
     "clipboardy-cjs": "^3.0.0",
@@ -75,23 +75,21 @@
     "diff": "^5.1.0",
     "dom-serializer": "2.0.0",
     "domhandler": "5.0.3",
-    "domutils": "3.0.1",
-    "dotenv": "^16.0.3",
+    "domutils": "^3.1",
+    "dotenv": "^16.4",
     "extract-zip": "^2.0.1",
     "fs-extra": "^10.1.0",
     "handlebars": "^4.7",
     "htmlparser2": "8.0",
     "json2csv": "^6.0.0-alpha.2",
-    "nock": "^13.3.8",
     "node-fetch": "^2.6",
     "parse5": "7.1",
     "parse5-htmlparser2-tree-adapter": "7.0.0",
-    "puppeteer": "^21.5",
-    "puppeteer-core": "^21.3",
+    "puppeteer": "^21.11",
+    "puppeteer-core": "^22.4",
     "puppeteer-extra": "^3.3",
     "puppeteer-extra-plugin-user-preferences": "^2.4",
     "strip-comments": "^2.0.1",
-    "ts-sinon": "^2.0.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -102,31 +100,34 @@
     "@oclif/test": "^3",
     "@types/chai": "^4.3.10",
     "@types/fs-extra": "^9.0.13",
-    "@types/mocha": "^10.0.4",
+    "@types/mocha": "^10.0",
     "@types/mock-fs": "^4.13.4",
-    "@types/node": "^18.7.13",
+    "@types/node": "^18.19",
     "@types/uuid": "^8.3.4",
-    "chai": "^4.3.6",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "chai": "^4.4",
     "copyfiles": "^2.4.1",
-    "esbuild": "^0.15.5",
-    "eslint": "^8.22.0",
-    "eslint-config-oclif": "^5.0.0",
-    "eslint-config-oclif-typescript": "^3.0.13",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "esbuild": "^0.20",
+    "eslint": "^8.57",
+    "eslint-config-oclif": "^5.1",
+    "eslint-config-oclif-typescript": "^3.1",
+    "eslint-config-prettier": "^9.1",
+    "eslint-plugin-prettier": "^5.1",
     "globby": "^11",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
     "mocha": "^10.1.0",
     "mocha-junit-reporter": "^2.2.1",
     "mock-fs": "^5.2.0",
+    "nock": "^13.5",
     "nyc": "^15.1.0",
-    "oclif": "^4.0.3",
+    "oclif": "^4.5",
     "shx": "^0.3.4",
     "ts-mocha": "^10.0.0",
-    "ts-node": "^10.9.1",
-    "tslib": "^2.4.0",
-    "typescript": "^5.2.2",
+    "ts-node": "^10.9",
+    "ts-sinon": "^2.0.2",
+    "tslib": "^2.6",
+    "typescript": "^5.4",
     "typescript-json-serializer": "^4.3.0"
   },
   "lint-staged": {