backend-manager 3.1.2 → 3.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -65,7 +65,7 @@
     "uid-generator": "^2.0.0",
     "ultimate-jekyll-poster": "^0.0.15",
     "uuid": "^9.0.1",
-    "wonderful-fetch": "^1.0.1",
+    "wonderful-fetch": "^1.1.0",
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }

package/src/manager/functions/core/actions/api/admin/backup.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
     payload.data.payload.deletionRegex = payload.data.payload.deletionRegex ? powertools.regexify(payload.data.payload.deletionRegex) : payload.data.payload.deletionRegex;
 
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // https://googleapis.dev/nodejs/firestore/latest/v1.FirestoreAdminClient.html#exportDocuments
@@ -61,7 +61,7 @@ Module.prototype.main = function () {
     })
     .catch(async (e) => {
       await self._setMetaStats(e);
-      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: true}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: true}).error)
     });
 
   });
@@ -96,7 +96,7 @@ Module.prototype._setMetaStats = function (error, meta) {
       metadata: Manager.Metadata().set({tag: 'admin:backup'}),
     }, {merge: true})
     .catch(e => {
-      assistant.errorManager(e, {code: 500, sentry: false, send: false, log: true});
+      assistant.errorify(e, {code: 500, sentry: false, send: false, log: true});
     })
 
     return resolve();

package/src/manager/functions/core/actions/api/admin/create-post.js

@@ -18,7 +18,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     // Perform checks
     if (!payload.user.roles.admin && !payload.user.roles.blogger) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     const repoInfo = assistant.parseRepo(get(self.Manager.config, 'github.repo_website'));
@@ -45,7 +45,7 @@ Module.prototype.main = function () {
     const finalPost = await poster.create(payload.data).catch(e => e);
 
     if (finalPost instanceof Error) {
-      return reject(assistant.errorManager(`Failed to post: ${finalPost}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500, sentry: false, send: false, log: false}).error)
     }
 
     // Request indexing
@@ -68,7 +68,7 @@ Module.prototype.main = function () {
       return resolve({data: finalPost});
     })
     .catch((e) => {
-      return reject(assistant.errorManager(`Failed to post: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to post: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
     })
 
   });

package/src/manager/functions/core/actions/api/admin/cron.js

@@ -13,12 +13,12 @@ Module.prototype.main = function () {
 
     // Check if the user is an admin
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // Check if the ID is set
     if (!payload.data.payload.id) {
-      return reject(assistant.errorManager(`Missing parameter {id}`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Missing parameter {id}`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     // Run the cron job
@@ -27,7 +27,7 @@ Module.prototype.main = function () {
       return resolve({data: res});
     })
     .catch(e => {
-      return reject(assistant.errorManager(e, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 400, sentry: false, send: false, log: false}).error)
     })
   });
 

package/src/manager/functions/core/actions/api/admin/database-read.js

@@ -16,9 +16,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     // Read from Firestore

package/src/manager/functions/core/actions/api/admin/database-write.js

@@ -17,9 +17,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error);
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error);
     }
 
     // Write to Firestore
@@ -29,7 +29,7 @@ Module.prototype.main = function () {
       return resolve({data: payload.data.payload.document});
     })
     .catch((e) => {
-      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
     });
   });
 

package/src/manager/functions/core/actions/api/admin/firestore-query.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // Run queries
@@ -35,7 +35,7 @@ Module.prototype.main = function () {
         return resolve({data: self.docs});
       })
       .catch((e) => {
-        return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
       })
 
   });

package/src/manager/functions/core/actions/api/admin/firestore-read.js

@@ -16,9 +16,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorManager(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`<path> parameter required`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     // Read from Firestore
@@ -28,7 +28,7 @@ Module.prototype.main = function () {
       return resolve({data: doc.data()});
     })
     .catch(e => {
-      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
     })
   });
 

package/src/manager/functions/core/actions/api/admin/firestore-write.js

@@ -19,9 +19,9 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.path) {
-      return reject(assistant.errorManager(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Path parameter required.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     // Set metadata
@@ -37,7 +37,7 @@ Module.prototype.main = function () {
       return resolve({data: {path: payload.data.payload.path}});
     })
     .catch(e => {
-      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
     })
   });
 

package/src/manager/functions/core/actions/api/admin/get-stats.js

@@ -17,7 +17,7 @@ Module.prototype.main = function () {
 
     // Perform checks
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // Get stats
@@ -34,7 +34,7 @@ Module.prototype.main = function () {
         }
 
         if (data instanceof Error) {
-          return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}).error)
         }
 
         // Retrieve the stats again after updating
@@ -47,13 +47,13 @@ Module.prototype.main = function () {
 
 
         if (data instanceof Error) {
-          return reject(assistant.errorManager(data, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(data, {code: 500, sentry: false, send: false, log: false}).error)
         }
 
         return resolve({data: data})
       })
       .catch(function (e) {
-        return reject(assistant.errorManager(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to get: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
       })
   });
 

package/src/manager/functions/core/actions/api/admin/payment-processor.js

@@ -15,12 +15,12 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     const productId = _.get(payload, 'data.payload.payload.details.productIdGlobal');
     if (!productId) {
-      return reject(assistant.errorManager(`No productId`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`No productId`, {code: 400, sentry: false, send: false, log: false}).error)
     }
     const processorPath = `${process.cwd()}/payment-processors/${productId}.js`
     let processor;
@@ -45,7 +45,7 @@ Module.prototype.main = function () {
       return resolve({data: result});
     })
     .catch(e => {
-      return reject(assistant.errorManager(`Payment processor @ "${processorPath}" failed: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Payment processor @ "${processorPath}" failed: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
     })
   });
 

