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

package/esm/util/security.d.ts

@@ -1,4 +1,5 @@
 import { IsecurityConfig, ProductSceneEnum, DeviceIdParameter } from '../types';
+import type { ApdidEnvironment } from './jshield-apdid';
 export declare const getSecurityConfigStorageKey: (scene: ProductSceneEnum) => string;
 export declare enum SecurityRegionEnum {
     SG = "SG",
@@ -23,10 +24,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>;

package/esm/util/security.js

@@ -9,7 +9,7 @@ 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 APDID from "./jshield-apdid/apdid-core.umd.min";
+import { ApdidLoader } from "./jshield-apdid";
 export var getSecurityConfigStorageKey = function getSecurityConfigStorageKey(scene) {
   return "AMSSDK_SECURITY_CONFIG_".concat(scene);
 };
@@ -29,21 +29,110 @@ export var getSecurityHost = function getSecurityHost(region) {
   return securityHost[region] || securityHost[SecurityRegionEnum.SG];
 };
 export var getSecurityScene = function getSecurityScene(product) {
-  console.log('getSecurityScene', product);
   return sceneMap[product] || '';
 };
+
+/**
+ * Map SDK environment string to ApdidEnvironment for CDN URL selection.
+ */
+export var mapEnvironment = function mapEnvironment(env) {
+  if (!env) return 'production';
+  var lower = env.toLowerCase();
+  if (lower === 'pre' || lower === 'light_sandbox') return 'pre';
+  if (lower === 'dev' || lower === 'test' || lower === 'local') return 'dev';
+  return 'production';
+};
 export var Security = /*#__PURE__*/function () {
   function Security(options) {
     _classCallCheck(this, Security);
     _defineProperty(this, "scene", void 0);
     _defineProperty(this, "h5gateway", void 0);
+    _defineProperty(this, "environment", void 0);
+    _defineProperty(this, "apdidLoaded", false);
+    _defineProperty(this, "apdidLoadFailed", false);
     this.scene = options.scene;
     this.h5gateway = options.h5gateway || securityHost[SecurityRegionEnum.SG];
+    this.environment = options.environment;
   }
+
+  /**
+   * Ensure the apdid-core script is loaded async.
+   * Returns true if loaded successfully, false otherwise.
+   * On failure, sets apdidLoadFailed flag for graceful degradation.
+   */
   _createClass(Security, [{
+    key: "ensureApdidLoaded",
+    value: (function () {
+      var _ensureApdidLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var loader, apdidEnv;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!this.apdidLoaded) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return", true);
+            case 2:
+              if (!this.apdidLoadFailed) {
+                _context.next = 4;
+                break;
+              }
+              return _context.abrupt("return", false);
+            case 4:
+              loader = ApdidLoader.getInstance();
+              apdidEnv = mapEnvironment(this.environment);
+              _context.prev = 6;
+              _context.next = 9;
+              return loader.load({
+                environment: apdidEnv,
+                callbacks: {
+                  onLoad: function onLoad(duration) {
+                    console.log("[Security] apdid-core script loaded in ".concat(duration, "ms"));
+                  },
+                  onLoadFailed: function onLoadFailed(error) {
+                    console.error('[Security] apdid-core script load failed:', error.message);
+                  },
+                  onLoadTimeout: function onLoadTimeout() {
+                    console.error('[Security] apdid-core script load timeout');
+                  }
+                }
+              });
+            case 9:
+              this.apdidLoaded = true;
+              return _context.abrupt("return", true);
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](6);
+              console.error('[Security] apdid-core load error, degrading:', _context.t0);
+              this.apdidLoadFailed = true;
+              return _context.abrupt("return", false);
+            case 18:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[6, 13]]);
+      }));
+      function ensureApdidLoaded() {
+        return _ensureApdidLoaded.apply(this, arguments);
+      }
+      return ensureApdidLoaded;
+    }()
+    /**
+     * Get the APDID module from the loader.
+     * Returns undefined if not loaded.
+     */
+    )
+  }, {
+    key: "getAPDIDModule",
+    value: function getAPDIDModule() {
+      var loader = ApdidLoader.getInstance();
+      return loader.getApdidModule();
+    }
+  }, {
     key: "initSecurity",
     value: function initSecurity(successCallback, failCallback) {
-      console.log(this.scene, 'preloadSecuritySDK');
+      var _this = this;
       if (!this.scene) {
         throw new Error('securityConfig parameter error');
       }
@@ -52,12 +141,23 @@ export var Security = /*#__PURE__*/function () {
         console.error(errorMsg);
         throw new Error(errorMsg);
       }
-      this.initToken(successCallback, failCallback);
+
+      // Async: ensure script is loaded before calling initToken
+      this.ensureApdidLoaded().then(function (loaded) {
+        if (!loaded) {
+          failCallback && failCallback('apdid-core script load failed');
+          return;
+        }
+        _this.initToken(successCallback, failCallback);
+      }).catch(function () {
+        failCallback && failCallback('apdid-core script load failed');
+      });
     }
   }, {
     key: "initToken",
     value: function initToken(successCallback, failCallback) {
       try {
+        var APDID = this.getAPDIDModule();
         APDID === null || APDID === void 0 || APDID.initToken(this.scene, {
           host: this.h5gateway
         }, function (success, tokenResult, msg) {
@@ -66,7 +166,6 @@ export var Security = /*#__PURE__*/function () {
           } else {
             failCallback && failCallback(msg);
           }
-          console.log('initToken result tokenResult', JSON.stringify(tokenResult), msg);
         });
       } catch (error) {
         failCallback && failCallback(error === null || error === void 0 ? void 0 : error.toString());
@@ -75,48 +174,48 @@ export var Security = /*#__PURE__*/function () {
   }, {
     key: "pollingGetApdidToken",
     value: function () {
-      var _pollingGetApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(config) {
-        var _this = this;
+      var _pollingGetApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(config) {
+        var _this2 = this;
         var tokenCollectTime, dataPollingInterval, asyncFunc;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               tokenCollectTime = parseInt((config === null || config === void 0 ? void 0 : config.tokenCollectTime) || '0', 10);
               dataPollingInterval = parseInt((config === null || config === void 0 ? void 0 : config.dataPollingInterval) || '500', 10);
               asyncFunc = /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var deviceId, interval, polling;
-                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
                       case 0:
-                        _context2.next = 2;
-                        return _this.getApdidToken();
+                        _context3.next = 2;
+                        return _this2.getApdidToken();
                       case 2:
-                        deviceId = _context2.sent;
+                        deviceId = _context3.sent;
                         if (!deviceId) {
-                          _context2.next = 5;
+                          _context3.next = 5;
                           break;
                         }
-                        return _context2.abrupt("return", resolve(deviceId));
+                        return _context3.abrupt("return", resolve(deviceId));
                       case 5:
                         polling = /*#__PURE__*/function () {
-                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                            return _regeneratorRuntime().wrap(function _callee$(_context) {
-                              while (1) switch (_context.prev = _context.next) {
+                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                              while (1) switch (_context2.prev = _context2.next) {
                                 case 0:
-                                  _context.next = 2;
-                                  return _this.getApdidToken();
+                                  _context2.next = 2;
+                                  return _this2.getApdidToken();
                                 case 2:
-                                  deviceId = _context.sent;
+                                  deviceId = _context2.sent;
                                   if (deviceId) {
                                     clearInterval(interval);
                                     resolve(deviceId);
                                   }
                                 case 4:
                                 case "end":
-                                  return _context.stop();
+                                  return _context2.stop();
                               }
-                            }, _callee);
+                            }, _callee2);
                           }));
                           return function polling() {
                             return _ref2.apply(this, arguments);
@@ -129,22 +228,22 @@ export var Security = /*#__PURE__*/function () {
                         }, tokenCollectTime);
                       case 8:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
-                  }, _callee2);
+                  }, _callee3);
                 }));
                 return function asyncFunc(_x2) {
                   return _ref.apply(this, arguments);
                 };
               }();
