cloudcommerce 2.2.2 → 2.3.0

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

@@ -89,12 +89,15 @@ const saveViews = async () => {
       const pageViewsSnapshot = await db.collection('ssrPageViews')
         .where('at', '>', new Date(Date.now() - 1000 * 60 * 20))
         .where('at', '<', new Date(Date.now() - 1000 * sMaxAge))
-        .where('isCachePurged', '!=', true)
         .get();
       const purgedUrls = [];
       for (let i = 0; i < pageViewsSnapshot.docs.length; i++) {
         const doc = pageViewsSnapshot.docs[i];
-        const { url } = doc.data();
+        const { url, isCachePurged } = doc.data();
+        if (isCachePurged) {
+          continue;
+        }
+        doc.ref.update({ isCachePurged: true });
         if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
           await bunnyAxios('/purge', {
             method: 'POST',
@@ -126,7 +129,6 @@ const saveViews = async () => {
               if (err.response?.status !== 404) throw err;
             });
           }
-          doc.ref.update({ isCachePurged: true });
         }
       }
     } catch (err) {
@@ -141,6 +143,12 @@ const saveViews = async () => {
       }
     }
   }
+  const date = new Date();
+  if (date.getHours() > 1) return;
+  if (!process.env.CRONTAB_SSR_SAVE_VIEWS) {
+    const dateMinutes = date.getMinutes();
+    if (dateMinutes < 48 || dateMinutes > 50) return;
+  }
   const pageViewsQuery = db.collection('ssrPageViews')
     .where('at', '<', new Date(Date.now() - 1000 * 60 * 60 * 24 * 90));
   await deleteQueryBatch(db, pageViewsQuery);

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

@@ -1 +1 @@
-{"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"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"}
+{"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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -32,7 +32,7 @@
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
     "@vueuse/core": "10.7.2",
-    "astro": "4.2.7",
+    "astro": "4.2.8",
     "astro-capo": "^0.0.1",
     "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",

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

@@ -91,12 +91,18 @@ const saveViews = async () => {
       const pageViewsSnapshot = await db.collection('ssrPageViews')
         .where('at', '>', new Date(Date.now() - 1000 * 60 * 20))
         .where('at', '<', new Date(Date.now() - 1000 * sMaxAge))
-        .where('isCachePurged', '!=', true)
         .get();
       const purgedUrls: string[] = [];
       for (let i = 0; i < pageViewsSnapshot.docs.length; i++) {
         const doc = pageViewsSnapshot.docs[i];
-        const { url } = doc.data() as { url: string };
+        const {
+          url,
+          isCachePurged,
+        } = doc.data() as { url: string, isCachePurged?: true };
+        if (isCachePurged) {
+          continue;
+        }
+        doc.ref.update({ isCachePurged: true });
         if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
           await bunnyAxios('/purge', {
             method: 'POST',
@@ -128,7 +134,6 @@ const saveViews = async () => {
               if (err.response?.status !== 404) throw err;
             });
           }
-          doc.ref.update({ isCachePurged: true });
         }
       }
     } catch (err: any) {
@@ -143,6 +148,12 @@ const saveViews = async () => {
       }
     }
   }
+  const date = new Date();
+  if (date.getHours() > 1) return;
+  if (!process.env.CRONTAB_SSR_SAVE_VIEWS) {
+    const dateMinutes = date.getMinutes();
+    if (dateMinutes < 48 || dateMinutes > 50) return;
+  }
   const pageViewsQuery = db.collection('ssrPageViews')
     .where('at', '<', new Date(Date.now() - 1000 * 60 * 60 * 24 * 90));
   await deleteQueryBatch(db, pageViewsQuery);

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
@@ -43,7 +43,7 @@
     "@types/gtag.js": "^0.0.18",
     "@vite-pwa/astro": "^0.2.0",
     "@vueuse/core": "10.7.2",
