@alipay/ams-checkout 0.0.1766457560-dev.0 → 0.0.1766664288-dev.1

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

@@ -0,0 +1,10 @@
+export declare enum ProductScene {
+    EXPRESS_CHECKOUT = "EXPRESS_CHECKOUT",
+    ELEMENT_PAYMENT = "ELEMENT_PAYMENT"
+}
+interface EventScenario {
+    eventName: ProductScene;
+    supportedEvents: string[];
+}
+export declare const productEventScenarios: EventScenario[];
+export {};

package/esm/core/component/element/config.js

@@ -0,0 +1,17 @@
+// 定义产品场景的枚举
+export var ProductScene = /*#__PURE__*/function (ProductScene) {
+  ProductScene["EXPRESS_CHECKOUT"] = "EXPRESS_CHECKOUT";
+  ProductScene["ELEMENT_PAYMENT"] = "ELEMENT_PAYMENT";
+  return ProductScene;
+}({});
+
+// 定义一个事件场景的接口
+
+// 存储产品场景及支持的事件名
+export var productEventScenarios = [{
+  eventName: ProductScene.EXPRESS_CHECKOUT,
+  supportedEvents: [] // 没有支持的事件
+}, {
+  eventName: ProductScene.ELEMENT_PAYMENT,
+  supportedEvents: ['paymentMethodChanged'] // 支持的事件
+}];

package/esm/core/component/element/elementController/index.d.ts

@@ -1,4 +1,4 @@
-import { AddressMountOptions, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions } from '../type';
+import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
 declare class ElementController {
     private options;
     private elementContainer;
@@ -33,7 +33,7 @@ declare class ElementController {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<IPaymentApiResponse>;
+    submitPayment(submitParams: SubmitFuncParams): Promise<IPaymentApiResponse>;
     private changeLoading;
     private addEventListener;
     private sendRequestAndWaitWebLaunch;
@@ -44,5 +44,7 @@ declare class ElementController {
     private destroyHandle;
     destroy(): void;
     private setControllerStatusOrView;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
+    private isEventAllowed;
 }
 export default ElementController;

package/esm/core/component/element/elementController/index.js

@@ -40,8 +40,9 @@ import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
 import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
-import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeStringify, showToast } from "../util";
+import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
+import { productEventScenarios, ProductScene } from "../config";
 var TIMEOUT_DURATION = 10000;
 var ElementController = /*#__PURE__*/function () {
   function ElementController(options) {
@@ -337,7 +338,7 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "submitPayment",
     value: function () {
-      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
         var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -369,7 +370,7 @@ var ElementController = /*#__PURE__*/function () {
               _context4.next = 11;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _yield$_this3$onValid2, data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, _yield$_this3$onValid2, _data, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -422,7 +423,7 @@ var ElementController = /*#__PURE__*/function () {
                               }
                             }, _callee2);
                           }));
-                          return function processStep(_x2, _x3) {
+                          return function processStep(_x3, _x4) {
                             return _ref4.apply(this, arguments);
                           };
                         }(); // 按顺序处理步骤
@@ -445,29 +446,28 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 21;
+                          _context3.next = 22;
                           break;
                         }
-                        _context3.next = 17;
+                        params.handleAction = (submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleAction) || false;
+                        _context3.next = 18;
                         return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
-                      case 17:
+                      case 18:
                         _yield$_this3$onValid2 = _context3.sent;
-                        data = _yield$_this3$onValid2.data;
+                        _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
-                        recordResult = data;
+                        recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 21:
+                      case 22:
                         _context3.next = 30;
                         break;
-                      case 23:
-                        _context3.prev = 23;
+                      case 24:
+                        _context3.prev = 24;
                         _context3.t0 = _context3["catch"](2);
-                        // 修复error为{}空对象的问题，上报stack&message
-                        errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
                         errorResult = {
                           error: _objectSpread(_objectSpread({}, ERRORMESSAGE.ERR_DATA_STRUCT_UNRECOGNIZED), {}, {
-                            context: errorString
+                            context: JSON.stringify(_context3.t0)
                           }),
                           status: PaymentStatus.FAIL
                         };
@@ -482,9 +482,9 @@ var ElementController = /*#__PURE__*/function () {
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 23]]);
+                  }, _callee3, null, [[2, 24]]);
                 }));
