hk-bus-eta 1.2.0 → 1.2.4

package/Ctb.js

@@ -1,7 +1,11 @@
+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: 'no-store'}).then(
+    fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/CTB/${stopId}/${route}`, {
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
         eta: e.eta,
@@ -14,7 +18,9 @@ module.exports = {
     )
   ),
   fetchStopEtas: ( stopId ) => (
-    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/CTB/${stopId}`, { cache: "no-store" }).then(
+    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/CTB/${stopId}`, { 
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({
       route: e.route,

package/Kmb.js

@@ -1,9 +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: "no-store" }
+      { cache: utils.isSafari ? 'default' : 'no-store' }
     ).then( response => response.json() )
     .then(({data}) => data.filter(e => 
       e.dir === bound 
@@ -19,7 +21,9 @@ module.exports = {
     )
   ),
   fetchStopEtas: ( stopId ) => (
-    fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { cache: "no-store" })
+    fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { 
+      cache: utils.isSafari ? 'default' : 'no-store'
+    })
     .then(response => response.json())
     .then(({data}) => data.map( e => ({
       route: e.route,

package/Nlb.js

@@ -1,3 +1,5 @@
+const utils = require('./utils')
+
 module.exports = {
   co: 'nlb',
   fetchEtas: ({stopId, nlbId }) => (
@@ -11,7 +13,7 @@ module.exports = {
         "Content-Type": "text/plain"
       },
       method: "POST",
-      cache: 'no-store'
+      cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
     ).then(({estimatedArrivals}) => {
@@ -27,8 +29,9 @@ module.exports = {
     })
   ),
   fetchStopEtas: ( stopId ) => (
-    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NLB/${stopId}`, { cache: "no-store" })
-    .then( response => {
+    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NLB/${stopId}`, { 
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then( response => {
         if (response.ok)
           return response.json()
         // special handle for NLB API

package/Nwfb.js

@@ -1,7 +1,11 @@
+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: 'no-store'}).then(
+    fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/NWFB/${stopId}/${route}`, {
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then(
       response => response.json()
     ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
         eta: e.eta,
@@ -14,7 +18,9 @@ module.exports = {
     )
   ),
   fetchStopEtas: ( stopId ) => (
-    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NWFB/${stopId}`, { cache: "no-store" }).then(
+    fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NWFB/${stopId}`, { 
+      cache: utils.isSafari ? 'default' : 'no-store'
+    }).then(
       response => response.json()
     ).then(({data}) => data.map( e => ({
       route: e.route,

package/index.d.ts

@@ -7,6 +7,12 @@ export type Terminal = {
 
 export type FreqId = "31" | "287" | "415" | "63" | "319" | "447" | "416" | "480" | "266" | "271" | "272" | "288" | "320" | "448" | "511"
 
+export type Freq = {
+  [key in FreqId]: {
+    [startTime: string]: [string, string] | null
+  }
+}
+
 export type RouteListEntry = {
   readonly route: string,
   readonly co: Company[],
@@ -14,11 +20,8 @@ export type RouteListEntry = {
   readonly dest: Terminal,
   readonly fares: string[] | null,
   readonly faresHoliday: string[] | null,
-  readonly freq: {
-    [key in FreqId]: {
-      [startTime: string]: string[]
-    }
-  },
+  readonly freq: Freq | null,
+  readonly jt: string | null,
   readonly seq: number,
   readonly serviceType: string,
   readonly stops: {
@@ -52,6 +55,7 @@ export type StopList = Record<string, StopListEntry>
 export type StopMap = Record<string, StopTuple[]>
 
 export type BusDb = {
+  holidays: string[],
   routeList: RouteList,
   stopList: StopList,
   stopMap: StopMap

package/index.js

@@ -12,7 +12,7 @@ module.exports = {
       _etas = _etas.concat( await KmbApi.fetchEtas({
       route,
       stopId: stops.kmb[seq], 
-      seq: (seq + 1 === stops.kmb.length ? 1000 : seq), 
+      seq,
       serviceType, bound: bound[company_id]}) 
       )
     }

package/package.json

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

package/utils.js

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