@cloudcommerce/cli 2.1.0 → 2.2.0

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @cloudcommerce/cli@2.0.9 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
+> @cloudcommerce/cli@2.1.0 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
 > bash ../../scripts/build-lib.sh
 

package/ci/bunny-config-base.sh

@@ -5,11 +5,16 @@ if [ -z "$BUNNYNET_API_KEY" ]; then
   exit 1
 fi
 if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
   echo "Provide the domain as the first argument"
   exit 1
 fi
 
-domain=$1
+project_id=$1
+domain=$2
 
 response=$(curl --silent --request GET \
   --url https://api.bunny.net/pullzone \
@@ -51,9 +56,7 @@ curl --silent --request POST \
     "css"
   ],
   "EnableAccessControlOriginHeader": true,
-  "DisableCookies": false,
-  "EnableOriginShield": true,
-  "CacheControlMaxAgeOverride": -1,
+  "DisableCookies": true,
   "CacheControlPublicMaxAgeOverride": -1,
   "BurstSize": 0,
   "RequestLimit": 0,
@@ -70,11 +73,8 @@ curl --silent --request POST \
   "EnableAvifVary": false,
   "EnableCountryCodeVary": false,
   "EnableMobileVary": false,
-  "EnableCookieVary": true,
-  "CookieVaryParameters": [
-    "bid",
-    "branch"
-  ],
+  "EnableCookieVary": false,
+  "CookieVaryParameters": [],
   "EnableHostnameVary": false,
   "LoggingIPAnonymizationEnabled": true,
   "EnableTLS1": true,
@@ -87,7 +87,6 @@ curl --silent --request POST \
   "LogForwardingEnabled": false,
   "LoggingSaveToStorage": false,
   "FollowRedirects": false,
-  "PermaCacheStorageZoneId": 0,
   "OriginRetries": 0,
   "OriginConnectTimeout": 5,
   "OriginResponseTimeout": 15,
@@ -112,7 +111,7 @@ curl --silent --request POST \
   "LogForwardingFormat": 1,
   "ShieldDDosProtectionType": 1,
   "ShieldDDosProtectionEnabled": false,
-  "EnableRequestCoalescing": true,
+  "EnableRequestCoalescing": false,
   "RequestCoalescingTimeout": 30,
   "DisableLetsEncrypt": false,
   "EnableBunnyImageAi": false,
@@ -162,8 +161,65 @@ configure_edge_rule "APIs bypass CDN cache" '
       "Parameter1": ""
     }
   ],
-  "TriggerMatchingType": 0,
+  "TriggerMatchingType": 1,
   "Description": "APIs bypass CDN cache",
   "Enabled": true
 }
 '
+
+configure_edge_rule "APIs bypass perma-cache" '
+{
+  "ActionType": 15,
+  "ActionParameter1": null,
+  "ActionParameter2": null,
+  "Triggers": [
+    {
+      "Type": 0,
+      "PatternMatches": [
+        "*/_api/*",
+        "*/_feeds/*",
+        "*/.*/git/*",
+        "*/_analytics"
+      ],
+      "PatternMatchingType": 0,
+      "Parameter1": ""
+    }
+  ],
+  "TriggerMatchingType": 1,
+  "Description": "APIs bypass perma-cache",
+  "Enabled": true
+}
+'
+
+configure_edge_rule "SSR browser cache" '
+{
+  "ActionType": 16,
+  "ActionParameter1": "120",
+  "ActionParameter2": null,
+  "Triggers": [
+    {
+      "Type": 0,
+      "PatternMatches": [
+        "*/_astro/*"
+      ],
+      "PatternMatchingType": 2,
+      "Parameter1": ""
+    },
+    {
+      "Type": 3,
+      "PatternMatches": [
+        "webp",
+        "png",
+        "jpg",
+        "woff2",
+        "mp4"
+      ],
+      "PatternMatchingType": 2,
+      "Parameter1": ""
+    }
+  ],
+  "TriggerMatchingType": 1,
+  "Description": "SSR browser cache",
+  "Enabled": true
+}
+'

