@alipay/ams-checkout 0.0.1783663570-dev.1 → 0.0.1783663570-dev.2

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/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;
     /**

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

@@ -9,20 +9,24 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { ProductSceneEnum } from "../../../types";
-import { Security, SecurityRegionEnum, getSecurityConfigStorageKey, getSecurityHost, getSecurityScene } from "./security";
+import { Security, SecurityRegionEnum, getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, mapEnvironment } from "./security";
 import { getOrSetStorageId, safeJson } from "../../../util";
+import { SecuritySdkRegistry } from "../../../util/security-registry";
+import { ApdidLoader } from "../../../util/jshield-apdid";
 import { ServiceProvider } from '..';
 export var SecurityService = /*#__PURE__*/function () {
   function SecurityService() {
     _classCallCheck(this, SecurityService);
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "productScene", ProductSceneEnum.EASY_PAY);
+    _defineProperty(this, "environment", void 0);
   }
   _createClass(SecurityService, [{
     key: "init",
     value: function init(initOptions, instanceId, sdkMetaData) {
       this.logger = ServiceProvider.getInstance(instanceId).getService('Log');
       this.productScene = sdkMetaData.productScene;
+      this.environment = initOptions === null || initOptions === void 0 ? void 0 : initOptions.environment;
     }
   }, {
     key: "update",
@@ -46,40 +50,44 @@ export var SecurityService = /*#__PURE__*/function () {
               return _context2.abrupt("return", new Promise(function (resolve) {
                 // To avoid rendering being blocked, move the logic to the next event loop for processing
                 setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                  var getDeviceIdStartTime, securitySDK, deviceId;
+                  var getDeviceIdStartTime, product, securitySDK, deviceId;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
                         getDeviceIdStartTime = Date.now();
-                        securitySDK = _this._getSecuritySDKByProductScene({
-                          product: (deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.productScene) || _this.productScene
+                        product = (deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.productScene) || _this.productScene;
+                        _context.next = 4;
+                        return _this._getSecuritySDKByProductScene({
+                          product: product
                         });
+                      case 4:
+                        securitySDK = _context.sent;
                         deviceId = '';
                         if (!securitySDK) {
-                          _context.next = 15;
+                          _context.next = 18;
                           break;
                         }
                         if (!(isPolling && parseInt(deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.tokenCollectTime) > 0)) {
-                          _context.next = 10;
+                          _context.next = 13;
                           break;
                         }
-                        _context.next = 7;
+                        _context.next = 10;
                         return securitySDK.pollingGetApdidToken(deviceIdParameter);
-                      case 7:
+                      case 10:
                         _context.t0 = _context.sent;
-                        _context.next = 13;
+                        _context.next = 16;
                         break;
-                      case 10:
-                        _context.next = 12;
+                      case 13:
+                        _context.next = 15;
                         return securitySDK.getApdidToken();
-                      case 12:
+                      case 15:
                         _context.t0 = _context.sent;
-                      case 13:
+                      case 16:
                         deviceId = _context.t0;
                         _this.logDeviceId(deviceId, getDeviceIdStartTime);
-                      case 15:
+                      case 18:
                         resolve(deviceId);
-                      case 16:
+                      case 19:
                       case "end":
                         return _context.stop();
                     }
@@ -145,6 +153,10 @@ export var SecurityService = /*#__PURE__*/function () {
         var isPre,
           timeout,
           sdkAction,
+          scene,
+          existing,
+          apdidEnv,
+          loader,
           _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -152,17 +164,78 @@ export var SecurityService = /*#__PURE__*/function () {
               isPre = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : false;
               timeout = _args5.length > 1 ? _args5[1] : undefined;
               sdkAction = isPre ? 'PreInit' : 'Init';
-              if (!this._getSecuritySDKByProductScene({
-                product: this.productScene
-              })) {
-                _context5.next = 5;
+              scene = this._getSceneByProduct(this.productScene); // Check if already ready
+              if (!SecuritySdkRegistry.isReady(scene)) {
+                _context5.next = 6;
                 break;
               }
               return _context5.abrupt("return", Promise.resolve());
-            case 5:
+            case 6:
+              if (!SecuritySdkRegistry.isLoading(scene)) {
+                _context5.next = 19;
+                break;
+              }
+              existing = SecuritySdkRegistry.get(scene);
+              if (!(existing && existing.status === 'loading')) {
+                _context5.next = 19;
+                break;
+              }
+              _context5.prev = 9;
+              _context5.next = 12;
+              return existing.loadingPromise;
+            case 12:
+              this.logger.logInfo({
+                title: "sdk_event_securitySdk".concat(sdkAction, "Success")
+              }).send();
+              _context5.next = 18;
+              break;
+            case 15:
+              _context5.prev = 15;
+              _context5.t0 = _context5["catch"](9);
+              this.logger.logError({
+                title: 'sdk_error_securitySdkInitFailed'
+              }, {
+                productScene: this.productScene,
+                sign: isPre ? 'Active initialization' : 'SDK internal initialization'
+              }).send();
+            case 18:
+              return _context5.abrupt("return");
+            case 19:
               this.logger.logInfo({
                 title: "sdk_event_securitySdk".concat(sdkAction)
               });
+
+              // 非阻塞调度 ApdidLoader 加载，在浏览器空闲时发起，2s 超时兜底
+              // Security 内部的 ensureApdidLoaded() 会在需要 token 时按需等待加载完成
+              apdidEnv = mapEnvironment(this.environment);
+              loader = ApdidLoader.getInstance();
+              loader.scheduleLoad({
+                environment: apdidEnv,
+                callbacks: {
+                  onLoad: function onLoad(duration) {
+                    _this2.logger.logInfo({
+                      title: 'sdk_event_securitySdkScriptLoaded'
+                    }, {
+                      eventMessage: "".concat(duration)
+                    }).send();
+                  },
+                  onLoadFailed: function onLoadFailed(error) {
+                    _this2.logger.logError({
+                      title: 'sdk_event_securitySdkLoadFailed',
+                      msg: error.message
+                    }, {
+                      productScene: _this2.productScene
+                    }).send();
+                  },
+                  onLoadTimeout: function onLoadTimeout() {
+                    _this2.logger.logError({
+                      title: 'sdk_event_securitySdkScriptLoadTimeout'
+                    }, {
+                      productScene: _this2.productScene
+                    }).send();
+                  }
+                }
+              });
               return _context5.abrupt("return", new Promise(function (resolve, reject) {
                 if (timeout) {
                   setTimeout(function () {
@@ -196,11 +269,11 @@ export var SecurityService = /*#__PURE__*/function () {
                   reject();
                 });
               }));
-            case 7:
+            case 24:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this);
+        }, _callee5, this, [[9, 15]]);
       }));
       function _initSecurity() {
         return _initSecurity3.apply(this, arguments);
@@ -227,34 +300,85 @@ export var SecurityService = /*#__PURE__*/function () {
     }
 
     /**
-     * @description Obtain security SDK through scenario identification
+     * Get the scene string from product enum
      */
   }, {
-    key: "_getSecuritySDKByProductScene",
-    value: function _getSecuritySDKByProductScene(securityConfig) {
-      var storage = this._getSecurityConfigStorage(securityConfig.product);
-      var scene = storage.scene || getSecurityScene(securityConfig.product);
-      var securitySdk = SecurityService.securitySdkMap.get(scene);
-      return securitySdk;
+    key: "_getSceneByProduct",
+    value: function _getSceneByProduct(product) {
+      var storage = this._getSecurityConfigStorage(product);
+      return storage.scene || getSecurityScene(product);
     }
 
     /**
-     * @description New 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 () {
+      var _getSecuritySDKByProductScene2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(securityConfig) {
+        var scene;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              scene = this._getSceneByProduct(securityConfig.product);
+              return _context6.abrupt("return", SecuritySdkRegistry.getInstance(scene));
+            case 2:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function _getSecuritySDKByProductScene(_x3) {
+        return _getSecuritySDKByProductScene2.apply(this, arguments);
+      }
+      return _getSecuritySDKByProductScene;
+    }()
+    /**
+     * @description New security SDK through scenario identification (async)
+     * Uses shared SecuritySdkRegistry to avoid duplicate initialization
+     */
+    )
   }, {
     key: "_newSecuritySDKByScene",
     value: function _newSecuritySDKByScene(securityConfig, successCallback, failCallback) {
       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 && (existingEntry.status === 'ready' || existingEntry.status === 'loading')) {
+        if (existingEntry.status === 'ready') {
+          successCallback && successCallback();
+        }
+        // If loading, the existing callbacks will handle it
+        return;
+      }
       try {
         var securitySdk = new Security({
           scene: scene,
-          h5gateway: h5gateway
+          h5gateway: h5gateway,
+          environment: this.environment
         });
-        SecurityService.securitySdkMap.set(scene, securitySdk);
-        securitySdk.initSecurity(successCallback, failCallback);
+
+        // 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);
       } 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());
       }
     }
@@ -280,5 +404,4 @@ export var SecurityService = /*#__PURE__*/function () {
     }
   }]);
   return SecurityService;
-}();
-_defineProperty(SecurityService, "securitySdkMap", new Map());
+}();

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

