@idm-plugin/vessel 1.7.1 → 1.7.2

package/dist/index.js

@@ -1,19 +1,19 @@
-var it = Object.defineProperty;
-var ct = (j, e, t) => e in j ? it(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
-var G = (j, e, t) => (ct(j, typeof e != "symbol" ? e + "" : e, t), t);
-import L from "got";
+var rt = Object.defineProperty;
+var dt = (Y, e, t) => e in Y ? rt(Y, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : Y[e] = t;
+var _ = (Y, e, t) => (dt(Y, typeof e != "symbol" ? e + "" : e, t), t);
+import V from "got";
 import at from "@log4js-node/log4js-api";
 import w from "moment";
-import { LngLatHelper as Z, LaneHelper as R } from "@idm-plugin/geo2";
-import { MeteoHelper2 as rt, MeteoHelper as dt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as nt } from "@idm-plugin/meteo";
-let M;
+import { LngLatHelper as J, LaneHelper as R } from "@idm-plugin/geo2";
+import { MeteoHelper2 as ut, MeteoHelper as ht } from "@idm-plugin/meteo2";
+import { Meteo2Assist as ct } from "@idm-plugin/meteo";
+let g;
 try {
-  M = at.getLogger("vessel");
+  g = at.getLogger("vessel");
 } catch {
 } finally {
 }
-class st {
+class $ {
   /**
    * 解析AIS状态码
    * @param status
@@ -54,23 +54,23 @@ class st {
     return { labelCn: t, labelEn: n };
   }
 }
-class kt extends st {
+class Ct extends $ {
   constructor(t, n) {
     super();
-    G(this, "clientId");
-    G(this, "clientSecret");
-    G(this, "token");
+    _(this, "clientId");
+    _(this, "clientSecret");
+    _(this, "token");
     this.clientId = t, this.clientSecret = n;
   }
   async authToken(t = {}) {
-    const n = "https://svc.data.myvessel.cn/ada/oauth/token", c = {
+    const n = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, o = await L.post(n, c).json();
-    M == null || M.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
+    }, o = await V.post(n, i).json();
+    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, n, o), o.error || (this.token = {
       accessToken: o.access_token,
       tokenType: o.token_type,
       expiresIn: o.expires_in,
@@ -80,21 +80,21 @@ class kt extends st {
     });
   }
   async realTimePosition(t, n = {}) {
-    var u, m, l;
+    var u, y, l;
     (!this.token || w().diff(w(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(n);
-    const c = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
+    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", o = {
       headers: {
-        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
+        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, c, o);
-    const a = await L.get(c, o).json();
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
+    const a = await V.get(i, o).json();
     if (a.code)
-      return M == null || M.warn("[%s] fetch realtime position failed: %j", n.requestId, c, { message: a.message, status: a.status, code: a.code }), a;
+      return g == null || g.warn("[%s] fetch realtime position failed: %j", n.requestId, i, { message: a.message, status: a.status, code: a.code }), a;
     const s = a.data;
-    for (const y in s)
-      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
+    for (const M in s)
+      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
     const d = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.mmsi,
@@ -121,78 +121,78 @@ class kt extends st {
       utc: d.utc().format()
     };
   }
-  async trajectory(t, n, c, o, a = !0, s = {}) {
+  async trajectory(t, n, i, o, a = !0, s = {}) {
     (!this.token || w().diff(w(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = w(n), u = w(c), m = [];
-    for (; u.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), d, o, m, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, u, d, o, m, s), m;
+    const d = await this.realTimePosition(t, s), c = w(n), u = w(i), y = [];
+    for (; u.diff(c, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, c, c.clone().add(30, "day"), d, o, y, s), c.add(30, "day");
+    return await this.trajectoryIn30Day(t, c, u, d, o, y, s), y;
   }
-  async trajectoryIn30Day(t, n, c, o, a, s, d = {}) {
-    var f, S, I, b, v;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
+  async trajectoryIn30Day(t, n, i, o, a, s, d = {}) {
+    var m, C, k, p, v;
+    const c = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", u = {
       headers: {
-        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(S = this.token) == null ? void 0 : S.accessToken}`
+        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(C = this.token) == null ? void 0 : C.accessToken}`
       },
       json: {
         mmsi: t,
         startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: c.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
-    const m = await L.post(r, u).json();
-    if (m.code)
-      return M == null || M.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: m.message, status: m.status, code: m.code }), m;
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", d.requestId, c, u);
+    const y = await V.post(c, u).json();
+    if (y.code)
+      return g == null || g.warn("[%s] fetch trajectory failed: %j", d.requestId, c, { message: y.message, status: y.status, code: y.code }), y;
     let l = -1;
-    const y = w(`${(b = (I = m.data) == null ? void 0 : I[0]) == null ? void 0 : b.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (v = m.data) == null || v.forEach((i) => {
-      for (const E in i)
-        !isNaN(i[E]) && Number(i[E]) !== 1 / 0 && (i[E] = Number(i[E]));
-      const h = w(`${i.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), C = i.status, { labelCn: g, labelEn: D } = this.parseStatus(C), Y = {
-        mmsi: i.mmsi,
+    const M = w(`${(p = (k = y.data) == null ? void 0 : k[0]) == null ? void 0 : p.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (v = y.data) == null || v.forEach((r) => {
+      for (const H in r)
+        !isNaN(r[H]) && Number(r[H]) !== 1 / 0 && (r[H] = Number(r[H]));
+      const h = w(`${r.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), b = r.status, { labelCn: f, labelEn: D } = this.parseStatus(b), S = {
+        mmsi: r.mmsi,
         imo: o == null ? void 0 : o.imo,
-        lat: i.lat,
-        lng: i.lon,
-        sog: i.sog,
-        cog: i.cog,
-        hdg: i.hdg,
-        draught: i.draught,
-        status: C,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(i.eta) ? w(`${i.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: i.dest,
+        lat: r.lat,
+        lng: r.lon,
+        sog: r.sog,
+        cog: r.cog,
+        hdg: r.hdg,
+        draught: r.draught,
+        status: b,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(r.eta) ? w(`${r.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: r.dest,
         positionTime: h.unix(),
-        labelCn: g,
+        labelCn: f,
         labelEn: D,
         method: "trajectory",
         vendor: "myVessel",
         utc: h.utc().format()
-      }, q = Math.floor(h.diff(y, "minute", !0) / (a || 1));
-      q !== l && (l = q, s.push(Y));
+      }, A = Math.floor(h.diff(M, "minute", !0) / (a || 1));
+      A !== l && (l = A, s.push(S));
     }), s;
   }
 }
-class St extends st {
+class St extends $ {
   constructor(t) {
     super();
-    G(this, "token");
+    _(this, "token");
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const c = "https://api.hifleet.com/position/position/get/token", o = {
+    const i = "https://api.hifleet.com/position/position/get/token", o = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, a = await L.post(c, o).json();
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, c, o);
+    }, a = await V.post(i, o).json();
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o);
     const s = a == null ? void 0 : a.list;
     if (!s)
-      return M == null || M.warn("[%s] fetch realtime position failed: %j", n.requestId, c, a), a;
-    for (const y in s)
-      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
+      return g == null || g.warn("[%s] fetch realtime position failed: %j", n.requestId, i, a), a;
+    for (const M in s)
+      !isNaN(s[M]) && Number(s[M]) !== 1 / 0 && (s[M] = Number(s[M]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: u } = this.parseStatus(d), m = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: c, labelEn: u } = this.parseStatus(d), y = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -209,17 +209,17 @@ class St extends st {
       rot: isNaN(s.rot) ? 0 : s.rot,
       eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? w.utc(s.eta).format() : void 0,
       destination: s.destination,
-      positionTime: m.unix(),
-      utc: m.utc().format(),
+      positionTime: y.unix(),
+      utc: y.utc().format(),
       status: d,
-      labelCn: r,
+      labelCn: c,
       labelEn: u,
       method: "position",
       vendor: "hifleet"
     };
   }
   async search(t, n = {}) {
-    let c = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
     const o = {
       searchParams: {
         keyword: t
@@ -230,8 +230,8 @@ class St extends st {
         Host: "www.hifleet.com"
       }
     };
-    let a = await L.post(c, o).json();
-    M == null || M.info("[%s] fetch vessel props from: %s - %j", n.requestId, c, o), a instanceof Array && (a = a[0]);
+    let a = await V.post(i, o).json();
+    g == null || g.info("[%s] fetch vessel props from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]);
     for (const d in a)
       !isNaN(a[d]) && Number(a[d]) !== 1 / 0 && (a[d] = Number(a[d]));
     const s = {
@@ -244,10 +244,10 @@ class St extends st {
       draught: a.dr,
       type: a.t
     };
-    return c = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await L.post(c, o).json(), M == null || M.info("[%s] search vessel dead weight from: %s - %j", n.requestId, c, o), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
+    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await V.post(i, o).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", n.requestId, i, o), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
   }
   async suggest(t, n = {}) {
-    const c = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
+    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
       searchParams: {
         q: t
       },
@@ -256,8 +256,8 @@ class St extends st {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, a = await L.post(c, o).json();
-    M == null || M.info("[%s] suggest vessel props from: %s - %j", n.requestId, c, o);
+    }, a = await V.post(i, o).json();
+    g == null || g.info("[%s] suggest vessel props from: %s - %j", n.requestId, i, o);
     const s = [];
     for (const d of a)
       s.push({
@@ -267,79 +267,79 @@ class St extends st {
         imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
         score: d._score
       });
-    return s.sort((d, r) => r.score - d.score), s;
+    return s.sort((d, c) => c.score - d.score), s;
   }
-  async trajectory(t, n, c, o, a = !0, s = {}) {
-    var i, h, C;
+  async trajectory(t, n, i, o, a = !0, s = {}) {
+    var r, h, b;
     const d = await this.realTimePosition(t, s);
-    let r = w(n);
-    const u = w(c), m = w();
+    let c = w(n);
+    const u = w(i), y = w();
     if (a) {
-      let g = u.diff(r, "d", !0);
-      g < 0 ? r = u.clone().subtract(40, "d") : g < 30 ? r.subtract(10, "d") : g < 60 ? r.subtract(5, "d") : r = u.clone().subtract(80, "d"), g = m.diff(u, "d", !0), u.add(g > 10 ? 240 : g * 24, "h");
+      let f = u.diff(c, "d", !0);
+      f < 0 ? c = u.clone().subtract(40, "d") : f < 30 ? c.subtract(10, "d") : f < 60 ? c.subtract(5, "d") : c = u.clone().subtract(80, "d"), f = y.diff(u, "d", !0), u.add(f > 10 ? 240 : f * 24, "h");
     }
     const l = {
       searchParams: {
         endtime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        starttime: r.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
+        starttime: c.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         mmsi: t,
         usertoken: this.token
       }
-    }, y = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", f = await L.get(y, l).json();
-    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, l);
-    let S;
-    f && (S = ((h = (i = f.ships) == null ? void 0 : i.offors) == null ? void 0 : h.ship) || [], S.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, f));
-    const I = [];
-    let b = -1;
-    const v = w(`${(C = S == null ? void 0 : S[0]) == null ? void 0 : C.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const g of S) {
-      for (const x in g)
-        !isNaN(g[x]) && Number(g[x]) !== 1 / 0 && (g[x] = Number(g[x]));
-      const D = w(`${g.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      g.status = g.sp > 4 ? 0 : 1;
-      const { labelEn: Y, labelCn: q } = this.parseStatus(g.status), E = {
-        mmsi: g.m,
-        name: g.n,
+    }, M = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", m = await V.get(M, l).json();
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, M, l);
+    let C;
+    m && (C = ((h = (r = m.ships) == null ? void 0 : r.offors) == null ? void 0 : h.ship) || [], C.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, m));
+    const k = [];
+    let p = -1;
+    const v = w(`${(b = C == null ? void 0 : C[0]) == null ? void 0 : b.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const f of C) {
+      for (const x in f)
+        !isNaN(f[x]) && Number(f[x]) !== 1 / 0 && (f[x] = Number(f[x]));
+      const D = w(`${f.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      f.status = f.sp > 4 ? 0 : 1;
+      const { labelEn: S, labelCn: A } = this.parseStatus(f.status), H = {
+        mmsi: f.m,
+        name: f.n,
         imo: d == null ? void 0 : d.imo,
-        lat: g.la,
-        lng: g.lo,
-        draught: g.draught,
-        sog: g.sp,
-        cog: g.co,
-        hdg: g.hdg,
+        lat: f.la,
+        lng: f.lo,
+        draught: f.draught,
+        sog: f.sp,
+        cog: f.co,
+        hdg: f.hdg,
         positionTime: D.unix(),
         utc: D.utc().format(),
-        status: g.status,
-        labelCn: q,
-        labelEn: Y,
+        status: f.status,
+        labelCn: A,
+        labelEn: S,
         method: "trajectory",
         vendor: "hifleet"
-      }, k = Math.floor(D.diff(v, "minute", !0) / (o || 1));
-      k !== b && (b = k, I.push(E));
+      }, T = Math.floor(D.diff(v, "minute", !0) / (o || 1));
+      T !== p && (p = T, k.push(H));
     }
-    return I;
+    return k;
   }
 }
-class Yt extends st {
+class Yt extends $ {
   constructor(t) {
     super();
-    G(this, "token");
+    _(this, "token");
     this.token = t;
   }
   async realTimePosition(t, n = {}) {
-    const c = {
+    const i = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await L.get(o, c).json();
-    if (M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, c), (a == null ? void 0 : a.status) !== 0)
+    }, o = "https://api.shipxy.com/apicall/GetSingleShip", a = await V.get(o, i).json();
+    if (g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i), (a == null ? void 0 : a.status) !== 0)
       return a;
     const s = a.data[0];
     for (const l in s)
       !isNaN(s[l]) && Number(s[l]) !== 1 / 0 && (s[l] = Number(s[l]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
+    const { labelCn: d, labelEn: c } = await this.parseStatus(s.navistat), u = w.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -357,77 +357,77 @@ class Yt extends st {
       positionTime: s.lasttime,
       utc: u.utc().format(),
       status: s.navistat,
-      labelEn: r,
+      labelEn: c,
       labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
-  async trajectory(t, n, c, o, a = !0, s = {}) {
+  async trajectory(t, n, i, o, a = !0, s = {}) {
     var v;
-    const d = await this.realTimePosition(t, s), r = w(n), u = w(c), m = "https://api.shipxy.com/apicall/GetShipTrack", l = {
+    const d = await this.realTimePosition(t, s), c = w(n), u = w(i), y = "https://api.shipxy.com/apicall/GetShipTrack", l = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: r.unix(),
+        btm: c.unix(),
         etm: u.unix()
       }
-    }, y = await L.get(m, l).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, l), (y == null ? void 0 : y.status) !== 0)
-      return y;
-    const f = y == null ? void 0 : y.points, S = [], I = w.unix((v = f[0]) == null ? void 0 : v.utc);
-    let b = -1;
-    for (const i of f) {
-      const h = w.unix(i.utc), C = {
+    }, M = await V.get(y, l).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, l), (M == null ? void 0 : M.status) !== 0)
+      return M;
+    const m = M == null ? void 0 : M.points, C = [], k = w.unix((v = m[0]) == null ? void 0 : v.utc);
+    let p = -1;
+    for (const r of m) {
+      const h = w.unix(r.utc), b = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
-        sog: Math.round(i.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(i.cog / 100 * 100) / 100,
-        lat: Math.round(i.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(i.lon / 1e6 * 1e5) / 1e5,
+        sog: Math.round(r.sog * 3600 / 1e3 / 1852 * 100) / 100,
+        cog: Math.round(r.cog / 100 * 100) / 100,
+        lat: Math.round(r.lat / 1e6 * 1e5) / 1e5,
+        lng: Math.round(r.lon / 1e6 * 1e5) / 1e5,
         positionTime: h.unix(),
         utc: h.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, g = Math.floor(h.diff(I, "minute", !0) / (o || 1));
-      g !== b && (b = g, S.push(C));
+      }, f = Math.floor(h.diff(k, "minute", !0) / (o || 1));
+      f !== p && (p = f, C.push(b));
     }
-    return S;
+    return C;
   }
 }
-class jt extends st {
+class jt extends $ {
   constructor(t) {
     super();
-    G(this, "token");
+    _(this, "token");
     this.token = t;
   }
   async getShipId(t, n = {}) {
-    const c = {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await L.post(o, c).json();
-    return M == null || M.info("[%s] fetch ship id from: %s - %j", n.requestId, o, c), a.code !== "0" ? a : a.data[0].shipId;
+    }, o = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await V.post(o, i).json();
+    return g == null || g.info("[%s] fetch ship id from: %s - %j", n.requestId, o, i), a.code !== "0" ? a : a.data[0].shipId;
   }
   async getShipInfo(t, n = {}) {
-    const c = {
+    const i = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, o = "https://api3.myships.com/sp/ships/aissta", a = await L.post(o, c).json();
-    if (M == null || M.info("[%s] fetch ship info from: %s - %j", n.requestId, o, c), a.code !== "0")
+    }, o = "https://api3.myships.com/sp/ships/aissta", a = await V.post(o, i).json();
+    if (g == null || g.info("[%s] fetch ship info from: %s - %j", n.requestId, o, i), a.code !== "0")
       return a;
     const s = a.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
+    return t === "407170" && (d = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -438,45 +438,45 @@ class jt extends st {
     };
   }
   async realTimePosition(t, n = {}) {
-    const c = await this.getShipId(t, n), o = await this.getShipInfo(c, n), a = {
+    const i = await this.getShipId(t, n), o = await this.getShipInfo(i, n), a = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: c
+        shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await L.post(s, a).json();
-    M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
-    const r = d.data[0];
-    for (const f in r)
-      !isNaN(r[f]) && Number(r[f]) !== 1 / 0 && (r[f] = Number(r[f]));
-    const { labelCn: u, labelEn: m } = await this.parseStatus(r.aisNavStatus), l = w.unix(r.posTime);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await V.post(s, a).json();
+    g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, s, a);
+    const c = d.data[0];
+    for (const m in c)
+      !isNaN(c[m]) && Number(c[m]) !== 1 / 0 && (c[m] = Number(c[m]));
+    const { labelCn: u, labelEn: y } = await this.parseStatus(c.aisNavStatus), l = w.unix(c.posTime);
     return {
       ...o,
       mmsi: t,
-      lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
-      lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
-      sog: Math.round(r.sog / 10 * 100) / 100,
-      cog: Math.round(r.cog / 10 * 100) / 100,
-      hdg: Math.round(r.heading * 100) / 100,
-      rot: Math.round(r.rot * 100) / 100,
-      positionTime: r.posTime,
+      lat: Math.round(c.lat / 1e4 / 60 * 1e5) / 1e5,
+      lng: Math.round(c.lon / 1e4 / 60 * 1e5) / 1e5,
+      sog: Math.round(c.sog / 10 * 100) / 100,
+      cog: Math.round(c.cog / 10 * 100) / 100,
+      hdg: Math.round(c.heading * 100) / 100,
+      rot: Math.round(c.rot * 100) / 100,
+      positionTime: c.posTime,
       utc: l.utc().format(),
-      status: r.aisNavStatus,
-      labelEn: m,
+      status: c.aisNavStatus,
+      labelEn: y,
       labelCn: u,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, n, c, o, a = !0, s = {}) {
-    const d = w(n), r = w(c), u = await this.getShipId(t), m = await this.getShipInfo(u), l = [];
-    for (; r.diff(d, "day", !0) > 30; )
-      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), m, t, o, l);
-    return await this.trajectoryIn30Day(u, d.unix(), r.unix(), m, t, o, l), l;
+  async trajectory(t, n, i, o, a = !0, s = {}) {
+    const d = w(n), c = w(i), u = await this.getShipId(t), y = await this.getShipInfo(u), l = [];
+    for (; c.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(u, d.unix(), d.add(30, "day").unix(), y, t, o, l);
+    return await this.trajectoryIn30Day(u, d.unix(), c.unix(), y, t, o, l), l;
   }
-  async trajectoryIn30Day(t, n, c, o, a, s, d, r = {}) {
-    var I;
+  async trajectoryIn30Day(t, n, i, o, a, s, d, c = {}) {
+    var k;
     const u = {
       headers: {
         appKey: this.token
@@ -484,44 +484,44 @@ class jt extends st {
       json: {
         shipId: t,
         startTime: n,
-        endTime: c
+        endTime: i
       }
-    }, m = "https://api3.myships.com/sp/ships/position/history", l = await L.post(m, u).json();
-    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", r.requestId, m, u), l.code !== "0")
-      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", r.requestId, l), l;
-    const y = l.data;
-    for (const b in y)
-      !isNaN(y[b]) && Number(y[b]) !== 1 / 0 && (y[b] = Number(y[b]));
-    const f = w.unix((I = y[0]) == null ? void 0 : I.posTime);
-    let S = -1;
-    for (const b of y) {
-      const v = w.unix(b.posTime), i = {
+    }, y = "https://api3.myships.com/sp/ships/position/history", l = await V.post(y, u).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", c.requestId, y, u), l.code !== "0")
+      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", c.requestId, l), l;
+    const M = l.data;
+    for (const p in M)
+      !isNaN(M[p]) && Number(M[p]) !== 1 / 0 && (M[p] = Number(M[p]));
+    const m = w.unix((k = M[0]) == null ? void 0 : k.posTime);
+    let C = -1;
+    for (const p of M) {
+      const v = w.unix(p.posTime), r = {
         imo: o == null ? void 0 : o.imo,
         mmsi: a,
-        lat: Math.round(b.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(b.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(b.sog / 10 * 100) / 100,
-        cog: Math.round(b.cog / 10 * 100) / 100,
-        hdg: Math.round(b.heading * 100) / 100,
-        rot: Math.round(b.rot * 100) / 100,
+        lat: Math.round(p.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(p.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(p.sog / 10 * 100) / 100,
+        cog: Math.round(p.cog / 10 * 100) / 100,
+        hdg: Math.round(p.heading * 100) / 100,
+        rot: Math.round(p.rot * 100) / 100,
         positionTime: v.unix(),
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, h = Math.floor(v.diff(f, "minute", !0) / (s || 1));
-      h !== S && (S = h, d.push(i));
+      }, h = Math.floor(v.diff(m, "minute", !0) / (s || 1));
+      h !== C && (C = h, d.push(r));
     }
     return d;
   }
 }
-let V;
+let B;
 try {
-  V = at.getLogger("vessel");
+  B = at.getLogger("vessel");
 } catch {
 } finally {
 }
-var ut = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(ut || {});
-class ht {
+var lt = /* @__PURE__ */ ((Y) => (Y.NOTICE = "NOTICE", Y.WARN = "WARN", Y.HEAVY = "HEAVY", Y.SEVERE = "SEVERE", Y.ERROR = "ERROR", Y.FATAL = "FATAL", Y))(lt || {});
+class ft {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -531,20 +531,20 @@ class ht {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, d, r;
-    V == null || V.info("[%s] parse rule: %s", t.requestId, e);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), c = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, o = c == null ? void 0 : c.split(";");
+    var s, d, c;
+    B == null || B.info("[%s] parse rule: %s", t.requestId, e);
+    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, o = i == null ? void 0 : i.split(";");
     if (!o)
       return;
     const a = {};
     for (let u = 0; u < (o == null ? void 0 : o.length); u++) {
-      const m = (r = (d = o[u].match(n)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (u === 0 && !m)
+      const y = (c = (d = o[u].match(n)) == null ? void 0 : d[0]) == null ? void 0 : c.split("],");
+      if (u === 0 && !y)
         a.scope = o[0];
-      else if (m)
-        for (let l = 0, y = m.length; l < y; l++) {
-          const f = this.parseRule(m[l]);
-          f && (a[f.level] ? f.key ? a[f.level][f == null ? void 0 : f.key] = f : a[f.level] = f : f.key ? a[f.level] = { [f == null ? void 0 : f.key]: f } : a[f.level] = f);
+      else if (y)
+        for (let l = 0, M = y.length; l < M; l++) {
+          const m = this.parseRule(y[l]);
+          m && (a[m.level] ? m.key ? a[m.level][m == null ? void 0 : m.key] = m : a[m.level] = m : m.key ? a[m.level] = { [m == null ? void 0 : m.key]: m } : a[m.level] = m);
         }
     }
     return a;
@@ -557,8 +557,8 @@ class ht {
    */
   parseRule(e, t = {}) {
     var a;
-    V == null || V.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), c = (a = e == null ? void 0 : e.match(n)) == null ? void 0 : a[0], o = c == null ? void 0 : c.split(",");
+    B == null || B.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
+    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (a = e == null ? void 0 : e.match(n)) == null ? void 0 : a[0], o = i == null ? void 0 : i.split(",");
     if (o)
       return {
         operator: o[0],
@@ -575,26 +575,26 @@ class ht {
    * @param options
    */
   checkWeather(e, t, n = {}) {
-    var f, S, I, b, v, i, h, C, g, D, Y, q, E, k, x;
-    let c = 0, o = 0, a = 0, s = 0;
-    const d = Math.round(((S = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.sigWave) == null ? void 0 : S.number) * 1.6 * 100) / 100, r = (b = (I = t == null ? void 0 : t.SEVERE) == null ? void 0 : I.sigWave) == null ? void 0 : b.number, u = (i = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : i.number, m = Math.round((((C = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : C.number) + 2) * 100) / 100, l = (D = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.wind) == null ? void 0 : D.number, y = (q = (Y = t == null ? void 0 : t.HEAVY) == null ? void 0 : Y.wind) == null ? void 0 : q.number;
-    for (let P = 0; P < (e == null ? void 0 : e.length); P++) {
-      const T = e[P], F = (k = (E = T == null ? void 0 : T.meteo) == null ? void 0 : E.wave) == null ? void 0 : k.sig, W = (x = T == null ? void 0 : T.meteo) == null ? void 0 : x.wind, B = P ? w(T.eta).diff(w(e[P - 1].eta), "hour", !0) : 0;
-      s = B > s ? B : s, V == null || V.info("[%s] check sig.wave: %j", n.requestId, { ...F, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u }), (F == null ? void 0 : F.height) >= d ? T.isDangerous = !0 : (F == null ? void 0 : F.height) >= r ? T.isSevere = !0 : (F == null ? void 0 : F.height) >= u && (T.isHeavy = !0), V == null || V.info("[%s] check wind: %j", n.requestId, { ...W, dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }), (W == null ? void 0 : W.scale) >= m ? (T.isDangerous = !0, delete T.isSevere, delete T.isHeavy) : (W == null ? void 0 : W.scale) > l ? (T.isDangerous || (T.isSevere = !0), delete T.isHeavy) : (W == null ? void 0 : W.scale) === y && !T.isDangerous && !T.isSevere && (T.isHeavy = !0), c += T.isDangerous ? B : 0, o += T.isSevere ? B : 0, a += T.isHeavy ? B : 0;
+    var m, C, k, p, v, r, h, b, f, D, S, A, H, T, x;
+    let i = 0, o = 0, a = 0, s = 0;
+    const d = Math.round(((C = (m = t == null ? void 0 : t.SEVERE) == null ? void 0 : m.sigWave) == null ? void 0 : C.number) * 1.6 * 100) / 100, c = (p = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : p.number, u = (r = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : r.number, y = Math.round((((b = (h = t == null ? void 0 : t.SEVERE) == null ? void 0 : h.wind) == null ? void 0 : b.number) + 2) * 100) / 100, l = (D = (f = t == null ? void 0 : t.SEVERE) == null ? void 0 : f.wind) == null ? void 0 : D.number, M = (A = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : A.number;
+    for (let W = 0; W < (e == null ? void 0 : e.length); W++) {
+      const j = e[W], F = (T = (H = j == null ? void 0 : j.meteo) == null ? void 0 : H.wave) == null ? void 0 : T.sig, L = (x = j == null ? void 0 : j.meteo) == null ? void 0 : x.wind, Z = W ? w(j.eta).diff(w(e[W - 1].eta), "hour", !0) : 0;
+      s = Z > s ? Z : s, B == null || B.info("[%s] check sig.wave: %j", n.requestId, { ...F, dgThd4Wv: d, svThd4Wv: c, hvThd4Wv: u }), (F == null ? void 0 : F.height) >= d ? j.isDangerous = !0 : (F == null ? void 0 : F.height) >= c ? j.isSevere = !0 : (F == null ? void 0 : F.height) >= u && (j.isHeavy = !0), B == null || B.info("[%s] check wind: %j", n.requestId, { ...L, dgThd4Wd: y, svThd4Wd: l, hvThd4Wd: M }), (L == null ? void 0 : L.scale) >= y ? (j.isDangerous = !0, delete j.isSevere, delete j.isHeavy) : (L == null ? void 0 : L.scale) > l ? (j.isDangerous || (j.isSevere = !0), delete j.isHeavy) : (L == null ? void 0 : L.scale) === M && !j.isDangerous && !j.isSevere && (j.isHeavy = !0), i += j.isDangerous ? Z : 0, o += j.isSevere ? Z : 0, a += j.isHeavy ? Z : 0;
     }
-    return c = Math.round(c * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: c, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: m, svThd4Wd: l, hvThd4Wd: y }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
+    return i = Math.round(i * 100) / 100, o = Math.round(o * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: o, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: y, svThd4Wd: l, hvThd4Wd: M }, sig: { dgThd4Wv: d, svThd4Wv: c, hvThd4Wv: u } };
   }
 }
-const Ct = new ht();
-let p;
+const Dt = new ft();
+let I;
 try {
-  p = at.getLogger("vessel");
+  I = at.getLogger("vessel");
 } catch {
 } finally {
 }
-const lt = new rt("", !0);
-var ft = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(ft || {}), mt = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(mt || {}), yt = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(yt || {});
-class A {
+const mt = new ut("", !0);
+var yt = /* @__PURE__ */ ((Y) => (Y.common = "common", Y.container = "container", Y.tugs = "tugs", Y))(yt || {}), Mt = /* @__PURE__ */ ((Y) => (Y.Ballast = "Ballast", Y.Laden = "Laden", Y))(Mt || {}), gt = /* @__PURE__ */ ((Y) => (Y.Cp = "CP", Y.Perf = "Basis", Y.Instruct = "Other", Y))(gt || {});
+class q {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -607,8 +607,8 @@ class A {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, n, c) {
-    let o = Math.round(e / (t * n * c) * 100) / 100;
+  static blockCoefficient(e, t, n, i) {
+    let o = Math.round(e / (t * n * i) * 100) / 100;
     o = o < 0.55 ? 0.55 : o > 0.85 ? 0.85 : o;
     const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = a.map((d) => Math.abs(d - o));
     return a[s.indexOf(Math.min(...s))];
@@ -625,8 +625,8 @@ class A {
    * @return [0.05, 0.30]
    */
   static froudeNumber(e, t, n = 9.8) {
-    let c = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
-    return c = c < 0.05 ? 0.05 : c > 0.3 ? 0.3 : c, c;
+    let i = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
+    return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
   }
   /**
    * 失速修正系數
@@ -636,7 +636,7 @@ class A {
    * @private
    */
   static amendFactor(e, t, n) {
-    const c = {
+    const i = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -654,7 +654,7 @@ class A {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[e];
-    return n === "Laden" && (a = c[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    return n === "Laden" && (a = i[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -682,10 +682,10 @@ class A {
    * @param bn
    * @private
    */
-  static vesselTagFactor(e, t, n, c = 0) {
-    c = c > 6 ? c - 0.9 * (c - 6) : c;
+  static vesselTagFactor(e, t, n, i = 0) {
+    i = i > 6 ? i - 0.9 * (i - 6) : i;
     let o;
-    return n === "container" ? o = 0.7 * c + Math.pow(c, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * c + Math.pow(c, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * c + Math.pow(c, 6.5) / (2.7 * Math.pow(e, 2 / 3)), o;
+    return n === "container" ? o = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? o = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : o = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), o;
   }
   /**
    * 浪高影响因子
@@ -705,11 +705,11 @@ class A {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, n, c) {
+  static assembleProperties(e, t, n, i) {
     var l;
-    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((l = e == null ? void 0 : e.type) == null ? void 0 : l.toLowerCase()) || "common";
+    const o = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, c = ((l = e == null ? void 0 : e.type) == null ? void 0 : l.toLowerCase()) || "common";
     return {
-      tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
+      tag: c.indexOf("container") > -1 ? "container" : c.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: o,
       loadCondition: t,
       draught: a,
@@ -719,7 +719,7 @@ class A {
       displacement: Math.round((d / 1.025 + a * s * o * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((n ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: c || 90
+      bearing: i || 90
     };
   }
   /**
@@ -732,37 +732,37 @@ class A {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, n, c = "", o = 2, a = !0, s = !1, d = {}) {
-    let r;
-    if (t.velocity && s && (e.speed = Z.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
+  static async speedLoseAt(e, t, n, i = "", o = 2, a = !0, s = !1, d = {}) {
+    let c;
+    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
       let u;
       if (d.meteo2)
         try {
-          const f = await lt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [S] = nt.pickHourly(f, n);
-          u = nt.toLegacy(S);
-        } catch (f) {
-          p.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, f);
+          const m = await mt.spotForecast(t.lat, t.lng, n.utc().format(), !1, !1, !0, d), [C] = ct.pickHourly(m, n);
+          u = ct.toLegacy(C);
+        } catch (m) {
+          I.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: n.utc().format() }, m);
         }
       else
-        u = await dt.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", c, d);
-      const m = A.weatherFactor(e, u), l = A.currentFactor(e.bearing, u == null ? void 0 : u.current, o), y = Math.round((e.speed * 1.943844 + m + l) * 100) / 100;
-      r = {
+        u = await ht.queryPointFactor(t.lng, t.lat, n.valueOf(), "wind,wave,current,watertemp", i, d);
+      const y = q.weatherFactor(e, u), l = q.currentFactor(e.bearing, u == null ? void 0 : u.current, o), M = Math.round((e.speed * 1.943844 + y + l) * 100) / 100;
+      c = {
         meteo: { ...u },
-        wxFactor: m,
+        wxFactor: y,
         cFactor: l,
-        speed: t.velocity && s ? t.velocity : y < 0 ? 1 : y,
+        speed: t.velocity && s ? t.velocity : M < 0 ? 1 : M,
         eta: n.utc().format("YYYY-MM-DDTHH:mm[Z]"),
         etd: n.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     } else
-      r = {
+      c = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
         eta: n.utc().format("YYYY-MM-DDTHH:mm[Z]"),
         etd: n.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
-    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...r, ...t };
+    return delete t.meteo, delete t.wxFactor, delete t.cFactor, delete t.speed, delete t.etd, { ...c, ...t };
   }
   /**
    * 基于步长计算失速样本
@@ -777,53 +777,53 @@ class A {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, c, o, a, s = "", d = !0, r = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, n, i, o, a, s = "", d = !0, c = !1, u = {}) {
     t.utc();
-    const m = t.clone().add(14, "days"), l = [], y = [];
-    let f = 0, S = 0, I, b;
+    const y = t.clone().add(14, "days"), l = [], M = [];
+    let m = 0, C = 0, k, p;
     for (let v = 0; v < a.length - 1; v++) {
-      let i = a[v];
-      i.distanceFromStart = Math.round((o + S) * 1e4) / 1e4;
+      let r = a[v];
+      r.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
       const h = a[v + 1];
-      if (e.bearing = R.calculateBearing(i, h, !h.gcToPrevious), i.bearing = e.bearing, i.suspend && r) {
-        i.eta = i.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), i.elapsed = i.elapsed ?? 0;
-        const D = i.suspend - i.elapsed;
-        if (c - f > D)
-          c = c - f - D, t.add(D, "hour"), i.elapsed = i.suspend;
+      if (e.bearing = R.calculateBearing(r, h, !h.gcToPrevious), r.bearing = e.bearing, r.suspend && c) {
+        r.eta = r.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), r.elapsed = r.elapsed ?? 0;
+        const D = r.suspend - r.elapsed;
+        if (i - m > D)
+          i = i - m - D, t.add(D, "hour"), r.elapsed = r.suspend;
         else {
-          const Y = c - f;
-          i.elapsed += Y, t.add(Y, "hour"), c = 0;
+          const S = i - m;
+          r.elapsed += S, t.add(S, "hour"), i = 0;
         }
-        if (p == null || p.info(`[%s] suspend ${i.elapsed} hours at %j, and remain ${c} hours need to go...`, u.requestId, i), c === 0)
-          return i.distanceFromPrevious = S, { etd: t, from: b || i, to: i, next: a.filter((Y) => Y), wps: l, days: y };
+        if (I == null || I.info(`[%s] suspend ${r.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, r), i === 0)
+          return r.distanceFromPrevious = C, { etd: t, from: p || r, to: r, next: a.filter((S) => S), wps: l, days: M };
       } else
-        i.suspend = 0;
-      d = t.isAfter(m) ? !1 : d, i = await A.speedLoseAt(e, i, t, s, 0, d, r, u), b = b || i, i.important && l.push(i), t.isSameOrAfter(n) && (y.push(i), n.add(24, "hour"));
-      const C = R.calculateDistance(i, h, !h.gcToPrevious);
-      let g = Math.ceil(C / b.speed * 1e4) / 1e4;
-      if (f + g < c) {
-        if (f += g, t.add(g, "hour"), delete a[v], p == null || p.debug(
-          `[%s] go to %j from %j with ${C}nm, and cost ${g} hours`,
+        r.suspend = 0;
+      d = t.isAfter(y) ? !1 : d, r = await q.speedLoseAt(e, r, t, s, 0, d, c, u), p = p || r, r.important && l.push(r), t.isSameOrAfter(n) && (M.push(r), n.add(24, "hour"));
+      const b = R.calculateDistance(r, h, !h.gcToPrevious);
+      let f = Math.ceil(b / p.speed * 1e4) / 1e4;
+      if (m + f < i) {
+        if (m += f, t.add(f, "hour"), delete a[v], I == null || I.debug(
+          `[%s] go to %j from %j with ${b}nm, and cost ${f} hours`,
           u.requestId,
           { lat: h.lat, lng: h.lng },
-          { lat: b.lat, lng: b.lng, etd: b.etd }
-        ), S += C, a.filter((D) => D).length <= 1) {
-          I = h, I.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), I.distanceFromPrevious = C, I.distanceFromStart = Math.round((o + S) * 1e4) / 1e4, l.push(I), delete a[v + 1];
+          { lat: p.lat, lng: p.lng, etd: p.etd }
+        ), C += b, a.filter((D) => D).length <= 1) {
+          k = h, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = b, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4, l.push(k), delete a[v + 1];
           break;
         }
       } else {
-        g = c - f, t.add(g, "hour");
-        const D = Z.roundPrecision(b.speed * g, 4);
-        I = R.calculateCoordinate(i, e.bearing, D, "nauticalmiles", !h.gcToPrevious), I.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[v] = I, p == null || p.debug(
-          `[%s] go to %j from %j with ${D}nm, and cost ${g} hours`,
+        f = i - m, t.add(f, "hour");
+        const D = J.roundPrecision(p.speed * f, 4);
+        k = R.calculateCoordinate(r, e.bearing, D, "nauticalmiles", !h.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), a[v] = k, I == null || I.debug(
+          `[%s] go to %j from %j with ${D}nm, and cost ${f} hours`,
           u.requestId,
-          { lat: I.lat, lng: I.lng },
-          { lat: i.lat, lng: i.lng, etd: i.etd }
-        ), S += D, I.distanceFromPrevious = Math.round(S * 1e4) / 1e4, I.distanceFromStart = Math.round((o + S) * 1e4) / 1e4;
+          { lat: k.lat, lng: k.lng },
+          { lat: r.lat, lng: r.lng, etd: r.etd }
+        ), C += D, k.distanceFromPrevious = Math.round(C * 1e4) / 1e4, k.distanceFromStart = Math.round((o + C) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: b, to: I, next: a.filter((v) => v), wps: l, days: y };
+    return { etd: t, from: p, to: k, next: a.filter((v) => v), wps: l, days: M };
   }
   /**
    * 洋流影响因子
@@ -832,10 +832,10 @@ class A {
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
   static currentFactor(e, t, n = 0) {
-    const c = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(c) === Math.PI / 2)
+    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+    if (Math.abs(i) === Math.PI / 2)
       return 0;
-    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(c);
+    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
     return n & 2 ? o = Math.ceil(o * 100) / 100 : n & 1 ? o = Math.floor(o * 100) / 100 : o = Math.round(o * 100) / 100, Math.abs(o) > 5 ? 0 : o;
   }
   /**
@@ -844,16 +844,16 @@ class A {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var m, l, y, f, S, I, b;
-    p == null || p.debug("calculate weather factor via: %j", { ...e, ...t });
-    const n = A.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), c = A.froudeNumber(e.speed, e.lbp), o = A.amendFactor(n, c, e.loadCondition);
-    let a = Math.abs(e.bearing % 360 - (((m = t == null ? void 0 : t.wind) == null ? void 0 : m.degree) % 360 || 0));
+    var y, l, M, m, C, k, p;
+    I == null || I.debug("calculate weather factor via: %j", { ...e, ...t });
+    const n = q.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = q.froudeNumber(e.speed, e.lbp), o = q.amendFactor(n, i, e.loadCondition);
+    let a = Math.abs(e.bearing % 360 - (((y = t == null ? void 0 : t.wind) == null ? void 0 : y.degree) % 360 || 0));
     a = a > 180 ? 360 - a : a;
-    const s = A.directionFactor(a, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = A.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (y = t == null ? void 0 : t.wind) == null ? void 0 : y.scale);
-    let r = s * o * d / 100 * e.speed;
-    r = Math.round(r * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(r) > 1 && (r = r / (Math.abs(Math.round(r)) + 1)), p == null || p.debug("wind wx factor = %d", r), a = Math.abs(e.bearing % 360 - (((S = (f = t == null ? void 0 : t.wave) == null ? void 0 : f.sig) == null ? void 0 : S.degree) % 360 || 0));
-    const u = A.waveHeightFactor(((b = (I = t == null ? void 0 : t.wave) == null ? void 0 : I.sig) == null ? void 0 : b.height) ?? 1, a);
-    return p == null || p.debug("wave wx factor = %d", u), r = r * 0.4 + u, p == null || p.debug("weather factor = %d", r), r = Math.abs(r) > 4 ? 4 * (Math.abs(r) / r) + Math.abs(r) / r * (Math.abs(r) - 4) * 0.1 : r, Math.round((r || 0) * 100) / 100;
+    const s = q.directionFactor(a, (l = t == null ? void 0 : t.wind) == null ? void 0 : l.scale), d = q.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (M = t == null ? void 0 : t.wind) == null ? void 0 : M.scale);
+    let c = s * o * d / 100 * e.speed;
+    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), I == null || I.debug("wind wx factor = %d", c), a = Math.abs(e.bearing % 360 - (((C = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : C.degree) % 360 || 0));
+    const u = q.waveHeightFactor(((p = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : p.height) ?? 1, a);
+    return I == null || I.debug("wave wx factor = %d", u), c = c * 0.4 + u, I == null || I.debug("weather factor = %d", c), c = Math.abs(c) > 4 ? 4 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 4) * 0.1 : c, Math.round((c || 0) * 100) / 100;
   }
   /**
    * 全程失速分析(走完航程)
@@ -867,74 +867,81 @@ class A {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, n, c, o, a = "", s = 0, d = !0, r = !1, u = {}) {
-    var B, Q, X, $, tt;
-    const m = w().valueOf();
-    e.lng = Z.convertToStdLng(e.lng);
-    const { route: l, waypoints: y } = o.points, f = R.calculateSubRoute(e, l);
-    if (((B = f[0]) == null ? void 0 : B.length) <= 1)
+  static async analyseInstant(e, t, n, i, o, a = "", s = 0, d = !0, c = !1, u = {}) {
+    var K, G, z, U, Q;
+    const y = w().valueOf();
+    e.lng = J.convertToStdLng(e.lng);
+    const { route: l, waypoints: M } = o.points, m = R.calculateSubRoute(e, l);
+    if (((K = m[0]) == null ? void 0 : K.length) <= 1)
       return;
-    const { v0: S, label: I } = e.sog ? {
+    const { v0: C, label: k } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: c.speed,
+      v0: i.speed,
       label: "CP"
       /* Cp */
-    }, b = A.assembleProperties(n, c.loadCondition, S, 0), v = y.length ? R.calculateSubWaypoints(e, y) : [];
+    }, p = q.assembleProperties(n, i.loadCondition, C, 0), v = M.length ? R.calculateSubWaypoints(e, M) : [];
     v.forEach((N) => N.important = !0);
-    const i = {
+    const r = {
       from: { ...e },
-      route: f,
+      route: m,
       waypoints: v,
-      v0: S,
-      label: I
+      v0: C,
+      label: k
     }, h = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (R.calculateRouteDistance(f) / c.speed <= 72 ? s = 3 : s = 6);
-    let C = R.simplifyRouteToCoordinates(f, v, 0), g = 0, D = 0, Y = 0, q = 0;
+    s || (R.calculateRouteDistance(m) / i.speed <= 72 ? s = 3 : s = 6);
+    let b = R.simplifyRouteToCoordinates(m, v, 0), f = 0, D = 0, S = 0, A = 0;
     t = w(t).utc();
-    const E = t.clone();
-    for (; C.length > 0; ) {
-      const N = s - t.hour() % s, J = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, H = await A.speedLoseInHoursStep(
-        b,
+    const H = t.clone();
+    for (; b.length > 0; ) {
+      const N = s - t.hour() % s, P = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, E = await q.speedLoseInHoursStep(
+        p,
         t,
-        E,
-        J,
-        g,
-        C,
+        H,
+        P,
+        f,
+        b,
         a,
         d,
-        r,
+        c,
         u
       );
-      (Q = H.from) != null && Q.speed && (h.hours.push(H.from), h.wps.push(...H.wps), h.days.push(...H.days)), C = H == null ? void 0 : H.next, C.length || h.hours.push(H == null ? void 0 : H.to), g += Math.round((((X = H == null ? void 0 : H.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (G = E.from) != null && G.speed && (h.hours.push(E.from), h.wps.push(...E.wps), h.days.push(...E.days)), b = E == null ? void 0 : E.next, b.length || h.hours.push(E == null ? void 0 : E.to), f += Math.round((((z = E == null ? void 0 : E.to) == null ? void 0 : z.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const k = h.hours;
-    for (let N = 0; N < k.length - 1; N++) {
-      const J = w(k[N + 1].eta).diff(k[N].etd, "hour", !0) || 1;
-      D += (k[N].wxFactor || 0) * J, Y += (k[N].cFactor || 0) * J, q += J;
+    const T = h.hours;
+    for (let N = 0; N < T.length - 1; N++) {
+      const P = w(T[N + 1].eta).diff(T[N].etd, "hour", !0) || 1;
+      D += (T[N].wxFactor || 0) * P, S += (T[N].cFactor || 0) * P, A += P;
     }
-    ($ = h.wps) == null || $.forEach((N, J) => {
-      if (N.positionTime = w.utc(N.etd || N.eta).unix(), J) {
-        const H = h.wps[J - 1], et = N.distanceFromStart - H.distanceFromStart, z = w(N.eta).diff(w(H.etd), "h", !0);
-        if (z < 1)
-          N.avgSpd = H.speed;
+    (U = h.wps) == null || U.forEach((N, P) => {
+      if (N.positionTime = w.utc(N.etd || N.eta).unix(), P) {
+        const E = h.wps[P - 1], O = N.distanceFromStart - E.distanceFromStart, nt = w(N.eta).diff(w(E.etd), "h", !0);
+        if (nt < 1)
+          N.avgSpd = E.speed;
         else {
-          N.avgSpd = Math.round(et / z * 100) / 100;
-          const U = Math.round((H.speed + N.speed) / 2 * 100) / 100;
-          N.avgSpd = N.avgSpd > U ? U : N.avgSpd;
+          N.avgSpd = Math.round(O / nt * 100) / 100;
+          const it = Math.round((E.speed + N.speed) / 2 * 100) / 100;
+          N.avgSpd = N.avgSpd > it ? it : N.avgSpd;
         }
       }
-    }), i.sample = h;
-    const x = h.hours.at(0), P = h.hours.at(-1);
-    i.distance = Math.round(P.distanceFromStart * 1e4) / 1e4, i.etd = w(x.eta).utc().format(), i.eta = w(P.eta).utc().format(), i.wxFactor = Math.round(D / q * 1e4) / 1e4, i.cFactor = Math.round(Y / q * 1e4) / 1e4, i.avgSpeed = Math.round(P.distanceFromStart / q * 1e4) / 1e4, i.totalHrs = Math.round(q * 1e4) / 1e4, i.totalFoCons = Math.round((c == null ? void 0 : c.fo) / 24 * i.totalHrs * 1e3) / 1e3, i.totalDgoCons = Math.round((c == null ? void 0 : c.dgo) / 24 * i.totalHrs * 1e3) / 1e3;
-    const F = w().valueOf() - m, W = ((tt = h == null ? void 0 : h.hours) == null ? void 0 : tt.length) || 1;
-    return p == null || p.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, F, W, Math.round(F / W * 1e3) / 1e3), i;
+    }), r.sample = h;
+    const x = h.hours.at(0), W = h.hours.at(-1);
+    r.distance = Math.round(W.distanceFromStart * 1e4) / 1e4, r.etd = w(x.eta).utc().format(), r.eta = w(W.eta).utc().format(), r.wxFactor = Math.round(D / A * 1e4) / 1e4, r.cFactor = Math.round(S / A * 1e4) / 1e4, r.avgSpeed = Math.round(W.distanceFromStart / A * 1e4) / 1e4, r.totalHrs = Math.round(A * 1e4) / 1e4;
+    const { distanceInECA: j, hoursInECA: F, totalDgoConsInECA: L, eca: Z } = await this.calculateECA(r, i, u), tt = J.roundPrecision(i.fo / 24 * (A - F), 3), et = J.roundPrecision(i.dgo / 24 * A, 3);
+    r.extend = {
+      eca: Z,
+      distanceInECA: j,
+      hoursInECA: F,
+      totalDgoConsInECA: L
+    }, r.totalFoCons = tt, r.totalDgoCons = et;
+    const X = w().valueOf() - y, st = ((Q = h == null ? void 0 : h.hours) == null ? void 0 : Q.length) || 1;
+    return I == null || I.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, X, st, Math.round(X / st * 1e3) / 1e3), r;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -949,11 +956,11 @@ class A {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, n, c, o, a, s, d = "", r = 3, u = !0, m = !1, l = {}) {
-    var et, z, U, ot;
-    const y = w().valueOf();
-    e.lng = Z.convertToStdLng(e.lng);
-    const { v0: f, label: S } = e.sog ? {
+  static async analyseInstantWithThreshed(e, t, n, i, o, a, s, d = "", c = 3, u = !0, y = !1, l = {}) {
+    var z, U, Q, N;
+    const M = w().valueOf();
+    e.lng = J.convertToStdLng(e.lng);
+    const { v0: m, label: C } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -961,52 +968,57 @@ class A {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, I = A.assembleProperties(c, o.loadCondition, f, 0), b = R.calculateSubRoute(e, a);
-    if (((et = b[0]) == null ? void 0 : et.length) <= 1)
+    }, k = q.assembleProperties(i, o.loadCondition, m, 0), p = R.calculateSubRoute(e, a);
+    if (((z = p[0]) == null ? void 0 : z.length) <= 1)
       return;
     const v = s.length ? R.calculateSubWaypoints(e, s) : [];
-    v.forEach((_) => _.important = !0);
-    let i = R.simplifyRouteToCoordinates(b, v, 0), h = 0, C = 0, g = 0, D = 0;
-    const Y = {
+    v.forEach((P) => P.important = !0);
+    let r = R.simplifyRouteToCoordinates(p, v, 0), h = 0, b = 0, f = 0, D = 0;
+    const S = {
       hours: [],
       wps: [],
       days: []
     };
     t = w(t).utc();
-    const q = t.clone();
-    for (; i.length > 0; ) {
-      const _ = r - t.hour() % r;
-      let K = Math.ceil(t.clone().add(_, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      K = t.clone().add(K, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : K;
-      const O = await A.speedLoseInHoursStep(I, t, q, K, h, i, d, u, m, l);
-      if ((z = O.from) != null && z.speed && (Y.hours.push(O.from), O != null && O.wps && Y.wps.push(...O.wps), Y.days.push(...O.days)), i = O == null ? void 0 : O.next, i.length || Y.hours.push(O == null ? void 0 : O.to), h += Math.round((((U = O == null ? void 0 : O.to) == null ? void 0 : U.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !K)
+    const A = t.clone();
+    for (; r.length > 0; ) {
+      const P = c - t.hour() % c;
+      let E = Math.ceil(t.clone().add(P, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
+      E = t.clone().add(E, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : E;
+      const O = await q.speedLoseInHoursStep(k, t, A, E, h, r, d, u, y, l);
+      if ((U = O.from) != null && U.speed && (S.hours.push(O.from), O != null && O.wps && S.wps.push(...O.wps), S.days.push(...O.days)), r = O == null ? void 0 : O.next, r.length || S.hours.push(O == null ? void 0 : O.to), h += Math.round((((Q = O == null ? void 0 : O.to) == null ? void 0 : Q.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !E)
         break;
     }
-    const E = Y.hours;
-    for (let _ = 0; _ < E.length - 1; _++) {
-      const K = w(E[_ + 1].eta).diff(E[_].etd, "hour", !0);
-      C += E[_].wxFactor * K, g += E[_].cFactor * K, D += K;
+    const H = S.hours;
+    for (let P = 0; P < H.length - 1; P++) {
+      const E = w(H[P + 1].eta).diff(H[P].etd, "hour", !0);
+      b += H[P].wxFactor * E, f += H[P].cFactor * E, D += E;
     }
-    const k = Y.hours.at(0), x = Y.hours.at(-1), P = await R.calculateRangeRoute(k, x, b), T = await R.calculateRangeWaypoints(k, x, b, v), F = {
-      sample: Y,
+    const T = S.hours.at(0), x = S.hours.at(-1), W = await R.calculateRangeRoute(T, x, p), j = await R.calculateRangeWaypoints(T, x, p, v), F = {
+      sample: S,
       distance: Math.round(((x == null ? void 0 : x.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: w(k.eta).utc().format(),
+      etd: w(T.eta).utc().format(),
       eta: w(x == null ? void 0 : x.eta).utc().format(),
-      wxFactor: Math.round(C / D * 1e4) / 1e4,
-      cFactor: Math.round(g / D * 1e4) / 1e4,
+      wxFactor: Math.round(b / D * 1e4) / 1e4,
+      cFactor: Math.round(f / D * 1e4) / 1e4,
       avgSpeed: Math.round(((x == null ? void 0 : x.distanceFromStart) || 0) / D * 1e4) / 1e4,
       totalHrs: Math.round(D * 1e4) / 1e4,
-      from: k,
+      from: T,
       to: x,
-      route: P,
-      waypoints: T,
-      v0: f,
-      label: S
-    }, { distanceInECA: W, hoursInECA: B, totalDgoConsInECA: Q, eca: X } = await this.calculateECA(F, o, l), $ = Z.roundPrecision(o.fo / 24 * (D - B), 3), tt = Z.roundPrecision(o.dgo / 24 * D, 3);
-    F.eca = X, F.distanceInECA = W, F.hoursInECA = B, F.totalDgoConsInECA = Q, F.totalDgoCons = tt, F.totalFoCons = $;
-    const J = w().valueOf() - y, H = ((ot = Y == null ? void 0 : Y.hours) == null ? void 0 : ot.length) || 1;
-    return p == null || p.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, J, H, Math.round(J / H * 1e3) / 1e3), F;
+      route: W,
+      waypoints: j,
+      v0: m,
+      label: C
+    }, { distanceInECA: L, hoursInECA: Z, totalDgoConsInECA: tt, eca: et } = await this.calculateECA(F, o, l), ot = J.roundPrecision(o.fo / 24 * (D - Z), 3), X = J.roundPrecision(o.dgo / 24 * D, 3);
+    F.extend = {
+      eca: et,
+      distanceInECA: L,
+      hoursInECA: Z,
+      totalDgoConsInECA: tt
+    }, F.totalDgoCons = X, F.totalFoCons = ot;
+    const K = w().valueOf() - M, G = ((N = S == null ? void 0 : S.hours) == null ? void 0 : N.length) || 1;
+    return I == null || I.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, K, G, Math.round(K / G * 1e3) / 1e3), F;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1023,57 +1035,57 @@ class A {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, n, c, o = {}) {
-    var b, v;
+  static async analyseCost(e, t, n, i, o = {}) {
+    var p, v;
     const a = w().valueOf(), s = [];
     o.meteo2 = o.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const d = R.calculateRouteDistance(c.route);
-    let r = 0;
-    n.forEach((i) => {
-      const h = Math.ceil(d / i.speed / 24);
-      r = r < h ? h : r;
-    }), r = r * 1.3;
-    const u = w.utc(e.etd).add(r ?? 14, "day");
-    let m = 1;
-    for (const i of n) {
-      const h = JSON.parse(JSON.stringify(c.route)), C = JSON.parse(JSON.stringify(c.waypoints)), g = await A.analyseInstantWithThreshed(
+    const d = R.calculateRouteDistance(i.route);
+    let c = 0;
+    n.forEach((r) => {
+      const h = Math.ceil(d / r.speed / 24);
+      c = c < h ? h : c;
+    }), c = c * 1.3;
+    const u = w.utc(e.etd).add(c ?? 14, "day");
+    let y = 1;
+    for (const r of n) {
+      const h = JSON.parse(JSON.stringify(i.route)), b = JSON.parse(JSON.stringify(i.waypoints)), f = await q.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
         u,
         t,
-        i,
+        r,
         h,
-        C,
+        b,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         o
       );
-      g && (await A.calculateCost(g, i, e, o), s.push(g), p == null || p.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, m, e.etd, u.format(), {
-        cost: g.cost.total,
-        distance: g.distance,
-        hours: g.totalHrs,
-        cp: `${i.speed}/${i.fo}/${i.dgo}`
-      })), m++;
+      f && (await q.calculateCost(f, r, e, o), s.push(f), I == null || I.info("[%s][L%d-%d] analyse from %s to %s cost: %j", o.requestId, 1, y, e.etd, u.format(), {
+        cost: f.cost.total,
+        distance: f.distance,
+        hours: f.totalHrs,
+        cp: `${r.speed}/${r.fo}/${r.dgo}`
+      })), y++;
     }
-    s.sort((i, h) => i.cost.total - h.cost.total);
-    const l = s.at(0), y = s.at(1), f = [];
-    if (f.push({ combined: !1, speeds: [l], cost: (b = l.cost) == null ? void 0 : b.total }), y) {
-      const i = l.cost.cp, h = y.cost.cp, C = w(l.eta), g = w(l.etd), D = C.diff(g, "days", !0);
-      let Y = Math.ceil(D / 2);
-      Y = Y > 7 ? 7 : Y < e.alterStep ? e.alterStep : Y;
-      let q = 2, E = { combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }, k;
-      for (; Y >= e.alterStep; ) {
-        const x = await A.combinedAnalyse(e, t, u, [i, h], c, Y, { ...o, level: q });
-        if (E.cost > x.cost ? k ? (k == null ? void 0 : k.cost) > x.cost && (k = x) : (k = E, E = x) : (!k || (k == null ? void 0 : k.cost) > x.cost) && (k = x), Y <= e.alterStep)
+    s.sort((r, h) => r.cost.total - h.cost.total);
+    const l = s.at(0), M = s.at(1), m = [];
+    if (m.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), M) {
+      const r = l.cost.cp, h = M.cost.cp, b = w(l.eta), f = w(l.etd), D = b.diff(f, "days", !0);
+      let S = Math.ceil(D / 2);
+      S = S > 7 ? 7 : S < e.alterStep ? e.alterStep : S;
+      let A = 2, H = { combined: !1, speeds: [M], cost: (v = M.cost) == null ? void 0 : v.total }, T;
+      for (; S >= e.alterStep; ) {
+        const x = await q.combinedAnalyse(e, t, u, [r, h], i, S, { ...o, level: A });
+        if (H.cost > x.cost ? T ? (T == null ? void 0 : T.cost) > x.cost && (T = x) : (T = H, H = x) : (!T || (T == null ? void 0 : T.cost) > x.cost) && (T = x), S <= e.alterStep)
           break;
-        Y = Math.ceil(Y / 2), q += 1;
+        S = Math.ceil(S / 2), A += 1;
       }
-      f.push(E), k && f.push(k);
+      m.push(H), T && m.push(T);
     }
-    const I = w().valueOf() - a;
-    return p == null || p.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, I), f.sort((i, h) => i.cost - h.cost);
+    const k = w().valueOf() - a;
+    return I == null || I.info("[%s] analyse elapsed: %d ms", o == null ? void 0 : o.requestId, k), m.sort((r, h) => r.cost - h.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1085,12 +1097,12 @@ class A {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, n, c, o, a, s = {}) {
-    s.counter = 1, p == null || p.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
-    const d = await A.alternateAnalyse(e, t, n, c, 0, o, a, s), r = d.reduce((l, y) => l + y.cost.total, 0);
-    p == null || p.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
-    const u = await A.alternateAnalyse(e, t, n, c, 1, o, a, s), m = u.reduce((l, y) => l + y.cost.total, 0);
-    return p == null || p.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, m), r < m ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: u, step: a };
+  static async combinedAnalyse(e, t, n, i, o, a, s = {}) {
+    s.counter = 1, I == null || I.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
+    const d = await q.alternateAnalyse(e, t, n, i, 0, o, a, s), c = d.reduce((l, M) => l + M.cost.total, 0);
+    I == null || I.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, c);
+    const u = await q.alternateAnalyse(e, t, n, i, 1, o, a, s), y = u.reduce((l, M) => l + M.cost.total, 0);
+    return I == null || I.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, y), c < y ? { combined: !0, cost: Math.round(c * 1e3) / 1e3, speeds: d, step: a } : { combined: !0, cost: Math.round(y * 1e3) / 1e3, speeds: u, step: a };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1103,41 +1115,41 @@ class A {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, n, c, o, a, s, d = {}) {
-    var l, y;
-    let r = w.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, m = [];
-    for (; r.isBefore(n); ) {
-      const f = r.clone().utc().add(s, "day"), S = JSON.parse(JSON.stringify(a.route)), I = JSON.parse(JSON.stringify(a.waypoints)), b = c[o], v = await A.analyseInstantWithThreshed(
+  static async alternateAnalyse(e, t, n, i, o, a, s, d = {}) {
+    var l, M;
+    let c = w.utc(e.etd);
+    const u = { lat: e.lat, lng: e.lng }, y = [];
+    for (; c.isBefore(n); ) {
+      const m = c.clone().utc().add(s, "day"), C = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), p = i[o], v = await q.analyseInstantWithThreshed(
         u,
-        r.format(),
-        f,
+        c.format(),
+        m,
         t,
-        b,
-        S,
-        I,
+        p,
+        C,
+        k,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      v && (await A.calculateCost(v, b, e, d), p == null || p.info(
+      v && (await q.calculateCost(v, p, e, d), I == null || I.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
-        r.utc().format(),
-        f.utc().format(),
-        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${b.speed}/${b.fo}/${b.dgo}` }
+        c.utc().format(),
+        m.utc().format(),
+        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${p.speed}/${p.fo}/${p.dgo}` }
       )), d.counter = d.counter + 1;
-      const i = (y = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : y.at(-1);
-      if (i)
-        u.lat = i.lat, u.lng = i.lng, r = w(i.eta), m.push(v), o = o ? 0 : 1;
+      const r = (M = (l = v == null ? void 0 : v.sample) == null ? void 0 : l.hours) == null ? void 0 : M.at(-1);
+      if (r)
+        u.lat = r.lat, u.lng = r.lng, c = w(r.eta), y.push(v), o = o ? 0 : 1;
       else
         break;
     }
-    return m;
+    return y;
   }
   /**
    * 计算Speed的cost
@@ -1146,13 +1158,14 @@ class A {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, n, c = {}) {
+  static async calculateCost(e, t, n, i = {}) {
+    var o;
     if (e) {
-      const o = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, a = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, s = Math.round((e.totalDgoCons + e.totalDgoConsInECA) * (n.priceDGO || 0) * 1e3) / 1e3;
+      const a = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - (n.addComm || 0)) * 1e3) / 1e3, s = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, d = Math.round((e.totalDgoCons + (((o = e.extend) == null ? void 0 : o.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
       e.cost = {
-        total: Math.round((o + a + s) * 1e3) / 1e3,
-        hire: o,
-        bunker: Math.round((a + s) * 1e3) / 1e3,
+        total: Math.round((a + s + d) * 1e3) / 1e3,
+        hire: a,
+        bunker: Math.round((s + d) * 1e3) / 1e3,
         cp: t
       };
     }
@@ -1162,22 +1175,22 @@ class A {
    * 计算单cp模式下的ECA属性
    */
   static async calculateECA(e, t, n = {}) {
-    var d, r;
-    const c = await R.intersectInECA(e.route);
+    var d, c;
+    const i = await R.intersectInECA(e.route);
     let o = 0, a = 0, s = 0;
     e.sample.wps.forEach((u) => {
       u.positionTime = w.utc(u.etd || u.eta).unix();
     });
-    for (const u of c) {
+    for (const u of i) {
       o += u.distance;
-      const m = await R.deadReckoningTime((d = u.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await R.deadReckoningTime((r = u.waypoints) == null ? void 0 : r.at(-1), e.sample.wps);
-      u.in = m, u.out = l, u.totalHrs = Z.roundPrecision((l.positionTime - m.positionTime) / 3600, 2), u.totalDgoCons = Z.roundPrecision(t.fo / 24 * u.totalHrs, 3), a += u.totalHrs;
+      const y = await R.deadReckoningTime((d = u.waypoints) == null ? void 0 : d.at(0), e.sample.wps), l = await R.deadReckoningTime((c = u.waypoints) == null ? void 0 : c.at(-1), e.sample.wps);
+      u.in = y, u.out = l, u.totalHrs = J.roundPrecision((l.positionTime - y.positionTime) / 3600, 2), u.totalDgoCons = J.roundPrecision(t.fo / 24 * u.totalHrs, 3), a += u.totalHrs, s += u.totalDgoCons;
     }
-    return o = Z.roundPrecision(o, 3), a = Z.roundPrecision(a, 3), s = Z.roundPrecision(s, 3), {
+    return o = J.roundPrecision(o, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: o,
       hoursInECA: a,
       totalDgoConsInECA: s,
-      eca: c
+      eca: i
     };
   }
   /**
@@ -1186,34 +1199,43 @@ class A {
    * @param options
    */
   static async mergeSpeeds(e, t = {}) {
-    var v;
+    var v, r;
     const n = {
       hours: [],
       wps: [],
       days: []
-    }, c = e.reduce((i, h) => i + h.distance, 0), o = e.reduce((i, h) => i + h.distanceInECA, 0), a = e.reduce((i, h) => i + h.totalHrs, 0), s = e.reduce((i, h) => i + h.hoursInECA, 0), d = e.reduce((i, h) => i + h.totalDgoConsInECA, 0), r = e.reduce((i, h) => i + h.wxFactor * h.totalHrs / a, 0), u = e.reduce((i, h) => i + h.cFactor * h.totalHrs / a, 0), m = e.reduce((i, h) => i + h.totalFoCons, 0), l = e.reduce((i, h) => i + h.totalDgoCons, 0), y = e.reduce((i, h) => i + h.cost.total, 0), f = e.reduce((i, h) => i + h.cost.hire, 0), S = e.reduce((i, h) => i + h.cost.bunker, 0), I = [], b = [];
-    for (const i of e) {
-      b.push(...i.eca);
-      const h = i.sample.hours, C = h.at(0);
-      C.cp = i.cost.cp;
-      const g = [i.etd, i.eta], D = I.findIndex((k) => k.id === C.cp.id);
-      D === -1 ? (C.cp.segment = [g], I.push(C.cp)) : I[D].segment.push(g);
-      const Y = i.sample.wps, q = i.sample.days;
-      h.forEach((k) => {
-        var P;
-        ((P = n.hours) == null ? void 0 : P.findIndex((T) => T.eta === k.eta)) === -1 && n.hours.push(k);
-      }), Y.forEach((k) => {
-        var P;
-        ((P = n.wps) == null ? void 0 : P.findIndex((T) => T.eta === k.eta)) === -1 && n.wps.push(k);
-      }), q.forEach((k) => {
-        var P;
-        ((P = n == null ? void 0 : n.days) == null ? void 0 : P.findIndex((T) => T.eta === k.eta)) === -1 && n.days.push(k);
+    }, i = e.reduce((h, b) => h + b.distance, 0), o = e.reduce((h, b) => {
+      var f;
+      return h + (((f = b.extend) == null ? void 0 : f.distanceInECA) || 0);
+    }, 0), a = e.reduce((h, b) => h + b.totalHrs, 0), s = e.reduce((h, b) => {
+      var f;
+      return h + (((f = b.extend) == null ? void 0 : f.hoursInECA) || 0);
+    }, 0), d = e.reduce((h, b) => {
+      var f;
+      return h + (((f = b.extend) == null ? void 0 : f.totalDgoConsInECA) || 0);
+    }, 0), c = e.reduce((h, b) => h + b.wxFactor * b.totalHrs / a, 0), u = e.reduce((h, b) => h + b.cFactor * b.totalHrs / a, 0), y = e.reduce((h, b) => h + b.totalFoCons, 0), l = e.reduce((h, b) => h + b.totalDgoCons, 0), M = e.reduce((h, b) => h + b.cost.total, 0), m = e.reduce((h, b) => h + b.cost.hire, 0), C = e.reduce((h, b) => h + b.cost.bunker, 0), k = [], p = [];
+    for (const h of e) {
+      p.push(...((v = h.extend) == null ? void 0 : v.eca) || []);
+      const b = h.sample.hours, f = b.at(0);
+      f.cp = h.cost.cp;
+      const D = [h.etd, h.eta], S = k.findIndex((x) => x.id === f.cp.id);
+      S === -1 ? (f.cp.segment = [D], k.push(f.cp)) : k[S].segment.push(D);
+      const A = h.sample.wps, H = h.sample.days;
+      b.forEach((x) => {
+        var j;
+        ((j = n.hours) == null ? void 0 : j.findIndex((F) => F.eta === x.eta)) === -1 && n.hours.push(x);
+      }), A.forEach((x) => {
+        var j;
+        ((j = n.wps) == null ? void 0 : j.findIndex((F) => F.eta === x.eta)) === -1 && n.wps.push(x);
+      }), H.forEach((x) => {
+        var j;
+        ((j = n == null ? void 0 : n.days) == null ? void 0 : j.findIndex((F) => F.eta === x.eta)) === -1 && n.days.push(x);
       });
-      const E = (v = n.wps) == null ? void 0 : v.findIndex((k) => k.eta === C.eta);
-      E === -1 ? n.wps.push(C) : n.wps[E] = C;
+      const T = (r = n.wps) == null ? void 0 : r.findIndex((x) => x.eta === f.eta);
+      T === -1 ? n.wps.push(f) : n.wps[T] = f;
     }
-    return n.wps.sort((i, h) => {
-      w(i.etd).unix() - w(h.etd).unix();
+    return n.wps.sort((h, b) => {
+      w(h.etd).unix() - w(b.etd).unix();
     }), {
       sample: n,
       etd: e.at(0).etd,
@@ -1222,37 +1244,39 @@ class A {
       to: e.at(-1).to,
       v0: e.at(0).v0,
       label: "Combined",
-      distance: Math.round(c * 1e4) / 1e4,
-      distanceInECA: Math.round(o * 1e4) / 1e4,
+      distance: Math.round(i * 1e4) / 1e4,
       totalHrs: Math.round(a * 1e3) / 1e3,
-      hoursInECA: Math.round(s * 1e3) / 1e3,
-      avgSpeed: Math.round(c / a * 1e3) / 1e3,
-      wxFactor: Math.round(r / a * 1e3) / 1e3,
+      avgSpeed: Math.round(i / a * 1e3) / 1e3,
+      wxFactor: Math.round(c / a * 1e3) / 1e3,
       cFactor: Math.round(u / a * 1e3) / 1e3,
-      totalFoCons: Math.round(m * 1e3) / 1e3,
+      totalFoCons: Math.round(y * 1e3) / 1e3,
       totalDgoCons: Math.round(l * 1e3) / 1e3,
-      totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
       cost: {
-        total: Math.round(y * 1e3) / 1e3,
-        hire: Math.round(f * 1e3) / 1e3,
-        bunker: Math.round(S * 1e3) / 1e3
+        total: Math.round(M * 1e3) / 1e3,
+        hire: Math.round(m * 1e3) / 1e3,
+        bunker: Math.round(C * 1e3) / 1e3
       },
-      cps: I,
-      eca: b
+      extend: {
+        cps: k,
+        eca: p,
+        distanceInECA: Math.round(o * 1e4) / 1e4,
+        hoursInECA: Math.round(s * 1e3) / 1e3,
+        totalDgoConsInECA: Math.round(d * 1e3) / 1e3
+      }
     };
   }
 }
 export {
-  st as AISImpl,
-  ht as AlertHelper,
-  ut as AlertLevel,
+  $ as AISImpl,
+  ft as AlertHelper,
+  lt as AlertLevel,
   St as HifleetImpl,
-  mt as LoadCondition,
+  Mt as LoadCondition,
   jt as MyShipImpl,
-  kt as MyVesselImpl,
+  Ct as MyVesselImpl,
   Yt as ShipxyImpl,
-  A as SpeedHelper,
-  yt as SpeedLabel,
-  ft as VesselTag,
-  Ct as alertHelper
+  q as SpeedHelper,
+  gt as SpeedLabel,
+  yt as VesselTag,
+  Dt as alertHelper
 };