cloudcommerce 0.0.92 → 0.0.94

package/packages/modules/src/firebase/functions-checkout/utils.ts

@@ -0,0 +1,301 @@
+import type { Response } from 'firebase-functions';
+import type {
+  CheckoutBodyWithItems,
+  BodyOrder,
+  BodyPayment,
+  PaymentGateways,
+  PaymentMethod,
+  Amount,
+  Item,
+  ShippingSerive,
+  ShippingLine,
+} from '../../types/index';
+
+// eslint-disable-next-line padding-line-between-statements
+import logger from 'firebase-functions/lib/logger';
+
+type BodyResouce = {[key:string]:any}
+
+const sendError = (
+  res:Response,
+  status: number,
+  errorCode: string | number,
+  message: string,
+  userMessage?: {[key:string]:string},
+  moreInfo?:string,
+) => {
+  return res.status(status)
+    .send({
+      status,
+      error_code: errorCode,
+      message,
+      user_message: userMessage,
+      more_info: moreInfo,
+    });
+};
+
+const fixAmount = (
+  amount: Amount,
+  body: CheckoutBodyWithItems,
+  orderBody: BodyOrder,
+) => {
+  Object.keys(amount).forEach((field) => {
+    if (amount[field] > 0 && field !== 'total') {
+      amount[field] = Math.round(amount[field] * 100) / 100;
+    }
+  });
+
+  amount.total = Math.round(
+    ((amount.subtotal || 0) + (amount.freight || 0) - (amount.discount || 0)) * 100,
+  ) / 100;
+  if (amount.total < 0) {
+    amount.total = 0;
+  }
+  // also save amount to checkout and order body objects
+  body.amount = amount;
+  orderBody.amount = amount;
+};
+
+const getValidResults = (
+  results: {[key:string]:any} [],
+  checkProp?:string,
+) => {
+  // results array returned from module
+  // see ./#applications.js
+  const validResults: {[key:string]:any}[] = [];
+  if (Array.isArray(results)) {
+    for (let i = 0; i < results.length; i++) {
+      const result = results[i];
+      if (result.validated) {
+        if (checkProp) {
+          // validate one property from response object
+          const responseProp = result.response[checkProp];
+          if (!responseProp || (Array.isArray(responseProp) && !responseProp.length)) {
+            // try next module result
+            continue;
+          }
+        }
+        // use it
+        validResults.push(result);
+      } else {
+        // help identify likely app response errors
+        logger.error(result.response_errors);
+      }
+    }
+  }
+  return validResults;
+};
+
+const handleListPayments = (
+  body: CheckoutBodyWithItems,
+  listPayment: {[key:string]:any},
+  paymentsBody: BodyPayment,
+  amount:Amount,
+  orderBody: BodyOrder,
+) => {
+  for (let i = 0; i < listPayment.length; i++) {
+    const result = listPayment[i];
+    // treat list payments response
+    const { response } = result;
+    if (response && response.payment_gateways) {
+    // check chosen payment method code and name
+      const paymentMethod: PaymentMethod = paymentsBody.transaction.payment_method;
+      let paymentMethodCode: PaymentMethod['code'];
+      let paymentMethodName:PaymentMethod['name'];
+      if (paymentMethod) {
+        paymentMethodCode = paymentMethod.code;
+        paymentMethodName = paymentMethod.name;
+      }
+
+      // filter gateways by method code
+      const possibleGateways: PaymentGateways = response.payment_gateways.filter(
+        (paymentGatewayFound: PaymentGateways[number]) => {
+          const paymentMethodFound = paymentGatewayFound.payment_method;
+          return !paymentMethodCode
+        || (paymentMethodFound && paymentMethodFound.code === paymentMethodCode);
+        },
+      );
+      let paymentGateway: PaymentGateways[number] | undefined;
+      if (possibleGateways.length > 1 && paymentMethodName) {
+      // prefer respective method name
+        paymentGateway = possibleGateways.find(
+          (paymentGatewayFound: PaymentGateways[number]) => {
+            return paymentGatewayFound.payment_method.name === paymentMethodName;
+          },
+        );
+      }
+      if (!paymentGateway) {
+        [paymentGateway] = possibleGateways;
+      }
+
+      if (paymentGateway) {
+        const { discount } = paymentGateway;
+
+        // handle discount by payment method
+        const applyDiscountIn = discount && discount.apply_at;
+        if (applyDiscountIn && discount.value && amount[applyDiscountIn]) {
+          const maxDiscount: number = amount[applyDiscountIn] || 0;
+          // update amount discount and total
+          let discountValue: number;
+          if (discount.type === 'percentage') {
+            discountValue = (maxDiscount * discount.value) / 100;
+          } else {
+            discountValue = discount.value;
+            if (discountValue > maxDiscount) {
+              discountValue = maxDiscount;
+            }
+          }
+          amount.discount = amount.discount ? amount.discount : 0;
+          amount.discount += discountValue;
+          fixAmount(amount, body, orderBody);
+        }
+        // add to order body
+        orderBody.payment_method_label = paymentGateway.label || '';
+
+      // finally start creating new order
+      }
+    }
+  }
+};
+
+// simulate requets to calculate shipping endpoint
+const handleShippingServices = (
+  body: CheckoutBodyWithItems,
+  listShipping: BodyResouce,
+  amount:Amount,
+  orderBody: BodyOrder,
+) => {
+  for (let i = 0; i < listShipping.length; i++) {
+    const result = listShipping[i];
+    // treat calculate shipping response
+    const { response } = result;
+    if (response && response.shipping_services) {
+      // check chosen shipping code
+      const shippingCode = body.shipping.service_code;
+
+      for (let index = 0; index < response.shipping_services.length; index++) {
+        const shippingService: ShippingSerive = response.shipping_services[index];
+        const shippingLine: ShippingLine = shippingService.shipping_line;
+        if (shippingLine && (!shippingCode || shippingCode === shippingService.service_code)) {
+          // update amount freight and total
+          const priceFreight = (typeof shippingLine.price === 'number'
+            ? shippingLine.price
+            : 0);
+          let freight = typeof shippingLine.total_price === 'number'
+            ? shippingLine.total_price
+            : priceFreight;
+          if (freight < 0) {
+            freight = 0;
+          }
+          amount.freight = freight;
+          fixAmount(amount, body, orderBody);
+
+          // app info
+          const shippingApp = {
+            app: { _id: result._id, ...shippingService },
+          };
+          // remove shipping line property
+          delete shippingApp.app.shipping_line;
+
+          // sum production time to posting deadline
+          let maxProductionDays = 0;
+          if (orderBody.items) {
+            orderBody.items.forEach(
+              (item:Item) => {
+                const productionTime = item.production_time;
+                if (productionTime) {
+                  let productionDays = productionTime.days;
+                  if (productionDays && productionTime.cumulative) {
+                    productionDays *= item.quantity;
+                  }
+                  if (productionTime.max_time) {
+                    if (productionDays > productionTime.max_time) {
+                      productionDays = productionTime.max_time;
+                    }
+                  }
+                  if (maxProductionDays < productionDays) {
+                    maxProductionDays = productionDays;
+                  }
+                }
+              },
+            );
+          }
+          if (maxProductionDays) {
+            if (!shippingLine.posting_deadline) {
+              shippingLine.posting_deadline = {
+                days: 0,
+              };
+            }
+            shippingLine.posting_deadline.days += maxProductionDays;
+          }
+
+          // add to order body
+          orderBody.shipping_lines = [
+            // generate new object id and compose shipping line object
+            { ...shippingApp, ...shippingLine },
+          ];
+          orderBody.shipping_method_label = shippingService.label || '';
+
+          // continue to discount step
+        }
+      }
+    }
+  }
+};
+
+const handleApplyDiscount = (
+  body: CheckoutBodyWithItems,
+  listDiscount: BodyResouce,
+  amount:Amount,
+  orderBody: BodyOrder,
+) => {
+  // simulate request to apply discount endpoint to get extra discount value
+  for (let i = 0; i < listDiscount.length; i++) {
+    const result = listDiscount[i];
+    // treat apply discount response
+    const { response } = result;
+    if (response && response.discount_rule) {
+      // check discount value
+      const discountRule = response.discount_rule;
+      const extraDiscount = discountRule.extra_discount;
+
+      if (extraDiscount && extraDiscount.value) {
+        // update amount and save extra discount to order body
+        amount.discount += extraDiscount.value;
+        fixAmount(amount, body, orderBody);
+        orderBody.extra_discount = {
+          ...body.discount,
+          ...extraDiscount,
+          // app info
+          app: {
+            ...discountRule,
+            _id: result._id,
+          },
+        };
+
+        if (response.freebie_product_ids) {
+          // mark items provided for free
+          orderBody.items.forEach((item) => {
+            if (!item.flags) {
+              item.flags = [];
+            }
+            if (response.freebie_product_ids.includes(item.product_id)) {
+              item.flags.push('discount-set-free');
+            }
+          });
+        }
+        break;
+      }
+    }
+  }
+  // proceed to list payments
+};
+
+export {
+  sendError,
+  fixAmount,
+  getValidResults,
+  handleShippingServices,
+  handleApplyDiscount,
+  handleListPayments,
+};

