abler-api 0.1.43 → 0.1.45

package/dist/cjs/pp-util.js

@@ -1,10 +1,11 @@
 'use strict';
 
 var require$$0 = require('crypto');
-var require$$1 = require('abler-util');
-var require$$2 = require('abler-db');
-var require$$3 = require('abler-net');
-var require$$4 = require('fs');
+var require$$1 = require('basic-auth');
+var require$$2 = require('abler-util');
+var require$$3 = require('abler-db');
+var require$$4 = require('abler-net');
+var require$$5 = require('fs');
 var require$$1$1 = require('path');
 var require$$1$2 = require('abler-messenger');
 var require$$0$1 = require('node-cron');
@@ -16,20 +17,22 @@ var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
+var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 
 const crypto = require$$0__default["default"];
-const ppUtil$4 = require$$1__default["default"].ppUtil;
+const getBasicAuthorization = require$$1__default["default"];
+const ppUtil$4 = require$$2__default["default"].ppUtil;
 const {
   dbUtil,
   kvStorage
-} = require$$2__default["default"];
+} = require$$3__default["default"];
 const {
   netUtil: netUtil$1
-} = require$$3__default["default"];
-const fs$1 = require$$4__default["default"];
+} = require$$4__default["default"];
+const fs$1 = require$$5__default["default"];
 let conf$3, appSetting$1, err$2, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
@@ -45,7 +48,10 @@ class apiUtil$2 {
   static debugFlag = ppUtil$4.newGuid(); //应用必须设置，否则谁也不知道是啥
 
   static testFlag = ppUtil$4.newGuid();
-  static envId_dev = "?"; // static apiCallRecSaver;
+  static envId_dev = "?";
+  static _validateBasicAuth = function (userName, password) {
+    throw new Error('未设置基本验证函数');
+  }; // static apiCallRecSaver;
 
   static config(appConfig, appErrCfg, appDbSql) {
     ppUtil$4.config(appConfig, appErrCfg);
@@ -1399,6 +1405,34 @@ class apiUtil$2 {
         return false;
       });
     }
+  }
+  /**
+   * 基本验证，应用系统应该预先设置验证函数 _validateBasicAuth(userName, password)
+   * @param req
+   * @param res
+   * @param next
+   * @returns {Promise<*>}
+   */
+
+
+  static async $basicAuth(req, res, next) {
+    try {
+      const authorization = getBasicAuthorization(req);
+
+      if (!authorization) {
+        res.set('WWW-Authenticate', 'Basic realm=need username and password');
+        return res.sendStatus(401);
+      }
+
+      if (!apiUtil$2._validateBasicAuth(authorization.name, authorization.pass)) {
+        res.set('WWW-Authenticate', 'Basic realm=invalid username or password');
+        return res.sendStatus(401);
+      }
+    } catch (e) {
+      return res.send(errCfg.ERROR(e));
+    }
+
+    return next();
   } //#endregion
   //region ====一些通用服务功能
 
@@ -1483,10 +1517,10 @@ function configNeeded() {
 
 var ppUtilApi = apiUtil$2;
 
-const fs = require$$4__default["default"];
+const fs = require$$5__default["default"];
 const path = require$$1__default$1["default"];
-const ppUtil$3 = require$$1__default["default"].ppUtil;
-const ppRedis = require$$2__default["default"].ppRedis;
+const ppUtil$3 = require$$2__default["default"].ppUtil;
+const ppRedis = require$$3__default["default"].ppRedis;
 let conf$2, err$1; // const dbCheck = require('../dbupdate/dd-version');
 
 /**
@@ -1663,11 +1697,11 @@ var ppPrecond = preconditions$1;
 
 const {
   ppUtil: ppUtil$2
-} = require$$1__default["default"];
+} = require$$2__default["default"];
 const RedisMessenger = require$$1__default$2["default"];
 const {
   netUtil
-} = require$$3__default["default"];
+} = require$$4__default["default"];
 let conf$1;
 
 class commonMessenger$2 {
@@ -1766,7 +1800,7 @@ var ppMessengerEx = commonMessenger$2;
 const CRON = require$$0__default$1["default"];
 const {
   ppUtil: ppUtil$1
-} = require$$1__default["default"];
+} = require$$2__default["default"];
 const apiUtil$1 = ppUtilApi;
 const commonMessenger$1 = ppMessengerEx;
 const MT_SCHEDULE_STATE = 'schedule-state',
@@ -1786,12 +1820,6 @@ class schedule$1 {
    */
 
   static async registerTask(taskName, taskCaption, cronExp, taskFunc, autoStart) {
-    if (!conf) {
-      ppUtil$1.configNeeded();
-      conf = ppUtil$1.appConfig;
-      err = ppUtil$1.appErrCfg;
-    }
-
     if (!this.envAllowed()) return {};
     let task = this.findTask(taskName);
 
@@ -2020,6 +2048,12 @@ class schedule$1 {
 
 
   static envAllowed() {
+    if (!conf) {
+      ppUtil$1.configNeeded();
+      conf = ppUtil$1.appConfig;
+      err = ppUtil$1.appErrCfg;
+    }
+
     let enabled = // PM2配置中指定了环境变量 SCHEDULE_ENABLED
     !!process.env.SCHEDULE_ENABLED // 如果PM2启动了多个进程，则只在第一个进程执行
     && process.env.NODE_APP_INSTANCE === '0'; // 如果有多台服务器，则只在第一台执行

package/package.json

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