@be-link/ecommerce-trade-service-node-sdk 0.1.67 → 0.1.69

package/enums.js

@@ -435,7 +435,7 @@ var ENUM_CN;
     };
     /** 退款方式中文映射 */
     ENUM_CN.ReverseRefundWay = {
-        [ENUM.ReverseRefundWay.USER_MANUAL]: '商家主动退款',
+        [ENUM.ReverseRefundWay.USER_MANUAL]: '商家审核退款',
         [ENUM.ReverseRefundWay.FAST]: '极速退款',
         [ENUM.ReverseRefundWay.MERCHANT_MANUAL]: '商家主动退款',
     };

package/modules/pos/orderQuery/types.d.ts

@@ -91,7 +91,7 @@ export declare namespace PosOrderQueryService {
                 orderIds?: string[];
                 sourceList?: ENUM.OrderSource[];
                 statusList?: ENUM.OrderStatus[];
-                orderTypeList?: ENUM.OrderType[];
+                isVerifyCoupon?: boolean;
                 refundStatusList?: ENUM.OrderRefundStatus[];
                 productPickList?: string[];
                 productDispatchList?: string[];

package/modules/ros/orderQuery/types.d.ts

@@ -59,8 +59,10 @@ export declare namespace RosOrderQueryService {
             reverseOrderIds?: string[];
             /** 订单ID列表 */
             orderIds?: string[];
-            /** 订单类型 */
-            orderTypeList?: ENUM.OrderType[];
+            /** 是否核销券订单（true=核销券订单，false=非核销券订单） */
+            isVerifyCoupon?: boolean;
+            /** 订单来源列表 */
+            sourceList?: ENUM.OrderSource[];
             /** 用户ID列表 */
             userIds?: string[];
             /** 门店ID列表 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/ecommerce-trade-service-node-sdk",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "EcommerceTradeService Node.js SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/utils/http.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,71 +8,101 @@ const axios_1 = __importDefault(require("axios"));
 const uuid_1 = require("uuid");
 const axios_retry_1 = __importDefault(require("axios-retry"));
 const request_context_1 = require("@fastify/request-context");
-const safe_stable_stringify_1 = __importDefault(require("safe-stable-stringify"));
+const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
+// HTTP 连接池配置 - 支持 2000 QPS（响应时间 2秒）
+const HTTP_CONFIG = {
+    maxSockets: 3000, // 每个 host 最大并发连接数
+    maxFreeSockets: 1000, // 保持空闲连接数（减少连接重建开销）
+    maxTotalSockets: 10000, // 所有 host 总连接数上限（支持多个服务同时调用）
+    keepAliveMsecs: 60000, // 保持连接60秒
+    timeout: 5000, // socket超时5秒
+    requestTimeout: 5000, // 请求超时5秒
+    retries: 0, // 不重试（失败直接返回）
+    retryBaseDelay: 200, // 基础重试延迟200ms
+};
+// 配置 HTTP/HTTPS Agent 以支持高并发连接池和 keepAlive
+const httpAgent = new http_1.default.Agent({
+    keepAlive: true,
+    keepAliveMsecs: HTTP_CONFIG.keepAliveMsecs,
+    maxSockets: HTTP_CONFIG.maxSockets,
+    maxFreeSockets: HTTP_CONFIG.maxFreeSockets,
+    maxTotalSockets: HTTP_CONFIG.maxTotalSockets,
+    timeout: HTTP_CONFIG.timeout,
+    scheduling: 'lifo', // 后进先出调度（优先复用热连接，提高连接复用效率）
+});
+const httpsAgent = new https_1.default.Agent({
+    keepAlive: true,
+    keepAliveMsecs: HTTP_CONFIG.keepAliveMsecs,
+    maxSockets: HTTP_CONFIG.maxSockets,
+    maxFreeSockets: HTTP_CONFIG.maxFreeSockets,
+    maxTotalSockets: HTTP_CONFIG.maxTotalSockets,
+    timeout: HTTP_CONFIG.timeout,
+    scheduling: 'lifo', // 后进先出调度（优先复用热连接，提高连接复用效率）
+});
+// 配置 axios 默认使用这些 agent
+axios_1.default.defaults.httpAgent = httpAgent;
+axios_1.default.defaults.httpsAgent = httpsAgent;
+axios_1.default.defaults.timeout = HTTP_CONFIG.requestTimeout;
+axios_1.default.defaults.maxRedirects = 3; // 限制重定向次数
+axios_1.default.defaults.maxContentLength = 50 * 1024 * 1024; // 50MB 最大响应大小
+// 高并发场景下的智能重试配置
 (0, axios_retry_1.default)(axios_1.default, {
-    retries: 1,
+    retries: HTTP_CONFIG.retries,
     retryCondition(error) {
-        return error.response?.status === 502;
-    },
-    retryDelay: (retryCount) => {
-        console.info(`retryCount: ${retryCount}, retryDelay: ${retryCount * 500}`);
-        return retryCount * 500;
+        // 重试临时错误和特定的网络错误
+        const status = error.response?.status;
+        const isNetworkError = error.code === 'ECONNRESET' ||
+            error.code === 'ETIMEDOUT' ||
+            error.code === 'ECONNREFUSED' ||
+            error.code === 'ENOTFOUND' ||
+            error.code === 'ENETUNREACH' ||
+            error.code === 'EAI_AGAIN';
+        const isServerError = status === 502 || status === 503 || status === 504;
+        const isRateLimited = status === 429;
+        const isTimeout = error.code === 'ECONNABORTED' || error.message?.includes('timeout');
+        return isNetworkError || isServerError || isRateLimited || isTimeout;
     },
-    onRetry(retryCount, error, requestConfig) {
-        console.info(`retryCount: ${retryCount}, onRetry: ${error.message}, requestHeader: ${(0, safe_stable_stringify_1.default)(requestConfig.headers)}`);
+    retryDelay: (retryCount, error) => {
+        // 指数退避 + 抖动
+        const status = error.response?.status;
+        // 如果是限流错误，延迟更长
+        if (status === 429) {
+            const retryAfter = error.response?.headers['retry-after'];
+            if (retryAfter) {
+                return parseInt(retryAfter) * 1000;
+            }
+            return 1000 + Math.random() * 1000; // 1-2秒
+        }
+        // 指数退避：200ms, 400ms, 800ms...
+        const exponentialDelay = HTTP_CONFIG.retryBaseDelay * Math.pow(2, retryCount - 1);
+        const jitter = Math.random() * 100; // 0-100ms 抖动
+        return Math.min(exponentialDelay + jitter, 3000); // 最多延迟3秒
     },
+    shouldResetTimeout: true, // 重试时重置超时
 });
 async function callApi(url, request) {
-    const requestId = request_context_1.requestContext.get('requestId') || request_context_1.requestContext.get('traceMessageId') || (0, uuid_1.v4)();
-    const pandoraUserId = request_context_1.requestContext.get('pandoraUserId') || '';
-    const beLinkUserId = request_context_1.requestContext.get('beLinkUserId') || '';
-    const pandoraRoleId = request_context_1.requestContext.get('pandoraRoleId') || '';
-    const realIp = request_context_1.requestContext.get('realIp') || '';
-    try {
-        console.info(`准备发起ecommerce-trade-service请求[${requestId}]: ${url}, 参数: ${(0, safe_stable_stringify_1.default)(request)}`);
-        const response = await axios_1.default.post(url, request, {
-            headers: {
-                'x-request-id': requestId,
-                'x-belink-pandora-userid': pandoraUserId,
-                'x-belink-userid': beLinkUserId,
-                'x-belink-pandora-roleid': pandoraRoleId,
-                'x-real-ip': realIp,
-            },
-        });
-        const responseData = response.data;
-        return responseData.data;
-    }
-    catch (error) {
-        const axiosError = error;
-        if (axiosError.response) {
-            const response = axiosError.response;
-            const data = response.data;
-            console.error(`ecommerce-trade-service 异常: ${axiosError.message},requestId: ${requestId}`);
-            console.info('响应信息', data.message);
-            console.error('异常堆栈', (0, safe_stable_stringify_1.default)(error.stack));
-            // throw new Error(data.errorType + ' - ' + data.message)
-            throw error;
-        }
-        // 调用dns模块解析url
-        const dns = await Promise.resolve().then(() => __importStar(require('dns')));
-        const dnsPromise = new Promise((resolve, reject) => {
-            const lookupRes = dns.lookup(url, (err, address) => {
-                if (err) {
-                    console.error(err.message);
-                    reject(err);
-                }
-                console.info(`lookup: ${(0, safe_stable_stringify_1.default)(lookupRes)}`);
-                resolve(address);
-            });
-        });
-        try {
-            const address = await dnsPromise;
-            console.info(`address: ${(0, safe_stable_stringify_1.default)(address)}`);
-        }
-        catch (error) {
-            console.info(`error: ${(0, safe_stable_stringify_1.default)(error)}`);
-        }
-        console.error(`ecommerce-trade-service 未知异常: ${axiosError.message}`, error.stack);
-        throw error;
-    }
+    // 获取请求上下文
+    const ctx = request_context_1.requestContext.get('requestId') ? request_context_1.requestContext : null;
+    const requestId = ctx?.get('requestId') || ctx?.get('traceMessageId') || (0, uuid_1.v4)();
+    const pandoraUserId = ctx?.get('pandoraUserId') || '';
+    const beLinkUserId = ctx?.get('beLinkUserId') || '';
+    const pandoraRoleId = ctx?.get('pandoraRoleId') || '';
+    const realIp = ctx?.get('realIp') || '';
+    const response = await axios_1.default.post(url, request || {}, {
+        headers: {
+            'x-request-id': requestId,
+            'x-belink-pandora-userid': pandoraUserId,
+            'x-belink-userid': beLinkUserId,
+            'x-belink-pandora-roleid': pandoraRoleId,
+            'x-real-ip': realIp,
+            Connection: 'keep-alive',
+            'Content-Type': 'application/json;charset=utf-8',
+        },
+        timeout: HTTP_CONFIG.requestTimeout,
+        httpAgent,
+        httpsAgent,
+    });
+    const responseData = response.data;
+    return responseData.data;
 }