cloudcommerce 0.9.0 → 0.10.0

package/packages/apps/paghiper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce app to integrate PagHiper",
   "main": "lib/paghiper.js",
   "exports": {
@@ -25,9 +25,9 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.3.5",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1"
+    "axios": "^1.3.6",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/apps/pix/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pix API (Bacen)",
   "main": "lib/pix.js",
   "exports": {
@@ -25,9 +25,9 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.3.5",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1"
+    "axios": "^1.3.6",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/apps/tiny-erp/lib/tiny-erp.js

@@ -1,17 +1,19 @@
 /* eslint-disable import/prefer-default-export */
 import '@cloudcommerce/firebase/lib/init';
-import { onRequest } from 'firebase-functions/v2/https';
+import functions from 'firebase-functions/v1';
 import config from '@cloudcommerce/firebase/lib/config';
 import { createAppEventsFunction } from '@cloudcommerce/firebase/lib/helpers/pubsub';
 import handleApiEvent from './event-to-tiny.js';
 import handleTinyWebhook from './tiny-webhook.js';
 
 const { httpsFunctionOptions } = config.get();
+const { region } = httpsFunctionOptions;
 
 export const tinyerp = {
   onStoreEvent: createAppEventsFunction('tinyErp', handleApiEvent),
-  webhook: onRequest(httpsFunctionOptions, (req, res) => {
-    handleTinyWebhook(req, res);
-  }),
+  webhook: functions
+    .region(region)
+    .runWith(httpsFunctionOptions)
+    .https.onRequest(handleTinyWebhook),
 };
 // # sourceMappingURL=tiny-erp.js.map

package/packages/apps/tiny-erp/lib/tiny-erp.js.map

@@ -1 +1 @@
-{"version":3,"file":"tiny-erp.js","sourceRoot":"","sources":["../src/tiny-erp.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EACL,uBAAuB,GAExB,MAAM,4CAA4C,CAAC;AACpD,OAAO,cAAc,MAAM,iBAAiB,CAAC;AAC7C,OAAO,iBAAiB,MAAM,gBAAgB,CAAC;AAE/C,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,YAAY,EAAE,uBAAuB,CACnC,SAAS,EACT,cAAiC,CAClC;IAED,OAAO,EAAE,SAAS,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACpD,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC;CACH,CAAC"}
+{"version":3,"file":"tiny-erp.js","sourceRoot":"","sources":["../src/tiny-erp.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EACL,uBAAuB,GAExB,MAAM,4CAA4C,CAAC;AACpD,OAAO,cAAc,MAAM,iBAAiB,CAAC;AAC7C,OAAO,iBAAiB,MAAM,gBAAgB,CAAC;AAE/C,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;AAExC,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,YAAY,EAAE,uBAAuB,CACnC,SAAS,EACT,cAAiC,CAClC;IAED,OAAO,EAAE,SAAS;SACf,MAAM,CAAC,MAAM,CAAC;SACd,OAAO,CAAC,oBAAoB,CAAC;SAC7B,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC;CACtC,CAAC"}

package/packages/apps/tiny-erp/lib/tiny-webhook.js

@@ -29,7 +29,8 @@ export default async (req, res) => {
           ...application.hidden_data,
         };
         if (appData.tiny_api_token !== tinyToken) {
-          return res.sendStatus(401);
+          res.sendStatus(401);
+          return;
         }
         process.env.TINY_ERP_TOKEN = tinyToken;
       }
@@ -81,12 +82,14 @@ export default async (req, res) => {
             parseTinyItem(variacao.id ? variacao : variacao.variacao);
           });
         }
-        return res.status(200).send(mapeamentos);
+        res.status(200).send(mapeamentos);
+        return;
       }
-      return res.sendStatus(200);
+      res.sendStatus(200);
+      return;
     }
     logger.warn('< Invalid Tiny Webhook body', req.body);
   }
