@alipay/ams-checkout 0.0.1781004142-dev.4 → 0.0.1781004142-dev.6

package/esm/core/component/element/elementController/index.js

@@ -374,7 +374,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, isApplePay, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -402,34 +402,45 @@ var ElementController = /*#__PURE__*/function () {
 
               // Non-Apple Pay: execute onBeforeConfirm at SDK layer directly, abort on failure
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
-              this.serviceMap.Log.logInfo({
-                title: 'sdk_element_submitPayment_beforeConfirm'
-              }, {
-                msg: safeStringify({
-                  isApplePay: isApplePay,
-                  hasOnBeforeConfirm: !!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm),
-                  currentPaymentMethodType: this.currentPaymentMethodType
-                })
-              });
+              paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 27;
+                _context4.next = 34;
                 break;
               }
               BEFORE_CONFIRM_TIMEOUT_MS = 15000;
-              _context4.prev = 11;
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.prev = 12;
               timeoutPromise = new Promise(function (_, reject) {
                 return setTimeout(function () {
                   return reject(new Error('onBeforeConfirm timed out'));
                 }, BEFORE_CONFIRM_TIMEOUT_MS);
               });
-              _context4.next = 15;
+              startTime = Date.now();
+              _context4.next = 17;
               return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
-            case 15:
+            case 17:
               shouldContinue = _context4.sent;
+              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                });
+                shouldContinue = false;
+              }
               if (!(shouldContinue === false)) {
-                _context4.next = 19;
+                _context4.next = 23;
                 break;
               }
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_abort'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
               this.changeLoading(false);
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
@@ -439,21 +450,36 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 19:
-              _context4.next = 27;
-              break;
-            case 21:
-              _context4.prev = 21;
-              _context4.t0 = _context4["catch"](11);
-              this.changeLoading(false);
-              isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
-              this.serviceMap.Log.logError({
-                title: ELEMENT_SPM_MAP.sdk_element_missKeyData
+            case 23:
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_success'
               }, {
-                msg: safeStringify({
-                  error: isTimeout ? 'onBeforeConfirm timed out after 15s' : 'onBeforeConfirm callback error'
-                })
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
               });
+              _context4.next = 32;
+              break;
+            case 26:
+              _context4.prev = 26;
+              _context4.t0 = _context4["catch"](12);
+              isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
+              if (isTimeout) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_error'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
+                  path: 'nonApplePay_sync'
+                });
+              }
+              this.changeLoading(false);
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
@@ -462,10 +488,22 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 27:
+            case 32:
+              _context4.next = 35;
+              break;
+            case 34:
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_skip'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
+                });
+              }
+            case 35:
               recordResult = null;
-              _context4.prev = 28;
-              _context4.next = 31;
+              _context4.prev = 36;
+              _context4.next = 39;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, _yield$_this3$onValid2, _data, errorString, errorResult;
@@ -621,10 +659,10 @@ var ElementController = /*#__PURE__*/function () {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 31:
+            case 39:
               return _context4.abrupt("return", _context4.sent);
-            case 32:
-              _context4.prev = 32;
+            case 40:
+              _context4.prev = 40;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -635,12 +673,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(32);
-            case 37:
+              return _context4.finish(40);
+            case 45:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[11, 21], [28,, 32, 37]]);
+        }, _callee4, this, [[12, 26], [36,, 40, 45]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -178,19 +178,21 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       // requests SDK layer to execute merchant's onBeforeConfirm callback via beforeConfirm event,
       // and returns the result (continue/abort) to iframe via dispatchToApp.
       this.eventCenter.listen(EVENT.beforeConfirm.name, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, shouldContinue, isTimeout;
+        var paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, shouldContinue, isTimeout;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              logger.logInfo({
-                title: 'sdk_element_beforeConfirm_event_received'
-              }, {
-                hasCallback: !!_this2._onBeforeConfirm
-              });
+              paymentMethodType = 'APPLEPAY';
               if (_this2._onBeforeConfirm) {
-                _context.next = 4;
+                _context.next = 5;
                 break;
               }
+              logger.logInfo({
+                title: 'sdk_before_confirm_skip'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -199,18 +201,31 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 }
               });
               return _context.abrupt("return");
-            case 4:
+            case 5:
               BEFORE_CONFIRM_TIMEOUT_MS = 15000;
-              _context.prev = 5;
+              logger.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
+              _context.prev = 7;
               timeoutPromise = new Promise(function (_, reject) {
                 return setTimeout(function () {
                   return reject(new Error('onBeforeConfirm timed out'));
                 }, BEFORE_CONFIRM_TIMEOUT_MS);
               });
-              _context.next = 9;
+              startTime = Date.now();
+              _context.next = 12;
               return Promise.race([_this2._onBeforeConfirm(), timeoutPromise]);
-            case 9:
+            case 12:
               shouldContinue = _context.sent;
+              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                logger.logError({
+                  title: 'sdk_before_confirm_timeout'
+                });
+                shouldContinue = false;
+              }
               logger.logInfo({
                 title: 'sdk_element_beforeConfirm_callback_result'
               }, {
@@ -223,17 +238,28 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: shouldContinue !== false
                 }
               });
