@alipay/ams-checkout 1.5.8 → 1.5.10

package/esm/plugin/component/popupWindow.style.d.ts

@@ -0,0 +1,6 @@
+export declare const insertStyleSheet: () => void;
+export declare const createModal: ({ device, url }: {
+    device: any;
+    url: any;
+}) => HTMLIFrameElement;
+export declare const destroyModal: () => void;

package/esm/plugin/component/popupWindow.style.js

@@ -0,0 +1,54 @@
+import { AMSPOPUP_PREFIX, ANIMATION_TIME } from "../../constant";
+
+// CSS样式字符串
+var modalStyles = "\n  .".concat(AMSPOPUP_PREFIX, "modal {\n    /* \u6DFB\u52A0\u5F39\u7A97\u6837\u5F0F */\n    background-color: #fff;\n    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    transform: translate(-50%, -50%);\n    z-index: 9999; /* \u8BBE\u7F6E\u5F39\u7A97\u7684\u5C42\u7EA7\u4E3A 9999 */\n    overflow: hidden;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "overlay {\n    /* \u6DFB\u52A0\u8499\u5C42\u6837\u5F0F */\n    position: fixed;\n    top: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    background-color: rgba(0, 0, 0, 0.4);\n    z-index: 999;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeIn {\n    /* \u6DFB\u52A0\u6DE1\u5165\u52A8\u753B */\n    animation: fadeIn ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  .").concat(AMSPOPUP_PREFIX, "fadeOut {\n    /* \u6DFB\u52A0\u6DE1\u51FA\u52A8\u753B */\n    animation: fadeOut ").concat(ANIMATION_TIME, "ms;\n    animation-fill-mode: forwards;\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u5165\u52A8\u753B */\n  @keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-webkit-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  @-moz-keyframes fadeIn {\n    0% {\n      opacity: 0;\n    }\n    100% {\n      opacity: 1;\n    }\n  }\n\n  /* \u5B9A\u4E49\u6DE1\u51FA\u52A8\u753B */\n  @keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-webkit-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n\n  @-moz-keyframes fadeOut {\n    0% {\n      opacity: 1;\n    }\n    100% {\n      opacity: 0;\n    }\n  }\n");
+
+// 创建和插入样式表
+export var insertStyleSheet = function insertStyleSheet() {
+  var style = document.createElement('style');
+  style.innerHTML = modalStyles;
+  document.head.appendChild(style);
+};
+
+// 插入弹窗
+export var createModal = function createModal(_ref) {
+  var device = _ref.device,
+    url = _ref.url;
+  var overlay = document.createElement('div');
+  overlay.classList.add("".concat(AMSPOPUP_PREFIX, "overlay"), "".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  var modal = document.createElement('div');
+  modal.classList.add("".concat(AMSPOPUP_PREFIX, "modal"), "".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  if (device === 'desktop') {
+    modal.style.width = '600px';
+    modal.style.height = '464px';
+    modal.style.borderRadius = '12px';
+  } else {
+    modal.style.width = 'calc(100% - 16px)';
+    modal.style.height = '80%';
+    modal.style.borderRadius = '8px';
+  }
+  var iframe = document.createElement('iframe');
+  iframe.src = url; // 替换为实际的 URL 地址
+  iframe.style.border = 'none';
+  iframe.style.width = '100%';
+  iframe.style.height = '100%';
+  modal.appendChild(iframe);
+  var body = document.getElementsByTagName('body')[0];
+  body.appendChild(overlay);
+  body.appendChild(modal);
+  return iframe;
+};
+
+// 销毁弹窗
+export var destroyModal = function destroyModal() {
+  var overlay = document.querySelector(".".concat(AMSPOPUP_PREFIX, "overlay"));
+  var modal = document.querySelector(".".concat(AMSPOPUP_PREFIX, "modal"));
+  overlay.classList.remove("".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  overlay.classList.add("".concat(AMSPOPUP_PREFIX, "fadeOut"));
+  modal.classList.remove("".concat(AMSPOPUP_PREFIX, "fadeIn"));
+  modal.classList.add("".concat(AMSPOPUP_PREFIX, "fadeOut"));
+  setTimeout(function () {
+    overlay.parentNode.removeChild(overlay);
+    modal.parentNode.removeChild(modal);
+  }, ANIMATION_TIME);
+};

package/esm/request/index.d.ts

@@ -1,8 +1,9 @@
 import { IrequestConfig } from '../types';
+import { Logger } from '../util/logger';
 /**
  *
  * @param requestData 请求参数
  * @param options 请求配置
  * @example request({ name: 'test' }, { operation-type: 'xxx.xxx.xxx' })
  */
-export declare function request<T>(requestData: Record<string, any> | undefined, options: IrequestConfig): Promise<T>;
+export declare function request<T>(requestData: Record<string, any> | undefined, options: IrequestConfig, logger: Logger): Promise<T>;

package/esm/request/index.js

@@ -19,7 +19,6 @@ import { sdkVersion } from "../config/index";
 import { appId, hostSignMap, lightSandboxMap, requestHost, sofaId, tntInstId } from "../config/request";
 import { errorEnum } from "../types";
 import { get } from "../util/get";
-import { getApdidToken, getAppname } from "../util/security";
 import axios from 'axios';
 import { device, fomatGetwayError, isPC, queryParse, safeJson } from "../util";
 var _queryParse = queryParse(),
@@ -59,18 +58,17 @@ function requestInstance(options) {
  * @param options 请求配置
  * @example request({ name: 'test' }, { operation-type: 'xxx.xxx.xxx' })
  */
-export function request(_x, _x2) {
+export function request(_x, _x2, _x3) {
   return _request.apply(this, arguments);
 }
 function _request() {
-  _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(requestData, options) {
-    var myRequest, startTime, envInfo, deviceId, _navigator, _data, _yield$myRequest, data, headers, resData, traceId, handleGetWayError, _error$message, _error, timeoutCode, errorCode;
+  _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(requestData, options, logger) {
+    var _options$envInfo;
+    var envInfo, _navigator, _data, startTime, myRequest, _yield$myRequest, data, headers, resData, traceId, handleGetWayError, errorMessage, errorCode, _error$message, _error, timeoutCode, _errorCode;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          myRequest = requestInstance(options);
-          startTime = Date.now();
-          envInfo = {
+          envInfo = _objectSpread(_objectSpread({
             terminalType: isPC() ? 'WEB' : 'WAP',
             browserInfo: {
               browserJavaScriptEnabled: true,
@@ -78,22 +76,13 @@ function _request() {
               browserUserAgent: navigator.userAgent,
               browserColorDepth: screen.colorDepth
             },
-            locale: options.locale || 'en_US',
             deviceLanguage: navigator.language,
             screenWidth: screen.width,
             screenHeight: screen.height,
             timeZoneOffset: new Date().getTimezoneOffset()
-          };
-          if (!(options !== null && options !== void 0 && options.needDeviceId)) {
-            _context.next = 8;
-            break;
-          }
-          _context.next = 6;
-          return getApdidToken(getAppname('Card'), options === null || options === void 0 ? void 0 : options.waitTime);
-        case 6:
-          deviceId = _context.sent;
-          envInfo.deviceId = deviceId;
-        case 8:
+          }, options === null || options === void 0 ? void 0 : options.envInfo), {}, {
+            locale: (options === null || options === void 0 || (_options$envInfo = options.envInfo) === null || _options$envInfo === void 0 ? void 0 : _options$envInfo.locale) || 'en_US'
+          });
           try {
             envInfo.browserInfo.browserJavaEnabled = ((_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.javaEnabled()) || false;
             // eslint-disable-next-line no-empty
@@ -105,12 +94,14 @@ function _request() {
               refUrl: window.location.href
             }
           })] : [requestData];
-          _context.prev = 11;
-          _context.next = 14;
+          startTime = Date.now();
+          _context.prev = 5;
+          myRequest = requestInstance(options);
+          _context.next = 9;
           return myRequest({
             data: _data
           });
-        case 14:
+        case 9:
           _yield$myRequest = _context.sent;
           data = _yield$myRequest.data;
           headers = _yield$myRequest.headers;
@@ -119,36 +110,68 @@ function _request() {
           resData.traceId = traceId || '';
           handleGetWayError = fomatGetwayError(headers, traceId);
           if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-            _context.next = 23;
+            _context.next = 21;
             break;
           }
+          errorMessage = (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage);
+          errorCode = handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode;
+          logger.reportRPC({
+            name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
+            label: 'request',
+            time: Date.now() - startTime,
+            success: false,
+            code: errorCode,
+            msg: errorMessage,
+            traceId: traceId
+          }, {
+            // TODO Concerned input data
+          }).send();
           throw new Error(JSON.stringify({
-            errorMessage: (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage),
-            errorCode: handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode,
+            errorMessage: errorMessage,
+            errorCode: errorCode,
             success: false
           }));
-        case 23:
+        case 21:
+          logger.reportRPC({
+            name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
+            label: 'request',
+            time: Date.now() - startTime,
+            success: true,
+            code: 'SUCCESS',
+            msg: '',
+            traceId: traceId
+          }).send();
           return _context.abrupt("return", resData);
-        case 26:
-          _context.prev = 26;
-          _context.t0 = _context["catch"](11);
+        case 25:
+          _context.prev = 25;
+          _context.t0 = _context["catch"](5);
           _error = safeJson(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, {
             success: false,
             errorCode: errorEnum.SYSTEM,
-            errorMessage: ''
+            errorMessage: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
           });
           timeoutCode = _context.t0 !== null && _context.t0 !== void 0 && (_error$message = _context.t0.message) !== null && _error$message !== void 0 && _error$message.includes('timeout') ? errorEnum.TIMEOUT : '';
-          errorCode = (_error === null || _error === void 0 ? void 0 : _error.errorCode) || timeoutCode;
+          _errorCode = (_error === null || _error === void 0 ? void 0 : _error.errorCode) || timeoutCode;
+          logger.reportRPC({
+            name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
+            label: 'request',
+            time: Date.now() - startTime,
+            success: false,
+            code: _errorCode,
+            msg: _error === null || _error === void 0 ? void 0 : _error.message
+          }, {
+            // TODO Concerned input data
+          }).send();
           return _context.abrupt("return", Promise.reject({
             success: false,
-            errorCode: errorCode,
-            errorMessage: ''
+            errorCode: _errorCode,
+            errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
           }));
         case 32:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[11, 26]]);
+    }, _callee, null, [[5, 25]]);
   }));
   return _request.apply(this, arguments);
 }

package/esm/service/index.d.ts

@@ -1,2 +1,10 @@
+/**
+ * Copyright (c) 2022 International Business Group, Ant Group. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), the rights to use, copy, modify, merge, and/or distribute the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
+ * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
+ */
+import { Logger } from '../util/logger';
 import { CashierSdkActionQueryRequest, CashierSdkActionQueryResult, IrequestConfig } from '../types';
-export declare function queryPaymentInfo(params?: CashierSdkActionQueryRequest, options?: IrequestConfig): Promise<CashierSdkActionQueryResult>;
+export declare function queryPaymentInfo(params: CashierSdkActionQueryRequest, options: IrequestConfig, logger: Logger): Promise<CashierSdkActionQueryResult>;

package/esm/service/index.js

@@ -14,12 +14,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
+
 import { request } from "../request";
-export function queryPaymentInfo(_x, _x2) {
+export function queryPaymentInfo(_x, _x2, _x3) {
   return _queryPaymentInfo.apply(this, arguments);
 }
 function _queryPaymentInfo() {
-  _queryPaymentInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, options) {
+  _queryPaymentInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, options, logger) {
     var hostSign;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -29,7 +30,7 @@ function _queryPaymentInfo() {
             hostSign: hostSign,
             needEnvInfo: true,
             'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
-          })));
+          }), logger));
         case 2:
         case "end":
           return _context.stop();

