@alipay/ams-checkout 2.0.14 → 2.0.16

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -132,14 +132,18 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       });
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       this.eventCenter.listen(EVENT.getApplePayToken.name, function (data) {
+        var _this2$obtainDataRes;
         var _this2$elementContain = _this2.elementContainer.getPaymentContext(),
           paymentSessionObj = _this2$elementContain.paymentSessionObj,
           paymentSession = _this2$elementContain.paymentSession;
+        // SDK shipping takes priority; fall back to sdkAction.query shippingInfo (from createSession)
+        var shipping = (data === null || data === void 0 ? void 0 : data.shipping) || ((_this2$obtainDataRes = _this2.obtainDataRes) === null || _this2$obtainDataRes === void 0 || (_this2$obtainDataRes = _this2$obtainDataRes.originActionQueryResult) === null || _this2$obtainDataRes === void 0 ? void 0 : _this2$obtainDataRes.shippingInfo);
         var applePayService = new ApplePaySdk({
           paymentSessionData: paymentSession,
           parseData: paymentSessionObj,
           logger: logger,
-          env: _this2.options.env.environment
+          env: _this2.options.env.environment,
+          shipping: shipping
         });
         applePayService.startPay().then(function (res) {
           _this2.eventCenter.dispatchToApp({
@@ -272,9 +276,16 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock);
               _queryParse = queryParse(this.getElementUrl()), appType = _queryParse.appType;
               terminalType = isElementPad() ? 'WEB' : appType ? 'APP' : isElementPC() ? 'WEB' : 'WAP';
+              /**
+               * 生成查询支付动作的Promise
+               * 该方法负责向后端发起sdkAction查询请求，获取支付相关的动作配置信息。
+               * 支持本地mock模式用于开发调试，生产环境会发起真实的HTTP请求。
+               * @returns {Promise<CashierSdkActionQueryResult>} 返回支付动作查询结果的Promise
+               */
               generateActionQueryPromise = function generateActionQueryPromise() {
                 return new Promise(function (resolve, reject) {
                   var _displayInfo$merchant;
+                  // 本地mock模式：直接返回预设的sdkAction，用于开发调试
                   if (LOCAL_MOCK) {
                     setTimeout(function () {
                       resolve(sdkAction);
@@ -294,12 +305,18 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                       isUserPreferredLocale: true
                     }
                   };
+
+                  // 可选参数：商户指定的储值卡信息
                   if (displayInfo !== null && displayInfo !== void 0 && (_displayInfo$merchant = displayInfo.merchantAppointParam) !== null && _displayInfo$merchant !== void 0 && _displayInfo$merchant.storedCard) {
                     sdkRequestData.merchantAppointParam = displayInfo.merchantAppointParam;
                   }
+
+                  // 可选参数：控制支付完成后是否重定向
                   if (Object.prototype.hasOwnProperty.call(displayInfo, 'notRedirectAfterComplete')) {
                     sdkRequestData.notRedirectAfterComplete = displayInfo.notRedirectAfterComplete;
                   }
+
+                  // 发起支付动作查询请求
                   requestService.request(sdkRequestData, {
                     env: environment,
                     envInfo: {
@@ -309,8 +326,13 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     hostSign: hostSign,
                     timeout: 300000,
                     // TODO dev环境接口超时
-                    'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
+                    'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query',
+                    // 避免被第三方库或axios拦截器覆写，降低请求被错误处理的风险
+                    headers: {
+                      'Content-Type': 'application/json' // 手动指定Content-Type为application/json，确保符合MGW预期
+                    }
                   }).then(function (result) {
+                    // 记录请求结果日志
                     if (!result.success) {
                       _this3.getLogger().logError({
                         title: 'sdk_event_sdkQuery_failed'
@@ -329,6 +351,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     }
                     resolve(result);
                   }, function (e) {
+                    // 请求异常处理：记录错误日志并reject
                     reject(e);
                     _this3.getLogger().logError({
                       title: 'sdk_event_sdkQuery_failed'
@@ -339,19 +362,28 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
+              /**
+               * 生成查询用户账户信息的Promise
+               * 该方法负责向后端发起oneAccount查询请求，获取用户的账户相关信息（如会员等级、权益等）。
+               * 支持本地mock模式用于开发调试，生产环境会发起真实的HTTP请求。
+               * @returns {Promise<AccountQueryResult>} 返回账户信息查询结果的Promise
+               */
               generateOneAccountQueryPromise = function generateOneAccountQueryPromise() {
                 return new Promise(function (resolve, reject) {
+                  // 本地mock模式：直接返回预设的oneAccount数据，用于开发调试
                   if (LOCAL_MOCK) {
                     setTimeout(function () {
                       resolve(oneAccount);
                     }, 100);
                     return;
                   }
+
+                  // 发起账户信息查询请求
                   requestService.request({
                     paymentSessionConfig: paymentSessionConfig,
                     paymentSessionData: paymentSession,
                     accountInfo: {
-                      email: ''
+                      email: '' // 邮箱字段预留，当前传空字符串
                     }
                   }, {
                     env: environment,
@@ -361,10 +393,16 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                     },
                     timeout: 300000,
                     // TODO dev环境接口超时
-                    'Operation-Type': 'com.ipay.iexpfront.one.account.query'
+                    'Operation-Type': 'com.ipay.iexpfront.one.account.query',
+                    // 避免被第三方库或axios拦截器覆写，降低请求被错误处理的风险
+                    headers: {
+                      'Content-Type': 'application/json' // 手动指定Content-Type为application/json，确保符合MGW预期
+                    }
                   }).then(function (result) {
+                    // 直接透传查询结果，不做额外处理
                     resolve(result);
                   }, function (e) {
+                    // 请求异常处理：直接reject错误，由调用方处理
                     reject(e);
                   });
                 });

package/esm/core/component/element/type.d.ts

@@ -174,6 +174,7 @@ export interface PaymentMountOptions extends BaseMountOptions {
             'state-success': string;
             'state-info': string;
             'state-marketing': string;
+            'state-conventional': string;
             'radius-backup': string;
             'radius-module': string;
             'radius-component': string;
@@ -373,7 +374,7 @@ interface IUserName {
 }
 type Shippings = ShippingsItem[];
 type IPaymentMethods = IPaymentMethod[];
-interface CKPShipping {
+export interface CKPShipping {
     shippingRateId?: string;
     shippingRateData?: ShippingRateData;
     shippingAddress: ShippingAddress;

package/esm/modern/index.js

@@ -15,7 +15,7 @@ import { createLoader } from '@antglobal/create-sdk-loader';
 
 import { stageName } from "./stageName";
 var SDKURL = {
-  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("2.0.14", "/ams-checkout.js"),
+  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("2.0.16", "/ams-checkout.js"),
   LOCAL: "http://localhost:3000/ams-checkout.min.js",
   PROD: 'https://js.antom.com/v2/ams-checkout.js'
 };

package/esm/plugin/component/channel.d.ts

@@ -1,4 +1,5 @@
 import { type EventPayload, type IPaymentSessionMetaData } from '../../types';
+import type { CKPShipping } from '../../core/component/element/type';
 import { Logger } from '../../util/logger';
 export type IChannelBehavior = {
     usePaymentSessionAsQueryResult: boolean;
@@ -32,11 +33,13 @@ export declare class ApplePaySdk {
     private paymentStatus;
     private logger;
     private env;
-    constructor({ paymentSessionData, parseData, logger, env, }: {
+    private shipping?;
+    constructor({ paymentSessionData, parseData, logger, env, shipping, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;
         logger: Logger;
         env?: string;
+        shipping?: CKPShipping;
     });
     startPay(): Promise<unknown>;
     begin(): Promise<unknown>;

package/esm/plugin/component/channel.js

@@ -136,7 +136,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
       parseData = _ref.parseData,
       logger = _ref.logger,
       _ref$env = _ref.env,
-      env = _ref$env === void 0 ? EnvironmentEnum.prod : _ref$env;
+      env = _ref$env === void 0 ? EnvironmentEnum.prod : _ref$env,
+      shipping = _ref.shipping;
     _classCallCheck(this, ApplePaySdk);
     _defineProperty(this, "APPLESDKURL", 'https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js');
     _defineProperty(this, "session", null);
@@ -148,10 +149,12 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     _defineProperty(this, "paymentStatus", void 0);
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "env", void 0);
+    _defineProperty(this, "shipping", void 0);
     this.paymentSessionData = paymentSessionData;
     this.parseData = parseData;
     this.env = env;
     this.logger = logger;
+    this.shipping = shipping;
   }
   _createClass(ApplePaySdk, [{
     key: "startPay",
@@ -346,7 +349,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 paymentFactors: params,
                 paymentMethod: {
                   paymentMethodType: 'APPLEPAY'
-                }
+                },
+                shipping: this.shipping
               };
               _context4.t2 = this.env;
               _context4.next = 6;

package/esm/plugin/component/index.js

@@ -1384,12 +1384,13 @@ var ComponentApp = /*#__PURE__*/function () {
         });
       }
       if ((data === null || data === void 0 || (_data$context6 = data.context) === null || _data$context6 === void 0 ? void 0 : _data$context6.event) === EVENT.getApplePayToken.name) {
-        var _this$_renderParams18, _this$_renderParams19;
+        var _this$_renderParams18, _this$_renderParams19, _data$context7;
         var applePayService = new ApplePaySdk({
           paymentSessionData: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.sessionData,
           parseData: (_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.paymentSessionMetaData,
           logger: this.AMSSDK.logger,
-          env: this.AMSSDK.options.env.environment
+          env: this.AMSSDK.options.env.environment,
+          shipping: data === null || data === void 0 || (_data$context7 = data.context) === null || _data$context7 === void 0 || (_data$context7 = _data$context7.data) === null || _data$context7 === void 0 ? void 0 : _data$context7.shipping
         });
         applePayService.startPay().then(function (res) {
           _this7.dispatchToApp({
@@ -1435,11 +1436,11 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "logEventCallback",
     value: function logEventCallback(data, title) {
       if (data.context.event === EVENT.eventCallback.name) {
-        var _data$context8;
+        var _data$context9;
         var callbackData = '';
         try {
-          var _data$context7;
-          callbackData = JSON.stringify((data === null || data === void 0 || (_data$context7 = data.context) === null || _data$context7 === void 0 ? void 0 : _data$context7.data) || '');
+          var _data$context8;
+          callbackData = JSON.stringify((data === null || data === void 0 || (_data$context8 = data.context) === null || _data$context8 === void 0 ? void 0 : _data$context8.data) || '');
         } catch (e) {
           console.error(e);
         }
@@ -1447,7 +1448,7 @@ var ComponentApp = /*#__PURE__*/function () {
           title: title
         }, {
           callbackData: callbackData,
-          callbackId: (data === null || data === void 0 || (_data$context8 = data.context) === null || _data$context8 === void 0 ? void 0 : _data$context8.eventCallbackId) || ''
+          callbackId: (data === null || data === void 0 || (_data$context9 = data.context) === null || _data$context9 === void 0 ? void 0 : _data$context9.eventCallbackId) || ''
         }).send();
       }
     }

package/esm/types/index.d.ts

@@ -572,6 +572,7 @@ export interface CashierSubmitPayRequest {
         paymentMethodDetail?: Record<string, any>;
         category?: string;
     };
+    shipping?: import('../core/component/element/type').CKPShipping;
 }
 export interface CashierSubmitPayRequest {
     paymentMethodType?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "",
   "author": "",
   "exports": {
@@ -58,7 +58,13 @@
     "generateApi": "intl-oneapi generate && prettier --write src/modern/sdk/oneapi",
     "lint": "eslint ./src",
     "test": "jest --coverage --silent",
-    "tsc": "tsc --noEmit"
+    "tsc": "tsc --noEmit",
+    "code-review-biz": "node .agents/skills/code-review-biz/scripts/code-review-cli.js",
+    "code-review-biz:mr": "node .agents/skills/code-review-biz/scripts/code-review-cli.js --url=",
+    "code-review-biz:push": "node .agents/skills/code-review-biz/scripts/code-review-cli.js --mode=pre-push",
+    "code-review-biz:init": "node .agents/skills/code-review-biz/scripts/lib/init.js init",
+    "code-review-biz:update": "node .agents/skills/code-review-biz/scripts/lib/init.js update",
+    "prepare": "husky install || true"
   },
   "commitlint": {
     "extends": [

package/types.d.ts

@@ -233,7 +233,7 @@ export declare class AntomSDKError extends AntomError<AntomSDKErrorCodes> {
     name: string;
 }
 
-declare const AntomSDKErrorCodes: {
+export declare const AntomSDKErrorCodes: {
     /**
      * @description 找不到主元素
      */
@@ -246,6 +246,26 @@ declare const AntomSDKErrorCodes: {
      * @description WebApp 初始化超时
      */
     readonly SDK_LAUNCH_PAYMENT_APP_ERROR: "SDK_LAUNCH_PAYMENT_APP_ERROR";
+    /**
+     * @description 参数非法，缺少必填参数或参数值不合法
+     */
+    readonly PARAM_INVALID: "PARAM_INVALID";
+    /**
+     * @description channelClientId 查询接口超时
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_TIMEOUT: "CHANNEL_CLIENT_ID_QUERY_TIMEOUT";
+    /**
+     * @description channelClientId 查询返回 success=true 但缺少 channelClientId
+     */
+    readonly CHANNEL_CLIENT_ID_MISSING: "CHANNEL_CLIENT_ID_MISSING";
+    /**
+     * @description channelClientId 查询失败（success=false 或其他异常）
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_FAILED: "CHANNEL_CLIENT_ID_QUERY_FAILED";
+    /**
+     * @description channelClientId 查询失败（请求异常，如网络错误、服务器错误等）
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_ERROR: "CHANNEL_CLIENT_ID_QUERY_ERROR";
     readonly GENERATE_ELEMENT_KEY_FAILED: "GENERATE_ELEMENT_KEY_FAILED";
     readonly ELEMENT_INIT_FAILED: "ELEMENT_INIT_FAILED";
     readonly MOUNT_TIMEOUT: "MOUNT_TIMEOUT";
@@ -275,9 +295,9 @@ declare const AntomSDKErrorCodes: {
     readonly INVALID_REDIRECT_URL: "INVALID_REDIRECT_URL";
 };
 
-declare type AntomSDKErrorCodes = typeof AntomSDKErrorCodes[keyof typeof AntomSDKErrorCodes];
+export declare type AntomSDKErrorCodes = (typeof AntomSDKErrorCodes)[keyof typeof AntomSDKErrorCodes];
 
-export declare type AntomTheme = "default" | "agateGreen" | "night" | "nostalgicGray" | "gamingPurple" | "cherryBlossomPink" | "light";
+export declare type AntomTheme = 'default' | 'agateGreen' | 'night' | 'nostalgicGray' | 'gamingPurple' | 'cherryBlossomPink' | 'light';
 
 declare interface APICallbackOptions {
     requestType: 'fetch' | 'xhr';

package/types.untrimmed.d.ts

@@ -260,7 +260,7 @@ export declare class AntomSDKError extends AntomError<AntomSDKErrorCodes> {
     name: string;
 }
 
-declare const AntomSDKErrorCodes: {
+export declare const AntomSDKErrorCodes: {
     /**
      * @description 找不到主元素
      */
@@ -273,6 +273,26 @@ declare const AntomSDKErrorCodes: {
      * @description WebApp 初始化超时
      */
     readonly SDK_LAUNCH_PAYMENT_APP_ERROR: "SDK_LAUNCH_PAYMENT_APP_ERROR";
+    /**
+     * @description 参数非法，缺少必填参数或参数值不合法
+     */
+    readonly PARAM_INVALID: "PARAM_INVALID";
+    /**
+     * @description channelClientId 查询接口超时
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_TIMEOUT: "CHANNEL_CLIENT_ID_QUERY_TIMEOUT";
+    /**
+     * @description channelClientId 查询返回 success=true 但缺少 channelClientId
+     */
+    readonly CHANNEL_CLIENT_ID_MISSING: "CHANNEL_CLIENT_ID_MISSING";
+    /**
+     * @description channelClientId 查询失败（success=false 或其他异常）
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_FAILED: "CHANNEL_CLIENT_ID_QUERY_FAILED";
+    /**
+     * @description channelClientId 查询失败（请求异常，如网络错误、服务器错误等）
+     */
+    readonly CHANNEL_CLIENT_ID_QUERY_ERROR: "CHANNEL_CLIENT_ID_QUERY_ERROR";
     readonly GENERATE_ELEMENT_KEY_FAILED: "GENERATE_ELEMENT_KEY_FAILED";
     readonly ELEMENT_INIT_FAILED: "ELEMENT_INIT_FAILED";
     readonly MOUNT_TIMEOUT: "MOUNT_TIMEOUT";
@@ -302,9 +322,9 @@ declare const AntomSDKErrorCodes: {
     readonly INVALID_REDIRECT_URL: "INVALID_REDIRECT_URL";
 };
 
-declare type AntomSDKErrorCodes = typeof AntomSDKErrorCodes[keyof typeof AntomSDKErrorCodes];
+export declare type AntomSDKErrorCodes = (typeof AntomSDKErrorCodes)[keyof typeof AntomSDKErrorCodes];
 
-export declare type AntomTheme = "default" | "agateGreen" | "night" | "nostalgicGray" | "gamingPurple" | "cherryBlossomPink" | "light";
+export declare type AntomTheme = 'default' | 'agateGreen' | 'night' | 'nostalgicGray' | 'gamingPurple' | 'cherryBlossomPink' | 'light';
 
 declare interface APICallbackOptions {
     requestType: 'fetch' | 'xhr';