backend-manager 3.2.173 → 3.2.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.173",
+  "version": "3.2.175",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@firebase/rules-unit-testing": "^2.0.7",
-    "@google-cloud/storage": "^7.11.2",
+    "@google-cloud/storage": "^7.11.3",
     "@octokit/rest": "^19.0.13",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
@@ -52,13 +52,13 @@
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
-    "firebase-admin": "^12.1.1",
+    "firebase-admin": "^12.2.0",
     "firebase-functions": "^5.0.1",
     "fs-jetpack": "^5.1.0",
-    "glob": "^10.4.2",
+    "glob": "^11.0.0",
     "hcaptcha": "^0.1.1",
     "inquirer": "^8.2.5",
-    "itwcw-package-analytics": "^1.0.4",
+    "itwcw-package-analytics": "^1.0.6",
     "json5": "^2.2.3",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
@@ -69,7 +69,7 @@
     "moment": "^2.30.1",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
-    "node-powertools": "^1.4.4",
+    "node-powertools": "^1.4.5",
     "npm-api": "^1.0.1",
     "paypal-server-api": "^2.0.14",
     "pushid": "^1.0.0",
@@ -85,6 +85,6 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "prepare-package": "^1.1.12"
+    "prepare-package": "^1.1.13"
   }
-}
+}

package/src/manager/functions/core/events/auth/on-create.js

