node-easywechat 3.5.17 → 3.5.19

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 
 
+## v3.5.19 (2023-12-26)
+
+- Fix: 工具包对外暴露PublicKey和PrivateKey
+- Fix: 调整微信支付敏感信息加密机默认哈希算法 (#65)
+
+## v3.5.18 (2023-12-26)
+
+- Fix: 修复微信支付上传图片时报错的问题 (#64)
+
 ## v3.5.17 (2023-12-20)
 
 - Fix: 修复TS问题 (#62)

package/dist/Core/Support/Utils.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import Crypto from 'crypto';
 import Stream from 'stream';
+import Fs from 'fs';
 export declare const createHash: (str: Crypto.BinaryLike, type?: string, target?: Crypto.BinaryToTextEncoding) => any;
 export declare const createHmac: (str: Crypto.BinaryLike, key: Crypto.BinaryLike, type?: string, target?: Crypto.BinaryToTextEncoding) => any;
 /**
@@ -102,3 +105,13 @@ export declare const buildXml: (data: Record<string, any>, rootName?: string) =>
  * @returns
  */
 export declare const createUserAgent: (appends?: string[]) => string;
+/**
+ * 流转Buffer
+ * @param stream 可读流
+ */
+export declare const streamToBuffer: (stream: Fs.ReadStream) => Promise<Buffer>;
+/**
+ * Buffer转流
+ * @param buffer Buffer对象
+ */
+export declare const bufferToStream: (buffer: Buffer) => Stream.Duplex;

package/dist/Core/Support/Utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUserAgent = exports.buildXml = exports.parseXml = exports.singleItem = exports.strSnake = exports.strCamel = exports.strStudly = exports.strLcwords = exports.strUcwords = exports.rtrim = exports.ltrim = exports.trim = exports.applyMixins = exports.inArray = exports.isIp = exports.isIpv6 = exports.isIpv4 = exports.isFunction = exports.isObject = exports.isNumber = exports.isArray = exports.isString = exports.makeSignature = exports.randomString = exports.parseQueryString = exports.buildQueryString = exports.getTimestamp = exports.createFileHash = exports.createHmac = exports.createHash = void 0;
+exports.bufferToStream = exports.streamToBuffer = exports.createUserAgent = exports.buildXml = exports.parseXml = exports.singleItem = exports.strSnake = exports.strCamel = exports.strStudly = exports.strLcwords = exports.strUcwords = exports.rtrim = exports.ltrim = exports.trim = exports.applyMixins = exports.inArray = exports.isIp = exports.isIpv6 = exports.isIpv4 = exports.isFunction = exports.isObject = exports.isNumber = exports.isArray = exports.isString = exports.makeSignature = exports.randomString = exports.parseQueryString = exports.buildQueryString = exports.getTimestamp = exports.createFileHash = exports.createHmac = exports.createHash = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const qs_1 = __importDefault(require("qs"));
 const xml2js_1 = __importDefault(require("xml2js"));
@@ -337,3 +337,27 @@ const createUserAgent = function (appends = []) {
     return values.join(' ');
 };
 exports.createUserAgent = createUserAgent;
+/**
+ * 流转Buffer
+ * @param stream 可读流
+ */
+const streamToBuffer = function (stream) {
+    return new Promise((resolve, reject) => {
+        let buffers = [];
+        stream.on('error', reject);
+        stream.on('data', data => buffers.push(data));
+        stream.on('end', () => resolve(Buffer.concat(buffers)));
+    });
+};
+exports.streamToBuffer = streamToBuffer;
+/**
+ * Buffer转流
+ * @param buffer Buffer对象
+ */
+const bufferToStream = function (buffer) {
+    let stream = new stream_1.default.Duplex();
+    stream.push(buffer);
+    stream.push(null);
+    return stream;
+};
+exports.bufferToStream = bufferToStream;

package/dist/Pay/Client.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import fs from 'fs';
 import { Method, AxiosRequestConfig, AxiosInstance } from "axios";
 import HttpClientInterface from "../Core/HttpClient/Contracts/HttpClientInterface";
@@ -22,12 +23,12 @@ declare class Client implements HttpClientInterface {
      * 文件上传
      * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter2_1_1.shtml
      * @param uri 接口地址
-     * @param file 文件路径或文件可读流
+     * @param file 文件路径、文件Buffer或文件可读流
      * @param meta 文件元信息，包含 filename 和 sha256 两个字段
      * @param filename 文件名，必须以 .jpg、.bmp、.png 为后缀
      * @returns
      */
-    uploadMedia(uri: string, file: string | fs.ReadStream, meta?: Record<string, any>, filename?: string): Promise<HttpClientResponse>;
+    uploadMedia(uri: string, file: string | fs.ReadStream | Buffer, meta?: Record<string, any>, filename?: string): Promise<HttpClientResponse>;
     /**
      * 判断是否是V3请求
      * @param url 请求地址
@@ -41,7 +42,7 @@ declare class Client implements HttpClientInterface {
      * @param payload 请求载荷
      * @returns
      */
-    protected createSignature(method: string, url: string, payload: AxiosRequestConfig<any>): string;
+    createSignature(method: string, url: string, payload: AxiosRequestConfig<any>): string;
     /**
      * 创建签名（V2）
      * @param body 请求参数

package/dist/Pay/Client.js

@@ -61,7 +61,7 @@ class Client {
             if (!payload.headers['user-agent'] && !payload.headers['User-Agent']) {
                 payload.headers['user-agent'] = (0, Utils_1.createUserAgent)();
             }
-            if (this.isV3Request(url)) {
+            if (this.isV3Request(url) && !payload.headers['authorization']) {
                 payload.headers['authorization'] = this.createSignature(method, url, payload);
             }
             else {
@@ -95,7 +95,7 @@ class Client {
      * 文件上传
      * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter2_1_1.shtml
      * @param uri 接口地址
-     * @param file 文件路径或文件可读流
+     * @param file 文件路径、文件Buffer或文件可读流
      * @param meta 文件元信息，包含 filename 和 sha256 两个字段
      * @param filename 文件名，必须以 .jpg、.bmp、.png 为后缀
      * @returns
@@ -103,17 +103,21 @@ class Client {
     uploadMedia(uri, file, meta = null, filename = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof file === 'string') {
-                file = fs_1.default.createReadStream(file);
+                file = fs_1.default.readFileSync(file);
             }
+            else if (typeof file !== 'string' && !Buffer.isBuffer(file)) {
+                file = yield (0, Utils_1.streamToBuffer)(file);
+            }
+            filename = filename !== null && filename !== void 0 ? filename : 'file.jpg';
             if (!meta) {
                 meta = {
-                    filename: filename !== null && filename !== void 0 ? filename : 'file.jpg',
-                    sha256: yield (0, Utils_1.createFileHash)(file, 'sha256'),
+                    filename: filename,
+                    sha256: yield (0, Utils_1.createHash)(file, 'sha256'),
                 };
             }
             let metaJson = JSON.stringify(meta);
             let formData = new form_data_1.default();
-            formData.append('file', file);
+            formData.append('file', file, filename);
             formData.append('meta', metaJson, {
                 contentType: 'application/json',
             });

package/dist/Pay/Encryptor.d.ts

@@ -1,6 +1,11 @@
+/// <reference types="node" />
 import { PrivateKey } from "../Core/Support/PrivateKey";
 import { PublicKey } from "../Core/Support/PublicKey";
 import RSA from "../Core/Support/RSA";
+/**
+ * 敏感信息加解密
+ * @see https://pay.weixin.qq.com/docs/merchant/development/interface-rules/sensitive-data-encryption.html
+ */
 declare class Encryptor extends RSA {
     protected publicCert: PublicKey;
     protected privateCert: PrivateKey;
@@ -14,5 +19,23 @@ declare class Encryptor extends RSA {
      * 获取公钥的序列号
      */
     getSerialNo(): string;
+    /**
+     * 加密
+     * @param plaintext 待加密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    encrypt(plaintext: string, encoding?: BufferEncoding, hashType?: string, padding?: number): string;
+    /**
+     * 解密
+     * @param ciphertext 待解密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    decrypt(ciphertext: string, encoding?: BufferEncoding, hashType?: string, padding?: number): string;
 }
 export = Encryptor;

package/dist/Pay/Encryptor.js

@@ -3,6 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const RSA_1 = __importDefault(require("../Core/Support/RSA"));
+const crypto_1 = __importDefault(require("crypto"));
+/**
+ * 敏感信息加解密
+ * @see https://pay.weixin.qq.com/docs/merchant/development/interface-rules/sensitive-data-encryption.html
+ */
 class Encryptor extends RSA_1.default {
     /**
      * 设置加密机所需的公私密钥
@@ -21,5 +26,27 @@ class Encryptor extends RSA_1.default {
     getSerialNo() {
         return this.publicCert.getSerialNo();
     }
+    /**
+     * 加密
+     * @param plaintext 待加密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    encrypt(plaintext, encoding = 'base64', hashType = 'sha1', padding = crypto_1.default.constants.RSA_PKCS1_OAEP_PADDING) {
+        return super.encrypt(plaintext, encoding, hashType, padding);
+    }
+    /**
+     * 解密
+     * @param ciphertext 待解密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    decrypt(ciphertext, encoding = 'base64', hashType = 'sha1', padding = crypto_1.default.constants.RSA_PKCS1_OAEP_PADDING) {
+        return super.decrypt(ciphertext, encoding, hashType, padding);
+    }
 }
 module.exports = Encryptor;

package/dist/Pay/Utils.d.ts

@@ -12,6 +12,7 @@ declare class Utils {
     getPlatformCert(): Promise<PublicKey>;
     /**
      * 获取敏感信息加密机
+     * @see https://pay.weixin.qq.com/docs/merchant/development/interface-rules/sensitive-data-encryption.html
      * @param platformCert PublicKey封装过的平台证书
      * @returns
      */

package/dist/Pay/Utils.js

@@ -34,6 +34,7 @@ class Utils {
     }
     /**
      * 获取敏感信息加密机
+     * @see https://pay.weixin.qq.com/docs/merchant/development/interface-rules/sensitive-data-encryption.html
      * @param platformCert PublicKey封装过的平台证书
      * @returns
      */

package/dist/index.d.ts

@@ -12,7 +12,9 @@ import OfficialAccountMessage from './OfficialAccount/Message';
 import WorkMessage from './Work/Message';
 import OpenPlatformMessage from './OpenPlatform/Message';
 import OpenWorkMessage from './OpenWork/Message';
-export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, Pay, PayConfig, OpenPlatform, OpenPlatformConfig, Work, WorkConfig, OpenWork, OpenWorkConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, 
+import { PublicKey } from './Core/Support/PublicKey';
+import { PrivateKey } from './Core/Support/PrivateKey';
+export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, Pay, PayConfig, OpenPlatform, OpenPlatformConfig, Work, WorkConfig, OpenWork, OpenWorkConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, PublicKey, PrivateKey, 
 /**
  * 表单对象
  * @see https://github.com/axios/axios#formdata

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.definePaymentScannedHandler = exports.definePaymentRefundedHandler = exports.definePaymentPaidHandler = exports.definePaymentAlertHandler = exports.definePaymentFailHandler = exports.defineHttpClientFailureJudgeClosure = exports.defineOpenWorkServerHandler = exports.defineOpenPlatformServerHandler = exports.defineWorkServerHandler = exports.defineMiniAppServerHandler = exports.defineOfficeAccountServerHandler = exports.defineLogHandler = exports.defineOpenWorkConfig = exports.defineWorkConfig = exports.defineOpenPlatformConfig = exports.definePayConfig = exports.defineMiniAppConfig = exports.defineOfficialAccountConfig = exports.FormData = exports.ServerRequest = exports.CacheInterface = exports.OpenWork = exports.Work = exports.OpenPlatform = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
+exports.definePaymentScannedHandler = exports.definePaymentRefundedHandler = exports.definePaymentPaidHandler = exports.definePaymentAlertHandler = exports.definePaymentFailHandler = exports.defineHttpClientFailureJudgeClosure = exports.defineOpenWorkServerHandler = exports.defineOpenPlatformServerHandler = exports.defineWorkServerHandler = exports.defineMiniAppServerHandler = exports.defineOfficeAccountServerHandler = exports.defineLogHandler = exports.defineOpenWorkConfig = exports.defineWorkConfig = exports.defineOpenPlatformConfig = exports.definePayConfig = exports.defineMiniAppConfig = exports.defineOfficialAccountConfig = exports.FormData = exports.PrivateKey = exports.PublicKey = exports.ServerRequest = exports.CacheInterface = exports.OpenWork = exports.Work = exports.OpenPlatform = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
 const Application_1 = __importDefault(require("./OfficialAccount/Application"));
 exports.OfficialAccount = Application_1.default;
 const Application_2 = __importDefault(require("./MiniApp/Application"));
@@ -22,6 +22,10 @@ const ServerRequest_1 = __importDefault(require("./Core/Http/ServerRequest"));
 exports.ServerRequest = ServerRequest_1.default;
 const form_data_1 = __importDefault(require("form-data"));
 exports.FormData = form_data_1.default;
+const PublicKey_1 = require("./Core/Support/PublicKey");
+Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return PublicKey_1.PublicKey; } });
+const PrivateKey_1 = require("./Core/Support/PrivateKey");
+Object.defineProperty(exports, "PrivateKey", { enumerable: true, get: function () { return PrivateKey_1.PrivateKey; } });
 /**
  * 定义公众号配置
  * @param config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.5.17",
+  "version": "3.5.19",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {