cloudcommerce 2.12.2 → 2.13.0

package/packages/feeds/src/firebase/serve-feeds.ts

@@ -1,10 +1,374 @@
 import type { Request, Response } from 'firebase-functions';
+import { error } from 'firebase-functions/logger';
+import api from '@cloudcommerce/api';
+import config from '@cloudcommerce/firebase/lib/config';
 
-export default (req: Request, res: Response) => {
-  const { method } = req;
+const fetchProducts = async (page = 1) => {
+  const limit = 300;
+  const offset = limit * (page - 1);
+  const {
+    data: {
+      result: products,
+      meta: { count },
+    },
+  } = await api.get('products', {
+    limit,
+    offset,
+    count: true,
+    params: {
+      available: true,
+      visible: true,
+    },
+    fields: [
+      '_id',
+      'name',
+      'sku',
+      'slug',
+      'quantity',
+      'min_quantity',
+      'production_time',
+      'pictures',
+      'currency_id',
+      'price',
+      'base_price',
+      'category_tree',
+      'categories.0.name',
+      'brands.0.name',
+      'google_product_category_id',
+      'gtin',
+      'mpn',
+      'adult',
+      'condition',
+      'weight',
+      'dimensions',
+      'specifications',
+      'variations',
+      'short_description',
+      'body_html',
+    ] as const,
+  });
+  return {
+    products,
+    nextPage: (count && count > offset + limit) ? page + 1 : null,
+  };
+};
+
+export type FeedProducts = Awaited<ReturnType<typeof fetchProducts>>['products'];
+
+const products: FeedProducts = [];
+const fetchAllProducts = async () => {
+  let page: number | null = 1;
+  while (page) {
+    const {
+      products: _products,
+      nextPage,
+      // eslint-disable-next-line no-await-in-loop
+    } = await fetchProducts(page);
+    page = nextPage;
+    _products.forEach((product) => products.push(product));
+  }
+};
+
+const fetching = new Promise((resolve, reject) => {
+  fetchAllProducts().then(resolve).catch(reject);
+});
+
+const serveFeeds = async (req: Request, res: Response) => {
+  const { method, url } = req;
   if (method !== 'GET') {
     res.sendStatus(405);
     return;
   }
-  res.sendStatus(202);
+  if (url !== '/_feeds/catalog' && url !== '/catalog') {
+    res.sendStatus(404);
+    return;
+  }
+  try {
+    await fetching;
+  } catch (err) {
+    error(err);
+    res.sendStatus(500);
+    return;
+  }
+  const {
+    storeId,
+    settingsContent: { domain, name },
+  } = config.get();
+  const title = `Products feed - ${name}`;
+  const isSkipVariations = !!req.query.skip_variations;
+  const discount = Number(req.query.discount) || 0;
+  let querystring = String(req.query.qs) || '?_=feed';
+  if (querystring.charAt(0) !== '?') {
+    querystring = `?${querystring}`;
+  }
+  let propsSet: Record<string, any> = {};
+  if (typeof req.query.set_properties === 'string') {
+    try {
+      propsSet = JSON.parse(req.query.set_properties);
+      if (typeof propsSet !== 'object' || !propsSet) {
+        throw new Error('Invalid');
+      }
+    } catch {
+      res.sendStatus(400);
+      return;
+    }
+  }
+  const isFacebook = (req.get('User-Agent') || '').includes('facebook');
+
+  let xml = `
+  <?xml version="1.0"?>
+  <feed xmlns="http://www.w3.org/2005/Atom" xmlns:g="http://base.google.com/ns/1.0">
+    <title><![CDATA[${title}]]></title>
+    <link href="https://${domain}/" rel="alternate" type="text/html"/>
+    <updated>${new Date().toISOString()}</updated>
+    <id><![CDATA[#${storeId},${Math.random()}]]></id>
+    <author>
+      <name>e-com.plus Cloud Commerce</name>
+    </author>`;
+
+  const convertProduct = (p: (typeof products)[0], groupId?: string) => {
+    if (p.name) {
+      const entry: Record<string, any> = {
+        id: p.sku || p._id,
+        title: p.name,
+        item_group_id: groupId,
+        google_product_category: p.google_product_category_id,
+      };
+      if (p.short_description) {
+        entry.description = p.short_description;
+      } else if (p.body_html) {
+        entry.description = p.body_html
+          .replace(/<style\b[^>]*>.*?<\/style>/isg, '')
+          .replace(/<[^>]+>/g, '')
+          .replace(/&nbsp;/g, '');
+      } else {
+        entry.description = p.name;
+      }
+      if (p.slug) {
+        entry.link = `https://${domain}/${p.slug}${querystring}`;
+        if (groupId) entry.link += `&amp;var=${p._id}`;
+        if (discount > 0) entry.link += `&amp;discount=${discount}`;
+      }
+      if (
+        (p.quantity === undefined || p.quantity)
+        && (!p.min_quantity || p.quantity! >= p.min_quantity)
+      ) {
+        entry.availability = 'in stock';
+      } else {
+        entry.availability = 'out of stock';
+      }
+      if (p.production_time?.days) {
+        entry.min_handling_time = p.production_time.days;
+        if (p.production_time.max_time) {
+          entry.max_handling_time = p.production_time.max_time;
+        }
+      }
+      if (p.pictures?.length) {
+        const additionalImages: string[] = [];
+        for (let i = 0; i < p.pictures.length && i < 10; i++) {
+          const picture = p.pictures[i];
+          let img = picture.zoom?.url || picture.big?.url || picture.normal?.url;
+          if (img) {
+            img = img.replace(
+              /(\w+\.)?(ecoms\d)\.com/i,
+              '$2-nyc3.nyc3.cdn.digitaloceanspaces.com',
+            );
+            if (!entry.image_link) {
+              entry.image_link = img;
+            } else {
+              additionalImages.push(img);
+            }
+          }
+        }
+        if (additionalImages.length) {
+          entry.additional_image_link = additionalImages;
+        }
+      }
+      if (p.price) {
+        if (p.base_price && p.base_price > p.price) {
+          entry.price = `${p.base_price} ${p.currency_id}`;
+          entry.sale_price = (p.price * (1 - discount)).toFixed(2) + ` ${p.currency_id}`;
+        } else {
+          entry.price = (p.price * (1 - discount)).toFixed(2) + ` ${p.currency_id}`;
+        }
+      }
+      if (p.category_tree) {
+        entry.product_type = p.category_tree;
+      } else if (p.categories?.length) {
+        entry.product_type = p.categories[0].name;
+      }
+      let isIdentifierExists = false;
+      if (p.brands?.length) {
+        isIdentifierExists = true;
+        entry.brand = p.brands[0].name;
+      }
+      (['gtin', 'mpn'] as const).forEach((field) => {
+        const codes = p[field];
+        if (Array.isArray(codes) && codes.length) {
+          entry[field] = codes[0];
+          isIdentifierExists = true;
+        }
+      });
+      entry.identifier_exists = isIdentifierExists ? 'yes' : 'no';
+      if (p.adult) {
+        entry.adult = 'yes';
+      }
+      if (p.condition) {
+        entry.condition = p.condition !== 'not_specified' ? p.condition : 'new';
+      }
+      if (p.weight) {
+        entry.shipping_weight = `${p.weight.value} ${p.weight.unit || ''}`;
+      }
+      if (p.dimensions && !isFacebook) {
+        (['length', 'width', 'height'] as const).forEach((side) => {
+          const dimension = p.dimensions![side];
+          if (dimension) {
+            entry[`shipping_${side}`] = `${dimension.value} ${dimension.unit || ''}`;
+          }
+        });
+      }
+      if (p.specifications) {
+        let customLabel = 0;
+        Object.keys(p.specifications).forEach((spec) => {
+          const values = p.specifications![spec];
+          if (!values.length) return;
+          const [val] = values;
+          /* eslint-disable no-case-declarations */
+          switch (spec) {
+            case 'energy_efficiency_class':
+            case 'age_group':
+            case 'gender':
+            case 'size_type':
+            case 'size_system':
+              entry[spec] = val.value || val.text;
+              break;
+            case 'size':
+            case 'pattern':
+            case 'material':
+              entry[spec] = val.text;
+              break;
+            case 'colors':
+            case 'color':
+            case 'cor':
+            case 'cores':
+              let colors = val.text.replace(/[/]/g, ' ');
+              for (let i = 1; i < values.length; i++) {
+                colors += `/${values[i].text.replace(/[/]/g, ' ')}`;
+              }
+              entry.color = colors;
+              break;
+            default:
+              let commonSpec: string | null = null;
+              let fixedText = val.value || val.text;
+              switch (fixedText.toLowerCase()) {
+                case 'm':
+                case 'l':
+                case 'g':
+                case 's':
+                case 'p':
+                case 'xs':
+                case 'pp':
+                case 'xl':
+                case 'gg':
+                case 'xxl':
+                case 'xg':
+                case 'u':
+                case 'Único':
+                case 'unico':
+                  commonSpec = 'size';
+                  break;
+                case 'adult':
+                case 'adulto':
+                case 'kids':
+                case 'criança':
+                case 'infant':
+                case 'infantil':
+                case 'newborn':
+                case 'recém-nascido':
+                case 'toddler':
+                  commonSpec = 'age_group';
+                  break;
+                case 'male':
+                case 'masculino':
+                case 'female':
+                case 'feminino':
+                case 'unisex':
+                  commonSpec = 'gender';
+                  break;
+                case 'homem':
+                  commonSpec = 'gender';
+                  fixedText = 'male';
+                  break;
+                case 'mulher':
+                  commonSpec = 'gender';
+                  fixedText = 'female';
+                  break;
+                default:
+                  if (customLabel < 5) {
+                    entry[`custom_label_${customLabel}`] = val.text;
+                    customLabel += 1;
+                  }
+                  break;
+              }
+              if (commonSpec !== null && !entry[commonSpec]) {
+                entry[commonSpec] = fixedText;
+              }
+              break;
+          }
+        });
+      }
+      Object.keys(propsSet).forEach((key) => {
+        entry[key] = propsSet[key];
+      });
+
+      xml += `
+      <entry>`;
+      Object.keys(entry).forEach((key) => {
+        const val = entry[key];
+        if (val === undefined || val === null) return;
+        if (typeof val === 'object' && val) {
+          Object.keys(entry).forEach((nKey) => {
+            const nested = val[nKey];
+            xml += `<g:${key}><![CDATA[${nested}]]></g:${key}>`;
+          });
+          return;
+        }
+        if (key === 'link') {
+          xml += `<g:${key}><!--${p._id}-->${val}</g:${key}>`;
+          return;
+        }
+        xml += `<g:${key}><![CDATA[${val}]]></g:${key}>`;
+      });
+      xml += `
+      </entry>`;
+
+      if (p.variations && !isSkipVariations) {
+        p.variations.forEach((variation) => {
+          const mergedItem = { ...p, ...variation };
+          if (p.specifications) {
+            mergedItem.specifications = {
+              ...p.specifications,
+              ...variation.specifications,
+            };
+          }
+          if (!variation.sku && p.sku) {
+            mergedItem.sku = `${p.sku}-${Math.ceil(Math.random() * 1000)}`;
+          }
+          if (variation.picture_id && p.pictures) {
+            const picture = p.pictures.find(({ _id }) => _id === variation.picture_id);
+            if (picture) mergedItem.pictures = [picture];
+          }
+          delete mergedItem.variations;
+          convertProduct(mergedItem as any, entry.id);
+        });
+      }
+    }
+  };
+
+  products.forEach((p) => convertProduct(p));
+  xml += `
+  </feed>`;
+  res.send(xml);
 };
+
+export default serveFeeds;

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,7 +40,7 @@
     "@google-cloud/pubsub": "^4.3.3",
     "dotenv": "^16.4.5",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.8.2",
+    "firebase-functions": "^4.9.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -56,7 +56,7 @@
     "ajv-formats": "^2.1.1",
     "axios": "^1.6.8",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.8.2",
+    "firebase-functions": "^4.9.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {
@@ -31,7 +31,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.8.2",
+    "firebase-functions": "^4.9.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -42,7 +42,7 @@
     "astro-capo": "^0.0.1",
     "axios": "^1.6.8",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.8.2",
+    "firebase-functions": "^4.9.0",
     "mitt": "^3.0.1",
     "vue": "^3.4.21",
     "yaml": "^2.4.1"
@@ -50,6 +50,6 @@
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",
     "@firebase/app-types": "^0.9.1",
-    "typescript": "~5.4.4"
+    "typescript": "~5.4.5"
   }
 }

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
@@ -48,7 +48,7 @@
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
     "@fastify/deepmerge": "^1.3.0",
