@alipay/ams-checkout 0.0.1783663570-dev.7 → 0.0.1783663570-dev.9

package/esm/util/jshield-apdid/apdid-loader.js

@@ -19,7 +19,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * - Concurrent call dedup (shared loadingPromise)
  * - State management: idle -> loading -> ready/failed
  * - Monitoring event hooks (onLoad callback)
- * - Uses dynamic import() for ESM modules
+ * - Uses a module script for ESM modules to avoid dynamic import syntax in the UMD bundle
  */
 
 /** Environment type for CDN URL selection */
@@ -61,9 +61,9 @@ var APDID_GLOBAL_NAME = 'APDID';
  * ApdidLoader - Singleton class responsible for async loading the apdid-core ESM module.
  *
  * Key behaviors:
- * - Uses dynamic import() to load ESM modules
+ * - Uses a module script to load ESM modules
  * - Concurrent calls share the same loading promise
- * - On success, the module export is stored internally
+ * - On success, the APDID global exposed by the module is stored internally
  * - On failure/timeout, the loader degrades gracefully and getApdidModule() returns undefined
  */
 export var ApdidLoader = /*#__PURE__*/function () {
@@ -252,7 +252,7 @@ export var ApdidLoader = /*#__PURE__*/function () {
       return _loadWithRetry;
     }()
     /**
-     * Internal method: attempt to load the ESM module once via dynamic import() (no retry)
+     * Internal method: attempt to load the ESM module once via a module script (no retry)
      */
     )
   }, {
@@ -260,35 +260,72 @@ export var ApdidLoader = /*#__PURE__*/function () {
     value: function _loadModuleOnce(url, config) {
       var _this2 = this;
       var startTime = Date.now();
-      var timeoutId;
 
-      // Race dynamic import() against timeout
-      var importPromise = import( /* webpackIgnore: true */url).then(function (module) {
-        clearTimeout(timeoutId);
-        // ESM default export or namespace
-        var apdidCore = module.default || module;
-        if (apdidCore) {
-          _this2._onLoadSuccess(apdidCore, startTime, config);
-        } else {
-          // Fallback: check window.APDID (UMD bundle loaded separately)
-          var globalApdid = window[APDID_GLOBAL_NAME];
-          if (globalApdid) {
-            _this2._onLoadSuccess(globalApdid, startTime, config);
-          } else {
-            throw new Error("[ApdidLoader] Module loaded but no export and window.".concat(APDID_GLOBAL_NAME, " not found"));
-          }
+      // Older WebViews ignore module scripts without firing load/error events.
+      // Fail fast so the existing retry/degradation flow does not wait for two 10s timeouts.
+      if (!('noModule' in document.createElement('script'))) {
+        return Promise.reject(new Error('[ApdidLoader] Module scripts are not supported'));
+      }
+      return new Promise(function (resolve, reject) {
+        var globalWindow = window;
+        var loadedApdid = globalWindow.APDID;
+        if (loadedApdid) {
+          _this2._onLoadSuccess(loadedApdid, startTime, config);
+          resolve();
+          return;
         }
-      });
-      var timeoutPromise = new Promise(function (_resolve, reject) {
-        timeoutId = setTimeout(function () {
-          if (_this2.state === 'loading') {
-            var _config$callbacks4, _config$callbacks4$on;
-            (_config$callbacks4 = config.callbacks) === null || _config$callbacks4 === void 0 || (_config$callbacks4$on = _config$callbacks4.onLoadTimeout) === null || _config$callbacks4$on === void 0 || _config$callbacks4$on.call(_config$callbacks4);
-            reject(new Error("[ApdidLoader] Module load timeout after ".concat(LOAD_TIMEOUT_MS, "ms: ").concat(url)));
+        var existingScript = Array.from(document.querySelectorAll('script[type="module"]')).find(function (candidate) {
+          return candidate.src === url;
+        });
+        var script = existingScript || document.createElement('script');
+        var settled = false;
+        var cleanup = function cleanup() {
+          clearTimeout(timeoutId);
+          script.removeEventListener('load', handleLoad);
+          script.removeEventListener('error', handleError);
+        };
+        var rejectLoad = function rejectLoad(error) {
+          if (settled) return;
+          settled = true;
+          cleanup();
+
+          // Remove failed scripts so the transparent retry can append a fresh one.
+          if (script.parentNode) {
+            script.parentNode.removeChild(script);
+          }
+          reject(error);
+        };
+        var handleLoad = function handleLoad() {
+          if (settled) return;
+          var apdidCore = globalWindow.APDID;
+          if (!apdidCore) {
+            rejectLoad(new Error("[ApdidLoader] Module loaded but window.".concat(APDID_GLOBAL_NAME, " not found")));
+            return;
           }
+          settled = true;
+          cleanup();
+          _this2._onLoadSuccess(apdidCore, startTime, config);
+          resolve();
+        };
+        var handleError = function handleError() {
+          rejectLoad(new Error("[ApdidLoader] Failed to load module script: ".concat(url)));
+        };
+        var timeoutId = setTimeout(function () {
+          var _config$callbacks4, _config$callbacks4$on;
+          if (settled) return;
+          (_config$callbacks4 = config.callbacks) === null || _config$callbacks4 === void 0 || (_config$callbacks4$on = _config$callbacks4.onLoadTimeout) === null || _config$callbacks4$on === void 0 || _config$callbacks4$on.call(_config$callbacks4);
+          rejectLoad(new Error("[ApdidLoader] Module load timeout after ".concat(LOAD_TIMEOUT_MS, "ms: ").concat(url)));
         }, LOAD_TIMEOUT_MS);
+        script.addEventListener('load', handleLoad);
+        script.addEventListener('error', handleError);
+        if (!existingScript) {
+          script.type = 'module';
+          script.src = url;
+          script.async = true;
+          script.crossOrigin = 'anonymous';
+          (document.head || document.getElementsByTagName('head')[0]).appendChild(script);
+        }
       });
-      return Promise.race([importPromise, timeoutPromise]);
     }
 
     /**

package/esm/util/logger.js

@@ -296,6 +296,6 @@ export var LogConfig = {
   version: 'iteration/20231021',
   mdata: {
     firstLogTime: Date.now(),
-    sdkVersion: "0.0.1783663570-dev.7"
+    sdkVersion: "0.0.1783663570-dev.9"
   }
 };

package/package.json

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

package/types.d.ts

@@ -3238,6 +3238,11 @@ export declare class ExpressElement extends BaseMainElement<ExpressElementConfig
     /** setup 阶段的 renderData，仅供非 Safari PC Apple Pay host-token 路径读取 paymentRequest。 */
     private _renderData;
     private _hostSign;
+    /**
+     * 构造时传入的初始金额。cleanAppConfig 已剔除 amount，setup 阶段透传给 iframe（PayPal 按钮首屏需要）
+     * 与 PayPal channelClientId 查询仍需读它；运行时改额只能走 updateConfig。
+     */
+    private _initialAmount;
     /**
      * 本地事件处理器（绕过 bridge 的 host→webapp 方向限制）。
      * bridge.on 只能监听 iframe 发来的消息；SDK host 主动推送事件给商户时走 _emit → _localHandlers。

package/types.untrimmed.d.ts

@@ -3656,6 +3656,11 @@ export declare class ExpressElement extends BaseMainElement<ExpressElementConfig
     /** setup 阶段的 renderData，仅供非 Safari PC Apple Pay host-token 路径读取 paymentRequest。 */
     private _renderData;
     private _hostSign;
+    /**
+     * 构造时传入的初始金额。cleanAppConfig 已剔除 amount，setup 阶段透传给 iframe（PayPal 按钮首屏需要）
+     * 与 PayPal channelClientId 查询仍需读它；运行时改额只能走 updateConfig。
+     */
+    private _initialAmount;
     /**
      * 本地事件处理器（绕过 bridge 的 host→webapp 方向限制）。
      * bridge.on 只能监听 iframe 发来的消息；SDK host 主动推送事件给商户时走 _emit → _localHandlers。