q-koa 13.8.48 → 13.8.49

package/core/app.js

@@ -101,6 +101,26 @@ const connectDatabase = (database) => (config) => {
 const defaultConfig = require('./config')
 
 const is_dev = process.env.NODE_ENV !== 'production'
+
+// JWT 兜底配置（应用未配置 jwt 时使用），提为模块级常量避免每个请求重建对象
+const DEFAULT_JWT = {
+  secret: 'token',
+  tokenKey: 'token',
+  expiresIn: '200000000',
+  _whiteList: [],
+  whiteList: [
+    'find',
+    'administrator/login',
+    'administrator/checkLogin',
+    'user/checkLogin',
+    'user/login',
+    'user/register',
+    'common',
+    'good/search',
+    'category/tree',
+    'system',
+  ],
+}
 class APP {
   constructor(_config) {
     const config = _.defaultsDeep(_config, defaultConfig)
@@ -181,18 +201,13 @@ class APP {
     this.app.use(async (ctx, next) => {
       const { url, host, ip, method } = ctx.request
 
-      if (
-        ctx.request.header['user-agent'] &&
-        ctx.request.header['user-agent'].includes('Tencent Security')
-      ) {
+      const userAgent = ctx.request.header['user-agent'] || ''
+      if (userAgent.includes('Tencent Security')) {
         return ctx.ERROR('error')
       }
 
-      if (
-        ctx.request.header['user-agent'] &&
-        ctx.request.header['user-agent'].includes('Apache-HttpClient')
-      ) {
-        throw new Error(`error`)
+      if (userAgent.includes('Apache-HttpClient')) {
+        throw new Error('error')
       }
 
       if (this.config.blackList.includes(ip)) {
@@ -208,24 +223,7 @@ class APP {
       const { secret, whiteList, _whiteList, tokenKey, expiresIn } =
         ctx.app[appName] && ctx.app[appName].appConfig
           ? ctx.app[appName].appConfig.jwt
-          : {
-              secret: 'token',
-              tokenKey: 'token',
-              expiresIn: '200000000',
-              _whiteList: [],
-              whiteList: [
-                'find',
-                'administrator/login',
-                'administrator/checkLogin',
-                'user/checkLogin',
-                'user/login',
-                'user/register',
-                'common',
-                'good/search',
-                'category/tree',
-                'system',
-              ],
-            }
+          : DEFAULT_JWT
 
       /**
        *  挂在jwt解密方法
@@ -296,7 +294,12 @@ class APP {
 
     this.app.on('error', async (err, ctx) => {
       // AggregateError（Node 17+ DNS 双栈解析等场景）取第一个子错误作为实际错误
-      if (err && err.name === 'AggregateError' && Array.isArray(err.errors) && err.errors.length > 0) {
+      if (
+        err &&
+        err.name === 'AggregateError' &&
+        Array.isArray(err.errors) &&
+        err.errors.length > 0
+      ) {
         err = err.errors[0]
       }
       const { url } = ctx.request
@@ -333,9 +336,7 @@ class APP {
           ? this.config.includes[0]
           : this.config.includes[0].app
       if (!this.app[appName]) {
-        throw new Error(
-          `没有生成应用${this.config.includes[0]}，请检查config includes`
-        )
+        throw new Error(`没有生成应用${appName}，请检查config includes`)
       }
       this.server = this.app.listen(this.port, () => {
         console.log(
@@ -444,9 +445,7 @@ class APP {
     dirList = dirList.filter((item) => includeList.some((i) => i.app === item))
 
     let dbFlag = false
-    for (let i = 0; i < dirList.length; i++) {
-      const appName = dirList[i]
-
+    for (const appName of dirList) {
       console.log(
         chalk.green(`==================== 启动 ${appName} ====================`)
       )
@@ -587,16 +586,11 @@ class APP {
       } catch (e) {
         push({
           appName,
-          message: `${appName}启动失败：${e.message}`,
+          message: `${appName}数据库连接失败`,
         })
-        console.log(chalk.red(`${appName}启动失败，跳过该应用并继续启动后续应用`))
+        console.log(`${appName}数据库连接失败`)
         console.log(e)
-        // 清理可能已部分初始化的 app 对象，避免残留不完整状态
-        if (this.app[appName]) {
-          delete this.app[appName]
-        }
-        // 不抛出错误，跳过该应用的路由注册，继续启动后续应用
-        continue
+        throw new Error(e.message)
       }
       if (
         this.app[appName] &&
@@ -676,8 +670,7 @@ class APP {
       (item) => !excludesModel.includes(item)
     )
 
-    for (let i = 0; i < pluginDirResult.length; i++) {
-      const folder = pluginDirResult[i]
+    for (const folder of pluginDirResult) {
       const isFolder = fs
         .lstatSync(path.resolve(pluginDir, folder))
         .isDirectory()
@@ -780,8 +773,7 @@ class APP {
                   hookList = [...hookList, 'beforeBulkDestroy']
                 }
                 let reduceHook = {}
-                for (let i = 0; i < hookList.length; i++) {
-                  const hook = hookList[i]
+                for (const hook of hookList) {
                   reduceHook = {
                     ...reduceHook,
                     [hook]: (target, t) => {
@@ -984,8 +976,7 @@ class APP {
       },
       this.app[appName]
     )
-    for (let i = 0; i < Object.keys(this.app[appName].model).length; i++) {
-      const model = Object.keys(this.app[appName].model)[i]
+    for (const model of modelList) {
 
       // if (!this.app[appName].include || !this.app[appName].include[model]) {
       //   this.app[appName] = _.defaultsDeep(
@@ -1166,8 +1157,8 @@ class APP {
           'controller',
           'afterExecute',
         ]
-        for (let i = 0; i < hooksList.length; i++) {
-          if (_.get(app, `${appName}.${hooksList[i]}.${controller}.${fn}`)) {
+        for (const hook of hooksList) {
+          if (_.get(app, `${appName}.${hook}.${controller}.${fn}`)) {
             // if (hooksList[i] === 'controller') {
             //   process.once('unhandledRejection', (reason, promise) => {
             //     if (
@@ -1186,7 +1177,7 @@ class APP {
             //     }
             //   })
             // }
-            await app[appName][hooksList[i]][controller][fn](ctx)
+            await app[appName][hook][controller][fn](ctx)
           }
         }
 
@@ -1214,9 +1205,9 @@ class APP {
         }
 
         const hooksList = ['beforeValidate', 'validate', 'afterValidate']
-        for (let i = 0; i < hooksList.length; i++) {
-          if (_.get(app, `${appName}.${hooksList[i]}.${controller}.${fn}`)) {
-            await app[appName][hooksList[i]][controller][fn](ctx)
+        for (const hook of hooksList) {
+          if (_.get(app, `${appName}.${hook}.${controller}.${fn}`)) {
+            await app[appName][hook][controller][fn](ctx)
           }
         }
         if (
@@ -2275,7 +2266,12 @@ class APP {
             })
             .catch((e) => {
               // AggregateError 取第一个子错误作为实际错误
-              if (e && e.name === 'AggregateError' && Array.isArray(e.errors) && e.errors.length > 0) {
+              if (
+                e &&
+                e.name === 'AggregateError' &&
+                Array.isArray(e.errors) &&
+                e.errors.length > 0
+              ) {
                 e = e.errors[0]
               }
               console.log('错误', e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.48",
+  "version": "13.8.49",
   "description": "",
   "main": "index.js",
   "scripts": {