backend-manager 3.2.99 → 3.2.100

package/package.json

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

package/src/manager/functions/core/actions/api/test/run-hook.js

@@ -11,7 +11,7 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
     // Log
-    assistant.log('assistant.cwd', assistant.cwd)
+    assistant.log('Manager.cwd', Manager.cwd)
 
     // If not dev, quit
     if (!assistant.isDevelopment()) {
@@ -26,16 +26,18 @@ Module.prototype.main = function () {
     // Load the hook
     let hook;
     try {
-      hook = (new (require(pathify(`${assistant.cwd}/${payload.data.payload.path}.js`)))()).main(Manager);
+      hook = (new (require(pathify(`${Manager.cwd}/${payload.data.payload.path}.js`)))());
     } catch (e) {
-      hook = (new (require(pathify(`${assistant.cwd}/methods/hooks/${payload.data.payload.path}.js`)))()).main(Manager);
+      hook = (new (require(pathify(`${Manager.cwd}/methods/hooks/${payload.data.payload.path}.js`)))());
     }
 
-    //
-    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.errorify(payload.data.payload.response || 'Unknown error message provided', {code: payload.data.payload.status}));
+    // Run the hook
+    try {
+      const result = await hook.main(Manager);
+
+      return resolve({data: result, status: 200});
+    } catch (e) {
+      return reject(assistant.errorify(e.message, {code: 500}));
     }
   });
 };

package/src/manager/helpers/analytics.js

@@ -195,8 +195,9 @@ Analytics.prototype.event = function (payload) {
   // https://support.google.com/analytics/answer/13316687?hl=en#zippy=%2Cweb
   // https://support.google.com/analytics/answer/9268042?sjid=4476481583372132143-NC
   // https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference/events#screen_view
-
   payload = payload || {};
+
+  // Fix event name
   payload.name = (payload.name || '')
     // Replace anything not a letter, number, or underscore with an underscore
     .replace(/[^a-zA-Z0-9_]/g, '_')
@@ -204,6 +205,8 @@ Analytics.prototype.event = function (payload) {
     .replace(/^_+|_+$/g, '')
     // Remove multiple underscores
     .replace(/_+/g, '_');
+
+  // Fix event params
   payload.params = payload.params || {};
 
   // Check if initialized