-    "@iconify-json/fa6-brands": "^1.1.18",
+    "@iconify-json/fa6-brands": "^1.1.19",
     "@iconify-json/heroicons": "^1.1.20",
     "@iconify-json/logos": "^1.1.42",
     "@types/gtag.js": "^0.0.19",
@@ -57,7 +57,7 @@
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.4.5",
-    "firebase": "^10.10.0",
+    "firebase": "^10.11.0",
     "image-size": "^1.1.1",
     "mitt": "^3.0.1",
     "semver": "^7.6.0",
@@ -72,6 +72,6 @@
   "devDependencies": {
     "@cloudcommerce/eslint": "workspace:*",
     "@cloudcommerce/types": "workspace:*",
-    "@types/react": "^18.2.73"
+    "@types/react": "^18.2.78"
   }
 }

package/packages/storefront/src/lib/scripts/vbeta-app.ts

@@ -240,7 +240,7 @@ if (!import.meta.env.SSR) {
   };
 
   const appScript = document.createElement('script');
-  appScript.src = 'https://cdn.jsdelivr.net/npm/@ecomplus/storefront-app@2.0.0-beta.197/dist/lib/js/app.js';
+  appScript.src = 'https://cdn.jsdelivr.net/npm/@ecomplus/storefront-app@2.0.0-beta.198/dist/lib/js/app.js';
   appScript.onload = onLoad;
   document.body.appendChild(appScript);
 }

