@speedkit/cli 2.57.1 → 2.59.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.59.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.58.0...v2.59.0) (2024-10-08)
+
+
+### Features
+
+* **prewarm:** handle rateLimiter on retry ([b744295](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/b7442959fded70807d7d0d6ae4e58cc4afa756f3))
+* **prewarm:** increase rateLimit after successfull batch ([d112927](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/d11292731b0151a0e467b595630673f452bdf845))
+
+# [2.58.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.57.1...v2.58.0) (2024-09-27)
+
+
+### Features
+
+* throw error if response of local docHandler is empty ([61fa850](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/61fa850077b983f6038f672b73f76c9b553aa2d3))
+
 ## [2.57.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.57.0...v2.57.1) (2024-09-26)
 
 

package/README.md

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

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

@@ -13,6 +13,8 @@ const files_1 = require("../../models/files");
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 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");
 class DocumentHandlerServer {
     customerConfig;
     files;
@@ -62,23 +64,20 @@ class DocumentHandlerServer {
         const script = new vm.Script(this.documentHandlerConfigCode + this.getTransformFunctionWrapper(), {
             filename: this.files.getByName("config_documentHandler").path,
         });
-        try {
-            return await (async () => {
-                return await new Promise((resolve, reject) => {
-                    vmContext.skInternalResponse.resolve = resolve;
-                    // @ts-expect-error reject is unknown
-                    vmContext.reject = reject;
-                    const context = vm.createContext(vmContext);
-                    script.runInContext(context, { displayErrors: true });
-                });
-            })();
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                throw new vm_error_1.VmError(error.message);
+        const vmResponse = await (0, safe_1.safe)(new Promise((resolve, reject) => {
+            vmContext.skInternalResponse.resolve = resolve;
+            // @ts-expect-error reject is unknown
+            vmContext.reject = reject;
+            const context = vm.createContext(vmContext);
+            script.runInContext(context, { displayErrors: true });
+        }));
+        if (vmResponse.success === true) {
+            if (!vmResponse.data.body || vmResponse.data.body?.length === 0) {
+                throw new vm_empty_response_error_1.VmEmptyResponseError(`documentHandlerResponse is empty for url: ${url}`);
             }
-            throw new vm_error_1.VmError(String(error) + JSON.stringify(error));
+            return vmResponse.data;
         }
+        throw new vm_error_1.VmError(vmResponse.error + JSON.stringify(vmResponse.errorObj));
     }
     getTransformFunctionWrapper() {
         return `\n\npost(db, skInternalRequest, skInternalResponse).catch((err)=>{reject(err);});`;

package/dist/services/onboarding/error/vm-empty-response-error.d.ts

@@ -0,0 +1,5 @@
+import ApplicationError from "../../error-handling/error/application-error";
+export declare class VmEmptyResponseError extends ApplicationError {
+    readonly code = "VM_EMPTY_RESPONSE_ERROR";
+    readonly suggestions: string[];
+}

package/dist/services/onboarding/error/vm-empty-response-error.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VmEmptyResponseError = void 0;
+const tslib_1 = require("tslib");
+const application_error_1 = tslib_1.__importDefault(require("../../error-handling/error/application-error"));
+class VmEmptyResponseError extends application_error_1.default {
+    code = "VM_EMPTY_RESPONSE_ERROR";
+    suggestions = [
+        "You may forgot to return html somewhere, check config_documentHandler!",
+    ];
+}
+exports.VmEmptyResponseError = VmEmptyResponseError;

package/dist/services/prewarm/assets/asset-api-client.d.ts

@@ -4,10 +4,14 @@ export declare class AssetApiClient {
     private sortParameters;
     private agent;
     private rateLimit;
+    private lowestRateLimit;
+    private isRetry;
     constructor(authenticationToken: string, app: string, sortParameters: boolean);
     fetchURL(url: string, variation: string): Promise<Response>;
+    setIsRetry(): void;
     getRateLimit(): number;
     reduceMaxRequestsPerSecond(): void;
+    increaseMaxRequestsPerSecond(): void;
     private isValidUrl;
     private setRateLimit;
 }

package/dist/services/prewarm/assets/asset-api-client.js

@@ -16,7 +16,9 @@ class AssetApiClient {
         keepAlive: true,
         rejectUnauthorized: false,
     });
-    rateLimit = __1.DEFAULT_MAX_REQUESTS_PER_SECOND;
+    rateLimit = __1.DEFAULT_REQUESTS_PER_SECOND;
+    lowestRateLimit = __1.DEFAULT_REQUESTS_PER_SECOND;
+    isRetry = false;
     constructor(authenticationToken, app, sortParameters) {
         this.authenticationToken = authenticationToken;
         this.app = app;
@@ -39,11 +41,23 @@ class AssetApiClient {
             method: "HEAD",
         });
     }
+    setIsRetry() {
+        this.isRetry = true;
+        this.rateLimit = this.lowestRateLimit;
+    }
     getRateLimit() {
         return this.rateLimit;
     }
     reduceMaxRequestsPerSecond() {
         this.setRateLimit(this.rateLimit * __1.RATE_LIMIT_MULTIPLICATOR);
+        if (this.rateLimit < this.lowestRateLimit) {
+            this.lowestRateLimit = this.rateLimit;
+        }
+    }
+    increaseMaxRequestsPerSecond() {
+        if (this.rateLimit + 1 <= __1.MAX_REQUESTS_PER_SECOND && !this.isRetry) {
+            this.setRateLimit(this.rateLimit + 1);
+        }
     }
     isValidUrl(url) {
         if (!node_url_1.URL.canParse(url)) {

package/dist/services/prewarm/pre-warm-model.d.ts

@@ -28,7 +28,8 @@ export declare enum ItemStatus {
 export declare const MIN_TIME_TO_FETCH_BATCH = 1000;
 export declare const FETCH_TIMEOUT = 10000;
 export declare const TIMOUT_AFTER_DETECTED_RATE_LIMIT = 5000;
-export declare const DEFAULT_MAX_REQUESTS_PER_SECOND = 15;
+export declare const DEFAULT_REQUESTS_PER_SECOND = 10;
+export declare const MAX_REQUESTS_PER_SECOND = 20;
 export declare const RATE_LIMIT_MULTIPLICATOR = 0.8;
 export declare const RATE_LIMIT_CODES: string[];
 export declare const TIMING_HEADER_ERROR_CODE_SELECTOR: RegExp;

package/dist/services/prewarm/pre-warm-model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_VARIATION = exports.VARIATION_SEPARATOR = exports.PROGRESS_BAR_FORMAT = exports.TIMING_HEADER_KEY = exports.TIMING_HEADER_ERROR_CODE_SELECTOR = exports.RATE_LIMIT_CODES = exports.RATE_LIMIT_MULTIPLICATOR = exports.DEFAULT_MAX_REQUESTS_PER_SECOND = exports.TIMOUT_AFTER_DETECTED_RATE_LIMIT = exports.FETCH_TIMEOUT = exports.MIN_TIME_TO_FETCH_BATCH = exports.ItemStatus = exports.PreWarmContext = void 0;
+exports.DEFAULT_VARIATION = exports.VARIATION_SEPARATOR = exports.PROGRESS_BAR_FORMAT = exports.TIMING_HEADER_KEY = exports.TIMING_HEADER_ERROR_CODE_SELECTOR = exports.RATE_LIMIT_CODES = exports.RATE_LIMIT_MULTIPLICATOR = exports.MAX_REQUESTS_PER_SECOND = exports.DEFAULT_REQUESTS_PER_SECOND = exports.TIMOUT_AFTER_DETECTED_RATE_LIMIT = exports.FETCH_TIMEOUT = exports.MIN_TIME_TO_FETCH_BATCH = exports.ItemStatus = exports.PreWarmContext = void 0;
 class PreWarmContext {
     app;
     path;
@@ -28,7 +28,8 @@ var ItemStatus;
 exports.MIN_TIME_TO_FETCH_BATCH = 1000;
 exports.FETCH_TIMEOUT = 10_000;
 exports.TIMOUT_AFTER_DETECTED_RATE_LIMIT = 5000;
-exports.DEFAULT_MAX_REQUESTS_PER_SECOND = 15;
+exports.DEFAULT_REQUESTS_PER_SECOND = 10;
+exports.MAX_REQUESTS_PER_SECOND = 20;
 exports.RATE_LIMIT_MULTIPLICATOR = 0.8;
 exports.RATE_LIMIT_CODES = ["308", "310", "316"];
 exports.TIMING_HEADER_ERROR_CODE_SELECTOR = /errorcode;desc=([^,]*),/;

package/dist/services/prewarm/pre-warm-service.js

@@ -63,6 +63,7 @@ class PreWarmService {
             .getByStatus(_1.ItemStatus.RETRY)
             .map((entry) => entry.url);
         const retryList = this.generateAssetRequestList(urlsToRetry);
+        this.assetClient.setIsRetry();
         await this.fetchUrls(retryList);
         await this.printSummary(retryList);
     }
@@ -152,7 +153,9 @@ class PreWarmService {
         if (retryCount > 0) {
             await this.sleep(_1.TIMOUT_AFTER_DETECTED_RATE_LIMIT);
             this.assetClient.reduceMaxRequestsPerSecond();
+            return;
         }
+        this.assetClient.increaseMaxRequestsPerSecond();
     }
     showMinimalStatusUpdate(batch, assetList) {
         if (!this.cli.quiet) {

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.57.1"
+  "version": "2.59.0"
 }

package/package.json

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