package/packages/modules/src/firebase/serve-modules-api.ts

@@ -1,6 +1,7 @@
 import type { Request, Response } from 'firebase-functions';
 import { schemas } from '../index';
 import handleModule from './handle-module';
+import checkout from './checkout';
 
 export default (req: Request, res: Response) => {
   const { method } = req;
@@ -29,10 +30,14 @@ export default (req: Request, res: Response) => {
 
   if (modName === '@checkout') {
     if (url === '/@checkout') {
-      return res.status(200).send({
-        status: 200,
-        message: 'CHECKOUT',
-      });
+      if (method === 'GET') {
+        return res.status(405)
+          .send({
+            error_code: 'CKT101',
+            message: 'GET is acceptable only to JSON schema, at /@checkout/schema',
+          });
+      }
+      return checkout(schemas[modName].params, req, res, req.hostname);
     }
     if (url === '/@checkout/schema') {
       return sendSchema();

package/packages/modules/src/types/index.d.ts

@@ -0,0 +1,67 @@
+import type {
+  CheckoutBody, 
+  Carts, 
+  Orders,
+  CalculateShippingResponse,
+  ListPaymentsResponse
+} from '@cloudcommerce/types';
+import { Transaction } from '@cloudcommerce/types/modules/@checkout:params';
+
+type Items = Carts['items']
+type Item = Items[number]
+
+type Amount = Orders['amount']
+
+type CheckoutBodyWithItems = Omit<CheckoutBody, 'items'> & {
+  items: Items
+  subtotal: number,
+  amount: Amount
+}
+
+type CustomerCheckout = Exclude<CheckoutBody['customer'], undefined>
+type BodyOrder = Omit<Orders, '_id' | 'created_at' | 'updated_at' | 'store_id' | 'items' > & { 
+  items : Item[]
+}
+
+type TransactionOrder = Exclude<Orders['transactions'], undefined>[number]
+type StatusTransactionOrder = Pick<TransactionOrder, 'status'>['status']
+type BodyTransactionOrder = Omit<TransactionOrder, 'status'> & {
+  status: StatusTransactionOrder
+}
+
+type OrderPaymentHistory = Pick<Orders,'payments_history'| 'financial_status' | 'amount'>
+type BodyPaymentHistory = Exclude<Pick<Orders,'payments_history'>['payments_history'], undefined>[number]
+
+type CheckoutTransaction = Exclude<CheckoutBody['transaction'], Transaction[]>
+
+type BodyPayment = Omit<CheckoutBodyItems, 'transaction'> & {
+  transaction: CheckoutTransaction
+}
+
+type CheckoutShippingService = CalculateShippingResponse['shipping_services'][number]
+type ShippingLine = CheckoutShippingSerive['shipping_line']
+type ShippingSerive = Omit<CheckoutShippingService, 'shipping_line'> & {
+  shipping_line?: ShippingLine
+}
+
+type PaymentGateways = ListPaymentsResponse['payment_gateways']
+type PaymentMethod = Pick<PaymentGateways[number]['payment_method'], 'code' | 'name'>
+
+export {
+  CheckoutBodyWithItems,
+  BodyPayment,
+  Items,
+  Item,
+  CustomerCheckout,
+  BodyOrder,
+  PaymentMethod,
+  Amount,
+  ShippingSerive,
+  ShippingLine,
+  PaymentGateways,
+  CheckoutTransaction,
+  TransactionOrder,
+  OrderPaymentHistory,
+  BodyTransactionOrder,
+  BodyPaymentHistory
+};

package/packages/passport/lib/firebase/handle-passport.js

@@ -106,5 +106,7 @@ const sendError = (res, msg, status = 400) => {
   }
 };
 
-export { sendError, getAuthCustomerApi };
+export {
+  sendError, getAuthCustomerApi, findCustomerByEmail, generateAccessToken,
+};
 // # sourceMappingURL=handle-passport.js.map

package/packages/passport/lib/firebase/handle-passport.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-passport.js","sourceRoot":"","sources":["../../src/firebase/handle-passport.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,iCAAiC,CAAC;AAErD,MAAM,mBAAmB,GAAG,KAAK,EAAE,KAAyB,EAAE,EAAE;IAC9D,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACvB;QACD,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAC7B,IAAU,EACV,SAAyC,EACzC,EAAE;IACF,IAAI,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC1C,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACrD,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;KACF;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,QAAmB,EAAE,EAAE;IACnD,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,GAAG,CAAC;KACjB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,KAAK,EAC/B,SAAoB,EACpB,UAAkB,EAKjB,EAAE;IACH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAuB,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC;IACxD,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE;QACxE,OAAO,GAAG,CAAC,IAAI,EAAoE,CAAC;KACrF;IACD,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC;YACzB,QAAQ,EAAE,cAAc;YACxB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,GAAG,EAAE,OAAO,CAAC,gBAAgB;gBAC7B,OAAO,EAAE,OAAO,CAAC,MAAM;gBACvB,WAAW,EAAE,UAAU;aACxB;SACF,CAAC,CAAC;QACH,MAAM,WAAW,GAAG;YAClB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,UAAU;SACxB,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAC9B,SAAoB,EACpB,SAAwC,EACxC,YAAkB,EAClB,EAAE;IACF,MAAM,oBAAoB,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAC9E,IAAI,oBAAoB,KAAK,IAAI,IAAI,oBAAoB,CAAC,KAAK,EAAE;QAC/D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,OAAO,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SACrD;QACD,MAAM,WAAW,GAAG;YAClB,YAAY,EAAE,oBAAoB,CAAC,IAAI,IAAI,EAAE;YAC7C,UAAU,EAAE,oBAAoB,CAAC,KAAK;YACtC,MAAM,EAAE,CAAC;oBACP,OAAO,EAAE,oBAAoB,CAAC,KAAK;oBACnC,QAAQ,EAAE,oBAAoB,CAAC,cAAc;iBAC9C,CAAC;YACF,eAAe,EAAE,CAAC;oBAChB,QAAQ,EAAE,oBAAoB,CAAC,QAAQ,CAAC,gBAAgB;oBACxD,OAAO,EAAE,oBAAoB,CAAC,OAAO;iBACtC,CAAC;SACU,CAAC;QACf,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,UAAU,EAAE;YACd,OAAO,mBAAmB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;SACnD;KACF;IACD,sFAAsF;IACtF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,GAAa,EACb,GAAY,EACZ,MAAM,GAAG,GAAG,EACZ,EAAE;IACF,IAAI,GAAG,EAAE;QACP,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YACtB,MAAM;YACN,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;KACJ;SAAM;QACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,uBAAuB;SAC/B,CAAC,CAAC;KACJ;AACH,CAAC,CAAC;AAEF,OAAO,EACL,SAAS,EACT,kBAAkB,GACnB,CAAC"}
+{"version":3,"file":"handle-passport.js","sourceRoot":"","sources":["../../src/firebase/handle-passport.ts"],"names":[],"mappings":"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"}

package/packages/passport/lib/index.js

@@ -1 +1,2 @@
+export { findCustomerByEmail, generateAccessToken } from './firebase/handle-passport.js';
 // # sourceMappingURL=index.js.map

package/packages/passport/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}

package/packages/passport/package.json

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

package/packages/passport/src/firebase/handle-passport.ts

@@ -137,4 +137,6 @@ const sendError = (
 export {
   sendError,
   getAuthCustomerApi,
+  findCustomerByEmail,
+  generateAccessToken,
 };

package/packages/passport/src/index.ts

@@ -0,0 +1 @@
+export { findCustomerByEmail, generateAccessToken } from './firebase/handle-passport';

package/packages/ssr/lib/firebase.js

@@ -1,6 +1,8 @@
-/* eslint-disable import/prefer-default-export */
-import '@cloudcommerce/firebase/lib/init';
-// eslint-disable-next-line import/no-unresolved
+/* eslint-disable import/prefer-default-export, import/no-unresolved, import/first */
+import '@cloudcommerce/api/fetch-polyfill';
+import { initializeApp } from 'firebase-admin/app';
+
+initializeApp();
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 import serveStorefront from './firebase/serve-storefront.js';

package/packages/ssr/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC;IAC3B,cAAc,EAAE,EAAE;IAClB,MAAM,EAAE,QAAQ;IAChB,mBAAmB;IACnB,GAAG,oBAAoB;CACxB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACd,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,aAAa,EAAE,CAAC;AAEhB,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC;IAC3B,cAAc,EAAE,EAAE;IAClB,MAAM,EAAE,QAAQ;IAChB,mBAAmB;IACnB,GAAG,oBAAoB;CACxB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACd,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -37,9 +37,6 @@
     "mime": "^3.0.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "sharp": "^0.31.0",
-    "slash": "^4.0.0",
-    "source-map-support": "^0.5.21",
     "string-width": "^5.1.2",
     "vue": "^3.2.39"
   },

package/packages/ssr/src/firebase.ts

@@ -1,6 +1,9 @@
-/* eslint-disable import/prefer-default-export */
-import '@cloudcommerce/firebase/lib/init';
-// eslint-disable-next-line import/no-unresolved
+/* eslint-disable import/prefer-default-export, import/no-unresolved, import/first */
+import '@cloudcommerce/api/fetch-polyfill';
+import { initializeApp } from 'firebase-admin/app';
+
+initializeApp();
+
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 import serveStorefront from './firebase/serve-storefront';

package/packages/storefront/astro.config.mjs

@@ -4,7 +4,6 @@ import * as dotenv from 'dotenv';
 import { defineConfig } from 'astro/config';
 import node from '@astrojs/node';
 import vue from '@astrojs/vue';
-import image from '@astrojs/image';
 import partytown from '@astrojs/partytown';
 import prefetch from '@astrojs/prefetch';
 import sitemap from '@astrojs/sitemap';
@@ -65,15 +64,12 @@ const _vitePWAOptions = {
         cacheName: 'assets',
       },
     }, {
-      urlPattern: /^\/_image$/,
+      urlPattern: settings.logo
+        ? new RegExp(`^${(settings.mini_logo ? `(?:${settings.mini_logo}|${settings.logo})` : settings.logo)}$`)
+        : /^\/(?:img\/uploads\/|img\/)?logo\.(?:png|jpg|jpeg|webp|avif|svg)$/,
       handler: 'StaleWhileRevalidate',
       options: {
-        cacheName: 'sharp-images',
-        expiration: {
-          maxEntries: 50,
-          maxAgeSeconds: 60 * 60 * 24 * 30, // 30 days
-          purgeOnQuotaError: true,
-        },
+        cacheName: 'logo',
       },
     }, {
       urlPattern: /^\/img\/uploads\/.*\.(?:png|jpg|jpeg|webp|avif|svg|gif)$/,
@@ -130,7 +126,6 @@ const genAstroConfig = ({
   adapter: node(),
   integrations: [
     vue(),
-    image(),
     partytown(),
     prefetch(),
     sitemap(),

package/packages/storefront/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()})).then((()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e})));self.define=(i,r)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let a={};const t=e=>n(e,o),c={module:{uri:o},exports:a,require:t};s[o]=Promise.all(i.map((e=>c[e]||t(e)))).then((e=>(r(...e),a)))}}define(["./workbox-6f0d1f78"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"chunks/workbox-window.prod.es5.4b654ae6.js",revision:null},{url:"client.80baece3.js",revision:null},{url:"hoisted.46e058d2.js",revision:null},{url:"page.3aa82516.js",revision:null},{url:"img/icon.png",revision:"791be7ee6538f26bb57bc31243a6e17e"},{url:"img/large-icon.png",revision:"0b35db516cfa7475b1c2f8c081e8d54d"},{url:"manifest.webmanifest",revision:"f3f24fe1b3d542152ca2f18813168ad6"}],{ignoreURLParametersMatching:[/.*/]}),e.cleanupOutdatedCaches(),e.registerRoute(/^\/$/,new e.NetworkFirst,"GET"),e.registerRoute(/\/((?!(?:admin|assets|img)(\/|$))[^.]+)(\.(?!js|css|xml|txt|png|jpg|jpeg|webp|avif|svg|gif)[^.]+)*$/,new e.NetworkFirst({cacheName:"pages",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/assets\//,new e.StaleWhileRevalidate({cacheName:"assets",plugins:[]}),"GET"),e.registerRoute(/^\/_image$/,new e.StaleWhileRevalidate({cacheName:"sharp-images",plugins:[new e.ExpirationPlugin({maxEntries:50,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/img\/uploads\/.*\.(?:png|jpg|jpeg|webp|avif|svg|gif)$/,new e.StaleWhileRevalidate({cacheName:"cms-images",plugins:[new e.ExpirationPlugin({maxEntries:20,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/ecomplus\.io/,new e.NetworkFirst({cacheName:"store-api",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/normal\//,new e.CacheFirst({cacheName:"product-thumbnails",plugins:[new e.ExpirationPlugin({maxEntries:100,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/big\//,new e.CacheFirst({cacheName:"product-pictures",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:604800,purgeOnQuotaError:!0})]}),"GET")}));
+if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()})).then((()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e})));self.define=(i,o)=>{const r=e||("document"in self?document.currentScript.src:"")||location.href;if(s[r])return;let a={};const t=e=>n(e,r),c={module:{uri:r},exports:a,require:t};s[r]=Promise.all(i.map((e=>c[e]||t(e)))).then((e=>(o(...e),a)))}}define(["./workbox-6f0d1f78"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"chunks/workbox-window.prod.es5.4b654ae6.js",revision:null},{url:"client.80baece3.js",revision:null},{url:"hoisted.46e058d2.js",revision:null},{url:"page.3aa82516.js",revision:null},{url:"img/icon.png",revision:"791be7ee6538f26bb57bc31243a6e17e"},{url:"img/large-icon.png",revision:"0b35db516cfa7475b1c2f8c081e8d54d"},{url:"manifest.webmanifest",revision:"f3f24fe1b3d542152ca2f18813168ad6"}],{ignoreURLParametersMatching:[/.*/]}),e.cleanupOutdatedCaches(),e.registerRoute(/^\/$/,new e.NetworkFirst,"GET"),e.registerRoute(/\/((?!(?:admin|assets|img)(\/|$))[^.]+)(\.(?!js|css|xml|txt|png|jpg|jpeg|webp|avif|svg|gif)[^.]+)*$/,new e.NetworkFirst({cacheName:"pages",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/assets\//,new e.StaleWhileRevalidate({cacheName:"assets",plugins:[]}),"GET"),e.registerRoute(/^\/img\/uploads\/logo.webp$/,new e.StaleWhileRevalidate({cacheName:"logo",plugins:[]}),"GET"),e.registerRoute(/^\/img\/uploads\/.*\.(?:png|jpg|jpeg|webp|avif|svg|gif)$/,new e.StaleWhileRevalidate({cacheName:"cms-images",plugins:[new e.ExpirationPlugin({maxEntries:20,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/ecomplus\.io/,new e.NetworkFirst({cacheName:"store-api",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/normal\//,new e.CacheFirst({cacheName:"product-thumbnails",plugins:[new e.ExpirationPlugin({maxEntries:100,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/big\//,new e.CacheFirst({cacheName:"product-pictures",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:604800,purgeOnQuotaError:!0})]}),"GET")}));