-              return _context3.abrupt("return", new Promise(function (resolve) {
+              return _context4.abrupt("return", new Promise(function (resolve) {
                 asyncFunc(resolve);
               }));
             case 4:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
       function pollingGetApdidToken(_x) {
         return _pollingGetApdidToken.apply(this, arguments);
@@ -154,25 +253,37 @@ export var Security = /*#__PURE__*/function () {
   }, {
     key: "getApdidToken",
     value: function () {
-      var _getApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this2 = this;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _getApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this3 = this;
+        var loaded;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context4.abrupt("return", new Promise(function (resolve) {
+              _context5.next = 2;
+              return this.ensureApdidLoaded();
+            case 2:
+              loaded = _context5.sent;
+              if (loaded) {
+                _context5.next = 5;
+                break;
+              }
+              return _context5.abrupt("return", '');
+            case 5:
+              return _context5.abrupt("return", new Promise(function (resolve) {
                 try {
-                  APDID === null || APDID === void 0 || APDID.getApdidToken(_this2.scene, function (tokenResult) {
+                  var APDID = _this3.getAPDIDModule();
+                  APDID === null || APDID === void 0 || APDID.getApdidToken(_this3.scene, function (tokenResult) {
                     resolve(tokenResult === null || tokenResult === void 0 ? void 0 : tokenResult.token);
                   });
                 } catch (error) {
                   resolve('');
                 }
               }));
-            case 1:
+            case 6:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5, this);
       }));
       function getApdidToken() {
         return _getApdidToken.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1783663570-dev.1",
+  "version": "0.0.1783663570-dev.2",
   "description": "",
   "author": "",
   "exports": {