@alipay/ams-checkout 0.0.1730107332-dev.5 → 0.0.1730107332-dev.7

package/esm/foundation/product-processor/easysafepay/deps.d.ts

@@ -1,18 +1,18 @@
 export type { SDKMetaData } from "../..";
+export { v4 as uuid } from 'uuid';
+export type { BizFlowStartBehavior, PaymentContext, ProductProcessor, RedirectBehaviorPayload, RenderBehaviorPayload, } from '../..';
 export * as ChannelCustomize from '../../../component/channel';
 export type { IChannelBehavior } from '../../../component/channel';
 export { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from '../../../types';
-export { ProductInfoCacheUtil } from '../../utils/payment_product_utils';
-export { v4 as uuid } from 'uuid';
 export type { CashierSdkActionQueryRequest, CashierSdkActionQueryResult, CashierSubmitPayRequest, CashierSubmitPayResult, IOptionsParams, } from '../../../types';
-export { isPC } from '../../../util';
+export { isEmpty, isPC } from '../../../util';
 export { getBackScheme } from '../../../util/getBackScheme';
 export { isLocalMock } from '../../../util/mock';
-export type { BizFlowStartBehavior, PaymentContext, ProductProcessor, RedirectBehaviorPayload, RenderBehaviorPayload } from '../..';
 export { ServiceProvider } from '../../service';
 export type { ContainerService } from '../../service/container';
 export type { EventCenter } from '../../service/event-center';
 export { LogService } from '../../service/log';
 export type { RequesterService } from '../../service/requester/requester';
 export type { SecurityService } from '../../service/security';
+export { ProductInfoCacheUtil } from '../../utils/payment_product_utils';
 export * as WebAppUrlUtil from '../../utils/web_app_url_utils';

package/esm/foundation/product-processor/easysafepay/deps.js

@@ -1,12 +1,12 @@
+export { v4 as uuid } from 'uuid';
 import * as _ChannelCustomize from "../../../component/channel";
 export { _ChannelCustomize as ChannelCustomize };
 export { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from "../../../types";
-export { ProductInfoCacheUtil } from "../../utils/payment_product_utils";
-export { v4 as uuid } from 'uuid';
-export { isPC } from "../../../util";
+export { isEmpty, isPC } from "../../../util";
 export { getBackScheme } from "../../../util/getBackScheme";
 export { isLocalMock } from "../../../util/mock";
 export { ServiceProvider } from "../../service";
 export { LogService } from "../../service/log";
+export { ProductInfoCacheUtil } from "../../utils/payment_product_utils";
 import * as _WebAppUrlUtil from "../../utils/web_app_url_utils";
 export { _WebAppUrlUtil as WebAppUrlUtil };

package/esm/foundation/product-processor/easysafepay/index.js

@@ -16,7 +16,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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); }
-import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, ProductInfoCacheUtil, ProductSceneEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
+import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, ProductInfoCacheUtil, ProductSceneEnum, ServiceProvider, uuid, WebAppUrlUtil, isEmpty } from "./deps";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -216,8 +216,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([this.processSubmitPay, webLaunchPromise]).then(function (_ref) {
-        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6, _this2$paymentContext7, _this2$paymentContext8;
+      Promise.all([this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
+        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6, _this2$paymentContext7, _this2$paymentContext8, _this2$paymentContext9;
         var _ref2 = _slicedToArray(_ref, 2),
           submitRes = _ref2[0],
           launchRes = _ref2[1];
@@ -225,18 +225,21 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
-            queryResult: _objectSpread(_objectSpread({}, (_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj), {}, {
-              orderAmount: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 || (_this2$paymentContext2 = _this2$paymentContext2.paymentSessionObj) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$paymentContext2.paymentView // For ESP 1.0
-            }),
-            sessionResult: (_this2$paymentContext3 = _this2.paymentContext) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.paymentSessionObj,
+            queryResult: isEmpty((_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj) ? {
+              success: false
+            } : _objectSpread({
+              success: true,
+              orderAmount: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 || (_this2$paymentContext2 = _this2$paymentContext2.paymentSessionObj) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$paymentContext2.paymentView
+            }, (_this2$paymentContext3 = _this2.paymentContext) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.paymentSessionObj),
+            sessionResult: (_this2$paymentContext4 = _this2.paymentContext) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.paymentSessionObj,
             submitResult: submitRes,
-            paymentSessionData: (_this2$paymentContext4 = _this2.paymentContext) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.paymentSession,
+            paymentSessionData: (_this2$paymentContext5 = _this2.paymentContext) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.paymentSession,
             heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
             renderDisplayType: _this2.paymentContext.displayInfo.type,
-            appearance: (_this2$paymentContext5 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.appearance,
-            notRedirectAfterComplete: ((_this2$paymentContext6 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.notRedirectAfterComplete) === true,
+            appearance: (_this2$paymentContext6 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.appearance,
+            notRedirectAfterComplete: ((_this2$paymentContext7 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext7 === void 0 ? void 0 : _this2$paymentContext7.notRedirectAfterComplete) === true,
             isAppWebview: _this2.paymentContext.startBizFlowOptions.isAppWebview,
-            merchantAppointParam: (_this2$paymentContext7 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext7 === void 0 ? void 0 : _this2$paymentContext7.merchantAppointParam,
+            merchantAppointParam: (_this2$paymentContext8 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext8 === void 0 ? void 0 : _this2$paymentContext8.merchantAppointParam,
             allowSubmitPayCallAhead: _this2.allowSubmitPayCallAhead,
             envInfo: {
               screenHeight: screen.height,
@@ -246,7 +249,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               trackId: logMetaData.requestSeq,
               platform: logMetaData.platform,
               firstLogTime: logMetaData.firstLogTime
-            }, ((_this2$paymentContext8 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext8 === void 0 ? void 0 : _this2$paymentContext8.paymentSessionConfig) || {}), {}, {
+            }, ((_this2$paymentContext9 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext9 === void 0 ? void 0 : _this2$paymentContext9.paymentSessionConfig) || {}), {}, {
               renderDisplayType: logMetaData.renderDisplayType,
               sdkVersion: logMetaData.sdkVersion,
               merchantId: logMetaData.merchantId,
@@ -285,15 +288,16 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 }
               }
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
+              console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context2.next = 7;
+                _context2.next = 8;
                 break;
               }
               return _context2.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 7:
+            case 8:
               requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
@@ -313,13 +317,14 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               extParams.complianceSDK = true;
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 13;
+              _context2.prev = 14;
+              console.log('[web-sdk]call submitPay');
               _context2.t0 = requester;
               _context2.t1 = submitParams;
               _context2.t2 = this.initConfig.environment;
-              _context2.next = 19;
+              _context2.next = 21;
               return this.acquireApdidToken();
-            case 19:
+            case 21:
               _context2.t3 = _context2.sent;
               _context2.t4 = {
                 deviceId: _context2.t3
@@ -333,9 +338,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context2.next = 25;
+              _context2.next = 27;
               return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
-            case 25:
+            case 27:
               res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
@@ -345,9 +350,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 traceId: res.traceId
               });
               return _context2.abrupt("return", res);
-            case 30:
-              _context2.prev = 30;
-              _context2.t7 = _context2["catch"](13);
+            case 32:
+              _context2.prev = 32;
+              _context2.t7 = _context2["catch"](14);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
@@ -357,11 +362,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 traceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
               throw _context2.t7;
-            case 34:
+            case 36:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[13, 30]]);
+        }, _callee2, this, [[14, 32]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -424,7 +429,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               return _context4.abrupt("return");
             case 13:
               if (!(productSceneVersion === '2.0')) {
-                _context4.next = 24;
+                _context4.next = 27;
                 break;
               }
               if (!(nonCompliant === true)) {
@@ -436,28 +441,32 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               _context4.next = 18;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
             case 18:
-              _context4.next = 24;
+              _context4.next = 27;
               break;
             case 20:
-              if (isFirstTimeToPay) {
+              if (!isFirstTimeToPay) {
                 _context4.next = 24;
                 break;
               }
+              console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0 and when first time to pay');
+              _context4.next = 27;
+              break;
+            case 24:
               // 切流「隐私合规」且非首次支付
               console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
-              _context4.next = 24;
+              _context4.next = 27;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 24:
-              _context4.next = 28;
+            case 27:
+              _context4.next = 31;
               break;
-            case 26:
-              _context4.prev = 26;
+            case 29:
+              _context4.prev = 29;
               _context4.t0 = _context4["catch"](0);
-            case 28:
+            case 31:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 26]]);
+        }, _callee4, this, [[0, 29]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

package/esm/util/index.d.ts

@@ -36,4 +36,5 @@ declare function loadSDKScript({ src, attrOptions, timeOut, loadCallback }: {
     timeOut?: number;
     loadCallback?: any;
 }, logger: any): Promise<unknown>;
-export { getType, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, };
+declare const isEmpty: (value: any) => boolean;
+export { getType, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, isEmpty, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript, };

package/esm/util/index.js

@@ -251,4 +251,17 @@ function loadSDKScript(_ref, logger) {
     document.head.appendChild(script);
   });
 }
-export { getType, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript };
+var isEmpty = function isEmpty(value) {
+  if (value == null) {
+    // Checks for null and undefined
+    return true;
+  }
+  if (typeof value === 'string' || Array.isArray(value)) {
+    return value.length === 0;
+  }
+  if (_typeof(value) === 'object') {
+    return Object.keys(value).length === 0;
+  }
+  return false; // For other types (like numbers, functions, etc.)
+};
+export { getType, getViewPort, getOrigin, serialize, isJsonString, isDom, isFunction, isEmpty, device, safeJson, isPC, queryParse, getDesignFontSize, amsSetSize, addSetFontSizeEvent, getOrSetStorageId, checkTimeElapsed, parseBase64ToString, loadSDKScript };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1730107332-dev.5",
+  "version": "0.0.1730107332-dev.7",
   "description": "",
   "author": "",
   "main": "esm/index.js",