backend-manager 2.5.57 → 2.5.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.57",
+  "version": "2.5.59",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -47,6 +47,7 @@
     "lowdb": "^1.0.0",
     "mailchimp-api-v3": "^1.15.0",
     "moment": "^2.29.4",
+    "nanoid": "^3.3.4",
     "node-fetch": "^2.6.9",
     "node-powertools": "^0.0.23",
     "npm-api": "^1.0.1",

package/src/cli/cli.js

@@ -227,6 +227,7 @@ Main.prototype.setup = async function () {
   self.runtimeConfigJSON = jetpack.read(`${self.firebaseProjectPath}/functions/.runtimeconfig.json`) || '{}';
   self.remoteconfigJSON = jetpack.read(`${self.firebaseProjectPath}/remoteconfig.template.json`) || '{}';
   self.projectPackage = jetpack.read(`${self.firebaseProjectPath}/package.json`) || '{}';
+  self.bemConfigJSON = jetpack.read(`${self.firebaseProjectPath}/functions/backend-manager-config.json`) || '{}';
 
   self.gitignore = jetpack.read(`${self.firebaseProjectPath}/functions/.gitignore`) || '';
   if (!self.package) {
@@ -261,19 +262,18 @@ Main.prototype.setup = async function () {
   self.bemApiURL = `https://us-central1-${_.get(self.firebaseRC, 'projects.default')}.cloudfunctions.net/bm_api?authenticationToken=${_.get(self.runtimeConfigJSON, 'backend_manager.key')}`;
   // const prepareStatsURL = `https://us-central1-${_.get(self.firebaseRC, 'projects.default')}.cloudfunctions.net/bm_api?authenticationToken=undefined`;
   
-
-  
-  log(`Id: `, chalk.bold(`${self.projectName}`));
-  log(`Url:`, chalk.bold(`${self.projectUrl}`));
+  // Log
+  log(`ID: `, chalk.bold(`${self.projectName}`));
+  log(`URL:`, chalk.bold(`${self.projectUrl}`));
 
   if (!self.package || !self.package.engines || !self.package.engines.node) {
     throw new Error('Missing <engines.node> in package.json')
   }
 
-
   // Tests
   await self.test('is a firebase project', async function () {
     let exists = jetpack.exists(`${self.firebaseProjectPath}/firebase.json`);
+    
     return exists;
   }, fix_isFirebase);
 
@@ -281,8 +281,8 @@ Main.prototype.setup = async function () {
     // return !!self.package.dependencies && !!self.package.devDependencies;
     // let gitignore = jetpack.read(path.resolve(`${__dirname}/../../templates/gitignore.md`));
     let nvmrc = jetpack.read(`${self.firebaseProjectPath}/functions/.nvmrc`) || '';
+    
     return nvmrc === `v${CLI_CONFIG.node}/*`
-
   }, fix_nvmrc);
 
   await self.test(`using node ${CLI_CONFIG.node}`, function () {
@@ -390,22 +390,25 @@ Main.prototype.setup = async function () {
     let runtimeconfig = JSON.parse(jetpack.read(`${self.firebaseProjectPath}/functions/.runtimeconfig.json`) || '{}');
     let ogPaths = getObjectPaths(runtimeconfigTemplate).split('\n');
     let pass = true;
+
     for (var i = 0, l = ogPaths.length; i < l; i++) {
       let item = ogPaths[i];
       if (!item) {continue}
-      pass = (_.get(runtimeconfig, item, undefined));
+      pass = _.get(runtimeconfig, item, undefined);
       if (typeof pass === 'undefined') {
         break;
       }
     }
-    return !!pass;
 
+    return !!pass;
   }, fix_runtimeConfig);
 
   await self.test('using proper backend-manager-config.json', async function () {
-    let bemConfig = JSON.parse(jetpack.read(`${self.firebaseProjectPath}/functions/backend-manager-config.json`) || '{}');
+    const bemConfig = JSON.parse(self.bemConfigJSON);
+
     let ogPaths = getObjectPaths(bemConfigTemplate).split('\n');
     let pass = true;
+
     for (var i = 0, l = ogPaths.length; i < l; i++) {
       let item = ogPaths[i];
       if (!item) {continue}
@@ -414,8 +417,13 @@ Main.prototype.setup = async function () {
         break;
       }
     }
-    return !!pass;
 
+    if (self.projectName !== bemConfig.firebaseConfig.projectId) {
+      console.error(chalk.red('Mismatch between project name and firebaseConfig.projectId in backend-manager-config.json'));
+      return false;
+    }
+
+    return !!pass;
   }, fix_bemConfig);
 
   await self.test('has service-account.json', function () {
@@ -769,6 +777,12 @@ async function fix_isFirebase(self) {
   return;
 };
 
+async function fix_isFirebase(self) {
+  log(chalk.red(`self is not a firebase project. Please use ${chalk.bold('firebase-init')} to set up.`));
+  throw '';
+  return;
+};
+
 function fix_projpackage(self) {
   return new Promise(function(resolve, reject) {
     self.projectPackage = self.projectPackage || {};

package/src/manager/helpers/utilities.js

@@ -1,5 +1,10 @@
+let nanoId;
+
 function Utilities(Manager) {
   const self = this;
+
+  self.cache = null;
+  self._deleteThis = Math.random();
   
   self.Manager = Manager;
 }
@@ -134,4 +139,103 @@ Utilities.prototype.iterateUsers = function (callback, options) {
   });
 };
 
+Utilities.prototype.randomId = function (options) {
+  const self = this;
+
+  options = options || {};
+  options.size = options.size || 14;
+
+  if (!nanoId) {
+    nanoId = require('nanoid');
+
+    nanoId = nanoId.customAlphabet(
+      nanoId.urlAlphabet.replace(/_|-/g, ''), 
+      options.size,
+    )
+  }
+
+  return nanoId();
+};
+
+// Utilities.prototype.get = function (doc, options) {
+//   const self = this;
+
+//   return new Promise(function(resolve, reject) {
+
+//     options = options || {};
+//     options.maxAge = options.maxAge || (1000 * 60 * 5); // 5 minutes
+
+//     self.cache = self.cache || self.Manager.storage({name: 'cache', temporary: true, clear: false});
+
+//     const item = self.cache.get(doc).value();
+//     const age = item ? Date.now() - item.time : null;
+
+//     console.log('+++++ 111', doc, age, item);
+
+//     if (item && age < options.maxAge) {
+//       console.log('---GOT FROM CACHE---');
+      
+//       return resolve(self.cache.map.get(doc).data);
+//     } else {
+//       console.log('---GOT FROM FIRESTORE---');
+      
+//       self.Manager.libraries.admin.firestore().doc(doc)
+//         .get()
+//         .then(async (doc) => {
+//           const data = doc.data();
+
+//           if (!data) {
+//             throw new Error(`Document with ID ${doc} not found`);
+//           }
+
+//           self.cache.set(doc, {
+//             data: data,
+//             time: Date.now(),
+//           })
+//           .write();
+
+//           return resolve(data);
+//         })
+//     }
+//   });
+// };
+
+
+Utilities.prototype.get = function (docPath, options) {
+  const self = this;
+
+  return new Promise(function(resolve, reject) {
+
+    options = options || {};
+    options.maxAge = options.maxAge || (1000 * 60 * 5); // 5 minutes
+
+    self.cache = self.cache || self.Manager.storage({name: 'cache', temporary: true, clear: false});
+
+    const item = self.cache.get(docPath).value();
+    const age = item ? Date.now() - item.time : null;
+
+    if (item && age && age < options.maxAge) {
+      return resolve(item.doc);
+    } else {
+      self.Manager.libraries.admin.firestore().doc(docPath)
+        .get()
+        .then(async (doc) => {
+          const data = doc.data();
+
+          if (!data) {
+            throw new Error(`Document with ID ${doc} not found`);
+          }
+
+          self.cache.set(docPath, {
+            doc: doc,
+            time: Date.now(),
+          })
+          .write();
+
+          return resolve(doc);
+        })
+    }
+  });
+};
+
 module.exports = Utilities;

package/src/manager/index.js

@@ -3,6 +3,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;
@@ -570,12 +571,6 @@ 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.Roles = function () {
   const self = this;
   self.libraries.Roles = self.libraries.Roles || require('./helpers/roles.js');
@@ -588,6 +583,23 @@ Manager.prototype.SubscriptionResolver = function () {
   return new self.libraries.SubscriptionResolver(...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.Utilities = function () {
+  const self = this;
+
+  if (!self._internal.utilities) {
+    self.libraries.Utilities = require('./helpers/utilities.js');
+    self._internal.utilities = new self.libraries.Utilities(self, ...arguments);
+  }
+
+  return self._internal.utilities;
+};
+
 Manager.prototype.storage = function (options) {
   const self = this;
   options = options || {};
@@ -603,7 +615,7 @@ Manager.prototype.storage = function (options) {
       ? `${require('os').tmpdir()}/${options.name}.json`
       : `./.data/${options.name}.json`;
     const adapter = new FileSync(dbPath);
-
+    
     if (
       options.temporary 
       && self.assistant.meta.environment === 'development'
@@ -622,6 +634,8 @@ Manager.prototype.storage = function (options) {
         jetpack.write(dbPath, {});
       }
       self._internal.storage[options.name] = low(adapter);
+
+      self._internal.storage[options.name].set('_location', dbPath)
     }
 
     try {