-              _context.next = 19;
+              _context.next = 23;
               break;
-            case 14:
-              _context.prev = 14;
-              _context.t0 = _context["catch"](5);
+            case 18:
+              _context.prev = 18;
+              _context.t0 = _context["catch"](7);
               isTimeout = _context.t0 instanceof Error && _context.t0.message === 'onBeforeConfirm timed out';
-              logger.logError({
-                title: 'sdk_element_onBeforeConfirm_error'
-              }, {
-                error: isTimeout ? 'onBeforeConfirm timed out after 15s' : safeStringify(_context.t0)
-              });
+              if (isTimeout) {
+                logger.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'applePay_eventBridge'
+                });
+              } else {
+                logger.logError({
+                  title: 'sdk_before_confirm_error'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  errorMessage: String((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0).slice(0, 200),
+                  path: 'applePay_eventBridge'
+                });
+              }
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -241,11 +267,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: false
                 }
               });
-            case 19:
+            case 23:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[5, 14]]);
+        }, _callee, null, [[7, 18]]);
       })));
     }
   }, {

package/esm/util/spm-map.d.ts

@@ -208,4 +208,10 @@ export declare const SPM_MAP: {
     'Abnormal params recurringInfo': string;
     'Payment processing but user dismissed the sheet': string;
     'User dismissed the sheet': string;
+    sdk_before_confirm_start: string;
+    sdk_before_confirm_success: string;
+    sdk_before_confirm_abort: string;
+    sdk_before_confirm_error: string;
+    sdk_before_confirm_timeout: string;
+    sdk_before_confirm_skip: string;
 };

package/esm/util/spm-map.js

@@ -198,5 +198,11 @@ export var SPM_MAP = _objectSpread({
   'Abnormal params paymentSessionFactor': 'a3753.b101271.c388189.d518377',
   'Abnormal params recurringInfo': 'a3753.b101271.c388189.d518377',
   'Payment processing but user dismissed the sheet': 'a3753.b101271.c388189.d518377',
-  'User dismissed the sheet': 'a3753.b101271.c388189.d518377'
+  'User dismissed the sheet': 'a3753.b101271.c388189.d518377',
+  sdk_before_confirm_start: 'a3753.b204577.c480929',
+  sdk_before_confirm_success: 'a3753.b204577.c480930',
+  sdk_before_confirm_abort: 'a3753.b204577.c480931',
+  sdk_before_confirm_error: 'a3753.b204577.c480932',
+  sdk_before_confirm_timeout: 'a3753.b204577.c480933',
+  sdk_before_confirm_skip: 'a3753.b204577.c480934'
 }, ELEMENT_SPM_MAP);

package/package.json

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