abler-api 0.1.14 → 0.1.17

package/dist/cjs/pp-util.js

@@ -3,12 +3,14 @@
 var require$$0 = require('crypto');
 var require$$1 = require('abler-util');
 var require$$2 = require('abler-db');
+var require$$3 = require('abler-net');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
+var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
 
 const crypto = require$$0__default["default"];
 const ppUtil$1 = require$$1__default["default"].ppUtil;
@@ -16,6 +18,7 @@ const {
   dbUtil,
   kvStorage
 } = require$$2__default["default"];
+const netUtil = require$$3__default["default"];
 let conf, appSetting, err, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
@@ -74,26 +77,6 @@ class apiUtil$1 {
   } //#endregion
   //#region ===== API服务相关工具
 
-  /**
-   * 获取客户端IP地址
-   * @param req
-   * @returns {*|string|string}
-   */
-
-
-  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 (ip.indexOf(",") >= 0) {
-      ip = ip.split(',')[0];
-    }
-
-    if (ip.indexOf(":") >= 0) {
-      ip = ip.substring(ip.lastIndexOf(':') + 1);
-    }
-
-    return ip;
-  }
   /**
    * 从请求中解出数据，包括路径参数、查询参数和Body
    * @param req
@@ -532,7 +515,7 @@ class apiUtil$1 {
     req.accessToken = req.accessToken || apiUtil$1.extractToken(req);
     const tokenKey = apiUtil$1.userTokenStoreKey(req.accessToken);
     const expireTime = apiUtil$1.tokenExpireTime(req);
-    await apiUtil$1.restoreTokenData(tokenKey, expireTime).then(async function (data) {
+    return await apiUtil$1.restoreTokenData(tokenKey, expireTime).then(async function (data) {
       req.userInfo = apiUtil$1.setUserIdNo(data, data._idNo);
       if (req.tokenValidater) await req.tokenValidater(req.userInfo, req);
       return true;
@@ -1038,6 +1021,148 @@ class apiUtil$1 {
     }
 
     return Promise.resolve(paramSufix);
+  }
+  /**
+   * 获取客户端IP地址
+   * @param req
+   * @returns {*|string|string}
+   */
+
+
+  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 (ip.indexOf(",") >= 0) {
+      ip = ip.split(',')[0];
+    }
+
+    if (ip.indexOf(":") >= 0) {
+      ip = ip.substring(ip.lastIndexOf(':') + 1);
+    }
+
+    return ip;
+  }
+  /**
+   * 获取与本机一起提供服务的所有主机
+   * @param params
+   * @returns {{port: (number|number), hosts: [string]}}
+   */
+
+
+  static getEnvHosts(params) {
+    configNeeded();
+    let envType = ppUtil$1.getEnvType();
+    let x = conf.envHosts[envType] || {
+      hosts: ["localhost"]
+    };
+    let port = +params.port || 8443;
+    return {
+      hosts: x.hosts,
+      port: x.port || port
+    };
+  }
+  /**
+   * 检查指定的host和发送请求的ip是不是自己的ip
+   * @param host
+   * @param req
+   * @returns {Promise<*>}
+   */
+
+
+  static async hostIsMySelf(host, req) {
+    let clientIp = apiUtil$1.getClientIp(req);
+    return getMyIp({
+      hosts: [host, clientIp]
+    });
+  }
+  /**
+   * 检查是否应该把请求转发到其它服务器，若是则转发
+   * @param options
+   * @returns {Promise<boolean>}
+   */
+
+
+  static async checkForwardsHost(options) {
+    configNeeded();
+    const params = options.replacements;
+    const myEnvHosts = apiUtil$1.getEnvHosts(params);
+    const myIp = ppUtil$1.getMyIp();
+    const host = params.host || myIp;
+    if (!myEnvHosts.hosts.contains(host)) throw [err.ACCESS_REFUSED, `环境${conf.envId}貌似无此主机：${params.host}`];
+
+    if (!apiUtil$1.hostIsMySelf(host, options._res.req)) {
+      let result = await apiUtil$1.forwardsTo(host, myEnvHosts.port, params, options._res.req, myIp);
+
+      options._res.send(result);
+
+      return true;
+    }
+
+    return false;
+  }
+  /**
+   * 将收到的请求转发到另一台主机
+   * @param anotherIp
+   * @param port
+   * @param params
+   * @param req
+   * @param lanClient
+   * @returns {Promise<*>}
+   */
+
+
+  static async forwardsTo(anotherIp, port, params, req, lanClient) {
+    let url = anotherIp.indexOf("://") > 0 ? anotherIp : `${port === 443 ? "https" : "http"}://${anotherIp}:${port}${req.originalUrl}`;
+
+    if (url.indexOf("?") > 0) {
+      url = url.substring(0, url.indexOf("?"));
+    }
+
+    let reqOptions = {
+      method: req.method,
+      url: url,
+      data: params
+    };
+    let result = await netUtil.apiRequest(reqOptions);
+
+    if (result.status !== 200) {
+      console.log(`访问 ${reqOptions.url} 出错`, result.status, result.res.statusMessage);
+      throw [err.EXCEPTION, `[${result.status}] - ${result.res.statusMessage}`];
+    }
+
+    return result.data;
+  }
+  /**
+   * 解析配置项路径
+   * @param keyPath
+   * @returns {{parent: null, parentKey: string, value, key: string}}
+   */
+
+
+  static parseCfgPath(keyPath) {
+    let keys = Array.isArray(keyPath) ? keyPath : keyPath.split(".");
+    let parentKey = "";
+    let key = "config";
+    let value = conf;
+    let parent = null;
+
+    for (let i = 0; i < keys.length; i++) {
+      parent = value;
+      parentKey += (parentKey ? "." : "") + key;
+      key = keys[i];
+      value = parent[key];
+
+      if (value === undefined) {
+        throw [err.INVALID_PARAM, `无此配置项: ${key}`];
+      }
+    }
+
+    return {
+      parent,
+      parentKey,
+      key,
+      value
+    };
   } //#endregion
   //region ====中间件
 
