@speedkit/cli 4.1.0 → 4.2.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [4.2.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v4.2.0...v4.2.1) (2026-05-12)
+
+
+### Bug Fixes
+
+* remove memoryLeaking htmlFormatter ([5472bbb](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/5472bbb58bb24064b857fd30156247429998bc47))
+
+# [4.2.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v4.1.0...v4.2.0) (2026-05-08)
+
+
+### Features
+
+* **onboarding:** local mode ([0a36f37](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/0a36f376d27f6bb369d38f073e5a5e5811cd1e11))
+* **onboarding:** local mode ([e3e44ef](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/e3e44ef55bd7c6f71e776d978ce5cbd3fcf117e8))
+
 # [4.1.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v4.0.0...v4.1.0) (2026-05-06)
 
 

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/4.1.0 linux-x64 node-v22.22.2
+@speedkit/cli/4.2.1 linux-x64 node-v22.22.2
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND
@@ -112,7 +112,7 @@ EXAMPLES
   $ sk autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.2.45/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.2.49/src/commands/autocomplete/index.ts)_
 
 ## `sk build-parameter-query CUSTOMERPATH`
 
@@ -355,7 +355,7 @@ DESCRIPTION
   Display help for sk.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.44/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.48/src/commands/help.ts)_
 
 ## `sk login [APP]`
 

package/dist/helpers/html-format-helper.js

@@ -1,4 +1,3 @@
-import { prettify } from "htmlfy";
 export function formatHtml(html) {
-    return prettify(html);
+    return html.replace(/>\s*</g, ">\n<");
 }

package/dist/helpers/java-regex.d.ts

@@ -0,0 +1 @@
+export declare function javaRegexToJs(javaRegex: string): RegExp | undefined;

package/dist/helpers/java-regex.js

