zmdms-utils 0.0.97 → 0.0.98

package/dist/es/request.d.ts

@@ -23,6 +23,11 @@ declare class AxiosRequest {
     private responseError;
     private logoutHandle;
     request(options: IOptions): Promise<AxiosResponse<any, any>>;
+    /**
+     * 推断密钥接口的请求前缀地址
+     * 绝对地址的请求取其origin 其他情况取实例的baseURL(同源场景为空串)
+     */
+    private getSecurityKeyBaseURL;
 }
 interface IOptions extends AxiosRequestConfig {
     isFormData?: boolean;
@@ -75,6 +80,12 @@ interface IOtherOptions {
     baseURL?: string;
     /** 加密实例方法 */
     crypto?: Crypto;
+    /**
+     * 开启自动密钥模式
+     * 开启后无需传crypto 加密请求会自动等待密钥就绪后加密
+     * 带token的请求会顺带预热密钥
+     */
+    securityKey?: boolean;
     /** 超时是否需要弹框 */
     isTimeoutConfirm?: boolean;
     /** 超时弹框提示内容 */

package/dist/es/request.js

@@ -1,6 +1,7 @@
-import { __rest, __assign } from './_virtual/_tslib.js';
+import { __awaiter, __rest, __assign, __generator } from './_virtual/_tslib.js';
 import axios from 'axios';
 import { removeToken, getPreToken } from './auth.js';
+import { getApiCrypto, initSecurityKeys } from './securityKey.js';
 import { TOKEN_KEY } from './constants.js';
 
 var defaultOptions = {
@@ -236,67 +237,106 @@ var AxiosRequest = /** @class */ (function () {
     };
     // 实例方法
     AxiosRequest.prototype.request = function (options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        var isFormData = options.isFormData, _k = options.isAuth, isAuth = _k === void 0 ? true : _k, resetOptions = __rest(options, ["isFormData", "isAuth"]);
-        var newOptions = resetOptions;
-        // 自定义请求头
-        if (!newOptions.headers) {
-            newOptions.headers = {};
-        }
-        if (isAuth) {
-            var token = getPreToken();
-            if (token) {
-                newOptions.headers[this.tokenKey] = token;
-            }
-        }
-        // 遍历params，将undefined值 转为null值
-        if (newOptions.data) {
-            newOptions.data = transformData(newOptions.data);
-        }
-        if (newOptions.params) {
-            newOptions.params = transformData(newOptions.params);
-        }
-        // 处理特殊请求
-        var specialMethod = ["POST", "PUT", "PATCH"];
-        var method = ((_a = newOptions.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || "";
-        if (specialMethod.includes(method)) {
-            if (isFormData) {
-                var formData = new FormData();
-                var dataObj = newOptions.data || {};
-                var dataKey = Object.keys(dataObj);
-                var dataVal = Object.values(dataObj);
-                for (var i = 0; i < dataKey.length; i++) {
-                    if (dataVal[i]) {
-                        formData.append(dataKey[i], dataVal[i]);
-                    }
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function () {
+            var isFormData, _f, isAuth, resetOptions, newOptions, token, specialMethod, method, formData, dataObj, dataKey, dataVal, i, crypto;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        isFormData = options.isFormData, _f = options.isAuth, isAuth = _f === void 0 ? true : _f, resetOptions = __rest(options, ["isFormData", "isAuth"]);
+                        newOptions = resetOptions;
+                        // 自定义请求头
+                        if (!newOptions.headers) {
+                            newOptions.headers = {};
+                        }
+                        if (isAuth) {
+                            token = getPreToken();
+                            if (token) {
+                                newOptions.headers[this.tokenKey] = token;
+                            }
+                            // 自动密钥模式：带token的请求顺带预热密钥 不阻塞当前请求
+                            // 预热失败静默处理 真正需要密钥的请求会再走到等待逻辑并报错
+                            if (this.otherOptions.securityKey) {
+                                initSecurityKeys({
+                                    baseURL: this.getSecurityKeyBaseURL(options),
+                                }).catch(function () { });
+                            }
+                        }
+                        if (!(newOptions.isCrypto && !this.crypto && this.otherOptions.securityKey)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, initSecurityKeys({
+                                baseURL: this.getSecurityKeyBaseURL(options),
+                            })];
+                    case 1:
+                        _g.sent();
+                        _g.label = 2;
+                    case 2:
+                        // 遍历params，将undefined值 转为null值
+                        if (newOptions.data) {
+                            newOptions.data = transformData(newOptions.data);
+                        }
+                        if (newOptions.params) {
+                            newOptions.params = transformData(newOptions.params);
+                        }
+                        specialMethod = ["POST", "PUT", "PATCH"];
+                        method = ((_a = newOptions.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || "";
+                        if (specialMethod.includes(method)) {
+                            if (isFormData) {
+                                formData = new FormData();
+                                dataObj = newOptions.data || {};
+                                dataKey = Object.keys(dataObj);
+                                dataVal = Object.values(dataObj);
+                                for (i = 0; i < dataKey.length; i++) {
+                                    if (dataVal[i]) {
+                                        formData.append(dataKey[i], dataVal[i]);
+                                    }
+                                }
+                                newOptions.headers["Content-Type"] = "multipart/form-data";
+                                newOptions.data = formData;
+                            }
+                            else {
+                                newOptions.headers = __assign({ "Content-Type": "application/json" }, newOptions.headers);
+                            }
+                        }
+                        crypto = this.crypto ||
+                            (this.otherOptions.securityKey ? getApiCrypto() : undefined);
+                        // 将参数进行aes加密
+                        if (newOptions.isCrypto === true || newOptions.isCrypto === "aes") {
+                            if (newOptions.data) {
+                                newOptions.data = (_b = crypto === null || crypto === void 0 ? void 0 : crypto.encrypt) === null || _b === void 0 ? void 0 : _b.call(crypto, JSON.stringify(newOptions.data));
+                            }
+                            if (newOptions.params) {
+                                newOptions.params = (_c = crypto === null || crypto === void 0 ? void 0 : crypto.encrypt) === null || _c === void 0 ? void 0 : _c.call(crypto, JSON.stringify(newOptions.params));
+                            }
+                        }
+                        // 将参数进行des加密
+                        if (newOptions.isCrypto === "des") {
+                            if (newOptions.data) {
+                                newOptions.data = (_d = crypto === null || crypto === void 0 ? void 0 : crypto.encrypt_des) === null || _d === void 0 ? void 0 : _d.call(crypto, JSON.stringify(newOptions.data));
+                            }
+                            if (newOptions.params) {
+                                newOptions.params = (_e = crypto === null || crypto === void 0 ? void 0 : crypto.encrypt_des) === null || _e === void 0 ? void 0 : _e.call(crypto, JSON.stringify(newOptions.params));
+                            }
+                        }
+                        return [2 /*return*/, this.instanceAxios(newOptions)];
                 }
-                newOptions.headers["Content-Type"] = "multipart/form-data";
-                newOptions.data = formData;
-            }
-            else {
-                newOptions.headers = __assign({ "Content-Type": "application/json" }, newOptions.headers);
-            }
-        }
-        // 数据加密处理 TODO:
-        // 将参数进行aes加密
-        if (newOptions.isCrypto === true || newOptions.isCrypto === "aes") {
-            if (newOptions.data) {
-                newOptions.data = (_c = (_b = this.crypto) === null || _b === void 0 ? void 0 : _b.encrypt) === null || _c === void 0 ? void 0 : _c.call(_b, JSON.stringify(newOptions.data));
-            }
-            if (newOptions.params) {
-                newOptions.params = (_e = (_d = this.crypto) === null || _d === void 0 ? void 0 : _d.encrypt) === null || _e === void 0 ? void 0 : _e.call(_d, JSON.stringify(newOptions.params));
-            }
-        }
-        // 将参数进行des加密
-        if (newOptions.isCrypto === "des") {
-            if (newOptions.data) {
-                newOptions.data = (_g = (_f = this.crypto) === null || _f === void 0 ? void 0 : _f.encrypt_des) === null || _g === void 0 ? void 0 : _g.call(_f, JSON.stringify(newOptions.data));
+            });
+        });
+    };
+    /**
+     * 推断密钥接口的请求前缀地址
+     * 绝对地址的请求取其origin 其他情况取实例的baseURL(同源场景为空串)
+     */
+    AxiosRequest.prototype.getSecurityKeyBaseURL = function (options) {
+        var url = options.url || "";
+        if (/^https?:\/\//i.test(url)) {
+            try {
+                return new URL(url).origin;
             }
-            if (newOptions.params) {
-                newOptions.params = (_j = (_h = this.crypto) === null || _h === void 0 ? void 0 : _h.encrypt_des) === null || _j === void 0 ? void 0 : _j.call(_h, JSON.stringify(newOptions.params));
+            catch (err) {
+                console.log(err);
             }
         }
-        return this.instanceAxios(newOptions);
+        return this.otherOptions.baseURL || "";
     };
     return AxiosRequest;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.97",
+  "version": "0.0.98",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/request.ts

@@ -7,6 +7,7 @@ import axios, {
 } from "axios";
 import { getPreToken, removeToken } from "./auth";
 import { Crypto } from "./crypto";
+import { initSecurityKeys, getApiCrypto } from "./securityKey";
 import { TOKEN_KEY } from "./constants";
 
 const defaultOptions: IOtherOptions = {
@@ -286,7 +287,7 @@ export class AxiosRequest {
   }
 
   // 实例方法
-  public request(options: IOptions) {
+  public async request(options: IOptions) {
     const { isFormData, isAuth = true, ...resetOptions } = options;
 
     const newOptions = resetOptions;
@@ -300,6 +301,20 @@ export class AxiosRequest {
       if (token) {
         newOptions.headers[this.tokenKey] = token;
       }
+      // 自动密钥模式：带token的请求顺带预热密钥 不阻塞当前请求
+      // 预热失败静默处理 真正需要密钥的请求会再走到等待逻辑并报错
+      if (this.otherOptions.securityKey) {
+        initSecurityKeys({
+          baseURL: this.getSecurityKeyBaseURL(options),
+        }).catch(() => {});
+      }
+    }
+
+    // 自动密钥模式：加密请求优先等待密钥就绪(外部已传入crypto实例时除外)
+    if (newOptions.isCrypto && !this.crypto && this.otherOptions.securityKey) {
+      await initSecurityKeys({
+        baseURL: this.getSecurityKeyBaseURL(options),
+      });
     }
 
     // 遍历params，将undefined值 转为null值
@@ -335,15 +350,17 @@ export class AxiosRequest {
     }
 
     // 数据加密处理 TODO:
+    // 优先使用外部传入的crypto实例 自动密钥模式下使用密钥管理器的实例
+    const crypto =
+      this.crypto ||
+      (this.otherOptions.securityKey ? getApiCrypto() : undefined);
     // 将参数进行aes加密
     if (newOptions.isCrypto === true || newOptions.isCrypto === "aes") {
       if (newOptions.data) {
-        newOptions.data = this.crypto?.encrypt?.(
-          JSON.stringify(newOptions.data),
-        );
+        newOptions.data = crypto?.encrypt?.(JSON.stringify(newOptions.data));
       }
       if (newOptions.params) {
-        newOptions.params = this.crypto?.encrypt?.(
+        newOptions.params = crypto?.encrypt?.(
           JSON.stringify(newOptions.params),
         );
       }
@@ -351,12 +368,12 @@ export class AxiosRequest {
     // 将参数进行des加密
     if (newOptions.isCrypto === "des") {
       if (newOptions.data) {
-        newOptions.data = this.crypto?.encrypt_des?.(
+        newOptions.data = crypto?.encrypt_des?.(
           JSON.stringify(newOptions.data),
         );
       }
       if (newOptions.params) {
-        newOptions.params = this.crypto?.encrypt_des?.(
+        newOptions.params = crypto?.encrypt_des?.(
           JSON.stringify(newOptions.params),
         );
       }
@@ -364,6 +381,22 @@ export class AxiosRequest {
 
     return this.instanceAxios(newOptions);
   }
+
+  /**
+   * 推断密钥接口的请求前缀地址
+   * 绝对地址的请求取其origin 其他情况取实例的baseURL(同源场景为空串)
+   */
+  private getSecurityKeyBaseURL(options: IOptions): string {
+    const url = options.url || "";
+    if (/^https?:\/\//i.test(url)) {
+      try {
+        return new URL(url).origin;
+      } catch (err) {
+        console.log(err);
+      }
+    }
+    return this.otherOptions.baseURL || "";
+  }
 }
 
 function transformData(data?: any): any {
@@ -442,6 +475,12 @@ export interface IOtherOptions {
   baseURL?: string;
   /** 加密实例方法 */
   crypto?: Crypto;
+  /**
+   * 开启自动密钥模式
+   * 开启后无需传crypto 加密请求会自动等待密钥就绪后加密
+   * 带token的请求会顺带预热密钥
+   */
+  securityKey?: boolean;
   /** 超时是否需要弹框 */
   isTimeoutConfirm?: boolean;
   /** 超时弹框提示内容 */