abler-api 0.1.60 → 0.1.63

package/dist/cjs/pp-util.js

@@ -26,8 +26,8 @@ const crypto = require$$0__default["default"];
 const getBasicAuthorization = require$$1__default["default"];
 const ppUtil$4 = require$$2__default["default"].ppUtil;
 const {
-  dbUtil,
-  kvStorage
+  dbUtil: dbUtil$1,
+  kvStorage: kvStorage$1
 } = require$$3__default["default"];
 const {
   netUtil: netUtil$1
@@ -465,8 +465,14 @@ class apiUtil$2 {
     configNeeded();
 
     if (!req.accessToken) {
-      //检查post的信息或者url查询参数或者头信息
-      let token = req.headers[hnToken] || req.headers['x-access-token']; //向后兼容
+      let token = req.header('Authorization');
+
+      if (token && token.startsWith('Bearer ')) {
+        token = token.substring(7);
+      } else {
+        //检查post的信息或者url查询参数或者头信息
+        token = req.headers[hnToken] || req.headers['x-access-token']; //向后兼容
+      }
 
       if (!token) {
         let params = apiUtil$2.extractParams(req);
@@ -669,17 +675,17 @@ class apiUtil$2 {
       tokenData.certPublicKey = req.certPublicKey;
     }
 
-    await kvStorage.storeObj(token, tokenData, timeout);
+    await kvStorage$1.storeObj(token, tokenData, timeout);
 
     if (dataId) {
-      await kvStorage.restoreValue("token_" + dataId).then(async oldToken => {
+      await kvStorage$1.restoreValue("token_" + dataId).then(async oldToken => {
         if (oldToken !== token) {
-          await kvStorage.unstoreValue(oldToken);
+          await kvStorage$1.unstoreValue(oldToken);
         } else {
           dataId = "";
         }
       }, function (e) {}).then(async () => {
-        if (dataId !== "") await kvStorage.storeValue("token_" + dataId, token, timeout);
+        if (dataId !== "") await kvStorage$1.storeValue("token_" + dataId, token, timeout);
       });
     }
   }
@@ -692,7 +698,7 @@ class apiUtil$2 {
 
 
   static async restoreTokenData(accessToken, expireTime) {
-    return await kvStorage.restoreObj(accessToken, expireTime);
+    return await kvStorage$1.restoreObj(accessToken, expireTime);
   }
   /**
    * 创建 API 调用记录
@@ -705,7 +711,7 @@ class apiUtil$2 {
   static createApiCallRec(tokenData, req) {
     if (!req.apiCallRec) {
       if (req.apiCallRecId) {
-        return dbUtil.dbQueryOne(dbSql.loadApiUsage, {
+        return dbUtil$1.dbQueryOne(dbSql.loadApiUsage, {
           replacements: {
             id: req.apiCallRecId
           }
@@ -780,7 +786,7 @@ class apiUtil$2 {
 
 
   static async queryCompanyInfo(companyId, nullable) {
-    return await dbUtil.dbQueryOne(dbSql.queryCompanyInfo, {
+    return await dbUtil$1.dbQueryOne(dbSql.queryCompanyInfo, {
       companyId
     }, nullable);
   }
@@ -799,7 +805,7 @@ class apiUtil$2 {
       certSpare: null,
       certSpareId: ''
     };
-    return await dbUtil.dbQueryOne(dbSql.queryCertDataByOwner, {
+    return await dbUtil$1.dbQueryOne(dbSql.queryCertDataByOwner, {
       ownerId: companyId,
       applyId: "company"
     }, false).then(certRec => {
@@ -810,7 +816,7 @@ class apiUtil$2 {
 
       certInfo.certLiving = pubKeyData;
       certInfo.certLivingId = certRec.id;
-      return dbUtil.dbQueryOne(dbSql.queryCertDataByOwner, {
+      return dbUtil$1.dbQueryOne(dbSql.queryCertDataByOwner, {
         ownerId: companyId,
         applyId: "company_spare"
       }, false).then(certRec1 => {
@@ -930,14 +936,14 @@ class apiUtil$2 {
           if (verifyOK) {
             // 备用证书验证成功了，则将备用证书替换为正式证书
             console.log(`公司(${tokenData.apiKey})备用证书验签成功，正式启用...`);
-            return dbUtil.dbTrans(trans => {
-              let p1 = dbUtil.dbExec(dbSql.deleteCertRecById, {
+            return dbUtil$1.dbTrans(trans => {
+              let p1 = dbUtil$1.dbExec(dbSql.deleteCertRecById, {
                 replacements: {
                   id: tokenData.certLivingId
                 },
                 transaction: trans
               });
-              let p2 = dbUtil.dbExec(dbSql.spareCertToLiving, {
+              let p2 = dbUtil$1.dbExec(dbSql.spareCertToLiving, {
                 replacements: {
                   id: tokenData.certSpareId
                 },
@@ -1021,7 +1027,7 @@ class apiUtil$2 {
 
 
   static tokenDataExist(token) {
-    return kvStorage.stored(token);
+    return kvStorage$1.stored(token);
   }
 
   static parametersOK(params) {
@@ -1572,7 +1578,12 @@ var ppUtilApi = apiUtil$2;
 const fs = require$$5__default["default"];
 const path = require$$1__default$1["default"];
 const ppUtil$3 = require$$2__default["default"].ppUtil;
-const ppRedis = require$$3__default["default"].ppRedis;
+const {
+  dbUtil,
+  ppRedis,
+  kvStorage,
+  redisSimulator
+} = require$$3__default["default"];
 let conf$2, err$1; // const dbCheck = require('../dbupdate/dd-version');
 
 /**
@@ -1604,10 +1615,11 @@ class preconditions$1 {
     return preconditions$1;
   }
 
-  static addChecker(checkFunc, args) {
+  static addChecker(checkFunc, args, blocked) {
     preconditions$1.checkFunctions.push({
       check: checkFunc,
-      args: args
+      args: args,
+      blocked: blocked
     });
     return preconditions$1;
   }
@@ -1620,17 +1632,30 @@ class preconditions$1 {
 
       preconditions$1.messages.push(`${preconditions$1.messages.length + 1}. ${msg}`);
     }
+
+    return msg;
   }
 
   static async checkAll() {
-    for (let i = 0; i < preconditions$1.checkFunctions.length; i++) {
-      const f = preconditions$1.checkFunctions[i]; // preconditions.addCheckPromise(f.check(f.args));
+    // 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();
 
-      preconditions$1.pushMessage(await f.check(f.args));
-    }
+      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]);
+    // }
 
-    for (let i = 0; i < preconditions$1.checkPromises.length; i++) {
-      preconditions$1.pushMessage(await preconditions$1.checkPromises[i]);
+
+    while (preconditions$1.checkPromises.length > 0) {
+      const p = preconditions$1.checkPromises.shift();
+      preconditions$1.pushMessage(await p);
     }
 
     let text = "";
@@ -1665,6 +1690,22 @@ class preconditions$1 {
 
   static async checkRedis() {
     return await checkRedis();
+  }
+  /**
+   * 初始化数据库连接
+   */
+
+
+  static async initDb() {
+    return await initDb();
+  }
+  /**
+   * 初始化键值对存储器
+   */
+
+
+  static async initKvStorage(dbSql) {
+    return await initKvStorage(dbSql);
   } // /**
   //  * 数据库可用性及业务数据版本版本检查
   //  */
@@ -1712,7 +1753,7 @@ async function checkExEnvSetting(loadjs) {
 
       let msg = await createEnvSettingFile(fileName, envSettingEx);
 
-      if (!msg) {
+      if (msg) {
         return msg;
       }
 
@@ -1746,6 +1787,36 @@ async function checkRedis() {
 
 }
 
+async function initDb() {
+  try {
+    dbUtil.config(conf$2, err$1);
+  } catch (e) {
+    if (e.reason === 'bad decrypt') {
+      e = new Error(`解密数据库密码(${conf$2.dbconn.dbpwd})失败`);
+    } // if (e.reason === 'bad decrypt') {
+    //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
+    // }
+
+
+    return `初始化数据库连接失败(${e.message})`;
+  }
+}
+
+async function initKvStorage(dbSql) {
+  try {
+    kvStorage.config(conf$2, err$1);
+
+    if (!conf$2.redis.enabled) {
+      kvStorage.setRedis(new redisSimulator(dbSql));
+    }
+  } catch (e) {
+    // if (e.reason === 'bad decrypt') {
+    //     e = new Error(`解密Redis密码(${conf.redis.password})失败`);
+    // }
+    return `初始化键值对存储器失败(${e.message})`;
+  }
+}
+
 var ppPrecond = preconditions$1;
 
 // 若 redis 可用，则使用基于 redis 的消息订阅发布系统

package/package.json

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