q-koa 13.8.58 → 13.8.60

package/core/app.js

@@ -458,154 +458,88 @@ class APP {
     })
     dirList = dirList.filter((item) => includeList.some((i) => i.app === item))
 
-    let dbFlag = false
-    for (const appName of dirList) {
-      console.log(
-        chalk.green(`==================== 启动 ${appName} ====================`)
-      )
-      const routerConfig = {
-        prefix: `/${appName}`,
-      }
-      const router = new Router(routerConfig)
-      Serve(
-        path.resolve(
-          __dirname,
-          `${rootDirectory}/${APP_DIR}/${appName}/public`
-        ),
-        router
-      )
-
-      const { push } = require('./file/plugins/log/service')
+    const { push } = require('./file/plugins/log/service')
+
+    // 所有 app 共用同一份 redis 配置，全局只连接一对 client+subscriber 供各 app 复用，
+    // 避免每个 app 各自建一套连接（2N 条连接 -> 2 条）
+    let sharedRedisClient = null
+    let sharedSubscriber = null
+    let redisError = null
+    if (
+      this.config.redis &&
+      this.config.redis.host &&
+      this.config.redis.port
+    ) {
       try {
-        const target = includeList.find((i) => i.app === appName)
-        const dbName =
-          (target ? target.db : '') || this.config.db.name || appName
-        const db = connectDatabase(dbName)(this.config.db)
-        if (!is_dev) {
-          if (!dbFlag) {
-            console.log(chalk.green(`${appName}检查数据库${dbName}`))
-            await db.authenticate()
-            dbFlag = true
-          }
-        } else {
-          console.log(chalk.green(`${appName}检查数据库${dbName}`))
-          await db.authenticate()
-        }
-        const configPath = `${rootDirectory}/${APP_DIR}/${appName}/config.js`
-        const configFile = path.resolve(__dirname, configPath)
-        const configExist = fs.existsSync(configFile)
-
-        if (
-          this.config.redis &&
-          this.config.redis.host &&
-          this.config.redis.port
-        ) {
-          let subscriber
-          let client
-          try {
-            client = redis.createClient({
-              socket: {
-                host: this.config.redis.host,
-                port: this.config.redis.port,
-                reconnectStrategy: false,
-              },
-              ...(this.config.redis.database
-                ? {
-                    database: this.config.redis.database,
-                  }
-                : {}),
-            })
-
-            client.on('error', (err) => console.log('Redis Client Error', err))
-
-            await client.connect()
-
-            subscriber = client.duplicate()
-            await subscriber.connect()
-
-            if (!is_dev) {
-              push({
-                appName,
-                message: `${appName}连接redis成功，${this.config.ip}:${this.port}`,
-              })
-            }
-          } catch (e) {
-            client = null
-
-            push({
-              appName,
-              message: `${appName}连接redis失败，${e.message}`,
-            })
-          }
-
-          this.app[appName] = {
-            sequelize: db,
-            ...(client
-              ? {
-                  redisClient: client,
-                  subscriber,
-                }
-              : {}),
-            appConfig: _.defaultsDeep(
-              configExist ? require(path.resolve(__dirname, configPath)) : {},
-              this.config.app,
-              { appName, ip: this.config.ip, port: this.port }
-            ),
-          }
-        } else {
-          this.app[appName] = {
-            sequelize: db,
-            redisClient: redisVirtual,
-            appConfig: _.defaultsDeep(
-              configExist ? require(path.resolve(__dirname, configPath)) : {},
-              this.config.app,
-              { appName, ip: this.config.ip, port: this.port }
-            ),
-          }
-        }
+        sharedRedisClient = redis.createClient({
+          socket: {
+            host: this.config.redis.host,
+            port: this.config.redis.port,
+            reconnectStrategy: false,
+          },
+          ...(this.config.redis.database
+            ? {
+                database: this.config.redis.database,
+              }
+            : {}),
+        })
 
-        // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
+        sharedRedisClient.on('error', (err) =>
+          console.log('Redis Client Error', err)
+        )
 
-        // if (proxyConfig) {
-        //   this.app.use(proxy(`/${appName}`, proxyConfig));
-        // }
+        await sharedRedisClient.connect()
 
-        const initFileConfig = _.get(
-          this.app[appName],
-          'appConfig.initFile',
-          false
-        )
-        if (initFileConfig) {
-          this.initFile(appName)
-        }
-        await this.initPlugin(appName)
+        sharedSubscriber = sharedRedisClient.duplicate()
+        await sharedSubscriber.connect()
+      } catch (e) {
+        sharedRedisClient = null
+        sharedSubscriber = null
+        redisError = e
+      }
+    }
 
-        const initEvent = _.get(this.app[appName], 'appConfig.initEvent', false)
-        if (initEvent) {
-          this.app[appName].event = new EventEmitter()
+    // 数据库连接校验：生产只校验一次（保持原有行为）；开发环境按 dbName 去重，同库只校验一次
+    let prodAuthPromise = null
+    const dbAuthCache = new Map()
+    const authenticateDb = (db, dbName, appName) => {
+      if (!is_dev) {
+        if (!prodAuthPromise) {
+          console.log(chalk.green(`${appName}检查数据库${dbName}`))
+          prodAuthPromise = db.authenticate()
         }
+        return prodAuthPromise
+      }
+      if (!dbAuthCache.has(dbName)) {
+        console.log(chalk.green(`${appName}检查数据库${dbName}`))
+        dbAuthCache.set(dbName, db.authenticate())
+      }
+      return dbAuthCache.get(dbName)
+    }
 
-        const cacheConfig = _.get(this.app[appName], 'appConfig.cache', {
-          max: 100,
-          maxAge: 1000 * 60 * 60 * 24,
-        })
-
-        this.app[appName].cache = new LRUCache({
-          max: cacheConfig.max,
-          ttl: cacheConfig.maxAge,
+    const routers = new Map()
+
+    // 各 app 的重初始化（数据库校验/插件/模型等）互相独立，并行执行
+    const results = await Promise.allSettled(
+      dirList.map((appName) =>
+        this._initSingleApp(appName, includeList, {
+          push,
+          routers,
+          sharedRedisClient,
+          sharedSubscriber,
+          redisError,
+          authenticateDb,
         })
+      )
+    )
+    const failed = results.find((r) => r.status === 'rejected')
+    if (failed) {
+      throw failed.reason
+    }
 
-        await this.initModel(appName)
-        // const models = Object.keys(this.app[appName].model).join(' / ')
-      } catch (e) {
-        push({
-          appName,
-          message: `${appName}数据库连接失败`,
-        })
-        console.log(`${appName}数据库连接失败`)
-        console.log(e)
-        throw new Error(e.message)
-      }
+    // 按原有顺序挂载路由，保证中间件注册顺序确定
+    for (const appName of dirList) {
+      const router = routers.get(appName)
       if (
         this.app[appName] &&
         this.app[appName].appConfig &&
@@ -654,10 +588,122 @@ class APP {
     starter.emit('loadAll')
   }
 
-  initFile(appName) {
+  async _initSingleApp(appName, includeList, ctx) {
+    const {
+      push,
+      routers,
+      sharedRedisClient,
+      sharedSubscriber,
+      redisError,
+      authenticateDb,
+    } = ctx
+    console.log(
+      chalk.green(`==================== 启动 ${appName} ====================`)
+    )
+    const routerConfig = {
+      prefix: `/${appName}`,
+    }
+    const router = new Router(routerConfig)
+    Serve(
+      path.resolve(__dirname, `${rootDirectory}/${APP_DIR}/${appName}/public`),
+      router
+    )
+    routers.set(appName, router)
+
+    try {
+      const target = includeList.find((i) => i.app === appName)
+      const dbName = (target ? target.db : '') || this.config.db.name || appName
+      const db = connectDatabase(dbName)(this.config.db)
+      await authenticateDb(db, dbName, appName)
+
+      const configPath = `${rootDirectory}/${APP_DIR}/${appName}/config.js`
+      const configFile = path.resolve(__dirname, configPath)
+      const configExist = fs.existsSync(configFile)
+      const appConfig = _.defaultsDeep(
+        configExist ? require(configFile) : {},
+        this.config.app,
+        { appName, ip: this.config.ip, port: this.port }
+      )
+
+      if (sharedRedisClient) {
+        if (!is_dev) {
+          push({
+            appName,
+            message: `${appName}连接redis成功，${this.config.ip}:${this.port}`,
+          })
+        }
+        this.app[appName] = {
+          sequelize: db,
+          redisClient: sharedRedisClient,
+          subscriber: sharedSubscriber,
+          appConfig,
+        }
+      } else if (
+        this.config.redis &&
+        this.config.redis.host &&
+        this.config.redis.port
+      ) {
+        // redis 配置了但连接失败：保持原有行为（不挂 redisClient），仅记录日志
+        push({
+          appName,
+          message: `${appName}连接redis失败，${
+            redisError ? redisError.message : '未知错误'
+          }`,
+        })
+        this.app[appName] = {
+          sequelize: db,
+          appConfig,
+        }
+      } else {
+        this.app[appName] = {
+          sequelize: db,
+          redisClient: redisVirtual,
+          appConfig,
+        }
+      }
+
+      const initFileConfig = _.get(
+        this.app[appName],
+        'appConfig.initFile',
+        false
+      )
+      if (initFileConfig) {
+        await this.initFile(appName)
+      }
+      await this.initPlugin(appName)
+
+      const initEvent = _.get(this.app[appName], 'appConfig.initEvent', false)
+      if (initEvent) {
+        this.app[appName].event = new EventEmitter()
+      }
+
+      const cacheConfig = _.get(this.app[appName], 'appConfig.cache', {
+        max: 100,
+        maxAge: 1000 * 60 * 60 * 24,
+      })
+
+      this.app[appName].cache = new LRUCache({
+        max: cacheConfig.max,
+        // 兼容业务方两种写法：lru-cache v11 的 ttl 或旧版 maxAge
+        ttl: cacheConfig.ttl || cacheConfig.maxAge,
+      })
+
+      await this.initModel(appName)
+    } catch (e) {
+      push({
+        appName,
+        message: `${appName}数据库连接失败`,
+      })
+      console.log(`${appName}数据库连接失败`)
+      console.log(e)
+      throw new Error(e.message)
+    }
+  }
+
+  async initFile(appName) {
     const dirExist = fsExtra.existsSync(path.resolve(__dirname, './file'))
     if (dirExist) {
-      fsExtra.copySync(
+      await fsExtra.copy(
         path.resolve(__dirname, './file'),
         path.resolve(__dirname, `${rootDirectory}/${APP_DIR}/${appName}`),
         {
@@ -964,12 +1010,8 @@ class APP {
       a[b] = []
       return a
     }, {})
-    this.app[appName] = _.defaultsDeep(
-      {
-        include,
-      },
-      this.app[appName]
-    )
+    // 直接赋值，避免对整个 app 对象做 defaultsDeep 深合并（且保持对象引用不变）
+    this.app[appName].include = include
     for (const model of modelList) {
 
       // if (!this.app[appName].include || !this.app[appName].include[model]) {

package/package.json

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