@alipay/ams-checkout 0.0.1776306844-dev.2 → 0.0.1777017092-dev.0

package/esm/util/security-registry.js

@@ -0,0 +1,175 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
+/**
+ * SecuritySdkRegistry - Shared registry for Security SDK instances
+ *
+ * Unifies the securitySdkMap management across SecurityService, PreloadHelper, and AMSSDK.
+ * Supports three states: loading, ready, failed to handle async script loading.
+ *
+ * Key behaviors:
+ * - scene-based key (same as the original securitySdkMap key)
+ * - 'loading' state holds a shared loadingPromise so concurrent callers can await the same promise
+ * - 'ready' state holds the Security instance
+ * - 'failed' state holds the error
+ *
+ * Uses a generic interface to avoid tight coupling to a specific Security class
+ * (there are two Security class implementations in the codebase).
+ */
+/**
+ * Minimal interface for Security SDK instances stored in the registry.
+ * Both Security class implementations (util/security and foundation/service/security/security) satisfy this.
+ */
+/**
+ * Security SDK entry states:
+ * - loading: Security instance is being created and initialized (holds shared promise)
+ * - ready: Security instance is available
+ * - failed: Security initialization failed (holds error)
+ */
+/**
+ * SecuritySdkRegistry - Singleton registry for Security SDK instances
+ */
+var SecuritySdkRegistryClass = /*#__PURE__*/function () {
+  function SecuritySdkRegistryClass() {
+    _classCallCheck(this, SecuritySdkRegistryClass);
+    _defineProperty(this, "registry", new Map());
+  }
+  _createClass(SecuritySdkRegistryClass, [{
+    key: "get",
+    value: /** Get the registry entry for a scene */
+    function get(scene) {
+      return this.registry.get(scene);
+    }
+
+    /** Set a loading entry with its promise */
+  }, {
+    key: "setLoading",
+    value: function setLoading(scene, loadingPromise) {
+      this.registry.set(scene, {
+        status: 'loading',
+        loadingPromise: loadingPromise
+      });
+    }
+
+    /** Set a ready entry with the Security instance */
+  }, {
+    key: "setReady",
+    value: function setReady(scene, instance) {
+      this.registry.set(scene, {
+        status: 'ready',
+        instance: instance
+      });
+    }
+
+    /** Set a failed entry with the error */
+  }, {
+    key: "setFailed",
+    value: function setFailed(scene, error) {
+      this.registry.set(scene, {
+        status: 'failed',
+        error: error
+      });
+    }
+
+    /** Get a ready Security instance, or undefined if not ready */
+  }, {
+    key: "getReadyInstance",
+    value: function getReadyInstance(scene) {
+      var entry = this.registry.get(scene);
+      if (entry && entry.status === 'ready') {
+        return entry.instance;
+      }
+      return undefined;
+    }
+
+    /**
+     * Get a Security instance, awaiting if currently loading.
+     * Returns undefined if not found, failed, or loading fails.
+     */
+  }, {
+    key: "getInstance",
+    value: (function () {
+      var _getInstance = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(scene) {
+        var entry;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              entry = this.registry.get(scene);
+              if (entry) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return", undefined);
+            case 3:
+              if (!(entry.status === 'ready')) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return", entry.instance);
+            case 5:
+              if (!(entry.status === 'loading')) {
+                _context.next = 15;
+                break;
+              }
+              _context.prev = 6;
+              _context.next = 9;
+              return entry.loadingPromise;
+            case 9:
+              return _context.abrupt("return", _context.sent);
+            case 12:
+              _context.prev = 12;
+              _context.t0 = _context["catch"](6);
+              return _context.abrupt("return", undefined);
+            case 15:
+              return _context.abrupt("return", undefined);
+            case 16:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[6, 12]]);
+      }));
+      function getInstance(_x) {
+        return _getInstance.apply(this, arguments);
+      }
+      return getInstance;
+    }() /** Check if a scene has a ready instance */)
+  }, {
+    key: "isReady",
+    value: function isReady(scene) {
+      var entry = this.registry.get(scene);
+      return (entry === null || entry === void 0 ? void 0 : entry.status) === 'ready';
+    }
+
+    /** Check if a scene is currently loading */
+  }, {
+    key: "isLoading",
+    value: function isLoading(scene) {
+      var entry = this.registry.get(scene);
+      return (entry === null || entry === void 0 ? void 0 : entry.status) === 'loading';
+    }
+
+    /** Delete a scene entry */
+  }, {
+    key: "delete",
+    value: function _delete(scene) {
+      return this.registry.delete(scene);
+    }
+
+    /** Clear all entries */
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.registry.clear();
+    }
+  }]);
+  return SecuritySdkRegistryClass;
+}();
+/** Singleton instance of SecuritySdkRegistry */
+export var SecuritySdkRegistry = new SecuritySdkRegistryClass();

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);
 };
@@ -32,17 +32,108 @@ 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');
@@ -52,12 +143,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) {
@@ -75,48 +177,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 +231,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 +256,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.1776306844-dev.2",
+  "version": "0.0.1777017092-dev.0",
   "description": "",
   "author": "",
   "exports": {

package/types.d.ts

@@ -611,7 +611,9 @@ declare class AxiosHeaders {
     ...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>
     ): AxiosHeaders;
 
-    toJSON(asStrings?: boolean): RawAxiosHeaders;
+    toJSON(asStrings: true): Record<string, string>;
+    toJSON(asStrings?: false): Record<string, string | string[]>;
+    toJSON(asStrings?: boolean): Record<string, string | string[]>;
 
     static from(thing?: AxiosHeaders | RawAxiosHeaders | string): AxiosHeaders;
 
@@ -695,6 +697,7 @@ declare interface BaseAppearance<A extends Partial<Appearance>> {
 declare interface BaseBridgeEventMap<AppConfig extends Record<string, any> = Record<string, any>, SubmitReplay extends Record<string, any> = Record<string, any>, SubmitParams extends Record<string, any> = Record<string, any>, AppErrorCodes extends string = string, OpenModalConfig extends BaseOpenModalConfig = BaseOpenModalConfig> {
     error: ErrorPayload<AppErrorCodes>;
     /* Excluded from this release type: "OPENSDK@HANDSHAKE" */
+    /* Excluded from this release type: "OPENSDK@READY_HANDSHAKE" */
     /* Excluded from this release type: "OPENSDK@UPDATE_CONFIG" */
     /* Excluded from this release type: "OPENSDK@HANDSHAKE_ACK" */
     /* Excluded from this release type: "OPENSDK@SUBMIT" */

package/types.untrimmed.d.ts

@@ -638,7 +638,9 @@ declare class AxiosHeaders {
     ...targets: Array<AxiosHeaders | RawAxiosHeaders | string | undefined | null>
     ): AxiosHeaders;
 
-    toJSON(asStrings?: boolean): RawAxiosHeaders;
+    toJSON(asStrings: true): Record<string, string>;
+    toJSON(asStrings?: false): Record<string, string | string[]>;
+    toJSON(asStrings?: boolean): Record<string, string | string[]>;
 
     static from(thing?: AxiosHeaders | RawAxiosHeaders | string): AxiosHeaders;
 
@@ -725,6 +727,10 @@ declare interface BaseBridgeEventMap<AppConfig extends Record<string, any> = Rec
      * @internal 内部事件 不暴露给商户
      */
     "OPENSDK@HANDSHAKE": AppConfig;
+    /**
+     * @internal 内部事件 不暴露给商户
+     */
+    "OPENSDK@READY_HANDSHAKE": void;
     /**
      * @internal 内部事件 不暴露给商户
      */