@idm-plugin/vessel 1.6.4 → 1.6.6

package/dist/index.js

@@ -1,15 +1,15 @@
 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);
+var at = (S, e, t) => e in S ? st(S, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : S[e] = t;
+var Z = (S, e, t) => (at(S, typeof e != "symbol" ? e + "" : e, t), t);
 import R from "got";
 import Q from "@log4js-node/log4js-api";
-import w from "moment";
+import v 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;
+let M;
 try {
-  b = Q.getLogger("vessel");
+  M = Q.getLogger("vessel");
 } catch {
 } finally {
 }
@@ -54,7 +54,7 @@ class U {
     return { labelCn: t, labelEn: o };
   }
 }
-class gt extends U {
+class vt extends U {
   constructor(t, o) {
     super();
     Z(this, "clientId");
@@ -70,32 +70,32 @@ class gt extends U {
         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 = {
+    M == null || M.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: w().utc().format()
+      issuedAt: v().utc().format()
     });
   }
   async realTimePosition(t, o = {}) {
-    var l, y, m;
-    (!this.token || w().diff(w(this.token.issuedAt), "seconds") > ((l = this.token) == null ? void 0 : l.expiresIn) - 300) && await this.authToken(o);
+    var l, m, f;
+    (!this.token || v().diff(v(this.token.issuedAt), "seconds") > ((l = this.token) == null ? void 0 : l.expiresIn) - 300) && await this.authToken(o);
     const i = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", a = {
       headers: {
-        Authorization: `${(y = this.token) == null ? void 0 : y.tokenType} ${(m = this.token) == null ? void 0 : m.accessToken}`
+        Authorization: `${(m = this.token) == null ? void 0 : m.tokenType} ${(f = this.token) == null ? void 0 : f.accessToken}`
       },
       searchParams: { mmsi: t }
     };
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
+    M == null || M.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;
+      return M == null || M.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 h in s)
       !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
-    const c = w(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = v(`${s.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.mmsi,
       name: s.vesselName,
@@ -110,29 +110,29 @@ class gt 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) ? w.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? v.utc(s.eta).format() : void 0,
       destination: s.dest,
-      positionTime: c.unix(),
+      positionTime: d.unix(),
       status: s.status,
       labelCn: s.statusNameCn,
       labelEn: s.statusNameEn,
       method: "position",
       vendor: "myVessel",
-      utc: c.utc().format()
+      utc: d.utc().format()
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    (!this.token || w().diff(w(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
-    const c = await this.realTimePosition(t, s), r = w(o), l = w(i), y = [];
-    for (; l.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, r, r.clone().add(30, "day"), c, a, y, s), r.add(30, "day");
-    return await this.trajectoryIn30Day(t, r, l, c, a, y, s), y;
+    (!this.token || v().diff(v(this.token.issuedAt), "seconds") > this.token.expiresIn - 300) && await this.authToken(s);
+    const d = await this.realTimePosition(t, s), c = v(o), l = v(i), m = [];
+    for (; l.diff(c, "day", !0) > 30; )
+      await this.trajectoryIn30Day(t, c, c.clone().add(30, "day"), d, a, m, s), c.add(30, "day");
+    return await this.trajectoryIn30Day(t, c, l, d, a, m, s), m;
   }
-  async trajectoryIn30Day(t, o, i, a, n, s, c = {}) {
-    var u, p, k, f, I;
-    const r = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
+  async trajectoryIn30Day(t, o, i, a, n, s, d = {}) {
+    var u, I, k, y, w;
+    const c = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
       headers: {
-        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(p = this.token) == null ? void 0 : p.accessToken}`
+        Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(I = this.token) == null ? void 0 : I.accessToken}`
       },
       json: {
         mmsi: t,
@@ -140,35 +140,35 @@ class gt extends U {
         endTime: i.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
     };
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", c.requestId, r, l);
-    const y = await R.post(r, l).json();
-    if (y.code)
-      return b == null || b.warn("[%s] fetch trajectory failed: %j", c.requestId, r, { message: y.message, status: y.status, code: y.code }), y;
-    let m = -1;
-    const h = w(`${(f = (k = y.data) == null ? void 0 : k[0]) == null ? void 0 : f.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    return (I = y.data) == null || I.forEach((d) => {
-      for (const x in d)
-        !isNaN(d[x]) && Number(d[x]) !== 1 / 0 && (d[x] = Number(d[x]));
-      const M = w(`${d.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), T = d.status, { labelCn: v, labelEn: Y } = this.parseStatus(T), S = {
-        mmsi: d.mmsi,
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", d.requestId, c, l);
+    const m = await R.post(c, l).json();
+    if (m.code)
+      return M == null || M.warn("[%s] fetch trajectory failed: %j", d.requestId, c, { message: m.message, status: m.status, code: m.code }), m;
+    let f = -1;
+    const h = v(`${(y = (k = m.data) == null ? void 0 : k[0]) == null ? void 0 : y.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    return (w = m.data) == null || w.forEach((r) => {
+      for (const q in r)
+        !isNaN(r[q]) && Number(r[q]) !== 1 / 0 && (r[q] = Number(r[q]));
+      const b = v(`${r.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), x = r.status, { labelCn: g, labelEn: j } = this.parseStatus(x), Y = {
+        mmsi: r.mmsi,
         imo: a == null ? void 0 : a.imo,
-        lat: d.lat,
-        lng: d.lon,
-        sog: d.sog,
-        cog: d.cog,
-        hdg: d.hdg,
-        draught: d.draught,
-        status: T,
-        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(d.eta) ? w(`${d.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
-        destination: d.dest,
-        positionTime: M.unix(),
-        labelCn: v,
-        labelEn: Y,
+        lat: r.lat,
+        lng: r.lon,
+        sog: r.sog,
+        cog: r.cog,
+        hdg: r.hdg,
+        draught: r.draught,
+        status: x,
+        eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(r.eta) ? v(`${r.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
+        destination: r.dest,
+        positionTime: b.unix(),
+        labelCn: g,
+        labelEn: j,
         method: "trajectory",
         vendor: "myVessel",
-        utc: M.utc().format()
-      }, D = Math.floor(M.diff(h, "minute", !0) / (n || 1));
-      D !== m && (m = D, s.push(S));
+        utc: b.utc().format()
+      }, C = Math.floor(b.diff(h, "minute", !0) / (n || 1));
+      C !== f && (f = C, s.push(Y));
     }), s;
   }
 }
@@ -185,14 +185,14 @@ class wt extends U {
         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);
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", o.requestId, i, a);
     const s = n == null ? void 0 : n.list;
     if (!s)
-      return b == null || b.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
+      return M == null || M.warn("[%s] fetch realtime position failed: %j", o.requestId, i, n), n;
     for (const h in s)
       !isNaN(s[h]) && Number(s[h]) !== 1 / 0 && (s[h] = Number(s[h]));
     s.status = s.sp > 3 ? 0 : 1;
-    const c = s.status, { labelCn: r, labelEn: l } = this.parseStatus(c), y = w(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    const d = s.status, { labelCn: c, labelEn: l } = this.parseStatus(d), m = v(`${s.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return {
       mmsi: s.m,
       name: s.n,
@@ -207,12 +207,12 @@ 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) ? w.utc(s.eta).format() : void 0,
+      eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(s.eta) ? v.utc(s.eta).format() : void 0,
       destination: s.destination,
-      positionTime: y.unix(),
-      utc: y.utc().format(),
-      status: c,
-      labelCn: r,
+      positionTime: m.unix(),
+      utc: m.utc().format(),
+      status: d,
+      labelCn: c,
       labelEn: l,
       method: "position",
       vendor: "hifleet"
@@ -231,9 +231,9 @@ class wt extends U {
       }
     };
     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 c in n)
-      !isNaN(n[c]) && Number(n[c]) !== 1 / 0 && (n[c] = Number(n[c]));
+    M == null || M.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]));
     const s = {
       mmsi: n.m,
       name: n.n,
@@ -244,7 +244,7 @@ class wt extends U {
       draught: n.dr,
       type: n.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 i = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", n = await R.post(i, a).json(), M == null || M.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;
   }
   async suggest(t, o = {}) {
     const i = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", a = {
@@ -257,70 +257,70 @@ class wt extends U {
         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);
+    M == null || M.info("[%s] suggest vessel props from: %s - %j", o.requestId, i, a);
     const s = [];
-    for (const c of n)
+    for (const d of n)
       s.push({
-        mmsi: !c.mmsi || isNaN(c.mmsi) ? null : Number(c.mmsi),
-        name: c.name,
-        callSign: c.callsign,
-        imo: !c.imo || isNaN(c.imo) ? null : Number(c.imo),
-        score: c._score
+        mmsi: !d.mmsi || isNaN(d.mmsi) ? null : Number(d.mmsi),
+        name: d.name,
+        callSign: d.callsign,
+        imo: !d.imo || isNaN(d.imo) ? null : Number(d.imo),
+        score: d._score
       });
-    return s.sort((c, r) => r.score - c.score), s;
+    return s.sort((d, c) => c.score - d.score), s;
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    var d, M, T;
-    const c = await this.realTimePosition(t, s);
-    let r = w(o);
-    const l = w(i), y = w();
+    var r, b, x;
+    const d = await this.realTimePosition(t, s);
+    let c = v(o);
+    const l = v(i), m = v();
     if (n) {
-      let v = l.diff(r, "d", !0);
-      v < 0 ? r = l.clone().subtract(40, "d") : v < 30 ? r.subtract(10, "d") : v < 60 ? r.subtract(5, "d") : r = l.clone().subtract(80, "d"), v = y.diff(l, "d", !0), l.add(v > 10 ? 240 : v * 24, "h");
+      let g = l.diff(c, "d", !0);
+      g < 0 ? c = l.clone().subtract(40, "d") : g < 30 ? c.subtract(10, "d") : g < 60 ? c.subtract(5, "d") : c = l.clone().subtract(80, "d"), g = m.diff(l, "d", !0), l.add(g > 10 ? 240 : g * 24, "h");
     }
-    const m = {
+    const f = {
       searchParams: {
         endtime: l.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
       }
-    }, h = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await R.get(h, m).json();
-    b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, m);
-    let p;
-    u && (p = ((M = (d = u.ships) == null ? void 0 : d.offors) == null ? void 0 : M.ship) || [], p.length || b == null || b.warn("[%s] fetch trajectory failed: %j", s.requestId, u));
+    }, h = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", u = await R.get(h, f).json();
+    M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, f);
+    let I;
+    u && (I = ((b = (r = u.ships) == null ? void 0 : r.offors) == null ? void 0 : b.ship) || [], I.length || M == null || M.warn("[%s] fetch trajectory failed: %j", s.requestId, u));
     const k = [];
-    let f = -1;
-    const I = w(`${(T = p == null ? void 0 : p[0]) == null ? void 0 : T.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-    for (const v of p) {
-      for (const C in v)
-        !isNaN(v[C]) && Number(v[C]) !== 1 / 0 && (v[C] = Number(v[C]));
-      const Y = w(`${v.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
-      v.status = v.sp > 4 ? 0 : 1;
-      const { labelEn: S, labelCn: D } = this.parseStatus(v.status), x = {
-        mmsi: v.m,
-        name: v.n,
-        imo: c == null ? void 0 : c.imo,
-        lat: v.la,
-        lng: v.lo,
-        draught: v.draught,
-        sog: v.sp,
-        cog: v.co,
-        hdg: v.hdg,
-        positionTime: Y.unix(),
-        utc: Y.utc().format(),
-        status: v.status,
-        labelCn: D,
-        labelEn: S,
+    let y = -1;
+    const w = v(`${(x = I == null ? void 0 : I[0]) == null ? void 0 : x.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+    for (const g of I) {
+      for (const D in g)
+        !isNaN(g[D]) && Number(g[D]) !== 1 / 0 && (g[D] = Number(g[D]));
+      const j = v(`${g.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
+      g.status = g.sp > 4 ? 0 : 1;
+      const { labelEn: Y, labelCn: C } = this.parseStatus(g.status), q = {
+        mmsi: g.m,
+        name: g.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,
+        positionTime: j.unix(),
+        utc: j.utc().format(),
+        status: g.status,
+        labelCn: C,
+        labelEn: Y,
         method: "trajectory",
         vendor: "hifleet"
-      }, A = Math.floor(Y.diff(I, "minute", !0) / (a || 1));
-      A !== f && (f = A, k.push(x));
+      }, T = Math.floor(j.diff(w, "minute", !0) / (a || 1));
+      T !== y && (y = T, k.push(q));
     }
     return k;
   }
 }
-class It extends U {
+class pt extends U {
   constructor(t) {
     super();
     Z(this, "token");
@@ -334,12 +334,12 @@ class It extends U {
         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)
+    if (M == null || M.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 m in s)
-      !isNaN(s[m]) && Number(s[m]) !== 1 / 0 && (s[m] = Number(s[m]));
-    const { labelCn: c, labelEn: r } = await this.parseStatus(s.navistat), l = w.unix(s.lasttime);
+    for (const f in s)
+      !isNaN(s[f]) && Number(s[f]) !== 1 / 0 && (s[f] = Number(s[f]));
+    const { labelCn: d, labelEn: c } = await this.parseStatus(s.navistat), l = v.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
       name: s.name,
@@ -357,47 +357,47 @@ class It extends U {
       positionTime: s.lasttime,
       utc: l.utc().format(),
       status: s.navistat,
-      labelEn: r,
-      labelCn: c,
+      labelEn: c,
+      labelCn: d,
       method: "position",
       vendor: "shipxy"
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    var I;
-    const c = await this.realTimePosition(t, s), r = w(o), l = w(i), y = "https://api.shipxy.com/apicall/GetShipTrack", m = {
+    var w;
+    const d = await this.realTimePosition(t, s), c = v(o), l = v(i), m = "https://api.shipxy.com/apicall/GetShipTrack", f = {
       searchParams: {
         id: t,
         k: this.token,
         enc: 1,
         cut: 0,
-        btm: r.unix(),
+        btm: c.unix(),
         etm: l.unix()
       }
-    }, h = await R.get(y, m).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", s.requestId, y, m), (h == null ? void 0 : h.status) !== 0)
+    }, h = await R.get(m, f).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", s.requestId, m, f), (h == null ? void 0 : h.status) !== 0)
       return h;
-    const u = h == null ? void 0 : h.points, p = [], k = w.unix((I = u[0]) == null ? void 0 : I.utc);
-    let f = -1;
-    for (const d of u) {
-      const M = w.unix(d.utc), T = {
-        imo: c == null ? void 0 : c.imo,
+    const u = h == null ? void 0 : h.points, I = [], k = v.unix((w = u[0]) == null ? void 0 : w.utc);
+    let y = -1;
+    for (const r of u) {
+      const b = v.unix(r.utc), x = {
+        imo: d == null ? void 0 : d.imo,
         mmsi: t,
-        sog: Math.round(d.sog * 3600 / 1e3 / 1852 * 100) / 100,
-        cog: Math.round(d.cog / 100 * 100) / 100,
-        lat: Math.round(d.lat / 1e6 * 1e5) / 1e5,
-        lng: Math.round(d.lon / 1e6 * 1e5) / 1e5,
-        positionTime: M.unix(),
-        utc: M.utc().format(),
+        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: b.unix(),
+        utc: b.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, v = Math.floor(M.diff(k, "minute", !0) / (a || 1));
-      v !== f && (f = v, p.push(T));
+      }, g = Math.floor(b.diff(k, "minute", !0) / (a || 1));
+      g !== y && (y = g, I.push(x));
     }
-    return p;
+    return I;
   }
 }
-class pt extends U {
+class It extends U {
   constructor(t) {
     super();
     Z(this, "token");
@@ -412,7 +412,7 @@ class pt extends U {
         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;
+    return M == null || M.info("[%s] fetch ship id from: %s - %j", o.requestId, a, i), n.code !== "0" ? n : n.data[0].shipId;
   }
   async getShipInfo(t, o = {}) {
     const i = {
@@ -423,14 +423,14 @@ class pt extends U {
         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")
+    if (M == null || M.info("[%s] fetch ship info from: %s - %j", o.requestId, a, i), n.code !== "0")
       return n;
     const s = n.data;
-    let c = s.imo;
-    return t === "407170" && (c = "9198379", b == null || b.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, c)), {
+    let d = s.imo;
+    return t === "407170" && (d = "9198379", M == null || M.warn("[%s] ship(%s) imo error: %s, should be %s", o.requestId, t, s.imo, d)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
-      imo: c,
+      imo: d,
       callSign: s.callSign,
       length: s.length,
       width: s.breadth,
@@ -445,37 +445,37 @@ class pt extends U {
       json: {
         shipId: i
       }
-    }, s = "https://api3.myships.com/sp/ships/position/latest", c = await R.post(s, n).json();
-    b == null || b.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
-    const r = c.data[0];
-    for (const u in r)
-      !isNaN(r[u]) && Number(r[u]) !== 1 / 0 && (r[u] = Number(r[u]));
-    const { labelCn: l, labelEn: y } = await this.parseStatus(r.aisNavStatus), m = w.unix(r.posTime);
+    }, s = "https://api3.myships.com/sp/ships/position/latest", d = await R.post(s, n).json();
+    M == null || M.info("[%s] fetch realtime position from: %s - %j", o.requestId, s, n);
+    const c = d.data[0];
+    for (const u in c)
+      !isNaN(c[u]) && Number(c[u]) !== 1 / 0 && (c[u] = Number(c[u]));
+    const { labelCn: l, labelEn: m } = await this.parseStatus(c.aisNavStatus), f = v.unix(c.posTime);
     return {
       ...a,
       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,
-      utc: m.utc().format(),
-      status: r.aisNavStatus,
-      labelEn: y,
+      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: f.utc().format(),
+      status: c.aisNavStatus,
+      labelEn: m,
       labelCn: l,
       method: "position",
       vendor: "myship"
     };
   }
   async trajectory(t, o, i, a, n = !0, s = {}) {
-    const c = w(o), r = w(i), l = await this.getShipId(t), y = await this.getShipInfo(l), m = [];
-    for (; r.diff(c, "day", !0) > 30; )
-      await this.trajectoryIn30Day(l, c.unix(), c.add(30, "day").unix(), y, t, a, m);
-    return await this.trajectoryIn30Day(l, c.unix(), r.unix(), y, t, a, m), m;
+    const d = v(o), c = v(i), l = await this.getShipId(t), m = await this.getShipInfo(l), f = [];
+    for (; c.diff(d, "day", !0) > 30; )
+      await this.trajectoryIn30Day(l, d.unix(), d.add(30, "day").unix(), m, t, a, f);
+    return await this.trajectoryIn30Day(l, d.unix(), c.unix(), m, t, a, f), f;
   }
-  async trajectoryIn30Day(t, o, i, a, n, s, c, r = {}) {
+  async trajectoryIn30Day(t, o, i, a, n, s, d, c = {}) {
     var k;
     const l = {
       headers: {
@@ -486,32 +486,32 @@ class pt extends U {
         startTime: o,
         endTime: i
       }
-    }, y = "https://api3.myships.com/sp/ships/position/history", m = await R.post(y, l).json();
-    if (b == null || b.info("[%s] fetch trajectory from: %s - %j", r.requestId, y, l), m.code !== "0")
-      return b == null || b.warn("[%s] invoke myship trajectory failed: %j", r.requestId, m), m;
-    const h = m.data;
-    for (const f in h)
-      !isNaN(h[f]) && Number(h[f]) !== 1 / 0 && (h[f] = Number(h[f]));
-    const u = w.unix((k = h[0]) == null ? void 0 : k.posTime);
-    let p = -1;
-    for (const f of h) {
-      const I = w.unix(f.posTime), d = {
+    }, m = "https://api3.myships.com/sp/ships/position/history", f = await R.post(m, l).json();
+    if (M == null || M.info("[%s] fetch trajectory from: %s - %j", c.requestId, m, l), f.code !== "0")
+      return M == null || M.warn("[%s] invoke myship trajectory failed: %j", c.requestId, f), f;
+    const h = f.data;
+    for (const y in h)
+      !isNaN(h[y]) && Number(h[y]) !== 1 / 0 && (h[y] = Number(h[y]));
+    const u = v.unix((k = h[0]) == null ? void 0 : k.posTime);
+    let I = -1;
+    for (const y of h) {
+      const w = v.unix(y.posTime), r = {
         imo: a == null ? void 0 : a.imo,
         mmsi: n,
-        lat: Math.round(f.lat / 1e4 / 60 * 1e5) / 1e5,
-        lng: Math.round(f.lon / 1e4 / 60 * 1e5) / 1e5,
-        sog: Math.round(f.sog / 10 * 100) / 100,
-        cog: Math.round(f.cog / 10 * 100) / 100,
-        hdg: Math.round(f.heading * 100) / 100,
-        rot: Math.round(f.rot * 100) / 100,
-        positionTime: I.unix(),
-        utc: I.utc().format(),
+        lat: Math.round(y.lat / 1e4 / 60 * 1e5) / 1e5,
+        lng: Math.round(y.lon / 1e4 / 60 * 1e5) / 1e5,
+        sog: Math.round(y.sog / 10 * 100) / 100,
+        cog: Math.round(y.cog / 10 * 100) / 100,
+        hdg: Math.round(y.heading * 100) / 100,
+        rot: Math.round(y.rot * 100) / 100,
+        positionTime: w.unix(),
+        utc: w.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, M = Math.floor(I.diff(u, "minute", !0) / (s || 1));
-      M !== p && (p = M, c.push(d));
+      }, b = Math.floor(w.diff(u, "minute", !0) / (s || 1));
+      b !== I && (I = b, d.push(r));
     }
-    return c;
+    return d;
   }
 }
 let W;
@@ -520,7 +520,7 @@ try {
 } 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 || {});
+var it = /* @__PURE__ */ ((S) => (S.NOTICE = "NOTICE", S.WARN = "WARN", S.HEAVY = "HEAVY", S.SEVERE = "SEVERE", S.ERROR = "ERROR", S.FATAL = "FATAL", S))(it || {});
 class rt {
   /**
    * 解析告警规则, 多规则场景
@@ -531,19 +531,19 @@ class rt {
    * @param options
    */
   parsePrinciple(e, t = {}) {
-    var s, c, r;
+    var s, d, c;
     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)
       return;
     const n = {};
     for (let l = 0; l < (a == null ? void 0 : a.length); l++) {
-      const y = (r = (c = a[l].match(o)) == null ? void 0 : c[0]) == null ? void 0 : r.split("],");
-      if (l === 0 && !y)
+      const m = (c = (d = a[l].match(o)) == null ? void 0 : d[0]) == null ? void 0 : c.split("],");
+      if (l === 0 && !m)
         n.scope = a[0];
-      else if (y)
-        for (let m = 0, h = y.length; m < h; m++) {
-          const u = this.parseRule(y[m]);
+      else if (m)
+        for (let f = 0, h = m.length; f < h; f++) {
+          const u = this.parseRule(m[f]);
           u && (n[u.level] ? u.key ? n[u.level][u == null ? void 0 : u.key] = u : n[u.level] = u : u.key ? n[u.level] = { [u == null ? void 0 : u.key]: u } : n[u.level] = u);
         }
     }
@@ -575,26 +575,26 @@ class rt {
    * @param options
    */
   checkWeather(e, t, o = {}) {
-    var u, p, k, f, I, d, M, T, v, Y, S, D, x, A, C;
+    var u, I, k, y, w, r, b, x, g, j, Y, C, q, T, D;
     let i = 0, a = 0, n = 0, s = 0;
-    const c = Math.round(((p = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : p.number) * 1.6 * 100) / 100, r = (f = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : f.number, l = (d = (I = t == null ? void 0 : t.HEAVY) == null ? void 0 : I.sigWave) == null ? void 0 : d.number, y = Math.round((((T = (M = t == null ? void 0 : t.SEVERE) == null ? void 0 : M.wind) == null ? void 0 : T.number) + 2) * 100) / 100, m = (Y = (v = t == null ? void 0 : t.SEVERE) == null ? void 0 : v.wind) == null ? void 0 : Y.number, h = (D = (S = t == null ? void 0 : t.HEAVY) == null ? void 0 : S.wind) == null ? void 0 : D.number;
+    const d = Math.round(((I = (u = t == null ? void 0 : t.SEVERE) == null ? void 0 : u.sigWave) == null ? void 0 : I.number) * 1.6 * 100) / 100, c = (y = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : y.number, l = (r = (w = t == null ? void 0 : t.HEAVY) == null ? void 0 : w.sigWave) == null ? void 0 : r.number, m = Math.round((((x = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.wind) == null ? void 0 : x.number) + 2) * 100) / 100, f = (j = (g = t == null ? void 0 : t.SEVERE) == null ? void 0 : g.wind) == null ? void 0 : j.number, h = (C = (Y = t == null ? void 0 : t.HEAVY) == null ? void 0 : Y.wind) == null ? void 0 : C.number;
     for (let V = 0; V < (e == null ? void 0 : e.length); V++) {
-      const H = e[V], O = (A = (x = H == null ? void 0 : H.meteo) == null ? void 0 : x.wave) == null ? void 0 : A.sig, P = (C = H == null ? void 0 : H.meteo) == null ? void 0 : C.wind, J = V ? w(H.eta).diff(w(e[V - 1].eta), "hour", !0) : 0;
-      s = J > s ? J : s, W == null || W.info("[%s] check sig.wave: %j", o.requestId, { ...O, dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: l }), (O == null ? void 0 : O.height) >= c ? H.isDangerous = !0 : (O == null ? void 0 : O.height) >= r ? H.isSevere = !0 : (O == null ? void 0 : O.height) >= l && (H.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...P, dgThd4Wd: y, svThd4Wd: m, hvThd4Wd: h }), (P == null ? void 0 : P.scale) >= y ? (H.isDangerous = !0, delete H.isSevere, delete H.isHeavy) : (P == null ? void 0 : P.scale) > m ? (H.isDangerous || (H.isSevere = !0), delete H.isHeavy) : (P == null ? void 0 : P.scale) === h && !H.isDangerous && !H.isSevere && (H.isHeavy = !0), i += H.isDangerous ? J : 0, a += H.isSevere ? J : 0, n += H.isHeavy ? J : 0;
+      const H = e[V], P = (T = (q = H == null ? void 0 : H.meteo) == null ? void 0 : q.wave) == null ? void 0 : T.sig, A = (D = H == null ? void 0 : H.meteo) == null ? void 0 : D.wind, J = V ? v(H.eta).diff(v(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: c, hvThd4Wv: l }), (P == null ? void 0 : P.height) >= d ? H.isDangerous = !0 : (P == null ? void 0 : P.height) >= c ? H.isSevere = !0 : (P == null ? void 0 : P.height) >= l && (H.isHeavy = !0), W == null || W.info("[%s] check wind: %j", o.requestId, { ...A, dgThd4Wd: m, svThd4Wd: f, hvThd4Wd: h }), (A == null ? void 0 : A.scale) >= m ? (H.isDangerous = !0, delete H.isSevere, delete H.isHeavy) : (A == null ? void 0 : A.scale) > f ? (H.isDangerous || (H.isSevere = !0), delete H.isHeavy) : (A == null ? void 0 : A.scale) === h && !H.isDangerous && !H.isSevere && (H.isHeavy = !0), i += H.isDangerous ? J : 0, a += H.isSevere ? J : 0, n += H.isHeavy ? J : 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: m, hvThd4Wd: h }, sig: { dgThd4Wv: c, svThd4Wv: r, hvThd4Wv: l } };
+    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: m, svThd4Wd: f, hvThd4Wd: h }, sig: { dgThd4Wv: d, svThd4Wv: c, hvThd4Wv: l } };
   }
 }
 const kt = new rt();
-let g;
+let p;
 try {
-  g = Q.getLogger("vessel");
+  p = Q.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 q {
+var dt = /* @__PURE__ */ ((S) => (S.common = "common", S.container = "container", S.tugs = "tugs", S))(dt || {}), ut = /* @__PURE__ */ ((S) => (S.Ballast = "Ballast", S.Laden = "Laden", S))(ut || {}), ht = /* @__PURE__ */ ((S) => (S.Cp = "CP", S.Perf = "Basis", S.Instruct = "Other", S))(ht || {});
+class E {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -610,7 +610,7 @@ class q {
   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((c) => Math.abs(c - 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))];
   }
   /**
@@ -706,17 +706,17 @@ class q {
    * @private
    */
   static assembleProperties(e, t, o, i) {
-    var m;
-    const a = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, n = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, c = e.deadweight ?? 67035.7773, r = ((m = e == null ? void 0 : e.type) == null ? void 0 : m.toLowerCase()) || "common";
+    var f;
+    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, c = ((f = e == null ? void 0 : e.type) == null ? void 0 : f.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: a,
       loadCondition: t,
       draught: n,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
       // 其中，1.025是指海水的密度，吨是指公吨，吃水是指船舶的最大吃水深度。船舶型宽是指船舶的最大型宽，船舶型长是指船舶的设计型长。上述公式是针对常规船舶适用的，不同类型的船舶可能会有一些差异。
-      displacement: Math.round((c / 1.025 + n * s * a * 0.7) * 1e4) / 1e4,
+      displacement: Math.round((d / 1.025 + n * s * a * 0.7) * 1e4) / 1e4,
       // 换算为m/s
       speed: Math.round((o ?? 14.1382) * 1852 / 3600 * 1e4) / 1e4,
       bearing: i || 90
@@ -732,37 +732,37 @@ class q {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam true 启用设置速度
    */
-  static async speedLoseAt(e, t, o, i = "", a = 2, n = !0, s = !1, c = {}) {
-    let r;
+  static async speedLoseAt(e, t, o, i = "", a = 2, n = !0, s = !1, d = {}) {
+    let c;
     if (t.velocity && s && (e.speed = z.roundPrecision(t.velocity * 1852 / 3600, 6)), n) {
       let l;
-      if (c.meteo2)
+      if (d.meteo2)
         try {
-          const u = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, c), [p] = tt.pickHourly(u, o);
-          l = tt.toLegacy(p);
+          const u = await ct.spotForecast(t.lat, t.lng, o.utc().format(), !1, !1, !0, d), [I] = tt.pickHourly(u, o);
+          l = tt.toLegacy(I);
         } catch (u) {
-          g.warn("[%s] meteo2 spot(%j) forecast failed: %s", c.requestId, { ...t, eta: o.utc().format() }, u);
+          p.warn("[%s] meteo2 spot(%j) forecast failed: %s", d.requestId, { ...t, eta: o.utc().format() }, u);
         }
       else
-        l = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, c);
-      const y = q.weatherFactor(e, l), m = q.currentFactor(e.bearing, l == null ? void 0 : l.current, a), h = Math.round((e.speed * 1.943844 + y + m) * 100) / 100;
-      r = {
+        l = await nt.queryPointFactor(t.lng, t.lat, o.valueOf(), "wind,wave,current,watertemp", i, d);
+      const m = E.weatherFactor(e, l), f = E.currentFactor(e.bearing, l == null ? void 0 : l.current, a), h = Math.round((e.speed * 1.943844 + m + f) * 100) / 100;
+      c = {
         meteo: { ...l },
-        wxFactor: y,
-        cFactor: m,
+        wxFactor: m,
+        cFactor: f,
         speed: t.velocity && s ? t.velocity : h < 0 ? 1 : h,
         eta: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
         etd: o.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: o.utc().format("YYYY-MM-DDTHH:mm[Z]"),
         etd: o.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 q {
    * @param useRouteParam true 启用航线上设置的参数 { suspend: 停留时长（小时）, velocity: 速度（kts）}
    * @private
    */
-  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", c = !0, r = !1, l = {}) {
+  static async speedLoseInHoursStep(e, t, o, i, a, n, s = "", d = !0, c = !1, l = {}) {
     t.utc();
-    const y = t.clone().add(14, "days"), m = [], h = [];
-    let u = 0, p = 0, k, f;
-    for (let I = 0; I < n.length - 1; I++) {
-      let d = n[I];
-      d.distanceFromStart = Math.round((a + p) * 1e4) / 1e4;
-      const M = n[I + 1];
-      if (e.bearing = B.calculateBearing(d, M, !M.gcToPrevious), d.bearing = e.bearing, d.suspend && r) {
-        d.eta = d.eta || t.format("YYYY-MM-DDTHH:mm[Z]"), d.elapsed = d.elapsed ?? 0;
-        const Y = d.suspend - d.elapsed;
-        if (i - u > Y)
-          i = i - u - Y, t.add(Y, "hour"), d.elapsed = d.suspend;
+    const m = t.clone().add(14, "days"), f = [], h = [];
+    let u = 0, I = 0, k, y;
+    for (let w = 0; w < n.length - 1; w++) {
+      let r = n[w];
+      r.distanceFromStart = Math.round((a + I) * 1e4) / 1e4;
+      const b = n[w + 1];
+      if (e.bearing = B.calculateBearing(r, b, !b.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 j = r.suspend - r.elapsed;
+        if (i - u > j)
+          i = i - u - j, t.add(j, "hour"), r.elapsed = r.suspend;
         else {
-          const S = i - u;
-          d.elapsed += S, t.add(S, "hour"), i = 0;
+          const Y = i - u;
+          r.elapsed += Y, t.add(Y, "hour"), i = 0;
         }
-        if (g == null || g.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${i} hours need to go...`, l.requestId, d), i === 0)
-          return d.distanceFromPrevious = p, { etd: t, from: f || d, to: d, next: n.filter((S) => S), wps: m, days: h };
+        if (p == null || p.info(`[%s] suspend ${r.elapsed} hours at %j, and remain ${i} hours need to go...`, l.requestId, r), i === 0)
+          return r.distanceFromPrevious = I, { etd: t, from: y || r, to: r, next: n.filter((Y) => Y), wps: f, days: h };
       } else
-        d.suspend = 0;
-      c = t.isAfter(y) ? !1 : c, d = await q.speedLoseAt(e, d, t, s, 0, c, r, l), f = f || d, d.important && m.push(d), t.isSameOrAfter(o) && (h.push(d), o.add(24, "hour"));
-      const T = B.calculateDistance(d, M, !M.gcToPrevious);
-      let v = Math.ceil(T / f.speed * 1e4) / 1e4;
-      if (u + v < i) {
-        if (u += v, t.add(v, "hour"), delete n[I], g == null || g.debug(
-          `[%s] go to %j from %j with ${T}nm, and cost ${v} hours`,
+        r.suspend = 0;
+      d = t.isAfter(m) ? !1 : d, r = await E.speedLoseAt(e, r, t, s, 0, d, c, l), y = y || r, r.important && f.push(r), t.isSameOrAfter(o) && (h.push(r), o.add(24, "hour"));
+      const x = B.calculateDistance(r, b, !b.gcToPrevious);
+      let g = Math.ceil(x / y.speed * 1e4) / 1e4;
+      if (u + g < i) {
+        if (u += g, t.add(g, "hour"), delete n[w], p == null || p.debug(
+          `[%s] go to %j from %j with ${x}nm, and cost ${g} hours`,
           l.requestId,
-          { lat: M.lat, lng: M.lng },
-          { lat: f.lat, lng: f.lng, etd: f.etd }
-        ), p += T, n.filter((Y) => Y).length <= 1) {
-          k = M, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = T, k.distanceFromStart = Math.round((a + p) * 1e4) / 1e4, m.push(k), delete n[I + 1];
+          { lat: b.lat, lng: b.lng },
+          { lat: y.lat, lng: y.lng, etd: y.etd }
+        ), I += x, n.filter((j) => j).length <= 1) {
+          k = b, k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), k.distanceFromPrevious = x, k.distanceFromStart = Math.round((a + I) * 1e4) / 1e4, f.push(k), delete n[w + 1];
           break;
         }
       } else {
-        v = i - u, t.add(v, "hour");
-        const Y = z.roundPrecision(f.speed * v, 4);
-        k = B.calculateCoordinate(d, e.bearing, Y, "nauticalmiles", !M.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[I] = k, g == null || g.debug(
-          `[%s] go to %j from %j with ${Y}nm, and cost ${v} hours`,
+        g = i - u, t.add(g, "hour");
+        const j = z.roundPrecision(y.speed * g, 4);
+        k = B.calculateCoordinate(r, e.bearing, j, "nauticalmiles", !b.gcToPrevious), k.eta = t.format("YYYY-MM-DDTHH:mm[Z]"), n[w] = k, p == null || p.debug(
+          `[%s] go to %j from %j with ${j}nm, and cost ${g} hours`,
           l.requestId,
           { lat: k.lat, lng: k.lng },
-          { lat: d.lat, lng: d.lng, etd: d.etd }
-        ), p += Y, k.distanceFromPrevious = Math.round(p * 1e4) / 1e4, k.distanceFromStart = Math.round((a + p) * 1e4) / 1e4;
+          { lat: r.lat, lng: r.lng, etd: r.etd }
+        ), I += j, k.distanceFromPrevious = Math.round(I * 1e4) / 1e4, k.distanceFromStart = Math.round((a + I) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: f, to: k, next: n.filter((I) => I), wps: m, days: h };
+    return { etd: t, from: y, to: k, next: n.filter((w) => w), wps: f, days: h };
   }
   /**
    * 洋流影响因子
@@ -844,16 +844,16 @@ class q {
    * @param wwc 气象要素
    */
   static weatherFactor(e, t) {
-    var y, m, h, u, p, k, f;
-    g == null || g.debug("calculate weather factor via: %j", { ...e, ...t });
-    const o = q.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = q.froudeNumber(e.speed, e.lbp), a = q.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));
+    var m, f, h, u, I, k, y;
+    p == null || p.debug("calculate weather factor via: %j", { ...e, ...t });
+    const o = E.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), i = E.froudeNumber(e.speed, e.lbp), a = E.amendFactor(o, i, e.loadCondition);
+    let n = Math.abs(e.bearing % 360 - (((m = t == null ? void 0 : t.wind) == null ? void 0 : m.degree) % 360 || 0));
     n = n > 180 ? 360 - n : n;
-    const s = q.directionFactor(n, (m = t == null ? void 0 : t.wind) == null ? void 0 : m.scale), c = q.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale);
-    let r = s * a * c / 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)), g == null || g.debug("wind wx factor = %d", r), n = Math.abs(e.bearing % 360 - (((p = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : p.degree) % 360 || 0));
-    const l = q.waveHeightFactor(((f = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : f.height) ?? 1, n);
-    return g == null || g.debug("wave wx factor = %d", l), r = r * 0.4 + l, g == null || g.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 = E.directionFactor(n, (f = t == null ? void 0 : t.wind) == null ? void 0 : f.scale), d = E.vesselTagFactor(e.displacement, e.loadCondition, e.tag, (h = t == null ? void 0 : t.wind) == null ? void 0 : h.scale);
+    let c = s * a * 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)), p == null || p.debug("wind wx factor = %d", c), n = Math.abs(e.bearing % 360 - (((I = (u = t == null ? void 0 : t.wave) == null ? void 0 : u.sig) == null ? void 0 : I.degree) % 360 || 0));
+    const l = E.waveHeightFactor(((y = (k = t == null ? void 0 : t.wave) == null ? void 0 : k.sig) == null ? void 0 : y.height) ?? 1, n);
+    return p == null || p.debug("wave wx factor = %d", l), c = c * 0.4 + l, p == null || p.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,14 +867,14 @@ class q {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstant(e, t, o, i, a, n = "", s = 0, c = !0, r = !1, l = {}) {
-    var J, K, _, G, L;
-    const y = w().valueOf();
+  static async analyseInstant(e, t, o, i, a, n = "", s = 0, d = !0, c = !1, l = {}) {
+    var J, _, K, G, L;
+    const m = v().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { route: m, waypoints: h } = a.points, u = B.calculateSubRoute(e, m);
+    const { route: f, waypoints: h } = a.points, u = B.calculateSubRoute(e, f);
     if (((J = u[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const { v0: p, label: k } = e.sog ? {
+    const { v0: I, label: k } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -882,59 +882,59 @@ class q {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, f = q.assembleProperties(o, i.loadCondition, p, 0), I = h.length ? B.calculateSubWaypoints(e, h) : [];
-    I.forEach((N) => N.important = !0);
-    const d = {
+    }, y = E.assembleProperties(o, i.loadCondition, I, 0), w = h.length ? B.calculateSubWaypoints(e, h) : [];
+    w.forEach((N) => N.important = !0);
+    const r = {
       from: { ...e },
       route: u,
-      waypoints: I,
-      v0: p,
+      waypoints: w,
+      v0: I,
       label: k
-    }, M = {
+    }, b = {
       hours: [],
       days: [],
       wps: []
     };
     s || (B.calculateRouteDistance(u) / i.speed <= 72 ? s = 3 : s = 6);
-    let T = B.simplifyRouteToCoordinates(u, I, 0), v = 0, Y = 0, S = 0, D = 0;
-    t = w(t).utc();
-    const x = t.clone();
-    for (; T.length > 0; ) {
-      const N = s - t.hour() % s, F = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, E = await q.speedLoseInHoursStep(
-        f,
+    let x = B.simplifyRouteToCoordinates(u, w, 0), g = 0, j = 0, Y = 0, C = 0;
+    t = v(t).utc();
+    const q = t.clone();
+    for (; x.length > 0; ) {
+      const N = s - t.hour() % s, F = Math.ceil(t.clone().add(N, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, O = await E.speedLoseInHoursStep(
+        y,
         t,
-        x,
+        q,
         F,
-        v,
-        T,
+        g,
+        x,
         n,
+        d,
         c,
-        r,
         l
       );
-      (K = E.from) != null && K.speed && (M.hours.push(E.from), M.wps.push(...E.wps), M.days.push(...E.days)), T = E == null ? void 0 : E.next, T.length || M.hours.push(E == null ? void 0 : E.to), v += Math.round((((_ = E == null ? void 0 : E.to) == null ? void 0 : _.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
+      (_ = O.from) != null && _.speed && (b.hours.push(O.from), b.wps.push(...O.wps), b.days.push(...O.days)), x = O == null ? void 0 : O.next, x.length || b.hours.push(O == null ? void 0 : O.to), g += Math.round((((K = O == null ? void 0 : O.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const A = M.hours;
-    for (let N = 0; N < A.length - 1; N++) {
-      const F = w(A[N + 1].eta).diff(A[N].etd, "hour", !0) || 1;
-      Y += (A[N].wxFactor || 0) * F, S += (A[N].cFactor || 0) * F, D += F;
+    const T = b.hours;
+    for (let N = 0; N < T.length - 1; N++) {
+      const F = v(T[N + 1].eta).diff(T[N].etd, "hour", !0) || 1;
+      j += (T[N].wxFactor || 0) * F, Y += (T[N].cFactor || 0) * F, C += F;
     }
-    (G = M.wps) == null || G.forEach((N, F) => {
+    (G = b.wps) == null || G.forEach((N, F) => {
       if (F) {
-        const E = M.wps[F - 1], et = N.distanceFromStart - E.distanceFromStart, X = w(N.eta).diff(w(E.etd), "h", !0);
+        const O = b.wps[F - 1], et = N.distanceFromStart - O.distanceFromStart, X = v(N.eta).diff(v(O.etd), "h", !0);
         if (X < 1)
-          N.avgSpd = E.speed;
+          N.avgSpd = O.speed;
         else {
           N.avgSpd = Math.round(et / X * 100) / 100;
-          const $ = Math.round((E.speed + N.speed) / 2 * 100) / 100;
+          const $ = Math.round((O.speed + N.speed) / 2 * 100) / 100;
           N.avgSpd = N.avgSpd > $ ? $ : N.avgSpd;
         }
       }
-    }), d.sample = M;
-    const C = M.hours.at(0), V = M.hours.at(-1);
-    d.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, d.etd = w(C.eta).utc().format(), d.eta = w(V.eta).utc().format(), d.wxFactor = Math.round(Y / D * 1e4) / 1e4, d.cFactor = Math.round(S / D * 1e4) / 1e4, d.avgSpeed = Math.round(V.distanceFromStart / D * 1e4) / 1e4, d.totalHrs = Math.round(D * 1e4) / 1e4, d.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * d.totalHrs * 1e3) / 1e3, d.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * d.totalHrs * 1e3) / 1e3;
-    const O = w().valueOf() - y, P = ((L = M == null ? void 0 : M.hours) == null ? void 0 : L.length) || 1;
-    return g == null || g.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, O, P, Math.round(O / P * 1e3) / 1e3), d;
+    }), r.sample = b;
+    const D = b.hours.at(0), V = b.hours.at(-1);
+    r.distance = Math.round(V.distanceFromStart * 1e4) / 1e4, r.etd = v(D.eta).utc().format(), r.eta = v(V.eta).utc().format(), r.wxFactor = Math.round(j / C * 1e4) / 1e4, r.cFactor = Math.round(Y / C * 1e4) / 1e4, r.avgSpeed = Math.round(V.distanceFromStart / C * 1e4) / 1e4, r.totalHrs = Math.round(C * 1e4) / 1e4, r.totalFoCons = Math.round((i == null ? void 0 : i.fo) / 24 * r.totalHrs * 1e3) / 1e3, r.totalDgoCons = Math.round((i == null ? void 0 : i.dgo) / 24 * r.totalHrs * 1e3) / 1e3;
+    const P = v().valueOf() - m, A = ((L = b == null ? void 0 : b.hours) == null ? void 0 : L.length) || 1;
+    return p == null || p.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, P, A, Math.round(P / A * 1e3) / 1e3), r;
   }
   /**
    * 分段失速分析（最多走hours 小时）
@@ -949,11 +949,11 @@ class q {
    * @param useMeteo true 启用气象分析
    * @param useRouteParam
    */
-  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, c = "", r = 3, l = !0, y = !1, m = {}) {
-    var J, K, _, G;
-    const h = w().valueOf();
+  static async analyseInstantWithThreshed(e, t, o, i, a, n, s, d = "", c = 3, l = !0, m = !1, f = {}) {
+    var J, _, K, G;
+    const h = v().valueOf();
     e.lng = z.convertToStdLng(e.lng);
-    const { v0: u, label: p } = e.sog ? {
+    const { v0: u, label: I } = e.sog ? {
       v0: e.sog,
       label: "Other"
       /* Instruct */
@@ -961,64 +961,52 @@ class q {
       v0: a.speed,
       label: "CP"
       /* Cp */
-    }, k = q.assembleProperties(i, a.loadCondition, u, 0), f = B.calculateSubRoute(e, n);
-    if (((J = f[0]) == null ? void 0 : J.length) <= 1)
+    }, k = E.assembleProperties(i, a.loadCondition, u, 0), y = B.calculateSubRoute(e, n);
+    if (((J = y[0]) == null ? void 0 : J.length) <= 1)
       return;
-    const I = s.length ? B.calculateSubWaypoints(e, s) : [];
-    I.forEach((L) => L.important = !0);
-    let d = B.simplifyRouteToCoordinates(f, I, 0), M = 0, T = 0, v = 0, Y = 0;
-    const S = {
+    const w = s.length ? B.calculateSubWaypoints(e, s) : [];
+    w.forEach((L) => L.important = !0);
+    let r = B.simplifyRouteToCoordinates(y, w, 0), b = 0, x = 0, g = 0, j = 0;
+    const Y = {
       hours: [],
       wps: [],
       days: []
     };
-    t = w(t).utc();
-    const D = t.clone();
-    for (; d.length > 0; ) {
-      const L = r - t.hour() % r;
+    t = v(t).utc();
+    const C = t.clone();
+    for (; r.length > 0; ) {
+      const L = c - t.hour() % c;
       let N = Math.ceil(t.clone().add(L, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      if (N = t.clone().add(N, "h").isAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : N, N) {
-        const F = await q.speedLoseInHoursStep(
-          k,
-          t,
-          D,
-          N,
-          M,
-          d,
-          c,
-          l,
-          y,
-          m
-        );
-        (K = F.from) != null && K.speed && (S.hours.push(F.from), F != null && F.wps && S.wps.push(...F.wps), S.days.push(...F.days)), d = F == null ? void 0 : F.next, d.length || S.hours.push(F == null ? void 0 : F.to), M += Math.round((((_ = F == null ? void 0 : F.to) == null ? void 0 : _.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
-      } else
+      N = t.clone().add(N, "h").isSameOrAfter(o) ? o.diff(t, "h", !0) * 1e4 / 1e4 : N;
+      const F = await E.speedLoseInHoursStep(k, t, C, N, b, r, d, l, m, f);
+      if ((_ = F.from) != null && _.speed && (Y.hours.push(F.from), F != null && F.wps && Y.wps.push(...F.wps), Y.days.push(...F.days)), r = F == null ? void 0 : F.next, r.length || Y.hours.push(F == null ? void 0 : F.to), b += Math.round((((K = F == null ? void 0 : F.to) == null ? void 0 : K.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !N)
         break;
     }
-    const x = S.hours;
-    for (let L = 0; L < x.length - 1; L++) {
-      const N = w(x[L + 1].eta).diff(x[L].etd, "hour", !0);
-      T += x[L].wxFactor * N, v += x[L].cFactor * N, Y += N;
+    const q = Y.hours;
+    for (let L = 0; L < q.length - 1; L++) {
+      const N = v(q[L + 1].eta).diff(q[L].etd, "hour", !0);
+      x += q[L].wxFactor * N, g += q[L].cFactor * N, j += N;
     }
-    const A = S.hours.at(0), C = S.hours.at(-1), V = {
-      sample: S,
-      distance: Math.round(((C == null ? void 0 : C.distanceFromStart) || 0) * 1e4) / 1e4,
+    const T = Y.hours.at(0), D = Y.hours.at(-1), V = {
+      sample: Y,
+      distance: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: w(A.eta).utc().format(),
-      eta: w(C == null ? void 0 : C.eta).utc().format(),
-      wxFactor: Math.round(T / Y * 1e4) / 1e4,
-      cFactor: Math.round(v / Y * 1e4) / 1e4,
-      avgSpeed: Math.round(((C == null ? void 0 : C.distanceFromStart) || 0) / Y * 1e4) / 1e4,
-      totalHrs: Math.round(Y * 1e4) / 1e4,
-      totalFoCons: Math.round((a == null ? void 0 : a.fo) / 24 * Y * 1e3) / 1e3,
-      totalDgoCons: Math.round((a == null ? void 0 : a.dgo) / 24 * Y * 1e3) / 1e3,
-      from: A,
-      to: C,
-      route: f,
-      waypoints: I,
+      etd: v(T.eta).utc().format(),
+      eta: v(D == null ? void 0 : D.eta).utc().format(),
+      wxFactor: Math.round(x / j * 1e4) / 1e4,
+      cFactor: Math.round(g / j * 1e4) / 1e4,
+      avgSpeed: Math.round(((D == null ? void 0 : D.distanceFromStart) || 0) / j * 1e4) / 1e4,
+      totalHrs: Math.round(j * 1e4) / 1e4,
+      totalFoCons: Math.round((a == null ? void 0 : a.fo) / 24 * j * 1e3) / 1e3,
+      totalDgoCons: Math.round((a == null ? void 0 : a.dgo) / 24 * j * 1e3) / 1e3,
+      from: T,
+      to: D,
+      route: y,
+      waypoints: w,
       v0: u,
-      label: p
-    }, O = w().valueOf() - h, P = ((G = S == null ? void 0 : S.hours) == null ? void 0 : G.length) || 1;
-    return g == null || g.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", m == null ? void 0 : m.requestId, O, P, Math.round(O / P * 1e3) / 1e3), V;
+      label: I
+    }, P = v().valueOf() - h, A = ((G = Y == null ? void 0 : Y.hours) == null ? void 0 : G.length) || 1;
+    return p == null || p.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", f == null ? void 0 : f.requestId, P, A, Math.round(P / A * 1e3) / 1e3), V;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1036,54 +1024,56 @@ class q {
    * @param options
    */
   static async analyseCost(e, t, o, i, a = {}) {
-    var p, k;
-    const n = w().valueOf(), s = [];
-    a.meteo2 = !0, e.speedStep = e.speedStep || 3;
-    const c = w.utc(e.etd).add(a.maxDays ?? 14, "day");
-    let r = 1;
-    for (const f of o) {
-      g == null || g.info("[%s][L%d-%d] analyse from %s to %s", a.requestId, 1, r, e.etd, c.format());
-      const I = JSON.parse(JSON.stringify(i.route)), d = JSON.parse(JSON.stringify(i.waypoints)), M = await q.analyseInstantWithThreshed(
+    var y, w;
+    const n = v().valueOf(), s = [];
+    a.meteo2 = !0, e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    const d = B.calculateRouteDistance(i.route);
+    let c = 0;
+    o.forEach((r) => {
+      const b = Math.ceil(d / r.speed / 24);
+      c = c < b ? b : c;
+    }), c = c * 1.3;
+    const l = v.utc(e.etd).add(c ?? 14, "day");
+    let m = 1;
+    for (const r of o) {
+      const b = JSON.parse(JSON.stringify(i.route)), x = JSON.parse(JSON.stringify(i.waypoints)), g = await E.analyseInstantWithThreshed(
         { lat: e.lat, lng: e.lng },
         e.etd,
-        c,
+        l,
         t,
-        f,
-        I,
-        d,
+        r,
+        b,
+        x,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
         a
       );
-      M && (await q.calculateCost(M, f, e, a), s.push(M), g == null || g.info("[%s][L%d-%d] cost: %j", a.requestId, 1, r, {
-        distance: M.distance,
-        totalHrs: M.totalHrs,
-        totalFoCons: M.totalFoCons,
-        totalDgoCons: M.totalDgoCons,
-        etd: M.etd,
-        eta: M.eta,
-        cost: M.cost
-      })), r++;
+      g && (await E.calculateCost(g, r, e, a), s.push(g), p == null || p.info("[%s][L%d-%d] analyse from %s to %s cost: %j", a.requestId, 1, m, e.etd, l.format(), {
+        cost: g.cost.total,
+        distance: g.distance,
+        hours: g.totalHrs,
+        cp: `${r.speed}/${r.fo}/${r.dgo}`
+      })), m++;
     }
-    s.sort((f, I) => f.cost.total - I.cost.total);
-    const l = s.at(0), y = s.at(1), m = [];
-    if (m.push({ combined: !1, speeds: [l], cost: (p = l.cost) == null ? void 0 : p.total }), y) {
-      const f = l.cost.cp, I = y.cost.cp, d = w(l.eta), M = w(l.etd), T = d.diff(M, "days", !0);
-      let v = Math.ceil(T / 2);
-      v = v > 7 ? 7 : v;
-      let Y = 2, S = { combined: !1, speeds: [y], cost: (k = y.cost) == null ? void 0 : k.total }, D;
-      for (; v >= 1; ) {
-        const x = await q.combinedAnalyse(e, t, c, [f, I], i, v, { ...a, level: Y });
-        if (S.cost > x.cost ? D ? (D == null ? void 0 : D.cost) > x.cost && (D = x) : (D = S, S = x) : (!D || (D == null ? void 0 : D.cost) > x.cost) && (D = x), v === 1)
+    s.sort((r, b) => r.cost.total - b.cost.total);
+    const f = s.at(0), h = s.at(1), u = [];
+    if (u.push({ combined: !1, speeds: [f], cost: (y = f.cost) == null ? void 0 : y.total }), h) {
+      const r = f.cost.cp, b = h.cost.cp, x = v(f.eta), g = v(f.etd), j = x.diff(g, "days", !0);
+      let Y = Math.ceil(j / 2);
+      Y = Y > 7 ? 7 : Y < e.alterStep ? e.alterStep : Y;
+      let C = 2, q = { combined: !1, speeds: [h], cost: (w = h.cost) == null ? void 0 : w.total }, T;
+      for (; Y >= e.alterStep; ) {
+        const D = await E.combinedAnalyse(e, t, l, [r, b], i, Y, { ...a, level: C });
+        if (q.cost > D.cost ? T ? (T == null ? void 0 : T.cost) > D.cost && (T = D) : (T = q, q = D) : (!T || (T == null ? void 0 : T.cost) > D.cost) && (T = D), Y <= e.alterStep)
           break;
-        v = Math.ceil(v / 2), Y += 1;
+        Y = Math.ceil(Y / 2), C += 1;
       }
-      m.push(S), D && m.push(D);
+      u.push(q), T && u.push(T);
     }
-    const u = w().valueOf() - n;
-    return g == null || g.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, u), m.sort((f, I) => f.cost - I.cost);
+    const k = v().valueOf() - n;
+    return p == null || p.info("[%s] analyse elapsed: %d ms", a == null ? void 0 : a.requestId, k), u.sort((r, b) => r.cost - b.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1096,11 +1086,11 @@ class q {
    * @param options
    */
   static async combinedAnalyse(e, t, o, i, a, n, s = {}) {
-    s.counter = 1, g == null || g.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
-    const c = await q.alternateAnalyse(e, t, o, i, 0, a, n, s), r = c.reduce((m, h) => m + h.cost.total, 0);
-    g == null || g.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, r);
-    const l = await q.alternateAnalyse(e, t, o, i, 1, a, n, s), y = l.reduce((m, h) => m + h.cost.total, 0);
-    return g == null || g.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, { cost: y }), r < y ? { combined: !0, cost: Math.round(r * 1e3) / 1e3, speeds: c } : { combined: !0, cost: Math.round(y * 1e3) / 1e3, speeds: l };
+    s.counter = 1, p == null || p.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, n);
+    const d = await E.alternateAnalyse(e, t, o, i, 0, a, n, s), c = d.reduce((f, h) => f + h.cost.total, 0);
+    p == null || p.info("[%s][L%d] cost with cpa/cpb turn: %d", s.requestId, s.level, c);
+    const l = await E.alternateAnalyse(e, t, o, i, 1, a, n, s), m = l.reduce((f, h) => f + h.cost.total, 0);
+    return p == null || p.info("[%s][L%d] cost with cpb/cpa turn: %d", s.requestId, s.level, m), c < m ? { combined: !0, cost: Math.round(c * 1e3) / 1e3, speeds: d } : { combined: !0, cost: Math.round(m * 1e3) / 1e3, speeds: l };
   }
   /**
    * 基于cp索引，交替计算指定步长下的成本
@@ -1113,43 +1103,41 @@ class q {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, o, i, a, n, s, c = {}) {
-    var m, h;
-    let r = w.utc(e.etd);
-    const l = { lat: e.lat, lng: e.lng }, y = [];
-    for (; r.isBefore(o); ) {
-      const u = r.clone().utc().add(s, "day");
-      g == null || g.info("[%s][L%d-%d] analyse from %s to %s", c.requestId, c.level, c.counter, r.utc().format(), u.utc().format());
-      const p = JSON.parse(JSON.stringify(n.route)), k = JSON.parse(JSON.stringify(n.waypoints)), f = await q.analyseInstantWithThreshed(
+  static async alternateAnalyse(e, t, o, i, a, n, s, d = {}) {
+    var f, h;
+    let c = v.utc(e.etd);
+    const l = { lat: e.lat, lng: e.lng }, m = [];
+    for (; c.isBefore(o); ) {
+      const u = c.clone().utc().add(s, "day"), I = JSON.parse(JSON.stringify(n.route)), k = JSON.parse(JSON.stringify(n.waypoints)), y = i[a], w = await E.analyseInstantWithThreshed(
         l,
-        r.format(),
+        c.format(),
         u,
         t,
-        i[a],
-        p,
+        y,
+        I,
         k,
         e.meteoVendor,
         e.speedStep,
         e.useMeteo,
         e.useRouteParam,
-        c
+        d
       );
-      f && (await q.calculateCost(f, i[a], e, c), g == null || g.info("[%s][L%d-%d] cost: %j", c.requestId, c.level, c.counter, {
-        distance: f.distance,
-        totalHrs: f.totalHrs,
-        totalFoCons: f.totalFoCons,
-        totalDgoCons: f.totalDgoCons,
-        etd: f.etd,
-        eta: f.eta,
-        cost: f.cost
-      })), c.counter = c.counter + 1;
-      const I = (h = (m = f == null ? void 0 : f.sample) == null ? void 0 : m.hours) == null ? void 0 : h.at(-1);
-      if (I)
-        l.lat = I.lat, l.lng = I.lng, r = w(I.eta), y.push(f), a = a ? 0 : 1;
+      w && (await E.calculateCost(w, y, e, d), p == null || p.info(
+        "[%s][L%d-%d] analyse from %s to %s cost: %j",
+        d.requestId,
+        d.level,
+        d.counter,
+        c.utc().format(),
+        u.utc().format(),
+        { cost: w.cost.total, distance: w.distance, hours: w.totalHrs, cp: `${y.speed}/${y.fo}/${y.dgo}` }
+      )), d.counter = d.counter + 1;
+      const r = (h = (f = w == null ? void 0 : w.sample) == null ? void 0 : f.hours) == null ? void 0 : h.at(-1);
+      if (r)
+        l.lat = r.lat, l.lng = r.lng, c = v(r.eta), m.push(w), a = a ? 0 : 1;
       else
         break;
     }
-    return y;
+    return m;
   }
   /**
    * 计算Speed的cost
@@ -1175,18 +1163,18 @@ class q {
       hours: [],
       wps: [],
       days: []
-    }, i = e.reduce((h, u) => h + u.distance, 0), a = e.reduce((h, u) => h + u.totalHrs, 0), n = e.reduce((h, u) => h + u.wxFactor * u.totalHrs / a, 0), s = e.reduce((h, u) => h + u.cFactor * u.totalHrs / a, 0), c = e.reduce((h, u) => h + u.totalFoCons, 0), r = e.reduce((h, u) => h + u.totalDgoCons, 0), l = e.reduce((h, u) => h + u.cost.total, 0), y = e.reduce((h, u) => h + u.cost.hire, 0), m = e.reduce((h, u) => h + u.cost.bunker, 0);
+    }, i = e.reduce((h, u) => h + u.distance, 0), a = e.reduce((h, u) => h + u.totalHrs, 0), n = e.reduce((h, u) => h + u.wxFactor * u.totalHrs / a, 0), s = e.reduce((h, u) => h + u.cFactor * u.totalHrs / a, 0), d = e.reduce((h, u) => h + u.totalFoCons, 0), c = e.reduce((h, u) => h + u.totalDgoCons, 0), l = e.reduce((h, u) => h + u.cost.total, 0), m = e.reduce((h, u) => h + u.cost.hire, 0), f = e.reduce((h, u) => h + u.cost.bunker, 0);
     for (const h of e) {
-      const u = h.sample.hours, p = h.sample.wps, k = h.sample.days;
-      u.forEach((f) => {
-        var d;
-        ((d = o.hours) == null ? void 0 : d.findIndex((M) => M.eta === f.eta)) === -1 && o.hours.push(f);
-      }), p.forEach((f) => {
-        var d;
-        ((d = o.wps) == null ? void 0 : d.findIndex((M) => M.eta === f.eta)) === -1 && o.wps.push(f);
-      }), k.forEach((f) => {
-        var d;
-        ((d = o == null ? void 0 : o.days) == null ? void 0 : d.findIndex((M) => M.eta === f.eta)) === -1 && o.days.push(f);
+      const u = h.sample.hours, I = h.sample.wps, k = h.sample.days;
+      u.forEach((y) => {
+        var r;
+        ((r = o.hours) == null ? void 0 : r.findIndex((b) => b.eta === y.eta)) === -1 && o.hours.push(y);
+      }), I.forEach((y) => {
+        var r;
+        ((r = o.wps) == null ? void 0 : r.findIndex((b) => b.eta === y.eta)) === -1 && o.wps.push(y);
+      }), k.forEach((y) => {
+        var r;
+        ((r = o == null ? void 0 : o.days) == null ? void 0 : r.findIndex((b) => b.eta === y.eta)) === -1 && o.days.push(y);
       });
     }
     return {
@@ -1201,12 +1189,12 @@ class q {
       avgSpeed: Math.round(i / a * 1e3) / 1e3,
       wxFactor: Math.round(n / a * 1e3) / 1e3,
       cFactor: Math.round(s / a * 1e3) / 1e3,
-      totalFoCons: Math.round(c * 1e3) / 1e3,
-      totalDgoCons: Math.round(r * 1e3) / 1e3,
+      totalFoCons: Math.round(d * 1e3) / 1e3,
+      totalDgoCons: Math.round(c * 1e3) / 1e3,
       cost: {
         total: Math.round(l * 1e3) / 1e3,
-        hire: Math.round(y * 1e3) / 1e3,
-        bunker: Math.round(m * 1e3) / 1e3
+        hire: Math.round(m * 1e3) / 1e3,
+        bunker: Math.round(f * 1e3) / 1e3
       }
     };
   }
@@ -1217,10 +1205,10 @@ export {
   it as AlertLevel,
   wt as HifleetImpl,
   ut as LoadCondition,
-  pt as MyShipImpl,
-  gt as MyVesselImpl,
-  It as ShipxyImpl,
-  q as SpeedHelper,
+  It as MyShipImpl,
+  vt as MyVesselImpl,
+  pt as ShipxyImpl,
+  E as SpeedHelper,
   ht as SpeedLabel,
   dt as VesselTag,
   kt as alertHelper