hk-bus-eta 1.3.5 → 1.4.0

package/Lrtfeeder.js

@@ -17,12 +17,14 @@ module.exports = {
     .then(({busStop}) => 
       busStop.filter(({busStopId}) => busStopId === stopId)
       .reduce((ret, {bus: buses}) => ([...ret, ...buses.reduce( (etas, bus) => {
-        const etaDate = new Date(Date.now() + parseInt(bus.arrivalTimeInSecond === "108000" ? bus.departureTimeInSecond : bus.arrivalTimeInSecond, 10) * 1000);
+        // hackily use +8 hours and use UTC hour to resolve timezone issue
+        const etaDate = new Date(Date.now() + parseInt(bus.arrivalTimeInSecond === "108000" ? bus.departureTimeInSecond : bus.arrivalTimeInSecond, 10) * 1000 + 8 * 3600000);
+
         return [
           ...etas,
           {
-            eta: `${etaDate.getFullYear()}-${`0${etaDate.getMonth() + 1}`.slice(-2)}-${`0${etaDate.getDate()}`.slice(-2)}`
-                +`T${`0${etaDate.getHours()}`.slice(-2)}:${`0${etaDate.getMinutes()}`.slice(-2)}:${`0${etaDate.getSeconds()}`.slice(-2)}+08:00`,
+            eta: `${etaDate.getUTCFullYear()}-${`0${etaDate.getUTCMonth() + 1}`.slice(-2)}-${`0${etaDate.getUTCDate()}`.slice(-2)}`
+                +`T${`0${etaDate.getUTCHours()}`.slice(-2)}:${`0${etaDate.getMinutes()}`.slice(-2)}:${`0${etaDate.getSeconds()}`.slice(-2)}+08:00`,
             remark: {
               [language]: bus.busRemark || ( bus.isScheduled === "1" ? ( language === "en" ? "Scheduled" : "預定班次" ) : "" )
             },

package/Nlb.js

@@ -18,8 +18,9 @@ module.exports = {
       response => response.json()
     ).then(({estimatedArrivals}) => {
       if ( !estimatedArrivals ) return []
+      
       return estimatedArrivals.filter(eta => eta.estimatedArrivalTime).map(e => ({
-        eta: e.estimatedArrivalTime,
+        eta: e.estimatedArrivalTime.replace(' ', 'T') + '.000+08:00',
         remark: {
           zh: '',
           en: ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus",
   "main": "index.js",
   "scripts": {