cloudcommerce 2.0.9 → 2.2.0

package/packages/cli/ci/bunny-prepare-ab.sh

@@ -0,0 +1,173 @@
+#!/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
+channel_url=$3
+
+base_uri=""
+additional_patterns=()
+
+fetch_and_purge() {
+  local endpoint=$1
+  local response=$(curl --silent "$base_uri$endpoint")
+  local slugs=$(echo $response | jq -r '.result[].slug')
+
+  for slug in $slugs; do
+    if [ -n "$slug" ]; then
+      additional_patterns+=("\"https://$domain/$slug\"")
+    fi
+  done
+}
+
+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'
+  fetch_and_purge 'categories?fields=slug&sort=created_at&limit=1'
+fi
+
+if [ -z "$GIT_BRANCH" ]; then
+  echo "GIT_BRANCH env not set, skipping edge rules config"
+  exit 0
+fi
+if [ -z "$channel_url" ]; then
+  echo "Channel URL not set (second argument), skipping edge rules config"
+  exit 0
+fi
+channel_url="${channel_url%/}"
+
+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')
+
+configure_edge_rule() {
+  printf "\n"
+  local description=$1
+  local rule_data=$2
+  local is_additional_patterns=${3:-true}
+  local found_rule=$(echo $edge_rules | jq --arg description "$description" '.[] | select(.Description == $description)')
+  local guid=$(echo $found_rule | jq -r '.Guid // empty')
+
+  local json_data="$rule_data"
+  if [ "$is_additional_patterns" = true ]; then
+    local additional_patterns_json=$(printf '%s\n' "${additional_patterns[@]}" | jq -s '.')
+    json_data=$(echo $json_data | jq --argjson additionalPatterns "$additional_patterns_json" '.Triggers[0].PatternMatches += $additionalPatterns')
+  fi
+  if [ -n "$guid" ]; then
+    json_data=$(echo $json_data | jq --arg guid "$guid" '. + {Guid: $guid}')
+  fi
+
+  curl --silent --request POST \
+    --url "https://api.bunny.net/pullzone/$pull_zone_id/edgerules/addOrUpdate" \
+    --header "AccessKey: $BUNNYNET_API_KEY" \
+    --header 'content-type: application/json' \
+    --data "$json_data"
+  printf "\n\n> Configured edge rule \"$description\"\n"
+}
+
+ab_testing_data="
+{
+  \"ActionType\": 2,
+  \"ActionParameter1\": \"$channel_url\",
+  \"ActionParameter2\": \"\",
+  \"Triggers\": [
+    {
+      \"Type\": 0,
+      \"PatternMatches\": [
+        \"https://$domain/\"
+      ],
+      \"PatternMatchingType\": 0,
+      \"Parameter1\": \"\"
+    },
+    {
+      \"Type\": 7,
+      \"PatternMatches\": [
+        \"50\"
+      ],
+      \"PatternMatchingType\": 0,
+      \"Parameter1\": \"\"
+    }
+  ],
+  \"TriggerMatchingType\": 1,
+  \"Description\": \"A/B testing [$GIT_BRANCH]\",
+  \"Enabled\": true
+}"
+
+ab_testing_bypass_data="
+{
+  \"ActionType\": 3,
+  \"ActionParameter1\": \"0\",
+  \"ActionParameter2\": \"\",
+  \"Triggers\": [
+    {
+      \"Type\": 0,
+      \"PatternMatches\": [
+        \"https://$domain/\"
+      ],
+      \"PatternMatchingType\": 0,
+      \"Parameter1\": \"\"
+    }
+  ],
+  \"TriggerMatchingType\": 1,
+  \"Description\": \"A/B CDN cache bypass [$GIT_BRANCH]\",
+  \"Enabled\": true
+}"
+
+ab_testing_perma_bypass_data="
+{
+  \"ActionType\": 15,
+  \"ActionParameter1\": null,
+  \"ActionParameter2\": null,
+  \"Triggers\": [
+    {
+      \"Type\": 0,
+      \"PatternMatches\": [
+        \"https://$domain/\"
+      ],
+      \"PatternMatchingType\": 0,
+      \"Parameter1\": \"\"
+    }
+  ],
+  \"TriggerMatchingType\": 1,
+  \"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 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/packages/cli/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/packages/cli/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/packages/cli/lib/cli.js

