@idm-plugin/vessel 1.7.0 → 1.7.1

package/dist/index.js

@@ -1,101 +1,101 @@
-var st = Object.defineProperty;
-var at = (j, e, t) => e in j ? st(j, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : j[e] = t;
-var Z = (j, e, t) => (at(j, typeof e != "symbol" ? e + "" : e, t), t);
-import R from "got";
-import Q from "@log4js-node/log4js-api";
-import p from "moment";
-import { LngLatHelper as z, LaneHelper as B } from "@idm-plugin/geo";
-import { MeteoHelper2 as ot, MeteoHelper as nt } from "@idm-plugin/meteo2";
-import { Meteo2Assist as tt } from "@idm-plugin/meteo";
-let b;
+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";
+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;
 try {
-  b = Q.getLogger("vessel");
+  M = at.getLogger("vessel");
 } catch {
 } finally {
 }
-class U {
+class st {
   /**
    * 解析AIS状态码
    * @param status
    */
   parseStatus(e) {
-    let t, o;
+    let t, n;
     switch (e) {
       case 0:
-        t = "在航（主机推动）", o = "The engine is in use";
+        t = "在航（主机推动）", n = "The engine is in use";
         break;
       case 1:
-        t = "锚泊", o = "Anchored";
+        t = "锚泊", n = "Anchored";
         break;
       case 2:
-        t = "失控", o = "Not operated";
+        t = "失控", n = "Not operated";
         break;
       case 3:
-        t = "操纵受限", o = "Limited airworthiness";
+        t = "操纵受限", n = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", o = "Limited by ship's draft";
+        t = "吃水受限", n = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", o = "Mooring";
+        t = "靠泊", n = "Mooring";
         break;
       case 6:
-        t = "搁浅", o = "Stranded";
+        t = "搁浅", n = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", o = "Engaged in fishing";
+        t = "捕捞作业", n = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", o = "Sailing";
+        t = "靠帆船提供动力", n = "Sailing";
         break;
       default:
-        t = "未定义", o = "Undefined";
+        t = "未定义", n = "Undefined";
     }
-    return { labelCn: t, labelEn: o };
+    return { labelCn: t, labelEn: n };
   }
 }
-class vt extends U {
-  constructor(t, o) {
+class kt extends st {
+  constructor(t, n) {
     super();
-    Z(this, "clientId");
-    Z(this, "clientSecret");
-    Z(this, "token");
-    this.clientId = t, this.clientSecret = o;
+    G(this, "clientId");
+    G(this, "clientSecret");
+    G(this, "token");
+    this.clientId = t, this.clientSecret = n;
   }
   async authToken(t = {}) {
-    const o = "https://svc.data.myvessel.cn/ada/oauth/token", i = {
+    const n = "https://svc.data.myvessel.cn/ada/oauth/token", c = {
       searchParams: {
         client_id: this.clientId,
         client_secret: this.clientSecret,
         grant_type: "client_credentials"
       }
-    }, a = await R.post(o, i).json();
-    b == null || b.info("[%s] fetch access token from: %s - %j", t.requestId, o, a), a.error || (this.token = {
-      accessToken: a.access_token,
-      tokenType: a.token_type,
-      expiresIn: a.expires_in,
-      scope: a.scope,
-      jti: a.jti,
-      issuedAt: p().utc().format()
+    }, 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 = {
+      accessToken: o.access_token,
+      tokenType: o.token_type,
+      expiresIn: o.expires_in,
+      scope: o.scope,
+      jti: o.jti,
+      issuedAt: w().utc().format()
     });
   }
-  async realTimePosition(t, o = {}) {
-    var u, y, h;
-    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > ((u = this.token) == null ? void 0 : u.expiresIn) - 300) && await this.authToken(o);
-    const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
+  async realTimePosition(t, n = {}) {
+    var u, m, 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 = {
       headers: {
-        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(h = this.token) == null ? void 0 : h.accessToken}`
+        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
-    const n = await R.get(i, a).json();
-    if (n.code)
-      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, { message: n.message, status: n.status, code: n.code }), n;
-    const s = n.data;
-    for (const f in s)
-      !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
-    const d = p(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, c, o);
+    const a = await L.get(c, 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;
+    const s = a.data;
+    for (const y in s)
+      !isNaN(s[y]) && Number(s[y]) !== 1 / 0 && (s[y] = Number(s[y]));
+    const d = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.mmsi,
       name: s.vesselName,
@@ -110,7 +110,7 @@ class vt extends U {
       cog: s.cog,
       hdg: s.hdg,
       rot: s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? p.utc(s.eta).format() : void 0,
+      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.dest,
       positionTime: d.unix(),
       status: s.status,
@@ -121,78 +121,78 @@ class vt extends U {
       utc: d.utc().format()
     };
   }
-  async trajectory(t, o, i, a, n = !0, s = {}) {
-    (!this.token || p().diff(p(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const d = await this.realTimePosition(t, s), r = p(o), u = p(i), y = [];
+  async trajectory(t, n, c, 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, a, y, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, u, d, a, y, s), y;
+      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;
   }
-  async trajectoryIn30Day(t, o, i, a, n, s, d = {}) {
-    var l, m, M, g, I;
+  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 = {
       headers: {
-        Authorization: `${(l = this.token) == null ? void 0 : l.tokenType} ${(m = this.token) == null ? void 0 : m.accessToken}`
+        Authorization: `${(f = this.token) == null ? void 0 : f.tokenType} ${(S = this.token) == null ? void 0 : S.accessToken}`
       },
       json: {
         mmsi: t,
-        startTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
-        endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
+        startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
+        endTime: c.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", d.requestId, r, u);
-    const y = await R.post(r, u).json();
-    if (y.code)
-      return b == null || b.warn("[%s] fetch trajectory failed: %j", d.requestId, r, { message: y.message, status: y.status, code: y.code }), y;
-    let h = -1;
-    const f = p(`${(g = (M = y.data) == null ? void 0 : M[0]) == null ? void 0 : g.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (I = y.data) == null || I.forEach((c) => {
-      for (const T in c)
-        !isNaN(c[T]) && Number(c[T]) !== 1 / 0 && (c[T] = Number(c[T]));
-      const w = p(`${c.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), N = c.status, { labelCn: v, labelEn: S } = this.parseStatus(N), Y = {
-        mmsi: c.mmsi,
-        imo: a == null ? void 0 : a.imo,
-        lat: c.lat,
-        lng: c.lon,
-        sog: c.sog,
-        cog: c.cog,
-        hdg: c.hdg,
-        draught: c.draught,
-        status: N,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(c.eta) ? p(`${c.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: c.dest,
-        positionTime: w.unix(),
-        labelCn: v,
-        labelEn: S,
+    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;
+    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,
+        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,
+        positionTime: h.unix(),
+        labelCn: g,
+        labelEn: D,
         method: "trajectory",
         vendor: "myVessel",
-        utc: w.utc().format()
-      }, F = Math.floor(w.diff(f, "minute", !0) / (n || 1));
-      F !== h && (h = F, s.push(Y));
+        utc: h.utc().format()
+      }, q = Math.floor(h.diff(y, "minute", !0) / (a || 1));
+      q !== l && (l = q, s.push(Y));
     }), s;
   }
 }
-class wt extends U {
+class St extends st {
   constructor(t) {
     super();
-    Z(this, "token");
+    G(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, o = {}) {
-    const i = "https://api.hifleet.com/position/position/get/token", a = {
+  async realTimePosition(t, n = {}) {
+    const c = "https://api.hifleet.com/position/position/get/token", o = {
       searchParams: {
         mmsi: t,
         usertoken: this.token
       }
-    }, n = await R.post(i, a).json();
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
-    const s = n == null ? void 0 : n.list;
+    }, a = await L.post(c, o).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", n.requestId, c, o);
+    const s = a == null ? void 0 : a.list;
     if (!s)
-      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
-    for (const f in s)
-      !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
+      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]));
     s.status = s.sp > 3 ? 0 : 1;
-    const d = s.status, { labelCn: r, labelEn: u } = this.parseStatus(d), y = p(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    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");
     return {
       mmsi: s.m,
       name: s.n,
@@ -207,10 +207,10 @@ class wt extends U {
       cog: s.co,
       hdg: s.h,
       rot: isNaN(s.rot) ? 0 : s.rot,
-      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? p.utc(s.eta).format() : void 0,
+      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: y.unix(),
-      utc: y.utc().format(),
+      positionTime: m.unix(),
+      utc: m.utc().format(),
       status: d,
       labelCn: r,
       labelEn: u,
@@ -218,9 +218,9 @@ class wt extends U {
       vendor: "hifleet"
     };
   }
-  async search(t, o = {}) {
-    let i = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
-    const a = {
+  async search(t, n = {}) {
+    let c = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
+    const o = {
       searchParams: {
         keyword: t
       },
@@ -230,24 +230,24 @@ class wt extends U {
         Host: "www.hifleet.com"
       }
     };
-    let n = await R.post(i, a).json();
-    b == null || b.info("[%s] fetch vessel props from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]);
-    for (const d in n)
-      !isNaN(n[d]) && Number(n[d]) !== 1 / 0 && (n[d] = Number(n[d]));
+    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]);
+    for (const d in a)
+      !isNaN(a[d]) && Number(a[d]) !== 1 / 0 && (a[d] = Number(a[d]));
     const s = {
-      mmsi: n.m,
-      name: n.n,
-      imo: n.i,
-      callSign: n.c,
-      length: n.l,
-      breadth: n.b,
-      draught: n.dr,
-      type: n.t
+      mmsi: a.m,
+      name: a.n,
+      imo: a.i,
+      callSign: a.c,
+      length: a.l,
+      breadth: a.b,
+      draught: a.dr,
+      type: a.t
     };
-    return i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await R.post(i, a).json(), b == null || b.info("[%s] search vessel dead weight from: %s - %j", o.requestId, i, a), n instanceof Array && (n = n[0]), n && (s.deadweight = Number(n.dwt)), s;
+    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;
   }
-  async suggest(t, o = {}) {
-    const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
+  async suggest(t, n = {}) {
+    const c = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", o = {
       searchParams: {
         q: t
       },
@@ -256,10 +256,10 @@ class wt extends U {
         Origin: "https://www.hifleet.com",
         Host: "www.hifleet.com"
       }
-    }, n = await R.post(i, a).json();
-    b == null || b.info("[%s] suggest vessel props from: %s - %j", o.requestId, i, a);
+    }, a = await L.post(c, o).json();
+    M == null || M.info("[%s] suggest vessel props from: %s - %j", n.requestId, c, o);
     const s = [];
-    for (const d of n)
+    for (const d of a)
       s.push({
         mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
         name: d.name,
@@ -269,77 +269,77 @@ class wt extends U {
       });
     return s.sort((d, r) => r.score - d.score), s;
   }
-  async trajectory(t, o, i, a, n = !0, s = {}) {
-    var c, w, N;
+  async trajectory(t, n, c, o, a = !0, s = {}) {
+    var i, h, C;
     const d = await this.realTimePosition(t, s);
-    let r = p(o);
-    const u = p(i), y = p();
-    if (n) {
-      let v = u.diff(r, "d", !0);
-      v < 0 ? r = u.clone().subtract(40, "d") : v < 30 ? r.subtract(10, "d") : v < 60 ? r.subtract(5, "d") : r = u.clone().subtract(80, "d"), v = y.diff(u, "d", !0), u.add(v > 10 ? 240 : v * 24, "h");
+    let r = w(n);
+    const u = w(c), m = 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");
     }
-    const 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"),
         mmsi: t,
         usertoken: this.token
       }
-    }, f = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", l = await R.get(f, h).json();
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, f, h);
-    let m;
-    l && (m = ((w = (c = l.ships) == null ? void 0 : c.offors) == null ? void 0 : w.ship) || [], m.length || b == null || b.warn("[%s] fetch trajectory failed: %j", s.requestId, l));
-    const M = [];
-    let g = -1;
-    const I = p(`${(N = m == null ? void 0 : m[0]) == null ? void 0 : N.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const v of m) {
-      for (const H in v)
-        !isNaN(v[H]) && Number(v[H]) !== 1 / 0 && (v[H] = Number(v[H]));
-      const S = p(`${v.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      v.status = v.sp > 4 ? 0 : 1;
-      const { labelEn: Y, labelCn: F } = this.parseStatus(v.status), T = {
-        mmsi: v.m,
-        name: v.n,
+    }, 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,
         imo: d == null ? void 0 : d.imo,
-        lat: v.la,
-        lng: v.lo,
-        draught: v.draught,
-        sog: v.sp,
-        cog: v.co,
-        hdg: v.hdg,
-        positionTime: S.unix(),
-        utc: S.utc().format(),
-        status: v.status,
-        labelCn: F,
+        lat: g.la,
+        lng: g.lo,
+        draught: g.draught,
+        sog: g.sp,
+        cog: g.co,
+        hdg: g.hdg,
+        positionTime: D.unix(),
+        utc: D.utc().format(),
+        status: g.status,
+        labelCn: q,
         labelEn: Y,
         method: "trajectory",
         vendor: "hifleet"
-      }, D = Math.floor(S.diff(I, "minute", !0) / (a || 1));
-      D !== g && (g = D, M.push(T));
+      }, k = Math.floor(D.diff(v, "minute", !0) / (o || 1));
+      k !== b && (b = k, I.push(E));
     }
-    return M;
+    return I;
   }
 }
-class pt extends U {
+class Yt extends st {
   constructor(t) {
     super();
-    Z(this, "token");
+    G(this, "token");
     this.token = t;
   }
-  async realTimePosition(t, o = {}) {
-    const i = {
+  async realTimePosition(t, n = {}) {
+    const c = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1
       }
-    }, a = "https://api.shipxy.com/apicall/GetSingleShip", n = await R.get(a, i).json();
-    if (b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, a, i), (n == null ? void 0 : n.status) !== 0)
-      return n;
-    const s = n.data[0];
-    for (const h in s)
-      !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
-    const { labelCn: d, labelEn: r } = await this.parseStatus(s.navistat), u = p.unix(s.lasttime);
+    }, 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)
+      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);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -363,9 +363,9 @@ class pt extends U {
       vendor: "shipxy"
     };
   }
-  async trajectory(t, o, i, a, n = !0, s = {}) {
-    var I;
-    const d = await this.realTimePosition(t, s), r = p(o), u = p(i), y = "https://api.shipxy.com/apicall/GetShipTrack", h = {
+  async trajectory(t, n, c, 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 = {
       searchParams: {
         id: t,
         k: this.token,
@@ -374,60 +374,60 @@ class pt extends U {
         btm: r.unix(),
         etm: u.unix()
       }
-    }, f = await R.get(y, h).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, h), (f == null ? void 0 : f.status) !== 0)
-      return f;
-    const l = f == null ? void 0 : f.points, m = [], M = p.unix((I = l[0]) == null ? void 0 : I.utc);
-    let g = -1;
-    for (const c of l) {
-      const w = p.unix(c.utc), N = {
+    }, 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 = {
         imo: d == null ? void 0 : d.imo,
         mmsi: t,
-        sog: Math.round(c.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(c.cog / 100 * 100) / 100,
-        lat: Math.round(c.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(c.lon / 1e6 * 1e5) / 1e5,
-        positionTime: w.unix(),
-        utc: w.utc().format(),
+        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,
+        positionTime: h.unix(),
+        utc: h.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, v = Math.floor(w.diff(M, "minute", !0) / (a || 1));
-      v !== g && (g = v, m.push(N));
+      }, g = Math.floor(h.diff(I, "minute", !0) / (o || 1));
+      g !== b && (b = g, S.push(C));
     }
-    return m;
+    return S;
   }
 }
-class It extends U {
+class jt extends st {
   constructor(t) {
     super();
-    Z(this, "token");
+    G(this, "token");
     this.token = t;
   }
-  async getShipId(t, o = {}) {
-    const i = {
+  async getShipId(t, n = {}) {
+    const c = {
       headers: {
         appKey: this.token
       },
       json: {
         mmsiList: t
       }
-    }, a = "https://api3.myships.com/sp/ships/getShipIdByMMSI", n = await R.post(a, i).json();
-    return b == null || b.info("[%s] fetch ship id from: %s - %j", o.requestId, a, i), n.code !== "0" ? n : n.data[0].shipId;
+    }, 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;
   }
-  async getShipInfo(t, o = {}) {
-    const i = {
+  async getShipInfo(t, n = {}) {
+    const c = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t
       }
-    }, a = "https://api3.myships.com/sp/ships/aissta", n = await R.post(a, i).json();
-    if (b == null || b.info("[%s] fetch ship info from: %s - %j", o.requestId, a, i), n.code !== "0")
-      return n;
-    const s = n.data;
+    }, 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")
+      return a;
+    const s = a.data;
     let d = s.imo;
-    return t === "407170" && (d = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, d)), {
+    return t === "407170" && (d = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: d,
@@ -437,22 +437,22 @@ class It extends U {
       draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(t, o = {}) {
-    const i = await this.getShipId(t, o), a = await this.getShipInfo(i, o), n = {
+  async realTimePosition(t, n = {}) {
+    const c = await this.getShipId(t, n), o = await this.getShipInfo(c, n), a = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: i
+        shipId: c
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await R.post(s, n).json();
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
+    }, 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 l in r)
-      !isNaN(r[l]) && Number(r[l]) !== 1 / 0 && (r[l] = Number(r[l]));
-    const { labelCn: u, labelEn: y } = await this.parseStatus(r.aisNavStatus), h = p.unix(r.posTime);
+    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);
     return {
-      ...a,
+      ...o,
       mmsi: t,
       lat: Math.round(r.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(r.lon / 1e4 / 60 * 1e5) / 1e5,
@@ -461,67 +461,67 @@ class It extends U {
       hdg: Math.round(r.heading * 100) / 100,
       rot: Math.round(r.rot * 100) / 100,
       positionTime: r.posTime,
-      utc: h.utc().format(),
+      utc: l.utc().format(),
       status: r.aisNavStatus,
-      labelEn: y,
+      labelEn: m,
       labelCn: u,
       method: "position",
       vendor: "myship"
     };
   }
-  async trajectory(t, o, i, a, n = !0, s = {}) {
-    const d = p(o), r = p(i), u = await this.getShipId(t), y = await this.getShipInfo(u), h = [];
+  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(), y, t, a, h);
-    return await this.trajectoryIn30Day(u, d.unix(), r.unix(), y, t, a, h), h;
+      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 trajectoryIn30Day(t, o, i, a, n, s, d, r = {}) {
-    var M;
+  async trajectoryIn30Day(t, n, c, o, a, s, d, r = {}) {
+    var I;
     const u = {
       headers: {
         appKey: this.token
       },
       json: {
         shipId: t,
-        startTime: o,
-        endTime: i
+        startTime: n,
+        endTime: c
       }
-    }, y = "https://api3.myships.com/sp/ships/position/history", h = await R.post(y, u).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", r.requestId, y, u), h.code !== "0")
-      return b == null || b.warn("[%s] invoke myship trajectory failed: %j", r.requestId, h), h;
-    const f = h.data;
-    for (const g in f)
-      !isNaN(f[g]) && Number(f[g]) !== 1 / 0 && (f[g] = Number(f[g]));
-    const l = p.unix((M = f[0]) == null ? void 0 : M.posTime);
-    let m = -1;
-    for (const g of f) {
-      const I = p.unix(g.posTime), c = {
-        imo: a == null ? void 0 : a.imo,
-        mmsi: n,
-        lat: Math.round(g.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(g.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(g.sog / 10 * 100) / 100,
-        cog: Math.round(g.cog / 10 * 100) / 100,
-        hdg: Math.round(g.heading * 100) / 100,
-        rot: Math.round(g.rot * 100) / 100,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
+    }, 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 = {
+        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,
+        positionTime: v.unix(),
+        utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, w = Math.floor(I.diff(l, "minute", !0) / (s || 1));
-      w !== m && (m = w, d.push(c));
+      }, h = Math.floor(v.diff(f, "minute", !0) / (s || 1));
+      h !== S && (S = h, d.push(i));
     }
     return d;
   }
 }
-let W;
+let V;
 try {
-  W = Q.getLogger("vessel");
+  V = at.getLogger("vessel");
 } catch {
 } finally {
 }
-var it = /* @__PURE__ */ ((j) => (j.NOTICE = "NOTICE", j.WARN = "WARN", j.HEAVY = "HEAVY", j.SEVERE = "SEVERE", j.ERROR = "ERROR", j.FATAL = "FATAL", j))(it || {});
-class rt {
+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 {
   /**
    * 解析告警规则, 多规则场景
    * @param rule
@@ -532,22 +532,22 @@ class rt {
    */
   parsePrinciple(e, t = {}) {
     var s, d, r;
-    W == null || W.info("[%s] parse rule: %s", t.requestId, e);
-    const o = new RegExp("(?<=\\[)(.+)(?=])", "g"), i = e.match(o) ? (s = e.match(o)) == null ? void 0 : s[0] : void 0, a = i == null ? void 0 : i.split(";");
-    if (!a)
+    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(";");
+    if (!o)
       return;
-    const n = {};
-    for (let u = 0; u < (a == null ? void 0 : a.length); u++) {
-      const y = (r = (d = a[u].match(o)) == null ? void 0 : d[0]) == null ? void 0 : r.split("],");
-      if (u === 0 && !y)
-        n.scope = a[0];
-      else if (y)
-        for (let h = 0, f = y.length; h < f; h++) {
-          const l = this.parseRule(y[h]);
-          l && (n[l.level] ? l.key ? n[l.level][l == null ? void 0 : l.key] = l : n[l.level] = l : l.key ? n[l.level] = { [l == null ? void 0 : l.key]: l } : n[l.level] = l);
+    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)
+        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);
         }
     }
-    return n;
+    return a;
   }
   /**
    * 解析单一告警规则
@@ -556,16 +556,16 @@ class rt {
    * @param options
    */
   parseRule(e, t = {}) {
-    var n;
-    W == null || W.info("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const o = new RegExp("(?<=\\[)(.+?)(?=])", "g"), i = (n = e == null ? void 0 : e.match(o)) == null ? void 0 : n[0], a = i == null ? void 0 : i.split(",");
-    if (a)
+    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(",");
+    if (o)
       return {
-        operator: a[0],
-        number: Number.isNaN(Number(a[1])) ? a[1] : Number(a[1]),
-        level: a[2],
-        time: Number(a[3]),
-        key: a[4]
+        operator: o[0],
+        number: Number.isNaN(Number(o[1])) ? o[1] : Number(o[1]),
+        level: o[2],
+        time: Number(o[3]),
+        key: o[4]
       };
   }
   /**
@@ -574,27 +574,27 @@ class rt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(e, t, o = {}) {
-    var l, m, M, g, I, c, w, N, v, S, Y, F, T, D, H;
-    let i = 0, a = 0, n = 0, s = 0;
-    const d = Math.round(((m = (l = t == null ? void 0 : t.SEVERE) == null ? void 0 : l.sigWave) == null ? void 0 : m.number) * 1.6 * 100) / 100, r = (g = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.sigWave) == null ? void 0 : g.number, u = (c = (I = t == null ? void 0 : t.HEAVY) == null ? void 0 : I.sigWave) == null ? void 0 : c.number, y = Math.round((((N = (w = t == null ? void 0 : t.SEVERE) == null ? void 0 : w.wind) == null ? void 0 : N.number) + 2) * 100) / 100, h = (S = (v = t == null ? void 0 : t.SEVERE) == null ? void 0 : v.wind) == null ? void 0 : S.number, f = (F = (Y = t == null ? void 0 : t.HEAVY) == null ? void 0 : Y.wind) == null ? void 0 : F.number;
-    for (let V = 0; V < (e == null ? void 0 : e.length); V++) {
-      const E = e[V], P = (D = (T = E == null ? void 0 : E.meteo) == null ? void 0 : T.wave) == null ? void 0 : D.sig, A = (H = E == null ? void 0 : E.meteo) == null ? void 0 : H.wind, J = V ? p(E.eta).diff(p(e[V - 1].eta), "hour", !0) : 0;
-      s = J > s ? J : s, W == null || W.info("[%s] check sig.wave: %j", o.requestId, { ...P, dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u }), (P == null ? void 0 : P.height) >= d ? E.isDangerous = !0 : (P == null ? void 0 : P.height) >= r ? E.isSevere = !0 : (P == null ? void 0 : P.height) >= u && (E.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...A, dgThd4Wd: y, svThd4Wd: h, hvThd4Wd: f }), (A == null ? void 0 : A.scale) >= y ? (E.isDangerous = !0, delete E.isSevere, delete E.isHeavy) : (A == null ? void 0 : A.scale) > h ? (E.isDangerous || (E.isSevere = !0), delete E.isHeavy) : (A == null ? void 0 : A.scale) === f && !E.isDangerous && !E.isSevere && (E.isHeavy = !0), i += E.isDangerous ? J : 0, a += E.isSevere ? J : 0, n += E.isHeavy ? J : 0;
+  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;
     }
-    return i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, n = Math.round(n * 100) / 100, s = Math.round(s), { sample: e, dangerous: i, severe: a, heavy: n, step: s < 3 ? 3 : s, wind: { dgThd4Wd: y, svThd4Wd: h, hvThd4Wd: f }, sig: { dgThd4Wv: d, svThd4Wv: r, hvThd4Wv: u } };
+    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 } };
   }
 }
-const kt = new rt();
-let k;
+const Ct = new ht();
+let p;
 try {
-  k = Q.getLogger("vessel");
+  p = at.getLogger("vessel");
 } catch {
 } finally {
 }
-const ct = new ot("", !0);
-var dt = /* @__PURE__ */ ((j) => (j.common = "common", j.container = "container", j.tugs = "tugs", j))(dt || {}), ut = /* @__PURE__ */ ((j) => (j.Ballast = "Ballast", j.Laden = "Laden", j))(ut || {}), ht = /* @__PURE__ */ ((j) => (j.Cp = "CP", j.Perf = "Basis", j.Instruct = "Other", j))(ht || {});
-class C {
+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 {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -607,11 +607,11 @@ class C {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, o, i) {
-    let a = Math.round(e / (t * o * i) * 100) / 100;
-    a = a < 0.55 ? 0.55 : a > 0.85 ? 0.85 : a;
-    const n = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = n.map((d) => Math.abs(d - a));
-    return n[s.indexOf(Math.min(...s))];
+  static blockCoefficient(e, t, n, c) {
+    let o = Math.round(e / (t * n * c) * 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))];
   }
   /**
    * @see https://baike.baidu.com/item/%E5%BC%97%E5%8A%B3%E5%BE%B7%E6%95%B0/228891?fromModule=search-result_lemma-recommend
@@ -624,9 +624,9 @@ class C {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(e, t, o = 9.8) {
-    let i = Math.round(Math.sqrt(e * e / (o * t)) * 100) / 100;
-    return i = i < 0.05 ? 0.05 : i > 0.3 ? 0.3 : i, i;
+  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;
   }
   /**
    * 失速修正系數
@@ -635,8 +635,8 @@ class C {
    * @param loadCondition
    * @private
    */
-  static amendFactor(e, t, o) {
-    const i = {
+  static amendFactor(e, t, n) {
+    const c = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
       0.65: [2.6, -3.7, -11.6],
@@ -645,7 +645,7 @@ class C {
       0.8: [2.6, -13.1, -15.1],
       0.85: [3.1, -18.7, 28]
     };
-    let n = {
+    let a = {
       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 C {
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
     }[e];
-    return o === "Laden" && (n = i[e]), n[0] + n[1] * t + n[2] * Math.pow(t, 2);
+    return n === "Laden" && (a = c[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
   }
   /**
    * 失速方向因子
@@ -668,8 +668,8 @@ class C {
    * @private
    */
   static directionFactor(e, t = 0) {
-    let o;
-    return e > 30 && e <= 60 ? o = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? o = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? o = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : o = 1, Math.round(o * 1e5) / 1e5;
+    let n;
+    return e > 30 && e <= 60 ? n = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? n = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? n = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : n = 1, Math.round(n * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -682,10 +682,10 @@ class C {
    * @param bn
    * @private
    */
-  static vesselTagFactor(e, t, o, i = 0) {
-    i = i > 6 ? i - 0.9 * (i - 6) : i;
-    let a;
-    return o === "container" ? a = 0.7 * i + Math.pow(i, 6.5) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? a = 0.7 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)) : a = 0.5 * i + Math.pow(i, 6.5) / (2.7 * Math.pow(e, 2 / 3)), a;
+  static vesselTagFactor(e, t, n, c = 0) {
+    c = c > 6 ? c - 0.9 * (c - 6) : c;
+    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;
   }
   /**
    * 浪高影响因子
@@ -694,8 +694,8 @@ class C {
    */
   static waveHeightFactor(e, t) {
     e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
-    let o;
-    return t > 30 && t <= 60 ? o = -0.6 : t > 60 && t <= 90 ? o = -0.4 : t > 90 && t <= 120 ? o = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? o = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? o = e < 3 ? 0.7 : -0.6 : o = -0.7, Math.round(o * (0.144 * Math.pow(e, 2) + 0.178 * e) * 1e4) / 1e4;
+    let n;
+    return t > 30 && t <= 60 ? n = -0.6 : t > 60 && t <= 90 ? n = -0.4 : t > 90 && t <= 120 ? n = e < 3 ? 0.4 : -0.3 : t > 120 && t <= 150 ? n = e < 3 ? 0.6 : -0.5 : t > 150 && t <= 180 ? n = e < 3 ? 0.7 : -0.6 : n = -0.7, Math.round(n * (0.144 * Math.pow(e, 2) + 0.178 * e) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -705,21 +705,21 @@ class C {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, o, i) {
-    var h;
-    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, d = e.deadweight ?? 67035.7773, r = ((h = e == null ? void 0 : e.type) == null ? void 0 : h.toLowerCase()) || "common";
+  static assembleProperties(e, t, n, c) {
+    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";
     return {
       tag: r.indexOf("container") > -1 ? "container" : r.indexOf("tugs") > -1 ? "tugs" : "common",
-      lbp: a,
+      lbp: o,
       loadCondition: t,
-      draught: n,
+      draught: a,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((d / 1.025 + n * s * a * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + a * s * o * 0.7) * 1e4) / 1e4,
       // 换算为m/s
-      speed: Math.round((o ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
-      bearing: i || 90
+      speed: Math.round((n ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
+      bearing: c || 90
     };
   }
   /**
@@ -732,35 +732,35 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, o, i = "", a = 2, n = !0, s = !1, d = {}) {
+  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)), n) {
+    if (t.velocity && s && (e.speed = Z.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
       let u;
       if (d.meteo2)
         try {
-          const l = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, d), [m] = tt.pickHourly(l, o);
-          u = tt.toLegacy(m);
-        } catch (l) {
-          k.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: o.utc().format() }, l);
+          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);
         }
       else
-        u = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, d);
-      const y = C.weatherFactor(e, u), h = C.currentFactor(e.bearing, u == null ? void 0 : u.current, a), f = Math.round((e.speed * 1.943844 + y + h) * 100) / 100;
+        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 = {
         meteo: { ...u },
-        wxFactor: y,
-        cFactor: h,
-        speed: t.velocity && s ? t.velocity : f < 0 ? 1 : f,
-        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        wxFactor: m,
+        cFactor: l,
+        speed: t.velocity && s ? t.velocity : y < 0 ? 1 : y,
+        eta: n.utc().format("YYYY-MM-DDTHH:mm[Z]"),
+        etd: n.utc().format("YYYY-MM-DDTHH:mm[Z]")
       };
     } else
       r = {
         wxFactor: 0,
         cFactor: 0,
         speed: t.velocity && s ? t.velocity : Math.round((e.speed * 1.943844 + 0 + 0) * 100) / 100,
-        eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
-        etd: o.utc().format("YYYY-MM-DDTHH:mm[Z]")
+        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 };
   }
@@ -777,53 +777,53 @@ class C {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", d = !0, r = !1, u = {}) {
+  static async speedLoseInHoursStep(e, t, n, c, o, a, s = "", d = !0, r = !1, u = {}) {
     t.utc();
-    const y = t.clone().add(14, "days"), h = [], f = [];
-    let l = 0, m = 0, M, g;
-    for (let I = 0; I < n.length - 1; I++) {
-      let c = n[I];
-      c.distanceFromStart = Math.round((a + m) * 1e4) / 1e4;
-      const w = n[I + 1];
-      if (e.bearing = B.calculateBearing(c, w, !w.gcToPrevious), c.bearing = e.bearing, c.suspend && r) {
-        c.eta = c.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), c.elapsed = c.elapsed ?? 0;
-        const S = c.suspend - c.elapsed;
-        if (i - l > S)
-          i = i - l - S, t.add(S, "hour"), c.elapsed = c.suspend;
+    const m = t.clone().add(14, "days"), l = [], y = [];
+    let f = 0, S = 0, I, b;
+    for (let v = 0; v < a.length - 1; v++) {
+      let i = a[v];
+      i.distanceFromStart = Math.round((o + S) * 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;
         else {
-          const Y = i - l;
-          c.elapsed += Y, t.add(Y, "hour"), i = 0;
+          const Y = c - f;
+          i.elapsed += Y, t.add(Y, "hour"), c = 0;
         }
-        if (k == null || k.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${i} hours need to go...`, u.requestId, c), i === 0)
-          return c.distanceFromPrevious = m, { etd: t, from: g || c, to: c, next: n.filter((Y) => Y), wps: h, days: f };
+        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 };
       } else
-        c.suspend = 0;
-      d = t.isAfter(y) ? !1 : d, c = await C.speedLoseAt(e, c, t, s, 0, d, r, u), g = g || c, c.important && h.push(c), t.isSameOrAfter(o) && (f.push(c), o.add(24, "hour"));
-      const N = B.calculateDistance(c, w, !w.gcToPrevious);
-      let v = Math.ceil(N / g.speed * 1e4) / 1e4;
-      if (l + v < i) {
-        if (l += v, t.add(v, "hour"), delete n[I], k == null || k.debug(
-          `[%s] go to %j from %j with ${N}nm, and cost ${v} hours`,
+        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`,
           u.requestId,
-          { lat: w.lat, lng: w.lng },
-          { lat: g.lat, lng: g.lng, etd: g.etd }
-        ), m += N, n.filter((S) => S).length <= 1) {
-          M = w, M.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), M.distanceFromPrevious = N, M.distanceFromStart = Math.round((a + m) * 1e4) / 1e4, h.push(M), delete n[I + 1];
+          { 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];
           break;
         }
       } else {
-        v = i - l, t.add(v, "hour");
-        const S = z.roundPrecision(g.speed * v, 4);
-        M = B.calculateCoordinate(c, e.bearing, S, "nauticalmiles", !w.gcToPrevious), M.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[I] = M, k == null || k.debug(
-          `[%s] go to %j from %j with ${S}nm, and cost ${v} hours`,
+        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`,
           u.requestId,
-          { lat: M.lat, lng: M.lng },
-          { lat: c.lat, lng: c.lng, etd: c.etd }
-        ), m += S, M.distanceFromPrevious = Math.round(m * 1e4) / 1e4, M.distanceFromStart = Math.round((a + m) * 1e4) / 1e4;
+          { 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;
         break;
       }
     }
-    return { etd: t, from: g, to: M, next: n.filter((I) => I), wps: h, days: f };
+    return { etd: t, from: b, to: I, next: a.filter((v) => v), wps: l, days: y };
   }
   /**
    * 洋流影响因子
@@ -831,12 +831,12 @@ class C {
    * @param current 洋流要素
    * @param role  1: 船东, 2: 租家, 0: 未知
    */
-  static currentFactor(e, t, o = 0) {
-    const i = (e - (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
-    if (Math.abs(i) === Math.PI / 2)
+  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)
       return 0;
-    let a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i);
-    return o & 2 ? a = Math.ceil(a * 100) / 100 : o & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, Math.abs(a) > 5 ? 0 : a;
+    let o = ((t == null ? void 0 : t.kts) || 0) * Math.cos(c);
+    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 C {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var y, h, f, l, m, M, g;
-    k == null || k.debug("calculate weather factor via: %j", { ...e, ...t });
-    const o = C.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = C.froudeNumber(e.speed, e.lbp), a = C.amendFactor(o, i, e.loadCondition);
-    let n = Math.abs(e.bearing % 360 - (((y = t == null ? void 0 : t.wind) == null ? void 0 : y.degree) % 360 || 0));
-    n = n > 180 ? 360 - n : n;
-    const s = C.directionFactor(n, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale), d = C.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale);
-    let r = s * a * 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)), k == null || k.debug("wind wx factor = %d", r), n = Math.abs(e.bearing % 360 - (((m = (l = t == null ? void 0 : t.wave) == null ? void 0 : l.sig) == null ? void 0 : m.degree) % 360 || 0));
-    const u = C.waveHeightFactor(((g = (M = t == null ? void 0 : t.wave) == null ? void 0 : M.sig) == null ? void 0 : g.height) ?? 1, n);
-    return k == null || k.debug("wave wx factor = %d", u), r = r * 0.4 + u, k == null || k.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;
+    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));
+    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;
   }
   /**
    * 全程失速分析(走完航程)
@@ -867,74 +867,74 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, o, i, a, n = "", s = 0, d = !0, r = !1, u = {}) {
-    var J, _, K, G, L;
-    const y = p().valueOf();
-    e.lng = z.convertToStdLng(e.lng);
-    const { route: h, waypoints: f } = a.points, l = B.calculateSubRoute(e, h);
-    if (((J = l[0]) == null ? void 0 : J.length) <= 1)
+  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)
       return;
-    const { v0: m, label: M } = e.sog ? {
+    const { v0: S, label: I } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: i.speed,
+      v0: c.speed,
       label: "CP"
       /* Cp */
-    }, g = C.assembleProperties(o, i.loadCondition, m, 0), I = f.length ? B.calculateSubWaypoints(e, f) : [];
-    I.forEach((x) => x.important = !0);
-    const c = {
+    }, b = A.assembleProperties(n, c.loadCondition, S, 0), v = y.length ? R.calculateSubWaypoints(e, y) : [];
+    v.forEach((N) => N.important = !0);
+    const i = {
       from: { ...e },
-      route: l,
-      waypoints: I,
-      v0: m,
-      label: M
-    }, w = {
+      route: f,
+      waypoints: v,
+      v0: S,
+      label: I
+    }, h = {
       hours: [],
       days: [],
       wps: []
     };
-    s || (B.calculateRouteDistance(l) / i.speed <= 72 ? s = 3 : s = 6);
-    let N = B.simplifyRouteToCoordinates(l, I, 0), v = 0, S = 0, Y = 0, F = 0;
-    t = p(t).utc();
-    const T = t.clone();
-    for (; N.length > 0; ) {
-      const x = s - t.hour() % s, q = Math.ceil(t.clone().add(x, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, O = await C.speedLoseInHoursStep(
-        g,
+    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;
+    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,
         t,
-        T,
-        q,
-        v,
-        N,
-        n,
+        E,
+        J,
+        g,
+        C,
+        a,
         d,
         r,
         u
       );
-      (_ = O.from) != null && _.speed && (w.hours.push(O.from), w.wps.push(...O.wps), w.days.push(...O.days)), N = O == null ? void 0 : O.next, N.length || w.hours.push(O == null ? void 0 : O.to), v += Math.round((((K = O == null ? void 0 : O.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (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;
     }
-    const D = w.hours;
-    for (let x = 0; x < D.length - 1; x++) {
-      const q = p(D[x + 1].eta).diff(D[x].etd, "hour", !0) || 1;
-      S += (D[x].wxFactor || 0) * q, Y += (D[x].cFactor || 0) * q, F += q;
+    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;
     }
-    (G = w.wps) == null || G.forEach((x, q) => {
-      if (q) {
-        const O = w.wps[q - 1], et = x.distanceFromStart - O.distanceFromStart, X = p(x.eta).diff(p(O.etd), "h", !0);
-        if (X < 1)
-          x.avgSpd = O.speed;
+    ($ = 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;
         else {
-          x.avgSpd = Math.round(et / X * 100) / 100;
-          const $ = Math.round((O.speed + x.speed) / 2 * 100) / 100;
-          x.avgSpd = x.avgSpd > $ ? $ : x.avgSpd;
+          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;
         }
       }
-    }), c.sample = w;
-    const H = w.hours.at(0), V = w.hours.at(-1);
-    c.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, c.etd = p(H.eta).utc().format(), c.eta = p(V.eta).utc().format(), c.wxFactor = Math.round(S / F * 1e4) / 1e4, c.cFactor = Math.round(Y / F * 1e4) / 1e4, c.avgSpeed = Math.round(V.distanceFromStart / F * 1e4) / 1e4, c.totalHrs = Math.round(F * 1e4) / 1e4, c.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * c.totalHrs * 1e3) / 1e3, c.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * c.totalHrs * 1e3) / 1e3;
-    const P = p().valueOf() - y, A = ((L = w == null ? void 0 : w.hours) == null ? void 0 : L.length) || 1;
-    return k == null || k.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", u == null ? void 0 : u.requestId, P, A, Math.round(P / A * 1e3) / 1e3), c;
+    }), 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;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -949,64 +949,64 @@ class C {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, d = "", r = 3, u = !0, y = !1, h = {}) {
-    var J, _, K, G;
-    const f = p().valueOf();
-    e.lng = z.convertToStdLng(e.lng);
-    const { v0: l, label: m } = e.sog ? {
+  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 ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
     } : {
-      v0: a.speed,
+      v0: o.speed,
       label: "CP"
       /* Cp */
-    }, M = C.assembleProperties(i, a.loadCondition, l, 0), g = B.calculateSubRoute(e, n);
-    if (((J = g[0]) == null ? void 0 : J.length) <= 1)
+    }, I = A.assembleProperties(c, o.loadCondition, f, 0), b = R.calculateSubRoute(e, a);
+    if (((et = b[0]) == null ? void 0 : et.length) <= 1)
       return;
-    const I = s.length ? B.calculateSubWaypoints(e, s) : [];
-    I.forEach((L) => L.important = !0);
-    let c = B.simplifyRouteToCoordinates(g, I, 0), w = 0, N = 0, v = 0, S = 0;
+    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 = {
       hours: [],
       wps: [],
       days: []
     };
-    t = p(t).utc();
-    const F = t.clone();
-    for (; c.length > 0; ) {
-      const L = r - t.hour() % r;
-      let x = Math.ceil(t.clone().add(L, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      x = t.clone().add(x, "h").isSameOrAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : x;
-      const q = await C.speedLoseInHoursStep(M, t, F, x, w, c, d, u, y, h);
-      if ((_ = q.from) != null && _.speed && (Y.hours.push(q.from), q != null && q.wps && Y.wps.push(...q.wps), Y.days.push(...q.days)), c = q == null ? void 0 : q.next, c.length || Y.hours.push(q == null ? void 0 : q.to), w += Math.round((((K = q == null ? void 0 : q.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !x)
+    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)
         break;
     }
-    const T = Y.hours;
-    for (let L = 0; L < T.length - 1; L++) {
-      const x = p(T[L + 1].eta).diff(T[L].etd, "hour", !0);
-      N += T[L].wxFactor * x, v += T[L].cFactor * x, S += x;
+    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 D = Y.hours.at(0), H = Y.hours.at(-1), V = {
+    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,
-      distance: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) * 1e4) / 1e4,
+      distance: Math.round(((x == null ? void 0 : x.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: p(D.eta).utc().format(),
-      eta: p(H == null ? void 0 : H.eta).utc().format(),
-      wxFactor: Math.round(N / S * 1e4) / 1e4,
-      cFactor: Math.round(v / S * 1e4) / 1e4,
-      avgSpeed: Math.round(((H == null ? void 0 : H.distanceFromStart) || 0) / S * 1e4) / 1e4,
-      totalHrs: Math.round(S * 1e4) / 1e4,
-      totalFoCons: Math.round((a == null ? void 0 : a.fo) / 24 * S * 1e3) / 1e3,
-      totalDgoCons: Math.round((a == null ? void 0 : a.dgo) / 24 * S * 1e3) / 1e3,
-      from: D,
-      to: H,
-      route: g,
-      waypoints: I,
-      v0: l,
-      label: m
-    }, P = p().valueOf() - f, A = ((G = Y == null ? void 0 : Y.hours) == null ? void 0 : G.length) || 1;
-    return k == null || k.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", h == null ? void 0 : h.requestId, P, A, Math.round(P / A * 1e3) / 1e3), V;
+      etd: w(k.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,
+      avgSpeed: Math.round(((x == null ? void 0 : x.distanceFromStart) || 0) / D * 1e4) / 1e4,
+      totalHrs: Math.round(D * 1e4) / 1e4,
+      from: k,
+      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;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1023,57 +1023,57 @@ class C {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, o, i, a = {}) {
-    var g, I;
-    const n = p().valueOf(), s = [];
-    a.meteo2 = a.meteo2 || !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
-    const d = B.calculateRouteDistance(i.route);
+  static async analyseCost(e, t, n, c, o = {}) {
+    var b, 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;
-    o.forEach((c) => {
-      const w = Math.ceil(d / c.speed / 24);
-      r = r < w ? w : r;
+    n.forEach((i) => {
+      const h = Math.ceil(d / i.speed / 24);
+      r = r < h ? h : r;
     }), r = r * 1.3;
-    const u = p.utc(e.etd).add(r ?? 14, "day");
-    let y = 1;
-    for (const c of o) {
-      const w = JSON.parse(JSON.stringify(i.route)), N = JSON.parse(JSON.stringify(i.waypoints)), v = await C.analyseInstantWithThreshed(
+    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(
         { lat: e.lat, lng: e.lng },
         e.etd,
         u,
         t,
-        c,
-        w,
-        N,
+        i,
+        h,
+        C,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
-        a
+        o
       );
-      v && (await C.calculateCost(v, c, e, a), s.push(v), k == null || k.info("[%s][L%d-%d] analyse from %s to %s cost: %j", a.requestId, 1, y, e.etd, u.format(), {
-        cost: v.cost.total,
-        distance: v.distance,
-        hours: v.totalHrs,
-        cp: `${c.speed}/${c.fo}/${c.dgo}`
-      })), y++;
+      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++;
     }
-    s.sort((c, w) => c.cost.total - w.cost.total);
-    const h = s.at(0), f = s.at(1), l = [];
-    if (l.push({ combined: !1, speeds: [h], cost: (g = h.cost) == null ? void 0 : g.total }), f) {
-      const c = h.cost.cp, w = f.cost.cp, N = p(h.eta), v = p(h.etd), S = N.diff(v, "days", !0);
-      let Y = Math.ceil(S / 2);
+    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 F = 2, T = { combined: !1, speeds: [f], cost: (I = f.cost) == null ? void 0 : I.total }, D;
+      let q = 2, E = { combined: !1, speeds: [y], cost: (v = y.cost) == null ? void 0 : v.total }, k;
       for (; Y >= e.alterStep; ) {
-        const H = await C.combinedAnalyse(e, t, u, [c, w], i, Y, { ...a, level: F });
-        if (T.cost > H.cost ? D ? (D == null ? void 0 : D.cost) > H.cost && (D = H) : (D = T, T = H) : (!D || (D == null ? void 0 : D.cost) > H.cost) && (D = H), 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)
           break;
-        Y = Math.ceil(Y / 2), F += 1;
+        Y = Math.ceil(Y / 2), q += 1;
       }
-      l.push(T), D && l.push(D);
+      f.push(E), k && f.push(k);
     }
-    const M = p().valueOf() - n;
-    return k == null || k.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, M), l.sort((c, w) => c.cost - w.cost);
+    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);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1085,12 +1085,12 @@ class C {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, o, i, a, n, s = {}) {
-    s.counter = 1, k == null || k.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
-    const d = await C.alternateAnalyse(e, t, o, i, 0, a, n, s), r = d.reduce((h, f) => h + f.cost.total, 0);
-    k == null || k.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
-    const u = await C.alternateAnalyse(e, t, o, i, 1, a, n, s), y = u.reduce((h, f) => h + f.cost.total, 0);
-    return k == null || k.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, y), r < y ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: d, step: n } : { combined: !0, cost: Math.round(y * 1e3) / 1e3, speeds: u, step: n };
+  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 };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1103,41 +1103,41 @@ class C {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, o, i, a, n, s, d = {}) {
-    var h, f;
-    let r = p.utc(e.etd);
-    const u = { lat: e.lat, lng: e.lng }, y = [];
-    for (; r.isBefore(o); ) {
-      const l = r.clone().utc().add(s, "day"), m = JSON.parse(JSON.stringify(n.route)), M = JSON.parse(JSON.stringify(n.waypoints)), g = i[a], I = await C.analyseInstantWithThreshed(
+  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(
         u,
         r.format(),
-        l,
+        f,
         t,
-        g,
-        m,
-        M,
+        b,
+        S,
+        I,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         d
       );
-      I && (await C.calculateCost(I, g, e, d), k == null || k.info(
+      v && (await A.calculateCost(v, b, e, d), p == null || p.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         d.requestId,
         d.level,
         d.counter,
         r.utc().format(),
-        l.utc().format(),
-        { cost: I.cost.total, distance: I.distance, hours: I.totalHrs, cp: `${g.speed}/${g.fo}/${g.dgo}` }
+        f.utc().format(),
+        { cost: v.cost.total, distance: v.distance, hours: v.totalHrs, cp: `${b.speed}/${b.fo}/${b.dgo}` }
       )), d.counter = d.counter + 1;
-      const c = (f = (h = I == null ? void 0 : I.sample) == null ? void 0 : h.hours) == null ? void 0 : f.at(-1);
-      if (c)
-        u.lat = c.lat, u.lng = c.lng, r = p(c.eta), y.push(I), a = a ? 0 : 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;
       else
         break;
     }
-    return y;
+    return m;
   }
   /**
    * 计算Speed的cost
@@ -1146,81 +1146,113 @@ class C {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, o, i = {}) {
+  static async calculateCost(e, t, n, c = {}) {
     if (e) {
-      const a = Math.round(e.totalHrs / 24 * (o.dailyHire || 0) * (1 - (o.addComm || 0)) * 1e3) / 1e3, n = Math.round(e.totalFoCons * (o.priceFO || 0) * 1e3) / 1e3, s = Math.round(e.totalDgoCons * (o.priceDGO || 0) * 1e3) / 1e3;
+      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;
       e.cost = {
-        total: Math.round((a + n + s) * 1e3) / 1e3,
-        hire: a,
-        bunker: Math.round((n + s) * 1e3) / 1e3,
+        total: Math.round((o + a + s) * 1e3) / 1e3,
+        hire: o,
+        bunker: Math.round((a + s) * 1e3) / 1e3,
         cp: t
       };
     }
     return e;
   }
+  /**
+   * 计算单cp模式下的ECA属性
+   */
+  static async calculateECA(e, t, n = {}) {
+    var d, r;
+    const c = 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) {
+      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;
+    }
+    return o = Z.roundPrecision(o, 3), a = Z.roundPrecision(a, 3), s = Z.roundPrecision(s, 3), {
+      distanceInECA: o,
+      hoursInECA: a,
+      totalDgoConsInECA: s,
+      eca: c
+    };
+  }
+  /**
+   * 合并多cp组合模式下的速度集合
+   * @param speeds
+   * @param options
+   */
   static async mergeSpeeds(e, t = {}) {
-    var l;
-    const o = {
+    var v;
+    const n = {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((m, M) => m + M.distance, 0), a = e.reduce((m, M) => m + M.totalHrs, 0), n = e.reduce((m, M) => m + M.wxFactor * M.totalHrs / a, 0), s = e.reduce((m, M) => m + M.cFactor * M.totalHrs / a, 0), d = e.reduce((m, M) => m + M.totalFoCons, 0), r = e.reduce((m, M) => m + M.totalDgoCons, 0), u = e.reduce((m, M) => m + M.cost.total, 0), y = e.reduce((m, M) => m + M.cost.hire, 0), h = e.reduce((m, M) => m + M.cost.bunker, 0), f = [];
-    for (const m of e) {
-      const M = m.sample.hours, g = M.at(0);
-      g.cp = m.cost.cp;
-      const I = [m.etd, m.eta], c = f.findIndex((S) => S.id === g.cp.id);
-      c === -1 ? (g.cp.segment = [I], f.push(g.cp)) : f[c].segment.push(I);
-      const w = m.sample.wps, N = m.sample.days;
-      M.forEach((S) => {
-        var F;
-        ((F = o.hours) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.hours.push(S);
-      }), w.forEach((S) => {
-        var F;
-        ((F = o.wps) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.wps.push(S);
-      }), N.forEach((S) => {
-        var F;
-        ((F = o == null ? void 0 : o.days) == null ? void 0 : F.findIndex((T) => T.eta === S.eta)) === -1 && o.days.push(S);
+    }, 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);
       });
-      const v = (l = o.wps) == null ? void 0 : l.findIndex((S) => S.eta === g.eta);
-      v === -1 ? o.wps.push(g) : o.wps[v] = g;
+      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;
     }
-    return o.wps.sort((m, M) => {
-      p(m.etd).unix() - p(M.etd).unix();
+    return n.wps.sort((i, h) => {
+      w(i.etd).unix() - w(h.etd).unix();
     }), {
-      sample: o,
+      sample: n,
       etd: e.at(0).etd,
       eta: e.at(-1).eta,
       from: e.at(0).from,
       to: e.at(-1).to,
       v0: e.at(0).v0,
       label: "Combined",
-      distance: Math.round(i * 1e4) / 1e4,
+      distance: Math.round(c * 1e4) / 1e4,
+      distanceInECA: Math.round(o * 1e4) / 1e4,
       totalHrs: Math.round(a * 1e3) / 1e3,
-      avgSpeed: Math.round(i / a * 1e3) / 1e3,
-      wxFactor: Math.round(n / a * 1e3) / 1e3,
-      cFactor: Math.round(s / a * 1e3) / 1e3,
-      totalFoCons: Math.round(d * 1e3) / 1e3,
-      totalDgoCons: Math.round(r * 1e3) / 1e3,
+      hoursInECA: Math.round(s * 1e3) / 1e3,
+      avgSpeed: Math.round(c / a * 1e3) / 1e3,
+      wxFactor: Math.round(r / a * 1e3) / 1e3,
+      cFactor: Math.round(u / a * 1e3) / 1e3,
+      totalFoCons: Math.round(m * 1e3) / 1e3,
+      totalDgoCons: Math.round(l * 1e3) / 1e3,
+      totalDgoConsInECA: Math.round(d * 1e3) / 1e3,
       cost: {
-        total: Math.round(u * 1e3) / 1e3,
-        hire: Math.round(y * 1e3) / 1e3,
-        bunker: Math.round(h * 1e3) / 1e3
+        total: Math.round(y * 1e3) / 1e3,
+        hire: Math.round(f * 1e3) / 1e3,
+        bunker: Math.round(S * 1e3) / 1e3
       },
-      cps: f
+      cps: I,
+      eca: b
     };
   }
 }
 export {
-  U as AISImpl,
-  rt as AlertHelper,
-  it as AlertLevel,
-  wt as HifleetImpl,
-  ut as LoadCondition,
-  It as MyShipImpl,
-  vt as MyVesselImpl,
-  pt as ShipxyImpl,
-  C as SpeedHelper,
-  ht as SpeedLabel,
-  dt as VesselTag,
-  kt as alertHelper
+  st as AISImpl,
+  ht as AlertHelper,
+  ut as AlertLevel,
+  St as HifleetImpl,
+  mt as LoadCondition,
+  jt as MyShipImpl,
+  kt as MyVesselImpl,
+  Yt as ShipxyImpl,
+  A as SpeedHelper,
+  yt as SpeedLabel,
+  ft as VesselTag,
+  Ct as alertHelper
 };