hk-bus-eta 3.1.0 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/dist/index.js +32 -2
  2. package/dist/index.js.map +1 -1
  3. package/dist/lightRail.js +2 -2
  4. package/dist/lrtfeeder.js +2 -2
  5. package/dist/type.d.ts +1 -1
  6. package/esm/index.js +32 -2
  7. package/esm/index.js.map +1 -1
  8. package/esm/lightRail.js +2 -2
  9. package/esm/lrtfeeder.js +2 -2
  10. package/esm/type.d.ts +1 -1
  11. package/package.json +2 -2
  12. package/src/index.ts +37 -6
  13. package/src/lightRail.ts +2 -2
  14. package/src/lrtfeeder.ts +2 -2
  15. package/src/type.ts +4 -1
package/dist/index.js CHANGED
@@ -59,6 +59,30 @@ function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtf
59
59
  bound: bound.mtr,
60
60
  }));
61
61
  }
62
+ else if (company_id === "gmbHki" && stops.gmbHki) {
63
+ _etas = _etas.concat(yield (0, gmb_1.default)({
64
+ stopId: stops.gmbHki[seq],
65
+ gtfsId,
66
+ seq,
67
+ bound: bound.gmbHki,
68
+ }));
69
+ }
70
+ else if (company_id === "gmbKln" && stops.gmbKln) {
71
+ _etas = _etas.concat(yield (0, gmb_1.default)({
72
+ stopId: stops.gmbKln[seq],
73
+ gtfsId,
74
+ seq,
75
+ bound: bound.gmbKln,
76
+ }));
77
+ }
78
+ else if (company_id === "gmbNt" && stops.gmbNt) {
79
+ _etas = _etas.concat(yield (0, gmb_1.default)({
80
+ stopId: stops.gmbNt[seq],
81
+ gtfsId,
82
+ seq,
83
+ bound: bound.gmbNt,
84
+ }));
85
+ }
62
86
  }
63
87
  return _etas.sort((a, b) => {
64
88
  if (a.eta === "")
@@ -77,13 +101,19 @@ function fetchEtas({ route, stops, bound, dest, seq, serviceType, co, nlbId, gtf
77
101
  exports.fetchEtas = fetchEtas;
78
102
  function fetchEtaDb() {
79
103
  return __awaiter(this, void 0, void 0, function* () {
80
- return fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json").then((r) => r.json());
104
+ return fetch("https://data.hkbus.app/routeFareList.min.json")
105
+ .then((r) => r.json())
106
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
107
+ .then(r => r.json()));
81
108
  });
82
109
  }
83
110
  exports.fetchEtaDb = fetchEtaDb;
84
111
  function fetchEtaDbMd5() {
85
112
  return __awaiter(this, void 0, void 0, function* () {
86
- return fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5").then((r) => r.text());
113
+ return fetch("https://data.hkbus.app/routeFareList.md5")
114
+ .then((r) => r.text())
115
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
116
+ .then(r => r.text()));
87
117
  });
88
118
  }
89
119
  exports.fetchEtaDbMd5 = fetchEtaDbMd5;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/lightRail.js CHANGED
@@ -37,8 +37,8 @@ function fetchEtas({ stopId, route, dest, }) {
37
37
  .join("")}`,
38
38
  },
39
39
  dest: {
40
- zh: '',
41
- en: '',
40
+ zh: "",
41
+ en: "",
42
42
  },
43
43
  co: "lightRail",
44
44
  };
package/dist/lrtfeeder.js CHANGED
@@ -40,8 +40,8 @@ function fetchEtas({ stopId, route, language, }) {
40
40
  : ""),
41
41
  },
42
42
  dest: {
43
- zh: '',
44
- en: '',
43
+ zh: "",
44
+ en: "",
45
45
  },
46
46
  co: "lrtfeeder",
47
47
  },
package/dist/type.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr";
1
+ export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "gmbHki" | "gmbKln" | "gmbNt";
2
2
  export type Terminal = {
3
3
  en: string;
4
4
  zh: string;
package/esm/index.js CHANGED
@@ -43,6 +43,30 @@ export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, c
43
43
  bound: bound.mtr,
44
44
  }));
45
45
  }
46
+ else if (company_id === "gmbHki" && stops.gmbHki) {
47
+ _etas = _etas.concat(await gmb({
48
+ stopId: stops.gmbHki[seq],
49
+ gtfsId,
50
+ seq,
51
+ bound: bound.gmbHki,
52
+ }));
53
+ }
54
+ else if (company_id === "gmbKln" && stops.gmbKln) {
55
+ _etas = _etas.concat(await gmb({
56
+ stopId: stops.gmbKln[seq],
57
+ gtfsId,
58
+ seq,
59
+ bound: bound.gmbKln,
60
+ }));
61
+ }
62
+ else if (company_id === "gmbNt" && stops.gmbNt) {
63
+ _etas = _etas.concat(await gmb({
64
+ stopId: stops.gmbNt[seq],
65
+ gtfsId,
66
+ seq,
67
+ bound: bound.gmbNt,
68
+ }));
69
+ }
46
70
  }
47
71
  return _etas.sort((a, b) => {
48
72
  if (a.eta === "")
@@ -58,9 +82,15 @@ export async function fetchEtas({ route, stops, bound, dest, seq, serviceType, c
58
82
  }
59
83
  }
60
84
  export async function fetchEtaDb() {
61
- return fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json").then((r) => r.json());
85
+ return fetch("https://data.hkbus.app/routeFareList.min.json")
86
+ .then((r) => r.json())
87
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
88
+ .then(r => r.json()));
62
89
  }
63
90
  export async function fetchEtaDbMd5() {
64
- return fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5").then((r) => r.text());
91
+ return fetch("https://data.hkbus.app/routeFareList.md5")
92
+ .then((r) => r.text())
93
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
94
+ .then(r => r.text()));
65
95
  }
66
96
  //# sourceMappingURL=index.js.map
package/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/esm/lightRail.js CHANGED
@@ -35,8 +35,8 @@ export default function fetchEtas({ stopId, route, dest, }) {
35
35
  .join("")}`,
36
36
  },
37
37
  dest: {
38
- zh: '',
39
- en: '',
38
+ zh: "",
39
+ en: "",
40
40
  },
41
41
  co: "lightRail",
42
42
  };
