backend-manager 3.2.60 → 3.2.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.60",
+  "version": "3.2.62",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -71,4 +71,4 @@
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }
-}
+}

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

@@ -73,6 +73,8 @@ Module.prototype.clearFirestore = function() {
   const assistant = self.assistant;
   const context = self.context;
 
+  const { admin } = libraries;
+
   return new Promise(async function(resolve, reject) {
     // Log status
     assistant.log(`cron/daily/reset-usage() [firestore]: Starting...`);
@@ -166,7 +168,7 @@ Module.prototype.clearFirestore = function() {
     // Clear temporary/usage in firestore by deleting the doc
     admin.firestore().collection('temporary').listDocuments()
     .then((snap) => {
-      const chunks = []
+      const chunks = [];
       for (let i = 0; i < snap.length; i += 500) {
         chunks.push(snap.slice(i, i + 500))
       }

package/src/manager/helpers/utilities.js

@@ -196,32 +196,41 @@ Utilities.prototype.get = function (docPath, options) {
     options.maxAge = options.maxAge || (1000 * 60 * 5); // 5 minutes
     options.readTime = typeof options.readTime === 'undefined' ? null : options.readTime;
     options.log = typeof options.log === 'undefined' ? false : options.log;
+    options.format = typeof options.format === 'undefined' ? 'raw' : options.format;
 
     self.cache = self.cache || Manager.storage({name: 'cache', temporary: true, clear: false});
 
     const item = self.cache.get(docPath).value();
     const age = item ? Date.now() - item.time : null;
 
+    function _format(doc) {
+      if (options.format === 'raw') {
+        return doc;
+      } else if (options.format === 'data') {
+        return doc.data();
+      }
+    }
+
+    // Log
     if (options.readTime) {
       const { Timestamp } = require('firebase-admin/firestore')
       const time = Math.round(new Date(options.readTime).getTime() / 1000 / 60);
-      const logg = new Date(time * 1000 * 60);
+      const timeLog = new Date(time * 1000 * 60);
 
+      // Log
       if (options.log) {
-        console.log('Read time:', logg);
+        console.log('Read time:', timeLog);
       }
 
-      // loop docs
+      // Loop docs
       admin.firestore().runTransaction(
         updateFunction => updateFunction.get(admin.firestore().doc(docPath)),
         {readOnly: true, readTime: new Timestamp(time * 60, 0)}
       )
-      .then(snap => {
-        return resolve(snap);
-      })
-      .catch(e => reject(e));
+      .then((snap) => resolve(_format(snap)))
+      .catch((e) => reject(e));
     } else if (item && age && age < options.maxAge) {
-      return resolve(item.doc);
+      return resolve(_format(item.doc));
     } else {
       admin.firestore().doc(docPath)
         .get()
@@ -236,9 +245,9 @@ Utilities.prototype.get = function (docPath, options) {
             .write();
           }
 
-          return resolve(doc);
+          return resolve(_format(doc));
         })
-        .catch(e => reject(e));
+        .catch((e) => reject(e));
     }
   });
 };