backend-manager 3.2.137 → 3.2.138

package/package.json

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

package/src/cli/cli.js

@@ -1284,7 +1284,7 @@ async function cmd_configSet(self, newPath, newValue) {
     } catch (e) {
     }
 
-    const isObject = typeof object === 'object';
+    const isObject = object && typeof object === 'object';
 
     // If it's a string, ensure some things
     if (!isObject) {

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

@@ -60,10 +60,16 @@ Module.prototype.main = function () {
 
       // Fix required values
       payload.data.payload.url = payload.data.payload.url
-        // Replace /blog/ (slashes may or may not be present)
+        // Replace blog/
         .replace(/blog\//ig, '')
         // Remove leading and trailing slashes
-        .replace(/^\/|\/$/g, '');
+        .replace(/^\/|\/$/g, '')
+        // Replace anything that's not a letter or number with a hyphen
+        .replace(/[^a-zA-Z0-9]/g, '-')
+        // Remove multiple hyphens
+        .replace(/-+/g, '-')
+        // Lowercase
+        .toLowerCase();
 
       // Fix body
       payload.data.payload.body = payload.data.payload.body

package/src/manager/functions/core/cron/daily/ghostii-auto-publisher.js

@@ -108,16 +108,29 @@ Module.prototype.harvest = function (settings) {
       });
 
       // Log
-      assistant.log('Get final content', final);
+      assistant.log('harvest(): Get final content', final);
 
       // Request to Ghostii
-      const result = await self.requestGhostii(final).catch((e) => e);
-      if (result instanceof Error) {
-        assistant.error(`harvest(): Error requesting Ghostii`, result);
+      const article = await self.requestGhostii(final).catch((e) => e);
+      if (article instanceof Error) {
+        assistant.error(`harvest(): Error requesting Ghostii`, article);
 
         break;
       }
 
+      // Log
+      assistant.log(`harvest(): Article`, article);
+
+      // Upload post to blog
+      const uploadedPost = await self.uploadPost(article).catch((e) => e);
+      if (uploadedPost instanceof Error) {
+        assistant.error(`harvest(): Error uploading post to blog`, uploadedPost);
+
+        break;
+      }
+
+      // Log
+      assistant.log(`harvest(): Uploaded post`, uploadedPost);
     }
 
     // Log
@@ -209,17 +222,71 @@ Module.prototype.requestGhostii = function (content) {
     // Fetch URL
     fetch('https://api.ghostii.ai/write/article', {
       method: 'post',
-      timeout: 30000,
-      tries: 3,
+      timeout: 90000,
+      tries: 1,
       response: 'json',
       body: {
+        backendManagerKey: Manager.config.backend_manager.key,
         keywords: [''],
         description: content,
+        insertLinks: true,
       },
     })
-    .then((r) => {
-      return resolve(r);
+    .then((r) => resolve(r))
+    .catch((e) => reject(e));
+  });
+}
+
+Module.prototype.uploadPost = function (article) {
+  const self = this;
+
+  // Shortcuts
+  const Manager = self.Manager;
+  const libraries = self.libraries;
+  const assistant = self.assistant;
+  const context = self.context;
+
+  return new Promise(async function(resolve, reject) {
+    // request.body.command = 'admin:create-post';
+    // request.body.payload = {
+    //   title: data.payload.postTitle,
+    //   url: data.formatted.path,
+    //   excerpt: data.payload.postExcerpt,
+    //   headerImageURL: data.payload.postHeaderImageUrl,
+    //   body: data.payload.postBody,
+    //   id: self.postId++,
+    //   author: 'alex',
+    //   // affiliate: '',
+    //   // tags: 'tag, tag2, tag3',
+    //   // categories: 'marketing, business',
+    //   githubUser: app.github.user,
+    //   githubRepo: app.github.repo,
+    // }
+
+
+    // Fetch URL
+    fetch(`${self.appObject.server}/bm_api`, {
+      method: 'post',
+      timeout: 90000,
+      tries: 1,
+      response: 'json',
+      body: {
+        backendManagerKey: Manager.config.backend_manager.key,
+        command: '',
+        payload: {
+          title: article.title,
+          url: article.title, // This is formatted on the bm_api endpoint
+          excerpt: article.description,
+          headerImageURL: article.headerImageUrl,
+          body: article.body,
+          id: self.postId++,
+          author: 'alex',
+          githubUser: self.appObject.github.user,
+          githubRepo: self.appObject.github.repo,
+        },
+      },
     })
+    .then((r) => resolve(r))
     .catch((e) => reject(e));
   });
 }

package/src/manager/index.js

@@ -67,7 +67,7 @@ Manager.prototype.init = function (exporter, options) {
   options.uniqueAppName = options.uniqueAppName || undefined;
   options.assistant = options.assistant || {};
   options.cwd = typeof options.cwd === 'undefined' ? process.cwd() : options.cwd;
-  options.projectPackagePath = typeof options.projectPackagePath === 'undefined' ? undefined : options.projectPackagePath;
+  options.projectPackageDirectory = typeof options.projectPackageDirectory === 'undefined' ? undefined : options.projectPackageDirectory;
   // options.assistant.optionsLogString = options.assistant.optionsLogString || undefined;
 
   // Load libraries
@@ -99,7 +99,7 @@ Manager.prototype.init = function (exporter, options) {
   self.project.backendManagerConfigPath = path.resolve(self.cwd, options.backendManagerConfigPath);
 
   // Load package.json
-  self.package = resolveProjectPackage(options.projectPackagePath || self.cwd);
+  self.package = resolveProjectPackage(options.projectPackageDirectory || self.cwd);
 
   // Load config
   self.config = merge(
@@ -206,7 +206,7 @@ Manager.prototype.init = function (exporter, options) {
   if (self.options.initialize) {
     // Initialize Firebase
     try {
-      // console.log('---process.env.GOOGLE_APPLICATION_CREDENTIALS', process.env.GOOGLE_APPLICATION_CREDENTIALS);
+      // Initialize Firebase
       if (process.env.GOOGLE_APPLICATION_CREDENTIALS) {
         self.libraries.initializedAdmin = self.libraries.admin.initializeApp();
       } else {
@@ -254,9 +254,9 @@ Manager.prototype.init = function (exporter, options) {
 
   // Set dotenv
   try {
-    require('dotenv').config();
+    const env = require('dotenv').config();
   } catch (e) {
-    self.assistant.error(new Error('Failed to set up environment variables from .env file'));
+    self.assistant.error(new Error(`Failed to set up environment variables from .env file: ${e.message}`));
   }
 
   // Setup LocalDatabase
@@ -555,6 +555,19 @@ Manager.prototype.storage = function (options) {
   return self._internal.storage[options.name]
 };
 
+Manager.prototype.getCustomServer = function () {
+  const self = this;
+
+  if (!self._internal.server || !self._internal.app) {
+    throw new Error('Server not set up');
+  }
+
+  return {
+    server: self._internal.server,
+    app: self._internal.app,
+  };
+};
+
 Manager.prototype.install = function (controller, options) {
   const self = this;
 
@@ -857,7 +870,7 @@ Manager.prototype.setupCustomServer = function (_library, options) {
   //   // querystringParser: str => querystring.parse(str.toLowerCase())
   // });
 
-  //
+  // Setup express
   const app = require('express')({
     logger: true,
     // querystringParser: str => querystring.parse(str.toLowerCase())
@@ -980,6 +993,10 @@ Manager.prototype.setupCustomServer = function (_library, options) {
       self.assistant.log(`Server listening on ${address.address}:${address.port}`);
     }
 
+    // Set server and app to internal
+    self._internal.server = server;
+    self._internal.app = app;
+
     // Emit event
     self.emit('online', new Event('online'), server, app);
   });