@idm-plugin/vessel 3.8.2 → 3.8.4

package/dist/index.js

@@ -1,6 +1,6 @@
 var ht = Object.defineProperty;
-var mt = (x, e, t) => e in x ? ht(x, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : x[e] = t;
-var K = (x, e, t) => (mt(x, typeof e != "symbol" ? e + "" : e, t), t);
+var mt = (x, t, e) => t in x ? ht(x, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : x[t] = e;
+var K = (x, t, e) => (mt(x, typeof t != "symbol" ? t + "" : t, e), e);
 import z from "got";
 import ut from "@log4js-node/log4js-api";
 import p from "moment";
@@ -18,51 +18,51 @@ class nt {
    * 解析AIS状态码
    * @param status
    */
-  parseStatus(e) {
-    let t, n;
-    switch (e) {
+  parseStatus(t) {
+    let e, n;
+    switch (t) {
       case 0:
-        t = "在航（主机推动）", n = "Underway Using Engine";
+        e = "在航（主机推动）", n = "Underway Using Engine";
         break;
       case 1:
-        t = "锚泊", n = "Anchored";
+        e = "锚泊", n = "Anchored";
         break;
       case 2:
-        t = "失控", n = "Not under command";
+        e = "失控", n = "Not under command";
         break;
       case 3:
-        t = "操纵受限", n = "Limited airworthiness";
+        e = "操纵受限", n = "Limited airworthiness";
         break;
       case 4:
-        t = "吃水受限", n = "Limited by ship's draft";
+        e = "吃水受限", n = "Limited by ship's draft";
         break;
       case 5:
-        t = "靠泊", n = "Mooring";
+        e = "靠泊", n = "Mooring";
         break;
       case 6:
-        t = "搁浅", n = "Stranded";
+        e = "搁浅", n = "Stranded";
         break;
       case 7:
-        t = "捕捞作业", n = "Engaged in fishing";
+        e = "捕捞作业", n = "Engaged in fishing";
         break;
       case 8:
-        t = "靠帆船提供动力", n = "Sailing";
+        e = "靠帆船提供动力", n = "Sailing";
         break;
       default:
-        t = "未定义", n = "Undefined";
+        e = "未定义", n = "Undefined";
     }
-    return { labelCn: t, labelEn: n };
+    return { labelCn: e, labelEn: n };
   }
 }
 class Tt extends nt {
-  constructor(t, n) {
+  constructor(e, n) {
     super();
     K(this, "clientId");
     K(this, "clientSecret");
     K(this, "token");
-    this.clientId = t, this.clientSecret = n;
+    this.clientId = e, this.clientSecret = n;
   }
-  async authToken(t = {}) {
+  async authToken(e = {}) {
     const n = "https://svc.data.myvessel.cn/ada/oauth/token", o = {
       searchParams: {
         client_id: this.clientId,
@@ -70,7 +70,7 @@ class Tt extends nt {
         grant_type: "client_credentials"
       }
     }, i = await z.post(n, o).json();
-    g == null || g.info("[%s] fetch access token from: %s - %j", t.requestId, n, i), i.error || (this.token = {
+    g == null || g.info("[%s] fetch access token from: %s - %j", e.requestId, n, i), i.error || (this.token = {
       accessToken: i.access_token,
       tokenType: i.token_type,
       expiresIn: i.expires_in,
@@ -79,16 +79,16 @@ class Tt extends nt {
       issuedAt: p().utc().format()
     });
   }
-  async checkToken(t = {}) {
+  async checkToken(e = {}) {
     var n;
-    return (!this.token || p().diff(p(this.token.issuedAt), "seconds") > (((n = this.token) == null ? void 0 : n.expiresIn) || 0) - 300) && await this.authToken(t), this.token;
+    return (!this.token || p().diff(p(this.token.issuedAt), "seconds") > (((n = this.token) == null ? void 0 : n.expiresIn) || 0) - 300) && await this.authToken(e), this.token;
   }
   /**
    * 模糊查询
    * @param kw
    * @param options
    */
-  async suggest(t, n = {}) {
+  async suggest(e, n = {}) {
     var s, r;
     await this.checkToken(n);
     const o = "https://market.myvessel.cn/sdc/v1/mkt/vessels/fuzzy", i = {
@@ -96,7 +96,7 @@ class Tt extends nt {
         Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
-        kw: t,
+        kw: e,
         recordNum: n.ps || 10
       }
     };
@@ -119,10 +119,10 @@ class Tt extends nt {
    * @param imo
    * @param options
    */
-  async search(t, n = {}) {
+  async search(e, n = {}) {
     var u, l;
     await this.checkToken(n);
-    const o = /^\d{7}$/.test(t.toString()), i = o ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", a = o ? { imo: t } : { mmsi: t }, s = {
+    const o = /^\d{7}$/.test(e.toString()), i = o ? "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/imo" : "https://market.myvessel.cn/sdc/v1/mkt/vessels/detail/mmsi", a = o ? { imo: e } : { mmsi: e }, s = {
       headers: {
         Authorization: `${(u = this.token) == null ? void 0 : u.tokenType} ${(l = this.token) == null ? void 0 : l.accessToken}`
       },
@@ -161,7 +161,7 @@ class Tt extends nt {
     }
     return {};
   }
-  async archives(t, n = {}) {
+  async archives(e, n = {}) {
     var s, r;
     await this.checkToken(n);
     const o = "https://svc.data.myvessel.cn/sdc/v1/ship/info/batch", i = {
@@ -169,21 +169,21 @@ class Tt extends nt {
         Authorization: `${(s = this.token) == null ? void 0 : s.tokenType} ${(r = this.token) == null ? void 0 : r.accessToken}`
       },
       json: {
-        mmsiList: typeof t == "number" ? [t] : t
+        mmsiList: typeof e == "number" ? [e] : e
       }
     };
     g == null || g.info("[%s] fetch vessel archive from: %s - %j", n.requestId, o, i);
     const a = await z.post(o, i).json();
     return a.status !== 200 ? (g == null || g.warn("[%s] fetch vessel archive failed: %j", n.requestId, { message: a.message, status: a.status, code: a.code }), {}) : a.data;
   }
-  async realTimePosition(t, n = {}) {
+  async realTimePosition(e, n = {}) {
     var r, u;
     await this.checkToken(n);
     const o = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/location/unit", i = {
       headers: {
         Authorization: `${(r = this.token) == null ? void 0 : r.tokenType} ${(u = this.token) == null ? void 0 : u.accessToken}`
       },
-      searchParams: { mmsi: t }
+      searchParams: { mmsi: e }
     };
     g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, o, i);
     const a = await z.get(o, i).json();
@@ -236,7 +236,7 @@ class Tt extends nt {
    * @param excludeSeas  排除水域, [sea.code]
    * @param options { requiretId: '请求ID', useAIModel: '启用AI算法', withECA: '是否计算低硫区航行距离', withSpecial: '是否计算穿越的特战区列表和海盗区列表', draught: '最大吃水' }
    */
-  async calculateRoute(t, n, o, i, a, s = {}) {
+  async calculateRoute(e, n, o, i, a, s = {}) {
     var I, b, E;
     const r = p();
     await this.checkToken(s);
@@ -246,9 +246,9 @@ class Tt extends nt {
       withECA: s.withECA || !1,
       withSpecialRegion: s.withSpecial || !1
     };
-    t.code && (l.startPortCode = t.code), t.lng !== void 0 && t.lat !== void 0 && (l.startPoint = {
-      lon: t.lng,
-      lat: t.lat
+    e.code && (l.startPortCode = e.code), e.lng !== void 0 && e.lat !== void 0 && (l.startPoint = {
+      lon: e.lng,
+      lat: e.lat
     }), n.code && (l.endPortCode = n.code), n.lng !== void 0 && n.lat !== void 0 && (l.endPoint = {
       lon: n.lng,
       lat: n.lat
@@ -260,9 +260,9 @@ class Tt extends nt {
       json: l
     };
     g == null || g.info("[%s] fetch route from: %s - %j", s.requestId, u, h);
-    const c = await z.post(u, h).json();
-    if (c.status !== 200)
-      return g == null || g.warn("[%s] fetch route failed: %j", s.requestId, { message: c.message, status: c.status, code: c.code }), {};
+    const d = await z.post(u, h).json();
+    if (d.status !== 200)
+      return g == null || g.warn("[%s] fetch route failed: %j", s.requestId, { message: d.message, status: d.status, code: d.code }), {};
     {
       const k = {
         status: "Success",
@@ -273,7 +273,7 @@ class Tt extends nt {
         route: [],
         distance: 0,
         memo: ""
-      }, { nodes: w, seas: v, tracks: m, specialRegions: d, ecaLength: f } = c.data;
+      }, { nodes: w, seas: v, tracks: m, specialRegions: c, ecaLength: f } = d.data;
       k.nodes = w == null ? void 0 : w.map((M) => ({
         code: M.nodeCode,
         nameEn: M.nameEn,
@@ -314,7 +314,7 @@ class Tt extends nt {
           lng: Math.round(M.maxLon * 1e6) / 1e6
         },
         level: M.mapLevel
-      })), d == null || d.map((M) => {
+      })), c == null || c.map((M) => {
         M.regionLength && k.regions.push({
           type: M.regionType,
           distance: M.regionLength,
@@ -334,21 +334,21 @@ class Tt extends nt {
       return k.memo = `time cost: ${S}s`, g.info("[%s] calculate route cost: %d seconds", s.requestId, S), k;
     }
   }
-  async trajectory(t, n, o, i, a = !0, s = {}) {
+  async trajectory(e, n, o, i, a = !0, s = {}) {
     await this.checkToken(s);
-    const r = await this.realTimePosition(t, s), u = p(n), l = p(o), h = [];
+    const r = await this.realTimePosition(e, s), u = p(n), l = p(o), h = [];
     for (; l.diff(u, "day", !0) > 30; )
-      await this.trajectoryIn30Day(t, u, u.clone().add(30, "day"), r, i, h, s), u.add(30, "day");
-    return await this.trajectoryIn30Day(t, u, l, r, i, h, s), h;
+      await this.trajectoryIn30Day(e, u, u.clone().add(30, "day"), r, i, h, s), u.add(30, "day");
+    return await this.trajectoryIn30Day(e, u, l, r, i, h, s), h;
   }
-  async trajectoryIn30Day(t, n, o, i, a, s, r = {}) {
+  async trajectoryIn30Day(e, n, o, i, a, s, r = {}) {
     var b, E, k, w, v;
     const u = "https://svc.data.myvessel.cn/sdc/v1/vessels/status/track", l = {
       headers: {
         Authorization: `${(b = this.token) == null ? void 0 : b.tokenType} ${(E = this.token) == null ? void 0 : E.accessToken}`
       },
       json: {
-        mmsi: t,
+        mmsi: e,
         startTime: n.utcOffset(8).format("YYYY-MM-DD HH:mm:ss"),
         endTime: o.utcOffset(8).format("YYYY-MM-DD HH:mm:ss")
       }
@@ -357,12 +357,12 @@ class Tt extends nt {
     const h = await z.post(u, l).json();
     if (h.code)
       return g == null || g.warn("[%s] fetch trajectory failed: %j", r.requestId, u, { message: h.message, status: h.status, code: h.code }), h;
-    let c = -1;
+    let d = -1;
     const I = p(`${(w = (k = h.data) == null ? void 0 : k[0]) == null ? void 0 : w.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     return (v = h.data) == null || v.forEach((m) => {
       for (const N in m)
         !isNaN(m[N]) && Number(m[N]) !== 1 / 0 && (m[N] = Number(m[N]));
-      const d = p(`${m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), f = m.status, { labelCn: y, labelEn: S } = this.parseStatus(f), M = {
+      const c = p(`${m.postime} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00"), f = m.status, { labelCn: y, labelEn: S } = this.parseStatus(f), M = {
         mmsi: m.mmsi,
         imo: i == null ? void 0 : i.imo,
         lat: m.lat,
@@ -374,27 +374,27 @@ class Tt extends nt {
         status: f,
         eta: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/.test(m.eta) ? p(`${m.eta} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00").utc().format() : void 0,
         destination: m.dest,
-        positionTime: d.unix(),
+        positionTime: c.unix(),
         labelCn: y,
         labelEn: S,
         method: "trajectory",
         vendor: "myVessel",
-        utc: d.utc().format()
-      }, j = Math.floor(d.diff(I, "minute", !0) / (a || 1));
-      j !== c && (c = j, s.push(M));
+        utc: c.utc().format()
+      }, j = Math.floor(c.diff(I, "minute", !0) / (a || 1));
+      j !== d && (d = j, s.push(M));
     }), s;
   }
 }
 class jt extends nt {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async realTimePosition(t, n = {}) {
+  async realTimePosition(e, n = {}) {
     const o = "https://api.hifleet.com/position/position/get/token", i = {
       searchParams: {
-        mmsi: t,
+        mmsi: e,
         usertoken: this.token
       }
     }, a = await z.post(o, i).json();
@@ -435,11 +435,11 @@ class jt extends nt {
       vendor: "hifleet"
     };
   }
-  async search(t, n = {}) {
+  async search(e, n = {}) {
     let o = "https://www.hifleet.com/hifleetapi/searchVesselOL.do";
     const i = {
       searchParams: {
-        keyword: t
+        keyword: e
       },
       headers: {
         Referer: "https://www.hifleet.com",
@@ -463,10 +463,10 @@ class jt extends nt {
     };
     return o = "https://www.hifleet.com/hifleetapi/sameShipSearch.do", a = await z.post(o, i).json(), g == null || g.info("[%s] search vessel dead weight from: %s - %j", n.requestId, o, i), a instanceof Array && (a = a[0]), a && (s.deadweight = Number(a.dwt)), s;
   }
-  async suggest(t, n = {}) {
+  async suggest(e, n = {}) {
     const o = "https://www.hifleet.com/hifleetapi/getShipSuggest.do", i = {
       searchParams: {
-        q: t
+        q: e
       },
       headers: {
         Referer: "https://www.hifleet.com",
@@ -486,32 +486,32 @@ class jt extends nt {
       });
     return s.sort((r, u) => u.score - r.score), s;
   }
-  async trajectory(t, n, o, i, a = !0, s = {}) {
-    var m, d, f;
-    const r = await this.realTimePosition(t, s);
+  async trajectory(e, n, o, i, a = !0, s = {}) {
+    var m, c, f;
+    const r = await this.realTimePosition(e, s);
     let u = p(n);
     const l = p(o), h = p();
     if (a) {
       let y = l.diff(u, "d", !0);
       y < 0 ? u = l.clone().subtract(40, "d") : y < 30 ? u.subtract(10, "d") : y < 60 ? u.subtract(5, "d") : u = l.clone().subtract(80, "d"), y = h.diff(l, "d", !0), l.add(y > 10 ? 240 : y * 24, "h");
     }
-    const c = {
+    const d = {
       searchParams: {
         endtime: l.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
         starttime: u.utcOffset("+8:00").format("YYYY-MM-DD HH:mm:ss"),
-        mmsi: t,
+        mmsi: e,
         usertoken: this.token
       }
-    }, I = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await z.get(I, c).json();
-    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, I, c);
+    }, I = "https://api.hifleet.com/position/trajectory/nocompressed/withstatic/token", b = await z.get(I, d).json();
+    g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, I, d);
     let E;
-    b && (E = ((d = (m = b.ships) == null ? void 0 : m.offors) == null ? void 0 : d.ship) || [], E.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
+    b && (E = ((c = (m = b.ships) == null ? void 0 : m.offors) == null ? void 0 : c.ship) || [], E.length || g == null || g.warn("[%s] fetch trajectory failed: %j", s.requestId, b));
     const k = [];
     let w = -1;
     const v = p(`${(f = E == null ? void 0 : E[0]) == null ? void 0 : f.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
     for (const y of E) {
-      for (const L in y)
-        !isNaN(y[L]) && Number(y[L]) !== 1 / 0 && (y[L] = Number(y[L]));
+      for (const O in y)
+        !isNaN(y[O]) && Number(y[O]) !== 1 / 0 && (y[O] = Number(y[O]));
       const S = p(`${y.ti} +08:00`, "YYYY-MM-DD HH:mm:ss +08:00");
       y.status = y.sp > 4 ? 0 : 1;
       const { labelEn: M, labelCn: j } = this.parseStatus(y.status), N = {
@@ -538,15 +538,15 @@ class jt extends nt {
   }
 }
 class xt extends nt {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async realTimePosition(t, n = {}) {
+  async realTimePosition(e, n = {}) {
     const o = {
       searchParams: {
-        id: t,
+        id: e,
         k: this.token,
         enc: 1
       }
@@ -554,8 +554,8 @@ class xt extends nt {
     if (g == null || g.info("[%s] fetch realtime position from: %s - %j", n.requestId, i, o), (a == null ? void 0 : a.status) !== 0)
       return a;
     const s = a.data[0];
-    for (const c in s)
-      !isNaN(s[c]) && Number(s[c]) !== 1 / 0 && (s[c] = Number(s[c]));
+    for (const d in s)
+      !isNaN(s[d]) && Number(s[d]) !== 1 / 0 && (s[d] = Number(s[d]));
     const { labelCn: r, labelEn: u } = await this.parseStatus(s.navistat), l = p.unix(s.lasttime);
     return {
       mmsi: s.ShipID,
@@ -580,71 +580,71 @@ class xt extends nt {
       vendor: "shipxy"
     };
   }
-  async trajectory(t, n, o, i, a = !0, s = {}) {
+  async trajectory(e, n, o, i, a = !0, s = {}) {
     var v;
-    const r = await this.realTimePosition(t, s), u = p(n), l = p(o), h = "https://api.shipxy.com/apicall/GetShipTrack", c = {
+    const r = await this.realTimePosition(e, s), u = p(n), l = p(o), h = "https://api.shipxy.com/apicall/GetShipTrack", d = {
       searchParams: {
-        id: t,
+        id: e,
         k: this.token,
         enc: 1,
         cut: 0,
         btm: u.unix(),
         etm: l.unix()
       }
-    }, I = await z.get(h, c).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, c), (I == null ? void 0 : I.status) !== 0)
+    }, I = await z.get(h, d).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", s.requestId, h, d), (I == null ? void 0 : I.status) !== 0)
       return I;
     const b = I == null ? void 0 : I.points, E = [], k = p.unix((v = b[0]) == null ? void 0 : v.utc);
     let w = -1;
     for (const m of b) {
-      const d = p.unix(m.utc), f = {
+      const c = p.unix(m.utc), f = {
         imo: r == null ? void 0 : r.imo,
-        mmsi: t,
+        mmsi: e,
         sog: Math.round(m.sog * 3600 / 1e3 / 1852 * 100) / 100,
         cog: Math.round(m.cog / 100 * 100) / 100,
         lat: Math.round(m.lat / 1e6 * 1e5) / 1e5,
         lng: Math.round(m.lon / 1e6 * 1e5) / 1e5,
-        positionTime: d.unix(),
-        utc: d.utc().format(),
+        positionTime: c.unix(),
+        utc: c.utc().format(),
         method: "trajectory",
         vendor: "shipxy"
-      }, y = Math.floor(d.diff(k, "minute", !0) / (i || 1));
+      }, y = Math.floor(c.diff(k, "minute", !0) / (i || 1));
       y !== w && (w = y, E.push(f));
     }
     return E;
   }
 }
 class Nt extends nt {
-  constructor(t) {
+  constructor(e) {
     super();
     K(this, "token");
-    this.token = t;
+    this.token = e;
   }
-  async getShipId(t, n = {}) {
+  async getShipId(e, n = {}) {
     const o = {
       headers: {
         appKey: this.token
       },
       json: {
-        mmsiList: t
+        mmsiList: e
       }
     }, i = "https://api3.myships.com/sp/ships/getShipIdByMMSI", a = await z.post(i, o).json();
     return g == null || g.info("[%s] fetch ship id from: %s - %j", n.requestId, i, o), a.code !== "0" ? a : a.data[0].shipId;
   }
-  async getShipInfo(t, n = {}) {
+  async getShipInfo(e, n = {}) {
     const o = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: t
+        shipId: e
       }
     }, i = "https://api3.myships.com/sp/ships/aissta", a = await z.post(i, o).json();
     if (g == null || g.info("[%s] fetch ship info from: %s - %j", n.requestId, i, o), a.code !== "0")
       return a;
     const s = a.data;
     let r = s.imo;
-    return t === "407170" && (r = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, t, s.imo, r)), {
+    return e === "407170" && (r = "9198379", g == null || g.warn("[%s] ship(%s) imo error: %s, should be %s", n.requestId, e, s.imo, r)), {
       mmsi: s.mmsi,
       name: s.shipnameEn,
       imo: r,
@@ -654,8 +654,8 @@ class Nt extends nt {
       draught: (s.draught || 100) / 10
     };
   }
-  async realTimePosition(t, n = {}) {
-    const o = await this.getShipId(t, n), i = await this.getShipInfo(o, n), a = {
+  async realTimePosition(e, n = {}) {
+    const o = await this.getShipId(e, n), i = await this.getShipInfo(o, n), a = {
       headers: {
         appKey: this.token
       },
@@ -667,10 +667,10 @@ class Nt extends nt {
     const u = r.data[0];
     for (const b in u)
       !isNaN(u[b]) && Number(u[b]) !== 1 / 0 && (u[b] = Number(u[b]));
-    const { labelCn: l, labelEn: h } = await this.parseStatus(u.aisNavStatus), c = p.unix(u.posTime);
+    const { labelCn: l, labelEn: h } = await this.parseStatus(u.aisNavStatus), d = p.unix(u.posTime);
     return {
       ...i,
-      mmsi: t,
+      mmsi: e,
       lat: Math.round(u.lat / 1e4 / 60 * 1e5) / 1e5,
       lng: Math.round(u.lon / 1e4 / 60 * 1e5) / 1e5,
       sog: Math.round(u.sog / 10 * 100) / 100,
@@ -678,7 +678,7 @@ class Nt extends nt {
       hdg: Math.round(u.heading * 100) / 100,
       rot: Math.round(u.rot * 100) / 100,
       positionTime: u.posTime,
-      utc: c.utc().format(),
+      utc: d.utc().format(),
       status: u.aisNavStatus,
       labelEn: h,
       labelCn: l,
@@ -686,27 +686,27 @@ class Nt extends nt {
       vendor: "myship"
     };
   }
-  async trajectory(t, n, o, i, a = !0, s = {}) {
-    const r = p(n), u = p(o), l = await this.getShipId(t), h = await this.getShipInfo(l), c = [];
+  async trajectory(e, n, o, i, a = !0, s = {}) {
+    const r = p(n), u = p(o), l = await this.getShipId(e), h = await this.getShipInfo(l), d = [];
     for (; u.diff(r, "day", !0) > 30; )
-      await this.trajectoryIn30Day(l, r.unix(), r.add(30, "day").unix(), h, t, i, c);
-    return await this.trajectoryIn30Day(l, r.unix(), u.unix(), h, t, i, c), c;
+      await this.trajectoryIn30Day(l, r.unix(), r.add(30, "day").unix(), h, e, i, d);
+    return await this.trajectoryIn30Day(l, r.unix(), u.unix(), h, e, i, d), d;
   }
-  async trajectoryIn30Day(t, n, o, i, a, s, r, u = {}) {
+  async trajectoryIn30Day(e, n, o, i, a, s, r, u = {}) {
     var k;
     const l = {
       headers: {
         appKey: this.token
       },
       json: {
-        shipId: t,
+        shipId: e,
         startTime: n,
         endTime: o
       }
-    }, h = "https://api3.myships.com/sp/ships/position/history", c = await z.post(h, l).json();
-    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", u.requestId, h, l), c.code !== "0")
-      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", u.requestId, c), c;
-    const I = c.data;
+    }, h = "https://api3.myships.com/sp/ships/position/history", d = await z.post(h, l).json();
+    if (g == null || g.info("[%s] fetch trajectory from: %s - %j", u.requestId, h, l), d.code !== "0")
+      return g == null || g.warn("[%s] invoke myship trajectory failed: %j", u.requestId, d), d;
+    const I = d.data;
     for (const w in I)
       !isNaN(I[w]) && Number(I[w]) !== 1 / 0 && (I[w] = Number(I[w]));
     const b = p.unix((k = I[0]) == null ? void 0 : k.posTime);
@@ -725,8 +725,8 @@ class Nt extends nt {
         utc: v.utc().format(),
         method: "trajectory",
         vendor: "myship"
-      }, d = Math.floor(v.diff(b, "minute", !0) / (s || 1));
-      d !== E && (E = d, r.push(m));
+      }, c = Math.floor(v.diff(b, "minute", !0) / (s || 1));
+      c !== E && (E = c, r.push(m));
     }
     return r;
   }
@@ -747,10 +747,10 @@ class Mt {
    *
    * @param options
    */
-  parsePrinciple(e, t = {}) {
+  parsePrinciple(t, e = {}) {
     var s, r, u;
-    _ == null || _.debug("[%s] parse rule: %s", t.requestId, e);
-    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = e.match(n) ? (s = e.match(n)) == null ? void 0 : s[0] : void 0, i = o == null ? void 0 : o.split(";");
+    _ == null || _.debug("[%s] parse rule: %s", e.requestId, t);
+    const n = new RegExp("(?<=\\[)(.+)(?=])", "g"), o = t.match(n) ? (s = t.match(n)) == null ? void 0 : s[0] : void 0, i = o == null ? void 0 : o.split(";");
     if (!i)
       return;
     const a = {};
@@ -759,8 +759,8 @@ class Mt {
       if (l === 0 && !h)
         a.scope = i[0];
       else if (h)
-        for (let c = 0, I = h.length; c < I; c++) {
-          const b = this.parseRule(h[c]);
+        for (let d = 0, I = h.length; d < I; d++) {
+          const b = this.parseRule(h[d]);
           b && (a[b.level] ? b.key ? a[b.level][b == null ? void 0 : b.key] = b : a[b.level] = b : b.key ? a[b.level] = { [b == null ? void 0 : b.key]: b } : a[b.level] = b);
         }
     }
@@ -772,10 +772,10 @@ class Mt {
    * @param rule
    * @param options
    */
-  parseRule(e, t = {}) {
+  parseRule(t, e = {}) {
     var a;
-    _ == null || _.debug("[%s] parse rule: %s", t.requestId, e), e = e.startsWith("[") ? e : `[${e}`, e = e.endsWith("]") ? e : `${e}]`;
-    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (a = e == null ? void 0 : e.match(n)) == null ? void 0 : a[0], i = o == null ? void 0 : o.split(",");
+    _ == null || _.debug("[%s] parse rule: %s", e.requestId, t), t = t.startsWith("[") ? t : `[${t}`, t = t.endsWith("]") ? t : `${t}]`;
+    const n = new RegExp("(?<=\\[)(.+?)(?=])", "g"), o = (a = t == null ? void 0 : t.match(n)) == null ? void 0 : a[0], i = o == null ? void 0 : o.split(",");
     if (i) {
       let s = i[3] === "Number.MAX_VALUE" ? 100 : Number(i[3]);
       return s = isNaN(s) ? 1 : s, {
@@ -793,15 +793,15 @@ class Mt {
    * @param principle 告警规则
    * @param options
    */
-  checkWeather(e, t, n = {}) {
-    var b, E, k, w, v, m, d, f, y, S, M, j, N, D, L;
+  checkWeather(t, e, n = {}) {
+    var b, E, k, w, v, m, c, f, y, S, M, j, N, D, O;
     let o = 0, i = 0, a = 0, s = 0;
-    const r = Math.round(((E = (b = t == null ? void 0 : t.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : E.number) * 1.6 * 100) / 100, u = (w = (k = t == null ? void 0 : t.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : w.number, l = (m = (v = t == null ? void 0 : t.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : m.number, h = Math.round((((f = (d = t == null ? void 0 : t.SEVERE) == null ? void 0 : d.wind) == null ? void 0 : f.number) + 2) * 100) / 100, c = (S = (y = t == null ? void 0 : t.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : S.number, I = (j = (M = t == null ? void 0 : t.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
-    for (let W = 0; W < (e == null ? void 0 : e.length); W++) {
-      const F = e[W], Y = (D = (N = F == null ? void 0 : F.meteo) == null ? void 0 : N.wave) == null ? void 0 : D.sig, A = (L = F == null ? void 0 : F.meteo) == null ? void 0 : L.wind, V = W ? p(F.eta).diff(p(e[W - 1].eta), "hour", !0) : 0;
-      s = V > s ? V : s, _ == null || _.debug("[%s] check sig.wave: %j", n.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l }), (Y == null ? void 0 : Y.height) >= r ? F.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= u ? F.isSevere = !0 : (Y == null ? void 0 : Y.height) >= l && (F.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", n.requestId, { ...A, dgThd4Wd: h, svThd4Wd: c, hvThd4Wd: I }), (A == null ? void 0 : A.scale) >= h ? (F.isDangerous = !0, delete F.isSevere, delete F.isHeavy) : (A == null ? void 0 : A.scale) > c ? (F.isDangerous || (F.isSevere = !0), delete F.isHeavy) : (A == null ? void 0 : A.scale) === I && !F.isDangerous && !F.isSevere && (F.isHeavy = !0), o += F.isDangerous ? V : 0, i += F.isSevere ? V : 0, a += F.isHeavy ? V : 0;
+    const r = Math.round(((E = (b = e == null ? void 0 : e.SEVERE) == null ? void 0 : b.sigWave) == null ? void 0 : E.number) * 1.6 * 100) / 100, u = (w = (k = e == null ? void 0 : e.SEVERE) == null ? void 0 : k.sigWave) == null ? void 0 : w.number, l = (m = (v = e == null ? void 0 : e.HEAVY) == null ? void 0 : v.sigWave) == null ? void 0 : m.number, h = Math.round((((f = (c = e == null ? void 0 : e.SEVERE) == null ? void 0 : c.wind) == null ? void 0 : f.number) + 2) * 100) / 100, d = (S = (y = e == null ? void 0 : e.SEVERE) == null ? void 0 : y.wind) == null ? void 0 : S.number, I = (j = (M = e == null ? void 0 : e.HEAVY) == null ? void 0 : M.wind) == null ? void 0 : j.number;
+    for (let W = 0; W < (t == null ? void 0 : t.length); W++) {
+      const F = t[W], Y = (D = (N = F == null ? void 0 : F.meteo) == null ? void 0 : N.wave) == null ? void 0 : D.sig, A = (O = F == null ? void 0 : F.meteo) == null ? void 0 : O.wind, V = W ? p(F.eta).diff(p(t[W - 1].eta), "hour", !0) : 0;
+      s = V > s ? V : s, _ == null || _.debug("[%s] check sig.wave: %j", n.requestId, { ...Y, dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l }), (Y == null ? void 0 : Y.height) >= r ? F.isDangerous = !0 : (Y == null ? void 0 : Y.height) >= u ? F.isSevere = !0 : (Y == null ? void 0 : Y.height) >= l && (F.isHeavy = !0), _ == null || _.debug("[%s] check wind: %j", n.requestId, { ...A, dgThd4Wd: h, svThd4Wd: d, hvThd4Wd: I }), (A == null ? void 0 : A.scale) >= h ? (F.isDangerous = !0, delete F.isSevere, delete F.isHeavy) : (A == null ? void 0 : A.scale) > d ? (F.isDangerous || (F.isSevere = !0), delete F.isHeavy) : (A == null ? void 0 : A.scale) === I && !F.isDangerous && !F.isSevere && (F.isHeavy = !0), o += F.isDangerous ? V : 0, i += F.isSevere ? V : 0, a += F.isHeavy ? V : 0;
     }
-    return o = Math.round(o * 100) / 100, i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: e, dangerous: o, severe: i, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: h, svThd4Wd: c, hvThd4Wd: I }, sig: { dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l } };
+    return o = Math.round(o * 100) / 100, i = Math.round(i * 100) / 100, a = Math.round(a * 100) / 100, s = Math.round(s), { sample: t, dangerous: o, severe: i, heavy: a, step: s < 3 ? 3 : s, wind: { dgThd4Wd: h, svThd4Wd: d, hvThd4Wd: I }, sig: { dgThd4Wv: r, svThd4Wv: u, hvThd4Wv: l } };
   }
 }
 const Dt = new Mt();
@@ -813,7 +813,7 @@ try {
 }
 const gt = new ft("", !0);
 var bt = /* @__PURE__ */ ((x) => (x.common = "common", x.container = "container", x.tugs = "tugs", x))(bt || {}), vt = /* @__PURE__ */ ((x) => (x.Ballast = "Ballast", x.Laden = "Laden", x))(vt || {}), wt = /* @__PURE__ */ ((x) => (x.Cp = "CP", x.Perf = "Basis", x.Instruct = "Other", x))(wt || {});
-class H {
+class L {
   /**
    * @see https://baike.baidu.com/item/%E6%96%B9%E5%BD%A2%E7%B3%BB%E6%95%B0/4965568?fr=aladdin
    * 方形系数（block coefficient）
@@ -826,8 +826,8 @@ class H {
    * @param draught 吃水 m
    * @return [0.55, 0.85]
    */
-  static blockCoefficient(e, t, n, o) {
-    let i = Math.round(e / (t * n * o) * 100) / 100;
+  static blockCoefficient(t, e, n, o) {
+    let i = Math.round(t / (e * n * o) * 100) / 100;
     i = i < 0.55 ? 0.55 : i > 0.85 ? 0.85 : i;
     const a = [0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85], s = a.map((r) => Math.abs(r - i));
     return a[s.indexOf(Math.min(...s))];
@@ -843,8 +843,9 @@ class H {
    * @param g 重力加速度 9.80 m/s^2
    * @return [0.05, 0.30]
    */
-  static froudeNumber(e, t, n = 9.8) {
-    let o = Math.round(Math.sqrt(e * e / (n * t)) * 100) / 100;
+  static froudeNumber(t, e, n = 9.8) {
+    t = t || 10 * 1852 / 3600;
+    let o = Math.round(Math.sqrt(t * t / (n * e)) * 100) / 100;
     return o = o < 0.05 ? 0.05 : o > 0.3 ? 0.3 : o, o;
   }
   /**
@@ -854,7 +855,7 @@ class H {
    * @param loadCondition
    * @private
    */
-  static amendFactor(e, t, n) {
+  static amendFactor(t, e, n) {
     const o = {
       0.55: [1.7, -1.4, -7.4],
       0.6: [2.2, -2.5, -9.7],
@@ -872,8 +873,8 @@ class H {
       0.75: [2.6, -12.5, -13.5],
       0.8: [3, -16.3, -21.6],
       0.85: [3.4, -20.9, 31.8]
-    }[e];
-    return n === "Laden" && (a = o[e]), a[0] + a[1] * t + a[2] * Math.pow(t, 2);
+    }[t];
+    return n === "Laden" && (a = o[t]), a[0] + a[1] * e + a[2] * Math.pow(e, 2);
   }
   /**
    * 失速方向因子
@@ -886,9 +887,9 @@ class H {
    * @param bn
    * @private
    */
-  static directionFactor(e, t = 0) {
+  static directionFactor(t, e = 0) {
     let n;
-    return e > 30 && e <= 60 ? n = (1.7 - 0.03 * Math.pow(t - 4, 2)) / 2 : e > 60 && e <= 150 ? n = (0.9 - 0.06 * Math.pow(t - 6, 2)) / 2 : e > 150 && e <= 180 ? n = (0.4 - 0.03 * Math.pow(t - 8, 2)) / 2 : n = 1, Math.round(n * 1e5) / 1e5;
+    return t > 30 && t <= 60 ? n = (1.7 - 0.03 * Math.pow(e - 4, 2)) / 2 : t > 60 && t <= 150 ? n = (0.9 - 0.06 * Math.pow(e - 6, 2)) / 2 : t > 150 && t <= 180 ? n = (0.4 - 0.03 * Math.pow(e - 8, 2)) / 2 : n = 1, Math.round(n * 1e5) / 1e5;
   }
   /**
    * 失速船型因子
@@ -902,9 +903,9 @@ class H {
    * @param kts
    * @private
    */
-  static vesselTagFactor(e, t, n, o) {
+  static vesselTagFactor(t, e, n, o) {
     let i;
-    return n === "container" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (22 * Math.pow(e, 2 / 3)) : t === "Ballast" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(e, 2 / 3)) : i = 0.5 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(e, 2 / 3)), i;
+    return n === "container" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (22 * Math.pow(t, 2 / 3)) : e === "Ballast" ? i = 0.7 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(t, 2 / 3)) : i = 0.5 * o / 2 + Math.pow(o, 3) / (2.7 * Math.pow(t, 2 / 3)), i;
   }
   /**
    * 浪高影响因子
@@ -914,11 +915,11 @@ class H {
    * @param options
    * @private
    */
-  static waveHeightFactor(e, t, n = 10, o = {}) {
-    e = e < 3 ? e * 0.7 : e, e = e < 0 ? 0.2 : e, e = e > 6 ? e - 0.9 * (e - 6) : e, e = e > 9 ? 9 : e;
+  static waveHeightFactor(t, e, n = 10, o = {}) {
+    t = t < 3 ? t * 0.7 : t, t = t < 0 ? 0.2 : t, t = t > 6 ? t - 0.9 * (t - 6) : t, t = t > 9 ? 9 : t;
     const i = Math.max(n > 10 ? n - 10 : 2.8);
     let a;
-    return t > 30 && t <= 60 ? a = -0.6 : t > 60 && t <= 90 ? a = -0.5 : t > 90 && t <= 120 ? a = e < i ? 0.2 : -0.3 : t > 120 && t <= 150 ? a = e < i ? 0.25 : -0.2 : t > 150 && t <= 180 ? a = e < i ? 0.3 : -0.1 : a = -0.7, C == null || C.info("[%s] calculate wave height factor with ht(%d), beta(%d), draught(%d) and factor(%d)", o.requestId, e, t, n, a), Math.round(a * (0.144 * Math.pow(e, 2) + 0.378 * e) * 1e4) / 1e4;
+    return e > 30 && e <= 60 ? a = -0.6 : e > 60 && e <= 90 ? a = -0.5 : e > 90 && e <= 120 ? a = t < i ? 0.2 : -0.3 : e > 120 && e <= 150 ? a = t < i ? 0.25 : -0.2 : e > 150 && e <= 180 ? a = t < i ? 0.3 : -0.1 : a = -0.7, C == null || C.info("[%s] calculate wave height factor with ht(%d), beta(%d), draught(%d) and factor(%d)", o.requestId, t, e, n, a), Math.round(a * (0.144 * Math.pow(t, 2) + 0.378 * t) * 1e4) / 1e4;
   }
   /**
    * 组装船舶运行参数
@@ -928,13 +929,13 @@ class H {
    * @param bearing 方位角
    * @private
    */
-  static assembleProperties(e, t, n, o) {
-    var c;
-    const i = e.lbp ?? e.length ?? e.lengthOverall ?? 198.9642, a = e.draught ?? 8, s = e.breadthMoulded ?? e.breadth ?? e.breadthExtreme ?? 32.4572, r = e.deadweight ?? 67035.7773, u = ((c = e == null ? void 0 : e.type) == null ? void 0 : c.toLowerCase()) || "common";
+  static assembleProperties(t, e, n, o) {
+    var d;
+    const i = t.lbp ?? t.length ?? t.lengthOverall ?? 198.9642, a = t.draught ?? 8, s = t.breadthMoulded ?? t.breadth ?? t.breadthExtreme ?? 32.4572, r = t.deadweight ?? 67035.7773, u = ((d = t == null ? void 0 : t.type) == null ? void 0 : d.toLowerCase()) || "common";
     return {
       tag: u.indexOf("container") > -1 ? "container" : u.indexOf("tugs") > -1 ? "tugs" : "common",
       lbp: i,
-      loadCondition: t,
+      loadCondition: e,
       draught: a,
       breadthMoulded: s,
       // 排水量（吨）= 载重量（吨）/ 1.025 + 吃水（米）× 船舶型宽（米）× 船舶型长（米）× 0.7
@@ -956,42 +957,42 @@ class H {
    * @param useRouteParam true 启用设置速度
    * @param options
    */
-  static async speedLoseAt(e, t, n, o = "", i = 2, a = !0, s = !1, r = {}) {
+  static async speedLoseAt(t, e, n, o = "", i = 2, a = !0, s = !1, r = {}) {
     let u;
-    if (t.velocity && s && (e.speed = J.roundPrecision(t.velocity * 1852 / 3600, 6)), a) {
+    if (e.velocity && s && (t.speed = J.roundPrecision(e.velocity * 1852 / 3600, 6)), a) {
       let l;
       try {
         o = (o == null ? void 0 : o.toUpperCase()) === "CMEMS" ? "ECMWF" : o, o = (o == null ? void 0 : o.toUpperCase()) === "METEO2" ? "best_match" : o;
-        const { weatherModels: k, marineModels: w } = await dt.autoPickMeteoModel(o), v = n.utc().format(), m = await gt.spotForecast(t.lat, t.lng, v, !1, !1, !0, {
+        const { weatherModels: k, marineModels: w } = await dt.autoPickMeteoModel(o), v = n.utc().format(), m = await gt.spotForecast(e.lat, e.lng, v, !1, !1, !0, {
           ...r,
           pastDays: 1,
           forecastDays: 2,
           weatherModels: k,
           marineModels: w
-        }), [d] = dt.pickHourly(m, v);
-        l = dt.toLegacy(d);
+        }), [c] = dt.pickHourly(m, v);
+        l = dt.toLegacy(c);
       } catch (k) {
-        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...t, eta: n.utc().format(), source: o }, k);
+        C.warn("[%s] meteo2 spot(%j) forecast failed: %s", r.requestId, { ...e, eta: n.utc().format(), source: o }, k);
       }
-      let h = H.currentFactor(e.bearing, l == null ? void 0 : l.current, i, r), c = H.weatherFactor(e, l, h, r);
-      const I = e.speed * 1.943844;
-      I + h + c <= 0 && (C.warn(
+      let h = L.currentFactor(t.bearing, l == null ? void 0 : l.current, i, r), d = L.weatherFactor(t, l, h, r);
+      const I = t.speed * 1.943844;
+      I + h + d <= 0 && (C.warn(
         "[%s] v0(%d) is less then factor(%d) = wxFactor(%d) + cFactor(%d), scale factor with 0.6",
         r.requestId,
         I,
-        c + h,
-        c,
+        d + h,
+        d,
         h
-      ), h = Math.round(h * 0.6 * 1e3) / 1e3, c = Math.round(c * 0.6 * 1e3) / 1e3);
-      const b = c <= (r.minV0Factor || -1) ? Math.max(r.maxV0Factor || -2.5, -1 * c * (c / 1.2)) : 0;
-      C == null || C.info("[%s] calculate speed lose with v0Factor(%d), cFactor(%d) and wxFactor(%d)", r.requestId, b, h, c), c += b;
-      let E = Math.round((I + h + c) * 100) / 100;
+      ), h = Math.round(h * 0.6 * 1e3) / 1e3, d = Math.round(d * 0.6 * 1e3) / 1e3);
+      const b = d <= (r.minV0Factor || -1) ? Math.max(r.maxV0Factor || -1.5, -1 * d * (d / 1.2)) : 0;
+      C == null || C.info("[%s] calculate speed lose with v0Factor(%d), cFactor(%d) and wxFactor(%d)", r.requestId, b, h, d), d += b;
+      let E = Math.round((I + h + d) * 100) / 100;
       E = E <= 0 ? 1 : E, u = {
         meteo: { ...l },
-        wxFactor: c,
+        wxFactor: d,
         v0Factor: b,
         cFactor: h,
-        speed: t.velocity && s ? t.velocity : E,
+        speed: e.velocity && s ? e.velocity : E,
         eta: n.utc().format(),
         etd: n.utc().format()
       };
@@ -1000,11 +1001,11 @@ class H {
         wxFactor: 0,
         v0Factor: 0,
         cFactor: 0,
-        speed: t.velocity && s ? t.velocity : Math.round(e.speed * 1.943844 * 100) / 100,
+        speed: e.velocity && s ? e.velocity : Math.round(t.speed * 1.943844 * 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, { ...u, ...t };
+    return delete e.meteo, delete e.wxFactor, delete e.cFactor, delete e.speed, delete e.etd, { ...u, ...e };
   }
   /**
    * 基于步长计算失速样本
@@ -1020,53 +1021,53 @@ class H {
    * @param options
    * @private
    */
-  static async speedLoseInHoursStep(e, t, n, o, i, a, s = "", r = !0, u = !1, l = {}) {
-    t.utc();
-    const h = t.clone().add(14, "days"), c = [], I = [], b = [];
+  static async speedLoseInHoursStep(t, e, n, o, i, a, s = "", r = !0, u = !1, l = {}) {
+    e.utc();
+    const h = e.clone().add(14, "days"), d = [], I = [], b = [];
     let E = 0, k = 0, w, v;
     for (let m = 0; m < a.length - 1; m++) {
-      let d = a[m];
-      d.distanceFromStart = Math.round((i + k) * 1e3) / 1e3;
+      let c = a[m];
+      c.distanceFromStart = Math.round((i + k) * 1e3) / 1e3;
       const f = a[m + 1];
-      if (e.bearing = R.calculateBearing(d, f, !f.gcToPrevious), d.bearing = e.bearing, d.suspend && u) {
-        d.eta = d.eta || t.utc().format(), d.elapsed = d.elapsed ?? 0;
-        const M = d.suspend - d.elapsed;
+      if (t.bearing = R.calculateBearing(c, f, !f.gcToPrevious), c.bearing = t.bearing, c.suspend && u) {
+        c.eta = c.eta || e.utc().format(), c.elapsed = c.elapsed ?? 0;
+        const M = c.suspend - c.elapsed;
         if (o - E > M)
-          o = o - E - M, t.add(M, "hour"), d.elapsed = d.suspend;
+          o = o - E - M, e.add(M, "hour"), c.elapsed = c.suspend;
         else {
           const j = o - E;
-          d.elapsed += j, t.add(j, "hour"), o = 0;
+          c.elapsed += j, e.add(j, "hour"), o = 0;
         }
-        if (C == null || C.info(`[%s] suspend ${d.elapsed} hours at %j, and remain ${o} hours need to go...`, l.requestId, d), o === 0)
-          return d.distanceFromPrevious = k, { etd: t, from: v || d, to: d, next: a.filter((j) => j), wps: c, days: I, all: b };
+        if (C == null || C.info(`[%s] suspend ${c.elapsed} hours at %j, and remain ${o} hours need to go...`, l.requestId, c), o === 0)
+          return c.distanceFromPrevious = k, { etd: e, from: v || c, to: c, next: a.filter((j) => j), wps: d, days: I, all: b };
       } else
-        d.suspend = 0;
-      r = t.isAfter(h) ? !1 : r, d = await H.speedLoseAt(e, d, t, s, 0, r, u, l), b.push(d), v = v || d, d.important && c.push(d), t.isSameOrAfter(n) && (I.push(d), n.add(24, "hour"));
-      const y = R.calculateDistance(d, f, !f.gcToPrevious);
+        c.suspend = 0;
+      r = e.isAfter(h) ? !1 : r, c = await L.speedLoseAt(t, c, e, s, 0, r, u, l), b.push(c), v = v || c, c.important && d.push(c), e.isSameOrAfter(n) && (I.push(c), n.add(24, "hour"));
+      const y = R.calculateDistance(c, f, !f.gcToPrevious);
       let S = Math.round(y / v.speed * 1e5) / 1e5;
       if (E + S < o) {
-        if (E += S, t.add(S, "hour"), delete a[m], C == null || C.debug(
+        if (E += S, e.add(S, "hour"), delete a[m], C == null || C.debug(
           `[%s] go to %j from %j with ${y}nm, and cost ${S} hours`,
           l.requestId,
           { lat: f.lat, lng: f.lng },
           { lat: v.lat, lng: v.lng, etd: v.etd }
         ), k += y, a.filter((M) => M).length <= 1) {
-          w = f, w.eta = t.utc().format(), w.distanceFromPrevious = y, w.distanceFromStart = Math.round((i + k) * 1e4) / 1e4, c.push(w), b.push(w), delete a[m + 1];
+          w = f, w.eta = e.utc().format(), w.distanceFromPrevious = y, w.distanceFromStart = Math.round((i + k) * 1e4) / 1e4, d.push(w), b.push(w), delete a[m + 1];
           break;
         }
       } else {
-        S = o - E, t.add(S, "hour");
+        S = o - E, e.add(S, "hour");
         const M = J.roundPrecision(v.speed * S, 5);
-        w = R.calculateCoordinate(d, e.bearing, M, "nauticalmiles", !f.gcToPrevious), w.eta = t.utc().format(), a[m] = w, C == null || C.debug(
+        w = R.calculateCoordinate(c, t.bearing, M, "nauticalmiles", !f.gcToPrevious), w.eta = e.utc().format(), a[m] = w, C == null || C.debug(
           `[%s] go to %j from %j with ${M}nm, and cost ${S} hours`,
           l.requestId,
           { lat: w.lat, lng: w.lng },
-          { lat: d.lat, lng: d.lng, etd: d.etd }
+          { lat: c.lat, lng: c.lng, etd: c.etd }
         ), k += M, w.distanceFromPrevious = Math.round(k * 1e4) / 1e4, w.distanceFromStart = Math.round((i + k) * 1e4) / 1e4;
         break;
       }
     }
-    return { etd: t, from: v, to: w, next: a.filter((m) => m), wps: c, days: I, all: b };
+    return { etd: e, from: v, to: w, next: a.filter((m) => m), wps: d, days: I, all: b };
   }
   /**
    * 洋流影响因子
@@ -1075,10 +1076,10 @@ class H {
    * @param role  1: 船东, 2: 租家, 0: 未知
    * @param options
    */
-  static currentFactor(e, t, n = 0, o = {}) {
-    const i = R.includedAngle(e, (t == null ? void 0 : t.degree) || 0) / 180 * Math.PI;
+  static currentFactor(t, e, n = 0, o = {}) {
+    const i = R.includedAngle(t ?? 0, (e == null ? void 0 : e.degree) ?? 0) / 180 * Math.PI;
     let a;
-    return Math.abs(i) === Math.PI / 2 && (a = 0), a = ((t == null ? void 0 : t.kts) || 0) * Math.cos(i), n & 2 ? a = Math.ceil(a * 100) / 100 : n & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, C == null || C.info("[%s] calculate current factor with %j", o.requestId, { beta: i, current: t, factor: a, role: n }), Math.abs(a) > 5 ? 0 : a;
+    return Math.abs(i) === Math.PI / 2 && (a = 0), a = ((e == null ? void 0 : e.kts) || 0) * Math.cos(i), n & 2 ? a = Math.ceil(a * 100) / 100 : n & 1 ? a = Math.floor(a * 100) / 100 : a = Math.round(a * 100) / 100, C == null || C.info("[%s] calculate current factor with %j", o.requestId, { beta: i, current: e, factor: a, role: n }), Math.abs(a) > 5 ? 0 : a;
   }
   /**
    * 风浪影响因子
@@ -1087,32 +1088,32 @@ class H {
    * @param cFactor 洋流因子
    * @param options
    */
-  static weatherFactor(e, t, n = 0, o = {}) {
-    var b, E, k, w, v, m, d;
-    C == null || C.info("[%s] calculate weather factor via: %j", o.requestId, { ...e, ...t });
-    const i = H.blockCoefficient(e.displacement, e.lbp, e.breadthMoulded, e.draught), a = J.roundPrecision(n * 1852 / 3600, 6), s = H.froudeNumber(e.speed - a, e.lbp), r = H.amendFactor(i, s, e.loadCondition);
-    let u = R.includedAngle(e.bearing, (b = t == null ? void 0 : t.wind) == null ? void 0 : b.degree);
-    const l = H.directionFactor(u, (E = t == null ? void 0 : t.wind) == null ? void 0 : E.scale), h = H.vesselTagFactor(e.displacement, e.loadCondition, e.tag, ((k = t == null ? void 0 : t.wind) == null ? void 0 : k.kts) || 10);
-    let c = l * r * h / 100 * (e.speed - a);
-    c = Math.round(c * 1.943844 * 1e4) / 1e4 * -1, e.tag === "tugs" && Math.abs(c) > 1 && (c = c / (Math.abs(Math.round(c)) + 1)), C == null || C.info("[%s] calculate wind wx factor: %d", o.requestId, c), u = R.includedAngle(e.bearing, (v = (w = t == null ? void 0 : t.wave) == null ? void 0 : w.sig) == null ? void 0 : v.degree);
-    const I = H.waveHeightFactor(((d = (m = t == null ? void 0 : t.wave) == null ? void 0 : m.sig) == null ? void 0 : d.height) ?? 1, u, e.draught, o);
-    return C == null || C.info("[%s] calculate wave wx factor: %d", o.requestId, I), c = Math.abs(c) > Math.abs(I) ? c : 0.6 * c + 0.8 * I, C == null || C.info("[%s] calculate finial weather factor: %d (0.6 * wf) + (0.8 * hf)", o.requestId, c), c = Math.abs(c) > 3 ? 3 * (Math.abs(c) / c) + Math.abs(c) / c * (Math.abs(c) - 2) * 0.1 : c, Math.round((c || 0) * 100) / 100;
+  static weatherFactor(t, e, n = 0, o = {}) {
+    var b, E, k, w, v, m, c;
+    C == null || C.info("[%s] calculate weather factor via: %j", o.requestId, { ...t, ...e }), t.displacement = t.displacement || t.lbp * t.breadthMoulded * t.draught * 0.7 * 1.025, t.speed = t.speed || 10 * 1852 / 3600, t.bearing = t.bearing ?? 0;
+    const i = L.blockCoefficient(t.displacement, t.lbp, t.breadthMoulded, t.draught), a = J.roundPrecision(n * 1852 / 3600, 6), s = L.froudeNumber(t.speed - a, t.lbp), r = L.amendFactor(i, s, t.loadCondition);
+    let u = R.includedAngle(t.bearing ?? 0, (b = e == null ? void 0 : e.wind) == null ? void 0 : b.degree);
+    const l = L.directionFactor(u, (E = e == null ? void 0 : e.wind) == null ? void 0 : E.scale), h = L.vesselTagFactor(t.displacement, t.loadCondition, t.tag, ((k = e == null ? void 0 : e.wind) == null ? void 0 : k.kts) || 10);
+    let d = l * r * h / 100 * (t.speed - a);
+    d = Math.round(d * 1.943844 * 1e4) / 1e4 * -1, t.tag === "tugs" && Math.abs(d) > 1 && (d = d / (Math.abs(Math.round(d)) + 1)), C == null || C.info("[%s] calculate wind wx factor: %d", o.requestId, d), u = R.includedAngle(t.bearing, (v = (w = e == null ? void 0 : e.wave) == null ? void 0 : w.sig) == null ? void 0 : v.degree);
+    const I = L.waveHeightFactor(((c = (m = e == null ? void 0 : e.wave) == null ? void 0 : m.sig) == null ? void 0 : c.height) ?? 1, u, t.draught, o);
+    return C == null || C.info("[%s] calculate wave wx factor: %d", o.requestId, I), d = Math.abs(d) > Math.abs(I) ? d : 0.4 * d + 0.6 * I, C == null || C.info("[%s] calculate finial weather factor: %d = (0.4 * wf) + (0.6 * hf)", o.requestId, d), d = Math.abs(d) > 3 ? 3 * (Math.abs(d) / d) + Math.abs(d) / d * (Math.abs(d) - 2) * 0.1 : d, Math.round((d || 0) * 100) / 100;
   }
   /**
    * 以12小时级别去掉重复的days
    * @param days
    * @param interval 12 hours
    */
-  static async reduceDays(e, t = 12 * 60 * 60) {
-    return e = e == null ? void 0 : e.reduce((n, o) => (o.positionTime || (o.positionTime = p.utc(o.etd || o.eta).unix()), n.some((i) => Math.floor(i.positionTime / t) === Math.floor(o.positionTime / t)) || n.push(o), n), []), e;
+  static async reduceDays(t, e = 12 * 60 * 60) {
+    return t = t == null ? void 0 : t.reduce((n, o) => (o.positionTime || (o.positionTime = p.utc(o.etd || o.eta).unix()), n.some((i) => Math.floor(i.positionTime / e) === Math.floor(o.positionTime / e)) || n.push(o), n), []), t;
   }
   /**
    * 以分钟级别去掉重复的wps
    * @param wps
    * @param interval 1 minute
    */
-  static async reduceWPS(e, t = 60) {
-    return e = e == null ? void 0 : e.reduce((n, o) => (n.some((i) => Math.floor(p(i.etd).unix() / t) === Math.floor(p(o.etd).unix() / t)) || n.push(o), n), []), e;
+  static async reduceWPS(t, e = 60) {
+    return t = t == null ? void 0 : t.reduce((n, o) => (n.some((i) => Math.floor(p(i.etd).unix() / e) === Math.floor(p(o.etd).unix() / e)) || n.push(o), n), []), t;
   }
   /**
    * 全程失速分析(走完航程)
@@ -1127,30 +1128,30 @@ class H {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstant(e, t, n, o, i, a = "", s = 0, r = !0, u = !1, l = {}) {
+  static async analyseInstant(t, e, n, o, i, a = "", s = 0, r = !0, u = !1, l = {}) {
     var U, G, X, Q, Z, $;
     const h = p().valueOf();
-    e.lng = J.convertToStdLng(e.lng);
-    const { route: c, waypoints: I } = i.points, b = R.calculateSubRoute(e, c);
+    t.lng = J.convertToStdLng(t.lng);
+    const { route: d, waypoints: I } = i.points, b = R.calculateSubRoute(t, d);
     if (((U = b[0]) == null ? void 0 : U.length) <= 1)
       return;
-    const { v0: E, label: k } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    const { v0: E, label: k } = t.sog ? {
+      v0: t.sog,
+      label: t.label || "Other"
       /* Instruct */
     } : {
       v0: o.speed,
       label: "CP"
       /* Cp */
-    }, w = H.assembleProperties(n, o.loadCondition, E, 0), v = I.length ? R.calculateSubWaypoints(e, I) : [];
+    }, w = L.assembleProperties(n, o.loadCondition, E, 0), v = I.length ? R.calculateSubWaypoints(t, I) : [];
     v.forEach((q) => q.important = !0);
     const m = {
-      from: { ...e },
+      from: { ...t },
       route: b,
       waypoints: v,
       v0: E,
       label: k
-    }, d = {
+    }, c = {
       hours: [],
       days: [],
       wps: [],
@@ -1158,12 +1159,12 @@ class H {
     };
     s || (R.calculateRouteDistance(b) / o.speed <= 72 ? s = 3 : s = 6);
     let f = R.simplifyRouteToCoordinates(b, v, 0), y = 0, S = 0, M = 0, j = 0;
-    t = p(t).utc();
-    const N = t.clone();
+    e = p(e).utc();
+    const N = e.clone();
     for (; f.length > 0; ) {
-      const q = s - t.hour() % s, B = Math.ceil(t.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4, T = await H.speedLoseInHoursStep(
+      const q = s - e.hour() % s, B = Math.ceil(e.clone().add(q, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4, T = await L.speedLoseInHoursStep(
         w,
-        t,
+        e,
         N,
         B,
         y,
@@ -1173,31 +1174,31 @@ class H {
         u,
         l
       );
-      if (d.all.push(...T.all), (G = T.from) != null && G.speed && (d.hours.push(T.from), d.wps.push(...T.wps), d.days.push(...T.days)), f = T == null ? void 0 : T.next, !f.length) {
-        const O = await H.speedLoseAt(w, T.to, p(T.to.eta), a, 0, r, u, l);
-        O.bearing = w.bearing, d.hours.push(O), d.all.push(O);
+      if (c.all.push(...T.all), (G = T.from) != null && G.speed && (c.hours.push(T.from), c.wps.push(...T.wps), c.days.push(...T.days)), f = T == null ? void 0 : T.next, !f.length) {
+        const H = await L.speedLoseAt(w, T.to, p(T.to.eta), a, 0, r, u, l);
+        H.bearing = w.bearing, c.hours[c.hours.length - 1] = H, c.all[c.all.length - 1] = H, c.wps[c.wps.length - 1] = H;
       }
       y += Math.round((((X = T == null ? void 0 : T.to) == null ? void 0 : X.distanceFromPrevious) ?? 0) * 1e4) / 1e4;
     }
-    const D = d.hours;
+    const D = c.hours;
     for (let q = 0; q < D.length - 1; q++) {
       const B = p(D[q + 1].eta).diff(D[q].etd, "hour", !0) || 1;
       S += (D[q].wxFactor || 0) * B, M += (D[q].cFactor || 0) * B, j += B;
     }
-    const L = D.reduce((q, B) => q + (B.suspend || 0), 0);
-    (Q = d.wps) == null || Q.forEach((q, B) => {
+    const O = D.reduce((q, B) => q + (B.suspend || 0), 0);
+    (Q = c.wps) == null || Q.forEach((q, B) => {
       q.positionTime = p.utc(q.etd || q.eta).unix();
-      const T = d.wps[B - 1];
+      const T = c.wps[B - 1];
       if (T) {
-        const O = q.distanceFromStart - T.distanceFromStart, P = p(q.eta || q.etd).diff(p(T.etd || T.eta), "h", !0);
-        q.avgSpd = Math.round(O / P * 100) / 100;
+        const H = q.distanceFromStart - T.distanceFromStart, P = p(q.eta || q.etd).diff(p(T.etd || T.eta), "h", !0);
+        q.avgSpd = Math.round(H / P * 100) / 100;
         const at = R.calculateBearing(T, q);
         q.avgBearing = at, T.bearing = at;
       }
-    }), d.wps = await H.reduceWPS(d.wps), d.days = await H.reduceDays(d.days), d.all = (Z = d.all) == null ? void 0 : Z.reduce((q, B) => (B.positionTime = p.utc(B.etd || B.eta).unix(), q.some((T) => Math.round(T.positionTime / 60) === Math.round(B.positionTime / 60)) || q.push(B), q), []), m.sample = d;
-    const W = d.hours.at(0), F = d.hours.at(-1);
-    m.distance = Math.round(F.distanceFromStart * 1e3) / 1e3, m.etd = p(W.eta).utc().format(), m.eta = p(F.eta).utc().format(), m.wxFactor = Math.round(S / j * 1e3) / 1e3, m.cFactor = Math.round(M / j * 1e3) / 1e3, m.avgSpeed = Math.round(F.distanceFromStart / j * 1e3) / 1e3, m.totalHrs = Math.round(j * 1e3) / 1e3, m.suspend = Math.round(L * 1e3) / 1e3;
-    const Y = J.roundPrecision(o.dgo / 24 * L, 3), { distanceInECA: A, hoursInECA: V, totalDgoConsInECA: ot, eca: tt } = await this.calculateECA(m, o, l), et = J.roundPrecision(o.fo / 24 * (j - V), 3), it = J.roundPrecision(o.dgo / 24 * j + Y, 3);
+    }), c.wps = await L.reduceWPS(c.wps), c.days = await L.reduceDays(c.days), c.all = (Z = c.all) == null ? void 0 : Z.reduce((q, B) => (B.positionTime = p.utc(B.etd || B.eta).unix(), q.some((T) => Math.round(T.positionTime / 60) === Math.round(B.positionTime / 60)) || q.push(B), q), []), m.sample = c;
+    const W = c.hours.at(0), F = c.hours.at(-1);
+    m.distance = Math.round(F.distanceFromStart * 1e3) / 1e3, m.etd = p(W.eta).utc().format(), m.eta = p(F.eta).utc().format(), m.wxFactor = Math.round(S / j * 1e3) / 1e3, m.cFactor = Math.round(M / j * 1e3) / 1e3, m.avgSpeed = Math.round(F.distanceFromStart / j * 1e3) / 1e3, m.totalHrs = Math.round(j * 1e3) / 1e3, m.suspend = Math.round(O * 1e3) / 1e3;
+    const Y = J.roundPrecision(o.dgo / 24 * O, 3), { distanceInECA: A, hoursInECA: V, totalDgoConsInECA: ot, eca: tt } = await this.calculateECA(m, o, l), et = J.roundPrecision(o.fo / 24 * (j - V), 3), it = J.roundPrecision(o.dgo / 24 * j + Y, 3);
     m.extend = {
       eca: tt,
       distanceInECA: A,
@@ -1205,7 +1206,7 @@ class H {
       totalDgoConsInECA: ot,
       totalDgoConsInSuspend: Y
     }, m.totalFoCons = et < 0 ? 0 : et, m.totalDgoCons = it;
-    const st = p().valueOf() - h, ct = (($ = d == null ? void 0 : d.hours) == null ? void 0 : $.length) || 1;
+    const st = p().valueOf() - h, ct = (($ = c == null ? void 0 : c.hours) == null ? void 0 : $.length) || 1;
     return C == null || C.info("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", l == null ? void 0 : l.requestId, st, ct, Math.round(st / ct * 1e3) / 1e3), m;
   }
   /**
@@ -1223,42 +1224,42 @@ class H {
    * @param useRouteParam
    * @param options
    */
-  static async analyseInstantWithThreshed(e, t, n, o, i, a, s, r = "", u = 3, l = !0, h = !1, c = {}) {
+  static async analyseInstantWithThreshed(t, e, n, o, i, a, s, r = "", u = 3, l = !0, h = !1, d = {}) {
     var X, Q, Z, $, q, B;
     const I = p().valueOf();
-    e.lng = J.convertToStdLng(e.lng);
-    const { v0: b, label: E } = e.sog ? {
-      v0: e.sog,
-      label: e.label || "Other"
+    t.lng = J.convertToStdLng(t.lng);
+    const { v0: b, label: E } = t.sog ? {
+      v0: t.sog,
+      label: t.label || "Other"
       /* Instruct */
     } : {
       v0: i.speed,
       label: "CP"
       /* Cp */
-    }, k = H.assembleProperties(o, i.loadCondition, b, 0), w = R.calculateSubRoute(e, a);
+    }, k = L.assembleProperties(o, i.loadCondition, b, 0), w = R.calculateSubRoute(t, a);
     if (((X = w[0]) == null ? void 0 : X.length) <= 1)
       return;
-    const v = s.length ? R.calculateSubWaypoints(e, s) : [];
+    const v = s.length ? R.calculateSubWaypoints(t, s) : [];
     v.forEach((T) => T.important = !0);
-    let m = R.simplifyRouteToCoordinates(w, v, 0), d = 0, f = 0, y = 0, S = 0;
+    let m = R.simplifyRouteToCoordinates(w, v, 0), c = 0, f = 0, y = 0, S = 0;
     const M = {
       hours: [],
       wps: [],
       days: [],
       all: []
     };
-    t = p(t).utc();
-    const j = t.clone();
+    e = p(e).utc();
+    const j = e.clone();
     for (; m.length > 0; ) {
-      const T = u - t.hour() % u;
-      let O = Math.ceil(t.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(t, "h", !0) * 1e4) / 1e4;
-      O = t.clone().add(O, "h").isSameOrAfter(n) ? n.diff(t, "h", !0) * 1e4 / 1e4 : O;
-      const P = await H.speedLoseInHoursStep(k, t, j, O, d, m, r, l, h, c);
-      if (M.all.push(...P.all), (Q = P.from) != null && Q.speed && (M.hours.push(P.from), P != null && P.wps && M.wps.push(...P.wps), M.days.push(...P.days)), m = P == null ? void 0 : P.next, m.length || M.hours.push(P == null ? void 0 : P.to), d += Math.round((((Z = P == null ? void 0 : P.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !O)
+      const T = u - e.hour() % u;
+      let H = Math.ceil(e.clone().add(T, "h").set({ minute: 0, second: 0, millisecond: 0 }).diff(e, "h", !0) * 1e4) / 1e4;
+      H = e.clone().add(H, "h").isSameOrAfter(n) ? n.diff(e, "h", !0) * 1e4 / 1e4 : H;
+      const P = await L.speedLoseInHoursStep(k, e, j, H, c, m, r, l, h, d);
+      if (M.all.push(...P.all), (Q = P.from) != null && Q.speed && (M.hours.push(P.from), P != null && P.wps && M.wps.push(...P.wps), M.days.push(...P.days)), m = P == null ? void 0 : P.next, m.length || M.hours.push(P == null ? void 0 : P.to), c += Math.round((((Z = P == null ? void 0 : P.to) == null ? void 0 : Z.distanceFromPrevious) ?? 0) * 1e4) / 1e4, !H)
         break;
     }
-    M.wps = await H.reduceWPS(M.wps), M.days = await H.reduceDays(M.days), M.all = ($ = M.all) == null ? void 0 : $.reduce((T, O) => (O.positionTime = p.utc(O.etd || O.eta).unix(), T.some((P) => Math.round(p(P.etd).unix() / 60) === Math.round(p(O.etd).unix() / 60)) || T.push(O), T), []), (q = M.wps) == null || q.forEach((T, O) => {
-      const P = M.wps[O - 1];
+    M.wps = await L.reduceWPS(M.wps), M.days = await L.reduceDays(M.days), M.all = ($ = M.all) == null ? void 0 : $.reduce((T, H) => (H.positionTime = p.utc(H.etd || H.eta).unix(), T.some((P) => Math.round(p(P.etd).unix() / 60) === Math.round(p(H.etd).unix() / 60)) || T.push(H), T), []), (q = M.wps) == null || q.forEach((T, H) => {
+      const P = M.wps[H - 1];
       if (P) {
         const at = T.distanceFromStart - P.distanceFromStart, lt = p(T.eta || T.etd).diff(p(P.etd || P.eta), "h", !0);
         P.bearing = R.calculateBearing(P, T), T.avgSpd = Math.round(at / lt * 100) / 100;
@@ -1266,27 +1267,27 @@ class H {
     });
     const N = M.hours;
     for (let T = 0; T < N.length - 1; T++) {
-      const O = p(N[T + 1].eta).diff(N[T].etd, "hour", !0);
-      f += N[T].wxFactor * O, y += N[T].cFactor * O, S += O;
+      const H = p(N[T + 1].eta).diff(N[T].etd, "hour", !0);
+      f += N[T].wxFactor * H, y += N[T].cFactor * H, S += H;
     }
-    const D = N.reduce((T, O) => T + (O.suspend || 0), 0), L = M.hours.at(0), W = M.hours.at(-1), F = await R.calculateRangeRoute(L, W, w), Y = await R.calculateRangeWaypoints(L, W, w, v), A = {
+    const D = N.reduce((T, H) => T + (H.suspend || 0), 0), O = M.hours.at(0), W = M.hours.at(-1), F = await R.calculateRangeRoute(O, W, w), Y = await R.calculateRangeWaypoints(O, W, w, v), A = {
       sample: M,
       distance: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) * 1e4) / 1e4,
       // 注意，可能会在first节点Drift,所有采用eta做为初始出发时间
-      etd: p(L.eta).utc().format(),
+      etd: p(O.eta).utc().format(),
       eta: p(W == null ? void 0 : W.eta).utc().format(),
       wxFactor: Math.round(f / S * 1e3) / 1e3,
       cFactor: Math.round(y / S * 1e3) / 1e3,
       avgSpeed: Math.round(((W == null ? void 0 : W.distanceFromStart) || 0) / S * 1e3) / 1e3,
       totalHrs: Math.round(S * 1e3) / 1e3,
       suspend: Math.round(D * 1e3) / 1e3,
-      from: L,
+      from: O,
       to: W,
       route: F,
       waypoints: Y,
       v0: b,
       label: E
-    }, V = J.roundPrecision(i.dgo / 24 * D, 3), { distanceInECA: ot, hoursInECA: tt, totalDgoConsInECA: et, eca: it } = await this.calculateECA(A, i, c), rt = J.roundPrecision(i.fo / 24 * (S - tt), 3), st = J.roundPrecision(i.dgo / 24 * S + V, 3);
+    }, V = J.roundPrecision(i.dgo / 24 * D, 3), { distanceInECA: ot, hoursInECA: tt, totalDgoConsInECA: et, eca: it } = await this.calculateECA(A, i, d), rt = J.roundPrecision(i.fo / 24 * (S - tt), 3), st = J.roundPrecision(i.dgo / 24 * S + V, 3);
     A.extend = {
       eca: it,
       distanceInECA: ot,
@@ -1295,7 +1296,7 @@ class H {
       totalDgoConsInSuspend: V
     }, A.totalDgoCons = st, A.totalFoCons = rt < 0 ? 0 : rt;
     const U = p().valueOf() - I, G = ((B = M == null ? void 0 : M.hours) == null ? void 0 : B.length) || 1;
-    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", c == null ? void 0 : c.requestId, U, G, Math.round(U / G * 1e3) / 1e3), A;
+    return C == null || C.debug("[%s] each hour-sample speed analyse cost: (%d / %d = %d) ms", d == null ? void 0 : d.requestId, U, G, Math.round(U / G * 1e3) / 1e3), A;
   }
   /**
    * 在指定航线条件下，基于多CP，动态计算最优成本(租金+油费)方案
@@ -1312,34 +1313,34 @@ class H {
    * @param lane 基础航线（重要转向点）
    * @param options
    */
-  static async analyseCost(e, t, n, o, i = {}) {
+  static async analyseCost(t, e, n, o, i = {}) {
     var w, v;
     const a = p().valueOf(), s = [];
-    e.speedStep = e.speedStep || 3, e.alterStep = e.alterStep ?? 1;
+    t.speedStep = t.speedStep || 3, t.alterStep = t.alterStep ?? 1;
     const r = R.calculateRouteDistance(o.route);
     let u = 0;
     n.forEach((m) => {
-      const d = Math.ceil(r / m.speed / 24);
-      u = u < d ? d : u;
+      const c = Math.ceil(r / m.speed / 24);
+      u = u < c ? c : u;
     }), u = u * 1.3;
-    const l = p.utc(e.etd).add(u ?? 14, "day");
+    const l = p.utc(t.etd).add(u ?? 14, "day");
     let h = 1;
     for (const m of n) {
-      const d = JSON.parse(JSON.stringify(o.route)), f = JSON.parse(JSON.stringify(o.waypoints)), y = await H.analyseInstantWithThreshed(
-        { lat: e.lat, lng: e.lng },
-        e.etd,
+      const c = JSON.parse(JSON.stringify(o.route)), f = JSON.parse(JSON.stringify(o.waypoints)), y = await L.analyseInstantWithThreshed(
+        { lat: t.lat, lng: t.lng },
+        t.etd,
         l,
-        t,
+        e,
         m,
-        d,
+        c,
         f,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
+        t.meteoVendor,
+        t.speedStep,
+        t.useMeteo,
+        t.useRouteParam,
         i
       );
-      y && (await H.calculateCost(y, m, e, i), s.push(y), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", i.requestId, 1, h, e.etd, l.format(), {
+      y && (await L.calculateCost(y, m, t, i), s.push(y), C == null || C.info("[%s][L%d-%d] analyse from %s to %s cost: %j", i.requestId, 1, h, t.etd, l.format(), {
         cost: y.cost.total,
         hire: y.cost.hire,
         bunker: y.cost.bunker,
@@ -1348,23 +1349,23 @@ class H {
         cp: `${m.speed}/${m.fo}/${m.dgo}`
       })), h++;
     }
-    s.sort((m, d) => m.cost.total - d.cost.total);
-    const c = s.at(0), I = s.at(1), b = [];
-    if (b.push({ combined: !1, speeds: [c], cost: (w = c.cost) == null ? void 0 : w.total }), I) {
-      const m = c.cost.cp, d = I.cost.cp, f = p(c.eta), y = p(c.etd), S = f.diff(y, "days", !0);
+    s.sort((m, c) => m.cost.total - c.cost.total);
+    const d = s.at(0), I = s.at(1), b = [];
+    if (b.push({ combined: !1, speeds: [d], cost: (w = d.cost) == null ? void 0 : w.total }), I) {
+      const m = d.cost.cp, c = I.cost.cp, f = p(d.eta), y = p(d.etd), S = f.diff(y, "days", !0);
       let M = Math.ceil(S / 2);
-      M = M > 7 ? 7 : M < e.alterStep ? e.alterStep : M;
+      M = M > 7 ? 7 : M < t.alterStep ? t.alterStep : M;
       let j = 2, N = { combined: !1, speeds: [I], cost: (v = I.cost) == null ? void 0 : v.total }, D;
-      for (; M >= e.alterStep; ) {
-        const L = await H.combinedAnalyse(e, t, l, [m, d], o, M, { ...i, level: j });
-        if (N.cost > L.cost ? D ? (D == null ? void 0 : D.cost) > L.cost && (D = L) : (D = N, N = L) : (!D || (D == null ? void 0 : D.cost) > L.cost) && (D = L), M <= e.alterStep)
+      for (; M >= t.alterStep; ) {
+        const O = await L.combinedAnalyse(t, e, l, [m, c], o, M, { ...i, level: j });
+        if (N.cost > O.cost ? D ? (D == null ? void 0 : D.cost) > O.cost && (D = O) : (D = N, N = O) : (!D || (D == null ? void 0 : D.cost) > O.cost) && (D = O), M <= t.alterStep)
           break;
         M = Math.ceil(M / 2), j += 1;
       }
       b.push(N), D && b.push(D);
     }
     const k = p().valueOf() - a;
-    return C == null || C.info("[%s] analyse elapsed: %d ms", i == null ? void 0 : i.requestId, k), b.sort((m, d) => m.cost - d.cost);
+    return C == null || C.info("[%s] analyse elapsed: %d ms", i == null ? void 0 : i.requestId, k), b.sort((m, c) => m.cost - c.cost);
   }
   /**
    * 按步长多次减半，分别用7,4,2,1天步长及cpa,cpb交替计算各种组合下的成本
@@ -1376,17 +1377,17 @@ class H {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async combinedAnalyse(e, t, n, o, i, a, s = {}) {
+  static async combinedAnalyse(t, e, n, o, i, a, s = {}) {
     s.counter = 1, C == null || C.info("[%s][L%d] analyse with alternate cp in every %d days", s.requestId, s.level, a);
-    const r = await H.alternateAnalyse(e, t, n, o, 0, i, a, s), u = r.reduce((d, f) => d + f.cost.total, 0), l = r.reduce((d, f) => d + f.cost.hire, 0), h = r.reduce((d, f) => d + f.cost.bunker, 0), c = r.reduce((d, f) => d + f.distance, 0), I = r.reduce((d, f) => d + f.totalHrs, 0);
+    const r = await L.alternateAnalyse(t, e, n, o, 0, i, a, s), u = r.reduce((c, f) => c + f.cost.total, 0), l = r.reduce((c, f) => c + f.cost.hire, 0), h = r.reduce((c, f) => c + f.cost.bunker, 0), d = r.reduce((c, f) => c + f.distance, 0), I = r.reduce((c, f) => c + f.totalHrs, 0);
     C == null || C.info("[%s][L%d] cost with cpa/cpb turn: %j", s.requestId, s.level, {
       cost: u,
       hire: l,
       bunker: h,
-      distance: c,
+      distance: d,
       hours: I
     });
-    const b = await H.alternateAnalyse(e, t, n, o, 1, i, a, s), E = b.reduce((d, f) => d + f.cost.total, 0), k = b.reduce((d, f) => d + f.cost.hire, 0), w = b.reduce((d, f) => d + f.cost.bunker, 0), v = b.reduce((d, f) => d + f.distance, 0), m = b.reduce((d, f) => d + f.totalHrs, 0);
+    const b = await L.alternateAnalyse(t, e, n, o, 1, i, a, s), E = b.reduce((c, f) => c + f.cost.total, 0), k = b.reduce((c, f) => c + f.cost.hire, 0), w = b.reduce((c, f) => c + f.cost.bunker, 0), v = b.reduce((c, f) => c + f.distance, 0), m = b.reduce((c, f) => c + f.totalHrs, 0);
     return C == null || C.info("[%s][L%d] cost with cpb/cpa turn: %j", s.requestId, s.level, {
       cost: E,
       hire: k,
@@ -1406,26 +1407,26 @@ class H {
    * @param step 步长，7，4，2，1
    * @param options
    */
-  static async alternateAnalyse(e, t, n, o, i, a, s, r = {}) {
-    var c, I;
-    let u = p.utc(e.etd);
-    const l = { lat: e.lat, lng: e.lng }, h = [];
+  static async alternateAnalyse(t, e, n, o, i, a, s, r = {}) {
+    var d, I;
+    let u = p.utc(t.etd);
+    const l = { lat: t.lat, lng: t.lng }, h = [];
     for (; u.isBefore(n); ) {
-      const b = u.clone().utc().add(s, "day"), E = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), w = o[i], v = await H.analyseInstantWithThreshed(
+      const b = u.clone().utc().add(s, "day"), E = JSON.parse(JSON.stringify(a.route)), k = JSON.parse(JSON.stringify(a.waypoints)), w = o[i], v = await L.analyseInstantWithThreshed(
         l,
         u.utc().format(),
         b,
-        t,
+        e,
         w,
         E,
         k,
-        e.meteoVendor,
-        e.speedStep,
-        e.useMeteo,
-        e.useRouteParam,
+        t.meteoVendor,
+        t.speedStep,
+        t.useMeteo,
+        t.useRouteParam,
         r
       );
-      v && (await H.calculateCost(v, w, e, r), C == null || C.info(
+      v && (await L.calculateCost(v, w, t, r), C == null || C.info(
         "[%s][L%d-%d] analyse from %s to %s cost: %j",
         r.requestId,
         r.level,
@@ -1441,7 +1442,7 @@ class H {
           cp: `${w.speed}/${w.fo}/${w.dgo}`
         }
       )), r.counter = r.counter + 1;
-      const m = (I = (c = v == null ? void 0 : v.sample) == null ? void 0 : c.hours) == null ? void 0 : I.at(-1);
+      const m = (I = (d = v == null ? void 0 : v.sample) == null ? void 0 : d.hours) == null ? void 0 : I.at(-1);
       if (m)
         l.lat = m.lat, l.lng = m.lng, u = p(m.eta), h.push(v), i = i ? 0 : 1;
       else
@@ -1456,35 +1457,35 @@ class H {
    * @param props
    * @param options
    */
-  static async calculateCost(e, t, n, o = {}) {
+  static async calculateCost(t, e, n, o = {}) {
     var i;
-    if (e) {
-      const a = (n.addComm || 0) >= 1 ? (n.addComm || 0) / 100 : n.addComm || 0, s = Math.round((n.dailyHire || 0) * (e.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(e.totalHrs / 24 * (n.dailyHire || 0) * (1 - a) * 1e3) / 1e3 + s, u = Math.round(e.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, l = Math.round((e.totalDgoCons + (((i = e.extend) == null ? void 0 : i.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
-      e.cost = {
+    if (t) {
+      const a = (n.addComm || 0) >= 1 ? (n.addComm || 0) / 100 : n.addComm || 0, s = Math.round((n.dailyHire || 0) * (t.suspend || 0) / 24 * 1e3) / 1e3, r = Math.round(t.totalHrs / 24 * (n.dailyHire || 0) * (1 - a) * 1e3) / 1e3 + s, u = Math.round(t.totalFoCons * (n.priceFO || 0) * 1e3) / 1e3, l = Math.round((t.totalDgoCons + (((i = t.extend) == null ? void 0 : i.totalDgoConsInECA) || 0)) * (n.priceDGO || 0) * 1e3) / 1e3;
+      t.cost = {
         total: Math.round((r + u + l) * 1e3) / 1e3,
         hire: Math.round(r * 1e3) / 1e3,
         suspendHire: s,
         bunker: Math.round((u + l) * 1e3) / 1e3,
-        cp: t
+        cp: e
       };
     }
-    return e;
+    return t;
   }
   /**
    * 计算单cp模式下的ECA属性
    *
    */
-  static async calculateECA(e, t, n = {}) {
+  static async calculateECA(t, e, n = {}) {
     var r, u, l, h;
-    const o = await R.intersectInECA((e == null ? void 0 : e.route) || []);
+    const o = await R.intersectInECA((t == null ? void 0 : t.route) || []);
     let i = 0, a = 0, s = 0;
-    (u = (r = e == null ? void 0 : e.sample) == null ? void 0 : r.wps) == null || u.forEach((c) => {
-      c.positionTime = p.utc(c.etd || c.eta).unix();
+    (u = (r = t == null ? void 0 : t.sample) == null ? void 0 : r.wps) == null || u.forEach((d) => {
+      d.positionTime = p.utc(d.etd || d.eta).unix();
     });
-    for (const c of o) {
-      i += c.distance;
-      const I = await R.deadReckoningTime((l = c.waypoints) == null ? void 0 : l.at(0), e.sample.all || e.sample.wps), b = await R.deadReckoningTime((h = c.waypoints) == null ? void 0 : h.at(-1), e.sample.all || e.sample.wps);
-      c.in = I, c.out = b, c.totalHrs = J.roundPrecision((b.positionTime - I.positionTime) / 3600, 3), c.totalDgoCons = J.roundPrecision(t.fo / 24 * c.totalHrs, 3), a += c.totalHrs, s += c.totalDgoCons;
+    for (const d of o) {
+      i += d.distance;
+      const I = await R.deadReckoningTime((l = d.waypoints) == null ? void 0 : l.at(0), t.sample.all || t.sample.wps), b = await R.deadReckoningTime((h = d.waypoints) == null ? void 0 : h.at(-1), t.sample.all || t.sample.wps);
+      d.in = I, d.out = b, d.totalHrs = J.roundPrecision((b.positionTime - I.positionTime) / 3600, 3), d.totalDgoCons = J.roundPrecision(e.fo / 24 * d.totalHrs, 3), a += d.totalHrs, s += d.totalDgoCons;
     }
     return i = J.roundPrecision(i, 3), a = J.roundPrecision(a, 3), s = J.roundPrecision(s, 3), {
       distanceInECA: i,
@@ -1498,25 +1499,25 @@ class H {
    * @param speeds
    * @param options
    */
-  static async mergeSpeeds(e, t = {}) {
-    var m, d;
+  static async mergeSpeeds(t, e = {}) {
+    var m, c;
     const n = {
       hours: [],
       wps: [],
       days: [],
       all: []
-    }, o = e.reduce((f, y) => f + y.distance, 0), i = e.reduce((f, y) => {
+    }, o = t.reduce((f, y) => f + y.distance, 0), i = t.reduce((f, y) => {
       var S;
       return f + (((S = y.extend) == null ? void 0 : S.distanceInECA) || 0);
-    }, 0), a = e.reduce((f, y) => f + y.totalHrs, 0), s = e.reduce((f, y) => {
+    }, 0), a = t.reduce((f, y) => f + y.totalHrs, 0), s = t.reduce((f, y) => {
       var S;
       return f + (((S = y.extend) == null ? void 0 : S.hoursInECA) || 0);
-    }, 0), r = e.reduce((f, y) => {
+    }, 0), r = t.reduce((f, y) => {
       var S;
       return f + (((S = y.extend) == null ? void 0 : S.totalDgoConsInECA) || 0);
-    }, 0), u = e.reduce((f, y) => f + y.wxFactor * y.totalHrs / a, 0), l = e.reduce((f, y) => f + y.cFactor * y.totalHrs / a, 0), h = e.reduce((f, y) => f + y.totalFoCons, 0), c = e.reduce((f, y) => f + y.totalDgoCons, 0), I = e.reduce((f, y) => f + y.cost.total, 0), b = e.reduce((f, y) => f + y.cost.hire, 0), E = e.reduce((f, y) => f + y.cost.bunker, 0), k = [], w = [];
+    }, 0), u = t.reduce((f, y) => f + y.wxFactor * y.totalHrs / a, 0), l = t.reduce((f, y) => f + y.cFactor * y.totalHrs / a, 0), h = t.reduce((f, y) => f + y.totalFoCons, 0), d = t.reduce((f, y) => f + y.totalDgoCons, 0), I = t.reduce((f, y) => f + y.cost.total, 0), b = t.reduce((f, y) => f + y.cost.hire, 0), E = t.reduce((f, y) => f + y.cost.bunker, 0), k = [], w = [];
     let v;
-    for (const f of e) {
+    for (const f of t) {
       w.push(...((m = f.extend) == null ? void 0 : m.eca) || []);
       const y = f.sample.hours, S = f.sample.all, M = f.sample.wps, j = f.sample.days, N = y.at(0);
       v && (N.distanceFromPrevious = v.distanceFromPrevious, N.distanceFromStart = v.distanceFromStart, y.forEach((F, Y) => {
@@ -1528,8 +1529,8 @@ class H {
       }), j.at(0).distanceFromPrevious = v.distanceFromPrevious, j.at(0).distanceFromStart = v.distanceFromStart, j.forEach((F, Y) => {
         Y && (F.distanceFromStart = F.distanceFromStart + v.distanceFromStart);
       })), N.cp = f.cost.cp;
-      const D = [f.etd, f.eta], L = k.findIndex((F) => F.id === N.cp.id);
-      L === -1 ? (N.cp.segment = [D], k.push(N.cp)) : k[L].segment.push(D), y.forEach((F) => {
+      const D = [f.etd, f.eta], O = k.findIndex((F) => F.id === N.cp.id);
+      O === -1 ? (N.cp.segment = [D], k.push(N.cp)) : k[O].segment.push(D), y.forEach((F) => {
         var A;
         ((A = n.hours) == null ? void 0 : A.findIndex((V) => V.eta === F.eta)) === -1 && n.hours.push(F);
       }), S.forEach((F) => {
@@ -1542,7 +1543,7 @@ class H {
         var A;
         ((A = n == null ? void 0 : n.days) == null ? void 0 : A.findIndex((V) => V.eta === F.eta)) === -1 && n.days.push(F);
       });
-      const W = (d = n.wps) == null ? void 0 : d.findIndex((F) => F.eta === N.eta);
+      const W = (c = n.wps) == null ? void 0 : c.findIndex((F) => F.eta === N.eta);
       W === -1 ? n.wps.push(N) : n.wps[W] = N, v = y.at(-1);
     }
     return n.wps.sort((f, y) => p(f.etd).unix() - p(y.etd).unix()), n.wps.forEach((f, y) => {
@@ -1555,11 +1556,11 @@ class H {
       }
     }), {
       sample: n,
-      etd: e.at(0).etd,
-      eta: e.at(-1).eta,
-      from: e.at(0).from,
-      to: e.at(-1).to,
-      v0: e.at(0).v0,
+      etd: t.at(0).etd,
+      eta: t.at(-1).eta,
+      from: t.at(0).from,
+      to: t.at(-1).to,
+      v0: t.at(0).v0,
       label: "Combined",
       distance: Math.round(o * 1e3) / 1e3,
       totalHrs: Math.round(a * 1e3) / 1e3,
@@ -1567,7 +1568,7 @@ class H {
       wxFactor: Math.round(u * 1e3) / 1e3,
       cFactor: Math.round(l * 1e3) / 1e3,
       totalFoCons: Math.round(h * 1e3) / 1e3,
-      totalDgoCons: Math.round(c * 1e3) / 1e3,
+      totalDgoCons: Math.round(d * 1e3) / 1e3,
       cost: {
         total: Math.round(I * 1e3) / 1e3,
         hire: Math.round(b * 1e3) / 1e3,
@@ -1579,7 +1580,7 @@ class H {
         distanceInECA: Math.round(i * 1e3) / 1e3,
         hoursInECA: Math.round(s * 1e3) / 1e3,
         totalDgoConsInECA: Math.round(r * 1e3) / 1e3,
-        speeds: e
+        speeds: t
       }
     };
   }
@@ -1593,7 +1594,7 @@ export {
   Nt as MyShipImpl,
   Tt as MyVesselImpl,
   xt as ShipxyImpl,
-  H as SpeedHelper,
+  L as SpeedHelper,
   wt as SpeedLabel,
   bt as VesselTag,
   Dt as alertHelper