Let e18 find message (if set)

vtfk · Jan 18, 2022 · a73a370 · a73a370
1 parent 5700ac6
commit a73a370
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/Archive/index.js b/Archive/index.js
@@ -50,12 +50,8 @@ module.exports = async (context, req) => {
     await roadRunner(e18, { status: 'completed', data: result }, context)
     return getResponseObject(result)
   } catch (error) {
-    if (error.response && error.response.data) {
-      const { data } = error.response
-      await roadRunner(e18, { status: 'failed', error: data, message: data.message }, context)
-    } else {
-      await roadRunner(e18, { status: 'failed', error, message: error.message }, context)
-    }
+    const data = error.response?.data || error instanceof HTTPError ? error.toJSON() : error
+    await roadRunner(e18, { status: 'failed', error: data }, context)
 
     if (error instanceof HTTPError) {
       logger('error', [error.message])

diff --git a/SyncElevmappe/index.js b/SyncElevmappe/index.js
@@ -53,12 +53,8 @@ module.exports = async function (context, req) {
     await roadRunner(e18, { status: 'completed', data: result }, context)
     return getResponseObject(result)
   } catch (error) {
-    if (error.response && error.response.data) {
-      const { data } = error.response
-      await roadRunner(e18, { status: 'failed', error: data, message: data.message }, context)
-    } else {
-      await roadRunner(e18, { status: 'failed', error, message: error.message }, context)
-    }
+    const data = error.response?.data || error instanceof HTTPError ? error.toJSON() : error
+    await roadRunner(e18, { status: 'failed', error: data }, context)
 
     if (error instanceof HTTPError) {
       logger('error', [error.message])

diff --git a/SyncPrivatePerson/index.js b/SyncPrivatePerson/index.js
@@ -44,12 +44,8 @@ module.exports = async function (context, req) {
     await roadRunner(e18, { status: 'completed', data: result }, context)
     return getResponseObject(result)
   } catch (error) {
-    if (error.response && error.response.data) {
-      const { data } = error.response
-      await roadRunner(e18, { status: 'failed', error: data, message: data.message }, context)
-    } else {
-      await roadRunner(e18, { status: 'failed', error, message: error.message }, context)
-    }
+    const data = error.response?.data || error instanceof HTTPError ? error.toJSON() : error
+    await roadRunner(e18, { status: 'failed', error: data }, context)
 
     if (error instanceof HTTPError) {
       logger('error', [error.message])

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "/~https://github.com/vtfk/azf-archive#readme",
   "dependencies": {
-    "@vtfk/e18": "1.2.1",
+    "@vtfk/e18": "1.2.2",
     "@vtfk/logger": "4.0.1",
     "@vtfk/p360": "1.1.5",
     "axios": "0.24.0",