backend-manager 2.0.18 → 2.0.21

package/package.json

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

package/src/manager/helpers/api-manager.js

@@ -13,9 +13,11 @@ let sampleUser = {
     }
   },
   authenticated: false,
-  _meta: {
-    lastStatsReset: new Date(),
-    lastUserFetch: new Date(),
+  _APIManager: {
+    meta: {
+      lastStatsReset: new Date(),
+      lastUserFetch: new Date(),
+    }
   }
 }
 
@@ -42,12 +44,13 @@ ApiManager.prototype.init = function (options) {
     options.plans = options.plans || {};
 
     // await self.Manager.libraries.admin.firestore
-    // options.plans.basic = options.plans.basic || {requests: 93};
+    // options.plans.basic = options.plans.basic || {requests: 100};
 
     options.maxUsersStored = options.maxUsersStored || 10000;
     options.refetchInterval = options.refetchInterval || 60;
     options.resetInterval = options.resetInterval || (60 * 24);
     options.officialAPIKeys = options.officialAPIKeys || [];
+    options.whitelistedAPIKeys = options.whitelistedAPIKeys || [];
 
     await fetch('https://us-central1-itw-creative-works.cloudfunctions.net/getApp', {
       method: 'POST',
@@ -86,11 +89,20 @@ ApiManager.prototype.init = function (options) {
   });
 };
 
-ApiManager.prototype._createNewUser = function (authenticatedUser, planId, persistentData, isRefetch) {
+ApiManager.prototype._createNewUser = function (authenticatedUser, planId, persistentData, isRefetch, apiKey) {
   const self = this;
+  const _APIManager_default = {
+    stats: {
+      requests: 0,
+    },
+    meta: {
+      lastStatsReset: new Date(),
+      lastUserFetch: new Date(),
+    },
+    providedAPIKey: apiKey,
+  }
   persistentData = persistentData || {};
-  persistentData._meta = persistentData._meta || {};
-  persistentData._stats = persistentData._stats || {};
+  persistentData._APIManager = persistentData._APIManager || merge({}, _APIManager_default);
 
   let newUser = {
     api: get(authenticatedUser, 'api', {}),
@@ -98,35 +110,43 @@ ApiManager.prototype._createNewUser = function (authenticatedUser, planId, persi
     plan: {
       id: planId,
       limits: {
-        requests: get(authenticatedUser, 'plan.limits.requests', get(self.options, `plans.${planId}.limits.requests`, 93)),
       }
     },
     authenticated: authenticatedUser.authenticated,
     ip: authenticatedUser.ip,
     country: authenticatedUser.country,
-    _stats: {
-      requests: 0,
-    },
-    _meta: {
-      lastStatsReset: new Date(),
-      lastUserFetch: new Date(),
-    }
+    _APIManager: merge({}, _APIManager_default),
   }
-  // console.log('-----MIN', moment().diff(moment(persistentData._meta.lastStatsReset), 'minutes', true), self.options.resetInterval);
-  if (moment().diff(moment(persistentData._meta.lastStatsReset), 'minutes', true) < self.options.resetInterval) {
-    newUser._meta.lastStatsReset = persistentData._meta.lastStatsReset || newUser._meta.lastStatsReset;
-    newUser._meta.lastUserFetch = persistentData._meta.lastUserFetch || newUser._meta.lastUserFetch;
-    Object.keys(persistentData._stats)
+
+  // Setup newUser
+  const currentPlan = get(self.options, `plans.${planId}.limits`, {})
+  Object.keys(currentPlan)
+  .forEach((id, i) => {
+    // console.log('----id', id);
+    // console.log('======currentPlan[id]', currentPlan[id]);
+    newUser.plan.limits[id] = get(authenticatedUser, `plan.limits.${id}`, currentPlan[id])
+    // const product = data.products[id]
+    // options.plans[product.planId] = {}
+    // options.plans[product.planId].limits = product.limits || {};
+  });
+
+
+
+  // console.log('-----MIN', moment().diff(moment(persistentData._APIManager.meta.lastStatsReset), 'minutes', true), self.options.resetInterval);
+  if (moment().diff(moment(persistentData._APIManager.meta.lastStatsReset), 'minutes', true) < self.options.resetInterval) {
+    newUser._APIManager.meta.lastStatsReset = persistentData._APIManager.meta.lastStatsReset || newUser._APIManager.meta.lastStatsReset;
+    newUser._APIManager.meta.lastUserFetch = persistentData._APIManager.meta.lastUserFetch || newUser._APIManager.meta.lastUserFetch;
+    Object.keys(persistentData._APIManager.stats)
     .forEach((key, i) => {
-      newUser._stats[key] = persistentData._stats[key];
+      newUser._APIManager.stats[key] = persistentData._APIManager.stats[key];
     });
   } else {
     // console.log('---RESSET INTERVAL REACHED');
-    newUser._meta.lastUserFetch = persistentData._meta.lastUserFetch;
+    newUser._APIManager.meta.lastUserFetch = persistentData._APIManager.meta.lastUserFetch;
   }
 
   if (isRefetch) {
-    newUser._meta.lastUserFetch = new Date();
+    newUser._APIManager.meta.lastUserFetch = new Date();
   }
 
   return newUser;
@@ -143,14 +163,14 @@ ApiManager.prototype.getUser = async function (assistant) {
   if (apiKey) {
     newUser = self.userList.filter(user => user.api.privateKey === apiKey);
     if (newUser[0]) {
-      if (newUser.length > 1 || moment().diff(moment(newUser[0]._meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
+      if (newUser.length > 1 || moment().diff(moment(newUser[0]._APIManager.meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
         // console.log('----REFETCHING');
-        persistentData = {set: true, _stats: merge({}, newUser[0]._stats), _meta: merge({}, newUser[0]._meta)};
+        persistentData = {set: true, _APIManager: merge({}, newUser[0]._APIManager)};
 
         self.userList = self.userList.filter(user => user.api.privateKey !== apiKey)
         newUser = null;
       } else {
-        persistentData = {set: true, _stats: merge({}, newUser[0]._stats), _meta: merge({}, newUser[0]._meta)};
+        persistentData = {set: true, _APIManager: merge({}, newUser[0]._APIManager)};
 
         newUser = newUser[0];
       }
@@ -176,20 +196,20 @@ ApiManager.prototype.getUser = async function (assistant) {
     let existingUser = self.userList.find(user => user.auth.uid === workingUID);
     if (existingUser) {
       // console.log('---actually does exist so setting');
-      // console.log('----1111 MIN lastUserFetch', moment().diff(moment(existingUser._meta.lastUserFetch), 'minutes', true), self.options.refetchInterval);
-      persistentData = !persistentData.set ? {set: true, _stats: merge({}, existingUser._stats), _meta: merge({}, existingUser._meta)} : persistentData;
+      // console.log('----1111 MIN lastUserFetch', moment().diff(moment(existingUser._APIManager.meta.lastUserFetch), 'minutes', true), self.options.refetchInterval);
+      persistentData = !persistentData.set ? {set: true, _APIManager: merge({}, existingUser._APIManager)} : persistentData;
       // console.log('----persistentData 2', persistentData);
-      if (moment().diff(moment(existingUser._meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
+      if (moment().diff(moment(existingUser._APIManager.meta.lastUserFetch), 'minutes', true) > self.options.refetchInterval) {
         // console.log('----REFETCHING');
         self.userList = self.userList.filter(user => user.auth.uid !== workingUID)
-        existingUser = self._createNewUser(authenticatedUser, planId, persistentData, true);
+        existingUser = self._createNewUser(authenticatedUser, planId, persistentData, true, apiKey);
         existingUser.auth.uid = workingUID;
         self.userList = self.userList.concat(existingUser);
       }
       newUser = existingUser
     } else {
       // console.log('---actually doesnt exist making new user');
-      newUser = self._createNewUser(authenticatedUser, planId, persistentData)
+      newUser = self._createNewUser(authenticatedUser, planId, persistentData, false, apiKey)
       newUser.auth.uid = workingUID;
       self.userList = self.userList.concat(newUser);
     }
@@ -201,27 +221,56 @@ ApiManager.prototype.getUser = async function (assistant) {
 
 };
 
-ApiManager.prototype.getUserStat = function (user, stat, def) {
+function _getUserStat(self, user, stat, def) {
+  const isWhitelistedAPIKey = self.options.whitelistedAPIKeys.includes(
+    get(user, `api.privateKey`, get(user, `_APIManager.providedAPIKey`))
+  );
+  // console.log('----user', user);
+  // console.log('----isWhitelistedAPIKey', isWhitelistedAPIKey);
+  return {
+    current: !isWhitelistedAPIKey ? get(user, `_APIManager.stats.${stat}`, typeof def !== 'undefined' ? def : 0) : 0,
+    limit: !isWhitelistedAPIKey ? get(user, `plan.limits.${stat}`, typeof def !== 'undefined' ? def : 0) : Infinity,
+  }
+}
+
+ApiManager.prototype.isUserOverStat = function (user, stat, def, frame) {
   const self = this;
   if (!user || !stat) {
     throw new Error('<user> and <stat> required')
   }
-  return {
-    current: get(user, `_stats.${stat}`, def || 0),
-    limit: get(user, `plan.limits.${stat}`, def || 0),
+  const result = self.getUserStat(user, stat, def);
+  frame = frame || 'daily';
+  let limit = result.limit;
+  // console.log('---result', result);
+  // console.log('---typeof result.current', typeof result.current);
+  // console.log('----limit', limit);
+  if (typeof result.limit === 'number') {
+    if (frame === 'daily') {
+      limit = Math.floor(result.limit / 31);
+    }
+    // console.log('----limit', limit);
+    // console.log('-----result.current < limit', result.current < limit);
+    return limit >= result.current;
   }
+
+  return false;
 }
 
-ApiManager.prototype.incrementUserStat = function (user, stat, amount) {
+ApiManager.prototype.getUserStat = function (user, stat, def, ) {
   const self = this;
   if (!user || !stat) {
     throw new Error('<user> and <stat> required')
   }
-  set(user, `_stats.${stat}`, get(user, `_stats.${stat}`, 0) + amount)
-  return {
-    current: get(user, `_stats.${stat}`, 0),
-    limit: get(user, `plan.limits.${stat}`, 0),
+  return _getUserStat(self, user, stat, def);
+}
+
+ApiManager.prototype.incrementUserStat = function (user, stat, amount) {
+  const self = this;
+  if (!user || !stat) {
+    throw new Error('<user> and <stat> required')
   }
+  set(user, `_APIManager.stats.${stat}`, get(user, `_APIManager.stats.${stat}`, 0) + amount)
+  return _getUserStat(self, user, stat, 0);
 }
 
 

package/src/manager/helpers/user.js

@@ -11,7 +11,7 @@ function User(settings, options) {
   options = options || {};
   let now = powertools.timestamp(new Date(), {output: 'string'});
   let nowUNIX = powertools.timestamp(now, {output: 'unix'});
-  let oldDate = powertools.timestamp(new Date('1999/01/01'), {output: 'string'})
+  let oldDate = powertools.timestamp(new Date(0), {output: 'string'})
   let oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
 
   const useDefaults = typeof options.defaults === 'undefined' ? true : options.defaults;
@@ -34,7 +34,7 @@ function User(settings, options) {
         timestampUNIX: _.get(settings, 'plan.expires.timestampUNIX', useDefaults ? oldDateUNIX : null),
       },
       limits: {
-        devices: _.get(settings, 'plan.limits.devices', useDefaults ? 1 : null),
+        // devices: _.get(settings, 'plan.limits.devices', null),
       },
       payment: {
         processor: _.get(settings, 'plan.payment.processor', null), // paypal | stripe | chargebee, etc