@alipay/ams-checkout 2.0.20 → 2.0.21

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

@@ -1,3 +1,4 @@
+import type { ShippingInfo } from "../../../modern/index";
 import { ActionForm, ConnectErrorCode, IAmount, IAmountView, IMerchantAppointParam, IPaymentMethod } from '../../../types';
 import AddressProcessor from './elementProcessor/addressProcessor';
 import AuthProcessor from './elementProcessor/authProcessor';
@@ -292,23 +293,6 @@ export interface PaymentSubmitData {
         paymentMethodId?: string;
     };
 }
-export interface ShippingInfo {
-    shippingName: {
-        firstName: string;
-        lastName: string;
-        middleName?: string;
-        fullName?: string;
-    };
-    shippingPhoneNo: string;
-    shippingAddress: {
-        region: string;
-        address1: string;
-        address2: string;
-        city?: string;
-        state?: string;
-        zipCode: string;
-    };
-}
 export interface AddressSubmitData {
     shippingName: {
         firstName: string;
@@ -352,7 +336,8 @@ export interface SubmitFuncParams {
      * - Only effective when payment method is Apple Pay
      * - Invoked via event bridge after user FaceID/TouchID authorization on the payment sheet
      * - Return true: proceed with charge
-     * - Return false / timeout / throw error: abort payment, returns MERCHANT_CONFIRM_ABORT error code
+     * - Return false / throw error: abort payment, returns MERCHANT_CONFIRM_ABORT error code
+     * - Timeout: abort payment, returns MERCHANT_CONFIRM_TIMEOUT error code
      */
     onBeforeConfirm?: () => Promise<boolean>;
 }
@@ -585,4 +570,17 @@ export interface EventDataMap {
     [EVENTNAME.PAYMENTMETHODCHANGED]: PaymentMethodChangedData;
     [EVENTNAME.BILLINGADDRESSCHANGED]: BillingAddressChangedData;
 }
+export interface IElementController {
+    mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<ICommonApiResponse>;
+    submitPayment(params: SubmitFuncParams): Promise<IPaymentApiResponse>;
+    validateFields(): Promise<{
+        isValid: boolean;
+    }>;
+    /**
+     * @deprecated 不要使用，internal experiment方法
+     */
+    updatePayment(paymentSessionData: string): Promise<boolean>;
+    destroy(): void;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
+}
 export {};

package/esm/core/instance/index.d.ts

@@ -11,6 +11,7 @@ import type { AMSCheckoutOptions, IAppendParams, InitSecurityConfig, IoptionsPar
 import { EventCenter } from '../../util/index';
 import { Logger } from '../../util/logger';
 import { Security } from '../../util/security';
+import type { ISecurity } from '../../util/security-registry';
 export default class AMSSDK {
     options: AMSCheckoutOptions;
     originOptions: IoptionsParams;
@@ -37,13 +38,20 @@ export default class AMSSDK {
         scene?: string;
     }): void;
     /**
-     * @description Obtain security SDK through scenario identification
+     * @description Obtain security SDK through scenario identification (async-aware)
+     * Handles three states: ready, loading, not found
      */
-    _getSecuritySDKByProductScene(securityConfig: InitSecurityConfig): Security;
+    _getSecuritySDKByProductScene(securityConfig: InitSecurityConfig): ISecurity;
     /**
-     * @description New security SDK through scenario identification
+     * @description Await security SDK by product scene (async)
+     * Returns the Security instance even if currently loading
      */
-    _newSecuritySDKByScene(securityConfig: InitSecurityConfig, successCallback?: () => void, failCallback?: (errMsg?: string) => void): Security;
+    _awaitSecuritySDKByProductScene(securityConfig: InitSecurityConfig): Promise<Security | undefined>;
+    /**
+     * @description New security SDK through scenario identification (async-aware)
+     * Uses shared SecuritySdkRegistry and triggers ApdidLoader
+     */
+    _newSecuritySDKByScene(securityConfig: InitSecurityConfig, successCallback?: () => void, failCallback?: (errMsg?: string) => void): void;
     /**
      * @description Obtain risk control configuration in local storage
      */

package/esm/core/instance/index.js

@@ -28,7 +28,9 @@ import { EnvironmentEnum, modeEnum, networkModeEnum, osTypeEnum, ProductSceneEnu
 import { checkTimeElapsed, device, EventCenter, getOrSetStorageId, getType, queryParse, safeJson } from "../../util/index";
 import CallApp from "../../util/intl-callapp/es/main";
 import { LogConfig, Logger } from "../../util/logger";
-import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security, SecurityRegionEnum } from "../../util/security";
+import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security, SecurityRegionEnum, mapEnvironment } from "../../util/security";
+import { SecuritySdkRegistry } from "../../util/security-registry";
+import { ApdidLoader } from "../../util/jshield-apdid";
 import { compareVersion } from "../../util/versionCompare";
 import { BusManager, BusMessage } from "../bus";
 import PreloadHelper from "../../foundation/utils/preload_helper";
@@ -166,15 +168,44 @@ var AMSSDK = /*#__PURE__*/function () {
       }, {
         productScene: product
       }).send();
-      var sdk = this._getSecuritySDKByProductScene({
-        product: product || scene
-      });
-      if (sdk) {
-        console.log('[web-sdk] skip init security sdk because it is already loaded');
-        return;
+      var effectiveProduct = product || scene;
+      var storage = this.getSecurityConfigStorage(effectiveProduct);
+      var securityScene = storage.scene || getSecurityScene(effectiveProduct);
+
+      // Check shared registry for all states
+      var registryEntry = SecuritySdkRegistry.get(securityScene);
+      if (registryEntry) {
+        if (registryEntry.status === 'ready') {
+          console.log('[web-sdk] skip init security sdk because it is already loaded');
+          this.logger.logInfo({
+            title: 'sdk_event_securitySdkPreInitSuccess'
+          }, {
+            productScene: product
+          }).send();
+          return;
+        }
+        if (registryEntry.status === 'loading') {
+          console.log('[web-sdk] security sdk is already loading, waiting...');
+          registryEntry.loadingPromise.then(function () {
+            _this.logger.logInfo({
+              title: 'sdk_event_securitySdkPreInitSuccess'
+            }, {
+              productScene: product
+            }).send();
+          }).catch(function (err) {
+            _this.logger.logError({
+              title: 'sdk_error_securitySdkInitFailed',
+              msg: err === null || err === void 0 ? void 0 : err.message
+            }, {
+              productScene: product,
+              sign: 'Active initialization'
+            }).send();
+          });
+          return;
+        }
       }
       this._newSecuritySDKByScene({
-        product: product || scene,
+        product: effectiveProduct,
         region: SecurityRegionEnum.SG
       }, function () {
         _this.logger.logInfo({
@@ -193,13 +224,27 @@ var AMSSDK = /*#__PURE__*/function () {
       });
     }
     /**
-     * @description Obtain security SDK through scenario identification
+     * @description Obtain security SDK through scenario identification (async-aware)
+     * Handles three states: ready, loading, not found
      */
   }, {
     key: "_getSecuritySDKByProductScene",
     value: function _getSecuritySDKByProductScene(securityConfig) {
       var storage = this.getSecurityConfigStorage(securityConfig.product);
       var scene = storage.scene || getSecurityScene(securityConfig.product);
+
+      // First check the shared registry (handles ready/loading/failed states)
+      var registryEntry = SecuritySdkRegistry.get(scene);
+      if (registryEntry) {
+        if (registryEntry.status === 'ready') {
+          return registryEntry.instance;
+        }
+        // Loading or failed - return undefined for backward compatibility
+        // Callers should use _awaitSecuritySDKByProductScene for async access
+        return undefined;
+      }
+
+      // Fallback: check legacy map and preload helper
       var securitySdk = this.securitySdkMap.get(scene);
       if (!securitySdk) {
         securitySdk = PreloadHelper.getSecuritySdk(scene);
@@ -210,24 +255,105 @@ var AMSSDK = /*#__PURE__*/function () {
       }
       return securitySdk;
     }
+
+    /**
+     * @description Await security SDK by product scene (async)
+     * Returns the Security instance even if currently loading
+     */
+  }, {
+    key: "_awaitSecuritySDKByProductScene",
+    value: (function () {
+      var _awaitSecuritySDKByProductScene2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(securityConfig) {
+        var storage, scene, instance;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              storage = this.getSecurityConfigStorage(securityConfig.product);
+              scene = storage.scene || getSecurityScene(securityConfig.product);
+              _context.next = 4;
+              return SecuritySdkRegistry.getInstance(scene);
+            case 4:
+              instance = _context.sent;
+              return _context.abrupt("return", instance);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _awaitSecuritySDKByProductScene(_x) {
+        return _awaitSecuritySDKByProductScene2.apply(this, arguments);
+      }
+      return _awaitSecuritySDKByProductScene;
+    }()
     /**
-     * @description New security SDK through scenario identification
+     * @description New security SDK through scenario identification (async-aware)
+     * Uses shared SecuritySdkRegistry and triggers ApdidLoader
      */
+    )
   }, {
     key: "_newSecuritySDKByScene",
     value: function _newSecuritySDKByScene(securityConfig, successCallback, failCallback) {
+      var _this$options2;
       var storage = this.getSecurityConfigStorage(securityConfig.product);
       var scene = storage.scene || getSecurityScene(securityConfig.product);
       var h5gateway = storage.h5gateway || getSecurityHost(securityConfig.region);
+
+      // Check if already exists in registry (avoid duplicates)
+      var existingEntry = SecuritySdkRegistry.get(scene);
+      if (existingEntry) {
+        if (existingEntry.status === 'ready') {
+          successCallback && successCallback();
+          return;
+        }
+        if (existingEntry.status === 'loading') {
+          // Wait for existing loading to complete
+          existingEntry.loadingPromise.then(function () {
+            successCallback && successCallback();
+          }).catch(function (err) {
+            failCallback && failCallback(err === null || err === void 0 ? void 0 : err.message);
+          });
+          return;
+        }
+        // failed status - allow retry by proceeding below
+      }
+
+      // 非阻塞调度 ApdidLoader 加载，不阻塞 SDK 初始化
+      // Security 内部的 ensureApdidLoaded() 会在需要 token 时按需等待加载完成
+      var apdidEnv = mapEnvironment((_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.env) === null || _this$options2 === void 0 ? void 0 : _this$options2.environment);
+      var loader = ApdidLoader.getInstance();
+      loader.scheduleLoad({
+        environment: apdidEnv
+      });
       try {
+        var _this$options3;
+        var environment = (_this$options3 = this.options) === null || _this$options3 === void 0 || (_this$options3 = _this$options3.env) === null || _this$options3 === void 0 ? void 0 : _this$options3.environment;
         var securitySdk = new Security({
           scene: scene,
-          h5gateway: h5gateway
+          h5gateway: h5gateway,
+          environment: environment
+        });
+
+        // Create loading promise and register in registry
+        var loadingPromise = new Promise(function (resolveLoading, rejectLoading) {
+          securitySdk.initSecurity(function () {
+            SecuritySdkRegistry.setReady(scene, securitySdk);
+            successCallback && successCallback();
+            resolveLoading(securitySdk);
+          }, function (msg) {
+            SecuritySdkRegistry.setFailed(scene, new Error(msg || 'Security init failed'));
+            failCallback && failCallback(msg);
+            rejectLoading(new Error(msg || 'Security init failed'));
+          });
         });
+
+        // Register as loading in the shared registry
+        SecuritySdkRegistry.setLoading(scene, loadingPromise);
+
+        // Also keep reference in the legacy map for backward compatibility
         this.securitySdkMap.set(scene, securitySdk);
-        securitySdk.initSecurity(successCallback, failCallback);
-        return securitySdk;
       } catch (error) {
+        SecuritySdkRegistry.setFailed(scene, new Error(error === null || error === void 0 ? void 0 : error.toString()));
         failCallback && failCallback(error === null || error === void 0 ? void 0 : error.toString());
       }
     }
@@ -333,17 +459,17 @@ var AMSSDK = /*#__PURE__*/function () {
       if (options !== null && options !== void 0 && options.onBeforeSubmit) {
         if (typeof (options === null || options === void 0 ? void 0 : options.onBeforeSubmit) !== 'function') throw new Error(ERRORMESSAGE.INIT_PARAMETER_ERROR.EVENT_ERROR.message);
         this._overrideSubscription(EVENT.beforeSubmit.name, /*#__PURE__*/function () {
-          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(payload) {
+          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload) {
             var eventCallbackId, res;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   eventCallbackId = uuid();
-                  _context.prev = 1;
-                  _context.next = 4;
+                  _context2.prev = 1;
+                  _context2.next = 4;
                   return options.onBeforeSubmit(payload);
                 case 4:
-                  res = _context.sent;
+                  res = _context2.sent;
                   _this2._componentApp.dispatchToApp({
                     context: {
                       event: EVENT.beforeSubmitDone.name,
@@ -351,11 +477,11 @@ var AMSSDK = /*#__PURE__*/function () {
                       data: res
                     }
                   });
-                  _context.next = 12;
+                  _context2.next = 12;
                   break;
                 case 8:
-                  _context.prev = 8;
-                  _context.t0 = _context["catch"](1);
+                  _context2.prev = 8;
+                  _context2.t0 = _context2["catch"](1);
                   _this2._componentApp.dispatchToApp({
                     context: {
                       event: EVENT.beforeSubmitDone.name,
@@ -367,15 +493,15 @@ var AMSSDK = /*#__PURE__*/function () {
                   });
                   _this2.logger.logError({
                     title: 'sdk_error_before_submit',
-                    msg: JSON.stringify(_context.t0)
+                    msg: JSON.stringify(_context2.t0)
                   }).send();
                 case 12:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
-            }, _callee, null, [[1, 8]]);
+            }, _callee2, null, [[1, 8]]);
           }));
-          return function (_x) {
+          return function (_x2) {
             return _ref2.apply(this, arguments);
           };
         }(), EVENT.beforeSubmit.uniqueKey);

package/esm/foundation/service/event-center.js

@@ -103,7 +103,7 @@ export var EventCenter = /*#__PURE__*/function () {
       if (!this.iframes.some(function (iframe) {
         return iframe.origin === e.origin;
       })) return;
-      if (((_e$data = e.data) === null || _e$data === void 0 ? void 0 : _e$data.source) === 'react-devtools-content-script') {
+      if ((_e$data = e.data) !== null && _e$data !== void 0 && _e$data.source && ['react-devtools-content-script', 'react-devtools-backend-manager', 'react-devtools-bridge'].includes(e.data.source)) {
         return; // Ignore messages from React DevTools
       }
       var isJson = isJsonString(e.data);

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

@@ -1,10 +1,9 @@
 import { DeviceIdParameter, IoptionsParams } from '../../../types';
 import { PaymentContext, SDKMetaData, Service } from '../../index';
-import { Security } from './security';
 export declare class SecurityService implements Service {
     private logger;
     private productScene;
-    static securitySdkMap: Map<string, Security>;
+    private environment?;
     init(initOptions: IoptionsParams, instanceId: string, sdkMetaData: SDKMetaData): void;
     update(paymentContext: PaymentContext): void;
     destroy(): void;
@@ -14,11 +13,17 @@ export declare class SecurityService implements Service {
     private _initSecurity;
     private logDeviceId;
     /**
-     * @description Obtain security SDK through scenario identification
+     * Get the scene string from product enum
+     */
+    private _getSceneByProduct;
+    /**
+     * @description Obtain security SDK through scenario identification (async-aware)
+     * Handles three states: ready, loading, not found
      */
     private _getSecuritySDKByProductScene;
     /**
-     * @description New security SDK through scenario identification
+     * @description New security SDK through scenario identification (async)
+     * Uses shared SecuritySdkRegistry to avoid duplicate initialization
      */
     private _newSecuritySDKByScene;
     /**