package/src/manager/functions/core/actions/api/admin/send-notification.js

@@ -37,17 +37,17 @@ Module.prototype.main = function () {
       self._notificationPayload.notification.click_action.searchParams.set('cb', new Date().getTime())
       self._notificationPayload.notification.click_action = self._notificationPayload.notification.click_action.toString()
     } catch (e) {
-      assistant.errorManager(`Failed to add cb to URL: ${e}`, {code: 500, sentry: false, send: false, log: true})
+      assistant.errorify(`Failed to add cb to URL: ${e}`, {code: 500, sentry: false, send: false, log: true})
     }
 
     assistant.log('Resolved notification payload', self._notificationPayload)
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     if (!payload.data.payload.title || !payload.data.payload.body) {
-      return reject(assistant.errorManager(`Parameters <title> and <body> required`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameters <title> and <body> required`, {code: 400, sentry: true, send: false, log: false}).error)
     }
 
     await self.getTokens({tags: false})
@@ -55,7 +55,7 @@ Module.prototype.main = function () {
       return resolve({data: payload.response.data})
     })
     .catch(e => {
-      return reject(assistant.errorManager(`Failed to send notification: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to send notification: ${e}`, {code: 400, sentry: true, send: false, log: false}).error)
     })
   });
 

package/src/manager/functions/core/actions/api/admin/sync-users.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
 
     // If the user is not an admin, reject
     if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // Get lastPageToken from meta/stats
@@ -116,7 +116,7 @@ Module.prototype.main = function () {
         return resolve();
       })
       .catch(e => {
-        return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error)
       })
   });
 

package/src/manager/functions/core/actions/api/firebase/get-providers.js

@@ -44,7 +44,7 @@ Module.prototype.main = function () {
     payload.data.payload.firebaseApiKey = payload.data.payload.firebaseApiKey || _.get(Manager, 'config.firebaseConfig.apiKey') || false;
 
     if (!payload.data.payload.firebaseApiKey) {
-      return reject(assistant.errorManager(`The firebaseApiKey parameter is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`The firebaseApiKey parameter is required.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     // Default
@@ -91,7 +91,7 @@ Module.prototype.main = function () {
 
             payload.response.data[provider.name] = result;
           } catch (e) {
-            assistant.errorManager(`Error parsing error: ${e}`, {sentry: true, send: false, log: true})
+            assistant.errorify(`Error parsing error: ${e}`, {sentry: true, send: false, log: true})
             payload.response.data[provider.name] = false;
           }
         })
@@ -136,7 +136,7 @@ Module.prototype.main = function () {
 
       })
       .catch(e => {
-        assistant.errorManager(`Error getting app data: ${e}`, {sentry: false, send: false, log: true})
+        assistant.errorify(`Error getting app data: ${e}`, {sentry: false, send: false, log: true})
       })
       .finally(r => {
         return resolve({data: payload.response.data});
@@ -144,7 +144,7 @@ Module.prototype.main = function () {
 
     })
     .catch(e => {
-      return reject(assistant.errorManager(`Failed to check providers: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to check providers: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
     })
 
   });

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

