@speedkit/cli 2.56.0 → 2.57.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.57.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.56.1...v2.57.0) (2024-09-17)
+
+
+### Features
+
+* **pop-prewarming:** support static url prefixes before the country specific codes ([926fd02](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/926fd02c01877e2059739b01bea7af2fd7be56b5))
+
+## [2.56.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.56.0...v2.56.1) (2024-09-16)
+
+
+### Bug Fixes
+
+* remove breaking comma ([acb2d22](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/acb2d226356725f8da2ede03c5041b29dd8ddf01))
+* remove uadevice from prewarmQuery ([52b91f7](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/52b91f770f7e2a815e05f4e94dbd3d2458418d62))
+
 # [2.56.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.55.0...v2.56.0) (2024-09-10)
 
 

package/README.md

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

package/dist/commands/build-prewarm-query.js

@@ -26,8 +26,7 @@ class BuildPrewarmQuery extends core_1.Command {
         return `
 select url
 from (
-select regexp_replace(regexp_replace(${parameterReplaceFilter}, '(^[^&?]*)&','$1?'), '\\?$','') as url,
-uadevice
+select regexp_replace(regexp_replace(${parameterReplaceFilter}, '(^[^&?]*)&','$1?'), '\\?$','') as url
 from live.rum.pi
 where app = '${app}'
   and date >= '${date}'

package/dist/commands/generate-pop-config.d.ts

@@ -17,6 +17,16 @@ export default class GeneratePopConfig extends Command {
     deployPrewarmingConfig(app: string, config: string, deploy: boolean | undefined): Promise<void>;
     run(): Promise<void>;
     private byHitsDesc;
+    /**
+     * Comparator function to sort OriginStats objects by their origin property in descending order.
+     * The comparison is primarily done based on the depth of the path (number of slashes).
+     * If the path depth is the same for both objects, a secondary comparison is done based on the path.
+     *
+     * @param a - The first OriginStats object to compare.
+     * @param b - The second OriginStats object to compare.
+     * @return Returns a negative number if `a` should appear before `b`, a positive number if `a` should appear after `b`, or zero if the objects are equivalent.
+     */
+    private byOriginDesc;
     private computeCoverageAndShare;
     private generateOriginStats;
     private generatePopConfig;

package/dist/commands/generate-pop-config.js

@@ -150,7 +150,22 @@ class GeneratePopConfig extends core_1.Command {
         // @todo refactor businessCode from this command to src/pop-config/pop-config-service
         const popConfigService = await new pop_config_1.PopConfigFactory().getService();
         const result = await popConfigService.getUsedPopsPerOrigin(app, useRum);
-        const originStats = this.generateOriginStats(result).filter((stats) => stats.hits > 1000);
+        const originStats = this.generateOriginStats(result)
+            .filter((stats) => {
+            if (stats.hits < 100)
+                return false;
+            try {
+                const url = new URL(stats.origin);
+                const isDevelopmentDomain = url.hostname.includes("localhost") ||
+                    url.hostname.includes(".local") ||
+                    url.port !== "";
+                return !isDevelopmentDomain;
+            }
+            catch {
+                return false; // unparsable origin
+            }
+        })
+            .sort(this.byOriginDesc); // make the pop config order deterministic
         this.printStats(originStats, coverage / 100, minimalShare / 100, popLimit, forceShield);
         const popConfig = this.generatePopConfig(originStats, coverage / 100, minimalShare / 100, popLimit, forceShield);
         await this.deployPrewarmingConfig(app, popConfig, deploy);
@@ -158,6 +173,21 @@ class GeneratePopConfig extends core_1.Command {
     byHitsDesc(a, b) {
         return b.hits - a.hits;
     }
+    /**
+     * Comparator function to sort OriginStats objects by their origin property in descending order.
+     * The comparison is primarily done based on the depth of the path (number of slashes).
+     * If the path depth is the same for both objects, a secondary comparison is done based on the path.
+     *
+     * @param a - The first OriginStats object to compare.
+     * @param b - The second OriginStats object to compare.
+     * @return Returns a negative number if `a` should appear before `b`, a positive number if `a` should appear after `b`, or zero if the objects are equivalent.
+     */
+    byOriginDesc(a, b) {
+        const pathDepth = b.origin.match(/\//g).length - a.origin.match(/\//g).length;
+        if (pathDepth !== 0)
+            return pathDepth;
+        return a.origin < b.origin ? -1 : 1;
+    }
     computeCoverageAndShare(totalHits, segmentedStats) {
         segmentedStats = segmentedStats.sort(this.byHitsDesc);
         let segmentHits = 0;

package/dist/services/pop-config/pop-config-service.js

@@ -10,7 +10,7 @@ class PopConfigService {
         const query = `
       with data as (select *,
                            coalesce('https://' || url_extract_host(assetUrl) ||
-                                    regexp_extract(url_extract_path(assetUrl), '(?i)/([a-z]{2}([-/_][a-z]{2})*/)', 0),
+                                    regexp_extract(url_extract_path(assetUrl), '(?i)((/\\w+)?/[a-z]{2}([-/_][a-z]{2})*/)', 0),
                                     'Unknown') as originWithPrefix
                     from fastly.logs
                     where date between ? and ?

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.56.0"
+  "version": "2.57.0"
 }

package/package.json

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