convert err obj into JSON stringifiable object + update error msg (#1376

)
AudiusProject · Apr 5, 2021 · d8f50b7 · d8f50b7
1 parent d9ae89b
commit d8f50b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/creator-node/src/apiHelpers.js b/creator-node/src/apiHelpers.js
@@ -114,6 +114,11 @@ const sendResponseWithHeartbeatTerminator =
       } else {
         logger.info('Error processing request:', resp.object.error)
       }
+
+      // Converts the error object into an object that JSON.stringify can parse
+      if (resp.object.error) {
+        resp.object.error = Object.getOwnPropertyNames(resp.object.error).reduce((acc, cur) => { acc[cur] = resp.object.error[cur]; return acc }, {})
+      }
     }
 
     // Construct the remainder of the JSON response

diff --git a/creator-node/src/routes/files.js b/creator-node/src/routes/files.js
@@ -411,7 +411,7 @@ module.exports = function (app) {
     // Ensure actual and expected dirCIDs match
     const expectedDirCID = ipfsAddRespArr[ipfsAddRespArr.length - 1].cid.toString()
     if (expectedDirCID !== dirCID) {
-      throw new Error(`Image file validation failed - dirCIDs do not match for dirCID ${dirCID}`)
+      throw new Error(`Image file validation failed - dirCIDs do not match for dirCID=${dirCID} expectedCID=${expectedDirCID}`)
     }
 
     // Record image file entries in DB

diff --git a/libs/src/services/creatorNode/index.js b/libs/src/services/creatorNode/index.js
@@ -679,13 +679,14 @@ class CreatorNode {
         }
       )
       if (resp.data && resp.data.error) {
-        throw new Error(resp.data.error)
+        throw new Error(JSON.stringify(resp.data.error))
       }
       onProgress(total, total)
       return resp.data
     } catch (e) {
       if (!e.response && retries > 0) {
-        console.log(`Network Error in request ${requestId} with ${retries} retries... retrying`)
+        console.warn(`Network Error in request ${requestId} with ${retries} retries... retrying`)
+        console.warn(e)
         return this._uploadFile(file, route, onProgress, extraFormDataOptions, retries - 1)
       }
       await this._handleErrorHelper(e, url, requestId)