abler-api 1.0.27 → 1.0.29

package/dist/cjs/pp-util.js

@@ -230,7 +230,7 @@ async function checkRedis() {
 }
 async function initDb() {
   try {
-    dbUtil$1.config(conf$3, err$1);
+    await dbUtil$1.config(conf$3, err$1);
   } catch (e) {
     if (e.reason === 'bad decrypt') {
       e = new Error(t_f$3("解密数据库密码(%s)失败", conf$3.dbconn.dbpwd));
@@ -350,22 +350,22 @@ class apiUtil$2 {
    * @returns {*}
    */
   static extractParams(req) {
-    if (!req._requestParams) {
+    let params = req._requestParams;
+    if (!params) {
       const contentType = req.headers["content-type"] || "application/json";
       if (contentType.startsWith("multipart/form-data")) {
-        req._requestParams = new Object();
-        for (let k in req.body) {
-          req._requestParams[k] = req.body[k];
-        }
+        params = {
+          ...req.body
+        };
       } else {
         if (req.method === "POST" || req.method === "PUT") {
-          req._requestParams = req.body;
+          params = req.body;
         } else {
-          req._requestParams = req.query;
+          params = req.query;
         }
       }
       if (req.headers["content-type"] !== "application/json") {
-        const obj = req._requestParams;
+        const obj = params;
         for (let key in obj) {
           if (!obj.hasOwnProperty(key)) continue;
           let value = obj[key];
@@ -383,12 +383,23 @@ class apiUtil$2 {
           }
         }
       }
-      if (req.params) {
-        req._requestParams = Object.assign(req.params, req._requestParams);
+      if (params) {
+        if (req.params) {
+          params = {
+            ...params,
+            ...req.params
+          };
+        }
+        apiUtil$2.setParamsFunctions(params);
+      }
+      if (req.complete) {
+        req._requestParams = params;
+      } else {
+        // console.trace("提取请求参数时数据尚在传输中");
+        console.warn("提取请求参数时数据尚在传输中");
       }
-      apiUtil$2.setParamsFunctions(req._requestParams);
     }
-    return req._requestParams;
+    return params;
   }
   static extractTokenData(req) {
     if (req.tokenData) {
@@ -572,7 +583,7 @@ class apiUtil$2 {
 
   /**
    * 从请求参数中获取查询参数
-      * @param req
+   * @param req
    * @param res
    * @returns {*}
    */
@@ -674,25 +685,17 @@ class apiUtil$2 {
         token = token.substring(7);
       } else {
         //检查post的信息或者url查询参数或者头信息
-        token = req.headers[hnToken] || req.headers['x-access-token']; //向后兼容
+        token = req.headers['x-access-token'] || req.headers['access-token'] || req.headers[hnToken];
       }
       if (!token) {
-        let params = apiUtil$2.extractParams(req);
-        token = params[pnToken];
-        if (token) {
-          delete params[pnToken];
-        } else if (params.token) {
-          token = params.token; //向后兼容
-          delete params.token;
-        } else {
-          if (!noErr) {
-            // 如果没有token，则返回错误
-            console.log(errCfg.TOKEN_NEEDED);
-            if (res) {
-              res.send(errCfg.ERROR(errCfg.TOKEN_NEEDED));
-            } else {
-              throw errCfg.TOKEN_NEEDED;
-            }
+        // 不再从请求参数提取 token，避免过早访问 extractParams
+        if (!noErr) {
+          // 如果没有token，则返回错误
+          console.log(errCfg.TOKEN_NEEDED);
+          if (res) {
+            res.send(errCfg.ERROR(errCfg.TOKEN_NEEDED));
+          } else {
+            throw errCfg.TOKEN_NEEDED;
           }
         }
       }
@@ -745,7 +748,7 @@ class apiUtil$2 {
     const tokenKey = apiUtil$2.userTokenStoreKey(req.accessToken);
     const expireTime = apiUtil$2.tokenExpireTime(req);
     return await apiUtil$2.restoreTokenData(tokenKey, expireTime).then(async function (data) {
-      req.userInfo = apiUtil$2.setUserIdNo(data, data._idNo);
+      req.userInfo = apiUtil$2.setUserIdNo(data, data?._idNo || '');
       if (req.tokenValidater) await req.tokenValidater(req.userInfo, req);
       return true;
     }, async function (e) {
@@ -1210,6 +1213,7 @@ class apiUtil$2 {
   static async parametersOK(params) {
     return apiUtil$2.checkParametersOK(...arguments);
   }
+
   /**
    * 获取客户端IP地址
    * @param req
@@ -1647,7 +1651,7 @@ class apiUtil$2 {
     try {
       if (extractToken(req, res)) {
         await apiUtil$2.restoreTokenData(apiUtil$2.userTokenStoreKey(req.accessToken), apiUtil$2.tokenExpireTime(req)).then(function (data) {
-          req.userInfo = apiUtil$2.setUserIdNo(data, data._idNo);
+          req.userInfo = apiUtil$2.setUserIdNo(data, data?._idNo || '');
         }, function (e) {
 
           //no token

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -15,11 +15,11 @@
   "author": "peng_peng",
   "license": "ISC",
   "dependencies": {
-    "abler-db": "^1.0.34",
+    "abler-db": "^1.0.36",
     "abler-i18n": "^1.0.2",
-    "abler-messenger": "^1.0.25",
-    "abler-net": "^1.0.7",
-    "abler-util": "^1.0.7",
+    "abler-messenger": "^1.0.26",
+    "abler-net": "^1.0.8",
+    "abler-util": "^1.0.8",
     "basic-auth": "^2.0.1",
     "node-cron": "^3.0.1",
     "proxy-agent": "6.5.0",
@@ -43,5 +43,5 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2"
   },
-  "gitHead": "96aec2da186aeacf74d2b9c1bfd3479cd03fda3b"
+  "gitHead": "a17eac0a3c30f5af285a13ad319103a5dfc67e0b"
 }