cloudcommerce 0.0.61 → 0.0.64

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAClE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"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,8BAA8B,CAAC;AAE3D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAClE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.0.61",
+  "version": "0.0.64",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
+    "@cloudcommerce/app-correios": "workspace:*",
     "@cloudcommerce/app-discounts": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "ajv": "^8.11.0",

package/packages/modules/src/firebase/call-app-module.ts

@@ -20,7 +20,16 @@ export default async (
   }
   const { storeId, apps } = config.get();
 
-  const debug = (response: AxiosResponse) => {
+  const checkErrorResponse = (logHead: string, resData: any) => {
+    if (typeof resData === 'object' && resData !== null) {
+      const { error, message } = resData;
+      if (typeof error === 'string' && error.length && typeof message === 'string') {
+        logger.warn(logHead, JSON.stringify({ error, message }));
+      }
+    }
+  };
+
+  const debugAndBlacklist = (response: AxiosResponse) => {
     const status = response ? response.status : 0;
     if (!blacklist[url]) {
       blacklist[url] = 1;
@@ -34,16 +43,11 @@ export default async (
         delete blacklist[url];
       }
     }, !status ? 180000 : 6000);
-
-    logger.info(`${url} : ${status}`);
+    const logHead = `${url} : ${status}`;
     if (status >= 400 && status < 500) {
-      const { data: resData } = response;
-      if (typeof resData === 'object' && resData !== null) {
-        const { error, message } = resData;
-        if (typeof error === 'string' && error.length && typeof message === 'string') {
-          logger.warn(JSON.stringify({ error, message }));
-        }
-      }
+      checkErrorResponse(logHead, response.data);
+    } else {
+      logger.info(logHead);
     }
   };
 
@@ -56,6 +60,13 @@ export default async (
           .then(({ applyDiscount }) => applyDiscount(_data));
       };
     }
