node-easywechat 3.5.16 → 3.5.18

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v3.5.18 (2023-12-26)
+
+- Fix: 修复微信支付上传图片时报错的问题 (#64)
+
+## v3.5.17 (2023-12-20)
+
+- Fix: 修复TS问题 (#62)
+
 ## v3.5.16 (2023-12-20)
 
 - Fix: 优化消息类型，允许未定义字段的存在 (#62)

package/dist/Core/Message.d.ts

@@ -26,6 +26,6 @@ declare class Message {
      */
     toString(): string;
 }
-interface Message extends Recordable, HasAttributesMixin {
+interface Message extends Record<string, any>, HasAttributesMixin {
 }
 export = Message;

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/Types/shim-axios.d.ts

@@ -4,28 +4,28 @@ import axios from 'axios';
 declare module 'axios' {
 
   interface AxiosInstance {
-    <T = Recordable, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
-    request<T = Recordable, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
-    get<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    delete<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    head<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    post<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
-    put<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
-    patch<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
+    <T = Record<string, any>, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
+    request<T = Record<string, any>, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
+    get<T = Record<string, any>, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    delete<T = Record<string, any>, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    head<T = Record<string, any>, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    post<T = Record<string, any>, R = AxiosResponse<T>>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<R>;
+    put<T = Record<string, any>, R = AxiosResponse<T>>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<R>;
+    patch<T = Record<string, any>, R = AxiosResponse<T>>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<R>;
   }
 
   interface AxiosRequestConfig {
     /**
      * 要发送的xml数据，会自动解析并赋值到data属性，同时设置content-type=text/xml
      */
-    xml?: string | Recordable;
+    xml?: string | Record<string, any>;
     /**
      * 要发送的json数据，会自动解析并赋值到data属性，同时设置content-type=application/json
      */
-    json?: string | Recordable;
+    json?: string | Record<string, any>;
     /**
      * 要发送的FormData数据，会自动解析并赋值到data属性，同时设置根据内容提取headers
      */
-    formData?: Recordable;
+    formData?: Record<string, any>;
   }
 }

package/package.json

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

package/dist/Types/common.d.ts

@@ -1,2 +0,0 @@
-
-type Recordable<T = any> = Record<string, T>;