From bd221d590971808368fc1b8f0692c9c364cdb8f0 Mon Sep 17 00:00:00 2001
From: TheEssem <smswessem@gmail.com>
Date: Tue, 1 Jun 2021 20:27:28 -0500
Subject: [PATCH] Make command error logs more verbose, image server
 connection/job error handling changes

---
 events/messageCreate.js | 2 +-
 utils/image.js          | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/events/messageCreate.js b/events/messageCreate.js
index b3f8d66..3b09abb 100644
--- a/events/messageCreate.js
+++ b/events/messageCreate.js
@@ -144,7 +144,7 @@ module.exports = async (client, cluster, ipc, message) => {
         content: "The request timed out before I could download that image. Try uploading your image somewhere else or reducing its size."
       }, reference));
     } else {
-      logger.error(error.toString());
+      logger.error(`Error occurred with command message ${message.cleanContent}: ${error.toString()}`);
       try {
         await client.createMessage(message.channel.id, Object.assign({
           content: "Uh oh! I ran into an error while running this command. Please report the content of the attached file at the following link or on the esmBot Support server: <https://github.com/esmBot/esmBot/issues>"
diff --git a/utils/image.js b/utils/image.js
index 2c7adbe..6d4ffc8 100644
--- a/utils/image.js
+++ b/utils/image.js
@@ -199,14 +199,15 @@ const start = (object, num) => {
         }
       });
     });
+  }).catch((result) => {
+    throw result;
   }).then((addr) => {
     const event = new EventEmitter();
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       event.once("uuid", (uuid) => resolve({ event, uuid, addr }));
+      event.once("error", reject);
       this.jobs[num] = { event, addr };
     });
-  }, (result) => {
-    throw result;
   }).then(data => {
     delete this.jobs[num];
     this.jobs[data.uuid] = { event: data.event, addr: data.addr };
@@ -286,6 +287,7 @@ exports.run = object => {
           resolve(payload);
         });
         data.event.once("error", (err) => {
+          delete this.jobs[data.uuid];
           reject(err);
         });
         return;