delivery-tracker - npm Package Compare versions

Comparing version 2.7.2 to 2.7.3

CHANGELOG.md

@@ -0,1 +1,4 @@
+# 2.7.3
+* fixed an issue in USPS is not working
+
 # 2.7.2
@@ -2,0 +5,0 @@ * fixed an issue in JNT is not working

lib/courier/usps.js

@@ -25,53 +25,36 @@ 'use strict'
       courier: courier,
-      number: $('input[name=label]').val(),
+      number: $('input[name=label]').val().trim(),
       status: tracker.STATUS.PENDING
     }
-    var toText = function (txt) {
-      if (!txt) {
-        return ''
-      }
-      return $(txt.indexOf('<span>') !== -1 ? txt : '<span>' + txt + '</span>').text().trim()
-    }
 
     var checkpoints = []
+    var $history = $('.tracking-progress-bar-status-container').find('.tb-step')
 
-    var $history = $('#trackingHistory_1').find('.panel-actions-content')
-    $('.mobileOnly').remove()
-
-    // html -> txt
-    var rawTxt = $history.html()
-    if (!rawTxt) {
-      return false
-    }
-    rawTxt = rawTxt.replace(/\s+/g, ' ')
-    // txt -> history list
-    var rawList = rawTxt.split('<hr>')
-    for (var i = 0; i < rawList.length; i++) {
-      var list = rawList[i].split('<br>')
-      if (list.length <= 3) {
-        continue
+    $history.each((index, element) => {
+      if (
+        element.attribs &&
+        (element.attribs.class || '').indexOf('toggle-history-container') !== -1
+      ) {
+        return
       }
-      var time = $(list[0]).text().trim()
-      var statusMessage = toText(list[1])
-      var location = toText(list[2])
-      var message = [statusMessage]
 
-      if ((list[3] || '').trim().length > 0) {
-        message.push(toText(list[3]))
-      }
-
       var checkpoint = {
         courier: courier,
-        location: location,
-        message: message.join(' - '),
+        location: $(element).find('.tb-location').text().trim(),
+        message: $(element).find('.tb-status-detail').text(),
         status: tracker.STATUS.IN_TRANSIT,
         // November 17, 2017, 3:08 pm
-        time: moment(time, 'MMMM DD, YYYY, hh:mm a').format('YYYY-MM-DDTHH:mm')
+        time: moment(
+          $(element).find('.tb-date').text().trim(),
+          'MMMM DD, YYYY, hh:mm a'
+        ).format('YYYY-MM-DDTHH:mm')
       }
 
-      checkpoint.message.indexOf('Shipping Label Created') !== -1 && (checkpoint.status = tracker.STATUS.INFO_RECEIVED)
-      checkpoint.message.indexOf('Delivered') !== -1 && (checkpoint.status = tracker.STATUS.DELIVERED)
+      checkpoint.message.indexOf('Shipping Label Created') !== -1 &&
+        (checkpoint.status = tracker.STATUS.INFO_RECEIVED)
+      checkpoint.message.indexOf('Delivered') !== -1 &&
+        (checkpoint.status = tracker.STATUS.DELIVERED)
 
       checkpoints.push(checkpoint)
-    }
+    })
 
@@ -90,5 +73,3 @@ result.checkpoints = checkpoints
       var tracking = trackingInfo(number)
-      request.get({
-        url: tracking.url
-      }, function (err, res, body) {
+      request.get({ url: tracking.url }, function (err, res, body) {
         if (err) {
@@ -100,3 +81,6 @@ return cb(err)
           var result = parser.trace(body)
-          cb(result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER), result)
+          cb(
+            result ? null : tracker.error(tracker.ERROR.INVALID_NUMBER),
+            result
+          )
         } catch (e) {
@@ -103,0 +87,0 @@ cb(tracker.error(e.message))

package.json

 {
   "name": "delivery-tracker",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "author": {
@@ -5,0 +5,0 @@ "name": "egg",

README.md

@@ -51,3 +51,3 @@ # delivery-tracker
 
-courier.trace({trace_number}, function (err, result) {
+courier.trace('TRACE_NUMBER', function (err, result) {
   console.log(result)
@@ -54,0 +54,0 @@ })

No alert changes

Worsened metrics

Total package byte prevSize

87493

decreased by-0.44%

Lines of code

2478

decreased by-0.56%

No dependency changes