hk-bus-eta 3.5.4 → 3.7.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.
- package/dist/ctb.js +1 -1
- package/dist/ctb.js.map +1 -1
- package/dist/fortuneferry.d.ts +1 -1
- package/dist/fortuneferry.js +3 -3
- package/dist/fortuneferry.js.map +1 -1
- package/dist/gmb.js +30 -15
- package/dist/gmb.js.map +1 -1
- package/dist/hkkf.js +2 -2
- package/dist/hkkf.js.map +1 -1
- package/dist/index.js +20 -10
- package/dist/index.js.map +1 -1
- package/dist/journeyTime.d.ts +1 -1
- package/dist/journeyTime.js +43 -18
- package/dist/journeyTime.js.map +1 -1
- package/dist/kmb.js +1 -1
- package/dist/kmb.js.map +1 -1
- package/dist/sunferry.js +12 -8
- package/dist/sunferry.js.map +1 -1
- package/dist/utils.js +19 -10
- package/dist/utils.js.map +1 -1
- package/esm/ctb.js +1 -1
- package/esm/ctb.js.map +1 -1
- package/esm/fortuneferry.d.ts +1 -1
- package/esm/fortuneferry.js +3 -3
- package/esm/fortuneferry.js.map +1 -1
- package/esm/gmb.js +30 -15
- package/esm/gmb.js.map +1 -1
- package/esm/hkkf.js +2 -2
- package/esm/hkkf.js.map +1 -1
- package/esm/index.js +20 -10
- package/esm/index.js.map +1 -1
- package/esm/journeyTime.d.ts +1 -1
- package/esm/journeyTime.js +41 -18
- package/esm/journeyTime.js.map +1 -1
- package/esm/kmb.js +1 -1
- package/esm/kmb.js.map +1 -1
- package/esm/sunferry.js +12 -8
- package/esm/sunferry.js.map +1 -1
- package/esm/utils.js +19 -10
- package/esm/utils.js.map +1 -1
- package/package.json +2 -1
- package/src/ctb.ts +1 -1
- package/src/fortuneferry.ts +44 -41
- package/src/gmb.ts +33 -13
- package/src/hkkf.ts +20 -17
- package/src/index.ts +43 -26
- package/src/journeyTime.ts +137 -79
- package/src/kmb.ts +1 -1
- package/src/sunferry.ts +42 -36
- package/src/type.ts +9 -1
- package/src/utils.ts +51 -43
package/dist/ctb.js
CHANGED
package/dist/ctb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ctb.js","sourceRoot":"","sources":["../src/ctb.ts"],"names":[],"mappings":";;AAAA,mCAAmC;AAUnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,wDAAwD,MAAM,IAAI,KAAK,EAAE,EACzE;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,kDAAkD;QAClD,uCAAuC;QACvC,sBAAsB;SACrB,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CACL,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CACnE;SACA,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"ctb.js","sourceRoot":"","sources":["../src/ctb.ts"],"names":[],"mappings":";;AAAA,mCAAmC;AAUnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,wDAAwD,MAAM,IAAI,KAAK,EAAE,EACzE;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,kDAAkD;QAClD,uCAAuC;QACvC,sBAAsB;SACrB,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CACL,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CACnE;SACA,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC;AA1CD,4BA0CC"}
|
package/dist/fortuneferry.d.ts
CHANGED
|
@@ -9,5 +9,5 @@ interface fetchEtasProps {
|
|
|
9
9
|
holidays: EtaDb["holidays"];
|
|
10
10
|
serviceDayMap: EtaDb["serviceDayMap"];
|
|
11
11
|
}
|
|
12
|
-
export default function fetchEtas({ stops: { fortuneferry }, seq, holidays, freq, serviceDayMap }: fetchEtasProps): Promise<Eta[]>;
|
|
12
|
+
export default function fetchEtas({ stops: { fortuneferry }, seq, holidays, freq, serviceDayMap, }: fetchEtasProps): Promise<Eta[]>;
|
|
13
13
|
export {};
|
package/dist/fortuneferry.js
CHANGED
|
@@ -31,13 +31,13 @@ const getCode = (zhName) => {
|
|
|
31
31
|
}
|
|
32
32
|
return "CL";
|
|
33
33
|
};
|
|
34
|
-
function fetchEtas({ stops: { fortuneferry: stops }, seq, holidays, freq, serviceDayMap }) {
|
|
34
|
+
function fetchEtas({ stops: { fortuneferry: stops }, seq, holidays, freq, serviceDayMap, }) {
|
|
35
35
|
if (seq >= 1)
|
|
36
36
|
return Promise.resolve([]);
|
|
37
37
|
const now = new Date();
|
|
38
38
|
return Promise.resolve((0, utils_1.getUpcomingFerry)({ holidays, serviceDayMap, freq, date: new Date() })
|
|
39
|
-
.filter(v =>
|
|
40
|
-
.map(eta => ({
|
|
39
|
+
.filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
|
|
40
|
+
.map((eta) => ({
|
|
41
41
|
eta: eta,
|
|
42
42
|
remark: {
|
|
43
43
|
zh: "預定班次",
|
package/dist/fortuneferry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fortuneferry.js","sourceRoot":"","sources":["../src/fortuneferry.ts"],"names":[],"mappings":";;AACA,mCAAqD;AAarD,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;IACjC,
|
|
1
|
+
{"version":3,"file":"fortuneferry.js","sourceRoot":"","sources":["../src/fortuneferry.ts"],"names":[],"mappings":";;AACA,mCAAqD;AAarD,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;IACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,SAAwB,SAAS,CAAC,EAChC,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,EAC9B,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,aAAa,GACE;IACf,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,wBAAgB,EAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;SACtE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,GAAG,EAAE,GAAG;QACR,MAAM,EAAE;YACN,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,WAAW;SAChB;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,EAAE;SACP;QACD,EAAE,EAAE,cAAc;KACnB,CAAC,CAAC,CACN,CAAC;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAqCE;AACJ,CAAC;AAhED,4BAgEC"}
|
package/dist/gmb.js
CHANGED
|
@@ -10,23 +10,38 @@ function fetchEtas({ gtfsId, stopId, bound, seq, }) {
|
|
|
10
10
|
.filter(({ route_seq }) => (bound === "O" && route_seq === 1) ||
|
|
11
11
|
(bound === "I" && route_seq === 2))
|
|
12
12
|
.filter(({ stop_seq }) => stop_seq === seq + 1)
|
|
13
|
-
.reduce((acc, { eta }) => [
|
|
13
|
+
.reduce((acc, { enabled, eta, description_tc, description_en }) => [
|
|
14
14
|
...acc,
|
|
15
|
-
...
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
...(enabled
|
|
16
|
+
? eta.map((data) => {
|
|
17
|
+
var _a, _b;
|
|
18
|
+
return {
|
|
19
|
+
eta: data.timestamp,
|
|
20
|
+
remark: {
|
|
21
|
+
zh: (_a = data.remarks_tc) !== null && _a !== void 0 ? _a : "",
|
|
22
|
+
en: (_b = data.remarks_en) !== null && _b !== void 0 ? _b : "",
|
|
23
|
+
},
|
|
24
|
+
dest: {
|
|
25
|
+
zh: "",
|
|
26
|
+
en: "",
|
|
27
|
+
},
|
|
28
|
+
co: "gmb",
|
|
29
|
+
};
|
|
30
|
+
})
|
|
31
|
+
: [
|
|
32
|
+
{
|
|
33
|
+
eta: null,
|
|
34
|
+
remark: {
|
|
35
|
+
zh: description_tc !== null && description_tc !== void 0 ? description_tc : "",
|
|
36
|
+
en: description_en !== null && description_en !== void 0 ? description_en : "",
|
|
37
|
+
},
|
|
38
|
+
dest: {
|
|
39
|
+
zh: "",
|
|
40
|
+
en: "",
|
|
41
|
+
},
|
|
42
|
+
co: "gmb",
|
|
22
43
|
},
|
|
23
|
-
|
|
24
|
-
zh: "",
|
|
25
|
-
en: "",
|
|
26
|
-
},
|
|
27
|
-
co: "gmb",
|
|
28
|
-
});
|
|
29
|
-
}),
|
|
44
|
+
]),
|
|
30
45
|
], []));
|
|
31
46
|
}
|
|
32
47
|
exports.default = fetchEtas;
|
package/dist/gmb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AASnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,
|
|
1
|
+
{"version":3,"file":"gmb.js","sourceRoot":"","sources":["../src/gmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AASnC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,MAAM,EACN,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAC/D;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CACL,CAAC,EAAE,SAAS,EAAO,EAAE,EAAE,CACrB,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC;QAClC,CAAC,KAAK,KAAK,GAAG,IAAI,SAAS,KAAK,CAAC,CAAC,CACrC;SACA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAO,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;SACnD,MAAM,CACL,CACE,GAAU,EACV,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,EAAO,EACrD,EAAE,CAAC;QACH,GAAG,GAAG;QACN,GAAG,CAAC,OAAO;YACT,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;;gBACpB,OAAO;oBACL,GAAG,EAAE,IAAI,CAAC,SAAS;oBACnB,MAAM,EAAE;wBACN,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;wBACzB,EAAE,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE;qBAC1B;oBACD,IAAI,EAAE;wBACJ,EAAE,EAAE,EAAE;wBACN,EAAE,EAAE,EAAE;qBACP;oBACD,EAAE,EAAE,KAAK;iBACV,CAAC;YACJ,CAAC,CAAC;YACJ,CAAC,CAAC;gBACE;oBACE,GAAG,EAAE,IAAI;oBACT,MAAM,EAAE;wBACN,EAAE,EAAE,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE;wBACxB,EAAE,EAAE,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE;qBACzB;oBACD,IAAI,EAAE;wBACJ,EAAE,EAAE,EAAE;wBACN,EAAE,EAAE,EAAE;qBACP;oBACD,EAAE,EAAE,KAAK;iBACV;aACF,CAAC;KACP,EACD,EAAE,CACH,CACJ,CAAC;AACN,CAAC;AA5DD,4BA4DC"}
|
package/dist/hkkf.js
CHANGED
|
@@ -6,8 +6,8 @@ function fetchEtas({ freq, seq, holidays, serviceDayMap, }) {
|
|
|
6
6
|
return Promise.resolve([]);
|
|
7
7
|
const now = new Date();
|
|
8
8
|
return Promise.resolve((0, utils_1.getUpcomingFerry)({ holidays, serviceDayMap, freq, date: new Date() })
|
|
9
|
-
.filter(v =>
|
|
10
|
-
.map(eta => ({
|
|
9
|
+
.filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
|
|
10
|
+
.map((eta) => ({
|
|
11
11
|
eta: eta,
|
|
12
12
|
remark: {
|
|
13
13
|
zh: "預定班次",
|
package/dist/hkkf.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":";;AACA,mCAAqD;AASrD,SAAwB,SAAS,CAAC,EAChC,IAAI,
|
|
1
|
+
{"version":3,"file":"hkkf.js","sourceRoot":"","sources":["../src/hkkf.ts"],"names":[],"mappings":";;AACA,mCAAqD;AASrD,SAAwB,SAAS,CAAC,EAChC,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,aAAa,GACE;IACf,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,wBAAgB,EAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;SACtE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,GAAG,EAAE,GAAG;QACR,MAAM,EAAE;YACN,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,WAAW;SAChB;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,EAAE;SACP;QACD,EAAE,EAAE,cAAc;KACnB,CAAC,CAAC,CACN,CAAC;IACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4BI;AACN,CAAC;AArDD,4BAqDC"}
|
package/dist/index.js
CHANGED
|
@@ -78,7 +78,12 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
|
|
|
78
78
|
}
|
|
79
79
|
else if (company_id === "fortuneferry" && stops.fortuneferry) {
|
|
80
80
|
_etas = _etas.concat(yield (0, fortuneferry_1.default)({
|
|
81
|
-
stops,
|
|
81
|
+
stops,
|
|
82
|
+
seq,
|
|
83
|
+
stopList,
|
|
84
|
+
freq,
|
|
85
|
+
serviceDayMap,
|
|
86
|
+
holidays,
|
|
82
87
|
}));
|
|
83
88
|
}
|
|
84
89
|
else if (company_id === "sunferry" && stops.sunferry) {
|
|
@@ -91,8 +96,7 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
|
|
|
91
96
|
if (_etas.some((e) => e.eta)) {
|
|
92
97
|
_etas = _etas.filter((e) => e.eta);
|
|
93
98
|
}
|
|
94
|
-
return _etas
|
|
95
|
-
.sort((a, b) => {
|
|
99
|
+
return _etas.sort((a, b) => {
|
|
96
100
|
if (!a.eta || a.eta === "")
|
|
97
101
|
return 1;
|
|
98
102
|
else if (!b.eta || b.eta === "")
|
|
@@ -109,26 +113,32 @@ function fetchEtas({ route, stops, bound, dest, freq, seq, serviceType, co, nlbI
|
|
|
109
113
|
exports.fetchEtas = fetchEtas;
|
|
110
114
|
function fetchEtaDb() {
|
|
111
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
|
-
return fetch("https://data.hkbus.app/routeFareList.min.json", {
|
|
116
|
+
return fetch("https://data.hkbus.app/routeFareList.min.json", {
|
|
117
|
+
cache: "no-store",
|
|
118
|
+
})
|
|
113
119
|
.then((r) => r.json())
|
|
114
|
-
.catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json", {
|
|
115
|
-
|
|
120
|
+
.catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.min.json", {
|
|
121
|
+
cache: "no-store",
|
|
122
|
+
}).then((r) => r.json()));
|
|
116
123
|
});
|
|
117
124
|
}
|
|
118
125
|
exports.fetchEtaDb = fetchEtaDb;
|
|
119
126
|
function fetchEtaDbMd5() {
|
|
120
127
|
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
-
return fetch("https://data.hkbus.app/routeFareList.md5", {
|
|
128
|
+
return fetch("https://data.hkbus.app/routeFareList.md5", {
|
|
129
|
+
cache: "no-store",
|
|
130
|
+
})
|
|
122
131
|
.then((r) => r.text())
|
|
123
|
-
.catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5", {
|
|
124
|
-
|
|
132
|
+
.catch(() => fetch("https://hkbus.github.io/hk-bus-crawling/routeFareList.md5", {
|
|
133
|
+
cache: "no-store",
|
|
134
|
+
}).then((r) => r.text()));
|
|
125
135
|
});
|
|
126
136
|
}
|
|
127
137
|
exports.fetchEtaDbMd5 = fetchEtaDbMd5;
|
|
128
138
|
function fetchRouteUpdatedAt(route) {
|
|
129
139
|
return __awaiter(this, void 0, void 0, function* () {
|
|
130
140
|
const filename = `${route.route}+${route.serviceType}+${route.orig.en}+${route.dest.en}`.toUpperCase();
|
|
131
|
-
return fetch(`https://data.hkbus.app/route-ts/${filename.replace(/[\\\/\:\*\?\"\<\>\|\]\']/g,
|
|
141
|
+
return fetch(`https://data.hkbus.app/route-ts/${filename.replace(/[\\\/\:\*\?\"\<\>\|\]\']/g, "")}`)
|
|
132
142
|
.then((r) => {
|
|
133
143
|
if (r.ok) {
|
|
134
144
|
return r.text();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,gDAAwB;AACxB,gDAAwB;AACxB,4DAAoC;AACpC,gDAAwB;AACxB,4DAAoC;AACpC,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/journeyTime.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { RouteListEntry, StopList } from "./type";
|
|
|
4
4
|
* @param {Object}
|
|
5
5
|
* @returns {number} journey time in minute
|
|
6
6
|
*/
|
|
7
|
-
export declare function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize, signal }: {
|
|
7
|
+
export declare function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize, signal, }: {
|
|
8
8
|
route: RouteListEntry;
|
|
9
9
|
stopList: StopList;
|
|
10
10
|
startSeq: number;
|
package/dist/journeyTime.js
CHANGED
|
@@ -11,12 +11,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.fetchEstJourneyTime = void 0;
|
|
13
13
|
const __HK_BUS_ETA_JT_CACHE__ = {};
|
|
14
|
+
function fetchEstJourneyTimeBasedOnHistoricalData({ route, startSeq, endSeq, }) {
|
|
15
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
const requests = [];
|
|
17
|
+
for (let i = startSeq; i < endSeq; ++i) {
|
|
18
|
+
const start = Object.values(route.stops)[0][startSeq];
|
|
19
|
+
const end = Object.values(route.stops)[0][endSeq];
|
|
20
|
+
requests.push(fetch(`https://raw.githubusercontent.com/HK-Bus-ETA/hk-bus-time-between-stops/refs/heads/pages/times/${start.slice(0, 2)}.json`)
|
|
21
|
+
.then((r) => r.json())
|
|
22
|
+
.then((r) => {
|
|
23
|
+
if (r[start][end]) {
|
|
24
|
+
return r[start][end];
|
|
25
|
+
}
|
|
26
|
+
throw new Error("not found");
|
|
27
|
+
}));
|
|
28
|
+
}
|
|
29
|
+
return Promise.all(requests).then((seconds) => Math.ceil(seconds.reduce((acc, cur) => acc + cur, 0) / 60));
|
|
30
|
+
});
|
|
31
|
+
}
|
|
14
32
|
/**
|
|
15
33
|
* Fetch Journey time in minute for a route
|
|
16
34
|
* @param {Object}
|
|
17
35
|
* @returns {number} journey time in minute
|
|
18
36
|
*/
|
|
19
|
-
function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize = 4, signal }) {
|
|
37
|
+
function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize = 4, signal, }) {
|
|
20
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
39
|
const stops = Object.values(route.stops)[0];
|
|
22
40
|
if (!["kmb", "nlb", "ctb", "lrtfeeder", "gmb"].includes(Object.keys(route.stops)[0]))
|
|
@@ -42,27 +60,34 @@ function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize = 4,
|
|
|
42
60
|
lat: stopList[stops[i + 1]].location.lat,
|
|
43
61
|
long: stopList[stops[i + 1]].location.lng,
|
|
44
62
|
},
|
|
45
|
-
departIn: Math.round(ret / 15) * 15
|
|
46
|
-
})
|
|
63
|
+
departIn: Math.round(ret / 15) * 15,
|
|
64
|
+
}),
|
|
65
|
+
{
|
|
66
|
+
startSeq: i,
|
|
67
|
+
endSeq: i + 1,
|
|
68
|
+
}
|
|
47
69
|
]);
|
|
48
70
|
if (payloads.length < batchSize && i !== endSeq - 1) {
|
|
49
71
|
// skip fetching until whole batch filled
|
|
50
72
|
continue;
|
|
51
73
|
}
|
|
52
|
-
const
|
|
74
|
+
const seconds = yield Promise.all(payloads.map(([key, payload, { startSeq, endSeq }]) => {
|
|
53
75
|
// load from cache if it is query within 15 minutes
|
|
54
|
-
if (key in __HK_BUS_ETA_JT_CACHE__ &&
|
|
55
|
-
|
|
76
|
+
if (key in __HK_BUS_ETA_JT_CACHE__ &&
|
|
77
|
+
__HK_BUS_ETA_JT_CACHE__[key].ts + 15 * 60 * 1000 >= ts) {
|
|
78
|
+
return Promise.resolve(__HK_BUS_ETA_JT_CACHE__[key].s);
|
|
56
79
|
}
|
|
57
|
-
return (
|
|
80
|
+
return fetchEstJourneyTimeBasedOnHistoricalData({
|
|
81
|
+
route, startSeq, endSeq
|
|
82
|
+
}).catch(() => (fetch("https://tdas-api.hkemobility.gov.hk/tdas/api/route", {
|
|
58
83
|
method: "POST",
|
|
59
84
|
headers: {
|
|
60
|
-
|
|
85
|
+
"Content-Type": "application/json",
|
|
61
86
|
},
|
|
62
87
|
body: payload,
|
|
63
88
|
signal,
|
|
64
89
|
})
|
|
65
|
-
.then(r => r.json())
|
|
90
|
+
.then((r) => r.json())
|
|
66
91
|
.then(({ eta, distM, jSpeed }) => {
|
|
67
92
|
var _a;
|
|
68
93
|
const speedStr = (_a = /(\d+)公里\/小時/g.exec(jSpeed)) === null || _a === void 0 ? void 0 : _a[1];
|
|
@@ -70,24 +95,24 @@ function fetchEstJourneyTime({ route, stopList, startSeq, endSeq, batchSize = 4,
|
|
|
70
95
|
speedStr !== undefined &&
|
|
71
96
|
!isNaN(parseInt(speedStr, 10))) {
|
|
72
97
|
// Set the speed limit as 70 km/h
|
|
73
|
-
return (distM / Math.min(parseInt(speedStr, 10), 70) / 1000) * 60;
|
|
98
|
+
return (distM / Math.min(parseInt(speedStr, 10), 70) / 1000) * 60 * 60;
|
|
74
99
|
}
|
|
75
100
|
console.warn("Unable to parse TDAS response for more precise journey time. Falling back.");
|
|
76
101
|
const [hh, mm] = eta.split(":").map((v) => parseInt(v, 10));
|
|
77
|
-
return hh * 60 + mm;
|
|
102
|
+
return (hh * 60 + mm) * 60;
|
|
78
103
|
})
|
|
79
104
|
.catch(() => {
|
|
80
105
|
// for any error, assume 4 minutes journey time blindly
|
|
81
|
-
return 4;
|
|
106
|
+
return 4 * 60;
|
|
82
107
|
})
|
|
83
|
-
.then(
|
|
84
|
-
__HK_BUS_ETA_JT_CACHE__[key] = {
|
|
108
|
+
.then((s) => {
|
|
109
|
+
__HK_BUS_ETA_JT_CACHE__[key] = { s: s * 1.1, ts };
|
|
85
110
|
// margin for car accelerating, decelerating, and passenger picking up and dropping off
|
|
86
|
-
return
|
|
87
|
-
}));
|
|
111
|
+
return s * 1.1;
|
|
112
|
+
})));
|
|
88
113
|
}));
|
|
89
|
-
|
|
90
|
-
ret +=
|
|
114
|
+
seconds.forEach((s) => {
|
|
115
|
+
ret += s;
|
|
91
116
|
});
|
|
92
117
|
payloads.length = 0;
|
|
93
118
|
}
|
package/dist/journeyTime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journeyTime.js","sourceRoot":"","sources":["../src/journeyTime.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"journeyTime.js","sourceRoot":"","sources":["../src/journeyTime.ts"],"names":[],"mappings":"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"}
|
package/dist/kmb.js
CHANGED
package/dist/kmb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kmb.js","sourceRoot":"","sources":["../src/kmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAYnC,kCAAkC;AAClC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,GAAG,EACH,WAAW,EACX,KAAK,EACL,EAAE,EACF,KAAK,GACU;IACf,OAAO,KAAK,CACV,mDAAmD,MAAM,IAAI,KAAK,IAAI,WAAW,EAAE,EACnF;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC;SACnC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CAAC,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAW,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,uEAAuE;QACvE,gFAAgF;SAC/E,MAAM,CACL,CAAC,GAAQ,EAAE,EAAE,CACX,EAAE,CAAC,MAAM,GAAG,CAAC;QACb,WAAW,KAAK,GAAG,CAAC,YAAY;QAChC,GAAG,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CACtB;SACA,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;QACnB,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;YACxC,wBAAwB;YACxB,IAAI,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;gBACvB,OAAO,GAAG,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;aAC5B;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"kmb.js","sourceRoot":"","sources":["../src/kmb.ts"],"names":[],"mappings":";;AACA,mCAAmC;AAYnC,kCAAkC;AAClC,SAAwB,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,GAAG,EACH,WAAW,EACX,KAAK,EACL,EAAE,EACF,KAAK,GACU;IACf,OAAO,KAAK,CACV,mDAAmD,MAAM,IAAI,KAAK,IAAI,WAAW,EAAE,EACnF;QACE,KAAK,EAAE,gBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC;SACnC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CAAC,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAW,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,uEAAuE;QACvE,gFAAgF;SAC/E,MAAM,CACL,CAAC,GAAQ,EAAE,EAAE,CACX,EAAE,CAAC,MAAM,GAAG,CAAC;QACb,WAAW,KAAK,GAAG,CAAC,YAAY;QAChC,GAAG,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CACtB;SACA,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;QACnB,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;YACxC,wBAAwB;YACxB,IAAI,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;gBACvB,OAAO,GAAG,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;aAC5B;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC;AAzDD,4BAyDC"}
|
package/dist/sunferry.js
CHANGED
|
@@ -12,13 +12,12 @@ function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
|
|
|
12
12
|
throw new Error("");
|
|
13
13
|
if (!data)
|
|
14
14
|
return [];
|
|
15
|
-
return data
|
|
16
|
-
.map(({ depart_time, rmk_en, rmk_tc, route_tc, route_en }) => {
|
|
15
|
+
return data.map(({ depart_time, rmk_en, rmk_tc, route_tc, route_en }) => {
|
|
17
16
|
const date = new Date();
|
|
18
|
-
let guess = `${date.getFullYear()}-${(
|
|
19
|
-
if (
|
|
17
|
+
let guess = `${date.getFullYear()}-${("0" + (date.getMonth() + 1)).slice(-2)}-${("0" + date.getDate()).slice(-2)}T${depart_time}:00+08:00`;
|
|
18
|
+
if (new Date(guess) < date) {
|
|
20
19
|
date.setDate(date.getDate() + 1);
|
|
21
|
-
guess = `${date.getFullYear()}-${(
|
|
20
|
+
guess = `${date.getFullYear()}-${("0" + (date.getMonth() + 1)).slice(-2)}-${("0" + date.getDate()).slice(-2)}T${depart_time}:00+08:00`;
|
|
22
21
|
}
|
|
23
22
|
return {
|
|
24
23
|
eta: guess,
|
|
@@ -37,9 +36,14 @@ function fetchEtas({ route, seq, freq, holidays, serviceDayMap, }) {
|
|
|
37
36
|
.catch(() => {
|
|
38
37
|
// the API gives CORS error, the below handling is for browser
|
|
39
38
|
const now = new Date();
|
|
40
|
-
return (0, utils_1.getUpcomingFerry)({
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
return (0, utils_1.getUpcomingFerry)({
|
|
40
|
+
holidays,
|
|
41
|
+
serviceDayMap,
|
|
42
|
+
freq,
|
|
43
|
+
date: new Date(),
|
|
44
|
+
})
|
|
45
|
+
.filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
|
|
46
|
+
.map((eta) => ({
|
|
43
47
|
eta: eta,
|
|
44
48
|
remark: {
|
|
45
49
|
zh: "預定班次",
|
package/dist/sunferry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sunferry.js","sourceRoot":"","sources":["../src/sunferry.ts"],"names":[],"mappings":";;AACA,mCAAqD;AAUrD,SAAwB,SAAS,CAAC,EAChC,KAAK,
|
|
1
|
+
{"version":3,"file":"sunferry.js","sourceRoot":"","sources":["../src/sunferry.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -26,27 +26,36 @@ const getUpcomingFerry = ({ holidays, serviceDayMap, date, freq, }) => {
|
|
|
26
26
|
if (freq === null) {
|
|
27
27
|
return [];
|
|
28
28
|
}
|
|
29
|
-
const getEta = (serviceFreq, date) =>
|
|
29
|
+
const getEta = (serviceFreq, date) => Object.keys(serviceFreq)
|
|
30
|
+
.sort((a, b) => (a < b ? -1 : 1))
|
|
31
|
+
.reduce((acc, tp) => {
|
|
30
32
|
const ferryTime = new Date(date.getTime());
|
|
31
33
|
ferryTime.setUTCHours(parseInt(tp.slice(0, 2), 10));
|
|
32
34
|
ferryTime.setUTCMinutes(parseInt(tp.slice(2), 10));
|
|
33
35
|
if (ferryTime >= date) {
|
|
34
|
-
acc.push(String(ferryTime.getUTCFullYear()) +
|
|
35
|
-
|
|
36
|
-
String(ferryTime.
|
|
37
|
-
|
|
38
|
-
String(ferryTime.
|
|
36
|
+
acc.push(String(ferryTime.getUTCFullYear()) +
|
|
37
|
+
"-" +
|
|
38
|
+
String(ferryTime.getUTCMonth() + 1).padStart(2, "0") +
|
|
39
|
+
"-" +
|
|
40
|
+
String(ferryTime.getUTCDate()).padStart(2, "0") +
|
|
41
|
+
"T" +
|
|
42
|
+
String(ferryTime.getUTCHours()).padStart(2, "0") +
|
|
43
|
+
":" +
|
|
44
|
+
String(ferryTime.getUTCMinutes()).padStart(2, "0") +
|
|
45
|
+
":00" +
|
|
39
46
|
".000+08:00");
|
|
40
47
|
}
|
|
41
48
|
return acc;
|
|
42
|
-
}, [])
|
|
49
|
+
}, []);
|
|
43
50
|
// obtain all ETAs sampling for next 24 hours, fancy handling for timezone
|
|
44
|
-
const ret = Array(24)
|
|
51
|
+
const ret = Array(24)
|
|
52
|
+
.fill(0)
|
|
53
|
+
.reduce((acc, _, idx) => {
|
|
45
54
|
const refDate = new Date(date.getTime());
|
|
46
55
|
refDate.setUTCHours(refDate.getUTCHours() + 8 + idx);
|
|
47
56
|
for (let serviceKey in freq) {
|
|
48
57
|
if (isHoliday(holidays, refDate)) {
|
|
49
|
-
if (serviceDayMap[serviceKey][0] ===
|
|
58
|
+
if (serviceDayMap[serviceKey][0] === "1") {
|
|
50
59
|
return acc.concat(getEta(freq[serviceKey], refDate));
|
|
51
60
|
}
|
|
52
61
|
}
|
|
@@ -56,7 +65,7 @@ const getUpcomingFerry = ({ holidays, serviceDayMap, date, freq, }) => {
|
|
|
56
65
|
}
|
|
57
66
|
return acc;
|
|
58
67
|
}, []);
|
|
59
|
-
return [...new Set(ret)].sort((a, b) => a < b ? -1 : 1);
|
|
68
|
+
return [...new Set(ret)].sort((a, b) => (a < b ? -1 : 1));
|
|
60
69
|
};
|
|
61
70
|
exports.getUpcomingFerry = getUpcomingFerry;
|
|
62
71
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEa,QAAA,QAAQ,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI;QACF,OAAO,OAAO,CACZ,SAAS;YACP,SAAS,CAAC,SAAS;YACnB,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvC,CAAC,CACC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACvC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC1C,CACJ,CAAC;KACH;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,uFAAuF;AACvF,kHAAkH;AAClH,MAAM,SAAS,GAAG,CAAC,QAAkB,EAAE,OAAa,EAAW,EAAE;IAC/D,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/esm/ctb.js
CHANGED
package/esm/ctb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ctb.js","sourceRoot":"","sources":["../src/ctb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAUnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,wDAAwD,MAAM,IAAI,KAAK,EAAE,EACzE;QACE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,kDAAkD;QAClD,uCAAuC;QACvC,sBAAsB;SACrB,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CACL,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CACnE;SACA,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"ctb.js","sourceRoot":"","sources":["../src/ctb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAUnC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,KAAK,EACL,GAAG,GACY;IACf,OAAO,KAAK,CACV,wDAAwD,MAAM,IAAI,KAAK,EAAE,EACzE;QACE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;KACzC,CACF;SACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;SACnC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjB,IAAI;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,kDAAkD;QAClD,uCAAuC;QACvC,sBAAsB;SACrB,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD;SACA,MAAM,CACL,CAAC,GAAQ,EAAE,CAAS,EAAE,IAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CACnE;SACA,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE;YACN,EAAE,EAAE,CAAC,CAAC,MAAM;YACZ,EAAE,EAAE,CAAC,CAAC,MAAM;SACb;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,CAAC,CAAC,OAAO;YACb,EAAE,EAAE,CAAC,CAAC,OAAO;SACd;QACD,EAAE,EAAE,KAAK;KACV,CAAC,CAAC,CACN;SACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/esm/fortuneferry.d.ts
CHANGED
|
@@ -9,5 +9,5 @@ interface fetchEtasProps {
|
|
|
9
9
|
holidays: EtaDb["holidays"];
|
|
10
10
|
serviceDayMap: EtaDb["serviceDayMap"];
|
|
11
11
|
}
|
|
12
|
-
export default function fetchEtas({ stops: { fortuneferry }, seq, holidays, freq, serviceDayMap }: fetchEtasProps): Promise<Eta[]>;
|
|
12
|
+
export default function fetchEtas({ stops: { fortuneferry }, seq, holidays, freq, serviceDayMap, }: fetchEtasProps): Promise<Eta[]>;
|
|
13
13
|
export {};
|
package/esm/fortuneferry.js
CHANGED
|
@@ -29,13 +29,13 @@ const getCode = (zhName) => {
|
|
|
29
29
|
}
|
|
30
30
|
return "CL";
|
|
31
31
|
};
|
|
32
|
-
export default function fetchEtas({ stops: { fortuneferry: stops }, seq, holidays, freq, serviceDayMap }) {
|
|
32
|
+
export default function fetchEtas({ stops: { fortuneferry: stops }, seq, holidays, freq, serviceDayMap, }) {
|
|
33
33
|
if (seq >= 1)
|
|
34
34
|
return Promise.resolve([]);
|
|
35
35
|
const now = new Date();
|
|
36
36
|
return Promise.resolve(getUpcomingFerry({ holidays, serviceDayMap, freq, date: new Date() })
|
|
37
|
-
.filter(v =>
|
|
38
|
-
.map(eta => ({
|
|
37
|
+
.filter((v) => new Date(v).getTime() - now.getTime() < 180 * 60 * 1000)
|
|
38
|
+
.map((eta) => ({
|
|
39
39
|
eta: eta,
|
|
40
40
|
remark: {
|
|
41
41
|
zh: "預定班次",
|
package/esm/fortuneferry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fortuneferry.js","sourceRoot":"","sources":["../src/fortuneferry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAY,MAAM,SAAS,CAAC;AAarD,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;IACjC,
|
|
1
|
+
{"version":3,"file":"fortuneferry.js","sourceRoot":"","sources":["../src/fortuneferry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAY,MAAM,SAAS,CAAC;AAarD,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;IACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,EAC9B,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,aAAa,GACE;IACf,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,OAAO,CAAC,OAAO,CACpB,gBAAgB,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;SACtE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,GAAG,EAAE,GAAG;QACR,MAAM,EAAE;YACN,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,WAAW;SAChB;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,EAAE;SACP;QACD,EAAE,EAAE,cAAc;KACnB,CAAC,CAAC,CACN,CAAC;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAqCE;AACJ,CAAC"}
|