abler-api 1.0.80 → 1.0.81

package/dist/cjs/pp-util.js

@@ -1623,7 +1623,7 @@ class apiUtil$2 {
       return apiUtil$2.apiFail(e, req);
     }
   }
-  static async restoreAppInfo(apiKey, req) {
+  static async restoreOrLoadAppInfo(apiKey, req) {
     let appInfo = await apiUtil$2.restoreObj(`${this.appAsPrefix}App_${apiKey}`, appSetting.tokenExpireTime);
     if (!appInfo) {
       appInfo = await dbUtil.dbQueryOneAndUnstringify(conf$2.dbSql.APP_QUERY, {
@@ -1631,7 +1631,7 @@ class apiUtil$2 {
       }, "exData");
       if (appInfo) {
         // await generateCek(appInfo);
-        await kvStorage.storeObj(`cbpApp_${appInfo.apiKey}`, appInfo, appSetting.tokenExpireTime);
+        await kvStorage.storeObj(`${this.appAsPrefix}App_${apiKey}`, appInfo, appSetting.tokenExpireTime);
       }
     }
     // if (appInfo && !appInfo.cek && appSetting.e2eEncryptionNeeded) {
@@ -1653,7 +1653,7 @@ class apiUtil$2 {
         encryptedContent: ''
       }
     };
-    const appInfo = await this.restoreAppInfo(params.apiKey, options._res.req);
+    const appInfo = await this.restoreOrLoadAppInfo(params.apiKey, options._res.req);
     if (!appInfo) {
       throw [errCfg.ACCESS_REFUSED, t_f$2("apiKey (%s) 无效", params.apiKey)];
     }
@@ -1702,16 +1702,34 @@ class apiUtil$2 {
   }
   static async reqAppInfoNeeded(req) {
     if (!req.appInfo) {
-      let apiKey = req.headers["api-key"] || req.leInfo?.apiKey || req.userInfo?.apiKey;
-      if (!apiKey) {
-        throw [errCfg.ACCESS_REFUSED, t("必须在请求头中设置api-key")];
-      }
-      req.appInfo = await this.restoreAppInfo(apiKey, req);
+      const apiKey = this.extractApiKey(req);
+      req.appInfo = await this.restoreOrLoadAppInfo(apiKey, req);
       if (!req.appInfo) {
         throw [errCfg.ACCESS_REFUSED, t_f$2("api-key (%s) 无效", apiKey)];
       }
     }
   }
+  static extractApiKey(req, noErr) {
+    if (!req.apiKey) {
+      let apiKey = req.headers['x-api-key'] || req.headers['api-key'] || req.leInfo?.apiKey || req.userInfo?.apiKey;
+      if (!apiKey) {
+        if (noErr) return;
+        throw [errCfg.ACCESS_REFUSED, t_f$2("必须在请求头中设置api-key")];
+      }
+
+      // 不能用IP作为客户端主机识别，因为一台主机常常会有多个IP，而每次请求的IP可能会发生变化
+      // 用户在 apiKey 加后缀 @xx 来区分同一ApiKey的不同客户端(服务器主机/进程)，或者在请求头中增加 x-api-client-id 来设置客户端标识
+      if (apiKey.includes("@")) {
+        const two = apiKey.split("@");
+        apiKey = two[0];
+        req.apiClientId = two[1];
+      } else {
+        req.apiClientId = req.headers['x-api-client-id'] || req.headers['api-client-id'];
+      }
+      req.apiKey = apiKey;
+    }
+    return req.apiKey;
+  }
   static async verifyApiSignature(req) {
     if (req.appInfo) {
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "1.0.80",
+  "version": "1.0.81",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -23,5 +23,5 @@
     "basic-auth": "^2.0.1",
     "node-cron": "^3.0.1"
   },
-  "gitHead": "24a18765761c03e679c089ea9c0c6eb255ea95e6"
+  "gitHead": "aa1ffa76c3eedf9ec6b343d5b32518a86f7bdfaf"
 }