@speedkit/cli 2.6.0 → 2.8.0

package/README.md

@@ -74,7 +74,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.6.0 linux-x64 node-v20.11.1
+@speedkit/cli/2.8.0 linux-x64 node-v20.11.1
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/services/onboarding/fetch-events/speed-kit-asset-request.d.ts

@@ -1,5 +1,5 @@
 import Protocol from "devtools-protocol";
-import { FetchRequestPausedEventHandler } from "../onboarding-model";
+import { FetchRequestPausedEventHandler, SpeedKitServerConfig } from "../onboarding-model";
 import CustomerConfig from "../../integration-api/struct/customer-config";
 import { DocumentHandlerServer } from "../../document-handler-runtime/document-handler-server";
 import { AbortResponse } from "../browser/abort-response";
@@ -13,8 +13,9 @@ export declare class SpeedKitAssetRequest implements FetchRequestPausedEventHand
     private documentHandler;
     private cache;
     private cli;
+    private speedKitServerConfig?;
     get patterns(): Protocol.Fetch.RequestPattern[];
-    constructor(customerConfig: CustomerConfig, documentHandler: DocumentHandlerServer, cache: Cache, cli: CliService);
+    constructor(customerConfig: CustomerConfig, documentHandler: DocumentHandlerServer, cache: Cache, cli: CliService, speedKitServerConfig?: SpeedKitServerConfig);
     handle(event: Protocol.Fetch.RequestPausedEvent): Promise<Partial<Protocol.Fetch.FulfillRequestRequest> | AbortResponse>;
     private getCachedResponse;
     private buildCustomHeaders;
@@ -23,4 +24,5 @@ export declare class SpeedKitAssetRequest implements FetchRequestPausedEventHand
     private isHtmlContentHeader;
     private isValidHtmlContent;
     private rewriteInstallResource;
+    private prepareOriginRequest;
 }

package/dist/services/onboarding/fetch-events/speed-kit-asset-request.js