+  } else if (modName === 'calculate_shipping') {
+    if (appId === apps.correios.appId) {
+      internalModuleFn = async (_data: AppModuleBody = data) => {
+        return import('@cloudcommerce/app-correios')
+          .then(({ calculateShipping }) => calculateShipping(_data));
+      };
+    }
   }
   if (internalModuleFn) {
     /*
@@ -71,10 +82,14 @@ export default async (
     */
     const middleware = global[`app${appId}_${modName}_middleware`];
     try {
+      let appResponse: any;
       if (typeof middleware === 'function') {
-        return await middleware(data, internalModuleFn);
+        appResponse = await middleware(data, internalModuleFn);
+      } else {
+        appResponse = await internalModuleFn(data);
       }
-      return await internalModuleFn(data);
+      checkErrorResponse(`${appId}_${modName}`, appResponse);
+      return appResponse;
     } catch (err) {
       logger.error(err);
       let message = 'Failed to execute module function';
@@ -102,12 +117,12 @@ export default async (
     timeout: isBigTimeout ? 30000 : 10000,
   })
     .then((response) => {
-      debug(response);
+      debugAndBlacklist(response);
       return response.data;
     })
     .catch((err) => {
       const { response } = err;
-      debug(response);
+      debugAndBlacklist(response);
       if (err.message || err.code) {
         let msg = `Axios error ${err.code}: ${err.message}`;
         if (data) {

package/packages/modules/src/firebase.ts

@@ -1,5 +1,4 @@
 /* eslint-disable import/prefer-default-export */
-
 import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';

package/packages/passport/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
+{"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;AAExD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.0.61",
+  "version": "0.0.64",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/src/firebase.ts

@@ -1,5 +1,4 @@
 /* eslint-disable import/prefer-default-export */
-
 import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.61",
+  "version": "0.0.64",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {

package/packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "0.0.61",
+  "version": "0.0.64",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "repository": {

package/packages/apps/_app.config.js

@@ -1,80 +0,0 @@
-/* eslint-disable comma-dangle, no-multi-spaces, key-spacing, max-len */
-
-/**
- * Edit base E-Com Plus Application object here.
- * Ref.: https://developers.e-com.plus/docs/api/#/store/applications/
- */
-
-export default () => {
-  return {
-    app_id: 9000,
-    title: 'My Awesome E-Com Plus App',
-    slug: 'my-awesome-app',
-    type: 'external',
-    state: 'active',
-
-    /**
-     * Uncomment modules above to work with E-Com Plus Mods API on Storefront.
-     * Ref.: https://developers.e-com.plus/modules-api/
-     */
-    modules: {
-      /**
-       * Triggered to calculate shipping options, must return values and deadlines.
-       * Start editing `routes/ecom/modules/calculate-shipping.js`
-       */
-      // calculate_shipping:   { enabled: true },
-
-      /**
-       * Triggered to validate and apply discount value, must return discount and conditions.
-       * Start editing `routes/ecom/modules/apply-discount.js`
-       */
-      // apply_discount:       { enabled: true },
-
-      /**
-       * Triggered when listing payments, must return available payment methods.
-       * Start editing `routes/ecom/modules/list-payments.js`
-       */
-      // list_payments:        { enabled: true },
-
-      /**
-       * Triggered when order is being closed, must create payment transaction and return info.
-       * Start editing `routes/ecom/modules/create-transaction.js`
-       */
-      // create_transaction:   { enabled: true },
-    },
-
-    admin_settings: {
-      /**
-       * JSON schema based fields to be configured by merchant and saved to app `data` / `hidden_data`, such as:
-
-       webhook_uri: {
-         schema: {
-           type: 'string',
-           maxLength: 255,
-           format: 'uri',
-           title: 'Notifications URI',
-           description: 'Unique notifications URI available on your Custom App dashboard'
-         },
-         hide: true
-       },
-       token: {
-         schema: {
-           type: 'string',
-           maxLength: 50,
-           title: 'App token'
-         },
-         hide: true
-       },
-       opt_in: {
-         schema: {
-           type: 'boolean',
-           default: false,
-           title: 'Some config option'
-         },
-         hide: false
-       },
-
-       */
-    },
-  };
-};

package/packages/apps/discounts/lib/discounts.config.d.ts

@@ -1,14 +0,0 @@
-declare const _default: () => {
-    app_id: number;
-    title: string;
-    slug: string;
-    type: string;
-    state: string;
-    modules: {
-        apply_discount: {
-            enabled: boolean;
-        };
-    };
-    admin_settings: {};
-};
-export default _default;

package/packages/apps/discounts/lib/discounts.config.js

@@ -1,19 +0,0 @@
-import config from '@cloudcommerce/firebase/lib/config';
-
-export default () => {
-  const { lang, apps: { discounts: { appId } } } = config.get();
-  return {
-    app_id: appId,
-    title: lang.startsWith('en') ? 'Campaigns and discounts' : 'Campanhas e descontos',
-    slug: 'discounts',
-    type: 'external',
-    state: 'active',
-    modules: {
-      apply_discount: {
-        enabled: true,
-      },
-    },
-    admin_settings: {},
-  };
-};
-// # sourceMappingURL=discounts.config.js.map

package/packages/apps/discounts/lib/discounts.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"discounts.config.js","sourceRoot":"","sources":["../src/discounts.config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,eAAe,GAAG,EAAE;IAClB,MAAM,EACJ,IAAI,EACJ,IAAI,EAAE,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GACF,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IAEjB,OAAO;QACL,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,uBAAuB;QAClF,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE;YACP,cAAc,EAAE;gBACd,OAAO,EAAE,IAAI;aACd;SACF;QACD,cAAc,EAAE,EACf;KACF,CAAC;AACJ,CAAC,CAAC"}

package/packages/apps/discounts/src/discounts.config.ts

@@ -1,25 +0,0 @@
-import config from '@cloudcommerce/firebase/lib/config';
-
-export default () => {
-  const {
-    lang,
-    apps: {
-      discounts: { appId },
-    },
-  } = config.get();
-
-  return {
-    app_id: appId,
-    title: lang.startsWith('en') ? 'Campaigns and discounts' : 'Campanhas e descontos',
-    slug: 'discounts',
-    type: 'external',
-    state: 'active',
-    modules: {
-      apply_discount: {
-        enabled: true,
-      },
-    },
-    admin_settings: {
-    },
-  };
-};