iboot-http-client 1.0.4 → 1.0.6

package/dist/iboot-http-client.es.js

@@ -1,7 +1,7 @@
 import C from "js-md5";
-import p from "crypto-js";
+import m from "crypto-js";
 import N from "pino";
-const M = {
+const L = {
   GENERAL: 0,
   PHONE: 1,
   EMAIL: 2
@@ -21,7 +21,7 @@ const M = {
   unknown: 0,
   male: 1,
   female: 2
-}, E = (n) => Array.isArray(n) || typeof n == "object" && Object.prototype.toString.call(n) === "[object Array]", I = (n) => {
+}, b = (n) => Array.isArray(n) || typeof n == "object" && Object.prototype.toString.call(n) === "[object Array]", I = (n) => {
   const t = n, e = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678", r = e.length;
   let s = "";
   for (let o = 0; o < t; o++)
@@ -33,7 +33,7 @@ const M = {
     const o = s.split("=");
     o[1] && (e[o[0]] = o[1]);
   }), e;
-}, m = (n) => n == null || n == "" || n.length == 0 ? "" : encodeURIComponent(n).replace(/\(/g, "%28").replace(/\)/g, "%29").replace(/\'/g, "%27").replace(/\!/g, "%21").replace(/\~/g, "%7E"), U = "zh-CN", T = "_device_id_key", _ = "_current_website_key", w = "Get request error!", b = "Post request error!", y = {
+}, p = (n) => n == null || n == "" || n.length == 0 ? "" : encodeURIComponent(n).replace(/\(/g, "%28").replace(/\)/g, "%29").replace(/\'/g, "%27").replace(/\!/g, "%21").replace(/\~/g, "%7E"), U = "zh-CN", w = "_device_id_key", _ = "_current_website_key", T = "Get request error!", E = "Post request error!", y = {
   "Device-Id": "Device-Id",
   Lang: "Lang",
   "Website-Id": "Website-Id",
@@ -45,21 +45,21 @@ const M = {
   IBOOT_WEBSITE_NO: "IBOOT_WEBSITE_NO",
   token: "token",
   user: "user"
-}, O = () => {
-  const n = localStorage.getItem(T) ?? "", t = localStorage.getItem(_), e = t != null ? JSON.parse(t) : null, r = {};
+}, S = () => {
+  const n = localStorage.getItem(w) ?? "", t = localStorage.getItem(_), e = t != null ? JSON.parse(t) : null, r = {};
   return n.length > 0 && (r["Device-Id"] = n), e && (r.Lang = e.language, e.websiteId && (r["Website-Id"] = e.websiteId), e.websiteNo && (r["Website-No"] = e.websiteNo)), r;
 }, x = (n, t) => {
-  localStorage.setItem(T, n), t && localStorage.setItem(_, JSON.stringify(t));
+  localStorage.setItem(w, n), t && localStorage.setItem(_, JSON.stringify(t));
 }, k = async (n, t) => {
   if (t?.data) {
     const o = new URLSearchParams(t.data);
     n.indexOf("?") != -1 ? n += `&${o}` : n += `?${o}`;
   }
-  const e = O(), r = t?.heads;
+  const e = S(), r = t?.heads;
   if (r)
     for (const o in r) {
-      const c = r[o];
-      c && (e[o] = c);
+      const a = r[o];
+      a && (e[o] = a);
     }
   const s = await fetch(n, {
     method: "GET",
@@ -71,46 +71,46 @@ const M = {
     success: !1,
     msg: s.statusText
   };
-}, S = async (n, t) => {
+}, O = async (n, t) => {
   const e = t?.data ?? {}, r = t?.heads;
   let s;
-  const o = new Headers(O());
+  const o = new Headers(S());
   if (e instanceof FormData ? s = e : (s = JSON.stringify(e), o.set("Content-Type", "application/json")), r)
     for (let l in r) {
       const i = r[l];
       i && o.set(l, i);
     }
-  const c = await fetch(n, {
+  const a = await fetch(n, {
     method: "POST",
     headers: o,
     body: s
   });
-  return c.ok ? await c.json() : {
-    code: c.status,
+  return a.ok ? await a.json() : {
+    code: a.status,
     success: !1,
-    msg: c.statusText
+    msg: a.statusText
   };
 }, j = async (n, t) => {
   const e = await k(n, t);
   if (e.success)
     return e.data;
   if (t?.showError) {
-    t.showError(e.msg ?? w);
+    t.showError(e.msg ?? T);
     return;
   }
-  throw Error(e.msg ?? w);
+  throw Error(e.msg ?? T);
 }, K = async (n, t) => {
-  const e = await S(n, t);
+  const e = await O(n, t);
   if (e.success)
     return e.data;
   if (t?.showError) {
-    t.showError(e.msg ?? b);
+    t.showError(e.msg ?? E);
     return;
   }
-  throw Error(e.msg ?? b);
+  throw Error(e.msg ?? E);
 }, F = async (n, t) => {
-  const e = await S(n, t);
-  return e.success ? (t?.showSuccess && t.showSuccess(e.msg ?? "SUCCESS"), !0) : (t?.showError && t.showError(e.msg ?? b), !1);
+  const e = await O(n, t);
+  return e.success ? (t?.showSuccess && t.showSuccess(e.msg ?? "SUCCESS"), !0) : (t?.showError && t.showError(e.msg ?? E), !1);
 }, H = (n) => {
   const t = n.headers.get(y["Device-Id"]), e = n.headers.get(y.Lang), r = n.headers.get(y["Website-Id"]), s = n.headers.get(y["Website-No"]), o = {};
   return t && t.length > 0 && (o.deviceId = t), e && e.length > 0 && (o.lang = e), r && r.length > 0 && (o.websiteId = r), s && s.length > 0 && (o.websiteNo = s), o;
@@ -131,25 +131,30 @@ class J {
   websiteNo;
   _isDebug;
   logger;
-  constructor({ deviceId: t, lang: e, websiteId: r, websiteNo: s, userType: o }) {
-    this.baseUrl = process.env.BASE_URL ?? "", this.helloMethod = process.env.HELLO_URL ?? "", this.apiKey = process.env.API_KEY ?? "", this.userType = o ?? A.TYPE_MGT, this.userFrom = process.env.USER_FROM || "1", this.deviceId = t ?? I(10), this.lang = e ?? U, this.websiteId = r, this.websiteNo = s, this._isDebug = process.env.NODE_ENV != "production", this.logger = N({
-      name: "iboot",
+  constructor({ deviceId: t, lang: e, websiteId: r, websiteNo: s, userType: o, helloURL: a, appName: l }) {
+    this.baseUrl = process.env.BASE_URL ?? "", this.helloMethod = a ?? "", this.apiKey = process.env.API_KEY ?? "", this.userType = o ?? A.TYPE_MGT, this.userFrom = process.env.USER_FROM || "1", this.deviceId = t ?? I(10), this.lang = e ?? U, this.websiteId = r, this.websiteNo = s, this._isDebug = process.env.NODE_ENV != "production", this.logger = N({
+      name: l,
       level: this._isDebug ? "debug" : "info",
-      nestedKey: "payload"
+      nestedKey: "payload",
+      messageKey: "msg",
+      //明确指定消息键,可解决乱码问题
+      formatters: {
+        level: (i) => ({ level: i })
+      }
     });
   }
   isDebug() {
     return this._isDebug;
   }
   encrypt(t) {
-    const e = p.enc.Utf8.parse(this.apiKey);
-    return p.AES.encrypt(t, e).toString();
+    const e = m.enc.Utf8.parse(this.apiKey);
+    return m.AES.encrypt(t, e).toString();
   }
   decrypt(t) {
-    const e = p.enc.Utf8.parse(this.apiKey);
-    return p.AES.decrypt(t, e, {
-      mode: p.mode.ECB
-    }).toString(p.enc.Utf8);
+    const e = m.enc.Utf8.parse(this.apiKey);
+    return m.AES.decrypt(t, e, {
+      mode: m.mode.ECB
+    }).toString(m.enc.Utf8);
   }
   getDeviceId() {
     return this.deviceId;
@@ -162,43 +167,43 @@ class J {
       if (s && typeof s == "string")
         s = s.trim();
       else if (s && typeof s == "object") {
-        if (E(s)) {
+        if (b(s)) {
           if (s.length === 0)
             continue;
           for (let o = 0; o < s.length; o++) {
-            const c = s[o];
-            for (const l in c) {
-              const i = c[l] ?? void 0;
+            const a = s[o];
+            for (const l in a) {
+              const i = a[l] ?? void 0;
               if (i) {
                 if (typeof i == "object")
-                  E(i) && i.forEach((a, d) => {
-                    if (a)
-                      for (const g in a) {
-                        const u = a[g];
+                  b(i) && i.forEach((c, g) => {
+                    if (c)
+                      for (const d in c) {
+                        const u = c[d];
                         if (u && u.toString().length > 0) {
-                          const f = `[${o.toString()}].${l + `[${d.toString()}].${g}`}=${m(u)}`;
+                          const f = `[${o.toString()}].${l + `[${g.toString()}].${d}`}=${p(u)}`;
                           e.push(r + f);
                         }
                       }
                   });
                 else if (i.toString().length > 0) {
-                  const a = `[${o.toString()}].${l}=${m(i.toString())}`;
-                  e.push(r + a);
+                  const c = `[${o.toString()}].${l}=${p(i.toString())}`;
+                  e.push(r + c);
                 }
               }
             }
           }
         } else
           for (const o in s) {
-            const c = s[o];
-            if (c != null && c != "" && c.length != 0) {
-              const l = `.${o}=${m(c)}`;
+            const a = s[o];
+            if (a != null && a != "" && a.length != 0) {
+              const l = `.${o}=${p(a)}`;
               e.push(r + l);
             }
           }
         continue;
       } else s && typeof s == "function" && (s = null);
-      s != null && s != "" && s.length != 0 && e.push(r + "=" + m(s));
+      s != null && s != "" && s.length != 0 && e.push(r + "=" + p(s));
     }
     return e && e.join("&");
   }
@@ -206,17 +211,18 @@ class J {
     const e = "&key=" + await this.helloIboot(), r = [];
     for (const i in t)
       r.push(i);
-    r.sort((i, a) => i.toLowerCase().localeCompare(a.toLowerCase()));
+    r.sort((i, c) => i.toLowerCase().localeCompare(c.toLowerCase()));
     const s = [];
     r.forEach((i) => {
-      let a = t[i];
-      typeof a == "object" && (a = JSON.stringify(a)), s.push(i + "=" + a);
+      let c = t[i];
+      typeof c == "object" && (c = JSON.stringify(c)), s.push(i + "=" + c);
     });
-    const o = s.join("&"), c = C.md5((o + e).toLocaleUpperCase()), l = {
+    const o = s.join("&"), a = C.md5((o + e).toLocaleUpperCase()), l = {
+      name: "sort",
       params: o,
-      md5: c
+      md5: a
     };
-    return this.logger.debug(l), c;
+    return this.logger.debug(l), a;
   }
   //eslint-disable-next-line @typescript-eslint/no-explicit-any
   assemblyParameter(t, e) {
@@ -237,7 +243,7 @@ class J {
     return r.Sign = o, r;
   }
   async helloIboot() {
-    if (this.helloIboot.length === 0)
+    if (this.helloMethod.length <= 0)
       return this.apiKey;
     const t = this.getApiUrl(this.helloMethod), e = {
       "Content-Type": "application/x-www-form-urlencoded",
@@ -275,33 +281,33 @@ class J {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async get({ url: t, data: e, token: r }) {
-    const s = this.assemblyParameter(e), o = this.convertUrlParameter(s), c = await this.assemblyHeader({ urlParams: o, token: r }), l = `${this.getApiUrl(t)}?${o.toString()}`, i = {
+    const s = this.assemblyParameter(e), o = this.convertUrlParameter(s), a = await this.assemblyHeader({ urlParams: o, token: r }), l = `${this.getApiUrl(t)}?${o.toString()}`, i = {
       method: "GET",
       url: l,
-      headers: c
+      headers: a
     };
     this.logger.info(i);
     try {
-      const a = await fetch(l, {
+      const c = await fetch(l, {
         method: "GET",
-        headers: c,
+        headers: a,
         credentials: "include",
         cache: "force-cache"
       });
-      if (a.ok) {
-        const d = await a.json();
-        return this.logger.debug({ result: d.data }), d;
+      if (c.ok) {
+        const g = await c.json();
+        return this.logger.debug({ GET_RESULT: g }), g;
       }
       return {
-        code: a.status,
+        code: c.status,
         success: !1,
-        msg: a.statusText
+        msg: c.statusText
       };
-    } catch (a) {
+    } catch (c) {
       return {
         code: 500,
         success: !1,
-        msg: a?.toString() ?? "Server exception!"
+        msg: c?.toString() ?? "Server exception!"
       };
     }
   }
@@ -310,16 +316,17 @@ class J {
     e = e ? { ...e } : {};
     const s = e.buffer ?? void 0, o = e.boundary ?? void 0;
     s && delete e.buffer, o && delete e.boundary;
-    const c = this.assemblyParameter(e), l = this.convertUrlParameter(c), i = await this.assemblyHeader({ urlParams: l, token: r });
+    const a = this.assemblyParameter(e), l = this.convertUrlParameter(a), i = await this.assemblyHeader({ urlParams: l, token: r });
     s && o && (i["Content-Type"] = `multipart/form-data; boundary=${o}`);
-    const a = this.getApiUrl(t), d = {
+    const c = this.getApiUrl(t), g = {
       method: "POST",
-      url: a,
-      headers: i
+      url: c,
+      headers: i,
+      params: a
     };
-    this.logger.info(d);
+    this.logger.info(g);
     try {
-      const g = s ? `${a}?${l}` : a, u = await fetch(g, {
+      const d = s ? `${c}?${l}` : c, u = await fetch(d, {
         method: "POST",
         headers: i,
         body: s || l.toString(),
@@ -327,18 +334,18 @@ class J {
       });
       if (u.ok) {
         const f = await u.json();
-        return this.logger.debug({ result: f.data }), f;
+        return this.logger.debug({ POST_RESULT: f }), f;
       }
       return {
         code: u.status,
         success: !1,
         msg: u.statusText
       };
-    } catch (g) {
+    } catch (d) {
       return {
         code: 500,
         success: !1,
-        msg: g?.toString() ?? "Server exception!"
+        msg: d?.toString() ?? "Server exception!"
       };
     }
   }
@@ -347,17 +354,18 @@ class J {
     e = e ? { ...e } : {};
     const s = e.buffer ?? void 0, o = e.boundary ?? void 0;
     s && delete e.buffer, o && delete e.boundary;
-    const c = this.assemblyParameter(e), l = this.convertUrlParameter(c), i = await this.assemblyHeader({ urlParams: l, token: r });
+    const a = this.assemblyParameter(e), l = this.convertUrlParameter(a), i = await this.assemblyHeader({ urlParams: l, token: r });
     s && o && (i["Content-Type"] = `multipart/form-data; boundary=${o}`), i.Connection = "keep-alive", i["X-Accel-Buffering"] = "no", i["Cache-Control"] = "no-cache";
-    const a = this.getApiUrl(t);
+    const c = this.getApiUrl(t);
     try {
-      const d = s ? `${a}?${l}` : a, g = {
-        method: "POST",
-        url: a,
-        headers: i
+      const g = s ? `${c}?${l}` : c, d = {
+        method: "STREAM",
+        url: c,
+        headers: i,
+        params: a
       };
-      this.logger.info(g);
-      const u = await fetch(d, {
+      this.logger.info(d);
+      const u = await fetch(g, {
         method: "POST",
         headers: i,
         body: s || l.toString(),
@@ -374,8 +382,8 @@ class J {
           Connection: "keep-alive"
         }
       });
-    } catch (d) {
-      throw d;
+    } catch (g) {
+      throw g;
     }
   }
   getUserInfo(t) {
@@ -410,15 +418,15 @@ class J {
   };
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setToken(t, e) {
-    const { id: r, name: s, username: o, nickname: c, sex: l, headImg: i, token: a, lastLoginTime: d, tokenExpired: g, deviceId: u, userType: f, mustChangePwd: v } = t, P = {
+    const { id: r, name: s, username: o, nickname: a, sex: l, headImg: i, token: c, lastLoginTime: g, tokenExpired: d, deviceId: u, userType: f, mustChangePwd: v } = t, P = {
       id: r,
       name: s,
       username: o,
-      nickname: c,
+      nickname: a,
       sex: l,
       headImg: i,
-      lastLoginTime: d,
-      tokenExpired: g,
+      lastLoginTime: g,
+      tokenExpired: d,
       deviceId: u,
       userType: f,
       status: 0,
@@ -430,7 +438,7 @@ class J {
       createTime: "",
       mustChangePwd: v
     };
-    return e.cookies.set(h.token, a, {
+    return e.cookies.set(h.token, c, {
       httpOnly: !0,
       secure: !this._isDebug,
       // 在生产环境中启用Secure
@@ -455,10 +463,10 @@ class J {
   }
 }
 export {
-  M as ACCOUNT_TYPE_MAP,
+  L as ACCOUNT_TYPE_MAP,
   _ as CURRENT_WEBSITE_KEY,
   U as DEFAULT_LOCALE,
-  T as DEVICE_ID_KEY,
+  w as DEVICE_ID_KEY,
   J as HttpClient,
   $ as USER_FORM_MAP,
   W as USER_SEX_MAP,
@@ -469,7 +477,7 @@ export {
   j as iGet,
   K as iPost,
   F as iPostSuccess,
-  S as post,
+  O as post,
   x as setDefaultRequestHeader
 };
 //# sourceMappingURL=iboot-http-client.es.js.map