package/esm/lrtfeeder.js CHANGED
@@ -38,8 +38,8 @@ export default function fetchEtas({ stopId, route, language, }) {
38
38
  : ""),
39
39
  },
40
40
  dest: {
41
- zh: '',
42
- en: '',
41
+ zh: "",
42
+ en: "",
43
43
  },
44
44
  co: "lrtfeeder",
45
45
  },
package/esm/type.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr";
1
+ export type Company = "kmb" | "nlb" | "ctb" | "lrtfeeder" | "gmb" | "lightRail" | "mtr" | "gmbHki" | "gmbKln" | "gmbNt";
2
2
  export type Terminal = {
3
3
  en: string;
4
4
  zh: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hk-bus-eta",
3
- "version": "3.1.0",
3
+ "version": "3.2.0",
4
4
  "description": "Query the ETA (Estimated Time of Arrival) of HK Bus/Minibus/MTR/Lightrail",
5
5
  "main": "dist/index.js",
6
6
  "module": "esm/index.js",
@@ -40,7 +40,7 @@
40
40
  "bugs": {
41
41
  "url": "https://github.com/hkbus/hk-bus-eta/issues"
42
42
  },
43
- "homepage": "https://hk-bus-eta.chunlaw.io/",
43
+ "homepage": "https://hk-bus-eta.hkbus.app/",
44
44
  "devDependencies": {
45
45
  "@types/jest": "^29.5.4",
46
46
  "jest": "^29.6.4",
package/src/index.ts CHANGED
@@ -68,6 +68,33 @@ export async function fetchEtas({
68
68
  bound: bound.mtr,
69
69
  }),
70
70
  );
71
+ } else if (company_id === "gmbHki" && stops.gmbHki) {
72
+ _etas = _etas.concat(
73
+ await gmb({
74
+ stopId: stops.gmbHki[seq],
75
+ gtfsId,
76
+ seq,
77
+ bound: bound.gmbHki,
78
+ }),
79
+ );
80
+ } else if (company_id === "gmbKln" && stops.gmbKln) {
81
+ _etas = _etas.concat(
82
+ await gmb({
83
+ stopId: stops.gmbKln[seq],
84
+ gtfsId,
85
+ seq,
86
+ bound: bound.gmbKln,
87
+ }),
88
+ );
89
+ } else if (company_id === "gmbNt" && stops.gmbNt) {
90
+ _etas = _etas.concat(
91
+ await gmb({
92
+ stopId: stops.gmbNt[seq],
93
+ gtfsId,
94
+ seq,
95
+ bound: bound.gmbNt,
96
+ }),
97
+ );
71
98
  }
72
99
  }
73
100
 
@@ -83,15 +110,19 @@ export async function fetchEtas({
83
110
  }
84
111
 
85
112
  export async function fetchEtaDb(): Promise<EtaDb> {
86
- return fetch(
87
- "https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json",
88
- ).then((r) => r.json());
113
+ return fetch("https://data.hkbus.app/routeFareList.min.json")
114
+ .then((r) => r.json())
115
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json")
116
+ .then(r => r.json())
117
+ );
89
118
  }
90
119
 
91
120
  export async function fetchEtaDbMd5(): Promise<string> {
92
- return fetch(
93
- "https://hkbus.github.io/hk-bus-crawling/routeFareList.md5",
94
- ).then((r) => r.text());
121
+ return fetch("https://data.hkbus.app/routeFareList.md5")
122
+ .then((r) => r.text())
123
+ .catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5")
124
+ .then(r => r.text())
125
+ );
95
126
  }
96
127
 
97
128
  export type * from "./type";
package/src/lightRail.ts CHANGED
@@ -66,8 +66,8 @@ export default function fetchEtas({
66
66
  .join("")}`,
67
67
  },
68
68
  dest: {
69
- zh: '',
70
- en: '',
69
+ zh: "",
70
+ en: "",
71
71
  },
72
72
  co: "lightRail",
73
73
  };
package/src/lrtfeeder.ts CHANGED
@@ -66,8 +66,8 @@ export default function fetchEtas({
66
66
  : ""),
67
67
  },
68
68
  dest: {
69
- zh: '',
70
- en: '',
69
+ zh: "",
70
+ en: "",
71
71
  },
72
72
  co: "lrtfeeder",
73
73
  },
package/src/type.ts CHANGED
@@ -5,7 +5,10 @@ export type Company =
5
5
  | "lrtfeeder"
6
6
  | "gmb"
7
7
  | "lightRail"
8
- | "mtr";
8
+ | "mtr"
9
+ | "gmbHki"
10
+ | "gmbKln"
11
+ | "gmbNt";
9
12
 
10
13
  export type Terminal = {
11
14
  en: string;