feat: move the merchant{key,cert} inside transformer.signer, affect per APIv2 request

Author: TheNorthMemory

lib/decorator.js

@@ -1,5 +1,4 @@
 const assert = require('assert');
-const https = require('https');
 const debuglog = require('util').debuglog('wechatpay:decorator');
 
 const { default: axios, mergeConfig, AxiosHeaders } = require('axios');
@@ -78,7 +77,6 @@ class Decorator {
    * @returns {AxiosInstance} - The axios instance
    */
   static xmlBased(config = {}) {
-    const httpsAgent = utils.isObject(config.merchant) ? new https.Agent(config.merchant) : undefined;
     const { mchid, secret } = config;
 
     let key;
@@ -91,16 +89,15 @@ class Decorator {
     const trans = new Transformer(mchid, key);
 
     const cfg = mergeConfig(mergeConfig(this.defaults, config), {
-      httpsAgent,
       headers: {
         'Content-Type': 'text/xml; charset=utf-8',
-        Accept: 'text/xml, text/plain, application/x-gzip',
+        Accept: 'text/xml, text/plain, application/json, application/x-gzip',
       },
       responseType: 'text',
       transformRequest: [].concat(trans.request),
       transformResponse: [].concat(trans.response),
     });
-    ['merchant', 'serial', 'privateKey', 'certs'].forEach((prop) => Reflect.deleteProperty(cfg, prop));
+    ['serial', 'privateKey', 'certs'].forEach((prop) => Reflect.deleteProperty(cfg, prop));
 
     const instance = axios.create(cfg);
     instance.interceptors.response.use(this.responseDetectorInterceptor());

lib/transformer.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+const https = require('https');
 const { XMLParser, XMLBuilder } = require('fast-xml-parser');
 const utils = require('./utils');
 const Hash = require('./hash');
@@ -117,19 +118,19 @@ class Transformer {
     const key = this[SECRET];
     const mch = this[MCHID];
 
-    /**
-     * @param {object} data - The API request parameters
-     * @return {object} - With data signature
-     */
     return function signer(data) {
+      if (this.security && utils.isObject(this.merchant) && utils.isString(this.baseURL) && this.baseURL.startsWith('https://')) {
+        Reflect.set(this, 'httpsAgent', new https.Agent(this.merchant));
+      }
+      Reflect.deleteProperty(this, 'merchant');
+
       const methodIsGet = isGetRequest(this);
       if (!methodIsGet && data === undefined) { throw new TypeError('The payload(data) must be an object or Buffer or Stream.'); }
       if (!methodIsGet && !utils.isObject(data)) { return data; }
 
       const inter = methodIsGet ? new URLSearchParams(this.params) : new Map(Object.entries(data));
-      const type = inter.get('sign_type') || Hash.ALGO_MD5;
-      const mchid = inter.get('mch_id') || inter.get('mchid') || inter.get('combine_mch_id');
 
+      const mchid = inter.get('mch_id') || inter.get('mchid') || inter.get('combine_mch_id');
       if (mch) {
         assert.ok(mch === mchid, `The ${methodIsGet ? 'params' : 'data'}'s merchant ID(${mchid}) doesn't matched the init one(${mch})`);
       }
@@ -138,7 +139,10 @@ class Transformer {
         inter.set('nonce_str', Formatter.nonce());
       }
 
-      inter.set('sign', Hash.sign(type, Object.fromEntries(inter.entries()), key));
+      const type = inter.get('sign_type');
+      inter.set('sign', Hash.sign(
+        [Hash.ALGO_MD5, Hash.ALGO_HMAC_SHA256].includes(type) ? type : Hash.ALGO_MD5, Object.fromEntries(inter.entries()), key,
+      ));
 
       return methodIsGet ? data : Object.fromEntries(inter.entries());
     };