-                return function (_x) {
+                return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
@@ -509,7 +509,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[8,, 12, 17]]);
       }));
-      function submitPayment() {
+      function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -654,7 +654,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee5, this, [[1, 20]]);
       }));
-      function sendRequestAndWaitWebLaunch(_x4, _x5) {
+      function sendRequestAndWaitWebLaunch(_x5, _x6) {
         return _sendRequestAndWaitWebLaunch.apply(this, arguments);
       }
       return sendRequestAndWaitWebLaunch;
@@ -787,7 +787,7 @@ var ElementController = /*#__PURE__*/function () {
                     }
                   }, _callee6);
                 }));
-                return function (_x7) {
+                return function (_x8) {
                   return _ref5.apply(this, arguments);
                 };
               }()));
@@ -797,7 +797,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee7);
       }));
-      function updatePayment(_x6) {
+      function updatePayment(_x7) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -834,6 +834,30 @@ var ElementController = /*#__PURE__*/function () {
       (_this$onStatusChangeC = this.onStatusChangeCallback) === null || _this$onStatusChangeC === void 0 || _this$onStatusChangeC.call(this, "\u72B6\u6001\u7531 ".concat(_status, " \u53D8\u66F4\u4E3A ").concat(status));
       this.elementContainer.setStatus(status);
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      if (!this.isEventAllowed(event)) {
+        return console.error("Event \"".concat(event, "\" is not allowed."));
+      }
+      this.serviceMap.EventCenter.listen(event, function (data) {
+        callback === null || callback === void 0 || callback(data);
+      });
+    }
+  }, {
+    key: "isEventAllowed",
+    value: function isEventAllowed(event) {
+      var _safeParse, _this$elementContaine;
+      // 获取当前场景
+      var isExpressCheckout = (_safeParse = safeParse((_this$elementContaine = this.elementContainer.getPaymentContext()) === null || _this$elementContaine === void 0 || (_this$elementContaine = _this$elementContaine.paymentSessionObj) === null || _this$elementContaine === void 0 ? void 0 : _this$elementContaine.extendInfo)) === null || _safeParse === void 0 ? void 0 : _safeParse.expressCheckout;
+      var productScene = isExpressCheckout ? ProductScene.EXPRESS_CHECKOUT : ProductScene.ELEMENT_PAYMENT;
+      // 查找对应的产品场景
+      var scenario = productEventScenarios.find(function (s) {
+        return s.eventName === productScene;
+      });
+      // 检查场景存在且事件名称在支持的事件列表中
+      return scenario !== undefined && scenario.supportedEvents.includes(event);
+    }
   }]);
   return ElementController;
 }();

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

@@ -1,4 +1,4 @@
-import { IElementOptions, PaymentMountOptions } from './type';
+import { EventDataMap, EVENTNAME, IElementOptions, PaymentMountOptions, SubmitFuncParams } from './type';
 export declare class ElementComponent {
     private options;
     private controller;
@@ -8,6 +8,7 @@ export declare class ElementComponent {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<import("./type").IPaymentApiResponse>;
+    submitPayment(params: SubmitFuncParams): Promise<import("./type").IPaymentApiResponse>;
     destroy(): void;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
 }

package/esm/core/component/element/index.js

@@ -62,14 +62,19 @@ export var ElementComponent = /*#__PURE__*/function () {
     }
   }, {
     key: "submitPayment",
-    value: function submitPayment() {
-      return this.controller.submitPayment();
+    value: function submitPayment(params) {
+      return this.controller.submitPayment(params);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.controller.destroy();
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      this.controller.on(event, callback);
+    }
   }]);
   return ElementComponent;
 }();

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

@@ -261,9 +261,13 @@ export interface AddressSubmitData {
     shippingId: string;
     actionFlag?: 'I' | 'U' | 'D';
 }
+export interface SubmitFuncParams {
+    handleAction?: boolean;
+}
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];
     shipping?: AddressSubmitData;
