backend-manager 3.2.122 → 3.2.124

package/package.json

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

package/src/cli/cli.js

@@ -1317,39 +1317,59 @@ async function cmd_configSet(self, newPath, newValue) {
         name: 'path',
         default: 'service.key'
       }
-    ]).then(answers => answers.path)
+    ]).then(answers => answers.path);
+
+    let object = null;
 
     try {
-      const object = JSON5.parse(newPath)
-      try {
-        if (typeof object === 'object') {
-          const keyify = (obj, prefix = '') =>
-            Object.keys(obj).reduce((res, el) => {
-              if( Array.isArray(obj[el]) ) {
-                return res;
-              } else if( typeof obj[el] === 'object' && obj[el] !== null ) {
-                return [...res, ...keyify(obj[el], prefix + el + '.')];
-              }
-              return [...res, prefix + el];
-            }, []);
-          const pathArray = keyify(object);
-          for (var i = 0; i < pathArray.length; i++) {
-            const pathName = pathArray[i];
-            const pathValue = _.get(object, pathName);
-            // console.log(chalk.blue(`Setting object: ${chalk.bold(pathName)} = ${chalk.bold(pathValue)}`));
-            console.log(chalk.blue(`Setting object: ${chalk.bold(pathName)}`));
-            await cmd_configSet(self, pathName, pathValue)
-            .catch(e => {
-              log(chalk.red(`Failed to save object path: ${e}`));
-            })
-          }
-          return resolve();
+      object = JSON5.parse(newPath);
+    } catch (e) {
+    }
+
+    const isObject = typeof object === 'object';
+
+    // If it's a string, ensure some things
+    if (!isObject) {
+      // Validate path
+      if (!newPath.includes('.')) {
+        console.log(chalk.red(`Path needs 2 parts (one.two): ${newPath}`));
+        return reject();
+      }
+
+      // Make sure it doesnt include space or special characters
+      if (newPath.match(/[^a-zA-Z0-9.]/)) {
+        console.log(chalk.red(`Path contains invalid characters: ${newPath}`));
+        return reject();
+      }
+    }
+
+    try {
+      if (isObject) {
+        const keyify = (obj, prefix = '') =>
+          Object.keys(obj).reduce((res, el) => {
+            if( Array.isArray(obj[el]) ) {
+              return res;
+            } else if( typeof obj[el] === 'object' && obj[el] !== null ) {
+              return [...res, ...keyify(obj[el], prefix + el + '.')];
+            }
+            return [...res, prefix + el];
+          }, []);
+        const pathArray = keyify(object);
+        for (var i = 0; i < pathArray.length; i++) {
+          const pathName = pathArray[i];
+          const pathValue = _.get(object, pathName);
+          // console.log(chalk.blue(`Setting object: ${chalk.bold(pathName)} = ${chalk.bold(pathValue)}`));
+          console.log(chalk.blue(`Setting object: ${chalk.bold(pathName)}`));
+          await cmd_configSet(self, pathName, pathValue)
+          .catch(e => {
+            log(chalk.red(`Failed to save object path: ${e}`));
+          })
         }
-      } catch (e) {
-        log(chalk.red(`Failed to save object: ${e}`));
-        return reject(e)
+        return resolve();
       }
     } catch (e) {
+      log(chalk.red(`Failed to save object: ${e}`));
+      return reject(e)
     }
 
     newValue = newValue || await inquirer.prompt([

package/src/manager/helpers/middleware.js

@@ -52,6 +52,8 @@ Middleware.prototype.run = function (libPath, options) {
 
     // Wakeup trigger (quit immediately if wakeup is true to avoid cold start on a future request)
     if (data.wakeup) {
+      assistant.log(`Middleware.process(): Wakeup activated at ${new Date().toISOString()}`);
+
       return assistant.respond({wakeup: true});
     }
 

package/src/manager/index.js

@@ -99,9 +99,9 @@ Manager.prototype.init = function (exporter, options) {
   // Load config
   self.config = merge(
     // Load basic config
-    requireJSON5(self.project.backendManagerConfigPath),
+    requireJSON5(self.project.backendManagerConfigPath, true),
     // Load ENV config as a fallback
-    requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), true),
+    requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), options.projectType === 'firebase'),
     // Finally, load the functions config
     self.libraries.functions
       ? self.libraries.functions.config()
@@ -984,17 +984,21 @@ function resolveProjectPackage() {
   } catch (e) {}
 }
 
-function requireJSON5(file, log) {
-  // Set log
-  log = typeof log === 'undefined' ? true : log;
+function requireJSON5(file, throwError) {
+  // Set throwError
+  throwError = typeof throwError === 'undefined' ? true : throwError;
 
   // Load JSON5
   try {
     return JSON5.parse(jetpack.read(file))
   } catch (e) {
-    if (log) {
-      console.error(`Failed to load JSON at ${file}:`, e);
+    // If we're not throwing an error, just return
+    if (!throwError) {
+      return {};
     }
+
+    // Otherwise, throw the error
+    console.error(`Failed to load JSON at ${file}:`, e);
     throw e;
   }
 }