@@ -1049,11 +1174,12 @@ class apiUtil$1 {
   static async $checkToken(req, res, next) {
     try {
       await apiUtil$1.checkRequestToken(req);
-      return true;
+      await next();
     } catch (e) {
       res.send(err.ERROR(e));
-      return false;
     }
+
+    return false;
   }
   /**
    * 检查令牌，若存在则将其用户信息置入req
@@ -1207,7 +1333,7 @@ class apiUtil$1 {
 
       req.isApiCall = true;
       req.tokenData = p;
-      apiUtil$1.$checkApiKeyOld(req, res, next);
+      return apiUtil$1.$checkApiKeyOld(req, res, next);
     }).catch(e => {
       apiUtil$1.sendOrRedirect(req, res, apiUtil$1.spoApiFail(err.TOKEN_INVALID, req));
     });
@@ -1244,6 +1370,55 @@ class apiUtil$1 {
       });
     }
   } //#endregion
+  //region ====一些通用服务功能
+
+  /**
+   * 获取配置数据
+   * @param options
+   * @returns {Promise<boolean|*>}
+   */
+  // api/config/appSetting.ossEnabled
+
+
+  static async getConfigValue(options) {
+    configNeeded();
+    const params = options.replacements;
+    let item = params.item;
+    delete params.item;
+    if (await apiUtil$1.checkForwardsHost(options)) return true;
+    let c = apiUtil$1.parseCfgPath(item);
+    delete c.parent;
+    c.host = ppUtil$1.getMyIp();
+    return c;
+  }
+  /**
+   * 设置配置数据
+   * @param options
+   * @returns {Promise<*>}
+   */
+
+
+  static async setConfigValue(options) {
+    configNeeded();
+    const params = options.replacements;
+    let item = params.item;
+    delete params.item; // if (await checkForwardsHost(options))
+    //     return true;
+
+    await apiUtil$1.parametersOK(params, "value");
+    let c = apiUtil$1.parseCfgPath(item);
+
+    if (typeof c.value === "object") {
+      throw [err.ACCESS_REFUSED, `暂不支持修改复杂配置`];
+    } // c.oldValue = c.value;
+
+
+    c.newValue = params.value;
+    c.parent[c.key] = c.newValue;
+    delete c.parent;
+    c.host = ppUtil$1.getMyIp();
+    return c; // 应用层自行处理多机同步
+  } //#endregion
 
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.14",
+  "version": "0.1.17",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -16,7 +16,8 @@
   "dependencies": {
     "q": "^1.5.1",
     "abler-util": ">=0.1.1",
-    "abler-db": ">=0.1.1"
+    "abler-db": ">=0.1.1",
+    "abler-net": ">=0.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.18.5",