backend-manager 2.0.7 → 2.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -64,4 +64,4 @@
     "src/",
     "templates/"
   ]
-}
+}

package/src/cli/cli.js

@@ -273,8 +273,8 @@ Main.prototype.setup = async function () {
   // }, fix_projpackage);
 
   await this.test('functions level package.json exists', async function () {
-    return !!self.package && !!self.package.dependencies && !!self.package.devDependencies;
-  }, fix_deps);
+    return !!self.package && !!self.package.dependencies && !!self.package.devDependencies && !!self.package.version;
+  }, fix_functionspackage);
 
   // await this.test('functions level package.json has updated version', async function () {
   //   return self.package.version === self.projectPackage.version;
@@ -695,10 +695,11 @@ function fix_projpackage(self) {
   });
 };
 
-function fix_deps(self) {
+function fix_functionspackage(self) {
   return new Promise(function(resolve, reject) {
     self.package.dependencies = self.package.dependencies || {};
     self.package.devDependencies = self.package.devDependencies || {};
+    self.package.version = self.package.version || '0.0.1';
 
     fs.write(`${self.firebaseProjectPath}/functions/package.json`, JSON.stringify(self.package, null, 2) );
     resolve();

package/src/manager/functions/core/actions/api/general/generate-uuid.js

@@ -36,10 +36,13 @@ Module.prototype.main = function () {
       }
     } else if (payload.data.payload.version === '4') {
       result = uuid.v4();
+    } else {
+      return reject(assistant.errorManager(`v${payload.data.payload.version} is not a valid version.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     assistant.log('UUID Generated', payload.data.payload, result, {environment: 'production'});
 
+    // Return the timestamp so electron-manager can save an http request >:)
     return resolve({data: {uuid: result, timestamp: new Date().toISOString()}});
 
   });

package/src/manager/index.js

@@ -57,7 +57,7 @@ Manager.prototype.init = function (exporter, options) {
   self.options = options;
   self.project = options.firebaseConfig || JSON.parse(process.env.FIREBASE_CONFIG);
   self.cwd = process.cwd();
-  self.package = require(path.resolve(self.cwd, 'package.json'));
+  self.package = resolveProjectPackage();
   self.config = merge(
     require(path.resolve(self.cwd, 'backend-manager-config.json')),
     self.libraries.functions.config()
@@ -464,4 +464,14 @@ Manager.prototype.debug = function () {
   }
 }
 
+function resolveProjectPackage() {
+  try {
+    return require(path.resolve(process.cwd(), 'functions', 'package.json'));
+  } catch (e) {}
+
+  try {
+    return require(path.resolve(process.cwd(), 'package.json'));
+  } catch (e) {}
+}
+
 module.exports = Manager;