@@ -20,14 +20,14 @@ Module.prototype.main = function () {
 
     if (payload.data.payload.version === '5') {
       if (!payload.data.payload.name) {
-        return reject(assistant.errorManager(`You must provide a name to hash for uuid v5.`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`You must provide a name to hash for uuid v5.`, {code: 400, sentry: false, send: false, log: false}).error)
       } else {
         result = uuid.v5(payload.data.payload.name, payload.data.payload.namespace);
       }
     } 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)
+      return reject(assistant.errorify(`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);

package/src/manager/functions/core/actions/api/general/send-email.js

@@ -32,9 +32,9 @@ Module.prototype.main = function () {
     }
 
     if (!payload.data.payload.id) {
-      return reject(assistant.errorManager(`Parameter {id} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameter {id} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
     } else if (!payload.data.payload.email) {
-      return reject(assistant.errorManager(`Parameter {email} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Parameter {email} is required.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     let emailPayload
@@ -46,7 +46,7 @@ Module.prototype.main = function () {
         script(payload.data.payload, Manager.config),
       );
     } catch (e) {
-      return reject(assistant.errorManager(`${payload.data.payload.id} is not a valid email ID.`, {code: 400, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`${payload.data.payload.id} is not a valid email ID.`, {code: 400, sentry: false, send: false, log: false}).error)
     }
 
     const storage = Manager.storage({temporary: true});
@@ -70,7 +70,7 @@ Module.prototype.main = function () {
     assistant.log('Storage:', storage.getState()['api:general:send-email']);
 
     if (ipData.count >= emailPayload.spamFilter.ip || emailData.count >= emailPayload.spamFilter.email) {
-      self.assistant.errorManager(`Spam filter triggered ip=${ipData.count}, email=${emailData.count}`, {code: 429, sentry: false, send: false, log: true})
+      self.assistant.errorify(`Spam filter triggered ip=${ipData.count}, email=${emailData.count}`, {code: 429, sentry: false, send: false, log: true})
       return resolve({data: {success: true}});
     }
 
@@ -99,7 +99,7 @@ Module.prototype.main = function () {
       });
     })
     .catch(e => {
-      return reject(assistant.errorManager(`Error sending email: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
+      return reject(assistant.errorify(`Error sending email: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
     });
 
   });

package/src/manager/functions/core/actions/api/handler/create-post.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     payload.response.data = {
@@ -83,7 +83,7 @@ Module.prototype.main = function () {
       .catch(e => e);
 
       if (createdInvoice instanceof Error) {
-        return reject(assistant.errorManager(createdInvoice, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(createdInvoice, {code: 400, sentry: false, send: false, log: false}).error)
       }
 
       // Send invoice
@@ -104,7 +104,7 @@ Module.prototype.main = function () {
       .catch(e => e);
 
       if (sentInvoice instanceof Error) {
-        return reject(assistant.errorManager(sentInvoice, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(sentInvoice, {code: 500, sentry: false, send: false, log: false}).error)
       }
 
       payload.response.data.invoice = {

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -32,11 +32,11 @@ Module.prototype.main = function () {
           signInToken = token;
         })
         .catch(e => {
-          error = assistant.errorManager(`Failed to create custom token: ${e}`, {code: 500, sentry: false, send: false, log: false}).error
+          error = assistant.errorify(`Failed to create custom token: ${e}`, {code: 500, sentry: false, send: false, log: false}).error
         })
       })
       .catch(e => {
-        assistant.errorManager(`Failed to resolve user: ${e}`, {code: 500, sentry: false, send: false, log: true})
+        assistant.errorify(`Failed to resolve user: ${e}`, {code: 500, sentry: false, send: false, log: true})
       })
 
       if (error) {
@@ -93,7 +93,7 @@ Module.prototype.main = function () {
       });
     })
     .catch(e => {
-      return reject(assistant.errorManager(`Error fetching app details: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Error fetching app details: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
     })
 
 

package/src/manager/functions/core/actions/api/template.js

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     // self.Api.resolveUser({adminRequired: false})

package/src/manager/functions/core/actions/api/test/create-test-accounts.js

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
 
     if (!payload.user.roles.admin) {
-      return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     }
 
     assistant.log('User:', payload.user);

package/src/manager/functions/core/actions/api/test/webhook.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
     if (payload.data.payload.status >= 200 && payload.data.payload.status <= 299) {
       return resolve({data: payload.data.payload.response, status: payload.data.payload.status});
     } else if (payload.data.payload.status >= 400 && payload.data.payload.status <= 599) {
-      return reject(assistant.errorManager(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status, sentry: false, send: false, log: false}).error)
     }
 
   });

package/src/manager/functions/core/actions/api/user/create-custom-token.js

@@ -19,7 +19,7 @@ Module.prototype.main = function () {
         return resolve({data: {token: token}});
       })
       .catch(e => {
-        return reject(assistant.errorManager(`Failed to create custom token: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to create custom token: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
       })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/delete.js

@@ -22,7 +22,7 @@ Module.prototype.main = function () {
         (user?.plan?.status && user?.plan?.status !== 'cancelled')
         || user?.plan?.payment?.active
       ) {
-        return reject(assistant.errorManager(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)
       }
 
       // Signout of all sessions
@@ -54,7 +54,7 @@ Module.prototype.main = function () {
         return resolve({data: {success: true}});
       })
       .catch(e => {
-        return reject(assistant.errorManager(`Failed to delete user: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to delete user: ${e}`, {code: 400, sentry: false, send: false, log: false}).error)
       })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/get-active-sessions.js

@@ -30,7 +30,7 @@ Module.prototype.main = function () {
         return resolve({data: data});
       })
       .catch(e => {
-        return reject(assistant.errorManager(`Session query error: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Session query error: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
       })
 
     })

