backend-manager 3.2.62 → 3.2.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.62",
+  "version": "3.2.64",
   "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

@@ -21,16 +21,23 @@ Module.prototype.main = function () {
       return reject(assistant.errorify(`Admin required.`, {code: 401}));
     }
 
+    // Get repo info
     const repoInfo = assistant.parseRepo(get(self.Manager.config, 'github.repo_website'));
-
     const poster = new Poster();
 
+    assistant.log(`main(): Creating post...`, repoInfo);
+
     // Save to disk OR commit
     poster.onDownload = function (meta) {
       return new Promise(async function(resolve, reject) {
         const tempPath = (meta.tempPath);
         const finalPath = poster.removeDirDot(meta.finalPath);
 
+        // Log
+        assistant.log(`onDownload(): tempPath`, tempPath);
+        assistant.log(`onDownload(): finalPath`, finalPath);
+
+        // Save to disk
         poster.readImage(tempPath)
           .then(image => {
             createFile(get(self.Manager.config, 'github.user'), repoInfo.user, repoInfo.name, get(self.Manager.config, 'github.key'), finalPath, image)
@@ -42,28 +49,34 @@ Module.prototype.main = function () {
       });
     }
 
+    // Create post
     const finalPost = await poster.create(payload.data).catch(e => e);
-
     if (finalPost instanceof Error) {
       return reject(assistant.errorify(`Failed to post: ${finalPost}`, {code: 500}));
     }
 
     // Request indexing
-    try {
-      const url = get(self.Manager.config, 'brand.url');
-      const encoded = encodeURIComponent(`${url}/sitemap.xml`);
+    // DEPRECATED
+    // try {
+    //   const url = get(self.Manager.config, 'brand.url');
+    //   const encoded = encodeURIComponent(`${url}/sitemap.xml`);
 
-      wonderfulFetch(`https://www.google.com/ping?sitemap=${encoded}`)
+    //   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}`);
-    }
+    //   // 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)
+    const githubUser = get(self.Manager.config, 'github.user');
+    const githubKey = get(self.Manager.config, 'github.key');
+    const filePath = poster.removeDirDot(finalPost.path);
+    const fileContent = finalPost.content;
+
+    await createFile(githubUser, repoInfo.user, repoInfo.name, githubKey, filePath, fileContent)
     .then(() => {
       return resolve({data: finalPost});
     })
@@ -76,19 +89,30 @@ Module.prototype.main = function () {
 };
 
 // HELPERS //
-async function createFile(user, repoUser, repoName, key, path, contents) {
-  let fileParsed = pathApi.parse(path);
+Module.prototype.createFile = function (user, repoUser, repoName, key, path, contents) {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
 
-  let base64Data = Buffer.from(contents).toString('base64');
-  // base64Data = contents;
-  // console.log('--------base64Data', base64Data);
   return new Promise(async (resolve, reject) => {
+    let fileParsed = pathApi.parse(path);
+    let base64Data = Buffer.from(contents).toString('base64');
     let sha;
-    try {
 
-      let branch = (repoName === 'ultimate-jekyll') ? 'template' : 'master';
+    // Log
+    assistant.log(`createFile(): Writing file to ${repoUser}/${repoName}/${path}`);
 
+    // Try to get sha
+    try {
+      let branch = repoName === 'ultimate-jekyll' ? 'template' : 'master';
       let pathGet = `https://api.github.com/repos/${repoUser}/${repoName}/git/trees/${branch}:${encodeURIComponent(pathApi.dirname(path))}`;
+
+      // Log
+      assistant.log(`createFile(): pathGet`, pathGet);
+
+      // Make request
       await makeRequest({
         method: 'GET',
         url: pathGet,
@@ -115,8 +139,7 @@ async function createFile(user, repoUser, repoName, key, path, contents) {
   }
 
   let pathPut = `https://api.github.com/repos/${repoUser}/${repoName}/contents/${path}`;
-  let writeRequest =
-  {
+  let writeRequest = {
     // url: `https://api.github.com/repos/:owner/:repo/contents/:path`,
     method: 'PUT',
     url: pathPut,
@@ -132,10 +155,16 @@ async function createFile(user, repoUser, repoName, key, path, contents) {
       'Authorization': `Basic ${Buffer.from(user + ':' + key).toString('base64')}`,
     }
   }
+
+  // Log
+  assistant.log(`createFile(): pathPut`, pathPut);
+
+  // Add sha if it exists
   if (sha) {
     writeRequest.body.sha = sha;
   }
-  // console.log('--------PUT', pathPut);
+
+  // Make request
   await makeRequest(writeRequest)
   .then((json) => {
     if (!json || (json.message && (json.message === 'Not Found' || json.message.includes('Invalid request'))) ) {

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,17 +195,18 @@ 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;
@@ -237,14 +241,15 @@ Utilities.prototype.get = function (docPath, options) {
         .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
           return resolve(_format(doc));
         })
         .catch((e) => reject(e));