@@ -10,6 +10,7 @@ class SpeedKitAssetRequest {
     documentHandler;
     cache;
     cli;
+    speedKitServerConfig;
     get patterns() {
         let result = [];
         for (const origin of this.customerConfig.origins) {
@@ -29,11 +30,12 @@ class SpeedKitAssetRequest {
         }
         return result;
     }
-    constructor(customerConfig, documentHandler, cache, cli) {
+    constructor(customerConfig, documentHandler, cache, cli, speedKitServerConfig) {
         this.customerConfig = customerConfig;
         this.documentHandler = documentHandler;
         this.cache = cache;
         this.cli = cli;
+        this.speedKitServerConfig = speedKitServerConfig;
     }
     async handle(event) {
         const originUrl = this.getAssetUrl(event.request.url);
@@ -43,7 +45,7 @@ class SpeedKitAssetRequest {
         if (cachedResponse instanceof baqend_response_1.BaqendResponse) {
             return cachedResponse;
         }
-        const response = await fetch(originUrl, { headers: (event.request.headers) });
+        const response = await fetch(originUrl, this.prepareOriginRequest(variation, { headers: (event.request.headers) }));
         const customHeaders = this.buildCustomHeaders(originUrl);
         if (response.headers.get('Content-Type').includes('image') || response.headers.get('Content-Type').includes('font')) {
             return;
@@ -134,5 +136,17 @@ class SpeedKitAssetRequest {
             return `${head}\n<script src="${this.customerConfig.installPath}" ${this.customerConfig.installParams}></script>`;
         });
     }
+    prepareOriginRequest(variationParam, init) {
+        if (!this.speedKitServerConfig || !variationParam) {
+            return init;
+        }
+        const variation = variationParam.toUpperCase();
+        if (!(variation in this.speedKitServerConfig.speedKit.variations)) {
+            return init;
+        }
+        const variationConfig = this.speedKitServerConfig.speedKit.variations[variation];
+        init.headers = { ...init.headers, ...variationConfig.headers };
+        return init;
+    }
 }
 exports.SpeedKitAssetRequest = SpeedKitAssetRequest;

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

@@ -29,3 +29,41 @@ export type awsCredentials = {
     accessKeyId: string;
     secretAccessKey: string;
 };
+export type SpeedKitServerConfigAuthentication = {
+    "user": string;
+    "password": string;
+    "uri": string;
+    "type": "basic";
+};
+export type SpeedKitServerConfigVariation = {
+    [key: string]: {
+        "headers"?: {
+            "cookie"?: string;
+        };
+        "urlPrefix"?: string;
+        "encodePrefixedUrl"?: boolean;
+        "queryParams"?: [];
+        "regex"?: null | string;
+    };
+};
+export type SpeedKitServerConfig = {
+    "speedKit": {
+        "httpAuthUser": null | string;
+        "httpAuthPass": null | string;
+        "httpAuthURI": null | string;
+        "httpAuthType": "basic";
+        "defaultAssetRequestsPerSecond": number;
+        "globalMinAssetRequestsPerSecond": number;
+        "globalMaxAssetRequestsPerSecond": number;
+        "assetRequestRateScaleUpStep": number;
+        "assetRequestRateScaleDownFactor": number;
+        "assetRequestRateLimitUpperTTFBLimit": number;
+        "assetRequestRateLimitLowerTTFBLimit": number;
+        "maxRevalidationWindowSize": number;
+        "minMaxAge": number;
+        "assetStreamingRateLimitTimeoutMs": 2000;
+        "streamRateLimit": number;
+        "authentications": SpeedKitServerConfigAuthentication[];
+        "variations": SpeedKitServerConfigVariation;
+    };
+};

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

@@ -39,6 +39,7 @@ const virtual_file_1 = require("../integration-api/struct/virtual-file");
 const install_file_recipe_1 = require("./config-renderer/install-file-recipe");
 const files_1 = require("../../models/files");
 const speed_kit_rum_pi_request_1 = require("./fetch-events/speed-kit-rum-pi-request");
+const server_config_1 = require("./server-config");
 class OnboardingServiceFactory {
     context;
     cliConfig;
@@ -104,7 +105,8 @@ class OnboardingServiceFactory {
             new speed_kit_service_worker_js_1.SpeedKitServiceWorkerJs(customerConfig, files.getByName(files_1.INTEGRATION_FILES.CUSTOM.SW)),
         ];
         if (this.context.local) {
-            handlers.push(new speed_kit_asset_request_1.SpeedKitAssetRequest(customerConfig, documentHandler, cache, cli));
+            const speedKitConfigLoader = new server_config_1.ServerConfig(cli, configApi);
+            handlers.push(new speed_kit_asset_request_1.SpeedKitAssetRequest(customerConfig, documentHandler, cache, cli, await speedKitConfigLoader.getServerSpeedKitConfig()));
             handlers.push(new speed_kit_rum_pi_request_1.SpeedKitRumPiRequest(customerConfig, cache, cli));
         }
         const athenaClient = await this.getAthenaClient(cli);

package/dist/services/onboarding/server-config/index.d.ts

@@ -0,0 +1,10 @@
+import { CliService } from "../../cli";
+import ConfigApiService from "../../config-api/config-api-service";
+import { SpeedKitServerConfig } from "../onboarding-model";
+export declare class ServerConfig {
+    private cli;
+    private client?;
+    constructor(cli: CliService, client?: ConfigApiService);
+    getServerSpeedKitConfig(): Promise<SpeedKitServerConfig | null>;
+    private getServerConfig;
+}

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

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServerConfig = void 0;
+const cli_1 = require("../../cli");
+const safe_1 = require("../../../helpers/safe");
+class ServerConfig {
+    cli;
+    client;
+    constructor(cli, client) {
+        this.cli = cli;
+        this.client = client;
+    }
+    async getServerSpeedKitConfig() {
+        const serverConfig = await this.getServerConfig();
+        if (!serverConfig) {
+            return;
+        }
+        return JSON.parse(serverConfig);
+    }
+    async getServerConfig() {
+        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);
+            this.cli.writeError(`unable to load serverConfig: ${serverConfigResponse.error}`);
+            return;
+        }
+        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+        return serverConfigResponse.data;
+    }
+}
+exports.ServerConfig = ServerConfig;

package/oclif.manifest.json

@@ -696,5 +696,5 @@
       ]
     }
   },
-  "version": "2.6.0"
+  "version": "2.8.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.6.0",
+  "version": "2.8.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -14,14 +14,14 @@
     "access": "public"
   },
   "scripts": {
-    "postinstall": "husky install",
+    "prepare": "husky install",
     "lint": "eslint --ext .ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --fix --ext .ts,.vue --ignore-path .gitignore src",
     "prebuild": "shx rm -rf dist",
     "build": "tsc -b && copyfiles -u 1 src/**/*hbs ./dist && copyfiles -u 1 src/**/*js ./dist && npm run build-dashboard",
     "build-dashboard": "copyfiles -u 1 src/services/onboarding/dashboard/frontend-dist/**/*.html dist && copyfiles -u 1 src/services/onboarding/dashboard/frontend-dist/**/*.js dist && copyfiles -u 1 src/services/onboarding/dashboard/frontend-dist/**/*.css dist",
     "postbuild": "oclif manifest && oclif readme",
-    "prepack": "npm run build && oclif manifest && oclif readme",
+    "prepack": "npm run build",
     "postpack": "rimraf rm -f oclif.manifest.json",
     "test": "mocha \"test/**/*.test.ts\"",
     "coverage": "nyc --extension .ts mocha \"test/**/*.test.ts\""