@idm-plugin/vessel 1.8.5 → 1.8.7

package/dist/index.js

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