@@ -1,4 +1,5 @@
 import { IsecurityConfig, ProductSceneEnum, DeviceIdParameter } from '../../../types';
+import type { ApdidEnvironment } from '../../../util/jshield-apdid';
 export declare const getSecurityConfigStorageKey: (scene: ProductSceneEnum) => string;
 export declare enum SecurityRegionEnum {
     SG = "SG",
@@ -22,10 +23,30 @@ export declare const sceneMap: {
 };
 export declare const getSecurityHost: (region: string) => string;
 export declare const getSecurityScene: (product: string) => string;
+/**
+ * Map SDK environment string to ApdidEnvironment for CDN URL selection.
+ */
+export declare const mapEnvironment: (env?: string) => ApdidEnvironment;
 export declare class Security {
     scene: string;
     h5gateway: string;
-    constructor(options: IsecurityConfig);
+    private environment?;
+    private apdidLoaded;
+    private apdidLoadFailed;
+    constructor(options: IsecurityConfig & {
+        environment?: string;
+    });
+    /**
+     * Ensure the apdid-core script is loaded async.
+     * Returns true if loaded successfully, false otherwise.
+     * On failure, sets apdidLoadFailed flag for graceful degradation.
+     */
+    private ensureApdidLoaded;
+    /**
+     * Get the APDID module from the loader.
+     * Returns undefined if not loaded.
+     */
+    private getAPDIDModule;
     initSecurity(successCallback: any, failCallback: any): void;
     private initToken;
     pollingGetApdidToken(config?: DeviceIdParameter): Promise<string>;