backend-manager 3.2.61 → 3.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.61",
+  "version": "3.2.63",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -41,7 +41,7 @@
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
-    "dotenv": "^16.4.4",
+    "dotenv": "^16.4.5",
     "firebase-admin": "^11.11.1",
     "firebase-functions": "^4.7.0",
     "fs-jetpack": "^5.1.0",
@@ -65,7 +65,7 @@
     "shortid": "^2.2.16",
     "sizeitup": "^1.0.7",
     "uid-generator": "^2.0.0",
-    "ultimate-jekyll-poster": "^0.0.15",
+    "ultimate-jekyll-poster": "^1.0.0",
     "uuid": "^9.0.1",
     "wonderful-fetch": "^1.1.1",
     "wonderful-log": "^1.0.5",

package/src/manager/functions/core/actions/api/admin/create-post.js

@@ -49,18 +49,19 @@ Module.prototype.main = function () {
     }
 
     // Request indexing
-    try {
-      const url = get(self.Manager.config, 'brand.url');
-      const encoded = encodeURIComponent(`${url}/sitemap.xml`);
-
-      wonderfulFetch(`https://www.google.com/ping?sitemap=${encoded}`)
-
-      // TODO
-      // https://developers.google.com/search/apis/indexing-api/v3/prereqs
-      // https://developers.google.com/search/apis/indexing-api/v3/using-api#url
-    } catch (e) {
-      assistant.error(`Failed to ping google: ${e}`);
-    }
+    // DEPRECATED
+    // try {
+    //   const url = get(self.Manager.config, 'brand.url');
+    //   const encoded = encodeURIComponent(`${url}/sitemap.xml`);
+
+    //   wonderfulFetch(`https://www.google.com/ping?sitemap=${encoded}`)
+
+    //   // TODO
+    //   // https://developers.google.com/search/apis/indexing-api/v3/prereqs
+    //   // https://developers.google.com/search/apis/indexing-api/v3/using-api#url
+    // } catch (e) {
+    //   assistant.error(`Failed to ping google: ${e}`);
+    // }
 
     // Save post OR commit
     await createFile(get(self.Manager.config, 'github.user'), repoInfo.user, repoInfo.name, get(self.Manager.config, 'github.key'), poster.removeDirDot(finalPost.path), finalPost.content)

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

@@ -168,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

@@ -1,9 +1,12 @@
 let nanoId;
+let _;
 
 function Utilities(Manager) {
   const self = this;
 
-  self.cache = null;
+  _ = require('lodash');
+
+  self.cache = {};
 
   self.Manager = Manager;
 }
@@ -192,53 +195,64 @@ Utilities.prototype.get = function (docPath, options) {
     const Manager = self.Manager;
     const { admin } = Manager.libraries;
 
+    // Set defaults
     options = 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();
+    // Check cache
+    const item = _.get(self.cache, docPath, null)
     const age = item ? Date.now() - item.time : null;
 
+    // Format
+    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()
         .then(async (doc) => {
           const data = doc.data();
 
+          // Set cache
           if (data) {
-            self.cache.set(docPath, {
+            _.set(self.cache, docPath, {
               doc: doc,
               time: Date.now(),
             })
-            .write();
           }
 
-          return resolve(doc);
+          // Return
+          return resolve(_format(doc));
         })
-        .catch(e => reject(e));
+        .catch((e) => reject(e));
     }
   });
 };