-    "astro": "4.2.7",
+    "astro": "4.2.8",
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.4.1",

package/packages/storefront/src/helpers/afetch.ts

@@ -1,12 +1,12 @@
 type FetchParams = Parameters<typeof fetch>;
 type RequestInit = Exclude<FetchParams[1], undefined>;
 type BodyInit = RequestInit['body'] | Record<string, any> | Array<any>;
+type AFetchInit = Omit<RequestInit, 'body'> & {
+  body?: BodyInit,
+  params?: Record<string, string | number | (string | number)[]>,
+};
 
-const afetch = (
-  url: FetchParams[0],
-  init?: Omit<RequestInit, 'body'> & { body?: BodyInit },
-  timeout = 10000,
-) => {
+const afetch = (url: FetchParams[0], init?: AFetchInit, timeout = 10000) => {
   let abortController: AbortController | undefined;
   let timer: NodeJS.Timeout | undefined;
   if (timeout) {
@@ -28,6 +28,23 @@ const afetch = (
       body = init.body;
     }
   }
+  if (init?.params && typeof url === 'string') {
+    let query = '';
+    Object.keys(init.params).forEach((key) => {
+      const value: string | number | (string | number)[] = init.params![key];
+      if (Array.isArray(value)) {
+        value.forEach((val) => {
+          query += `&${key}=${val}`;
+        });
+        return;
+      }
+      query += `&${key}=${value}`;
+    });
+    if (query) {
+      if (!url.includes('?')) url += `?${query.slice(1)}`;
+      else url += query;
+    }
+  }
   const promise = fetch(url, {
     ...init,
     body,

package/packages/storefront/src/lib/composables/use-pagination.ts

@@ -56,7 +56,7 @@ const usePagination = (props: Props) => {
   });
 
   const baseUrl = ref('');
-  watch(toRef(props.isUrlPath), () => {
+  watch(toRef(props, 'isUrlPath'), () => {
     const url = import.meta.env.SSR
       ? global.astroUrl
       : new URL(window.location.toString());

package/packages/storefront/src/lib/composables/use-shipping-calculator.ts

@@ -0,0 +1,273 @@
+import type { Ref } from 'vue';
+import type {
+  Products,
+  Carts,
+  CalculateShippingParams,
+  CalculateShippingResponse,
+  ModuleApiResult,
+} from '@cloudcommerce/types';
+import {
+  ref,
+  computed,
+  shallowReactive,
+  watch,
+  toRef,
+} from 'vue';
+import { useDebounceFn, watchOnce } from '@vueuse/core';
+import { price as getPrice } from '@ecomplus/utils';
+import config from '@cloudcommerce/config';
+import { fetchModule } from '@@sf/state/modules-info';
+
+export type ShippedItem = Exclude<CalculateShippingParams['items'], undefined>[0];
+
+export type ShippingService = CalculateShippingResponse['shipping_services'][0];
+
+type CartOrProductItem = Carts['items'][0] | (Partial<Products> & {
+  product_id: string & { length: 24 },
+  price: number,
+  quantity: number,
+});
+
+export interface Props {
+  zipInput?: Ref<HTMLInputElement | null>;
+  zipCode?: string;
+  canSelectService?: boolean;
+  countryCode?: string;
+  shippedItems?: (ShippedItem | CartOrProductItem)[];
+  shippingResult?: ModuleApiResult<'calculate_shipping'>['result'];
+  baseParams?: Partial<CalculateShippingParams>;
+  skippedAppIds?: number[];
+  appIdsOrder?: number[];
+}
+
+const localStorage = typeof window === 'object' && window.localStorage;
+
+export const ZIP_STORAGE_KEY = 'shipping-to-zip';
+
+const sortApps = (results: any, order: number[]) => {
+  return results.sort((a: any, b: any) => {
+    if (a.app_id === b.app_id) {
+      return 0;
+    }
+    const indexA = order.indexOf(a.app_id);
+    const indexB = order.indexOf(b.app_id);
+    if (indexA > -1) {
+      if (indexB > -1) {
+        return indexA < indexB ? -1 : 1;
+      }
+      return -1;
+    }
+    if (indexB > -1) return 1;
+    return 0;
+  });
+};
+const reduceItemBody = (itemOrProduct: Record<string, any>) => {
+  const shippedItem = {};
+  const fields: (keyof ShippedItem)[] = [
+    'product_id',
+    'variation_id',
+    'sku',
+    'name',
+    'quantity',
+    'inventory',
+    'currency_id',
+    'currency_symbol',
+    'price',
+    'final_price',
+    'dimensions',
+    'weight',
+  ];
+  fields.forEach((field) => {
+    if (itemOrProduct[field] !== undefined) {
+      shippedItem[field] = itemOrProduct[field];
+    }
+  });
+  return shippedItem as ShippedItem;
+};
+
+export const useShippingCalculator = (props: Props) => {
+  const localZipCode = ref(props.zipCode);
+  const zipCode = ref<string | null>(null);
+  if (!localZipCode.value && localStorage) {
+    const storedZip = localStorage.getItem(ZIP_STORAGE_KEY);
+    if (storedZip) {
+      localZipCode.value = storedZip;
+    }
+  }
+  const countryCode = props.countryCode || config.get().countryCode;
+  const _shippedItems = toRef(props, 'shippedItems');
+  const shippedItems = computed(() => {
+    return _shippedItems.value?.map(reduceItemBody) || [];
+  });
+  const amountSubtotal = computed(() => {
+    return shippedItems.value.reduce((subtotal, item) => {
+      return subtotal + getPrice(item) * item.quantity;
+    }, 0);
+  });
+
+  const isFetching = ref(false);
+  const fetchShippingServices = useDebounceFn((isRetry?: boolean) => {
+    if (isFetching.value) {
+      watchOnce((isFetching), (_isFetching) => {
+        if (!_isFetching) fetchShippingServices();
+      });
+      return;
+    }
+    const body: CalculateShippingParams = {
+      ...props.baseParams,
+      to: {
+        ...props.baseParams?.to,
+        zip: localZipCode.value!,
+      },
+    };
+    if (shippedItems.value.length) {
+      body.items = shippedItems.value;
+      body.subtotal = amountSubtotal.value;
+    }
+    isFetching.value = true;
+    fetchModule('calculate_shipping', {
+      method: 'POST',
+      params: {
+        skip_ids: props.skippedAppIds,
+      },
+      body,
+    })
+      .then(async (response) => {
+        const data = await response.json();
+        // eslint-disable-next-line no-use-before-define
+        parseShippingResult(data.result, isRetry);
+      })
+      .catch((err) => {
+        if (!isRetry) {
+          // eslint-disable-next-line no-use-before-define
+          scheduleRetry(4000);
+        }
+        console.error(err);
+      })
+      .finally(() => {
+        isFetching.value = false;
+      });
+  }, 100);
+  let retryTimer: NodeJS.Timeout | null = null;
+  const scheduleRetry = (timeout = 10000) => {
+    if (retryTimer) clearTimeout(retryTimer);
+    retryTimer = setTimeout(() => {
+      fetchShippingServices(true);
+    }, timeout);
+  };
+
+  const shippingServices = shallowReactive<(ShippingService & { app_id: number })[]>([]);
+  const freeFromValue = ref<number | null>(null);
+  const hasPaidOption = ref<boolean | undefined>();
+  const parseShippingResult = (
+    shippingResult: ModuleApiResult<'calculate_shipping'>['result'] = [],
+    isRetry = false,
+  ) => {
+    freeFromValue.value = null;
+    shippingServices.splice(0);
+    if (shippingResult.length) {
+      let hasSomeFailedApp = false;
+      shippingResult.forEach((appResult) => {
+        const { validated, error, response } = appResult;
+        if (!validated || error) {
+          hasSomeFailedApp = true;
+          return;
+        }
+        if (props.skippedAppIds?.includes(appResult.app_id)) {
+          return;
+        }
+        response.shipping_services.forEach((service) => {
+          shippingServices.push({
+            app_id: appResult.app_id,
+            ...service,
+          });
+        });
+        const freeShippingFromValue = response.free_shipping_from_value;
+        if (
+          freeShippingFromValue
+          && (!freeFromValue.value || freeFromValue.value > freeShippingFromValue)
+        ) {
+          freeFromValue.value = freeShippingFromValue;
+        }
+      });
+      if (!shippingServices.length) {
+        if (hasSomeFailedApp) {
+          if (!isRetry) {
+            fetchShippingServices(true);
+          } else {
+            scheduleRetry();
+          }
+        }
+        return;
+      }
+      shippingServices.sort((a, b) => {
+        const lineA = a.shipping_line;
+        const lineB = b.shipping_line;
+        const priceDiff = lineA.total_price! - lineB.total_price!;
+        if (priceDiff < 0) return -1;
+        if (priceDiff > 0) return 1;
+        return lineA.delivery_time?.days! < lineB.delivery_time?.days!
+          ? -1 : 1;
+      });
+      hasPaidOption.value = Boolean(shippingServices.find((service) => {
+        return service.shipping_line.total_price || service.shipping_line.price;
+      }));
+      const appIdsOrder = props.appIdsOrder || globalThis.ecomShippingApps || [];
+      if (Array.isArray(appIdsOrder) && appIdsOrder.length) {
+        sortApps(shippingServices, appIdsOrder);
+      }
+    }
+  };
+
+  const submitZipCode = () => {
+    const _zipCode = localZipCode.value;
+    if (countryCode === 'BR') {
+      if (_zipCode?.replace(/\D/g, '').length !== 8) return;
+    } else if (!_zipCode) {
+      return;
+    }
+    zipCode.value = _zipCode;
+    if (localStorage) {
+      localStorage.setItem(ZIP_STORAGE_KEY, zipCode.value);
+    }
+    fetchShippingServices();
+  };
+  watch(localZipCode, submitZipCode, {
+    immediate: !props.shippingResult,
+  });
+  watch(toRef(props, 'shippingResult'), (shippingResult) => {
+    if (!shippingResult?.length) return;
+    if (localZipCode.value) zipCode.value = localZipCode.value;
+    parseShippingResult(shippingResult);
+  }, {
+    immediate: true,
+  });
+  const zipInput = props.zipInput?.value;
+  if (zipInput) {
+    zipInput.addEventListener('input', (ev) => {
+      const value = (ev.target as HTMLInputElement).value;
+      if (value.length) {
+        if (countryCode === 'BR') {
+          const fmt = value.replace(/\D/g, '').padEnd(8, '_');
+          zipInput.innerHTML = fmt.substring(0, 5) + '-' + fmt.substring(5, 8);
+        } else {
+          zipInput.innerHTML = value.substring(0, 30);
+        }
+      }
+      localZipCode.value = value;
+    });
+  }
+
+  return {
+    zipCode,
+    shippedItems,
+    amountSubtotal,
+    submitZipCode,
+    fetchShippingServices,
+    freeFromValue,
+    shippingServices,
+    parseShippingResult,
+  };
+};
+
+export default useShippingCalculator;

package/packages/storefront/src/lib/scripts/push-analytics-events.ts

@@ -19,7 +19,7 @@ type AnalyticsEvent = {
 let eventsToSend: Array<AnalyticsEvent> = [];
 const _sendServerEvents = useDebounceFn(() => {
   afetch(`/_analytics`, {
-    method: 'post',
+    method: 'POST',
     body: {
       ...getAnalyticsContext(),
       events: eventsToSend,

package/packages/storefront/src/lib/state/modules-info.ts

@@ -2,6 +2,9 @@ import type {
   ListPaymentsResponse,
   CalculateShippingResponse,
   ApplyDiscountResponse,
+  ModuleApiEndpoint,
+  ModuleApiParams,
+  ModuleApiResult,
 } from '@cloudcommerce/types';
 import { reactive, computed } from 'vue';
 import { formatMoney } from '@ecomplus/utils';
@@ -32,6 +35,32 @@ loadingGlobalInfoPreset.then((modulesInfoPreset) => {
   Object.assign(modulesInfo, modulesInfoPreset);
 });
 
+type FetchModule = <M extends ModuleApiEndpoint>(
+  modName: M,
+  reqOptions?: {
+    method: 'GET',
+    params?: Record<string, string | number | (string | number)[]>,
+  } | {
+    method: 'POST',
+    params?: {
+      app_id?: number,
+      skip_ids?: number | number[],
+    },
+    body: ModuleApiParams<M>,
+  },
+) => Promise<Omit<Response, 'json'> & {
+  json(): Promise<ModuleApiResult<M>>,
+}>;
+
+export const fetchModule: FetchModule = (modName, reqOptions) => {
+  const { hostname } = window.location;
+  const { domain } = globalThis.$storefront.settings;
+  const modulesBaseUri = hostname !== 'localhost' && hostname !== '127.0.0.1'
+    ? `https://${domain}/_api/modules/`
+    : '/_api/modules/';
+  return afetch(`${modulesBaseUri}${modName}`, reqOptions);
+};
+
 if (!import.meta.env.SSR) {
   const storageKey = 'MODULES_INFO';
   const sessionJson = sessionStorage.getItem(storageKey);
@@ -50,8 +79,8 @@ if (!import.meta.env.SSR) {
   }
 
   const fetchInfo = () => {
-    const modulesToFetch: { modName: string, reqOptions?: Record<string, any> }[] = [];
-    ['list_payments', 'calculate_shipping'].forEach((modName) => {
+    const modulesToFetch: { modName: ModuleApiEndpoint, reqOptions?: any }[] = [];
+    (['list_payments', 'calculate_shipping'] as const).forEach((modName) => {
       if (!Object.keys(modulesInfo[modName]).length) {
         modulesToFetch.push({ modName });
       }
@@ -60,19 +89,14 @@ if (!import.meta.env.SSR) {
       modulesToFetch.push({
         modName: 'apply_discount',
         reqOptions: {
-          method: 'post',
+          method: 'POST',
           body: { utm },
         },
       });
     }
 
     modulesToFetch.forEach(({ modName, reqOptions }) => {
-      const { hostname } = window.location;
-      const { domain } = globalThis.$storefront.settings;
-      const modulesBaseUri = hostname !== 'localhost' && hostname !== '127.0.0.1'
-        ? `https://${domain}/_api/modules/`
-        : '/_api/modules/';
-      afetch(`${modulesBaseUri}${modName}`, reqOptions)
+      fetchModule(modName, reqOptions)
         .then(async (response) => {
           if (response.ok) {
             const modInfo = {};
@@ -108,7 +132,7 @@ if (!import.meta.env.SSR) {
                       field = 'discount_option';
                       val = data[field];
                       if (val && (!modInfo[field] || val.value > modInfo[field].value)) {
-                        data.payment_gateways.forEach(({ discount }) => {
+                        (data as ListPaymentsResponse).payment_gateways.forEach(({ discount }) => {
                           if (
                             discount && discount.apply_at !== 'freight'
                             && discount.value === val.value

package/packages/test-base/package.json

@@ -2,7 +2,7 @@
   "name": "@cloudcommerce/test-base",
   "private": true,
   "type": "module",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "E-Com Plus Cloud Commerce basic setup for testing",
   "main": "lib/index.js",
   "repository": {