+    handleAction?: boolean;
 }
 interface SubmitResultActionForm extends ActionForm {
     paymentCodeExpireTime: string;
@@ -443,4 +447,14 @@ export declare enum EXPOSURE_API_EVENT {
     VALIDATAFIELDS = "validateFields",
     UPDATEPAYMENT = "updatePayment"
 }
+export declare enum EVENTNAME {
+    PAYMENTMETHODCHANGED = "paymentMethodChanged"
+}
+interface PaymentMethodChangedData {
+    type: string;
+    name: string;
+}
+export interface EventDataMap {
+    [EVENTNAME.PAYMENTMETHODCHANGED]: PaymentMethodChangedData;
+}
 export {};

package/esm/core/component/element/type.js

@@ -147,4 +147,10 @@ export var EXPOSURE_API_EVENT = /*#__PURE__*/function (EXPOSURE_API_EVENT) {
   EXPOSURE_API_EVENT["VALIDATAFIELDS"] = "validateFields";
   EXPOSURE_API_EVENT["UPDATEPAYMENT"] = "updatePayment";
   return EXPOSURE_API_EVENT;
-}({});
+}({});
+export var EVENTNAME = /*#__PURE__*/function (EVENTNAME) {
+  EVENTNAME["PAYMENTMETHODCHANGED"] = "paymentMethodChanged";
+  return EVENTNAME;
+}({});
+
+// 支付方式改变的回调函数的数据结构

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

@@ -83,3 +83,4 @@ export declare const isElementPC: () => boolean;
  */
 export declare const isLoadErrorPage: (params: CashierSdkActionQueryResult) => boolean;
 export declare const safeStringify: (payload: any, defaultValue?: string) => string;
+export declare const safeParse: (payload: any, defaultValue?: Record<string, any>) => Record<string, any>;

package/esm/core/component/element/util.js

