q-koa 13.8.61 → 13.8.62

package/core/app.js

@@ -21,7 +21,7 @@ const util = require('util')
 const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
-const { getObject, getAppConfig, formatLiteralObj } = require('./file/utils')
+const { getObjectFn, getAppConfig, formatLiteralObj } = require('./file/utils')
 const redisVirtual = {
   hSet: () => {
     console.log('redisVirtual hSet')
@@ -2427,20 +2427,11 @@ APP.getConfig = (app) => ({
           },
         ],
       })
-      await app.cache.set(
-        'configList',
-        configList.map((item) => ({
-          ...item,
-        }))
-      )
-
-      const result = getObject(configList, app)(type)
-      if (!result) throw new Error('没有这个type')
-      return result
+      // raw: true 已是纯对象数组，直接缓存；getObjectFn 只读取不修改
+      app.cache.set('configList', configList)
     }
-    const result = getObject(configList, app)(type)
-    if (!result) throw new Error('没有这个type')
-    return result
+    // getObjectFn 始终返回对象（生产环境找不到配置时在其内部 throw），无需再判空
+    return getObjectFn(configList, app)(type)
   },
   update(target = 'configList') {
     if (app.redisClient) {

package/core/file/services/weixin.js

@@ -5,9 +5,10 @@ const getTicketUrl =
   'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi'
 const sha1 = require('sha1')
 const { LRUCache } = require('lru-cache')
+// 微信 access_token / jsapi_ticket 有效期均为 2 小时，缓存 110 分钟（留 10 分钟边界余量）
 const cache = new LRUCache({
   max: 100,
-  ttl: 1000 * 60 * 60,
+  ttl: 1000 * 60 * 110,
 })
 
 module.exports = class Singleton {

package/core/file/services/weixinMP.js

@@ -5,8 +5,8 @@
  * 1. 删除 Singleton.instance + lodash.isEqual 的假单例
  * 2. 新增 static _instanceMap = new Map()，key 为 config.appid
  * 3. 构造函数按 appid 直接命中缓存，不再做深比较
- * 4. 新增内部 _withTokenRetry：遇 40001/40014/42001 强刷当前 appid 的
- *    access_token 并重试一次，公共方法签名不暴露任何重试参数
+ * 4. 新增内部 _withTokenRetry：遇 40001/40014/42001 先普通刷新重试，
+ *    仍失败才 force_refresh 强刷（并发去重），公共方法签名不暴露任何重试参数
  */
 
 const util = require('util')
@@ -119,10 +119,13 @@ const b2bSendMessageUrl =
 const fsPromise = require('fs/promises')
 const { LRUCache } = require('lru-cache')
 const FormData = require('form-data')
+// 微信 access_token 有效期 2 小时，缓存 110 分钟（留 10 分钟边界余量）
 const cache = new LRUCache({
   max: 100,
-  ttl: 1000 * 60 * 60,
+  ttl: 1000 * 60 * 110,
 })
+// 同一 appid 并发强刷去重（single-flight），避免多请求重复调 stable_token
+const refreshingMap = new Map()
 const uuid = require('node-uuid')
 const hmacSha256 = (data, secret) => {
   return crypto.createHmac('sha256', secret).update(data).digest('hex')
@@ -175,12 +178,14 @@ module.exports = class Singleton {
     return this
   }
 
-  async getAccessToken(force_refresh = false) {
+  // 实际请求 stable_token；同一 appid 同类型（普通/强刷）的并发请求共享 Promise
+  _fetchAccessToken(force_refresh) {
     const { appid, secrect } = this.config
-    if (!force_refresh && cache.get(appid)) {
-      return cache.get(appid)
+    const flightKey = `${appid}:${force_refresh ? 1 : 0}`
+    if (refreshingMap.has(flightKey)) {
+      return refreshingMap.get(flightKey)
     }
-    const result = await wxAxios
+    const promise = wxAxios
       .post(getAccessTokenUrl, {
         grant_type: 'client_credential',
         appid,
@@ -188,24 +193,42 @@ module.exports = class Singleton {
         force_refresh,
       })
       .then((res) => res.data)
+      .then((result) => {
+        const { errcode, errmsg, access_token } = result
+        if (errcode) {
+          throw new Error(errmsg)
+        }
+        cache.set(appid, access_token)
+        return access_token
+      })
+      .finally(() => {
+        refreshingMap.delete(flightKey)
+      })
+    refreshingMap.set(flightKey, promise)
+    return promise
+  }
 
-    const { errcode, errmsg, access_token } = result
-
-    if (errcode) {
-      throw new Error(errmsg)
+  async getAccessToken(force_refresh = false) {
+    const { appid } = this.config
+    if (!force_refresh && cache.get(appid)) {
+      return cache.get(appid)
     }
-
-    cache.set(appid, access_token)
-    return access_token
+    return this._fetchAccessToken(force_refresh)
   }
 
-  // access_token 失效/过期统一重试：强刷当前 appid 的 token 后重试一次
+  // access_token 失效/过期统一重试：
+  // 第一次绕过缓存普通刷新（取微信服务端当前有效 token，不作废旧 token）；
+  // 仍失败才 force_refresh 强刷（并发去重）
   async _withTokenRetry(request) {
     let access_token = await this.getAccessToken()
     let result = await request(access_token)
     if (result.errcode && [40001, 40014, 42001].includes(result.errcode)) {
-      access_token = await this.getAccessToken(true)
+      access_token = await this._fetchAccessToken(false)
       result = await request(access_token)
+      if (result.errcode && [40001, 40014, 42001].includes(result.errcode)) {
+        access_token = await this._fetchAccessToken(true)
+        result = await request(access_token)
+      }
     }
     return result
   }

package/core/file/utils/index.js

@@ -34,7 +34,7 @@ exports.getList = (config) => (type) => {
   return list
 }
 
-exports.getObject = (config, app) => async (type) => {
+exports.getObjectFn = (config, app) => async (type) => {
   const obj = config.find((i) => i.code === type)
   let flag = false
   const temObj = {}

package/package.json

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