backend-manager 3.1.10 → 3.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.1.10",
+  "version": "3.1.12",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -11,6 +11,7 @@
     "_test": "npm run prepare && ./node_modules/mocha/bin/mocha test/ --recursive --timeout=10000",
     "test": "./node_modules/mocha/bin/mocha test/ --recursive --timeout=10000",
     "test:usage": "./node_modules/mocha/bin/mocha test/usage.js --timeout=10000",
+    "test:payment-resolver": "./node_modules/mocha/bin/mocha test/payment-resolver.js --timeout=10000",
     "start": "node src/index.js"
   },
   "engines": {
@@ -41,7 +42,7 @@
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "firebase-admin": "^11.11.1",
-    "firebase-functions": "^4.5.0",
+    "firebase-functions": "^4.6.0",
     "fs-jetpack": "^5.1.0",
     "hcaptcha": "^0.1.1",
     "inquirer": "^8.2.5",

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

@@ -7,11 +7,13 @@ function Module() {
 
 Module.prototype.init = function (Manager, data) {
   const self = this;
+
   self.Manager = Manager;
   self.libraries = Manager.libraries;
-  self.assistant = Manager.Assistant()
+  self.assistant = Manager.Assistant();
 
   self.context = data.context;
+
   return self;
 }
 

package/src/manager/helpers/assistant.js

@@ -201,21 +201,6 @@ BackendAssistant.prototype.log = function () {
   const self = this;
 
   const args = Array.prototype.slice.call(arguments);
-  const last = args[args.length - 1];
-  // const override = last && typeof last === 'object' && last.environment === 'production';
-  const pop = last?.environment === 'production' || last?.environment === 'development';
-
-  // if (self.meta.environment === 'development' || override) {
-  //   if (override) {
-  //     args.pop();
-  //   }
-  //   self._log.apply(self, args);
-  // }
-
-  // This makes all OLD logs work even if they use the old {environemnt: 'production'} syntax
-  if (pop) {
-    args.pop();
-  }
 
   self._log.apply(self, args);
 };

package/src/manager/helpers/subscription-resolver.js

@@ -14,6 +14,8 @@ function SubscriptionResolver(Manager, profile, resource) {
 SubscriptionResolver.prototype.resolve = function (options) {
   const self = this;
 
+  const datePast = moment(0);
+
   const resolved = {
     status: '',
     frequency: '',
@@ -25,28 +27,32 @@ SubscriptionResolver.prototype.resolve = function (options) {
       refunded: false,
     },
     start: {
-      timestamp: moment(0),
-      timestampUNIX: moment(0),
+      timestamp: datePast,
+      timestampUNIX: datePast,
     },
     expires: {
-      timestamp: moment(0),
-      timestampUNIX: moment(0),
+      timestamp: datePast,
+      timestampUNIX: datePast,
     },
     cancelled: {
-      timestamp: moment(0),
-      timestampUNIX: moment(0),
+      timestamp: datePast,
+      timestampUNIX: datePast,
     },
     lastPayment: {
       amount: 0,
       date: {
-        timestamp: moment(0),
-        timestampUNIX: moment(0),
+        timestamp: datePast,
+        timestampUNIX: datePast,
       }
     },
     trial: {
       claimed: false,
       active: false,
       daysLeft: 0,
+      expires: {
+        timestamp: datePast,
+        timestampUNIX: datePast,
+      },
     },
     details: {
       message: '',
@@ -178,6 +184,7 @@ SubscriptionResolver.prototype.resolve = function (options) {
     // Set days left
     if (resolved.trial.active) {
       resolved.trial.daysLeft = Math.abs(resolved.expires.timestamp.diff(options.today, 'days'));
+      resolved.trial.expires.timestamp = moment(resolved.start.timestamp).add(14, 'days');
     }
 
     // Set expiration
@@ -240,6 +247,9 @@ SubscriptionResolver.prototype.resolve = function (options) {
   resolved.cancelled.timestampUNIX = resolved.cancelled.timestamp.unix();
   resolved.cancelled.timestamp = resolved.cancelled.timestamp.toISOString();
 
+  resolved.trial.expires.timestampUNIX = resolved.trial.expires.timestamp.unix();
+  resolved.trial.expires.timestamp = resolved.trial.expires.timestamp.toISOString();
+
   // Fix trial days
   resolved.trial.daysLeft = resolved.trial.daysLeft < 0 ? 0 : resolved.trial.daysLeft;
 

package/src/manager/index.js

@@ -730,6 +730,47 @@ Manager.prototype.storage = function (options) {
   return self._internal.storage[options.name]
 };
 
+Manager.prototype.install = function (controller, options) {
+  const self = this;
+
+  // Set options defaults
+  options = options || {};
+  options.prefix = typeof options.prefix === 'undefined' ? null : options.prefix;
+  options.dir = typeof options.dir === 'undefined' ? '' : options.dir;
+  options.log = typeof options.log === 'undefined' ? false : options.log;
+
+  // Fix dir
+  options.dir = path.resolve(self.cwd, options.dir);
+
+  // If dir is a single file, install it. if its a directory, install all
+  const isDirectory = jetpack.exists(options.dir) === 'dir';
+
+  if (options.log) {
+    self.assistant.log(`Installing from ${options.dir}, prefix=${options.prefix}, isDirectory=${isDirectory}...`);
+  }
+
+  function _install(prefix, file) {
+    if (!file.includes('.js')) {return}
+    const name = file.replace('.js', '');
+    const _prefix = prefix ? `${prefix}_${name}` : name;
+
+    const fullPath = path.resolve(options.dir, file);
+
+    if (options.log) {
+      self.assistant.log(`Installing ${_prefix} from ${fullPath}...`);
+    }
+
+    controller[`${_prefix}`] = require(fullPath);
+  }
+
+  if (isDirectory) {
+    jetpack.list(options.dir)
+    .forEach(file => _install(options.prefix, file))
+  } else {
+    _install(options.prefix, options.dir);
+  }
+};
+
 Manager.prototype.require = function (p) {
   return require(p);
 };