npm - cloudcommerce - Versions diffs - 2.6.4 → 2.7.3 - Mend

cloudcommerce 2.6.4 → 2.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (123) hide show

package/packages/apps/correios/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/custom-payment/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for simple custom payment methods",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/custom-shipping/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-shipping",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {

package/packages/apps/datafrete/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {

package/packages/apps/discounts/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

package/packages/apps/emails/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/fb-conversions/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/flash-courier/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-flash-courier",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/frenet/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {

package/packages/apps/galaxpay/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {

package/packages/apps/google-analytics/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-google-analytics",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/jadlog/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/loyalty-points/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-loyalty-points",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to handle simple loyalty points programs",
   "main": "lib/loyalty-points.js",
   "exports": {

package/packages/apps/mandae/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mandae",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Mandaê shipping intermediator",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/melhor-envio/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-melhor-envio",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Melhor Envio",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/mercadopago/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mercadopago",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Mercado Pago",
   "main": "lib/mercadopago.js",
   "exports": {

package/packages/apps/pagarme/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me",
   "main": "lib/pagarme.js",
   "exports": {

package/packages/apps/pagarme-v5/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme-v5",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/paghiper/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate PagHiper",
   "main": "lib/paghiper.js",
   "exports": {

package/packages/apps/pix/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app to integrate Pix API (Bacen)",
   "main": "lib/pix.js",
   "exports": {

package/packages/apps/tiny-erp/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for Tiny ERP",
   "main": "lib/tiny-erp.js",
   "repository": {

package/packages/apps/webhooks/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app for general order webhooks",
   "main": "lib/index.js",
   "repository": {

package/packages/cli/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/config/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {

package/packages/emails/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce email sender",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "@cloudcommerce/firebase": "workspace:*",
     "axios": "^1.6.7",
     "ejs": "^3.1.9",
-    "nodemailer": "^6.9.10"
+    "nodemailer": "^6.9.11"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/eslint/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/eslint",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce ESLint config",
   "main": "lib/index.js",
   "repository": {

package/packages/events/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {

package/packages/feeds/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/feeds",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce catalog feeds",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/i18n/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {

package/packages/passport/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/lib/lib/cron-ssr-save-views.js CHANGED Viewed

@@ -7,7 +7,6 @@ import { deleteQueryBatch } from '@cloudcommerce/firebase/lib/helpers/firestore'
 const saveViews = async () => {
   const deployRand = process.env.DEPLOY_RAND || '_';
-  const projectId = process.env.GCLOUD_PROJECT;
   const db = getFirestore();
   const productViewsSnapshot = await db.collection('ssrProductViews')
     .limit(500).get();
@@ -32,10 +31,6 @@ const saveViews = async () => {
   }
   const { domain } = config.get().settingsContent;
   if (domain && process.env.BUNNYNET_API_KEY) {
-    let bunnyStorageName = process.env.BUNNYNET_STORAGE_NAME;
-    let bunnyStoragePass = process.env.BUNNYNET_STORAGE_PASS;
-    let bunnyZoneName = process.env.BUNNYNET_ZONE_NAME;
-    let permaCacheZoneFolder = '';
     const bunnyAxios = axios.create({
       baseURL: 'https://api.bunny.net/',
       headers: {
@@ -43,53 +38,6 @@ const saveViews = async () => {
       },
     });
     try {
-      const storageAuthReqs = [];
-      if (!bunnyStorageName || !bunnyStoragePass) {
-        storageAuthReqs.push(bunnyAxios.get('/storagezone').then(({ data }) => {
-          for (let i = 0; i < data.length; i++) {
-            const bunnyStorage = data[i];
-            if (bunnyStorageName) {
-              if (bunnyStorage.Name === bunnyStorageName) {
-                bunnyStoragePass = bunnyStorage.Password;
-                break;
-              }
-              continue;
-            }
-            if (bunnyStorage.Name.startsWith('storefront-isr-')) {
-              bunnyStorageName = bunnyStorage.Name;
-              bunnyStoragePass = bunnyStorage.Password;
-              break;
-            }
-          }
-        }));
-      }
-      if (!bunnyZoneName) {
-        storageAuthReqs.push(bunnyAxios.get('/pullzone').then(({ data }) => {
-          for (let i = 0; i < data.length; i++) {
-            const pullZone = data[i];
-            if (pullZone.Hostnames.find(({ Value }) => Value === domain)) {
-              bunnyZoneName = pullZone.Name;
-              break;
-            }
-          }
-        }));
-      }
-      await Promise.all(storageAuthReqs);
-      if (bunnyStorageName && bunnyStoragePass && bunnyZoneName) {
-        const { data } = await axios({
-          url: `https://storage.bunnycdn.com/${bunnyStorageName}/__bcdn_perma_cache__/`,
-          headers: {
-            AccessKey: bunnyStoragePass,
-          },
-        });
-        for (let i = 0; i < data.length; i++) {
-          const { ObjectName } = data[i];
-          if (ObjectName.startsWith(`pullzone__${bunnyZoneName}__`)
-                        && (!permaCacheZoneFolder || permaCacheZoneFolder < ObjectName)) {
-            permaCacheZoneFolder = ObjectName;
-          }
-        }
-      }
       const sMaxAge = Number(process.env.SSR_CACHE_MAX_AGE) || 179;
       const pageViewsSnapshot = await db.collection('ssrPageViews')
         .where('at', '>', new Date(Date.now() - 1000 * 60 * 20))
@@ -103,47 +51,21 @@ const saveViews = async () => {
         if (data.isCachePurged) {
           continue;
         }
-        const url = data.url.replace(/\?.*$/, '');
-        doc.ref.update({ isCachePurged: true });
+        const url = data.url.replace(/\?.*$/, '').replace(/#.*$/, '');
         if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
           purgeReqs.push(bunnyAxios('/purge', {
             method: 'POST',
             params: {
-              async: 'false',
+              // async: 'false',
               url,
             },
+          }).then(async () => {
+            doc.ref.update({ isCachePurged: true });
+            const freshHtmlUrl = `${url}?__isrV=${deployRand}&t=${Date.now()}`;
+            await axios.get(freshHtmlUrl);
+            // info(`Cache bump ${url}`);
           }));
           purgedUrls.push(url);
-          if (permaCacheZoneFolder) {
-            let pathname = url.replace(`https://${domain}`, '');
-            const freshHtmlUrl = `https://${projectId}.web.app${pathname}`
-                            + `?__isrV=${deployRand}&t=${Date.now()}`;
-            purgeReqs.push(
-              // eslint-disable-next-line no-loop-func
-              axios.get(freshHtmlUrl).then(({ data: freshHtml }) => {
-                if (pathname.charAt(0) === '/') {
-                  pathname = pathname.slice(1);
-                }
-                const paths = pathname.split('/');
-                const filename = paths.pop() || '';
-                let folderpath = paths.join('/');
-                if (folderpath) folderpath += '/';
-                // https://support.bunny.net/hc/en-us/articles/360017048720-Perma-Cache-Folder-Structure-Explained
-                const permaCachePath = `__bcdn_perma_cache__/${permaCacheZoneFolder}`
-                                + `/${folderpath}___${filename}___/___file___`;
-                axios({
-                  method: 'PUT',
-                  url: `https://storage.bunnycdn.com/${bunnyStorageName}/${permaCachePath}`,
-                  headers: {
-                    'Content-Type': 'application/octet-stream',
-                    Accept: 'application/json',
-                    AccessKey: bunnyStoragePass,
-                  },
-                  data: freshHtml,
-                });
-              }),
-            );
-          }
         }
       }
       await Promise.all(purgeReqs);

package/packages/ssr/lib/lib/cron-ssr-save-views.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAEjF,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAC3B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC;IAClD,MAAM,~~SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAwB,CAAC;IACvD,MAAM,~~EAAE,GAAG,YAAY,EAAE,CAAC;IAC1B,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;SAChE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzD,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,EAA8B,CAAC;QAChE,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,MAAM,SAAS,GAAG,GAAG,CAAC,EAA6B,CAAC;YACpD,IAAI;gBACF,4CAA4C;gBAC5C,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAChE,4CAA4C;gBAC5C,MAAM,GAAG,CAAC,KAAK,CAAC,YAAY,SAAS,EAAE,EAAE;oBACvC,KAAK,EAAE,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;iBACnC,CAAC,CAAC;gBACH,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACZ,KAAK,CAAC,GAAG,CAAC,CAAC;gBACX,MAAM;aACP;SACF;KACF;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC;IAChD,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;QAC1C,~~IAAI,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QACzD,IAAI,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QACzD,IAAI,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACnD,IAAI,oBAAoB,GAAG,EAAE,CAAC;QAC9B,~~MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;YAC9B,OAAO,EAAE,wBAAwB;YACjC,OAAO,EAAE;gBACP,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;aACxC;SACF,CAAC,CAAC;QACH,IAAI;YACF,MAAM,eAAe,GAAmB,EAAE,CAAC;YAC3C,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,EAAE;gBAC1C,eAAe,CAAC,IAAI,CAClB,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;oBAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACpC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC7B,IAAI,gBAAgB,EAAE;4BACpB,IAAI,YAAY,CAAC,IAAI,KAAK,gBAAgB,EAAE;gCAC1C,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC;gCACzC,MAAM;6BACP;4BACD,SAAS;yBACV;wBACD,IAAI,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;4BACnD,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC;4BACrC,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC;4BACzC,MAAM;yBACP;qBACF;gBACH,CAAC,CAAC,CACH,CAAC;aACH;YACD,IAAI,CAAC,aAAa,EAAE;gBAClB,eAAe,CAAC,IAAI,CAClB,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;oBAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;wBACzB,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,EAAE;4BAC5D,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC;4BAC9B,MAAM;yBACP;qBACF;gBACH,CAAC,CAAC,CACH,CAAC;aACH;YACD,MAAM,OAAO,~~CAAC,~~GAAG,~~CAAC,eAAe,CAAC,CAAC;YACnC,IAAI,gBAAgB,IAAI,gBAAgB,IAAI,aAAa,EAAE;gBACzD,~~MAAM,~~EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,~~CAAC~~;oBAC3B~~,~~GAAG,EAAE,gCAAgC,gBAAgB,wBAAwB;oBAC7E,~~OAAO,~~EAAE;wBACP,SAAS,EAAE,gBAAgB;qBAC5B;iBACF,~~CAAC,~~CAAC;gBACH,KAAK,IAAI,CAAC,~~GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACpC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC/B,IACE,UAAU,CAAC,UAAU,CAAC,aAAa,aAAa,IAAI,CAAC;2BAClD,CAAC,CAAC,oBAAoB,IAAI,oBAAoB,GAAG,UAAU,CAAC,EAC/D;wBACA,oBAAoB,GAAG,UAAU,CAAC;qBACnC;iBACF;aACF;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC;YAC7D,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;iBAC1D,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;iBACvD,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;iBACvD,GAAG,EAAE,CAAC;YACT,MAAM,UAAU,GAAa,EAAE,CAAC;YAChC,MAAM,SAAS,GAAmB,EAAE,CAAC;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtD,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAA2C,CAAC;gBACjE,IAAI,IAAI,CAAC,aAAa,EAAE;oBACtB,SAAS;iBACV;gBACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC~~;gBAC1C~~,~~GAAG~~,CAAC,~~GAAG,CAAC,~~MAAM,~~CAAC,~~EAAE,~~aAAa,~~EAAE,~~IAAI,EAAE,~~CAAC,CAAC;~~gBACxC~~,IAAI,GAAG,EAAE,UAAU,CAAC,WAAW,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACrE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;wBAClC,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE;4BACN,~~KAAK,EAAE,OAAO~~;~~4BACd~~,GAAG;yBACJ;qBACF,CAAC,CAAC,~~CAAC;oBACJ,UAAU,CAAC,~~IAAI,CAAC,~~GAAG~~,~~CAAC,CAAC;oBACrB,~~IAAI,~~oBAAoB,~~EAAE;~~wBACxB~~,~~IAAI~~,~~QAAQ~~,GAAG,~~GAAG,~~CAAC,~~OAAO~~,CAAC,~~WAAW~~,~~MAAM~~,EAAE,~~EAAE~~,EAAE,CAAC,CAAC;~~wBACpD~~,MAAM,YAAY,GAAG,~~WAAW~~,~~SAAS~~,WAAW,~~QAAQ,EAAE;8BAC1D,WAAW,~~UAAU,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;~~wBAC5C~~,~~SAAS~~,~~CAAC,IAAI;wBACZ,wCAAwC;wBACxC,~~KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC~~,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAoB,EAAE,EAAE~~;~~4BACrE~~,~~IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE~~;~~gCAC9B~~,~~QAAQ,GAAG,QAAQ,~~CAAC,~~KAAK,~~CAAC,CAAC,CAAC~~,CAAC~~;~~6BAC9B;4BACD~~,~~MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;4BAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;4BACnC,IAAI,~~UAAU,~~GAAG,KAAK,~~CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;~~4BACjC,IAAI,UAAU~~;gCAAE,UAAU,IAAI,GAAG,CAAC;4BAClC,kGAAkG;4BAClG,MAAM,cAAc,GAAG,wBAAwB,oBAAoB,EAAE;kCACjE,IAAI,UAAU,MAAM,QAAQ,gBAAgB,CAAC;4BACjD,KAAK,CAAC;gCACJ,MAAM,EAAE,KAAK;gCACb,GAAG,EAAE,gCAAgC,gBAAgB,IAAI,cAAc,EAAE;gCACzE,OAAO,EAAE;oCACP,cAAc,EAAE,0BAA0B;oCAC1C,MAAM,EAAE,kBAAkB;oCAC1B,SAAS,EAAE,gBAAgB;iCAC5B;gCACD,IAAI,EAAE,SAAS;6BAChB,CAAC,CAAC;wBACL,CAAC,CAAC,CACH,CAAC;qBACH;iBACF;aACF;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAChB,MAAM,IAAI,GAAQ,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAC1D,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;gBACzB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC9B,KAAK,CAAC,IAAI,CAAC,CAAC;aACb;iBAAM;gBACL,KAAK,CAAC,GAAG,CAAC,CAAC;aACZ;SACF;KACF;IACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACxB,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;QAAE,OAAO;IAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,WAAW,GAAG,EAAE,IAAI,WAAW,GAAG,EAAE;YAAE,OAAO;KAClD;IACD,MAAM,cAAc,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;SACjD,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACrE,MAAM,gBAAgB,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1	+ {"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"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"}

package/packages/ssr/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "2.6.4",
+  "version": "2.7.3",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -32,13 +32,13 @@
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
     "@vueuse/core": "10.8.0",
-    "astro": "4.4.4",
+    "astro": "4.4.6",
     "astro-capo": "^0.0.1",
     "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.7.0",
     "mitt": "^3.0.1",
-    "vue": "^3.4.20",
+    "vue": "^3.4.21",
     "yaml": "^2.4.0"
   },
   "devDependencies": {

package/packages/ssr/src/lib/cron-ssr-save-views.ts CHANGED Viewed

@@ -7,7 +7,6 @@ import { deleteQueryBatch } from '@cloudcommerce/firebase/lib/helpers/firestore'
 const saveViews = async () => {
   const deployRand = process.env.DEPLOY_RAND || '_';
-  const projectId = process.env.GCLOUD_PROJECT as string;
   const db = getFirestore();
   const productViewsSnapshot = await db.collection('ssrProductViews')
     .limit(500).get();
@@ -32,10 +31,6 @@ const saveViews = async () => {
   }
   const { domain } = config.get().settingsContent;
   if (domain && process.env.BUNNYNET_API_KEY) {
-    let bunnyStorageName = process.env.BUNNYNET_STORAGE_NAME;
-    let bunnyStoragePass = process.env.BUNNYNET_STORAGE_PASS;
-    let bunnyZoneName = process.env.BUNNYNET_ZONE_NAME;
-    let permaCacheZoneFolder = '';
     const bunnyAxios = axios.create({
       baseURL: 'https://api.bunny.net/',
       headers: {
@@ -43,59 +38,6 @@ const saveViews = async () => {
       },
     });
     try {
-      const storageAuthReqs: Promise<any>[] = [];
-      if (!bunnyStorageName || !bunnyStoragePass) {
-        storageAuthReqs.push(
-          bunnyAxios.get('/storagezone').then(({ data }) => {
-            for (let i = 0; i < data.length; i++) {
-              const bunnyStorage = data[i];
-              if (bunnyStorageName) {
-                if (bunnyStorage.Name === bunnyStorageName) {
-                  bunnyStoragePass = bunnyStorage.Password;
-                  break;
-                }
-                continue;
-              }
-              if (bunnyStorage.Name.startsWith('storefront-isr-')) {
-                bunnyStorageName = bunnyStorage.Name;
-                bunnyStoragePass = bunnyStorage.Password;
-                break;
-              }
-            }
-          }),
-        );
-      }
-      if (!bunnyZoneName) {
-        storageAuthReqs.push(
-          bunnyAxios.get('/pullzone').then(({ data }) => {
-            for (let i = 0; i < data.length; i++) {
-              const pullZone = data[i];
-              if (pullZone.Hostnames.find(({ Value }) => Value === domain)) {
-                bunnyZoneName = pullZone.Name;
-                break;
-              }
-            }
-          }),
-        );
-      }
-      await Promise.all(storageAuthReqs);
-      if (bunnyStorageName && bunnyStoragePass && bunnyZoneName) {
-        const { data } = await axios({
-          url: `https://storage.bunnycdn.com/${bunnyStorageName}/__bcdn_perma_cache__/`,
-          headers: {
-            AccessKey: bunnyStoragePass,
-          },
-        });
-        for (let i = 0; i < data.length; i++) {
-          const { ObjectName } = data[i];
-          if (
-            ObjectName.startsWith(`pullzone__${bunnyZoneName}__`)
-            && (!permaCacheZoneFolder || permaCacheZoneFolder < ObjectName)
-          ) {
-            permaCacheZoneFolder = ObjectName;
-          }
-        }
-      }
       const sMaxAge = Number(process.env.SSR_CACHE_MAX_AGE) || 179;
       const pageViewsSnapshot = await db.collection('ssrPageViews')
         .where('at', '>', new Date(Date.now() - 1000 * 60 * 20))
@@ -109,47 +51,21 @@ const saveViews = async () => {
         if (data.isCachePurged) {
           continue;
         }
-        const url = data.url.replace(/\?.*$/, '');
-        doc.ref.update({ isCachePurged: true });
+        const url = data.url.replace(/\?.*$/, '').replace(/#.*$/, '');
         if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
           purgeReqs.push(bunnyAxios('/purge', {
             method: 'POST',
             params: {
-              async: 'false',
+              // async: 'false',
               url,
             },
+          }).then(async () => {
+            doc.ref.update({ isCachePurged: true });
+            const freshHtmlUrl = `${url}?__isrV=${deployRand}&t=${Date.now()}`;
+            await axios.get(freshHtmlUrl);
+            // info(`Cache bump ${url}`);
           }));
           purgedUrls.push(url);
-          if (permaCacheZoneFolder) {
-            let pathname = url.replace(`https://${domain}`, '');
-            const freshHtmlUrl = `https://${projectId}.web.app${pathname}`
-              + `?__isrV=${deployRand}&t=${Date.now()}`;
-            purgeReqs.push(
-              // eslint-disable-next-line no-loop-func
-              axios.get(freshHtmlUrl).then(({ data: freshHtml }: { data: string }) => {
-                if (pathname.charAt(0) === '/') {
-                  pathname = pathname.slice(1);
-                }
-                const paths = pathname.split('/');
-                const filename = paths.pop() || '';
-                let folderpath = paths.join('/');
-                if (folderpath) folderpath += '/';
-                // https://support.bunny.net/hc/en-us/articles/360017048720-Perma-Cache-Folder-Structure-Explained
-                const permaCachePath = `__bcdn_perma_cache__/${permaCacheZoneFolder}`
-                  + `/${folderpath}___${filename}___/___file___`;
-                axios({
-                  method: 'PUT',
-                  url: `https://storage.bunnycdn.com/${bunnyStorageName}/${permaCachePath}`,
-                  headers: {
-                    'Content-Type': 'application/octet-stream',
-                    Accept: 'application/json',
-                    AccessKey: bunnyStoragePass,
-                  },
-                  data: freshHtml,
-                });
-              }),
-            );
-          }
         }
       }
       await Promise.all(purgeReqs);