@alipay/ams-checkout 0.0.1783663570-dev.6 → 0.0.1784095668-dev.0

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 { ApdidLoader } from "./jshield-apdid";
+import APDID from "./jshield-apdid/apdid-core.umd.min";
 export var getSecurityConfigStorageKey = function getSecurityConfigStorageKey(scene) {
   return "AMSSDK_SECURITY_CONFIG_".concat(scene);
 };
@@ -29,110 +29,21 @@ 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) {
-      var _this = this;
+      console.log(this.scene, 'preloadSecuritySDK');
       if (!this.scene) {
         throw new Error('securityConfig parameter error');
       }
@@ -141,23 +52,12 @@ export var Security = /*#__PURE__*/function () {
         console.error(errorMsg);
         throw new Error(errorMsg);
       }
-
-      // 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');
-      });
+      this.initToken(successCallback, failCallback);
     }
   }, {
     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) {
@@ -166,6 +66,7 @@ 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());
@@ -174,48 +75,48 @@ export var Security = /*#__PURE__*/function () {
   }, {
     key: "pollingGetApdidToken",
     value: function () {
-      var _pollingGetApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(config) {
-        var _this2 = this;
+      var _pollingGetApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(config) {
+        var _this = this;
         var tokenCollectTime, dataPollingInterval, asyncFunc;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.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 _callee3(resolve) {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve) {
                   var deviceId, interval, polling;
-                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        _context3.next = 2;
-                        return _this2.getApdidToken();
+                        _context2.next = 2;
+                        return _this.getApdidToken();
                       case 2:
-                        deviceId = _context3.sent;
+                        deviceId = _context2.sent;
                         if (!deviceId) {
-                          _context3.next = 5;
+                          _context2.next = 5;
                           break;
                         }
-                        return _context3.abrupt("return", resolve(deviceId));
+                        return _context2.abrupt("return", resolve(deviceId));
                       case 5:
                         polling = /*#__PURE__*/function () {
-                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                              while (1) switch (_context2.prev = _context2.next) {
+                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                            return _regeneratorRuntime().wrap(function _callee$(_context) {
+                              while (1) switch (_context.prev = _context.next) {
                                 case 0:
-                                  _context2.next = 2;
-                                  return _this2.getApdidToken();
+                                  _context.next = 2;
+                                  return _this.getApdidToken();
                                 case 2:
-                                  deviceId = _context2.sent;
+                                  deviceId = _context.sent;
                                   if (deviceId) {
                                     clearInterval(interval);
                                     resolve(deviceId);
                                   }
                                 case 4:
                                 case "end":
-                                  return _context2.stop();
+                                  return _context.stop();
                               }
-                            }, _callee2);
+                            }, _callee);
                           }));
                           return function polling() {
                             return _ref2.apply(this, arguments);
@@ -228,22 +129,22 @@ export var Security = /*#__PURE__*/function () {
                         }, tokenCollectTime);
                       case 8:
                       case "end":
-                        return _context3.stop();
+                        return _context2.stop();
                     }
-                  }, _callee3);
+                  }, _callee2);
                 }));
                 return function asyncFunc(_x2) {
                   return _ref.apply(this, arguments);
                 };
               }();