@@ -434,8 +434,8 @@ Module.prototype.sendWelcomeEmail = function (user) {
               I'm Ian, the founder and CEO of <strong>${Manager.config.brand.name}</strong>, and I'm thrilled to have you with us.
               Your journey begins today, and we are committed to supporting you every step of the way.
               <br><br>
+              We are dedicated to ensuring your experience is exceptional.
               Feel free to reply directly to this email with any questions you may have.
-              Our team and I are dedicated to ensuring your experience is exceptional.
               <br><br>
               Thank you for choosing <strong>${Manager.config.brand.name}</strong>. Here's to new beginnings!
             `

package/src/manager/helpers/analytics.js

@@ -88,10 +88,10 @@ function Analytics(Manager, options) {
         : 'None',
     },
     country: {
-      value: self.request.country
+      value: self.request.country,
     },
     city: {
-      value: self.request.city
+      value: self.request.city,
     },
     gender: {
       value: authUser?.personal?.gender
@@ -228,7 +228,7 @@ Analytics.prototype.event = function (payload) {
   payload = payload || {};
 
   // Fix event name
-  payload.name = (payload.name || '')
+  payload.name = `${payload.name}`
     // Replace anything not a letter, number, or underscore with an underscore
     .replace(/[^a-zA-Z0-9_]/g, '_')
     // Remove leading and trailing underscores

package/src/manager/helpers/assistant.js

@@ -4,6 +4,17 @@ const _ = require('lodash');
 const uuid = require('uuid');
 let JSON5;
 
+const LOG_LEVELS = {
+  error: 'error',
+  warn: 'warn',
+  info: 'info',
+  debug: 'debug',
+  log: 'log',
+  notice: 'NOTICE',
+  critical: 'CRITICAL',
+  emergency: 'EMERGENCY'
+};
+
 function BackendAssistant() {
   const self = this;
 
@@ -12,7 +23,24 @@ function BackendAssistant() {
   self.initialized = false;
 
   // Add log methods
-  addLogMethods();
+  Object.keys(LOG_LEVELS)
+  .forEach((level) => {
+    // Skip log because it is already a method
+    // if (level === 'log') {
+    //   return;
+    // }
+
+    // Add log method
+    BackendAssistant.prototype[level] = function() {
+      const self = this;
+      const args = Array.prototype.slice.call(arguments);
+
+      // Prepend level to args
+      args.unshift(level);
+      // self.log.apply(this, args);
+      self._log.apply(this, args);
+    };
+  });
 
   return self;
 }
@@ -33,12 +61,14 @@ function tryParse(input) {
 BackendAssistant.prototype.init = function (ref, options) {
   const self = this;
 
+  // Set options
   options = options || {};
   options.accept = options.accept || 'json';
   options.showOptionsLog = typeof options.showOptionsLog !== 'undefined' ? options.showOptionsLog : false;
   options.optionsLogString = typeof options.optionsLogString !== 'undefined' ? options.optionsLogString : '\n\n\n\n\n';
   options.fileSavePath = options.fileSavePath || process.env.npm_package_name || '';
 
+  // Set now
   const now = new Date();
 
   // Attached libraries - used in .errorify()
@@ -236,96 +266,41 @@ BackendAssistant.prototype.logProd = function () {
   self._log.apply(self, args);
 };
 
-BackendAssistant.prototype.log = function () {
+BackendAssistant.prototype._log = function () {
   const self = this;
+  const logs = [...arguments];
+  const prefix = self.logPrefix ? ` ${self.logPrefix}:` : ':';
 
-  const args = Array.prototype.slice.call(arguments);
+  // Prepend log prefix log string
+  logs.unshift(`[${self.tag} @ ${new Date().toISOString()}]${prefix}`);
 
-  self._log.apply(self, args);
-};
+  // Get the log level
+  const level = logs[1];
 
-function addLogMethods() {
-  const levels = ['error', 'warn', 'info', 'debug', 'notice', 'critical', 'emergency'];
+  // Pass along arguments to console.log
+  if (LOG_LEVELS[level]) {
+    logs.splice(1, 1);
 
-  // Add log methods
-  levels.forEach((level) => {
-    BackendAssistant.prototype[level] = function() {
-      const self = this;
-      const args = Array.prototype.slice.call(arguments);
-
-      // Prepend level to args
-      args.unshift(level);
-      self.log.apply(this, args);
-    };
-  });
-}
-
-BackendAssistant.prototype._log = function () {
-  const self = this;
-
-  // 1. Convert args to a normal array
-  const logs = [...Array.prototype.slice.call(arguments)];
-
-  // Add log prefix
-  const prefix = self.logPrefix
-    ? ` ${self.logPrefix}:`
-    : ':';
-
-  // 2. Prepend log prefix log string
-  logs.unshift(
-    `[${self.tag} @ ${new Date().toISOString()}]${prefix}`
-  );
-
-  // 3. Pass along arguments to console.log
-  if (logs[1] === 'error') {
-    logs.splice(1,1)
-    console.error.apply(console, logs);
-  } else if (logs[1] === 'warn') {
-    logs.splice(1,1)
-    console.warn.apply(console, logs);
-  } else if (logs[1] === 'info') {
-    logs.splice(1,1)
-    console.info.apply(console, logs);
-  } else if (logs[1] === 'debug') {
-    logs.splice(1,1)
-    console.debug.apply(console, logs);
-  } else if (logs[1] === 'notice') {
-    logs.splice(1,1)
-    if (self.isDevelopment()) {
-      console.log.apply(console, logs);
-    } else {
-      self.ref.functions.logger.write({
-        severity: 'NOTICE',
-        message: logs,
-      });
-    }
-  } else if (logs[1] === 'critical') {
-    logs.splice(1,1)
-    if (isDevelopment) {
+    // Determine how to log
+    if (level in console) {
+      console[level].apply(console, logs);
+    } else if (self.isDevelopment()) {
       console.log.apply(console, logs);
     } else {
       self.ref.functions.logger.write({
-        severity: 'CRITICAL',
+        severity: LOG_LEVELS[level].toUpperCase(),
         message: logs,
       });
     }
-  } else if (logs[1] === 'emergency') {
-    logs.splice(1,1)
-    if (isDevelopment) {
-      console.log.apply(console, logs);
-    } else {
-      self.ref.functions.logger.write({
-        severity: 'EMERGENCY',
-        message: logs,
-      });
+
+    // Write with wonderful-log
+    if (self.Manager?.libraries?.logger?.[level]) {
+      self.Manager?.libraries?.logger?.[level](...logs)
     }
-  } else if (logs[1] === 'log') {
-    logs.splice(1,1)
-    console.log.apply(console, logs);
   } else {
     console.log.apply(console, logs);
   }
-}
+};
 
 BackendAssistant.prototype.setLogPrefix = function (s) {
   const self = this;

package/src/manager/index.js

@@ -70,6 +70,7 @@ Manager.prototype.init = function (exporter, options) {
   options.assistant = options.assistant || {};
   options.cwd = typeof options.cwd === 'undefined' ? process.cwd() : options.cwd;
   options.projectPackageDirectory = typeof options.projectPackageDirectory === 'undefined' ? undefined : options.projectPackageDirectory;
+  options.logSavePath = typeof options.logSavePath === 'undefined' ? false : options.logSavePath;
   // options.assistant.optionsLogString = options.assistant.optionsLogString || undefined;
 
   // Load libraries
@@ -87,6 +88,7 @@ Manager.prototype.init = function (exporter, options) {
     localDatabase: null,
     User: null,
     Analytics: null,
+    logger: null,
   };
 
   // Set properties
@@ -118,8 +120,27 @@ Manager.prototype.init = function (exporter, options) {
   // Get app ID
   const appId = self.config?.app?.id;
 
+  // Set log
+  if (options.logSavePath) {
+    self.libraries.logger = new (require('wonderful-log'))({
+      console: {
+        enabled: false,
+      },
+      file: {
+        enabled: true,
+        path: options.logSavePath,
+      },
+    });
+  }
+
   // Init assistant
-  self.assistant = self.Assistant().init(undefined, options.assistant);
+  self.assistant = self.Assistant().init({
+    req: null,
+    res: null,
+    admin: self.libraries.admin,
+    functions: self.libraries.functions,
+    Manager: self,
+  }, options.assistant);
 
   // Set more properties (need to wait for assistant to determine if DEV)
   self.project.functionsUrl = self.assistant.isDevelopment()

package/src/manager/libraries/openai.js

@@ -4,6 +4,8 @@ const powertools = require('node-powertools');
 const _ = require('lodash');
 const JSON5 = require('json5');
 
+// Constants
+const DEFAULT_MODEL = 'gpt-4o';
 const TOKEN_COST_TABLE = {
   // May 13th, 2024
   'gpt-4o': {
@@ -142,7 +144,7 @@ OpenAI.prototype.request = function (options) {
   return new Promise(async function(resolve, reject) {
     options = _.merge({}, options);
 
-    options.model = typeof options.model === 'undefined' ? 'gpt-3.5-turbo' : options.model;
+    options.model = typeof options.model === 'undefined' ? DEFAULT_MODEL : options.model;
     options.timeout = typeof options.timeout === 'undefined' ? 120000 : options.timeout;
     options.moderate = typeof options.moderate === 'undefined' ? true : options.moderate;
     options.log = typeof options.log === 'undefined' ? false : options.log;