hk-bus-eta 1.3.2 → 1.4.0

package/Ctb.js

@@ -1,8 +1,10 @@
+const utils = require('./utils');
+
 module.exports = {
   co: 'ctb',
   fetchEtas: ({stopId, route, bound }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/CTB/${stopId}/${route}`, {
-      cache: "reload"
+      cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
@@ -17,7 +19,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/CTB/${stopId}`, { 
-      cache: "reload"
+      cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({

package/Kmb.js

@@ -1,10 +1,11 @@
+const utils = require('./utils');
+
 module.exports = {
   co: 'kmb',
   fetchEtas: ({stopId, route, seq, serviceType, bound}) => (
-    fetch(
-      `https://data.etabus.gov.hk/v1/transport/kmb/eta/${stopId}/${route}/${serviceType}`,
-      { cache: "reload" }
-    ).then( response => response.json() )
+    fetch(`https://data.etabus.gov.hk/v1/transport/kmb/eta/${stopId}/${route}/${serviceType}`,{ 
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then( response => response.json() )
     .then(({data}) => data.filter(e => 
       e.dir === bound 
       && e.seq === seq + 1 // api return 1-based seq
@@ -20,7 +21,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { 
-      cache: "reload"
+      cache: utils.isSafari ? 'default' : 'no-store'
     })
     .then(response => response.json())
     .then(({data}) => data.map( e => ({

package/Lrtfeeder.js

@@ -1,9 +1,11 @@
+const utils = require('./utils');
+
 module.exports = {
   co: 'lrtfeeder',
   fetchEtas: ({stopId, route, language}) => (
     fetch(`https://rt.data.gov.hk/v1/transport/mtr/bus/getSchedule`, {
       method: "POST",
-      cache: "reload",
+      cache: utils.isSafari ? 'default' : 'no-store',
       headers: {
         'Content-Type': 'application/json'
       },
@@ -15,14 +17,16 @@ 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, 10) * 1000)
-        if ( bus.arrivalTimeInSecond === "108000" ) return [...etas];
+        // 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: new Date(etaDate.toString().split('GMT')[0]+' UTC').toISOString(),
+            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
+              [language]: bus.busRemark || ( bus.isScheduled === "1" ? ( language === "en" ? "Scheduled" : "預定班次" ) : "" )
             },
             co: 'lrtfeeder'
           }

package/Nlb.js

@@ -1,3 +1,5 @@
+const utils = require('./utils');
+
 module.exports = {
   co: 'nlb',
   fetchEtas: ({stopId, nlbId }) => (
@@ -16,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/Nwfb.js

@@ -1,8 +1,10 @@
+const utils = require('./utils');
+
 module.exports = {
   co: 'nwfb',
   fetchEtas: ({stopId, route, bound }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/NWFB/${stopId}/${route}`, {
-      cache: "reload"
+      cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
@@ -17,7 +19,7 @@ module.exports = {
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NWFB/${stopId}`, { 
-      cache: "reload"
+      cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({

package/package.json

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

package/utils.js

@@ -0,0 +1,6 @@
+module.exports = {
+  isSafari: navigator 
+    && navigator.userAgent 
+    && navigator.userAgent.includes('Safari/') 
+    && !(navigator.userAgent.includes('Chrome/') || navigator.userAgent.includes('Chromium/'))
+}