abler-api 0.1.66 → 0.1.68

package/dist/cjs/pp-util.js

@@ -1083,17 +1083,21 @@ class apiUtil$2 {
 
 
   static getClientIp(req) {
-    let ip = req.headers["x-real-ip"] || req.headers["x-true-ip"] || req.headers['x-forwarded-for'] || req.headers['x-forward-for'] || req.connection.remoteAddress || req.socket.remoteAddress || req.headers['host'] || ""; // console.log("Request IP:", ip, "req: ", req);
+    if (!req.hasOwnProperty("clientIp")) {
+      let ip = req.headers["x-real-ip"] || req.headers["x-true-ip"] || req.headers['x-forwarded-for'] || req.headers['x-forward-for'] || req.connection.remoteAddress || req.socket.remoteAddress || req.headers['host'] || ""; // console.log("Request IP:", ip, "req: ", req);
 
-    if (ip.indexOf(",") >= 0) {
-      ip = ip.split(',')[0];
-    }
+      if (ip.indexOf(",") >= 0) {
+        ip = ip.split(',')[0];
+      }
+
+      if (ip.indexOf(":") >= 0) {
+        ip = ip.substring(ip.lastIndexOf(':') + 1);
+      }
 
-    if (ip.indexOf(":") >= 0) {
-      ip = ip.substring(ip.lastIndexOf(':') + 1);
+      req.clientIp = ip;
     }
 
-    return ip;
+    return req.clientIp;
   }
   /**
    * 获取与本机一起提供服务的所有主机
@@ -1639,25 +1643,29 @@ class preconditions$1 {
   }
 
   static async checkAll() {
-    // for (let i = 0; i < preconditions.checkFunctions.length; i++) {
-    //     const f = preconditions.checkFunctions[i];
-    //     // preconditions.addCheckPromise(f.check(f.args));
-    //     preconditions.pushMessage(await f.check(f.args));
-    // }
-    while (preconditions$1.checkFunctions.length > 0) {
-      const f = preconditions$1.checkFunctions.shift();
+    try {
+      // for (let i = 0; i < preconditions.checkFunctions.length; i++) {
+      //     const f = preconditions.checkFunctions[i];
+      //     // preconditions.addCheckPromise(f.check(f.args));
+      //     preconditions.pushMessage(await f.check(f.args));
+      // }
+      while (preconditions$1.checkFunctions.length > 0) {
+        const f = preconditions$1.checkFunctions.shift();
 
-      if (preconditions$1.pushMessage(await f.check(f.args)) && f.blocked) {
-        break;
-      }
-    } // for (let i = 0; i < preconditions.checkPromises.length; i++) {
-    //     preconditions.pushMessage(await preconditions.checkPromises[i]);
-    // }
+        if (preconditions$1.pushMessage(await f.check(f.args)) && f.blocked) {
+          break;
+        }
+      } // for (let i = 0; i < preconditions.checkPromises.length; i++) {
+      //     preconditions.pushMessage(await preconditions.checkPromises[i]);
+      // }
 
 
-    while (preconditions$1.checkPromises.length > 0) {
-      const p = preconditions$1.checkPromises.shift();
-      preconditions$1.pushMessage(await p);
+      while (preconditions$1.checkPromises.length > 0) {
+        const p = preconditions$1.checkPromises.shift();
+        preconditions$1.pushMessage(await p);
+      }
+    } catch (e) {
+      preconditions$1.pushMessage(e.message);
     }
 
     let text = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",