cloudcommerce 0.0.56 → 0.0.59

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.59](https://github.com/ecomplus/cloud-commerce/compare/v0.0.58...v0.0.59) (2022-08-24)
+
+
+### Features
+
+* **cli:** Use `GITHUB_TOKEN` env to auto set secrets on setup ([#43](https://github.com/ecomplus/cloud-commerce/issues/43)) ([8949070](https://github.com/ecomplus/cloud-commerce/commit/89490703cba52affdbb69c63d8b459cb609f5130))
+* **events:** Start publishing PubSub messages for each topic/app/event [[#29](https://github.com/ecomplus/cloud-commerce/issues/29)] ([9575d25](https://github.com/ecomplus/cloud-commerce/commit/9575d25d4ca27fcc19acbd0118b0140f8b484316))
+
+
+### Bug Fixes
+
+* **cli:** Do not create `GH_TOKEN` secret (set by default) ([8e50e37](https://github.com/ecomplus/cloud-commerce/commit/8e50e371477bdf67ec0cef380f2c6488d3d588a5))
+* **deps:** Add `@google-cloud/pubsub` to core `@cloudcommerce/firebase` dependencies ([0b35b0e](https://github.com/ecomplus/cloud-commerce/commit/0b35b0edb560329a21869e8b6a75abaed9c4cd34))
+* **events:** Save last run state and timestamp to Firestore ([7183a55](https://github.com/ecomplus/cloud-commerce/commit/7183a55694ca0e5cc6968be9ca4e965772937e2a))
+* Set default GCloud region to `southamerica-east1` (São Paulo) ([212d04d](https://github.com/ecomplus/cloud-commerce/commit/212d04d72ace4cffe54489dae5b74c2dbfa4e0d0))
+
+### [0.0.58](https://github.com/ecomplus/cloud-commerce/compare/v0.0.57...v0.0.58) (2022-08-23)
+
+### [0.0.57](https://github.com/ecomplus/cloud-commerce/compare/v0.0.56...v0.0.57) (2022-08-23)
+
 ### [0.0.56](https://github.com/ecomplus/cloud-commerce/compare/v0.0.55...v0.0.56) (2022-08-23)
 
 ### [0.0.55](https://github.com/ecomplus/cloud-commerce/compare/v0.0.54...v0.0.55) (2022-08-23)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "packages/api/lib/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

package/packages/apps/tiny-erp/README.md

@@ -1 +1 @@
-# `@cloudcommerce/tiny`
+# `@cloudcommerce/tiny-erp`

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

@@ -1,20 +1,20 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce",
   "main": "lib/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",
-    "directory": "packages/tiny"
+    "directory": "packages/apps/tiny-erp"
   },
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
   "license": "Apache 2.0 with Commons Clause",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
-  "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/tiny#readme",
+  "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/apps/tiny-erp#readme",
   "scripts": {
     "build": "echo '@ecomplus/tiny-erp'"
   },

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

@@ -1,3 +1,3 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../../tsconfig.json"
 }

package/packages/cli/config/firebase.json

@@ -40,15 +40,18 @@
     "rewrites": [
       {
         "source": "/api/modules/**",
-        "function": "modules"
+        "function": "modules",
+        "region": "southamerica-east1"
       },
       {
         "source": "/api/passport/**",
-        "function": "passport"
+        "function": "passport",
+        "region": "southamerica-east1"
       },
       {
         "source": "**/!(*(*.)js|*(*.)css|*(*.)ico|*(*.)png|*(*.)gif|*(*.)jpg|*(*.)jpeg|*(*.)webp|*(*.)avif|*(*.)svg|*(*.)woff|*(*.)woff2|*(*.)otf|*(*.)ttf|*(*.)eot)",
-        "function": "ssr"
+        "function": "ssr",
+        "region": "southamerica-east1"
       }
     ],
     "cleanUrls": true

package/packages/cli/lib/index.js

@@ -5,9 +5,10 @@ import {
 } from 'zx';
 import login from './login.js';
 import build from './build.js';
-import { siginGcloudAndSetIAM, createKeyServiceAccount } from './config-gcloud.js';
+import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud.js';
+import createGhSecrets from './setup-gh.js';
 
-const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS } = process.env;
+const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS, GITHUB_TOKEN } = process.env;
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 let projectId = FIREBASE_PROJECT_ID;
@@ -29,7 +30,7 @@ if (projectId) {
       const firebaserc = fs.readJSONSync(path.join(pwd, '.firebaserc'));
       projectId = firebaserc.projects.default;
     } catch (e) {
-      projectId = 'ecom2-001';
+      projectId = 'ecom2-002';
     }
   }
 }
@@ -102,11 +103,29 @@ ECOM_STORE_ID=${storeId}
     if (argv.gcloud !== false) {
       try {
         await siginGcloudAndSetIAM(projectId, pwd);
-        serviceAccountJSON = await createKeyServiceAccount(projectId, pwd);
+        serviceAccountJSON = await createServiceAccountKey(projectId, pwd);
       } catch (e) {
         //
       }
     }
+    let hasCreatedAllSecrets = false;
+    if (GITHUB_TOKEN && argv.github !== false) {
+      try {
+        hasCreatedAllSecrets = await createGhSecrets(apiKey, authenticationId, serviceAccountJSON, GITHUB_TOKEN);
+      } catch (e) {
+        //
+      }
+    }
+    if (hasCreatedAllSecrets) {
+      return echo`
+      ****
+
+CloudCommerce setup completed successfully.
+Your store repository on GitHub is ready, the first deploy will automatically start with GH Actions.
+
+-- More info at https://github.com/ecomplus/store#getting-started
+`;
+    }
     return echo`
     ****
 

package/packages/cli/lib/{config-gcloud.js → setup-gcloud.js}

@@ -78,7 +78,7 @@ const siginGcloudAndSetIAM = async (projectId, pwd) => {
   }
   return null;
 };
-const createKeyServiceAccount = async (projectId, pwd) => {
+const createServiceAccountKey = async (projectId, pwd) => {
   try {
     const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
     await $`gcloud iam service-accounts keys create ${pathFileKey} \
@@ -91,4 +91,4 @@ const createKeyServiceAccount = async (projectId, pwd) => {
 
 export default siginGcloudAndSetIAM;
 
-export { siginGcloudAndSetIAM, createKeyServiceAccount };
+export { siginGcloudAndSetIAM, createServiceAccountKey };

package/packages/cli/lib/setup-gh.js

@@ -0,0 +1,59 @@
+import { fetch, $ } from 'zx';
+import libsodium from 'libsodium-wrappers';
+
+const getRemoteRepo = async () => {
+  try {
+    return (await $`git config --get remote.origin.url`).stdout
+      .replace(/.*github.com[/:]/, '')
+      .replace('.git', '')
+      .replace('\n', '');
+  } catch (e) {
+    return null;
+  }
+};
+const createGhSecrets = async (ecomApiKey, ecomAuthentication, firebaseServiceAccount, ghToken, ghRepo) => {
+  const remoteRepo = ghRepo || await getRemoteRepo();
+  if (!remoteRepo) {
+    throw new Error("Can't define remote Git repository");
+  }
+  const baseUrl = `https://api.github.com/repos/${remoteRepo}/actions/secrets`;
+  const fetchGhSecrets = async (resource, body, method = 'GET') => {
+    const url = `${baseUrl}${resource}`;
+    const headers = {
+      Accept: 'application/vnd.github+json',
+      Authorization: `token ${ghToken}`,
+    };
+    return fetch(url, {
+      method,
+      headers,
+      body,
+    });
+  };
+    // https:// docs.github.com/pt/rest/actions/secrets#get-a-repository-public-key
+  const ghPublicKey = await (await fetchGhSecrets('/public-key')).json();
+  const ghKeyBuffer = Buffer.from(ghPublicKey.key, 'base64');
+  await libsodium.ready;
+  const createGhSecret = async (secretName, secretValue) => {
+    // https://docs.github.com/pt/rest/actions/secrets#example-encrypting-a-secret-using-nodejs
+    // Encryption example: https://github.com/github/tweetsodium
+    const encryptedBytes = libsodium.crypto_box_seal(Buffer.from(secretValue), ghKeyBuffer);
+    const body = {
+      encrypted_value: Buffer.from(encryptedBytes).toString('base64'),
+      key_id: ghPublicKey.key_id,
+    };
+    return fetchGhSecrets(`/${secretName}`, JSON.stringify(body), 'PUT');
+  };
+  try {
+    await createGhSecret('ECOM_API_KEY', ecomApiKey);
+    await createGhSecret('ECOM_AUTHENTICATION_ID', ecomAuthentication);
+    if (firebaseServiceAccount) {
+      await createGhSecret('FIREBASE_SERVICE_ACCOUNT', firebaseServiceAccount);
+      return true;
+    }
+  } catch (e) {
+    //
+  }
+  return false;
+};
+
+export default createGhSecrets;

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
+    "libsodium-wrappers": "^0.7.10",
     "md5": "^2.3.0",
     "zx": "^7.0.8"
   }

package/packages/cli/src/index.ts

@@ -9,11 +9,13 @@ import {
 } from 'zx';
 import login from './login';
 import build from './build';
-import { siginGcloudAndSetIAM, createKeyServiceAccount } from './config-gcloud';
+import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud';
+import createGhSecrets from './setup-gh';
 
 const {
   FIREBASE_PROJECT_ID,
   GOOGLE_APPLICATION_CREDENTIALS,
+  GITHUB_TOKEN,
 } = process.env;
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
@@ -41,7 +43,7 @@ if (projectId) {
       const firebaserc = fs.readJSONSync(path.join(pwd, '.firebaserc'));
       projectId = firebaserc.projects.default;
     } catch (e) {
-      projectId = 'ecom2-001';
+      projectId = 'ecom2-002';
     }
   }
 }
@@ -103,6 +105,7 @@ ECOM_API_KEY=${apiKey}
 ECOM_STORE_ID=${storeId}
 `,
     );
+
     if (argv.deploy !== false) {
       await $firebase('deploy');
     }
@@ -111,6 +114,7 @@ ECOM_STORE_ID=${storeId}
         path.join(pwd, 'functions', 'config.json'),
         JSON.stringify({ storeId }, null, 2),
       );
+
       await build();
       try {
         await $`git add .firebaserc functions/config.json`;
@@ -124,12 +128,35 @@ ECOM_STORE_ID=${storeId}
     if (argv.gcloud !== false) {
       try {
         await siginGcloudAndSetIAM(projectId as string, pwd);
-        serviceAccountJSON = await createKeyServiceAccount(projectId as string, pwd);
+        serviceAccountJSON = await createServiceAccountKey(projectId as string, pwd);
+      } catch (e) {
+        //
+      }
+    }
+    let hasCreatedAllSecrets = false;
+    if (GITHUB_TOKEN && argv.github !== false) {
+      try {
+        hasCreatedAllSecrets = await createGhSecrets(
+          apiKey,
+          authenticationId,
+          serviceAccountJSON,
+          GITHUB_TOKEN,
+        );
       } catch (e) {
         //
       }
     }
 
+    if (hasCreatedAllSecrets) {
+      return echo`
+      ****
+
+CloudCommerce setup completed successfully.
+Your store repository on GitHub is ready, the first deploy will automatically start with GH Actions.
+
+-- More info at https://github.com/ecomplus/store#getting-started
+`;
+    }
     return echo`
     ****
 

package/packages/cli/src/{config-gcloud.ts → setup-gcloud.ts}

@@ -84,7 +84,7 @@ const siginGcloudAndSetIAM = async (projectId: string, pwd: string) => {
   return null;
 };
 
-const createKeyServiceAccount = async (projectId: string, pwd: string) => {
+const createServiceAccountKey = async (projectId: string, pwd: string) => {
   try {
     const pathFileKey = path.join(pwd, '.cloudcommerce', 'serviceAccountKey.json');
     await $`gcloud iam service-accounts keys create ${pathFileKey} \
@@ -99,5 +99,5 @@ export default siginGcloudAndSetIAM;
 
 export {
   siginGcloudAndSetIAM,
-  createKeyServiceAccount,
+  createServiceAccountKey,
 };

package/packages/cli/src/setup-gh.ts

@@ -0,0 +1,83 @@
+import { fetch, $ } from 'zx';
+import libsodium from 'libsodium-wrappers';
+
+const getRemoteRepo = async () => {
+  try {
+    return (await $`git config --get remote.origin.url`).stdout
+      .replace(/.*github.com[/:]/, '')
+      .replace('.git', '')
+      .replace('\n', '');
+  } catch (e) {
+    return null;
+  }
+};
+
+const createGhSecrets = async (
+  ecomApiKey: string,
+  ecomAuthentication: string,
+  firebaseServiceAccount: string | null,
+  ghToken: string,
+  ghRepo?: string,
+) => {
+  const remoteRepo = ghRepo || await getRemoteRepo();
+  if (!remoteRepo) {
+    throw new Error("Can't define remote Git repository");
+  }
+  const baseUrl = `https://api.github.com/repos/${remoteRepo}/actions/secrets`;
+
+  const fetchGhSecrets = async (
+    resource: string,
+    body?: string,
+    method: string = 'GET',
+  ) => {
+    const url = `${baseUrl}${resource}`;
+    const headers = {
+      Accept: 'application/vnd.github+json',
+      Authorization: `token ${ghToken}`,
+    };
+    return fetch(url, {
+      method,
+      headers,
+      body,
+    });
+  };
+
+  // https:// docs.github.com/pt/rest/actions/secrets#get-a-repository-public-key
+  const ghPublicKey = await (await fetchGhSecrets('/public-key')).json() as {
+    key_id: string,
+    key: string,
+  };
+  const ghKeyBuffer = Buffer.from(ghPublicKey.key, 'base64');
+  await libsodium.ready;
+
+  const createGhSecret = async (
+    secretName: string,
+    secretValue: string,
+  ) => {
+    // https://docs.github.com/pt/rest/actions/secrets#example-encrypting-a-secret-using-nodejs
+    // Encryption example: https://github.com/github/tweetsodium
+    const encryptedBytes = libsodium.crypto_box_seal(
+      Buffer.from(secretValue),
+      ghKeyBuffer,
+    );
+    const body = {
+      encrypted_value: Buffer.from(encryptedBytes).toString('base64'),
+      key_id: ghPublicKey.key_id,
+    };
+    return fetchGhSecrets(`/${secretName}`, JSON.stringify(body), 'PUT');
+  };
+
+  try {
+    await createGhSecret('ECOM_API_KEY', ecomApiKey);
+    await createGhSecret('ECOM_AUTHENTICATION_ID', ecomAuthentication);
+    if (firebaseServiceAccount) {
+      await createGhSecret('FIREBASE_SERVICE_ACCOUNT', firebaseServiceAccount);
+      return true;
+    }
+  } catch (e) {
+    //
+  }
+  return false;
+};
+
+export default createGhSecrets;

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
+    "@cloudcommerce/app-tiny-erp": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^11.0.1",
     "firebase-functions": "^3.22.0",

package/packages/firebase/lib/config.js

@@ -17,7 +17,7 @@ const self = {
     countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
     storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'us-central1',
+      region: env.DEPLOY_REGION || 'southamerica-east1',
     },
     apps: {
       discounts: {

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

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,aAAa;AACb,MAAM,GAAG,GAA8B,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC/E,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC;OACtC,EAAE,CAAC;AAER,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE;QACR,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,GAAG,CAAC,SAAS,IAAI,YAAY;QACnC,QAAQ,EAAE,GAAG,CAAC,aAAa,IAAI,gBAAgB;QAC/C,cAAc,EAAE,GAAG,CAAC,oBAAoB,IAAI,uBAAuB;QACnE,WAAW,EAAE,GAAG,CAAC,iBAAiB,IAAI,oBAAoB;QAC1D,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QAClC,oBAAoB,EAAE;YACpB,MAAM,EAAE,GAAG,CAAC,aAAa,IAAI,aAAa;SAC3C;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,KAAK,EAAE,IAAI;aACZ;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE;oBACN,qBAAqB;oBACrB,cAAc;oBACd,mBAAmB;iBACA;aACtB;SACF;KACF;CACF,CAAC;AAEF,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SACpC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,aAAa;AACb,MAAM,GAAG,GAA8B,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC/E,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC;OACtC,EAAE,CAAC;AAER,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE;QACR,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,GAAG,CAAC,SAAS,IAAI,YAAY;QACnC,QAAQ,EAAE,GAAG,CAAC,aAAa,IAAI,gBAAgB;QAC/C,cAAc,EAAE,GAAG,CAAC,oBAAoB,IAAI,uBAAuB;QACnE,WAAW,EAAE,GAAG,CAAC,iBAAiB,IAAI,oBAAoB;QAC1D,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QAClC,oBAAoB,EAAE;YACpB,MAAM,EAAE,GAAG,CAAC,aAAa,IAAI,oBAAoB;SAClD;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,KAAK,EAAE,IAAI;aACZ;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE;oBACN,qBAAqB;oBACrB,cAAc;oBACd,mBAAmB;iBACA;aACtB;SACF;KACF;CACF,CAAC;AAEF,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SACpC;IACH,CAAC;CACF,CAAC"}

package/packages/firebase/lib/handlers/check-store-events.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => Promise<boolean>;
+declare const _default: () => Promise<FirebaseFirestore.WriteResult>;
 export default _default;

package/packages/firebase/lib/handlers/check-store-events.js

@@ -1,12 +1,15 @@
+// eslint-disable-next-line import/no-unresolved
+import { getFirestore } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/lib/logger';
+import { PubSub } from '@google-cloud/pubsub';
 import api from '@cloudcommerce/api';
 import getEnv from '../env.js';
 import config from '../config.js';
 
-const parseEventsTopic = (eventsTopic) => {
+const parseEventsTopic = (eventsTopic, baseApiEventsFilter) => {
   const [resource, eventName] = eventsTopic.split('-');
   const params = {};
-  const bodySet = {};
+  const bodySet = { ...baseApiEventsFilter };
   if (eventName === 'new') {
     params.action = 'create';
   } else {
@@ -50,8 +53,30 @@ const parseEventsTopic = (eventsTopic) => {
   });
   return { resource, params };
 };
+const pubSubClient = new PubSub();
+const tryPubSubPublish = (topicName, messageObj, retries = 0) => {
+  pubSubClient.topic(topicName).publishMessage(messageObj)
+    .catch((err) => {
+      // eslint-disable-next-line no-param-reassign
+      err.retries = retries;
+      logger.error(err);
+      if (retries <= 3) {
+        setTimeout(() => {
+          tryPubSubPublish(topicName, messageObj, retries + 1);
+        }, 1000 * (2 ** retries));
+      }
+    });
+};
 
 export default async () => {
+  const timestamp = Date.now();
+  const documentRef = getFirestore().doc('storeEvents/last');
+  const lastRunTimestamp = (await documentRef.get()).get('timestamp')
+        || Date.now() - 1000 * 60 * 5;
+  const baseApiEventsFilter = {
+    'timestamp>': new Date(lastRunTimestamp - 1).toISOString(),
+    'timestamp<': new Date(timestamp).toISOString(),
+  };
   const { apps } = config.get();
   const { apiAuth } = getEnv();
   const subscribersApps = [];
@@ -61,25 +86,25 @@ export default async () => {
       subscribersApps.push(appObj);
     }
   });
-  const activeSubscribersApps = (await api.get('applications', {
+  const activeAppsIds = (await api.get('applications', {
     params: {
       state: 'active',
       app_id: subscribersApps.map(({ appId }) => appId),
       fields: 'app_id',
     },
-  })).data.result;
-  logger.info({ activeSubscribersApps });
+  })).data.result.map((app) => app.app_id);
   const listenedEvents = [];
   subscribersApps.forEach(({ appId, events }) => {
-    if (activeSubscribersApps.find((app) => app.app_id === appId)) {
+    if (activeAppsIds.includes(appId)) {
       events.forEach((eventsTopic) => {
-        listenedEvents.push(eventsTopic);
+        if (!listenedEvents.includes(eventsTopic)) {
+          listenedEvents.push(eventsTopic);
+        }
       });
     }
   });
-  logger.info({ listenedEvents });
   listenedEvents.forEach(async (eventsTopic) => {
-    const { resource, params } = parseEventsTopic(eventsTopic);
+    const { resource, params } = parseEventsTopic(eventsTopic, baseApiEventsFilter);
     let { data: { result } } = await api.get(`events/${resource}`, {
       ...apiAuth,
       params,
@@ -99,8 +124,24 @@ export default async () => {
     if (typeof middleware === 'function') {
       result = await middleware(resource, result);
     }
+    result.forEach((apiEvent) => {
+      subscribersApps.forEach(({ appId, events }) => {
+        if (events.includes(eventsTopic) && activeAppsIds.includes(appId)) {
+          const topicName = `app${appId}_${eventsTopic}`;
+          const messageObj = {
+            messageId: `${eventsTopic}_${apiEvent.timestamp}`,
+            json: apiEvent,
+          };
+          tryPubSubPublish(topicName, messageObj);
+        }
+      });
+    });
     logger.info(`> '${eventsTopic}' events: `, result);
   });
-  return true;
+  return documentRef.set({
+    timestamp,
+    activeAppsIds,
+    listenedEvents,
+  });
 };
 // # sourceMappingURL=check-store-events.js.map

package/packages/firebase/lib/handlers/check-store-events.js.map

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

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,6 +28,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@fastify/deepmerge": "^1.1.0",
+    "@google-cloud/pubsub": "^3.1.0",
     "firebase-admin": "^11.0.1",
     "firebase-functions": "^3.22.0",
     "node-fetch": "^3.2.10",

package/packages/firebase/src/config.ts

@@ -23,7 +23,7 @@ const self = {
     countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
     storeId: Number(env.ECOM_STORE_ID),
     httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'us-central1',
+      region: env.DEPLOY_REGION || 'southamerica-east1',
     },
     apps: {
       discounts: {

package/packages/firebase/src/handlers/check-store-events.ts

@@ -1,13 +1,19 @@
 import type { Resource, AppEventsTopic } from '@cloudcommerce/types';
+// eslint-disable-next-line import/no-unresolved
+import { getFirestore } from 'firebase-admin/firestore';
 import logger from 'firebase-functions/lib/logger';
+import { PubSub } from '@google-cloud/pubsub';
 import api, { ApiConfig } from '@cloudcommerce/api';
 import getEnv from '../env';
 import config from '../config';
 
-const parseEventsTopic = (eventsTopic: AppEventsTopic) => {
+const parseEventsTopic = (
+  eventsTopic: AppEventsTopic,
+  baseApiEventsFilter: Record<string, string>,
+) => {
   const [resource, eventName] = eventsTopic.split('-');
   const params: ApiConfig['params'] = {};
-  const bodySet: { [key: string]: any } = {};
+  const bodySet: { [key: string]: any } = { ...baseApiEventsFilter };
   if (eventName === 'new') {
     params.action = 'create';
   } else {
@@ -55,7 +61,34 @@ const parseEventsTopic = (eventsTopic: AppEventsTopic) => {
   };
 };
 
+const pubSubClient = new PubSub();
+const tryPubSubPublish = (
+  topicName: string,
+  messageObj: { messageId: string, json: any },
+  retries = 0,
+) => {
+  pubSubClient.topic(topicName).publishMessage(messageObj)
+    .catch((err) => {
+      // eslint-disable-next-line no-param-reassign
+      err.retries = retries;
+      logger.error(err);
+      if (retries <= 3) {
+        setTimeout(() => {
+          tryPubSubPublish(topicName, messageObj, retries + 1);
+        }, 1000 * (2 ** retries));
+      }
+    });
+};
+
 export default async () => {
+  const timestamp = Date.now();
+  const documentRef = getFirestore().doc('storeEvents/last');
+  const lastRunTimestamp: number = (await documentRef.get()).get('timestamp')
+    || Date.now() - 1000 * 60 * 5;
+  const baseApiEventsFilter = {
+    'timestamp>': new Date(lastRunTimestamp - 1).toISOString(),
+    'timestamp<': new Date(timestamp).toISOString(),
+  };
   const { apps } = config.get();
   const { apiAuth } = getEnv();
   const subscribersApps: Array<{ appId: number, events: AppEventsTopic[] }> = [];
@@ -65,25 +98,25 @@ export default async () => {
       subscribersApps.push(appObj);
     }
   });
-  const activeSubscribersApps = (await api.get('applications', {
+  const activeAppsIds = (await api.get('applications', {
     params: {
       state: 'active',
       app_id: subscribersApps.map(({ appId }) => appId),
       fields: 'app_id',
     },
-  })).data.result;
-  logger.info({ activeSubscribersApps });
+  })).data.result.map((app) => app.app_id);
   const listenedEvents: AppEventsTopic[] = [];
   subscribersApps.forEach(({ appId, events }) => {
-    if (activeSubscribersApps.find((app) => app.app_id === appId)) {
+    if (activeAppsIds.includes(appId)) {
       events.forEach((eventsTopic) => {
-        listenedEvents.push(eventsTopic);
+        if (!listenedEvents.includes(eventsTopic)) {
+          listenedEvents.push(eventsTopic);
+        }
       });
     }
   });
-  logger.info({ listenedEvents });
   listenedEvents.forEach(async (eventsTopic) => {
-    const { resource, params } = parseEventsTopic(eventsTopic);
+    const { resource, params } = parseEventsTopic(eventsTopic, baseApiEventsFilter);
     let { data: { result } } = await api.get(`events/${resource}`, {
       ...apiAuth,
       params,
@@ -103,7 +136,23 @@ export default async () => {
     if (typeof middleware === 'function') {
       result = await middleware(resource, result);
     }
+    result.forEach((apiEvent) => {
+      subscribersApps.forEach(({ appId, events }) => {
+        if (events.includes(eventsTopic) && activeAppsIds.includes(appId)) {
+          const topicName = `app${appId}_${eventsTopic}`;
+          const messageObj = {
+            messageId: `${eventsTopic}_${apiEvent.timestamp}`,
+            json: apiEvent,
+          };
+          tryPubSubPublish(topicName, messageObj);
+        }
+      });
+    });
     logger.info(`> '${eventsTopic}' events: `, result);
   });
-  return true;
+  return documentRef.set({
+    timestamp,
+    activeAppsIds,
+    listenedEvents,
+  });
 };

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {

package/packages/passport/package.json

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

package/packages/ssr/package.json

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

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.59",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {
@@ -24,12 +24,13 @@
     "@astrojs/partytown": "^1.0.0",
     "@astrojs/prefetch": "^0.0.7",
     "@astrojs/sitemap": "^1.0.0",
-    "@astrojs/tailwind": "^1.0.0",
     "@astrojs/vue": "^1.0.0",
     "@cloudcommerce/api": "workspace:*",
     "@picocss/pico": "^1.5.3",
     "astro": "^1.0.6",
     "rollup": "^2.78.1",
+    "unocss": "^0.45.12",
+    "vite": "^3.0.9",
     "vue": "^3.2.37"
   }
 }

package/packages/types/package.json

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