change the error type when an unexpected error occurs. (string -> obj…

…ect)
egg- · Nov 5, 2020 · ca3fb9d · ca3fb9d
1 parent 294b593
commit ca3fb9d
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.5.1
+* change the error type when an unexpected error occurs. (string -> object)
+
 # 2.5.0
 * add j&t express
 

diff --git a/lib/courier/airbridge.js b/lib/courier/airbridge.js
@@ -84,7 +84,7 @@ module.exports = function (opts) {
           var result = parser.trace(body, number)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/auspost.js b/lib/courier/auspost.js
@@ -87,7 +87,7 @@ module.exports = function (opts) {
           var results = parser.trace(body.QueryTrackEventsResponse.TrackingResults)
           cb(results[0] ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), results[0])
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/cesco.js b/lib/courier/cesco.js
@@ -109,7 +109,7 @@ module.exports = function (opts) {
           result.number = number
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/cjkoreaexpress.js b/lib/courier/cjkoreaexpress.js
@@ -93,7 +93,7 @@ module.exports = function (opts) {
             var result = parser.trace(body)
             cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
           } catch (e) {
-            cb(e.message)
+            cb(tracker.error(e.message))
           }
         })
       })

diff --git a/lib/courier/ecargo.js b/lib/courier/ecargo.js
@@ -87,7 +87,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/efs.js b/lib/courier/efs.js
@@ -93,7 +93,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/fedex.js b/lib/courier/fedex.js
@@ -102,7 +102,7 @@ module.exports = function (opts) {
           var results = parser.trace(body.TrackPackagesResponse.packageList)
           cb(null, results[0])
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/jnt.js b/lib/courier/jnt.js
@@ -74,7 +74,7 @@ module.exports = function () {
           var result = parser.trace(JSON.parse(body.data))
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/kerrythai.js b/lib/courier/kerrythai.js
@@ -71,7 +71,7 @@ module.exports = function () {
           var result = parser.trace(body, number)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/koreapost.js b/lib/courier/koreapost.js
@@ -147,7 +147,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/lbc.js b/lib/courier/lbc.js
@@ -94,7 +94,7 @@ module.exports = function () {
             var result = parser.trace(body, number)
             cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
           } catch (e) {
-            cb(e.message)
+            cb(tracker.error(e.message))
           }
         })
       })

diff --git a/lib/courier/poslaju.js b/lib/courier/poslaju.js
@@ -78,7 +78,7 @@ module.exports = function (opts) {
           try {
             parser.trace(body, cb)
           } catch (e) {
-            cb(e.message)
+            cb(tracker.error(e.message))
           }
         }
       ], cb)

diff --git a/lib/courier/rincos.js b/lib/courier/rincos.js
@@ -92,7 +92,7 @@ module.exports = function (opts) {
           try {
             parser.trace(body, cb)
           } catch (e) {
-            cb(e.message)
+            cb(tracker.error(e.message))
           }
         }
       ], cb)

diff --git a/lib/courier/royalmail.js b/lib/courier/royalmail.js
@@ -76,7 +76,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/sicepat.js b/lib/courier/sicepat.js
@@ -175,7 +175,7 @@ module.exports = function (opts) {
           var result = handler.parser.trace(body, number)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/tnt.js b/lib/courier/tnt.js
@@ -86,7 +86,7 @@ module.exports = function (opts) {
           var result = parser.trace(output, number)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/usps.js b/lib/courier/usps.js
@@ -97,7 +97,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/xioexpress.js b/lib/courier/xioexpress.js
@@ -78,7 +78,7 @@ module.exports = function (opts) {
           var result = parser.trace(body, number)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/lib/courier/yelloexpress.js b/lib/courier/yelloexpress.js
@@ -104,7 +104,7 @@ module.exports = function (opts) {
           var result = parser.trace(body)
           cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
         } catch (e) {
-          cb(e.message)
+          cb(tracker.error(e.message))
         }
       })
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "delivery-tracker",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "author": {
     "name": "egg",
     "email": "[email protected]"