@@ -63,20 +63,14 @@ export function checkCanMount(_ref) {
     return {
       success: false,
       errorMsg: "Element with selector ".concat(sdkSelector, " not found."),
-      error: {
-        code: ERRORMESSAGE.PARAM_INVALID.code,
-        message: "Element with selector ".concat(sdkSelector, " not found.")
-      }
+      error: ERRORMESSAGE.PARAM_INVALID
     };
   }
   if (status === IElementStatus.DESTROYED) {
     return {
       success: false,
       errorMsg: "Creating components in the destroyed state is forbidden.",
-      error: {
-        code: ERRORMESSAGE.UI_STATE_ERROR.code,
-        message: "Creating components in the destroyed state is forbidden."
-      }
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   if (status === IElementStatus.READY) {
@@ -88,10 +82,7 @@ export function checkCanMount(_ref) {
     return {
       success: false,
       errorMsg: "SDK status error.",
-      error: {
-        code: ERRORMESSAGE.UI_STATE_ERROR.code,
-        message: "SDK status error."
-      }
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   return {
@@ -535,4 +526,14 @@ export var safeStringify = function safeStringify(payload) {
     console.error('JSON.stringify failed:', e);
     return defaultValue;
   }
+};
+export var safeParse = function safeParse(payload) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  if (!payload) return defaultValue;
+  try {
+    return JSON.parse(payload) || defaultValue;
+  } catch (e) {
+    console.error('JSON.parse failed:', e);
+    return defaultValue;
+  }
 };

package/esm/foundation/service/log/index.d.ts

@@ -35,7 +35,6 @@ export declare class LogService implements Service {
     log(type: string, payload: LogPayload, extra?: LogExtra, enableExtractCompliance?: boolean): LogService;
     private reportLogs;
     private loadScript;
-    private fallbackLoadScript;
     private initTracker;
     send(): void;
     setComponentStartTime(val: number): void;

package/esm/foundation/service/log/index.js

@@ -183,43 +183,6 @@ export var LogService = /*#__PURE__*/function () {
   }, {
     key: "loadScript",
     value: function loadScript(url, callback) {
-      var _this3 = this;
-      /*
-      * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
-      * Message: Mismatched anonymous define() module
-      * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
-      * 而宿主环境中已经存在匿名模块，导致报错。
-      *
-      * TODO: 所有通过window.iTracker调用的方法都需要判断
-      *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
-      * */
-      if (typeof window.define === 'function' && window.define.amd && typeof window.require === 'function') {
-        var moduleId = 'antom_iTracker';
-        try {
-          var _specified, _ref;
-          // 避免重复 config
-          if (!((_specified = (_ref = window.require).specified) !== null && _specified !== void 0 && _specified.call(_ref, moduleId))) {
-            // @ts-expect-error amd
-            window.require.config({
-              paths: _defineProperty({}, moduleId, url.replace(/\.js$/, ''))
-            });
-          }
-
-          // @ts-expect-error amd
-          window.require([moduleId], callback, function (err) {
-            console.error('AMD load failed, falling back to script tag', err);
-            _this3.fallbackLoadScript(url, callback);
-          });
-          return;
-        } catch (e) {
-          console.warn('require not available, using script tag', e);
-        }
-      }
-      this.fallbackLoadScript(url, callback);
-    }
-  }, {
-    key: "fallbackLoadScript",
-    value: function fallbackLoadScript(url, callback) {
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = url;
@@ -232,16 +195,16 @@ export var LogService = /*#__PURE__*/function () {
   }, {
     key: "initTracker",
     value: function initTracker() {
-      var _this4 = this;
+      var _this3 = this;
       if (this.isLoaded) return;
       this.isLoaded = true;
       try {
         if (typeof localStorage !== 'undefined') {
           this.loadScript(this.config.scriptUrl, function () {
             var _window4;
-            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this4.config);
+            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this3.config);
             setTimeout(function () {
-              _this4.reportLogs();
+              _this3.reportLogs();
             }, 80);
           });
         }

package/esm/main.js

@@ -238,8 +238,7 @@ export var AMSEasyPay = /*#__PURE__*/function () {
         displayInfo: {
           type: DisplayTypeEnum.popup
         },
-        isAppWebview: params.isAppWebview,
-        isNativeAppWebview: params.isNativeAppWebview
+        isAppWebview: params.isAppWebview
       });
     }
   }, {

package/esm/util/logger.d.ts

@@ -56,7 +56,6 @@ export declare class Logger {
     reportRPC(rpcData: LogPayload, extra?: Extra): Logger;
     reportLogs(): void;
     loadScript(url: string, callback: () => void): void;
-    private fallbackLoadScript;
     initTracker(): void;
     send(): void;
     setComponentStartTime(val: number): void;

package/esm/util/logger.js

@@ -176,43 +176,6 @@ export var Logger = /*#__PURE__*/function () {
   }, {
     key: "loadScript",
     value: function loadScript(url, callback) {
-      var _this5 = this;
-      /*
-       * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
-       * Message: Mismatched anonymous define() module
-       * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
-       * 而宿主环境中已经存在匿名模块，导致报错。
-       *
-       * TODO: 所有通过window.iTracker调用的方法都需要判断
-       *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
-       * */
-      if (typeof window.define === 'function' && window.define.amd && typeof window.require === 'function') {
-        var moduleId = 'antom_iTracker';
-        try {
-          var _specified, _ref;
-          // 避免重复 config
-          if (!((_specified = (_ref = window.require).specified) !== null && _specified !== void 0 && _specified.call(_ref, moduleId))) {
-            // @ts-expect-error amd
-            window.require.config({
-              paths: _defineProperty({}, moduleId, url.replace(/\.js$/, ''))
-            });
-          }
-
-          // @ts-expect-error amd
-          window.require([moduleId], callback, function (err) {
-            console.error('AMD load failed, falling back to script tag', err);
-            _this5.fallbackLoadScript(url, callback);
-          });
-          return;
-        } catch (e) {
-          console.warn('require not available, using script tag', e);
-        }
-      }
-      this.fallbackLoadScript(url, callback);
-    }
-  }, {
-    key: "fallbackLoadScript",
-    value: function fallbackLoadScript(url, callback) {
       var script = document.createElement('script');
       script.type = 'text/javascript';
       script.src = url;
@@ -225,16 +188,16 @@ export var Logger = /*#__PURE__*/function () {
   }, {
     key: "initTracker",
     value: function initTracker() {
-      var _this6 = this;
+      var _this5 = this;
       if (this.isLoaded) return;
       this.isLoaded = true;
       try {
         if (typeof localStorage !== 'undefined') {
           this.loadScript(this.config.scriptUrl, function () {
             var _window4;
-            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this6.config);
+            (_window4 = window) === null || _window4 === void 0 || _window4.iTracker.initiTracker(_this5.config);
             setTimeout(function () {
-              _this6.reportLogs();
+              _this5.reportLogs();
             }, 80);
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1766457560-dev.0",
+  "version": "0.0.1766664288-dev.1",
   "description": "",
   "author": "",
   "main": "esm/index.js",