q-koa 13.6.4 → 13.6.6

package/core/file/services/aliSms.js

@@ -1,20 +1,13 @@
 const Core = require('@alicloud/pop-core')
-const { lodash } = require('q-koa')
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(key) {
-    this.key = key
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
+    const cacheKey = key.accessKeyId
+    if (Singleton._instanceMap.has(cacheKey)) {
+      return Singleton._instanceMap.get(cacheKey)
     }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, key)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    this.key = key
+    Singleton._instanceMap.set(cacheKey, this)
   }
 
   init() {

package/core/file/services/alipay.js

@@ -1,7 +1,11 @@
 const crypto = require('crypto')
-const { lodash } = require('q-koa')
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.partner
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
     this.config = {
       service: 'alipay.wap.create.direct.pay.by.user',
       partner: '',
@@ -19,17 +23,7 @@ module.exports = class Singleton {
       return_url: 'http://www.baidu.com',
       ...config,
     }
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   async create() {

package/core/file/services/amap.js

@@ -1,5 +1,4 @@
 const axios = require('axios')
-const { lodash } = require('q-koa')
 
 const queryFn = (obj) => {
   const query = Object.keys(obj)
@@ -10,20 +9,13 @@ const queryFn = (obj) => {
   return query.replace('&', '?')
 }
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(key) {
-    this.key = key
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
     }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, key)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    this.key = key
+    Singleton._instanceMap.set(key, this)
   }
 
   async geo({ address }) {

package/core/file/services/douyin.js

@@ -1,6 +1,5 @@
 const util = require('util')
 const axios = require('axios')
-const { lodash } = require('q-koa')
 
 const commonTokenUrl =
   'https://open.douyin.com/oauth/client_token/?client_key=%s&client_secret=%s&grant_type=client_credential'
@@ -20,28 +19,23 @@ const cache = new LRUCache({
 })
 
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
-    this.config = {
-      ...config,
+    const key = config.client_key
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
     }
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
+    if (!config.client_key || !config.client_secret) {
+      throw new Error('没有配置client_key或client_secret')
     }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
+    this.config = {
+      ...config,
     }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   init() {
-    if (!this.config.client_key || !this.config.client_secret) {
-      throw new Error('没有配置client_key或client_secret')
-    }
+    return this
   }
 
   async getAccessToken() {

package/core/file/services/express.js

@@ -1,25 +1,18 @@
 const axios = require('axios')
-const { lodash } = require('q-koa')
 const { push } = require('../plugins/log/service')
 
 const send_url = 'http://wuliu.market.alicloudapi.com/kdi'
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.app_code
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
     this.config = {
       app_code: config.app_code,
     }
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   async send({ no }) {

package/core/file/services/geo.js

@@ -1,25 +1,17 @@
 const axios = require('axios')
 const util = require('util')
-const { lodash } = require('q-koa')
 const toLocationUrl =
   'https://apis.map.qq.com/ws/geocoder/v1/?location=%s&key=%s'
 const toLngAndLatUrl =
   'https://apis.map.qq.com/ws/geocoder/v1/?address=%s&key=%s'
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(key) {
-    this.key = key
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
     }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, key)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    this.key = key
+    Singleton._instanceMap.set(key, this)
   }
 
   async direction({

package/core/file/services/print.js

@@ -1,4 +1,4 @@
-const { lodash, getConfig } = require('q-koa')
+const { getConfig } = require('q-koa')
 const yly = require('yly-nodejs-sdk')
 // const LRU = require('lru-cache')
 // const cache = new LRU({
@@ -7,22 +7,16 @@ const yly = require('yly-nodejs-sdk')
 // })
 // const cacheKey = Symbol('print')
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.cid
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
     this.config = {
       ...config,
     }
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   async getAccessToken() {

package/core/file/services/toutiao.js

@@ -1,7 +1,6 @@
 const util = require('util')
 const axios = require('axios')
 const fsPromise = require('fs/promises')
-const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://developer.toutiao.com/api/apps/token?grant_type=%s&appid=%s&secret=%s'
 const createQRCodeUrl = 'https://developer.toutiao.com/api/apps/qrcode'
@@ -15,28 +14,24 @@ const cache = new LRUCache({
 const uuid = require('node-uuid')
 
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.appid
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
+    if (!config.appid || !config.secrect) {
+      throw new Error('没有配置appid或secrect')
+    }
     this.config = {
       ...config,
       grant_type: 'client_credential',
     }
-
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   init() {
-    if (!this.config.appid || !this.config.secrect)
-      throw new Error('没有配置appid或secrect')
+    return this
   }
 
   async getAccessToken() {

package/core/file/services/weixin.js

@@ -9,31 +9,27 @@ const cache = new LRUCache({
   max: 100,
   ttl: 1000 * 60 * 60,
 })
-const { lodash } = require('q-koa')
 
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.appid
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
+    if (!config.appid || !config.secrect) {
+      throw new Error('没有配置appid或secrect')
+    }
     this.config = {
       ...config,
 
       noncestr: 'kuashou',
       grant_type: 'client_credential',
     }
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
   init() {
-    if (!this.config.appid || !this.config.secrect)
-      throw new Error('没有配置appid或secrect')
+    return this
   }
   async getAccessToken() {
     const { appid, secrect, grant_type } = this.config

package/core/file/services/weixinMP.js

@@ -1,3 +1,13 @@
+/**
+ * weixinMP.js  —  按静态 Map 实例缓存优化后
+ *
+ * 改动点：
+ * 1. 删除 Singleton.instance + lodash.isEqual 的假单例
+ * 2. 新增 static _instanceMap = new Map()，key 为 config.appid
+ * 3. 构造函数按 appid 直接命中缓存，不再做深比较
+ * 4. 其余逻辑（url 常量 / cache LRU / 所有方法）保持不变
+ */
+
 const util = require('util')
 const axios = require('axios')
 const crypto = require('crypto')
@@ -105,7 +115,7 @@ const b2bFinishUrl =
 
 const fsPromise = require('fs/promises')
 const { LRUCache } = require('lru-cache')
-const request = require('request')
+const FormData = require('form-data')
 const cache = new LRUCache({
   max: 100,
   ttl: 1000 * 60 * 60,
@@ -114,20 +124,11 @@ const uuid = require('node-uuid')
 const hmacSha256 = (data, secret) => {
   return crypto.createHmac('sha256', secret).update(data).digest('hex')
 }
-const uploadPromise = (options) => {
-  return new Promise((resolve, reject) => {
-    request.post(
-      {
-        ...options,
-      },
-      (err, response, body) => {
-        if (err || response.statusCode !== 200) {
-          reject(err)
-        }
-        resolve(JSON.parse(body))
-      }
-    )
+const uploadPromise = async (url, formData) => {
+  const response = await axios.post(url, formData, {
+    headers: formData.getHeaders(),
   })
+  return response.data
 }
 
 const https = require('https')
@@ -145,28 +146,26 @@ const wxHttpsAgent = new https.Agent({
 axios.defaults.httpsAgent = wxHttpsAgent
 
 module.exports = class Singleton {
+  static _instanceMap = new Map()
+
   constructor(config) {
+    const key = config.appid
+    const cached = Singleton._instanceMap.get(key)
+    if (cached) {
+      return cached
+    }
+    if (!config.appid || !config.secrect) {
+      throw new Error('没有配置appid或secrect')
+    }
     this.config = {
       ...config,
       grant_type: 'client_credential',
     }
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   init() {
-    if (!this.config.appid || !this.config.secrect) {
-      throw new Error('没有配置appid或secrect')
-    }
+    return this
   }
 
   async getAccessToken() {
@@ -315,24 +314,24 @@ module.exports = class Singleton {
     const url = util.format(createLiveUrl, access_token)
 
     const formatOptions = {
-      name, // 房间名字
-      coverImg, // 通过 uploadfile 上传，填写 mediaID
-      startTime, // 开始时间
-      endTime, // 结束时间
-      anchorName, // 主播昵称
-      anchorWechat, // 主播微信号
-      subAnchorWechat, // 主播副号微信号
-      createrWechat, // 创建者微信号
-      shareImg, // 通过 uploadfile 上传，填写 mediaID
-      feedsImg, // 通过 uploadfile 上传，填写 mediaID
-      isFeedsPublic: 0, // 是否开启官方收录，1 开启，0 关闭
-      type: 0, // 直播类型，1 推流 0 手机直播
-      closeLike: 0, // 是否关闭点赞 1：关闭
-      closeGoods: 1, // 是否关闭商品货架，1：关闭
-      closeComment: 1, // 是否开启评论，1：关闭
-      closeReplay, // 是否关闭回放 1 关闭
-      closeShare: 1, //  是否关闭分享 1 关闭
-      closeKf: 1, // 是否关闭客服，1 关闭
+      name,
+      coverImg,
+      startTime,
+      endTime,
+      anchorName,
+      anchorWechat,
+      subAnchorWechat,
+      createrWechat,
+      shareImg,
+      feedsImg,
+      isFeedsPublic: 0,
+      type: 0,
+      closeLike: 0,
+      closeGoods: 1,
+      closeComment: 1,
+      closeReplay,
+      closeShare: 1,
+      closeKf: 1,
     }
     const result = await axios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
@@ -625,13 +624,11 @@ module.exports = class Singleton {
 
     const access_token = await this.getAccessToken()
     const url = util.format(uploadFile, access_token, 'image')
-    const formData = {
-      media: request(imgUrl.startsWith('//') ? `http:${imgUrl}` : imgUrl),
-    }
-    const uploadResult = await uploadPromise({
-      url,
-      formData,
-    })
+    const fullUrl = imgUrl.startsWith('//') ? `http:${imgUrl}` : imgUrl
+    const stream = (await axios.get(fullUrl, { responseType: 'stream' })).data
+    const formData = new FormData()
+    formData.append('media', stream)
+    const uploadResult = await uploadPromise(url, formData)
     if (uploadResult.errcode) {
       if (uploadResult.errcode === 40001) {
         cache.reset()
@@ -1203,21 +1200,6 @@ module.exports = class Singleton {
     return result
   }
 
-  // async b2bFinish(payLoad) {
-  //   const access_token = await this.getAccessToken()
-  //   const url = util.format(b2bFinishUrl, access_token)
-
-  //   const result = await axios.post(url, payLoad).then((res) => res.data)
-  //   if (result.errcode) {
-  //     if (result.errcode === 40001) {
-  //       cache.reset()
-  //       return await this.b2bFinish(payLoad)
-  //     }
-  //     throw new Error(`${result.errcode};${result.errmsg}`)
-  //   }
-  //   return result
-  // }
-
   async b2bFinish({ mchid, app_key, out_trade_no }) {
     const requestUrl = b2bFinishUrl
 

package/core/file/services/weixinOpen.js

@@ -38,28 +38,24 @@ const cache = new LRUCache({
 })
 
 module.exports = class Singleton {
+  static _instanceMap = new Map()
   constructor(config) {
+    const key = config.appid
+    if (Singleton._instanceMap.has(key)) {
+      return Singleton._instanceMap.get(key)
+    }
+    if (!config.appid || !config.secrect) {
+      throw new Error('没有配置appid或secrect')
+    }
     this.config = {
       ...config,
       grant_type: 'client_credential',
     }
-    /**
-     * 单例模式
-     */
-    if (!Singleton.instance) {
-      Singleton.instance = this
-    }
-    const previous = Singleton.instance.getConfig()
-    if (!lodash.isEqual(previous, config)) {
-      Singleton.instance = this
-    }
-    return Singleton.instance
+    Singleton._instanceMap.set(key, this)
   }
 
   init() {
-    if (!this.config.appid || !this.config.secrect) {
-      throw new Error('没有配置appid或secrect')
-    }
+    return this
   }
 
   async getAccessToken() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.6.4",
+  "version": "13.6.6",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -63,7 +63,7 @@
     "xlsx": "^0.18.5",
     "pm2": "^7.0.1",
     "dayjs": "^1.11.13",
-    "request": "^2.88.2"
+    "form-data": "^4.0.0"
   },
   "devDependencies": {
     "eslint": "^4.19.1",