package/src/manager/functions/core/actions/api/user/regenerate-api-keys.js

@@ -39,7 +39,7 @@ Module.prototype.main = function () {
         return resolve({data: newKeys});
       })
       .catch(e => {
-        return reject(assistant.errorManager(`Failed to generate keys: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to generate keys: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
       })
 
     })

package/src/manager/functions/core/actions/api/user/sign-out-all-sessions.js

@@ -37,10 +37,10 @@ Module.prototype.main = function () {
             return resolve({data: {sessions: count, message: `Successfully signed ${uid} out of all sessions`}});
           })
           .catch(e => {
-            return reject(assistant.errorManager(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+            return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
           })
       } catch (e) {
-        return reject(assistant.errorManager(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+        return reject(assistant.errorify(`Failed to sign out of all sessions: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
       }
     })
     .catch(e => {
@@ -108,7 +108,7 @@ Module.prototype.signOutOfSession = function (uid, session) {
 
       })
       .catch(e => {
-        assistant.errorManager(`Session query error for session ${session}: ${e}`, {code: 500, sentry: true, send: false, log: true})
+        assistant.errorify(`Session query error for session ${session}: ${e}`, {code: 500, sentry: true, send: false, log: true})
 
         return reject(e);
       })

package/src/manager/functions/core/actions/api/user/sign-up.js

@@ -26,7 +26,7 @@ Module.prototype.main = function () {
         const usage = await Manager.Usage().init(assistant, {log: true, key: ip});
 
         if (authUser instanceof Error) {
-          return reject(assistant.errorManager(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Failed to get auth user: ${authUser}`, {code: 500, sentry: false, send: false, log: false}).error)
         }
 
         // Age in seconds
@@ -34,7 +34,7 @@ Module.prototype.main = function () {
 
         // If the user is not new, reject
         if (ageInSeconds >= MAX_AGE) {
-          return reject(assistant.errorManager(`User is not new.`, {code: 400, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`User is not new.`, {code: 400, sentry: false, send: false, log: false}).error)
         }
 
         // Check if IP has signed up too many times
@@ -86,7 +86,7 @@ Module.prototype.main = function () {
           });
 
           // Reject
-          return reject(assistant.errorManager(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Too many signups from this IP (${ip}).`, {code: 429, sentry: false, send: false, log: false}).error)
         }
 
         // Increment signups
@@ -121,7 +121,7 @@ Module.prototype.main = function () {
           return resolve({data: result});
         })
         .catch(function (e) {
-          return reject(assistant.errorManager(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
+          return reject(assistant.errorify(`Failed to sign up: ${e}`, {code: 500, sentry: false, send: false, log: false}).error)
         })
     })
     .catch(e => {

package/src/manager/functions/core/actions/api/user/submit-feedback.js

@@ -77,11 +77,11 @@ Module.prototype.main = function () {
           });
         })
         .catch((e) => {
-          return reject(assistant.errorManager(`Failed to save feedback: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
+          return reject(assistant.errorify(`Failed to save feedback: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
         })
       })
       .catch((e) => {
-        return reject(assistant.errorManager(`Failed to get app: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
+        return reject(assistant.errorify(`Failed to get app: ${e.message}`, {code: 500, sentry: true, send: false, log: true}).error)
       })
 
     })

package/src/manager/functions/core/actions/api/user/validate-settings.js

@@ -28,7 +28,7 @@ Module.prototype.main = function () {
 
       // Check if the file exists
       if (!jetpack.exists(resolvedPath)) {
-        return reject(assistant.errorManager(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: true, send: false, log: true}).error);
+        return reject(assistant.errorify(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: true, send: false, log: true}).error);
       }
 
       // Load the file
@@ -40,7 +40,7 @@ Module.prototype.main = function () {
 
         return resolve({data: powertools.defaults(settings, combined)});
       } catch (e) {
-        return reject(assistant.errorManager(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: true, send: false, log: true}).error);
+        return reject(assistant.errorify(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: true, send: false, log: true}).error);
       }
 
     })

package/src/manager/functions/core/actions/api.js

@@ -271,7 +271,7 @@ Module.prototype.resolveUser = function (options) {
 
     if (options.uid) {
       if (options.adminRequired && !options.admin) {
-        user = self.assistant.errorManager('Admin required', {code: 401, sentry: false, send: false, log: false}).error;
+        user = self.assistant.errorify('Admin required', {code: 401, sentry: false, send: false, log: false}).error;
       } else {
         await self.libraries.admin.firestore().doc(`users/${options.uid}`)
         .get()
@@ -280,11 +280,11 @@ Module.prototype.resolveUser = function (options) {
           if (data) {
             user = data;
           } else {
-            user = self.assistant.errorManager(`User does not exist: ${options.uid}`, {code: 400, sentry: false, send: false, log: false}).error;
+            user = self.assistant.errorify(`User does not exist: ${options.uid}`, {code: 400, sentry: false, send: false, log: false}).error;
           }
         })
         .catch(function (e) {
-          user = self.assistant.errorManager(e, {code: 500, sentry: false, send: false, log: false}).error;
+          user = self.assistant.errorify(e, {code: 500, sentry: false, send: false, log: false}).error;
         })
       }
     } else if (self.payload.user.authenticated) {
@@ -296,7 +296,7 @@ Module.prototype.resolveUser = function (options) {
     if (user instanceof Error) {
       return reject(user);
     } else if (!user) {
-      return reject(self.assistant.errorManager('Unable to resolve user', {code: 500, sentry: false, send: false, log: false}).error);
+      return reject(self.assistant.errorify('Unable to resolve user', {code: 500, sentry: false, send: false, log: false}).error);
     } else {
       return resolve(user);
     }

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

@@ -105,7 +105,7 @@ Module.prototype.clearFirestore = function() {
     assistant.log(`cron/daily/reset-usage() [firestore]: Resetting metrics`, metrics);
 
     if (metrics instanceof Error) {
-      return reject(assistant.errorManager(`Failed to check providers: ${metrics}`, {code: 500, sentry: false, send: false, log: false}).error)
+      return reject(assistant.errorify(`Failed to check providers: ${metrics}`, {code: 500, sentry: false, send: false, log: false}).error)
     }
 
     // Reset all metrics with for loop of metrics
@@ -140,7 +140,7 @@ Module.prototype.clearFirestore = function() {
               assistant.log(`cron/daily/reset-usage() [firestore]: Reset ${metric} for ${doc.id} (${original} -> 0)`);
             })
             .catch(e => {
-              assistant.errorManager(`Error resetting ${metric} for ${doc.id}: ${e}`, {sentry: false, send: false, log: true})
+              assistant.errorify(`Error resetting ${metric} for ${doc.id}: ${e}`, {sentry: false, send: false, log: true})
             })
           }
 
@@ -159,7 +159,7 @@ Module.prototype.clearFirestore = function() {
         assistant.log(`cron/daily/reset-usage() [firestore]: Reset ${metric} for all users complete!`);
       })
       .catch(e => {
-        assistant.errorManager(`Error resetting ${metric} for all users: ${e}`, {sentry: false, send: false, log: true})
+        assistant.errorify(`Error resetting ${metric} for all users: ${e}`, {sentry: false, send: false, log: true})
       })
     }
 
@@ -169,7 +169,7 @@ Module.prototype.clearFirestore = function() {
       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})
+      assistant.errorify(`Error deleting temporary/usage: ${e}`, {sentry: false, send: false, log: true})
     })
 
     return resolve();

package/src/manager/functions/core/cron/daily.js

@@ -48,7 +48,7 @@ Module.prototype.main = function() {
         assistant.log(`cron/daily(): Job ${jobName} completed...`);
       })
       .catch(e => {
-        assistant.errorManager(`Error executing ${jobName}: ${e}`, {sentry: true, send: false, log: true});
+        assistant.errorify(`Error executing ${jobName}: ${e}`, {sentry: true, send: false, log: true});
         caught = e;
       })
     }

package/src/manager/helpers/assistant.js

@@ -60,7 +60,7 @@ BackendAssistant.prototype.init = function (ref, options) {
 
   // Set ID
   try {
-    self.id = self.Manager.Utilities().randomId();
+    self.id = self.ref.req.headers['function-execution-id'] || self.Manager.Utilities().randomId();
   } catch {
     self.id = now.getTime();
   }
@@ -344,8 +344,9 @@ BackendAssistant.prototype._log = function () {
   }
 }
 
-BackendAssistant.prototype.errorManager = function (e, options) {
+BackendAssistant.prototype.errorify = function (e, options) {
   const self = this;
+  const res = self.ref.res;
 
   // Set options
   options = options || {};
@@ -362,7 +363,7 @@ BackendAssistant.prototype.errorManager = function (e, options) {
     ? true
     : options.send;
   options.stack = typeof options.stack === 'undefined'
-    ? true
+    ? false
     : options.stack;
 
   // Construct error
@@ -370,16 +371,12 @@ BackendAssistant.prototype.errorManager = 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
-  Object.keys(options)
-  .forEach((item, i) => {
-    Object.assign(newError, { [item]: options[item] });
-  });
-
-  // Attach properties
-  _attachHeaderProperties(self, options);
+  _attachHeaderProperties(self, options, newError);
 
   // Log the error
   if (options.log) {
@@ -392,18 +389,24 @@ BackendAssistant.prototype.errorManager = function (e, options) {
   }
 
   // Quit and respond to the request
-  if (options.send && self.ref.res && self.ref.res.status) {
-    const sendable = newError?.stack && options.stack
+  if (options.send && res && res.status) {
+    let sendable = newError?.stack && options.stack
       ? newError?.stack
       : newError?.message;
 
-    self.ref.res
+    // Set error
+    sendable = `${sendable || newError || 'Unknown error'}`;
+
+    // Attach tag
+    if (newError.tag) {
+      // sendable = `(${newError.tag}) ${sendable}`;
+      sendable = `${sendable} (${newError.tag})`;
+    }
+
+    // Send response
+    res
       .status(options.code)
-      .send((
-        sendable
-          ? sendable
-          : newError
-      ) || 'Unknown error');
+      .send(sendable);
   }
 
   return {
@@ -411,10 +414,11 @@ BackendAssistant.prototype.errorManager = function (e, options) {
   }
 }
 
-BackendAssistant.prototype.errorify = BackendAssistant.prototype.errorManager;
+BackendAssistant.prototype.errorManager = BackendAssistant.prototype.errorify;
 
 BackendAssistant.prototype.respond = function(response, options) {
   const self = this;
+  const res = self.ref.res;
 
   // Set options
   options = options || {};
@@ -426,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);
   }
 
@@ -442,15 +448,20 @@ BackendAssistant.prototype.respond = function(response, options) {
   }
 
   // Send response
-  self.ref.res.status(options.code);
+  res.status(options.code);
 
-  if (typeof response === 'string') {
-    self.ref.res.send(response);
+  // If it is an object, send as json
+  if (response && typeof response === 'object') {
+    res.json(response);
   } else {
-    self.ref.res.json(response);
+    res.send(response);
   }
 }
 
+function isBetween(value, min, max) {
+  return value >= min && value <= max;
+}
+
 function stringify(e) {
   if (typeof e === 'string') {
     return e;
@@ -459,7 +470,7 @@ function stringify(e) {
   }
 }
 
-function _attachHeaderProperties(self, options) {
+function _attachHeaderProperties(self, options, error) {
   // Create headers
   const headers = {
     code: options.code,
@@ -473,6 +484,14 @@ function _attachHeaderProperties(self, options) {
 
   // Attach properties
   self.ref.res.header('bm-properties', JSON.stringify(headers));
+
+  // Attach properties
+  if (error) {
+    Object.keys(headers)
+    .forEach((item, i) => {
+      error[item] = headers[item];
+    });
+  }
 }
 
 BackendAssistant.prototype.authenticate = async function (options) {
@@ -504,7 +523,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
     }
   }
 
-  if (req?.headers?.authorization?.startsWith('Bearer ')) {
+  if (req?.headers?.authorization && 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);

package/src/manager/helpers/middleware.js

@@ -36,33 +36,42 @@ Middleware.prototype.run = function (library, req, res, options) {
       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});
+      assistant.errorify(`Unable to load library @ (${library}): ${e.message}`, {sentry: true, send: true, log: true});
+    }
+
+    // Setup usage
+    if (options.setupUsage) {
+      assistant.usage = await Manager.Usage().init(assistant);
     }
 
     // Setup analytics
     if (options.setupAnalytics) {
+      const uuid = assistant?.usage?.user?.auth?.uid
+        || assistant.request.user.auth.uid
+        || assistant.request.geolocation.ip
+
       assistant.analytics = Manager.Analytics({
         assistant: assistant,
-        uuid: assistant.request.geolocation.ip,
+        uuid: uuid,
       })
     }
 
-    // Setup usage
-    if (options.setupUsage) {
-      assistant.usage = await Manager.Usage().init(assistant);
-    }
-
     // Process
     try {
-      library.main(assistant)
+      // Set properties
+      library.Manager = Manager;
+      library.assistant = assistant;
+
+      // Run library
+      library.main(assistant, req, res)
       // .then(result => {
       //   return res.status(200).json(result);
       // })
       .catch(e => {
-        assistant.errorManager(e, {sentry: true, send: true, log: true});
+        assistant.errorify(e, {sentry: true, send: true, log: true});
       });
     } catch (e) {
-      assistant.errorManager(e, {sentry: true, send: true, log: true});
+      assistant.errorify(e, {sentry: true, send: true, log: true});
     }
   });
 };

package/src/manager/helpers/usage.js

@@ -81,13 +81,14 @@ Usage.prototype.init = function (assistant, options) {
       let foundUsage;
 
       if (options.unauthenticatedMode === 'firestore') {
+        // TODO: Make it request using .where() query so it doesnt use a read if it doesnt have to
         foundUsage = await Manager.libraries.admin.firestore().doc(`temporary/usage`)
           .get()
           .then((r) => {
             return r.data()?.[`${self.key}`];
           })
           .catch((e) => {
-            assistant.errorManager(`Usage.init(): Error fetching usage data: ${e}`, {sentry: true, send: false, log: true});
+            assistant.errorify(`Usage.init(): Error fetching usage data: ${e}`, {sentry: true, send: false, log: true});
           });
       } else {
         foundUsage = self.storage.get(`${self.paths.user}.usage`, {}).value();
@@ -114,7 +115,7 @@ Usage.prototype.init = function (assistant, options) {
         self.storage.set(`${self.paths.app}.lastFetched`, new Date().toISOString()).write();
       })
       .catch(e => {
-        assistant.errorManager(`Usage.init(): Error fetching app data: ${e}`, {sentry: true, send: false, log: true});
+        assistant.errorify(`Usage.init(): Error fetching app data: ${e}`, {sentry: true, send: false, log: true});
       })
     }
 
@@ -172,14 +173,14 @@ Usage.prototype.validate = function (path, options) {
       // If the captcha is valid, resolve
       if (!captchaResult || captchaResult instanceof Error || !captchaResult.success) {
         return reject(
-          assistant.errorManager(`Captcha verification failed.`, {code: 400, sentry: false, send: false, log: false}).error
+          assistant.errorify(`Captcha verification failed.`, {code: 400, sentry: false, send: false, log: false}).error
         );
       }
     }
 
     // Otherwise, they are over the limit, reject
     return reject(
-      assistant.errorManager(`You have exceeded your ${path} usage limit of ${period}/${allowed}.`, {code: 429, sentry: false, send: false, log: false}).error
+      assistant.errorify(`You have exceeded your ${path} usage limit of ${period}/${allowed}.`, {code: 429, sentry: false, send: false, log: false}).error
     );
   });
 };
@@ -282,17 +283,17 @@ Usage.prototype.update = function () {
           .then(() => {
             self.log(`Usage.update(): Updated user.usage in firestore`, self.user.usage);
 
-            return resolve();
+            return resolve(self.user.usage);
           })
           .catch(e => {
-            return reject(assistant.errorManager(e, {sentry: true, send: false, log: false}));
+            return reject(assistant.errorify(e, {sentry: true, send: false, log: false}));
           });
       } else {
         self.storage.set(`${self.paths.user}.usage`, self.user.usage).write();
 
         self.log(`Usage.update(): Updated user.usage in local storage`, self.user.usage);
 
-        return resolve();
+        return resolve(self.user.usage);
       }
     } else {
       Manager.libraries.admin.firestore().doc(`users/${self.user.auth.uid}`)
@@ -302,10 +303,10 @@ Usage.prototype.update = function () {
         .then(() => {
           self.log(`Usage.update(): Updated user.usage in firestore`, self.user.usage);
 
-          return resolve();
+          return resolve(self.user.usage);
         })
         .catch(e => {
-          return reject(assistant.errorManager(e, {sentry: true, send: false, log: false}));
+          return reject(assistant.errorify(e, {sentry: true, send: false, log: false}));
         });
     }
   });

package/src/manager/index.js

@@ -466,7 +466,7 @@ Manager.prototype._process = function (mod) {
     function _reject(e, log) {
       if (log) {
         // self.assistant.error(e);
-        mod.assistant.errorManager(e, {code: 500, sentry: true, send: false, log: true});
+        mod.assistant.errorify(e, {code: 500, sentry: true, send: false, log: true});
       }
       // res.status(500).send(e.message);
       return resolve()