backend-manager 3.1.3 → 3.1.6

package/package.json

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

package/src/manager/helpers/assistant.js

@@ -371,7 +371,9 @@ BackendAssistant.prototype.errorify = function (e, options) {
     ? e
     : new Error(stringify(e));
 
+  // Fix code
   options.code = newError.code || options.code;
+  options.code = isBetween(options.code, 400, 599) ? options.code : 500;
 
   // Attach properties
   _attachHeaderProperties(self, options, newError);
@@ -428,10 +430,12 @@ BackendAssistant.prototype.respond = function(response, options) {
     : options.log;
 
   // Handle error
+  const isErrorCode = isBetween(options.code, 400, 599);
   if (
     response instanceof Error
-    || (options.code >= 400 && options.code <= 599)
+    || isErrorCode
   ) {
+    options.code = !isErrorCode ? undefined : options.code;
     return self.errorify(response, options);
   }
 
@@ -454,6 +458,10 @@ BackendAssistant.prototype.respond = function(response, options) {
   }
 }
 
+function isBetween(value, min, max) {
+  return value >= min && value <= max;
+}
+
 function stringify(e) {
   if (typeof e === 'string') {
     return e;

package/src/manager/helpers/middleware.js

@@ -4,6 +4,7 @@
  */
 
 const path = require('path');
+const powertools = require('node-powertools');
 
 function Middleware(m) {
   const self = this;
@@ -27,16 +28,20 @@ Middleware.prototype.run = function (library, req, res, options) {
     options = options || {};
     options.setupAnalytics = typeof options.setupAnalytics === 'boolean' ? options.setupAnalytics : true;
     options.setupUsage = typeof options.setupUsage === 'boolean' ? options.setupUsage : true;
+    options.authenticate = typeof options.authenticate === 'boolean' ? options.authenticate : true;
+    options.setupSettings = typeof options.setupSettings === 'undefined' ? true : options.setupSettings;
 
     // Log
     assistant.log(`Middleware.process(): Request (${geolocation.ip} @ ${geolocation.country}, ${geolocation.region}, ${geolocation.city})`, JSON.stringify(data));
 
+    const basePath = path.resolve(process.cwd(), library.replace('.js', ''));
+
     // Load library
     try {
-      library = path.resolve(process.cwd(), `${library}.js`);
+      library = path.resolve(basePath, `methods/${basePath}/index.js`);
       library = new (require(library))();
     } catch (e) {
-      assistant.errorify(`Unable to load library @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
+      return assistant.errorify(`Unable to load library @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
     }
 
     // Setup usage
@@ -44,6 +49,11 @@ Middleware.prototype.run = function (library, req, res, options) {
       assistant.usage = await Manager.Usage().init(assistant);
     }
 
+    // Setup user
+    if (!options.setupUsage && options.authenticate) {
+      await assistant.authenticate();
+    }
+
     // Setup analytics
     if (options.setupAnalytics) {
       const uuid = assistant?.usage?.user?.auth?.uid
@@ -56,6 +66,18 @@ Middleware.prototype.run = function (library, req, res, options) {
       })
     }
 
+    // Resolve settings
+    if (options.setupSettings) {
+      // try {
+      //   const planId = assistant.request.user.plan.id;
+      //   let settings = path.resolve(basePath, `methods/${basePath}/settings.js`);
+      //   settings = require(settings)(assistant)[planId];
+      //   assistant.request.data = powertools.defaults(data, settings);
+      // } catch (e) {
+      //   return assistant.errorify(`Unable to resolve settings @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
+      // }
+    }
+
     // Process
     try {
       // Set properties
@@ -68,10 +90,10 @@ Middleware.prototype.run = function (library, req, res, options) {
       //   return res.status(200).json(result);
       // })
       .catch(e => {
-        assistant.errorify(e, {sentry: true, send: true, log: true});
+        return assistant.errorify(e, {sentry: true, send: true, log: true});
       });
     } catch (e) {
-      assistant.errorify(e, {sentry: true, send: true, log: true});
+      return assistant.errorify(e, {sentry: true, send: true, log: true});
     }
   });
 };

package/src/manager/helpers/settings.js

@@ -12,7 +12,7 @@ function Settings(m) {
   self.initialized = false;
 }
 
-Settings.prototype.init = function (assistant, options) {
+Settings.prototype.resolve = function (assistant, options) {
   const self = this;
 
   return new Promise(async function(resolve, reject) {