backend-manager 2.3.13 → 2.3.16

package/README.md

@@ -7,8 +7,7 @@
 <p align="center">
   <img src="https://img.shields.io/github/package-json/v/itw-creative-works/backend-manager.svg">
   <br>
-  <img src="https://img.shields.io/david/itw-creative-works/backend-manager.svg">
-  <img src="https://img.shields.io/david/dev/itw-creative-works/backend-manager.svg">
+  <img src="https://img.shields.io/librariesio/release/npm/backend-manager.svg">
   <img src="https://img.shields.io/bundlephobia/min/backend-manager.svg">
   <img src="https://img.shields.io/codeclimate/maintainability-percentage/itw-creative-works/backend-manager.svg">
   <img src="https://img.shields.io/npm/dm/backend-manager.svg">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.3.13",
+  "version": "2.3.16",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@google-cloud/storage": "^5.20.5",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
-    "backend-assistant": "^0.0.66",
+    "backend-assistant": "^0.0.67",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
@@ -48,7 +48,7 @@
     "mocha": "^9.2.2",
     "moment": "^2.29.4",
     "node-fetch": "^2.6.7",
-    "node-powertools": "^0.0.14",
+    "node-powertools": "^0.0.18",
     "npm-api": "^1.0.1",
     "paypal-server-api": "^0.0.7",
     "pushid": "^1.0.0",

package/src/manager/functions/core/actions/api/admin/get-stats.js

@@ -75,7 +75,8 @@ Module.prototype.updateStats = function (existingData) {
 
   return new Promise(async function(resolve, reject) {
     const stats = self.libraries.admin.firestore().doc(`meta/stats`);
-    const online = self.libraries.admin.database().ref(`gatherings/online`);
+    const gatheringOnline = self.libraries.admin.database().ref(`gatherings/online`);
+    const sessionsApp = self.libraries.admin.database().ref(`sessions/app`);
 
     let error = null;
     let update = {};
@@ -106,7 +107,7 @@ Module.prototype.updateStats = function (existingData) {
 
     await self.getAllSubscriptions()
       .then(r => {
-        _.set(update, 'subscriptions.total', r)
+        _.set(update, 'subscriptions', r)
       })
       .catch(e => {
         error = new Error(`Failed getting subscriptions: ${e}`);
@@ -116,12 +117,25 @@ Module.prototype.updateStats = function (existingData) {
       return reject(error);
     }
 
-    await online
+    await gatheringOnline
       .once('value')
       .then((snap) => {
-        let data = snap.val() || {};
-        let keys = Object.keys(data);
-        _.set(update, 'users.online', keys.length)
+        const data = snap.val() || {};
+        const keys = Object.keys(data);
+        const existing = _.get(update, 'users.online', 0)
+        _.set(update, 'users.online', existing + keys.length)
+      })
+      .catch(e => {
+        error = new Error(`Failed getting online users: ${e}`);
+      })
+
+    await sessionsApp
+      .once('value')
+      .then((snap) => {
+        const data = snap.val() || {};
+        const keys = Object.keys(data);
+        const existing = _.get(update, 'users.online', 0)
+        _.set(update, 'users.online', existing + keys.length)
       })
       .catch(e => {
         error = new Error(`Failed getting online users: ${e}`);
@@ -174,18 +188,43 @@ Module.prototype.getAllSubscriptions = function () {
     .where('plan.expires.timestampUNIX', '>=', new Date().getTime() / 1000)
     .get()
     .then(function(snapshot) {
-      let count = 0;
+      const stats = {
+        totals: {
+          total: 0,
+          exempt: 0,
+        },
+        plans: {}
+      };
 
       snapshot
       .forEach((doc, i) => {
         const data = doc.data();
         const planId = _.get(data, 'plan.id', 'basic');
-        if (!['', 'basic', 'free'].includes(planId)) {
-          count++;
+        const frequency = _.get(data, 'plan.payment.frequency', 'unknown');
+        const isAdmin = _.get(data, 'roles.admin', false);
+        const isVip = _.get(data, 'roles.vip', false);
+
+        if (!stats.plans[planId]) {
+          stats.plans[planId] = {
+            total: 0,
+            monthly: 0,
+            annually: 0,
+            exempt: 0,
+          }
         }
+
+        if (isAdmin || isVip) {
+          stats.totals.exempt++;
+          stats.plans[planId].exempt++;
+          return
+        }
+
+        stats.totals.total++;
+        stats.plans[planId].total++;
+        stats.plans[planId][frequency] = (stats.plans[planId][frequency] || 0) + 1
       });
 
-      return resolve(count);
+      return resolve(stats);
     })
     .catch(function(e) {
       return reject(e)

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -16,6 +16,7 @@ Module.prototype.main = function () {
 
     let uid = payload.data.payload.uid;
     const app = payload.data.payload.appId || payload.data.payload.app || Manager.config.app.id;
+    let config = payload.data.payload.config || {};
 
     let uuid = null;
     let error;
@@ -62,6 +63,12 @@ Module.prototype.main = function () {
       return reject(error)
     }
 
+    if (config.backendManagerKey === Manager.config.backend_manager.key && Manager.config.backend_manager.key) {
+      assistant.log('Validated config', config, {environment: 'production'})
+    } else {
+      config = {};
+    }
+
     // Fetch app details
     await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/getApp', {
       method: 'post',
@@ -81,6 +88,7 @@ Module.prototype.main = function () {
           ip: assistant.request.ip,
           country: assistant.request.country,
           app: result,
+          config: config,
         }
       });
     })