backend-manager 2.5.2 → 2.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

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

@@ -79,7 +79,9 @@ Module.prototype.updateStats = function (existingData) {
     const sessionsApp = self.libraries.admin.database().ref(`sessions/app`);
 
     let error = null;
-    let update = {};
+    let update = {
+      app: _.get(self.Manager.config, 'app.id', null),
+    };
 
     // Fix broken stats
     if (!_.get(existingData, 'users.total', null)) {

package/src/manager/helpers/utilities.js

@@ -0,0 +1,117 @@
+function Utilities(Manager) {
+  const self = this;
+  
+  self.Manager = Manager;
+}
+
+Utilities.prototype.iterateCollection = function (callback, options) {
+  const self = this;
+  const Manager = self.Manager;
+  const admin = Manager.libraries.admin;
+
+  return new Promise(function(resolve, reject) {
+    let batch = -1;
+
+    options = options || {};
+    options.collection = options.collection || '';
+    options.batchSize = options.batchSize || 1000;
+    options.log = options.log;
+
+    function listAllDocuments(nextPageToken) {
+      let query = admin.firestore().collection(options.collection)
+
+      // Start at next page
+      if (nextPageToken) {
+        query = query.startAfter(nextPageToken);
+      }
+
+      // batchSize
+      query = query.limit(options.batchSize);
+
+      query.get()
+        .then(async (snap) => {
+          const lastVisible = snap.docs[snap.docs.length - 1];
+
+          batch++;
+
+          if (options.log) {
+            console.log('Processing batch:', batch);
+          }          
+
+          callback({
+            snap: snap, docs: snap.docs.map(x => x)
+          }, batch)
+            .then(r => {
+              // Construct a new query starting at this document
+              if (lastVisible) {
+                listAllDocuments(lastVisible)
+              } else {
+                return resolve();
+              }
+            })
+            .catch((e) => {
+              console.error('Callback failed', e);
+              return reject(e);
+            });
+
+        })
+        .catch((e) => {
+          console.error('Query failed', e);
+          return reject(e);
+        });
+    }
+
+    listAllDocuments();    
+  });
+};
+
+Utilities.prototype.iterateUsers = function (callback, options) {
+  const self = this;
+  const Manager = self.Manager;
+  const admin = Manager.libraries.admin;  
+
+  return new Promise(function(resolve, reject) {
+    let batch = -1;
+
+    options = options || {};
+    options.log = options.log;
+    
+    function listAllUsers(nextPageToken) {
+      // List batch of users, 1000 at a time.
+      admin.auth()
+        .listUsers(1000, nextPageToken)
+        .then(async (listUsersResult) => {
+          
+          batch++;
+
+          if (options.log) {
+            console.log('Processing batch:', batch);
+          }
+
+          callback({
+            snap: listUsersResult, users: listUsersResult.users,
+          }, batch)
+            .then(r => {
+              if (listUsersResult.pageToken) {
+                listAllUsers(listUsersResult.pageToken);
+              } else {
+                return resolve();
+              }
+            })
+            .catch((e) => {
+              console.error('Callback failed', e);
+              return reject(e)
+            });        
+          
+        })
+        .catch((e) => {
+          console.error('Query failed', e);
+          return reject(e)
+        });      
+    }
+    
+    listAllUsers();   
+  });
+};
+
+module.exports = Utilities;

package/src/manager/index.js

@@ -2,6 +2,7 @@
 const path = require('path');
 const { get, merge } = require('lodash');
 const jetpack = require('fs-jetpack');
+const JSON5 = require('json5');
 // const { debug, log, error, warn } = require('firebase-functions/lib/logger');
 // let User;
 // let Analytics;
@@ -45,6 +46,7 @@ Manager.prototype.init = function (exporter, options) {
   options.firebaseConfig = options.firebaseConfig;
   options.useFirebaseLogger = typeof options.useFirebaseLogger === 'undefined' ? true : options.useFirebaseLogger;
   options.serviceAccountPath = typeof options.serviceAccountPath === 'undefined' ? 'service-account.json' : options.serviceAccountPath;
+  options.backendManagerConfigPath = typeof options.backendManagerConfigPath === 'undefined' ? 'backend-manager-config.json' : options.backendManagerConfigPath;
   options.uniqueAppName = options.uniqueAppName || undefined;
   options.assistant = options.assistant || {};
   // options.assistant.optionsLogString = options.assistant.optionsLogString || undefined;
@@ -71,10 +73,11 @@ Manager.prototype.init = function (exporter, options) {
   self.project = options.firebaseConfig || JSON.parse(process.env.FIREBASE_CONFIG || '{}');
   self.project.resourceZone = options.resourceZone;
   self.project.serviceAccountPath = path.resolve(self.cwd, options.serviceAccountPath)
-
+  self.project.backendManagerConfigPath = path.resolve(self.cwd, options.backendManagerConfigPath)
+  
   self.package = resolveProjectPackage();
   self.config = merge(
-    require(path.resolve(self.cwd, 'backend-manager-config.json')),
+    requireJSON5(self.project.backendManagerConfigPath),
     self.libraries.functions.config()
   );
 
@@ -112,13 +115,15 @@ Manager.prototype.init = function (exporter, options) {
 
     // Reject if package.json does not exist
     if (semverUsing !== semverRequired) {
-      console.error(new Error(`Node.js version mismatch: using ${semverUsing} but asked for ${semverRequired}`));
+      self.assistant.error(new Error(`Node.js version mismatch: using ${semverUsing} but asked for ${semverRequired}`), {environment: 'production'});
       return process.exit(1);
     }
   }  
 
   if (options.log) {
     self.assistant.log('process.env', process.env, {environment: 'production'})
+    console.log('Resolved serviceAccountPath', self.project.serviceAccountPath);
+    console.log('Resolved backendManagerConfigPath', self.project.backendManagerConfigPath);
   }
 
   // Setup sentry
@@ -133,7 +138,7 @@ Manager.prototype.init = function (exporter, options) {
       release: sentryRelease,
       beforeSend(event, hint) {
         if (self.assistant.meta.environment === 'development' && !self.options.reportErrorsInDev) {
-          self.assistant.error('Skipping Sentry because DEV')
+          self.assistant.error(new Error('Skipping Sentry because DEV'), {environment: 'production'})
           return null;
         }
         event.tags = event.tags || {};
@@ -154,15 +159,21 @@ Manager.prototype.init = function (exporter, options) {
       if (process.env.GOOGLE_APPLICATION_CREDENTIALS) {
         self.libraries.initializedAdmin = self.libraries.admin.initializeApp();
       } else {
+        const serviceAccount = require(self.project.serviceAccountPath);
         self.libraries.initializedAdmin = self.libraries.admin.initializeApp({
-          credential: self.libraries.admin.credential.cert(
-            require(self.project.serviceAccountPath)
-          ),
+          credential: self.libraries.admin.credential.cert(serviceAccount),
           databaseURL: self.project.databaseURL,
         }, options.uniqueAppName);
+
+        // const loadedProjectId = get(self.libraries.initializedAdmin, 'options_.credential.projectId', null);   
+        const loadedProjectId = serviceAccount.project_id;   
+        if (!loadedProjectId || !loadedProjectId.includes(self.config.app.id)) {
+          self.assistant.error(`Loaded app may have wrong service account: ${loadedProjectId} =/= ${self.config.app.id}`, {environment: 'production'});
+        }        
       }
+
     } catch (e) {
-      console.error('Failed to call .initializeApp()', e);
+      self.assistant.error('Failed to call .initializeApp()', e, {environment: 'production'});
     }
     // admin.firestore().settings({/* your settings... */ timestampsInSnapshots: true})
   }
@@ -372,12 +383,12 @@ Manager.prototype.init = function (exporter, options) {
     });
 
     // Cron
-    exporter.bm_backup =
+    exporter.bm_cronDaily =
     self.libraries.functions
     .runWith({ memory: '256MB', timeoutSeconds: 60 })
-    .pubsub.schedule(get(self.config, 'backup.schedule', 'every 24 hours'))
+    .pubsub.schedule('every 24 hours')
     .onRun(async (context) => {
-      return self._process((new (require(`${core}/cron/backup.js`))()).init(self, { context: context, }))
+      return self._process((new (require(`${core}/cron/daily.js`))()).init(self, { context: context, }))
     });
   }
 
@@ -385,7 +396,7 @@ Manager.prototype.init = function (exporter, options) {
   try {
     require('dotenv').config();
   } catch (e) {
-    console.error('Failed to set up environment variables from .env file');
+    self.assistant.error(new Error('Failed to set up environment variables from .env file'), {environment: 'production'});
   }
 
   // Setup LocalDatabase
@@ -393,6 +404,18 @@ Manager.prototype.init = function (exporter, options) {
     self.storage();
   }
 
+  if (self.assistant.meta.environment === 'development') {
+    setTimeout(function () {
+      console.log('Fetching meta/stats...');
+      self.libraries.admin
+      .firestore().doc('meta/stats')
+      .get()
+      .then(doc => {
+        console.log('meta/stats', doc.data());
+      })         
+    }, 3000);
+  }
+
   return self;
 };
 
@@ -532,6 +555,12 @@ Manager.prototype.ApiManager = function () {
   return new self.libraries.ApiManager(self, ...arguments);
 };
 
+Manager.prototype.Utilities = function () {
+  const self = this;
+  self.libraries.Utilities = self.libraries.Utilities || require('./helpers/utilities.js');
+  return new self.libraries.Utilities(self, ...arguments);
+};
+
 Manager.prototype.storage = function (options) {
   const self = this;
   options = options || {};
@@ -566,16 +595,16 @@ Manager.prototype.storage = function (options) {
     try {
       _setup()
     } catch (e) {
-      console.error(`Could not storage: ${dbPath}`, e);
+      self.assistant.error(`Could not setup storage: ${dbPath}`, e, {environment: 'production'});
 
       try {
         if (options.clearInvalid) {
-          console.log(`Clearing invalud storage: ${dbPath}`);
+          self.assistant.log(`Clearing invalid storage: ${dbPath}`, {environment: 'production'});
           jetpack.write(dbPath, {});
         }
         _setup()
       } catch (e) {
-        console.error(`Failed to clear invalid storage: ${dbPath}`, e);
+        self.assistant.error(`Failed to clear invalid storage: ${dbPath}`, e, {environment: 'production'});
       }
     }
   }
@@ -631,4 +660,8 @@ function resolveProjectPackage() {
   } catch (e) {}
 }
 
+function requireJSON5(p) {
+  return JSON5.parse(jetpack.read(p))
+}
+
 module.exports = Manager;