cloudcommerce 0.0.96 → 0.0.98

package/packages/modules/lib/firebase/handle-module.js

@@ -3,167 +3,165 @@ import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import api from '@cloudcommerce/api';
 import config from '@cloudcommerce/firebase/lib/config';
-import {
-  ajv, ajvOptions, parseAjvErrors, sendRequestError,
-} from './ajv.js';
+import { ajv, ajvOptions, parseAjvErrors, sendRequestError, } from './ajv.js';
 import callAppModule from './call-app-module.js';
-
 const ajvAppsResponse = addFormats(new Ajv({ ...ajvOptions, allErrors: true }));
 // Cache apps list and no params modules results
 const appsCache = {};
 const resultsCache = {};
 async function runModule(params, res, modName, validate, responseValidate, appId) {
-  const respond = (result) => res.send({
-    result,
-    meta: params,
-  });
-  const { storeId } = config.get();
-  const isEmptyParams = (!params || !Object.keys(params).length);
-  if (!validate(params)) {
-    return sendRequestError(res, modName, validate.errors);
-  }
-  let canCache = true;
-  const cacheKey = `${storeId}:${modName}`;
-  const listAppsParams = {
-    state: 'active',
-    [`modules.${modName}.enabled`]: true,
-    fields: `_id,app_id,version,data,hidden_data,modules.${modName}`,
-  };
-  if (appId
-        && (typeof appId === 'number' || (typeof appId === 'string' && /^\d+$/.test(appId)))) {
-    if (typeof appId === 'string') {
-      appId = parseInt(appId, 10);
+    const respond = (result) => res.send({
+        result,
+        meta: params,
+    });
+    const { storeId } = config.get();
+    const isEmptyParams = (!params || !Object.keys(params).length);
+    if (!validate(params)) {
+        return sendRequestError(res, modName, validate.errors);
     }
-    canCache = false;
-    listAppsParams.app_id = appId;
-    listAppsParams.limit = 1;
-  }
-  let canCacheResults = false;
-  if (canCache && isEmptyParams) {
-    if (resultsCache[cacheKey]) {
-      return respond(resultsCache[cacheKey]);
+    let canCache = true;
+    const cacheKey = `${storeId}:${modName}`;
+    const listAppsParams = {
+        state: 'active',
+        [`modules.${modName}.enabled`]: true,
+        fields: `_id,app_id,version,data,hidden_data,modules.${modName}`,
+    };
+    if (appId
+        && (typeof appId === 'number' || (typeof appId === 'string' && /^\d+$/.test(appId)))) {
+        if (typeof appId === 'string') {
+            appId = parseInt(appId, 10);
+        }
+        canCache = false;
+        listAppsParams.app_id = appId;
+        listAppsParams.limit = 1;
     }
-    canCacheResults = true;
-  }
-  let appsList;
-  if (canCache && appsCache[cacheKey]) {
-    appsList = appsCache[cacheKey];
-  } else {
-    try {
-      const { data } = await api.get('applications', {
-        params: listAppsParams,
-      });
-      appsList = data.result;
-    } catch (err) {
-      logger.error(err);
-      const error = err;
-      return res.status(500).send({
-        status: 500,
-        error_code: 'MOD801',
-        message: `Store API returned status ${error.statusCode} trying to list apps`,
-        more_info: error.data?.user_message?.en_us,
-      });
+    let canCacheResults = false;
+    if (canCache && isEmptyParams) {
+        if (resultsCache[cacheKey]) {
+            return respond(resultsCache[cacheKey]);
+        }
+        canCacheResults = true;
     }
-  }
-  if (Array.isArray(appsList)) {
-    if (!appsList.length) {
-      return respond([]);
+    let appsList;
+    if (canCache && appsCache[cacheKey]) {
+        appsList = appsCache[cacheKey];
     }
-    if (canCache && !appsCache[cacheKey]) {
-      appsCache[cacheKey] = appsList;
-      setTimeout(() => {
-        appsCache[cacheKey] = null;
-        delete appsCache[cacheKey];
-      }, appsList.length ? 60000 : 3000);
+    else {
+        try {
+            const { data } = await api.get('applications', {
+                params: listAppsParams,
+            });
+            appsList = data.result;
+        }
+        catch (err) {
+            logger.error(err);
+            const error = err;
+            return res.status(500).send({
+                status: 500,
+                error_code: 'MOD801',
+                message: `Store API returned status ${error.statusCode} trying to list apps`,
+                more_info: error.data?.user_message?.en_us,
+            });
+        }
     }
-    const moduleReqs = [];
-    for (let i = 0; i < appsList.length; i++) {
-      const application = appsList[i];
-      if (!application.hidden_data) {
-        application.hidden_data = {};
-      }
-      if (!application.data) {
-        application.data = {};
-      }
-      const appModuleUrl = application.modules[modName].endpoint;
-      // Handle request with big timeout if proxying one app (by ID) only
-      const isBigTimeout = !!(appId);
-      const appModuleBody = {
-        storeId,
-        module: modName,
-        params,
-        application,
-      };
-      const reqStartTime = Date.now();
-      moduleReqs.push(new Promise((resolve) => {
-        let response;
-        let isError = false;
-        let errorMessage = null;
-        callAppModule(appId, modName, appModuleUrl, appModuleBody, isBigTimeout)
-          .then((appResponse) => {
-            response = appResponse;
-            if (appResponse?.error) {
-              isError = true;
-              errorMessage = appResponse.message || String(appResponse.error);
+    if (Array.isArray(appsList)) {
+        if (!appsList.length) {
+            return respond([]);
+        }
+        if (canCache && !appsCache[cacheKey]) {
+            appsCache[cacheKey] = appsList;
+            setTimeout(() => {
+                appsCache[cacheKey] = null;
+                delete appsCache[cacheKey];
+            }, appsList.length ? 60000 : 3000);
+        }
+        const moduleReqs = [];
+        for (let i = 0; i < appsList.length; i++) {
+            const application = appsList[i];
+            if (!application.hidden_data) {
+                application.hidden_data = {};
             }
-          })
-          .catch((err) => {
-            response = null;
-            isError = true;
-            errorMessage = err.message;
-          })
-          .finally(() => {
-            const result = {
-              _id: application._id,
-              app_id: application.app_id,
-              took: Date.now() - reqStartTime,
-              version: application.version,
-              validated: false,
-              response_errors: null,
-              error: isError,
-              error_message: errorMessage,
-              response,
+            if (!application.data) {
+                application.data = {};
+            }
+            const appModuleUrl = application.modules[modName].endpoint;
+            // Handle request with big timeout if proxying one app (by ID) only
+            const isBigTimeout = !!(appId);
+            const appModuleBody = {
+                storeId,
+                module: modName,
+                params,
+                application,
             };
-            if (!isError && typeof response === 'object' && response !== null) {
-              result.validated = responseValidate(response);
-              if (!result.validated) {
-                // @ts-ignore
-                result.response_errors = parseAjvErrors(responseValidate.errors, ajvAppsResponse);
-              }
+            const reqStartTime = Date.now();
+            moduleReqs.push(new Promise((resolve) => {
+                let response;
+                let isError = false;
+                let errorMessage = null;
+                callAppModule(appId, modName, appModuleUrl, appModuleBody, isBigTimeout)
+                    .then((appResponse) => {
+                    response = appResponse;
+                    if (appResponse?.error) {
+                        isError = true;
+                        errorMessage = appResponse.message || String(appResponse.error);
+                    }
+                })
+                    .catch((err) => {
+                    response = null;
+                    isError = true;
+                    errorMessage = err.message;
+                })
+                    .finally(() => {
+                    const result = {
+                        _id: application._id,
+                        app_id: application.app_id,
+                        took: Date.now() - reqStartTime,
+                        version: application.version,
+                        validated: false,
+                        response_errors: null,
+                        error: isError,
+                        error_message: errorMessage,
+                        response,
+                    };
+                    if (!isError && typeof response === 'object' && response !== null) {
+                        result.validated = responseValidate(response);
+                        if (!result.validated) {
+                            // @ts-ignore
+                            result.response_errors = parseAjvErrors(responseValidate.errors, ajvAppsResponse);
+                        }
+                    }
+                    resolve(result);
+                });
+            }));
+        }
+        return Promise.all(moduleReqs).then((results) => {
+            if (!results.find(({ response }) => response)) {
+                res.status(409);
+                canCacheResults = false;
+            }
+            if (canCacheResults && !resultsCache[cacheKey]) {
+                resultsCache[cacheKey] = results;
+                setTimeout(() => {
+                    resultsCache[cacheKey] = null;
+                    delete resultsCache[cacheKey];
+                }, 60000);
             }
-            resolve(result);
-          });
-      }));
+            return respond(results);
+        });
     }
-    return Promise.all(moduleReqs).then((results) => {
-      if (!results.find(({ response }) => response)) {
-        res.status(409);
-        canCacheResults = false;
-      }
-      if (canCacheResults && !resultsCache[cacheKey]) {
-        resultsCache[cacheKey] = results;
-        setTimeout(() => {
-          resultsCache[cacheKey] = null;
-          delete resultsCache[cacheKey];
-        }, 60000);
-      }
-      return respond(results);
-    });
-  }
-  // Shoud never happen
-  return res.sendStatus(501);
+    // Shoud never happen
+    return res.sendStatus(501);
 }
-
 export default (modName, schema, responseSchema, req, res) => {
-  const validate = ajv.compile(schema);
-  const responseValidate = ajvAppsResponse.compile(responseSchema);
-  return {
-    GET() {
-      runModule(req.query, res, modName, validate, responseValidate);
-    },
-    POST() {
-      runModule(req.body, res, modName, validate, responseValidate, req.query.app_id);
-    },
-  };
+    const validate = ajv.compile(schema);
+    const responseValidate = ajvAppsResponse.compile(responseSchema);
+    return {
+        GET() {
+            runModule(req.query, res, modName, validate, responseValidate);
+        },
+        POST() {
+            runModule(req.body, res, modName, validate, responseValidate, req.query.app_id);
+        },
+    };
 };
-// # sourceMappingURL=handle-module.js.map
+//# sourceMappingURL=handle-module.js.map

package/packages/modules/lib/firebase/proxy-apps.js

@@ -1 +1,2 @@
-// # sourceMappingURL=proxy-apps.js.map
+"use strict";
+//# sourceMappingURL=proxy-apps.js.map

package/packages/modules/lib/firebase/serve-modules-api.js

@@ -1,63 +1,62 @@
 import { schemas } from '../index.js';
 import handleModule from './handle-module.js';
 import checkout from './checkout.js';
-
 export default (req, res) => {
-  const { method } = req;
-  if (method !== 'POST' && method !== 'GET') {
-    return res.sendStatus(405);
-  }
-  if (method === 'POST'
-        && (!req.body || typeof req.body !== 'object' || Array.isArray(req.body))) {
-    return res.sendStatus(400);
-  }
-  let { url } = req;
-  if (url.endsWith('.json')) {
-    url = url.slice(0, -5);
-  }
-  [url] = url.split('?');
-  const modName = url.split('/')[1];
-  const sendSchema = (isResponseSchema = false) => {
-    return res.status(200)
-      .setHeader('Cache-Control', 'public, max-age=3600')
-      .send(schemas[modName][isResponseSchema ? 'response' : 'params']);
-  };
-  if (modName === '@checkout') {
-    if (url === '/@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();
-    }
-    return res.sendStatus(404);
-  }
-  if (schemas[modName]) {
-    const { params: schema, response: responseSchema } = schemas[modName];
-    if (!schema.$schema) {
-      schema.$schema = 'http://json-schema.org/draft-07/schema#';
-      schema.title = `Module \`${modName}\`: Params model`;
+    const { method } = req;
+    if (method !== 'POST' && method !== 'GET') {
+        return res.sendStatus(405);
     }
-    if (!responseSchema.$schema) {
-      responseSchema.$schema = 'http://json-schema.org/draft-07/schema#';
-      responseSchema.title = `Module \`${modName}\`: App response model`;
+    if (method === 'POST'
+        && (!req.body || typeof req.body !== 'object' || Array.isArray(req.body))) {
+        return res.sendStatus(400);
     }
-    if (url === `/${modName}/schema`) {
-      return sendSchema();
+    let { url } = req;
+    if (url.endsWith('.json')) {
+        url = url.slice(0, -5);
     }
-    if (url === `/${modName}/response_schema`) {
-      return sendSchema(true);
+    [url] = url.split('?');
+    const modName = url.split('/')[1];
+    const sendSchema = (isResponseSchema = false) => {
+        return res.status(200)
+            .setHeader('Cache-Control', 'public, max-age=3600')
+            .send(schemas[modName][isResponseSchema ? 'response' : 'params']);
+    };
+    if (modName === '@checkout') {
+        if (url === '/@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();
+        }
+        return res.sendStatus(404);
     }
-    if (url === `/${modName}`) {
-      return handleModule(modName, schema, responseSchema, req, res)[method]();
+    if (schemas[modName]) {
+        const { params: schema, response: responseSchema } = schemas[modName];
+        if (!schema.$schema) {
+            schema.$schema = 'http://json-schema.org/draft-07/schema#';
+            schema.title = `Module \`${modName}\`: Params model`;
+        }
+        if (!responseSchema.$schema) {
+            responseSchema.$schema = 'http://json-schema.org/draft-07/schema#';
+            responseSchema.title = `Module \`${modName}\`: App response model`;
+        }
+        if (url === `/${modName}/schema`) {
+            return sendSchema();
+        }
+        if (url === `/${modName}/response_schema`) {
+            return sendSchema(true);
+        }
+        if (url === `/${modName}`) {
+            return handleModule(modName, schema, responseSchema, req, res)[method]();
+        }
     }
-  }
-  return res.sendStatus(404);
+    return res.sendStatus(404);
 };
-// # sourceMappingURL=serve-modules-api.js.map
+//# sourceMappingURL=serve-modules-api.js.map

package/packages/modules/lib/firebase.js

@@ -4,13 +4,11 @@ import '@cloudcommerce/firebase/lib/init';
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 import serveModulesApi from './firebase/serve-modules-api.js';
-
 const { httpsFunctionOptions } = config.get();
-
 export const modules = onRequest({
-  concurrency: 6,
-  ...httpsFunctionOptions,
+    concurrency: 6,
+    ...httpsFunctionOptions,
 }, (req, res) => {
-  serveModulesApi(req, res);
+    serveModulesApi(req, res);
 });
-// # sourceMappingURL=firebase.js.map
+//# sourceMappingURL=firebase.js.map

package/packages/modules/lib/index.js

@@ -3,23 +3,20 @@ import * as applyDiscount from '../schemas/apply_discount.cjs';
 import * as listPayments from '../schemas/list_payments.cjs';
 import * as createTransaction from '../schemas/create_transaction.cjs';
 import * as checkout from '../schemas/@checkout.cjs';
-
 const schemas = {
-  calculate_shipping: calculateShipping,
-  apply_discount: applyDiscount,
-  list_payments: listPayments,
-  create_transaction: createTransaction,
-  '@checkout': checkout,
+    calculate_shipping: calculateShipping,
+    apply_discount: applyDiscount,
+    list_payments: listPayments,
+    create_transaction: createTransaction,
+    '@checkout': checkout,
 };
-
 export default {
-  calculateShipping,
-  applyDiscount,
-  listPayments,
-  createTransaction,
-  checkout,
-  schemas,
+    calculateShipping,
+    applyDiscount,
+    listPayments,
+    createTransaction,
+    checkout,
+    schemas,
 };
-
 export { schemas };
-// # sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -34,7 +34,7 @@
     "ajv-formats": "^2.1.1",
     "axios": "^0.27.2",
     "firebase-admin": "^11.0.1",
-    "firebase-functions": "^3.23.0",
+    "firebase-functions": "^3.24.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {
@@ -26,7 +26,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^11.0.1",
-    "firebase-functions": "^3.23.0",
+    "firebase-functions": "^3.24.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -30,7 +30,7 @@
     "color": "^4.2.3",
     "compression": "^1.7.4",
     "firebase-admin": "^11.0.1",
-    "firebase-functions": "^3.23.0",
+    "firebase-functions": "^3.24.0",
     "html-escaper": "^3.0.3",
     "image-size": "^1.0.2",
     "kleur": "^4.1.5",

package/packages/storefront/.eslintrc.cjs

@@ -2,5 +2,6 @@ module.exports = {
   extends: '../../.eslintrc.cjs',
   rules: {
     'no-console': 'off',
+    'import/no-unresolved': 'off',
   },
 };

package/packages/storefront/astro.config.mjs

@@ -13,7 +13,12 @@ import getConfig from './storefront.config.mjs';
 
 dotenv.config();
 
-const { domain, primaryColor, settings } = getConfig();
+const {
+  lang,
+  domain,
+  primaryColor,
+  settings,
+} = getConfig();
 
 const _vitePWAOptions = {
   manifest: {
@@ -136,6 +141,11 @@ const genAstroConfig = ({
     plugins: [
       VitePWA(vitePWAOptions),
     ],
+    resolve: {
+      alias: {
+        '@i18n': `@ecomplus/i18n/src/${lang}/index.js`,
+      },
+    },
   },
 });
 

package/packages/storefront/dist/client/LoginOffcanvas.daf3f717.js

@@ -0,0 +1 @@
+import{_ as i}from"./chunks/LoginOffcanvas.07fe6492.js";import"./chunks/preload-helper.f15ab524.js";import"./chunks/runtime-dom.esm-bundler.738639ee.js";/* empty css                                                                          */export{i as default};