package/esm/types/index.d.ts

@@ -22,6 +22,7 @@ export interface IoptionsParams {
     analytics?: {
         enabled: boolean;
     };
+    securityConfig?: IsecurityConfig;
 }
 export type Iselector = string;
 export declare enum renderDisplayTypeEnum {
@@ -58,7 +59,9 @@ export declare enum paymentMethodCategoryTypeEnum {
 }
 export interface IcreateComponent {
     sessionData: string;
+    paymentSessionData?: string;
     appearance?: Record<string, any>;
+    notRedirectAfterComplete?: boolean;
 }
 export interface IappendIframeNodesParams extends IcreateComponent {
     paymentSessionMetaData: IpaymentSessionMetaData;
@@ -81,16 +84,19 @@ interface IpaymentSessionConfig {
     paymentMethodCategoryType: paymentMethodCategoryTypeEnum;
     productSceneVersion: string;
 }
-interface IpaymentSecurityConfig {
+export interface IpaymentSecurityConfig {
     appId: string;
     appName: string;
     bizToken: string;
     gateway: string;
     h5gateway: string;
-    tokenCollectTime: string;
+    tokenCollectTime?: string;
+    dataPollingInterval?: string;
     workSpaceId: string;
 }
 export interface IpaymentSessionMetaData {
+    clientId?: string;
+    renderDisplayType?: string;
     paymentSessionConfig?: IpaymentSessionConfig;
     securityConfig?: IpaymentSecurityConfig;
     moneyView?: any;
@@ -143,6 +149,16 @@ export declare enum platformEnum {
     desktop = "desktop",
     mobile = "mobile"
 }
+type EventCallbackResult = {
+    result: {
+        resultCode: string;
+        resultStatus: string;
+        resultMessage: string;
+    };
+    paymentResultCode?: string;
+    paymentResultMessage?: string;
+    paymentStatus?: string;
+} & Record<string, any>;
 /**
  * @description Create an event handler, called when an error occurs in AMSCheckout.
  */
@@ -163,7 +179,8 @@ export type callOnLog = (state: {
  */
 export type callOnEventCallback = (state: {
     code: string;
-    message: string;
+    message?: string;
+    result?: EventCallbackResult;
 }) => void;
 export type callonPaymentMethodSelected = (state: {
     paymentMethodType: string;
@@ -234,15 +251,15 @@ export interface IrequestConfig {
     beforerRequest?: () => void;
     afterRequest?: () => void;
     needEnvInfo?: boolean;
-    needDeviceId?: boolean;
-    waitTime?: string;
     locale?: string;
     hostSign?: string;
+    envInfo?: Record<string, any>;
 }
 export interface CashierSdkActionQueryRequest {
     paymentSessionData: string;
     paymentSessionConfig?: IpaymentSessionConfig;
     paymentMethodType?: string;
+    notRedirectAfterComplete?: boolean;
     extParams?: any;
 }
 export interface CashierSdkActionQueryResult {
@@ -272,6 +289,27 @@ export declare enum eventCodeEnum {
     SDK_CALL_URL_ERROR = "SDK_CALL_URL_ERROR",
     SDK_CALL_URL_SUCCESS = "SDK_CALL_URL_SUCCESS"
 }
+export interface ThreedData {
+    data: any;
+    method: string;
+    targetUrl: string;
+    pti?: number;
+    pt?: number;
+}
+export declare enum SecuritySceneEnum {
+    CARD = "CARD",
+    EASYPAY = "EASYPAY"
+}
+export interface IsecurityConfig {
+    scene: string;
+    region: string;
+}
+export declare enum RedirectType {
+    ApplinkUrl = "ApplinkUrl",
+    SchemeUrl = "SchemeUrl",
+    NormalUrl = "NormalUrl",
+    Unknown = "Unknown"
+}
 declare global {
     interface Window {
         [key: string]: any;

package/esm/types/index.js

@@ -80,6 +80,7 @@ export var platformEnum = /*#__PURE__*/function (platformEnum) {
   platformEnum["mobile"] = "mobile";
   return platformEnum;
 }({});
+
 /**
  * @description Create an event handler, called when an error occurs in AMSCheckout.
  */
@@ -133,4 +134,16 @@ export var eventCodeEnum = /*#__PURE__*/function (eventCodeEnum) {
   eventCodeEnum["SDK_CALL_URL_ERROR"] = "SDK_CALL_URL_ERROR";
   eventCodeEnum["SDK_CALL_URL_SUCCESS"] = "SDK_CALL_URL_SUCCESS";
   return eventCodeEnum;
+}({});
+export var SecuritySceneEnum = /*#__PURE__*/function (SecuritySceneEnum) {
+  SecuritySceneEnum["CARD"] = "CARD";
+  SecuritySceneEnum["EASYPAY"] = "EASYPAY";
+  return SecuritySceneEnum;
+}({});
+export var RedirectType = /*#__PURE__*/function (RedirectType) {
+  RedirectType["ApplinkUrl"] = "ApplinkUrl";
+  RedirectType["SchemeUrl"] = "SchemeUrl";
+  RedirectType["NormalUrl"] = "NormalUrl";
+  RedirectType["Unknown"] = "Unknown";
+  return RedirectType;
 }({});