@jayfong/x-server 2.118.0 → 2.118.1

package/lib/_cjs/services/pay.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.PayService = void 0;
-var _crypto = _interopRequireDefault(require("crypto"));
+var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
 var _alipaySdk = _interopRequireDefault(require("alipay-sdk"));
 var _form = _interopRequireDefault(require("alipay-sdk/lib/form"));
 var _got = _interopRequireDefault(require("got"));
@@ -44,9 +44,8 @@ class PayService {
     };
   }
   async prepareWepay(options) {
-    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: appId,
+      appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -65,7 +64,7 @@ class PayService {
       throw new Error(error);
     }
     const params = {
-      appId: appId,
+      appId: this.options.wepay.appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,
@@ -145,13 +144,13 @@ class PayService {
     };
   }
   wepaySign(data) {
-    return _crypto.default.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
+    return _nodeCrypto.default.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
   }
   wepayDecrypt(payload) {
     const ciphertextBuffer = Buffer.from(payload.ciphertext, 'base64');
     const authTag = ciphertextBuffer.slice(ciphertextBuffer.length - 16);
     const data = ciphertextBuffer.slice(0, ciphertextBuffer.length - 16);
-    const decipherIv = _crypto.default.createDecipheriv('aes-256-gcm', this.options.wepay.secretKey, payload.nonce);
+    const decipherIv = _nodeCrypto.default.createDecipheriv('aes-256-gcm', this.options.wepay.secretKey, payload.nonce);
     decipherIv.setAuthTag(Buffer.from(authTag));
     decipherIv.setAAD(Buffer.from(payload.associated_data));
     const decryptStr = decipherIv.update(data, undefined, 'utf8');

package/lib/core/define_bus.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'node:events';
 declare class EventBus extends EventEmitter {
     onReturnOff(event: string, listener: (...args: any[]) => any): () => any;
 }
-export declare function defineBus<T extends Record<string, any>>(): StrictEventEmitter<EventBus, T, T, "addEventListener" | "removeEventListener", "on" | "addListener" | "once" | "removeListener" | "emit" | "off" | "onReturnOff">;
+export declare function defineBus<T extends Record<string, any>>(): StrictEventEmitter<EventBus, T, T, "addEventListener" | "removeEventListener", "on" | "addListener" | "removeListener" | "once" | "emit" | "off" | "onReturnOff">;
 declare const assignmentCompatibilityHack: unique symbol;
 interface TypeRecord<T, U, V> {
     ' _emitterType'?: T;

package/lib/services/pay.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface PayServiceOptions {
     /** 支付宝 */
     alipay?: {
@@ -9,17 +9,17 @@ export interface PayServiceOptions {
         /** 支付宝公钥，用于对返回结果验签 */
         publicKey: string;
     };
-    /** 微信支付 */
+    /** 微信支付(APIv3)，未实现回调验签，因此验证微信支付身份块不需要关心 */
     wepay?: {
         /** 公众号 APPID */
         appId: string;
         /** 商户 ID */
         merchantId: string;
-        /** 商户应用私钥 */
+        /** 商户API证书私钥 */
         privateKey: string;
-        /** 证书序列号 */
+        /** 商户API证书序列号 */
         certificateSerialNumber: string;
-        /** 秘钥，用于解密请求平台证书、回调数据 */
+        /** 密钥，用于解密回调数据 */
         secretKey: string;
     };
 }
@@ -48,9 +48,7 @@ export interface PayServicePrepareWepayOptions {
     totalMoney: number;
     /** 通知地址(POST) */
     notifyUrl: string;
-    /** 对应公众号的 appId */
-    appId?: string;
-    /** 对应公众号用户的 openid */
+    /** 公众号用户的 openid */
     openid: string;
 }
 export interface PayServicePrepareWepayResult {

package/lib/services/pay.js

@@ -1,4 +1,4 @@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 import AlipaySdk from 'alipay-sdk';
 import AlipayFormData from 'alipay-sdk/lib/form';
 import got from 'got';
@@ -39,9 +39,8 @@ export class PayService {
     };
   }
   async prepareWepay(options) {
-    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: appId,
+      appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -60,7 +59,7 @@ export class PayService {
       throw new Error(error);
     }
     const params = {
-      appId: appId,
+      appId: this.options.wepay.appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.118.0",
+  "version": "2.118.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -22,7 +22,7 @@
     "up_prisma": "tpm dlx npm-check-updates '/.*prisma.*/' -i --target semver"
   },
   "dependencies": {
-    "@jayfong/x-request": "^2.118.0",
+    "@jayfong/x-request": "^2.118.1",
     "@aws-sdk/client-s3": "^3.1079.0",
     "@aws-sdk/s3-request-presigner": "^3.1079.0",
     "@fastify/compress": "^7.0.3",