package/ci/bunny-prepare-ab.sh

@@ -5,17 +5,17 @@ if [ -z "$BUNNYNET_API_KEY" ]; then
   exit 1
 fi
 if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
   echo "Provide the domain as the first argument"
   exit 1
 fi
 
-domain=$1
-channel_url=$2
-
-curl --request POST \
-  --url "https://api.bunny.net/purge?url=https://$domain/&async=false" \
-  --header "AccessKey: $BUNNYNET_API_KEY"
-echo "> Purged https://$domain/ cache"
+project_id=$1
+domain=$2
+channel_url=$3
 
 base_uri=""
 additional_patterns=()
@@ -27,16 +27,12 @@ fetch_and_purge() {
 
   for slug in $slugs; do
     if [ -n "$slug" ]; then
-      curl --request POST \
-        --url "https://api.bunny.net/purge?url=https://$domain/$slug" \
-        --header "AccessKey: $BUNNYNET_API_KEY"
       additional_patterns+=("\"https://$domain/$slug\"")
-      echo "> Purged https://$domain/$slug cache"
     fi
   done
 }
 
-if [ ! -z "$ECOM_STORE_ID" ]; then
+if [ -n "$ECOM_STORE_ID" ]; then
   base_uri="https://ecomplus.io/v2/:$ECOM_STORE_ID/"
 
   fetch_and_purge 'products?fields=slug&sort=-sales&limit=2'
@@ -119,31 +115,31 @@ ab_testing_data="
   \"Enabled\": true
 }"
 
-ab_testing_cookie_data="
+ab_testing_bypass_data="
 {
-  \"ActionType\": 2,
-  \"ActionParameter1\": \"$channel_url\",
+  \"ActionType\": 3,
+  \"ActionParameter1\": \"0\",
   \"ActionParameter2\": \"\",
   \"Triggers\": [
     {
-      \"Type\": 10,
+      \"Type\": 0,
       \"PatternMatches\": [
-        \"$GIT_BRANCH\"
+        \"https://$domain/\"
       ],
       \"PatternMatchingType\": 0,
-      \"Parameter1\": \"branch\"
+      \"Parameter1\": \"\"
     }
   ],
   \"TriggerMatchingType\": 1,
-  \"Description\": \"A/B testing cookie [$GIT_BRANCH]\",
+  \"Description\": \"A/B CDN cache bypass [$GIT_BRANCH]\",
   \"Enabled\": true
 }"
 
-ab_testing_bypass_data="
+ab_testing_perma_bypass_data="
 {
-  \"ActionType\": 3,
-  \"ActionParameter1\": \"0\",
-  \"ActionParameter2\": \"\",
+  \"ActionType\": 15,
+  \"ActionParameter1\": null,
+  \"ActionParameter2\": null,
   \"Triggers\": [
     {
       \"Type\": 0,
@@ -155,10 +151,23 @@ ab_testing_bypass_data="
     }
   ],
   \"TriggerMatchingType\": 1,
-  \"Description\": \"A/B testing cache bypass\",
+  \"Description\": \"A/B perma-cache bypass [$GIT_BRANCH]\",
   \"Enabled\": true
 }"
 
 configure_edge_rule "A/B testing [$GIT_BRANCH]" "$ab_testing_data"