-  return res.sendStatus(403);
+  res.sendStatus(403);
 };
 // # sourceMappingURL=tiny-webhook.js.map

package/packages/apps/tiny-erp/lib/tiny-webhook.js.map

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

package/packages/apps/tiny-erp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce app for Tiny ERP",
   "main": "lib/tiny-erp.js",
   "repository": {
@@ -22,9 +22,9 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.3",
-    "axios": "^1.3.5",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1",
+    "axios": "^1.3.6",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1",
     "form-data": "^4.0.0"
   },
   "devDependencies": {

package/packages/apps/tiny-erp/src/tiny-erp.ts

@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 
 import '@cloudcommerce/firebase/lib/init';
-import { onRequest } from 'firebase-functions/v2/https';
+import functions from 'firebase-functions/v1';
 import config from '@cloudcommerce/firebase/lib/config';
 import {
   createAppEventsFunction,
@@ -11,6 +11,7 @@ import handleApiEvent from './event-to-tiny';
 import handleTinyWebhook from './tiny-webhook';
 
 const { httpsFunctionOptions } = config.get();
+const { region } = httpsFunctionOptions;
 
 export const tinyerp = {
   onStoreEvent: createAppEventsFunction(
@@ -18,7 +19,8 @@ export const tinyerp = {
     handleApiEvent as ApiEventHandler,
   ),
 
-  webhook: onRequest(httpsFunctionOptions, (req, res) => {
-    handleTinyWebhook(req, res);
-  }),
+  webhook: functions
+    .region(region)
+    .runWith(httpsFunctionOptions)
+    .https.onRequest(handleTinyWebhook),
 };

package/packages/apps/tiny-erp/src/tiny-webhook.ts

@@ -31,7 +31,8 @@ export default async (req: Request, res: Response) => {
           ...application.hidden_data,
         };
         if (appData.tiny_api_token !== tinyToken) {
-          return res.sendStatus(401);
+          res.sendStatus(401);
+          return;
         }
         process.env.TINY_ERP_TOKEN = tinyToken;
       }
@@ -90,11 +91,13 @@ export default async (req: Request, res: Response) => {
             parseTinyItem(variacao.id ? variacao : variacao.variacao);
           });
         }
-        return res.status(200).send(mapeamentos);
+        res.status(200).send(mapeamentos);
+        return;
       }
-      return res.sendStatus(200);
+      res.sendStatus(200);
+      return;
     }
     logger.warn('< Invalid Tiny Webhook body', req.body);
   }
-  return res.sendStatus(403);
+  res.sendStatus(403);
 };