package/packages/storefront/src/lib/state/customer-session.ts

@@ -45,10 +45,11 @@ const isLogged = computed(() => {
   return isAuthenticated.value || !!firebaseAuth?.currentUser?.emailVerified;
 });
 const logout = () => {
-  session.auth = emptySession.auth;
-  session.customer = emptySession.customer;
-  localStorage.removeItem(storageKey);
-  firebaseAuth.signOut();
+  firebaseAuth.signOut().then(() => {
+    session.auth = emptySession.auth;
+    session.customer = emptySession.customer;
+    localStorage.removeItem(storageKey);
+  });
 };
 
 const throwNoAuth = (msg = 'Not authenticated') => {
@@ -123,13 +124,11 @@ const initializeFirebaseAuth = (canWaitIdle?: boolean) => {
             const isEmailChanged = user.email !== customerEmail.value;
             if (isEmailChanged || !isAuthenticated.value) {
               await authenticate();
-              if (isEmailChanged || !customerName.value) {
-                await fetchCustomer();
-              }
+            }
+            if (isEmailChanged || !session.customer.doc_number) {
+              await fetchCustomer();
             }
           }
-        } else {
-          logout();
         }
       });
       if (isSignInWithEmailLink(firebaseAuth, window.location.href)) {

package/packages/test-base/package.json

@@ -2,7 +2,7 @@
   "name": "@cloudcommerce/test-base",
   "private": true,
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce basic setup for testing",
   "main": "lib/index.js",
   "files": [

package/packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "e-com.plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "files": [