-              return _context4.abrupt("return", new Promise(function (resolve) {
+              return _context3.abrupt("return", new Promise(function (resolve) {
                 asyncFunc(resolve);
               }));
             case 4:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4);
+        }, _callee3);
       }));
       function pollingGetApdidToken(_x) {
         return _pollingGetApdidToken.apply(this, arguments);
@@ -253,37 +154,25 @@ export var Security = /*#__PURE__*/function () {
   }, {
     key: "getApdidToken",
     value: function () {
-      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) {
+      var _getApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this2 = this;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _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) {
+              return _context4.abrupt("return", new Promise(function (resolve) {
                 try {
-                  var APDID = _this3.getAPDIDModule();
-                  APDID === null || APDID === void 0 || APDID.getApdidToken(_this3.scene, function (tokenResult) {
+                  APDID === null || APDID === void 0 || APDID.getApdidToken(_this2.scene, function (tokenResult) {
                     resolve(tokenResult === null || tokenResult === void 0 ? void 0 : tokenResult.token);
                   });
                 } catch (error) {
                   resolve('');
                 }
               }));
-            case 6:
+            case 1:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4);
       }));
       function getApdidToken() {
         return _getApdidToken.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1783663570-dev.6",
+  "version": "0.0.1784095668-dev.0",
   "description": "",
   "author": "",
   "exports": {
@@ -36,15 +36,14 @@
     "README.md"
   ],
   "scripts": {
-    "build": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:umd && npm run build:father:tools  && npm run build:react",
+    "build": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father && npm run build:father:umd && npm run build:react",
     "build:analyze": "ANALYZE=1 father build",
-    "build:father:pre": "father build",
-    "build:father:pre:local": "STAGE_NAME=LOCAL father build",
-    "build:father:tools": "FATHER_BUILD_TYPE=only-umd-tools father build --no-clean",
-    "build:father:tools:local": "STAGE_NAME=LOCAL FATHER_BUILD_TYPE=only-umd-tools father build --no-clean",
+    "build:father": "FATHER_TSCONFIG_NAME=tsconfig.build.json father build",
+    "build:father:local": "STAGE_NAME=LOCAL FATHER_TSCONFIG_NAME=tsconfig.build.json father build",
+    "build:father:pre": "FATHER_BUILD_TYPE=prebuild father build",
     "build:father:umd": "FATHER_BUILD_TYPE=only-umd father build",
     "build:father:umd:local": "STAGE_NAME=LOCAL FATHER_BUILD_TYPE=only-umd father build",
-    "build:local": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:umd:local  && npm run build:father:tools:local && npm run build:react",
+    "build:local": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:local && npm run build:father:umd:local && npm run build:react",
     "build:react": "tsc --project tsconfig.cjs.json && mv react-js.js react-js.cjs && tsc --project tsconfig.esm.json",
     "build:type": "dts-bundle-generator -o ./types/antom-web-sdk.d.ts ./src/index.ts --no-banner --silent --no-check",
     "build:w": "FATHER_BUILD_TYPE=only-umd  STAGE_NAME=LOCAL father dev",
@@ -54,7 +53,7 @@
     "e2e": "nyc playwright test",
     "e2e:create": "node scripts/e2e-create.js",
     "e2e:ui": "playwright test --ui",
-    "extract": "opensdk extract && tspc -p tsconfig.build.json && rm -rf esm/modern/sdk",
+    "extract": "opensdk extract -p esm/modern/sdk",
     "format": "prettier --write --no-error-on-unmatched-pattern \"**/*.{js,jsx,ts,tsx,md,json,css,less}\"",
     "generateApi": "intl-oneapi generate && prettier --write src/modern/sdk/oneapi",
     "lint": "eslint ./src",
@@ -86,15 +85,12 @@
     ]
   },
   "dependencies": {
+    "@antglobal/create-sdk-loader": "^1.0.5",
     "axios": "^1.3.4",
     "proxy-polyfill": "^0.3.2",
     "uuid": "^9.0.0"
   },
-  "opensdk": {
-    "name": "Antom"
-  },
   "devDependencies": {
-    "@antglobal/create-sdk-loader": "^1.0.5",
     "@babel/core": "^7.20.7",
     "@babel/preset-env": "^7.20.2",
     "@commitlint/cli": "^17.3.0",
@@ -126,9 +122,7 @@
     "serve": "^14.2.5",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
-    "ts-patch": "^3.3.0",
-    "typescript": "^5.x",
-    "typescript-transform-paths": "^3.5.6"
+    "typescript": "^5.x"
   },
   "engines": {
     "install-node": "20"