-configure_edge_rule "A/B testing cookie [$GIT_BRANCH]" "$ab_testing_cookie_data" false
-configure_edge_rule "A/B testing cache bypass" "$ab_testing_bypass_data"
+configure_edge_rule "A/B CDN cache bypass [$GIT_BRANCH]" "$ab_testing_bypass_data"
+configure_edge_rule "A/B perma-cache bypass [$GIT_BRANCH]" "$ab_testing_perma_bypass_data"
+
+curl --silent --request POST \
+  --url "https://api.bunny.net/purge?url=https://$domain/" \
+  --header "AccessKey: $BUNNYNET_API_KEY"
+printf "\n> Purged https://$domain/ cache"
+
+for slug_url in "${additional_patterns[@]}"; do
+  clean_url=${slug_url//\"/}
+  curl --silent --request POST \
+    --url "https://api.bunny.net/purge?url=$clean_url" \
+    --header "AccessKey: $BUNNYNET_API_KEY"
+  echo "> Purged $clean_url cache"
+done

package/ci/bunny-remove-ab.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+if [ -z "$BUNNYNET_API_KEY" ]; then
+  echo "BUNNYNET_API_KEY env var must be set"
+  exit 1
+fi
+if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
+  echo "Provide the domain as the first argument"
+  exit 1
+fi
+
+project_id=$1
+domain=$2
+
+if [ -z "$GIT_BRANCH" ]; then
+  echo "GIT_BRANCH env not set, skipping edge rules removal"
+  exit 0
+fi
+
+response=$(curl --silent --request GET \
+  --url https://api.bunny.net/pullzone \
+  --header "AccessKey: $BUNNYNET_API_KEY" \
+  --header 'accept: application/json')
+
+pull_zone_id=$(echo $response | jq --arg domain "$domain" '[.[] | select(.Hostnames[].Value | contains($domain)).Id][0]')
+if [ -z "$pull_zone_id" ]; then
+  echo "bunny.net pull zone not found for domain $domain"
+  exit 1
+fi
+
+edge_rules=$(echo $response | jq --arg id "$pull_zone_id" '.[] | select(.Id == ($id | tonumber)).EdgeRules')
+
+remove_edge_rule() {
+  local description=$1
+  local found_rule=$(echo $edge_rules | jq --arg description "$description" '.[] | select(.Description == $description)')
+  local guid=$(echo $found_rule | jq -r '.Guid // empty')
+
+  if [ -n "$guid" ]; then
+    curl --silent --request DELETE \
+      --url "https://api.bunny.net/pullzone/$pull_zone_id/edgerules/$guid" \
+      --header "AccessKey: $BUNNYNET_API_KEY"
+    echo "> Removed edge rule \"$description\""
+  else
+    echo "> Edge rule \"$description\" not found"
+  fi
+}
+
+remove_edge_rule "A/B testing [$GIT_BRANCH]"
+remove_edge_rule "A/B CDN cache bypass [$GIT_BRANCH]"
+remove_edge_rule "A/B perma-cache bypass [$GIT_BRANCH]"

package/ci/bunny-setup.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+if [ -z "$BUNNYNET_API_KEY" ]; then
+  echo "BUNNYNET_API_KEY env var must be set"
+  exit 1
+fi
+if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+
+project_id=$1
+domain=$2
+
+storage_list=$(curl --silent --request GET \
+  --url https://api.bunny.net/storagezone \
+  --header "AccessKey: $BUNNYNET_API_KEY" \
+  --header 'accept: application/json')
+
+storage_prefix="storefront-isr-"
+storage_id=$(echo $storage_list | jq --arg prefix "$storage_prefix" '.[] | select(.Name | startswith($prefix)) | .Id')
+
+if [ -z "$storage_id" ]; then
+  rand_suffix=$(printf "%06d" $((RANDOM % 10000000)))
+  storage_name="${storage_prefix}${rand_suffix}"
+
+  printf "\n"
+  response=$(curl --silent --request POST \
+    --url https://api.bunny.net/storagezone \
+    --header "AccessKey: $BUNNYNET_API_KEY" \
+    --header 'accept: application/json' \
+    --header 'content-type: application/json' \
+    --data "
+{
+  \"Name\": \"$storage_name\",
+  \"Region\": \"DE\",
+  \"ReplicationRegions\": [
+    \"NY\",
+    \"BR\"
+  ],
+  \"ZoneTier\": 1
+}
+")
+
+  storage_id=$(echo "$response" | jq -r '.Id')
+  printf "\n\n> Created storage zone \"$storage_name\" ($storage_id)"
+fi
+
+if [ -z "$storage_id" ]; then
+  echo "Could not create bunny.net storage zone"
+  exit 1
+fi
+
+origin_url="https://$project_id.web.app"
+
+get_pull_zone_id() {
+  pull_zone_list=$(curl --silent --request GET \
+    --url https://api.bunny.net/pullzone \
+    --header "AccessKey: $BUNNYNET_API_KEY" \
+    --header 'accept: application/json')
+
+  pull_zone_id=$(echo $pull_zone_list | jq --arg url "$origin_url" '.[] | select(.OriginUrl == $url) | .Id')
+}
+get_pull_zone_id
+
+if [ -z "$pull_zone_id" ]; then
+  printf "\n"
+  response=$(curl --silent --request POST \
+    --url https://api.bunny.net/pullzone \
+    --header "AccessKey: $BUNNYNET_API_KEY" \
+    --header 'accept: application/json' \
+    --header 'content-type: application/json' \
+    --data "
+{
+  \"OriginUrl\": \"$origin_url\",
+  \"EnableGeoZoneUS\": true,
+  \"EnableGeoZoneEU\": true,
+  \"EnableGeoZoneASIA\": false,
+  \"EnableGeoZoneSA\": true,
+  \"EnableGeoZoneAF\": false,
+  \"Name\": \"$project_id\",
+  \"PermaCacheStorageZoneId\": $storage_id,
+  \"CacheControlMaxAgeOverride\": 31919000,
+  \"EnableOriginShield\": false
+}
+")
+
+  get_pull_zone_id
+  printf "\n\n> Created pull zone \"$pull_zone_id\" with origin \"$origin_url\""
+fi
+
+if [ -n "$domain" ]; then
+  printf "\n"
+  curl --silent --request POST \
+    --url https://api.bunny.net/pullzone/$pull_zone_id/addHostname \
+    --header "AccessKey: $BUNNYNET_API_KEY" \
+    --header 'content-type: application/json' \
+    --data "{\"Hostname\":\"$domain\"}"
+  printf "\n\n> Added hostname \"$domain\" to pull zone"
+
+  script_dir=$(dirname $0)
+  bash $script_dir/bunny-config-base.sh $domain
+fi

package/config/firebase.json

@@ -88,19 +88,6 @@
       }
     ],
     "headers": [
-      {
-        "source": "/**",
-        "headers": [
-          {
-            "key": "Set-Cookie",
-            "value": "bid={{BUILD_ID}}"
-          },
-          {
-            "key": "Set-Cookie",
-            "value": "branch={{GIT_BRANCH}}"
-          }
-        ]
-      },
       {
         "source": "/img/**",
         "headers": [

package/lib/cli.js

@@ -10,14 +10,12 @@ import build, { prepareCodebases } from './build.js';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud.js';
 import createGhSecrets from './setup-gh.js';
 
-if (!process.env.FIREBASE_PROJECT_ID && !process.env.ECOM_STORE_ID) {
+if (!process.env.FIREBASE_PROJECT_ID && !process.env.GOOGLE_APPLICATION_CREDENTIALS) {
   const pwd = process.cwd();
   dotenv.config();
   dotenv.config({ path: joinPath(pwd, 'functions/.env') });
 }
-const {
-  FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS, GITHUB_TOKEN, BUILD_ID, DEPLOY_RAND, GIT_BRANCH,
-} = process.env;
+const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS, GITHUB_TOKEN } = process.env;
 // https://github.com/google/zx/issues/124
 process.env.FORCE_COLOR = '3';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -47,14 +45,8 @@ if (projectId) {
 }
 
 export default async () => {
-  const buildId = BUILD_ID || DEPLOY_RAND || `${Math.random()}`;
   const baseConfigDir = joinPath(__dirname, '..', 'config');
   await fs.copy(baseConfigDir, pwd);
-  const firebaseJsonPath = joinPath(pwd, 'firebase.json');
-  const firebaseJson = fs.readFileSync(firebaseJsonPath, 'utf8')
-    .replace('{{BUILD_ID}}', buildId)
-    .replace('{{GIT_BRANCH}}', GIT_BRANCH || '_');
-  fs.writeFileSync(firebaseJsonPath, firebaseJson);
   const userConfigDir = joinPath(pwd, 'conf');
   if (fs.existsSync(userConfigDir) && fs.lstatSync(userConfigDir).isDirectory()) {
     await fs.copy(userConfigDir, pwd);
@@ -68,9 +60,9 @@ export default async () => {
       }
       if (userFirebaseConfig) {
         const deepmerge = Deepmerge();
-        const baseFirebaseConfig = JSON.parse(firebaseJson);
+        const baseFirebaseConfig = JSON.parse(fs.readFileSync(joinPath(baseConfigDir, 'firebase.json'), 'utf8'));
         const mergedConfig = deepmerge(baseFirebaseConfig, userFirebaseConfig);
-        fs.writeFileSync(firebaseJsonPath, JSON.stringify(mergedConfig, null, 2));
+        fs.writeFileSync(joinPath(pwd, 'firebase.json'), JSON.stringify(mergedConfig, null, 2));
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -29,7 +29,7 @@
     "md5": "^2.3.0",
     "typescript": "~5.2.2",
     "zx": "^7.2.3",
-    "@cloudcommerce/api": "2.1.0"
+    "@cloudcommerce/api": "2.2.0"
   },
   "scripts": {
     "build": "bash ../../scripts/build-lib.sh"

package/src/cli.ts

@@ -14,7 +14,7 @@ import build, { prepareCodebases } from './build';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud';
 import createGhSecrets from './setup-gh';
 
-if (!process.env.FIREBASE_PROJECT_ID && !process.env.ECOM_STORE_ID) {
+if (!process.env.FIREBASE_PROJECT_ID && !process.env.GOOGLE_APPLICATION_CREDENTIALS) {
   const pwd = process.cwd();
   dotenv.config();
   dotenv.config({ path: joinPath(pwd, 'functions/.env') });
@@ -23,9 +23,6 @@ const {
   FIREBASE_PROJECT_ID,
   GOOGLE_APPLICATION_CREDENTIALS,
   GITHUB_TOKEN,
-  BUILD_ID,
-  DEPLOY_RAND,
-  GIT_BRANCH,
 } = process.env;
 
 // https://github.com/google/zx/issues/124
@@ -62,14 +59,8 @@ if (projectId) {
 }
 
 export default async () => {
-  const buildId = BUILD_ID || DEPLOY_RAND || `${Math.random()}`;
   const baseConfigDir = joinPath(__dirname, '..', 'config');
   await fs.copy(baseConfigDir, pwd);
-  const firebaseJsonPath = joinPath(pwd, 'firebase.json');
-  const firebaseJson = fs.readFileSync(firebaseJsonPath, 'utf8')
-    .replace('{{BUILD_ID}}', buildId)
-    .replace('{{GIT_BRANCH}}', GIT_BRANCH || '_');
-  fs.writeFileSync(firebaseJsonPath, firebaseJson);
   const userConfigDir = joinPath(pwd, 'conf');
   if (fs.existsSync(userConfigDir) && fs.lstatSync(userConfigDir).isDirectory()) {
     await fs.copy(userConfigDir, pwd);
@@ -85,9 +76,14 @@ export default async () => {
       }
       if (userFirebaseConfig) {
         const deepmerge = Deepmerge();
-        const baseFirebaseConfig = JSON.parse(firebaseJson);
+        const baseFirebaseConfig = JSON.parse(
+          fs.readFileSync(joinPath(baseConfigDir, 'firebase.json'), 'utf8'),
+        );
         const mergedConfig = deepmerge(baseFirebaseConfig, userFirebaseConfig);
-        fs.writeFileSync(firebaseJsonPath, JSON.stringify(mergedConfig, null, 2));
+        fs.writeFileSync(
+          joinPath(pwd, 'firebase.json'),
+          JSON.stringify(mergedConfig, null, 2),
+        );
       }
     }
   }