backend-manager 3.0.63 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.0.63",
+  "version": "3.1.0",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -64,10 +64,9 @@
     "sizeitup": "^1.0.7",
     "uid-generator": "^2.0.0",
     "ultimate-jekyll-poster": "^0.0.15",
-    "universal-analytics": "^0.5.3",
     "uuid": "^9.0.1",
     "wonderful-fetch": "^1.0.1",
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }
-}
+}

package/src/manager/functions/core/cron/daily/reset-usage.js

@@ -163,6 +163,15 @@ Module.prototype.clearFirestore = function() {
       })
     }
 
+    // Clear temporary/usage in firestore by deleting the doc
+    await libraries.admin.firestore().doc(`temporary/usage`).delete()
+    .then(r => {
+      assistant.log(`cron/daily/reset-usage() [firestore]: Deleted temporary/usage`);
+    })
+    .catch(e => {
+      assistant.errorManager(`Error deleting temporary/usage: ${e}`, {sentry: false, send: false, log: true})
+    })
+
     return resolve();
   });
 }

package/src/manager/helpers/analytics copy.js

@@ -0,0 +1,217 @@
+// const ua = require('universal-analytics');
+const get = require('lodash/get');
+const fetch = require('wonderful-fetch');
+
+const uuidRegex = /[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/;
+let uuidv5;
+
+const BLACKLISTED_USER_AGENTS = new RegExp([
+  /(node-fetch)/,
+].map(r => r.source).join(''));
+
+function Analytics(Manager, options) {
+  let self = this;
+  self.Manager = Manager;
+  // self._request = self.Manager._inner || {};
+
+  // Set id and secret
+  // const analyticsId = get(self.Manager, 'config.google_analytics.id', undefined);
+  self.analyticsId = self?.Manager?.config?.google_analytics?.id;
+  self.analyticsSecret = self?.Manager?.config?.google_analytics?.secret;
+
+  // Fix options
+  options = options || {};
+
+  // Set properties
+  self._assistant = options.assistant || Manager.Assistant();
+  self._request = {
+    ip: get(self._assistant, 'request.geolocation.ip', '127.0.0.1'),
+    country: get(self._assistant, 'request.geolocation.country', ''),
+    referrer: get(self._assistant, 'request.referrer', ''),
+    userAgent: get(self._assistant, 'request.client.userAgent', ''),
+    name: get(self._assistant, 'meta.name', ''),
+  }
+
+  self._request.userAgent = self._request.userAgent.match(BLACKLISTED_USER_AGENTS) ? '' : self._request.userAgent;
+
+  self._ds = 'app';
+  self._uuid = options.uuid || self._request.ip || self.Manager.SERVER_UUID;
+  self._uuid = self._uuid.match(uuidRegex) ? self._uuid : self.generateId(self._uuid);
+  self._debug = typeof options.debug === 'undefined' ? (self.Manager.assistant.meta.environment === 'development') : options.debug;
+  self._pageview = typeof options.pageview === 'undefined' ? true : options.pageview;
+  self._version = self.Manager.package.version;
+  self._initialized = false;
+
+  if (!self.analyticsId) {
+    console.log('Not initializing because missing analyticsId', self.analyticsId);
+    return self;
+  } else if (!self.analyticsSecret) {
+    console.log('Not initializing because missing analyticsSecret', self.analyticsSecret);
+    return self;
+  }
+
+  // self.user = ua(self.analyticsId, self._uuid, {
+  //   strictCidFormat: false, // https://analytics.google.com/analytics/web/#/report-home/a104885300w228822596p215709578
+  // });
+  // self.user.set('ds', 'app');
+
+  // // https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#sc
+  // if (self._uuid) {
+  //   self.user.set('uid', self._uuid);
+  // }
+  // if (self._request.ip) {
+  //   self.user.set('uip', encodeURIComponent(self._request.ip));
+  // }
+  // if (self._request.userAgent) {
+  //   self.user.set('ua', encodeURIComponent(self._request.userAgent));
+  // }
+  // if (self._request.referrer) {
+  //   self.user.set('dr', encodeURIComponent(self._request.referrer));
+  // }
+
+  self._initialized = true;
+
+  if (self._pageview) {
+    self.pageview({
+      path: self._request.name,
+      location: self._request.name,
+      host: self._request.name,
+      title: self._request.name,
+    })
+  }
+
+  return self;
+}
+
+Analytics.prototype.generateId = function (id) {
+  let self = this;
+  uuidv5 = uuidv5 || require('uuid').v5;
+  let namespace = get(self.Manager, 'config.backend_manager.namespace', undefined);
+
+  return id && namespace ? uuidv5(id, namespace) : undefined;
+};
+
+Analytics.prototype.pageview = function (options) {
+  let self = this;
+  options = options || {};
+  options.path = options.path || self._request.name;
+  options.location = options.location || self._request.name;
+  options.host = options.host || self._request.name;
+  options.title = options.title || self._request.name;
+
+  if (!self._initialized) {
+    return self;
+  } else if (self._debug) {
+    console.log('Skipping Analytics.pageview() because in development', self._uuid, options);
+    return self;
+  }
+
+  // self.user.pageview({
+  //   dp: options.path,
+  //   dl: options.location,
+  //   dh: options.host,
+  //   dt: options.title,
+  // }).send();
+
+  self.send();
+
+  return self;
+};
+
+Analytics.prototype.event = function (options) {
+  let self = this;
+  options = options || {};
+  options.category = options.category;
+  options.action = options.action;
+  options.label = options.label;
+  options.value = options.value;
+  options.path = options.path || self._request.name;
+
+  if (!self._initialized) {
+    return self;
+  } else if (self._debug) {
+    console.log('Skipping Analytics.event() because in development', self._uuid, options);
+    return self;
+  }
+
+  // self.user.event({
+  //   ec: options.category,
+  //   ea: options.action,
+  //   el: options.label,
+  //   ev: options.value,
+  //   // dp: options.path || window.location.href,
+  // }).send();
+
+  self.send({
+    name: 'tutorial_begin',
+    params: {
+      campaign_id: 'google_1234',
+      campaign: 'Summer_fun',
+      source: 'google',
+      medium: 'cpc',
+      term: 'summer+travel',
+      content: 'logolink',
+      session_id: '123',
+      engagement_time_msec: '100',
+    }
+  });
+
+  return self;
+};
+
+Analytics.prototype.send = function (event) {
+  let self = this;
+
+  if (!self._initialized) {
+    return self;
+  } else if (self._debug) {
+    console.log('Skipping Analytics.event() because in development', self._uuid, options);
+    return self;
+  }
+
+  // self.user = ua(self.analyticsId, self._uuid, {
+  //   strictCidFormat: false, // https://analytics.google.com/analytics/web/#/report-home/a104885300w228822596p215709578
+  // });
+  // self.user.set('ds', 'app');
+
+  // // https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#sc
+  // if (self._uuid) {
+  //   self.user.set('uid', self._uuid);
+  // }
+  // if (self._request.ip) {
+  //   self.user.set('uip', encodeURIComponent(self._request.ip));
+  // }
+  // if (self._request.userAgent) {
+  //   self.user.set('ua', encodeURIComponent(self._request.userAgent));
+  // }
+  // if (self._request.referrer) {
+  //   self.user.set('dr', encodeURIComponent(self._request.referrer));
+  // }
+
+  /*
+    https://stackoverflow.com/questions/68773179/what-should-the-client-id-be-when-sending-events-to-google-analytics-4-using-the
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=gtag
+
+
+  */
+
+  // Send event
+  fetch(`https://www.google-analytics.com/mp/collect?measurement_id=${self.analyticsId}&api_secret=${self.analyticsSecret}`, {
+    method: 'post',
+    body: {
+      client_id: self._uuid,
+      user_id: self._uuid,
+      events: [event],
+    },
+  })
+  .then((r) => {
+    console.log('Analytics.send(): Sent', r);
+  })
+  .catch((e) => {
+    console.error('Analytics.send(): Error sending', e);
+  });
+
+  return self;
+};
+
+module.exports = Analytics;

package/src/manager/helpers/analytics.js

@@ -1,5 +1,7 @@
-const ua = require('universal-analytics');
+// const ua = require('universal-analytics');
 const get = require('lodash/get');
+const fetch = require('wonderful-fetch');
+
 const uuidRegex = /[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/;
 let uuidv5;
 
@@ -8,13 +10,16 @@ const BLACKLISTED_USER_AGENTS = new RegExp([
 ].map(r => r.source).join(''));
 
 function Analytics(Manager, options) {
-  let self = this;
+  const self = this;
   self.Manager = Manager;
   // self._request = self.Manager._inner || {};
 
-  const analyticsId = get(self.Manager, 'config.google_analytics.id', undefined);
+  // Set id and secret
+  // const analyticsId = get(self.Manager, 'config.google_analytics.id', undefined);
+  self.analyticsId = self?.Manager?.config?.google_analytics?.id;
+  self.analyticsSecret = self?.Manager?.config?.google_analytics?.secret;
 
-  // Fix optios
+  // Fix options
   options = options || {};
 
   // Set properties
@@ -29,36 +34,40 @@ function Analytics(Manager, options) {
 
   self._request.userAgent = self._request.userAgent.match(BLACKLISTED_USER_AGENTS) ? '' : self._request.userAgent;
 
+  self._data_soruce = 'server';
   self._uuid = options.uuid || self._request.ip || self.Manager.SERVER_UUID;
   self._uuid = self._uuid.match(uuidRegex) ? self._uuid : self.generateId(self._uuid);
-  self._debug = typeof options.debug === 'undefined' ? (self.Manager.assistant.meta.environment === 'development') : options.debug;
+  self._debug = typeof options.debug === 'undefined' ? self._assistant.meta.environment === 'development' : options.debug;
   self._pageview = typeof options.pageview === 'undefined' ? true : options.pageview;
   self._version = self.Manager.package.version;
   self._initialized = false;
 
-  if (!analyticsId) {
-    console.log('Not initializing because missing analyticsId', analyticsId);
+  if (!self.analyticsId) {
+    self._assistant.log('analytics(): Not initializing because missing analyticsId', self.analyticsId);
+    return self;
+  } else if (!self.analyticsSecret) {
+    self._assistant.log('analytics(): Not initializing because missing analyticsSecret', self.analyticsSecret);
     return self;
   }
 
-  self.user = ua(analyticsId, self._uuid, {
-    strictCidFormat: false, // https://analytics.google.com/analytics/web/#/report-home/a104885300w228822596p215709578
-  });
-  self.user.set('ds', 'app');
-
-  // https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#sc
-  if (self._uuid) {
-    self.user.set('uid', self._uuid);
-  }
-  if (self._request.ip) {
-    self.user.set('uip', encodeURIComponent(self._request.ip));
-  }
-  if (self._request.userAgent) {
-    self.user.set('ua', encodeURIComponent(self._request.userAgent));
-  }
-  if (self._request.referrer) {
-    self.user.set('dr', encodeURIComponent(self._request.referrer));
-  }
+  // self.user = ua(self.analyticsId, self._uuid, {
+  //   strictCidFormat: false, // https://analytics.google.com/analytics/web/#/report-home/a104885300w228822596p215709578
+  // });
+  // self.user.set('ds', 'app');
+
+  // // https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#sc
+  // if (self._uuid) {
+  //   self.user.set('uid', self._uuid);
+  // }
+  // if (self._request.ip) {
+  //   self.user.set('uip', encodeURIComponent(self._request.ip));
+  // }
+  // if (self._request.userAgent) {
+  //   self.user.set('ua', encodeURIComponent(self._request.userAgent));
+  // }
+  // if (self._request.referrer) {
+  //   self.user.set('dr', encodeURIComponent(self._request.referrer));
+  // }
 
   self._initialized = true;
 
@@ -75,61 +84,150 @@ function Analytics(Manager, options) {
 }
 
 Analytics.prototype.generateId = function (id) {
-  let self = this;
+  const self = this;
   uuidv5 = uuidv5 || require('uuid').v5;
   let namespace = get(self.Manager, 'config.backend_manager.namespace', undefined);
 
   return id && namespace ? uuidv5(id, namespace) : undefined;
 };
 
+// Disabled because we are using the Measurement Protocol (12/19/2023)
 Analytics.prototype.pageview = function (options) {
-  let self = this;
+  // const self = this;
+  // options = options || {};
+  // options.path = options.path || self._request.name;
+  // options.location = options.location || self._request.name;
+  // options.host = options.host || self._request.name;
+  // options.title = options.title || self._request.name;
+
+  // if (!self._initialized) {
+  //   return self;
+  // } else if (self._debug) {
+  //   self._assistant.log('analytics(): Skipping Analytics.pageview() because in development', self._uuid, options);
+  //   return self;
+  // }
+
+  // // self.user.pageview({
+  // //   dp: options.path,
+  // //   dl: options.location,
+  // //   dh: options.host,
+  // //   dt: options.title,
+  // // }).send();
+
+  // // self.send();
+
+  // return self;
+};
+
+Analytics.prototype.event = function (options) {
+  const self = this;
+
+  // Fix options
   options = options || {};
-  options.path = options.path || self._request.name;
-  options.location = options.location || self._request.name;
-  options.host = options.host || self._request.name;
-  options.title = options.title || self._request.name;
 
   if (!self._initialized) {
     return self;
   } else if (self._debug) {
-    console.log('Skipping Analytics.pageview() because in development', self._uuid, options);
+    self._assistant.log('analytics(): Skipping Analytics.event() because in development', self._uuid, options);
     return self;
   }
 
-  self.user.pageview({
-    dp: options.path,
-    dl: options.location,
-    dh: options.host,
-    dt: options.title,
-  }).send();
+  // self.user.event({
+  //   ec: options.category,
+  //   ea: options.action,
+  //   el: options.label,
+  //   ev: options.value,
+  //   // dp: options.path || window.location.href,
+  // }).send();
+
+  self.send({
+    name: options.name,
+    params: options.params
+  });
 
   return self;
 };
 
-Analytics.prototype.event = function (options) {
-  let self = this;
-  options = options || {};
-  options.category = options.category;
-  options.action = options.action;
-  options.label = options.label;
-  options.value = options.value;
-  options.path = options.path || self._request.name;
+Analytics.prototype.send = function (event) {
+  const self = this;
 
   if (!self._initialized) {
     return self;
   } else if (self._debug) {
-    console.log('Skipping Analytics.event() because in development', self._uuid, options);
+    self._assistant.log('analytics(): Skipping Analytics.event() because in development', self._uuid, event);
     return self;
   }
 
-  self.user.event({
-    ec: options.category,
-    ea: options.action,
-    el: options.label,
-    ev: options.value,
-    // dp: options.path || window.location.href,
-  }).send();
+  /*
+    https://stackoverflow.com/questions/68773179/what-should-the-client-id-be-when-sending-events-to-google-analytics-4-using-the
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=gtag
+
+
+    https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#sc
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=gtag#recommended_parameters_for_reports
+    https://stackoverflow.com/questions/43049662/how-to-send-measurement-protocol-if-there-is-no-clientid
+
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/validating-events?client_type=gtag
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference?client_type=gtag
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference/events
+    https://developers.google.com/analytics/devguides/collection/protocol/ga4/ua-feature-matrix
+  */
+
+  // Format event
+  event = event || {};
+  event.name = event.name || '';
+  event.timestamp_micros = new Date().getTime() * 1000,
+  event.params = event.params || {};
+  event.params.session_id = self._assistant.id;
+  event.params.engagement_time_msec = `${new Date().getTime() - new Date(self._assistant.meta.startTime.timestamp).getTime()}`;
+  event.params.event_source = self._data_soruce;
+  event.params.ip_override = self._request.ip;
+  event.params.user_agent = self._request.userAgent;
+  event.params.page_location = self._request.name;
+  event.params.page_referrer = self._request.referrer;
+  event.params.page_title = self._request.name;
+
+  // "event_source": "server",
+  // "page_location": "https:\/\/www.yourdomain.com\/page2",
+  // "page_referrer": "\/page1",
+  // "page_title": "Page 2",
+  // "ip_override": "xxx.xxx.xxx.0",
+  // "campaign": "your_campaign",
+  // "source": "your_source",
+  // "medium": "your_medium",
+  // "term": "your_term",
+  // "content": "your_content"
+
+  const body = {
+    client_id: self._uuid,
+    user_id: self._uuid,
+    // ip_override: self._request.ip,
+    // user_agent: self._request.userAgent,
+    events: [event],
+  }
+
+  // Log
+  if (self._assistant.meta.environment === 'development') {
+    self._assistant.log('analytics().send(): Sending...', JSON.stringify(body));
+  }
+
+  // Send event
+  fetch(`https://www.google-analytics.com/mp/collect?measurement_id=${self.analyticsId}&api_secret=${self.analyticsSecret}`, {
+  // fetch(`https://www.google-analytics.com/debug/mp/collect?measurement_id=${self.analyticsId}&api_secret=${self.analyticsSecret}`, {
+    method: 'post',
+    response: 'text',
+    tries: 2,
+    timeout: 30000,
+    body: body,
+  })
+  .then((r) => {
+    if (self._assistant.meta.environment === 'development') {
+      self._assistant.log('analytics().send(): Success', r);
+    }
+  })
+  .catch((e) => {
+    self._assistant.error('analytics().send(): Failed', e);
+  });
 
   return self;
 };

package/src/manager/helpers/assistant.js

@@ -33,6 +33,11 @@ BackendAssistant.prototype.init = function (ref, options) {
 
   const now = new Date();
 
+  // Attached libraries - used in .errorify()
+  self.analytics = null;
+  self.usage = null;
+
+  // Set meta
   self.meta = {};
 
   self.meta.startTime = {};
@@ -43,6 +48,7 @@ BackendAssistant.prototype.init = function (ref, options) {
   self.meta.environment = options.environment || self.getEnvironment();
   self.meta.type = options.functionType || process.env.FUNCTION_SIGNATURE_TYPE || 'unknown';
 
+  // Set ref
   self.ref = {};
   ref = ref || {};
   self.ref.res = ref.res || {};
@@ -50,14 +56,17 @@ BackendAssistant.prototype.init = function (ref, options) {
   self.ref.admin = ref.admin || {};
   self.ref.functions = ref.functions || {};
   self.ref.Manager = ref.Manager || {};
+  self.Manager = self.ref.Manager;
 
   // Set ID
   try {
-    self.id = self.ref.Manager.Utilities().randomId();
+    self.id = self.Manager.Utilities().randomId();
   } catch {
     self.id = now.getTime();
   }
 
+  self.tag = `${self.meta.name}/${self.id}`;
+
   // Set stuff about request
   self.request = {};
   self.request.referrer = (self.ref.req.headers || {}).referrer || (self.ref.req.headers || {}).referer || '';
@@ -146,6 +155,7 @@ BackendAssistant.prototype.init = function (ref, options) {
   self.constant.pastTime.timestamp = '1999-01-01T00:00:00Z';
   self.constant.pastTime.timestampUNIX = 915148800;
 
+  // Log options
   if (
     (self.meta.environment === 'development')
     && ((self.request.method !== 'OPTIONS') || (self.request.method === 'OPTIONS' && options.showOptionsLog))
@@ -155,8 +165,10 @@ BackendAssistant.prototype.init = function (ref, options) {
     console.log(options.optionsLogString);
   }
 
+  // Set tmpdir
   self.tmpdir = path.resolve(os.tmpdir(), options.fileSavePath, uuid.v4());
 
+  // Set initialized
   self.initialized = true;
 
   return self;
@@ -279,7 +291,7 @@ BackendAssistant.prototype._log = function() {
   const logs = [...Array.prototype.slice.call(arguments)];
 
   // 2. Prepend log prefix log string
-  logs.unshift(`[${self.meta.name}/${self.id} @ ${new Date().toISOString()}]:`);
+  logs.unshift(`[${self.tag} @ ${new Date().toISOString()}]:`);
 
   // 3. Pass along arguments to console.log
   if (logs[1] === 'error') {
@@ -335,22 +347,36 @@ BackendAssistant.prototype._log = function() {
 BackendAssistant.prototype.errorManager = function(e, options) {
   const self = this;
 
+  // Set options
   options = options || {};
-  options.code = typeof options.code === 'undefined' ? 500 : options.code;
-  options.log = typeof options.log === 'undefined' ? true : options.log;
-  options.sentry = typeof options.sentry === 'undefined' ? true : options.sentry;
-  options.send = typeof options.send === 'undefined' ? true : options.send;
-
+  options.code = typeof options.code === 'undefined'
+    ? 500
+    : options.code;
+  options.log = typeof options.log === 'undefined'
+    ? true
+    : options.log;
+  options.sentry = typeof options.sentry === 'undefined'
+    ? true
+    : options.sentry;
+  options.send = typeof options.send === 'undefined'
+    ? true
+    : options.send;
+
+  // Construct error
   const newError = e instanceof Error
     ? e
     : new Error(stringify(e));
 
+  options.code = newError.code || options.code;
+
   // Attach properties
   Object.keys(options)
   .forEach((item, i) => {
-    Object.assign(newError , { [item]: options[item] })
+    Object.assign(newError, { [item]: options[item] });
   });
 
+  // Attach properties
+  _attachHeaderProperties(self, options);
 
   // Log the error
   if (options.log) {
@@ -359,12 +385,19 @@ BackendAssistant.prototype.errorManager = function(e, options) {
 
   // Send error to Sentry
   if (options.sentry) {
-    self.ref.Manager.libraries.sentry.captureException(newError);
+    self.Manager.libraries.sentry.captureException(newError);
   }
 
   // Quit and respond to the request
   if (options.send && self.ref.res && self.ref.res.status) {
-    self.ref.res.status(options.code).send(newError ? newError.message || newError : 'Unknown error');
+    self.ref.res
+      .status(options.code)
+      .send((
+        newError?.message
+          // ? newError.stack
+          ? newError.message
+          : newError
+      ) || 'Unknown error');
   }
 
   return {
@@ -372,6 +405,38 @@ BackendAssistant.prototype.errorManager = function(e, options) {
   }
 }
 
+BackendAssistant.prototype.errorify = BackendAssistant.prototype.errorManager;
+
+BackendAssistant.prototype.respond = function(response, options) {
+  const self = this;
+
+  // Set options
+  options = options || {};
+  options.code = typeof options.code === 'undefined'
+    ? 200
+    : options.code;
+  options.log = typeof options.log === 'undefined'
+    ? true
+    : options.log;
+
+  // Attach properties
+  _attachHeaderProperties(self, options);
+
+  // Log the error
+  if (options.log) {
+    self.log(`Responding with ${options.code} code:`, JSON.stringify(response));
+  }
+
+  // Send response
+  self.ref.res.status(options.code);
+
+  if (typeof response === 'string') {
+    self.ref.res.send(response);
+  } else {
+    self.ref.res.json(response);
+  }
+}
+
 function stringify(e) {
   if (typeof e === 'string') {
     return e;
@@ -380,6 +445,21 @@ function stringify(e) {
   }
 }
 
+function _attachHeaderProperties(self, options) {
+  // Create headers
+  const headers = {
+    code: options.code,
+    tag: self.tag,
+    usage: {
+      current: self?.usage?.getUsage() || {},
+      limits: self?.usage?.getLimit() || {},
+    },
+    additional: options.additional || {},
+  }
+
+  // Attach properties
+  self.ref.res.header('bm-properties', JSON.stringify(headers));
+}
 
 BackendAssistant.prototype.authenticate = async function (options) {
   const self = this;
@@ -410,11 +490,11 @@ BackendAssistant.prototype.authenticate = async function (options) {
     }
   }
 
-  if (req.headers && req.headers.authorization && req.headers.authorization.startsWith('Bearer ')) {
+  if (req?.headers?.authorization?.startsWith('Bearer ')) {
     // Read the ID Token from the Authorization header.
     idToken = req.headers.authorization.split('Bearer ')[1];
     self.log('Found "Authorization" header', idToken, logOptions);
-  } else if (req.cookies && req.cookies.__session) {
+  } else if (req?.cookies?.__session) {
     // Read the ID Token from cookie.
     idToken = req.cookies.__session;
     self.log('Found "__session" cookie', idToken, logOptions);
@@ -422,7 +502,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
     // Check with custom BEM Token
     let storedApiKey;
     try {
-      const workingConfig = _.get(self.ref.Manager, 'config') || functions.config();
+      const workingConfig = _.get(self.Manager, 'config') || functions.config();
       storedApiKey = _.get(workingConfig, 'backend_manager.key', '')
     } catch (e) {
 
@@ -439,29 +519,31 @@ BackendAssistant.prototype.authenticate = async function (options) {
     }
   } else if (options.apiKey) {
     self.log('Found "options.apiKey"', options.apiKey, logOptions);
+
     if (options.apiKey.includes('test')) {
       return _resolve(self.request.user);
     }
+
     await admin.firestore().collection(`users`)
-    .where('api.privateKey', '==', options.apiKey)
-    .get()
-    .then(function(querySnapshot) {
-      querySnapshot.forEach(function(doc) {
-        self.request.user = doc.data();
-        self.request.user.authenticated = true;
+      .where('api.privateKey', '==', options.apiKey)
+      .get()
+      .then(function(querySnapshot) {
+        querySnapshot.forEach(function(doc) {
+          self.request.user = doc.data();
+          self.request.user.authenticated = true;
+        });
+      })
+      .catch(function(error) {
+        console.error('Error getting documents: ', error);
       });
-    })
-    .catch(function(error) {
-      console.error('Error getting documents: ', error);
-    });
 
     return _resolve(self.request.user);
   } else {
-    self.log('No Firebase ID token was able to be extracted.',
-      'Make sure you authenticate your request by providing either the following HTTP header:',
-      'Authorization: Bearer <Firebase ID Token>',
-      'or by passing a "__session" cookie',
-      'or by passing backendManagerKey or authenticationToken in the body or query', logOptions);
+    // self.log('No Firebase ID token was able to be extracted.',
+    //   'Make sure you authenticate your request by providing either the following HTTP header:',
+    //   'Authorization: Bearer <Firebase ID Token>',
+    //   'or by passing a "__session" cookie',
+    //   'or by passing backendManagerKey or authenticationToken in the body or query', logOptions);
 
     return _resolve(self.request.user);
   }

package/src/manager/helpers/middleware.js

@@ -0,0 +1,70 @@
+/**
+ * Middleware
+ * Used to handle middleware for the assistant
+ */
+
+const path = require('path');
+
+function Middleware(m) {
+  const self = this;
+
+  self.Manager = m;
+}
+
+Middleware.prototype.run = function (library, req, res, options) {
+  const self = this;
+  const Manager = self.Manager;
+  const { cors } = Manager.libraries;
+
+  return cors(req, res, async () => {
+    const assistant = Manager.Assistant({req: req, res: res});
+
+    const data = assistant.request.data;
+    const geolocation = assistant.request.geolocation;
+    const client = assistant.request.client;
+
+    // Set options
+    options = options || {};
+    options.setupAnalytics = typeof options.setupAnalytics === 'boolean' ? options.setupAnalytics : true;
+    options.setupUsage = typeof options.setupUsage === 'boolean' ? options.setupUsage : true;
+
+    // Log
+    assistant.log(`Middleware.process(): Request (${geolocation.ip} @ ${geolocation.country}, ${geolocation.region}, ${geolocation.city})`, JSON.stringify(data));
+
+    // Load library
+    try {
+      library = path.resolve(process.cwd(), `${library}.js`);
+      library = new (require(library))();
+    } catch (e) {
+      assistant.errorManager(`Unable to load library @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
+    }
+
+    // Setup analytics
+    if (options.setupAnalytics) {
+      assistant.analytics = Manager.Analytics({
+        assistant: assistant,
+        uuid: assistant.request.geolocation.ip,
+      })
+    }
+
+    // Setup usage
+    if (options.setupUsage) {
+      assistant.usage = await Manager.Usage().init(assistant);
+    }
+
+    // Process
+    try {
+      library.main(assistant, req, res)
+      // .then(result => {
+      //   return res.status(200).json(result);
+      // })
+      .catch(e => {
+        assistant.errorManager(e, {sentry: true, send: true, log: true});
+      });
+    } catch (e) {
+      assistant.errorManager(e, {sentry: true, send: true, log: true});
+    }
+  });
+};
+
+module.exports = Middleware;

package/src/manager/helpers/usage.js

@@ -244,7 +244,11 @@ Usage.prototype.getUsage = function (path) {
   const Manager = self.Manager;
   const assistant = self.assistant;
 
-  return _.get(self.user, `usage.${path}.period`, 0);
+  if (path) {
+    return _.get(self.user, `usage.${path}.period`, 0);
+  } else {
+    return self.user.usage;
+  }
 };
 
 Usage.prototype.getLimit = function (path) {
@@ -252,7 +256,13 @@ Usage.prototype.getLimit = function (path) {
   const Manager = self.Manager;
   const assistant = self.assistant;
 
-  return _.get(self.app, `products.${self.options.app}-${self.user.plan.id}.limits.${path}`, 0);
+  const key = `products.${self.options.app}-${self.user.plan.id}.limits`;
+
+  if (path) {
+    return _.get(self.app, `${key}.${path}`, 0);
+  } else {
+    return _.get(self.app, key, {});
+  }
 };
 
 Usage.prototype.update = function () {

package/src/manager/index.js

@@ -606,6 +606,12 @@ Manager.prototype.Usage = function () {
   return new self.libraries.Usage(self, ...arguments);
 };
 
+Manager.prototype.Middleware = function () {
+  const self = this;
+  self.libraries.Middleware = self.libraries.Middleware || require('./helpers/middleware.js');
+  return new self.libraries.Middleware(self, ...arguments);
+};
+
 Manager.prototype.Settings = function () {
   const self = this;
   self.libraries.Settings = self.libraries.Settings || require('./helpers/settings.js');