package/packages/apps/webhooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce app for general order webhooks",
   "main": "lib/index.js",
   "repository": {
@@ -21,9 +21,9 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.3.5",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1"
+    "axios": "^1.3.6",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/cli/lib/build.js

@@ -35,3 +35,5 @@ const buildCodebase = async (codebase) => {
 export default buildCodebase;
 
 export { buildCodebase, copyFunctionsConfig };
+
+export const prepareCodebases = copyFunctionsConfig;

package/packages/cli/lib/cli.js

@@ -4,11 +4,13 @@ import {
   $, argv, fs, echo, chalk,
 } from 'zx';
 import login from './login.js';
-import build from './build.js';
+import build, { prepareCodebases } from './build.js';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud.js';
 import createGhSecrets from './setup-gh.js';
 
 const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS, GITHUB_TOKEN } = process.env;
+// https://github.com/google/zx/issues/124
+process.env.FORCE_COLOR = '3';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 let projectId = FIREBASE_PROJECT_ID;
@@ -144,7 +146,7 @@ Finish by saving the following secrets to your GitHub repository:
 `;
   }
   if (argv._.includes('dev') || !argv._.length) {
-    await $`npm run build -- --codebase ssr`;
+    await prepareCodebases();
     return $`npm --prefix "${path.join(pwd, 'functions/ssr')}" run dev`;
   }
   return $`echo 'Hello from @cloudcommerce/cli'`;

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/cli/src/build.ts

@@ -39,3 +39,5 @@ const buildCodebase = async (codebase?: string) => {
 export default buildCodebase;
 
 export { buildCodebase, copyFunctionsConfig };
+
+export const prepareCodebases = copyFunctionsConfig;

package/packages/cli/src/cli.ts

@@ -8,7 +8,7 @@ import {
   chalk,
 } from 'zx';
 import login from './login';
-import build from './build';
+import build, { prepareCodebases } from './build';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud';
 import createGhSecrets from './setup-gh';
 
@@ -18,6 +18,9 @@ const {
   GITHUB_TOKEN,
 } = process.env;
 
+// https://github.com/google/zx/issues/124
+process.env.FORCE_COLOR = '3';
+
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 
@@ -176,7 +179,7 @@ Finish by saving the following secrets to your GitHub repository:
   }
 
   if (argv._.includes('dev') || !argv._.length) {
-    await $`npm run build -- --codebase ssr`;
+    await prepareCodebases();
     return $`npm --prefix "${path.join(pwd, 'functions/ssr')}" run dev`;
   }
   return $`echo 'Hello from @cloudcommerce/cli'`;

package/packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {

package/packages/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.3.5",
+    "axios": "^1.3.6",
     "ejs": "^3.1.9",
     "nodemailer": "^6.9.1"
   },

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {
@@ -40,8 +40,8 @@
     "@cloudcommerce/app-tiny-erp": "workspace:*",
     "@cloudcommerce/app-webhooks": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/firebase/lib/config.d.ts

@@ -4,13 +4,17 @@ declare const mergeConfig: {
     hello: string;
     httpsFunctionOptions: {
         region: string;
+        memory: "128MB" | "256MB" | "512MB" | "1GB" | "2GB";
     };
     ssrFunctionOptions: {
         region: string;
-        memory: "256MiB" | "512MiB" | "1GiB" | "2GiB";
+        memory: "128MB" | "256MB" | "512MB" | "1GB" | "2GB" | "4GB";
         timeoutSeconds: number;
         minInstances: number;
     };
+    modulesFunctionOptions: {
+        memory: "256MiB" | "512MiB" | "1GiB" | "2GiB";
+    };
     apps: {
         discounts: {
             appId: number;

package/packages/firebase/lib/config.js

@@ -38,7 +38,7 @@ const webhooksAppEvents = [
   'carts-delayed',
 ];
 const {
-  SETTINGS_FILEPATH, DEPLOY_REGION, SSR_DEPLOY_REGION, SSR_DEPLOY_MEMORY, SSR_DEPLOY_TIMEOUT_SECONDS, SSR_DEPLOY_MIN_INSTANCES,
+  SETTINGS_FILEPATH, DEPLOY_REGION, DEPLOY_MEMORY, SSR_DEPLOY_REGION, SSR_DEPLOY_MEMORY, SSR_DEPLOY_TIMEOUT_SECONDS, SSR_DEPLOY_MIN_INSTANCES, MODULES_DEPLOY_MEMORY,
 } = process.env;
 let cmsSettingsFile = SETTINGS_FILEPATH && existsSync(SETTINGS_FILEPATH)
   ? SETTINGS_FILEPATH
@@ -51,13 +51,17 @@ const mergeConfig = {
   hello: 'from @cloudcommerce/firebase',
   httpsFunctionOptions: {
     region: DEPLOY_REGION || 'southamerica-east1',
+    memory: DEPLOY_MEMORY || '256MB',
   },
   ssrFunctionOptions: {
     region: SSR_DEPLOY_REGION || 'us-central1',
-    memory: SSR_DEPLOY_MEMORY || '1GiB',
+    memory: SSR_DEPLOY_MEMORY || '1GB',
     timeoutSeconds: SSR_DEPLOY_TIMEOUT_SECONDS ? Number(SSR_DEPLOY_TIMEOUT_SECONDS) : 10,
     minInstances: SSR_DEPLOY_MIN_INSTANCES ? Number(SSR_DEPLOY_MIN_INSTANCES) : 0,
   },
+  modulesFunctionOptions: {
+    memory: MODULES_DEPLOY_MEMORY || '512MiB',
+  },
   apps: {
     discounts: {
       appId: 1252,

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

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

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -31,9 +31,9 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
-    "@google-cloud/pubsub": "^3.4.1",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1",
+    "@google-cloud/pubsub": "^3.5.0",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/firebase/src/config.ts

@@ -42,10 +42,12 @@ const webhooksAppEvents: ApiEventName[] = [
 const {
   SETTINGS_FILEPATH,
   DEPLOY_REGION,
+  DEPLOY_MEMORY,
   SSR_DEPLOY_REGION,
   SSR_DEPLOY_MEMORY,
   SSR_DEPLOY_TIMEOUT_SECONDS,
   SSR_DEPLOY_MIN_INSTANCES,
+  MODULES_DEPLOY_MEMORY,
 } = process.env;
 
 let cmsSettingsFile = SETTINGS_FILEPATH && existsSync(SETTINGS_FILEPATH)
@@ -60,13 +62,17 @@ const mergeConfig = {
   hello: 'from @cloudcommerce/firebase',
   httpsFunctionOptions: {
     region: DEPLOY_REGION || 'southamerica-east1',
+    memory: (DEPLOY_MEMORY as '128MB' | '256MB' | '512MB' | '1GB' | '2GB') || '256MB',
   },
   ssrFunctionOptions: {
     region: SSR_DEPLOY_REGION || 'us-central1',
-    memory: (SSR_DEPLOY_MEMORY as '256MiB' | '512MiB' | '1GiB' | '2GiB') || '1GiB',
+    memory: (SSR_DEPLOY_MEMORY as '128MB' | '256MB' | '512MB' | '1GB' | '2GB' | '4GB') || '1GB',
     timeoutSeconds: SSR_DEPLOY_TIMEOUT_SECONDS ? Number(SSR_DEPLOY_TIMEOUT_SECONDS) : 10,
     minInstances: SSR_DEPLOY_MIN_INSTANCES ? Number(SSR_DEPLOY_MIN_INSTANCES) : 0,
   },
+  modulesFunctionOptions: {
+    memory: (MODULES_DEPLOY_MEMORY as '256MiB' | '512MiB' | '1GiB' | '2GiB') || '512MiB',
+  },
   apps: {
     discounts: {
       appId: 1252,

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/lib/firebase.js

@@ -4,11 +4,12 @@ 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();
+const { httpsFunctionOptions: { region }, modulesFunctionOptions: { memory } } = config.get();
 
 export const modules = onRequest({
-  concurrency: 12,
-  ...httpsFunctionOptions,
+  concurrency: 24,
+  region,
+  memory,
 }, (req, res) => {
   serveModulesApi(req, res);
 });

package/packages/modules/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,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;IAC/B,WAAW,EAAE,EAAE;IACf,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,iDAAiD;AACjD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,MAAM,EACJ,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAChC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GACnC,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,EAAE;IACf,MAAM;IACN,MAAM;CACP,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACd,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.9.0",
+  "version": "0.10.0",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -44,9 +44,9 @@
     "@ecomplus/utils": "1.5.0-rc.3",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "axios": "^1.3.5",
-    "firebase-admin": "^11.6.0",
-    "firebase-functions": "^4.2.1",
+    "axios": "^1.3.6",
+    "firebase-admin": "^11.7.0",
+    "firebase-functions": "^4.3.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/modules/src/firebase.ts

@@ -4,11 +4,15 @@ import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 import serveModulesApi from './firebase/serve-modules-api';
 
-const { httpsFunctionOptions } = config.get();
+const {
+  httpsFunctionOptions: { region },
+  modulesFunctionOptions: { memory },
+} = config.get();
 
 export const modules = onRequest({
-  concurrency: 12,
-  ...httpsFunctionOptions,
+  concurrency: 24,
+  region,
+  memory,
 }, (req, res) => {
   serveModulesApi(req, res);
 });

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

@@ -9,24 +9,27 @@ export default async (req, res) => {
   url = url.replace('/api/passport', ''); // due to hosting rewrite
   const endpoint = url.split('/')[1];
   if (endpoint !== 'token') {
-    return res.sendStatus(404);
+    res.sendStatus(404);
+    return;
   }
   const firebaseAuthToken = req.headers.authorization?.split(' ')[1];
   if (!firebaseAuthToken) {
-    return res.sendStatus(401);
+    res.sendStatus(401);
+    return;
   }
   try {
     const authCustomerApi = await authenticateCustomer(firebaseAuthToken);
     if (authCustomerApi !== null) {
-      return res.send(authCustomerApi);
+      res.send(authCustomerApi);
+      return;
     }
-    return res.status(401).json({
+    res.status(401).json({
       status: 401,
       error: 'Invalid Firebase Auth token, unauthorized',
     });
   } catch (err) {
     logger.error(err);
-    return res.sendStatus(err.statusCode || 500);
+    res.sendStatus(err.statusCode || 500);
   }
 };
 // # sourceMappingURL=serve-passport-api.js.map

package/packages/passport/lib/firebase/serve-passport-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-passport-api.js","sourceRoot":"","sources":["../../src/firebase/serve-passport-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAE3D,eAAe,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACnD,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAClB,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB;IACjE,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,QAAQ,KAAK,OAAO,EAAE;QACxB,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IACD,MAAM,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IACD,IAAI;QACF,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QACtE,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAClC;QACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,2CAA2C;SACnD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,GAAG,CAAC,UAAU,CAAE,GAAgB,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;KAC5D;AACH,CAAC,CAAC"}
+{"version":3,"file":"serve-passport-api.js","sourceRoot":"","sources":["../../src/firebase/serve-passport-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAE3D,eAAe,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACnD,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAClB,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB;IACjE,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,QAAQ,KAAK,OAAO,EAAE;QACxB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,iBAAiB,EAAE;QACtB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO;KACR;IACD,IAAI;QACF,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QACtE,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1B,OAAO;SACR;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,2CAA2C;SACnD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,GAAG,CAAC,UAAU,CAAE,GAAgB,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;KACrD;AACH,CAAC,CAAC"}

package/packages/passport/lib/firebase.js

@@ -1,15 +1,18 @@
 import '@cloudcommerce/firebase/lib/init';
-import { onRequest } from 'firebase-functions/v2/https';
+import functions from 'firebase-functions/v1';
 import config from '@cloudcommerce/firebase/lib/config';
 import servePassportApi from './firebase/serve-passport-api.js';
 
-const options = {
-  memory: '128MiB',
-  ...config.get().httpsFunctionOptions,
-};
+const { httpsFunctionOptions } = config.get();
+const { region } = httpsFunctionOptions;
 
 // eslint-disable-next-line import/prefer-default-export
-export const passport = onRequest(options, (req, res) => {
-  servePassportApi(req, res);
-});
+export const passport = functions
+  .region(region)
+  .runWith({
+    ...httpsFunctionOptions,
+    memory: '128MB',
+    timeoutSeconds: 30,
+  })
+  .https.onRequest(servePassportApi);
 // # sourceMappingURL=firebase.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,EAAgB,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,OAAO,GAAG;IACd,MAAM,EAAE,QAAQ;IAChB,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB;CACrB,CAAC;AAElB,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;AAExC,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,GAAG,oBAAoB;IACvB,MAAM,EAAE,OAAO;IACf,cAAc,EAAE,EAAE;CACnB,CAAC;KACD,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC"}