@@ -0,0 +1,21 @@
+// Converts a Java-style regex (e.g. with leading `(?i)` inline flags) into a
+// JS RegExp. Named groups `(?<name>...)` are already supported in JS.
+export function javaRegexToJs(javaRegex) {
+    let pattern = javaRegex;
+    let flags = "";
+    const inlineFlags = pattern.match(/^\(\?([a-zA-Z]+)\)/);
+    if (inlineFlags) {
+        pattern = pattern.slice(inlineFlags[0].length);
+        for (const flag of inlineFlags[1]) {
+            if ("imsu".includes(flag) && !flags.includes(flag)) {
+                flags += flag;
+            }
+        }
+    }
+    try {
+        return new RegExp(pattern, flags);
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/services/onboarding/dashboard/index.d.ts

@@ -1,11 +1,11 @@
 import { BaqendResponse } from "../browser/baqend-response.js";
 import { Protocol } from "devtools-protocol";
-import { ParameterQueryBuilder } from "./parameter-query-builder.js";
 import { CustomerConfig } from "../../integration-api/index.js";
 import { RequestDiffService } from "./request-diff-service.js";
 import { Cache } from "../request-cache/cache.js";
 import { AthenaService } from "../../athena/index.js";
 import { DiffAgainstCurrentPage } from "./diff-against-current-page.js";
+import { QueryBuilderService } from "../../query-builder/query-builder-service.js";
 export declare class Dashboard {
     private customerConfig;
     private parameterQueryBuilder;
@@ -14,7 +14,7 @@ export declare class Dashboard {
     private currentPageDiff;
     private cache;
     private athenaLastResult;
-    constructor(customerConfig: CustomerConfig, parameterQueryBuilder: ParameterQueryBuilder, athenaClient: AthenaService, requestDiffService: RequestDiffService, currentPageDiff: DiffAgainstCurrentPage, cache: Cache);
+    constructor(customerConfig: CustomerConfig, parameterQueryBuilder: QueryBuilderService, athenaClient: AthenaService, requestDiffService: RequestDiffService, currentPageDiff: DiffAgainstCurrentPage, cache: Cache);
     getResponse(request: Protocol.Network.Request): Promise<BaqendResponse>;
     private createBaqendResponse;
 }

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

@@ -27,7 +27,7 @@ export class Dashboard {
             return this.createBaqendResponse(requestOrigin, "unsupported method");
         }
         if (url.pathname.startsWith("/query/create")) {
-            return this.createBaqendResponse(requestOrigin, JSON.stringify({ query: this.parameterQueryBuilder.getQuery() }), "application/json; charset=UTF-8");
+            return this.createBaqendResponse(requestOrigin, JSON.stringify({ query: this.parameterQueryBuilder.query() }), "application/json; charset=UTF-8");
         }
         if (url.pathname.startsWith("/query/execute")) {
             const postData = request.postData;

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

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

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

@@ -9,7 +9,6 @@ import { ExternalFileReader, IntegrationApiContext, VirtualFile, ExternalRecipe,
 import { InstallFileRecipe } from "./config-renderer/install-file-recipe.js";
 import { SpeedKitInstallContext } from "./config-renderer/speed-kit-install-context.js";
 import { Dashboard } from "./dashboard/index.js";
-import { ParameterQueryBuilder } from "./dashboard/parameter-query-builder.js";
 import { RequestDiffService } from "./dashboard/request-diff-service.js";
 import { FetchEventHandler } from "./fetch-event-handler.js";
 import { CustomerDomainDocumentResponse } from "./fetch-events/customer-domain-document-response.js";
@@ -26,13 +25,13 @@ import { OnboardingService } from "./onboarding-service.js";
 import { Cache } from "./request-cache/cache.js";
 import { InstallSpeedKitHtmlTemplate } from "./templates/install-speed-kit-html-template.js";
 import { InstallSpeedKitJsTemplate } from "./templates/install-speed-kit-js-template.js";
-// import { TodoCollector } from "./todo-collector";
 import { ExtensionValidator } from "./browser/extension/extension-validator.js";
 import { DevtoolsExtensionApi } from "./browser/extension/devtools-extension-api.js";
 import { TodoCollector } from "./todo-collector.js";
 import { Crawler } from "./virtual-orestes-app/crawler.js";
 import { VirtualOrestesApp } from "./virtual-orestes-app/index.js";
 import { ConfigApiContext, ConfigApiServiceFactory, } from "../config-api/index.js";
+import { account } from "baqend/cli";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { StaticRecipe } from "../integration-api/virtual/static-recipe.js";
@@ -41,6 +40,8 @@ import { ExtensionDownloader } from "./browser/extension/extension-downloader.js
 import { ExecutableValidator } from "./browser/executable/executable-validator.js";
 import { socksDispatcher } from "fetch-socks";
 import crypto from "node:crypto";
+import { QueryBuilderFactory } from "../query-builder/query-builder-factory.js";
+import { QueryTpe } from "../query-builder/query-builder-model.js";
 export class OnboardingServiceFactory {
     context;
     cliConfig;
@@ -81,10 +82,10 @@ export class OnboardingServiceFactory {
         const fileWatcher = new FileWatcher(cli, customerConfig, files, documentHandler, browserContext, cache);
         const athenaClient = (await this.getAthenaClient()) || null;
         const fetchHandler = await this.getFetchEventHandler(files, customerConfig, documentHandler, cache, cli, browserContext, athenaClient);
-        const messageHandler = this.prepareMessagehandler(athenaClient, files);
+        const messageHandler = await this.prepareMessagehandler(athenaClient, files, customerConfig);
         return new OnboardingService(browserContext, customerConfig, fetchHandler, fileWatcher, cli, messageHandler);
     }
-    prepareMessagehandler(athenaClient, files) {
+    async prepareMessagehandler(athenaClient, files, customerConfig) {
         const messageHandler = new DevtoolsExtensionApi();
         messageHandler.addMessage({
             id: "athena",
@@ -95,8 +96,23 @@ export class OnboardingServiceFactory {
             id: "todo",
             data: [...fileTodoCollector.getOpenTasks()],
         });
+        const appToken = await this.getAppToken(customerConfig.app);
+        if (appToken) {
+            messageHandler.addMessage({
+                id: "appToken",
+                data: { app: customerConfig.app, token: appToken },
+            });
+        }
         return messageHandler;
     }
+    async getAppToken(app) {
+        // skipInput=true -> fail instead of prompting when no valid login is cached
+        const result = await safe(account.login({ app, skipInput: true }));
+        if (result.success !== true) {
+            return null;
+        }
+        return result.data.token ?? null;
+    }
     async buildInstallResource(speedKitInstallContext, files, cli) {
         cli.startAction("ONBOARDING:BUILD:INSTALL_RESOURCE", "build file install_resource");
         const installResourceFile = new VirtualFile(INTEGRATION_FILES.BUILD.INSTALL, new InstallFileRecipe(speedKitInstallContext));
@@ -124,7 +140,11 @@ export class OnboardingServiceFactory {
         const serverConfig = await this.getSpeedKitServerConfig(configApi, cli);
         const agent = this.getCrawlerAgent(customerConfig, cli);
         const crawler = new Crawler(cli, agent, serverConfig);
-        const parameterQueryBuilder = new ParameterQueryBuilder(customerConfig, files.getByName(INTEGRATION_FILES.CONFIG.SPEED_KIT));
+        const parameterQueryBuilder = await new QueryBuilderFactory({
+            configName: this.context.configName,
+            customerPath: this.context.customerPath,
+            isWindows: this.cliConfig.runtimeConfig.windows,
+        }, this.cliConfig).buildService(QueryTpe.parameter);
         const DiffService = new DiffServiceFactory(new DiffContext(this.cliConfig.diffExec, this.cliConfig.diffExecTemplate)).getService();
         const requestDiffService = new RequestDiffService(DiffService, documentHandler);
         const handlers = [

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

@@ -8,6 +8,43 @@ export declare class Crawler {
     constructor(cli: CliService, agentConfig: Agent, speedKitServerConfig?: SpeedKitServerConfig);
     fetchRemote(originUrl: string, variation: string): Promise<Response>;
     private setDefaultUserAgent;
+    /**
+     * Mirrors how the Baqend asset server applies the `variations` block from
+     * the Speed Kit server config to outgoing origin fetches. The cookie /
+     * user-agent / etc. headers configured per variation must reach the origin
+     * so that the response matches what the variation is supposed to represent
+     * (e.g. a logged-in user, a specific store, a mobile device).
+     *
+     * Resolution order (matches Orestes server behavior):
+     *   1. The wildcard `"*"` variation (if any) — its headers always apply.
+     *   2. First-match-wins iteration over the remaining variations: for each
+     *      entry in declaration order, try an exact key match against
+     *      `variationParameter` first, then fall back to its Java-style
+     *      `regex` (e.g. `(?i)desktop-fmarkt-variant-(?<storeId>.*)`). The
+     *      first variation that matches by either means is applied — exact
+     *      matches do NOT take priority over regex matches in earlier
+     *      entries. When matched via regex, named capture groups are
+     *      substituted into header values via `${name}` placeholders, so a
+     *      cookie like `fmarktcookie=${storeId}` becomes
+     *      `fmarktcookie=2879130`.
+     *   3. Origin-level basic auth fallback (only if no variation matched).
+     */
     private prepareOriginRequest;
+    /**
+     * Replaces `${name}` placeholders in each header value with the matching
+     * named capture group from a regex match. Used by `prepareOriginRequest`
+     * to materialize parameterized variation headers — e.g. given:
+     *
+     *   headers = { cookie: "fmarktcookie=${storeId}" }
+     *   groups  = { storeId: "2879130" }
+     *
+     * the result is `{ cookie: "fmarktcookie=2879130" }`.
+     *
+     * Placeholders that don't match a captured group are left intact rather
+     * than replaced with `undefined`, so a misconfigured variation still
+     * produces a recognisable header value instead of a silent corruption.
+     * Non-string header values are passed through unchanged.
+     */
+    private substituteNamedGroups;
     private prepareAuthRequest;
 }

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

@@ -1,5 +1,6 @@
 import { USER_AGENT } from "../onboarding-model.js";
 import { safe } from "../../../helpers/safe.js";
+import { javaRegexToJs } from "../../../helpers/java-regex.js";
 import { randomUUID } from "node:crypto";
 export class Crawler {
     cli;
@@ -41,30 +42,110 @@ export class Crawler {
         }
         return USER_AGENT.DESKTOP;
     }
+    /**
+     * Mirrors how the Baqend asset server applies the `variations` block from
+     * the Speed Kit server config to outgoing origin fetches. The cookie /
+     * user-agent / etc. headers configured per variation must reach the origin
+     * so that the response matches what the variation is supposed to represent
+     * (e.g. a logged-in user, a specific store, a mobile device).
+     *
+     * Resolution order (matches Orestes server behavior):
+     *   1. The wildcard `"*"` variation (if any) — its headers always apply.
+     *   2. First-match-wins iteration over the remaining variations: for each
+     *      entry in declaration order, try an exact key match against
+     *      `variationParameter` first, then fall back to its Java-style
+     *      `regex` (e.g. `(?i)desktop-fmarkt-variant-(?<storeId>.*)`). The
+     *      first variation that matches by either means is applied — exact
+     *      matches do NOT take priority over regex matches in earlier
+     *      entries. When matched via regex, named capture groups are
+     *      substituted into header values via `${name}` placeholders, so a
+     *      cookie like `fmarktcookie=${storeId}` becomes
+     *      `fmarktcookie=2879130`.
+     *   3. Origin-level basic auth fallback (only if no variation matched).
+     */
     prepareOriginRequest(originUrl, variationParameter, init) {
         if (!this.speedKitServerConfig) {
             return init;
         }
-        if (this.speedKitServerConfig.speedKit.variations?.["*"]) {
-            const config = this.speedKitServerConfig.speedKit.variations["*"];
+        const variations = this.speedKitServerConfig.speedKit.variations;
+        // Wildcard variation headers apply to every request, regardless of which
+        // specific variation (if any) is requested.
+        if (variations?.["*"]) {
+            const config = variations["*"];
             init.headers = { ...init.headers, ...config.headers };
         }
         if (!variationParameter) {
             return init;
         }
-        for (const variationKey in this.speedKitServerConfig.speedKit.variations) {
+        // First-match-wins over the variations in declaration order. Each entry
+        // can match by exact key or by its Java-style `regex` field; whichever
+        // entry matches first applies its headers and short-circuits the rest.
+        for (const variationKey in variations) {
+            if (variationKey === "*") {
+                continue;
+            }
+            const variationConfig = variations[variationKey];
             if (variationParameter === variationKey) {
-                const variationConfig = this.speedKitServerConfig.speedKit.variations[variationKey];
                 init.headers = { ...init.headers, ...variationConfig.headers };
                 return init;
             }
+            if (!variationConfig.regex) {
+                continue;
+            }
+            const regex = javaRegexToJs(variationConfig.regex);
+            if (!regex) {
+                // Unsupported Java regex construct — skip rather than crash so later
+                // variations still get a chance to match.
+                continue;
+            }
+            const match = variationParameter.match(regex);
+            if (!match) {
+                continue;
+            }
+            init.headers = {
+                ...init.headers,
+                ...this.substituteNamedGroups(variationConfig.headers, match.groups),
+            };
+            return init;
         }
+        // No variation matched: fall back to origin basic auth if configured.
         const authentication = this.prepareAuthRequest(originUrl);
         if (authentication) {
             init.headers["Authorization"] = authentication;
         }
         return init;
     }
+    /**
+     * Replaces `${name}` placeholders in each header value with the matching
+     * named capture group from a regex match. Used by `prepareOriginRequest`
+     * to materialize parameterized variation headers — e.g. given:
+     *
+     *   headers = { cookie: "fmarktcookie=${storeId}" }
+     *   groups  = { storeId: "2879130" }
+     *
+     * the result is `{ cookie: "fmarktcookie=2879130" }`.
+     *
+     * Placeholders that don't match a captured group are left intact rather
+     * than replaced with `undefined`, so a misconfigured variation still
+     * produces a recognisable header value instead of a silent corruption.
+     * Non-string header values are passed through unchanged.
+     */
+    substituteNamedGroups(headers, groups) {
+        if (!headers) {
+            return {};
+        }
+        if (!groups) {
+            return { ...headers };
+        }
+        const result = {};
+        for (const [key, value] of Object.entries(headers)) {
+            result[key] =
+                typeof value === "string"
+                    ? value.replace(/\$\{(\w+)}/g, (match, name) => groups[name] ?? match)
+                    : value;
+        }
+        return result;
+    }
     prepareAuthRequest(originUrl) {
         if (!this.speedKitServerConfig ||
             this.speedKitServerConfig.speedKit?.authentications?.length < 1) {

package/dist/services/query-builder/query-builder-service.d.ts

@@ -6,5 +6,6 @@ export declare class QueryBuilderService {
     private cli;
     constructor(context: QueryBuilderContext, speedKitConfig: SpeedKitConfig, cli: CliServiceInterface);
     run(): Promise<void>;
+    query(): string;
     private buildQuery;
 }

package/dist/services/query-builder/query-builder-service.js

@@ -43,6 +43,15 @@ export class QueryBuilderService {
             this.cli.writeSuccess("Result has been copied to the clipboard 📋");
         }
     }
+    query() {
+        const parameters = getStrippedParameters(this.speedKitConfig);
+        const parameterReplaceFilter = getParameterReplaceFilter(parameters, getSpeedKitConfigVersion(this.speedKitConfig));
+        const whitelistedFilter = getWhitelistedFilter(this.speedKitConfig);
+        const blacklistedFilter = getBlacklistedFilter(this.speedKitConfig);
+        const skConfigVersion = getSpeedKitConfigVersion(this.speedKitConfig);
+        const parameterFilter = getParameterFilter(parameters, skConfigVersion);
+        return this.buildQuery(this.context.app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter);
+    }
     buildQuery(app, parameterFilter, whitelistedFilter, blacklistedFilter, parameterReplaceFilter) {
         if (this.context.queryType === QueryTpe.prewarm) {
             return new Prewarm(app, whitelistedFilter, blacklistedFilter, parameterReplaceFilter).query;

package/oclif.manifest.json

@@ -751,5 +751,5 @@
       ]
     }
   },
-  "version": "4.1.0"
+  "version": "4.2.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -82,16 +82,16 @@
   "types": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@aws-sdk/client-athena": "^3.529",
+    "@aws-sdk/client-athena": "^3.1045.0",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^10.0.1",
     "@inquirer/prompts": "^8.4.2",
-    "@oclif/core": "^4.10.5",
+    "@oclif/core": "^4.10.6",
     "@oclif/errors": "^1.3.6",
-    "@oclif/plugin-autocomplete": "^3.2.45",
-    "@oclif/plugin-help": "^6.2.44",
-    "@oclif/plugin-not-found": "^3.2.80",
-    "@oclif/plugin-warn-if-update-available": "^3.1.60",
+    "@oclif/plugin-autocomplete": "^3.2.46",
+    "@oclif/plugin-help": "^6.2.45",
+    "@oclif/plugin-not-found": "^3.2.81",
+    "@oclif/plugin-warn-if-update-available": "^3.1.61",
     "baqend": "^4.2.5",
     "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
@@ -106,11 +106,10 @@
     "fluent-ffmpeg": "^2.1.3",
     "fs-extra": "^11.3.4",
     "handlebars": "^4.7.9",
-    "htmlfy": "^1.0.1",
     "iconv-lite": "^0.7.2",
     "json2csv": "^6.0.0-alpha.2",
     "node-fetch": "^3.3.2",
-    "nypm": "^0.6.5",
+    "nypm": "^0.6.6",
     "puppeteer": "^24.41.0",
     "puppeteer-extra": "^3.3.6",
     "semver": "^7.7.4",