@speedkit/cli 2.58.0 → 2.60.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.60.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.59.0...v2.60.0) (2024-10-14)
+
+
+### Features
+
+* **customer-config:** extend default blacklist ([84f4844](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/84f48441086312d4621901ed9deff89e472fe393))
+
+# [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)
 
 

package/README.md

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

package/dist/services/customer-config/templates/config_SpeedKit.js.hbs

@@ -153,17 +153,22 @@
           // TODO: adjust/replace this exemplary list
 
           // Login & Account:
-          /\/account/i,
+          /account/i,
+          /profile/i,
           /password/i,
           /registration/i,
           /register/i,
           /login/i,
           /authenticate/i,
+          /wish(?:-)list/i,
 
           // Checkout & Payment:
-          /\/cart/i,
-          /\/basket/i,
+          /cart/i,
+          /basket/i,
           /checkout/i,
+          /order/i,
+          /success/i,
+          /confirmation/i,
           /payment/i,
           /paypal/i,
           /klarna/i,
@@ -183,14 +188,9 @@
 {{#if isPlentymarkets}}
 
           // Plentymarkets specific:
-          /\/mein-warenkorb/i,
-          /\/mein-checkout/i,
-          /\/my-account/i,
-          /\/myaccount/i,
-          /\/mein-kundenkonto/i,
-          /\/wish-list/i,
           /\/rest/i, // REST API
-          /place-order/i,
+          /kundenkonto/i,
+          /warenkorb/i,
 {{/if}}
 {{#if isSalesforce}}
 

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.58.0"
+  "version": "2.60.0"
 }

package/package.json

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