@@ -3,12 +3,18 @@ import { join as joinPath } from 'node:path';
 import {
   $, argv, fs, echo, chalk,
 } from 'zx';
+import * as dotenv from 'dotenv';
 import Deepmerge from '@fastify/deepmerge';
 import login from './login.js';
 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.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 } = process.env;
 // https://github.com/google/zx/issues/124
 process.env.FORCE_COLOR = '3';

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -17,7 +17,7 @@
     "directory": "packages/cli"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
@@ -28,6 +28,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@fastify/deepmerge": "^1.3.0",
+    "dotenv": "^16.3.2",
     "libsodium-wrappers": "^0.7.13",
     "md5": "^2.3.0",
     "typescript": "~5.2.2",

package/packages/cli/src/cli.ts

@@ -7,12 +7,18 @@ import {
   echo,
   chalk,
 } from 'zx';
+import * as dotenv from 'dotenv';
 import Deepmerge from '@fastify/deepmerge';
 import login from './login';
 import build, { prepareCodebases } from './build';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud';
 import createGhSecrets from './setup-gh';
 
+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,

package/packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {
@@ -15,7 +15,7 @@
     "directory": "packages/config"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce email sender",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,7 @@
     "directory": "packages/emails"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/eslint/base.eslintrc.cjs

@@ -5,6 +5,7 @@ module.exports = {
     node: true,
   },
   extends: [
+    'plugin:vue/vue3-essential',
     'airbnb-base',
   ],
   parserOptions: {
@@ -68,6 +69,7 @@ module.exports = {
     'no-continue': 'off',
     'lines-between-class-members': 'off',
     'arrow-body-style': 'off',
+    'vue/no-multiple-template-root': 'off',
     'import/extensions': [
       'error',
       'ignorePackages',

package/packages/eslint/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/eslint",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce ESLint config",
   "main": "lib/index.js",
   "repository": {
@@ -10,7 +10,7 @@
     "directory": "packages/eslint"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
@@ -19,8 +19,8 @@
     "build": "echo '@ecomplus/eslint'"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.18.1",
-    "@typescript-eslint/parser": "^6.18.1",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
     "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-astro": "^0.31.3",

package/packages/eslint/storefront.eslintrc.cjs

@@ -1,7 +1,6 @@
 module.exports = {
   extends: [
     './base.eslintrc.cjs',
-    'plugin:vue/vue3-essential',
     'plugin:astro/recommended',
   ],
   rules: {
@@ -20,7 +19,6 @@ module.exports = {
     'import/no-dynamic-require': 'off',
     'import/prefer-default-export': 'warn',
     'import/extensions': 'off',
-    'vue/no-multiple-template-root': 'off',
     'vue/multi-word-component-names': ['error', {
       ignores: [
         'Fade',

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {
@@ -14,7 +14,7 @@
     "directory": "packages/events"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/feeds/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/feeds",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce catalog feeds",
   "main": "lib/index.js",
   "exports": {
@@ -14,7 +14,7 @@
     "directory": "packages/feeds"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
     "directory": "packages/firebase"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
@@ -33,7 +33,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
     "@google-cloud/pubsub": "^4.1.1",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.3.2",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0",
     "source-map-support": "^0.5.21"

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {
@@ -17,7 +17,7 @@
     "directory": "packages/i18n"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -14,7 +14,7 @@
     "directory": "packages/modules"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {
@@ -14,7 +14,7 @@
     "directory": "packages/passport"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },