@alipay/ams-checkout 0.0.1726046231-dev.0 → 0.0.1726046231-dev.2

package/esm/core/component/element/type.d.ts

@@ -1,15 +1,56 @@
-import { ElementPaymentMethod, ConnectErrorCode } from '../../../types';
-interface BaseMountOptions {
+import { ConnectErrorCode, ElementPaymentMethod } from '../../../types';
+interface BaseMountOptions<T = void> {
+    config?: {};
+}
+export declare enum ThemeType {
+    NostalgicGray = "nostalgicGray",
+    Light = "light",
+    Night = "night",
+    CherryBlossomPink = "cherryBlossomPink",
+    GamingPurple = "gamingPurple",
+    AgateGreen = "agateGreen"
 }
-type Theme = "night" | "light" | "agateGreen" | "nostalgicGray" | "gamingPurple" | "cherryBlossomPink";
 export declare const addressTheme: {
     night: string;
     light: string;
 };
-export interface AddressMountOptions extends BaseMountOptions {
+export declare enum EventCallbackCode {
+    Failed = "Failed",
+    Completed = "Completed"
+}
+export interface IElementOptions {
+    sessionData: string;
+    environment?: string;
+    locale?: string;
+    mode?: string;
+    appearance?: {
+        theme: ThemeType.Light | ThemeType.Night;
+    };
+    onEventCallback?: ({ code, message }: {
+        code: EventCallbackCode;
+        message: string;
+    }) => void;
+    loading?: {
+        onStartLoading: () => void;
+        onEndLoading: () => void;
+    };
+}
+type HideField = 'shippingCountry' | 'shippingName' | 'shippingPhoneNo' | 'shippingRegion' | 'shippingAddress1' | 'shippingZipCode' | 'shippingAddress2';
+export interface AddressMountOptions extends BaseMountOptions<{
+    /**
+     * 是否开启地址联想功能
+     * 0 开启
+     * 1 关闭
+     */
+    autoSaveAsDefaultAddress?: boolean;
+    /**
+     * 隐藏部分地址要素
+     */
+    hideFields?: Array<HideField>;
+}> {
     type: 'address';
     appearance?: {
-        theme: "night" | "light";
+        theme: ThemeType.Light | ThemeType.Night;
     };
     debugProps?: {
         localLink: string;
@@ -18,7 +59,7 @@ export interface AddressMountOptions extends BaseMountOptions {
 export interface LinkAuthMountOptions extends BaseMountOptions {
     type: 'linkAuthentication';
     appearance?: {
-        theme: Theme;
+        theme: ThemeType;
     };
     debugProps?: {
         localLink?: string;
@@ -27,7 +68,7 @@ export interface LinkAuthMountOptions extends BaseMountOptions {
 export interface PaymentMountOptions extends BaseMountOptions {
     type: 'payment';
     appearance?: {
-        theme: Theme;
+        theme: ThemeType;
     };
     debugProps?: {
         localLink: string;
@@ -101,6 +142,7 @@ export interface AddressSubmitData {
     notes: string;
     prefer: '1' | '0';
     shippingId: string;
+    actionFlag: 'I' | 'U' | 'D';
 }
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];

package/esm/core/component/element/type.js

@@ -1,7 +1,21 @@
+export var ThemeType = /*#__PURE__*/function (ThemeType) {
+  ThemeType["NostalgicGray"] = "nostalgicGray";
+  ThemeType["Light"] = "light";
+  ThemeType["Night"] = "night";
+  ThemeType["CherryBlossomPink"] = "cherryBlossomPink";
+  ThemeType["GamingPurple"] = "gamingPurple";
+  ThemeType["AgateGreen"] = "agateGreen";
+  return ThemeType;
+}({});
 export var addressTheme = {
   night: 'NIGHT',
   light: 'LIGHT'
 };
+export var EventCallbackCode = /*#__PURE__*/function (EventCallbackCode) {
+  EventCallbackCode["Failed"] = "Failed";
+  EventCallbackCode["Completed"] = "Completed";
+  return EventCallbackCode;
+}({});
 // export type IMountOptions = AddressMountOptions | LinkAuthMountOptions | PaymentMountOptions;
 
 export var AddressEventCallbackName = /*#__PURE__*/function (AddressEventCallbackName) {
@@ -9,6 +23,4 @@ export var AddressEventCallbackName = /*#__PURE__*/function (AddressEventCallbac
   return AddressEventCallbackName;
 }({});
 
-// export type IMountResult = AddressMountResult | LinkAuthMountResult | PaymentMountResult;
-
-;
+// export type IMountResult = AddressMountResult | LinkAuthMountResult | PaymentMountResult;

package/esm/core/instance/index.d.ts

@@ -79,6 +79,7 @@ export default class AMSSDK {
         normalUrl?: string;
         schemeUrl?: string;
         applinkUrl?: string;
+        callAppJudgeTime?: number;
     }): Promise<void>;
     /**
      * @description Overlay Subscription

package/esm/core/instance/index.js

@@ -418,6 +418,7 @@ var AMSSDK = /*#__PURE__*/function () {
         var normalUrl = (data === null || data === void 0 ? void 0 : data.normalUrl) || '';
         var schemeUrl = (data === null || data === void 0 ? void 0 : data.schemeUrl) || '';
         var applinkUrl = (data === null || data === void 0 ? void 0 : data.applinkUrl) || '';
+        var callAppJudgeTime = (data === null || data === void 0 ? void 0 : data.callAppJudgeTime) || '';
         var jumpFunc = function jumpFunc() {
           if (normalUrl) {
             resolve();
@@ -440,6 +441,9 @@ var AMSSDK = /*#__PURE__*/function () {
             },
             delay: 0
           };
+          if (callAppJudgeTime) {
+            config['resultJudgmentTime'] = callAppJudgeTime;
+          }
           try {
             var callLib = new CallApp(config);
             callLib.open({

package/esm/plugin/component/index.d.ts

@@ -25,6 +25,7 @@ export default class ComponentApp {
     private _appLocationSearch;
     private _renderDisplayType;
     private _multipleCallbackEvents;
+    private _isAppWebview;
     _merchantAppointParam: IMerchantAppointParam;
     private _webAppHeartBeatTimeoutFn;
     constructor(componentOption?: {

package/esm/plugin/component/index.js

@@ -25,6 +25,7 @@ import { ComponentSignEnum, DisplayTypeEnum, eventCodeEnum, MessageName, Platfor
 import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
+import { getBackScheme } from "../../util/getBackScheme";
 import { handlePaymentSessionConfig } from "../payment-element/utils";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
 import { getChannelBehavior } from "./channel";
@@ -57,6 +58,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_appLocationSearch", void 0);
     _defineProperty(this, "_renderDisplayType", DisplayTypeEnum.popup);
     _defineProperty(this, "_multipleCallbackEvents", void 0);
+    _defineProperty(this, "_isAppWebview", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
     this._appVersion = componentOption.appVersion;
@@ -269,6 +271,7 @@ var ComponentApp = /*#__PURE__*/function () {
       var appendAliasContainerId = renderParams.appendAliasContainerId ? "-".concat(this._selector) : '';
       var inlineId = "".concat(COMPONENT_CONTAINER_ID).concat(appendAliasContainerId);
       var insertedNode = this._renderDisplayType === DisplayTypeEnum.inline ? "#".concat(inlineId) : this._selector;
+      this._isAppWebview = renderParams.isAppWebview;
       this.initLoggerMeta();
       this.initSecurity();
       this._performanceData.push({
@@ -700,7 +703,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _channelBehavior$buil, _this6$_renderParams$;
-          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _this6$_renderParams3, _ref11, _ref11$productSceneVe, productSceneVersion, _ref11$productScene, productScene, _ref12, _ref12$action, _ref12$action2, _ref12$action2$enable, enableSignAgreement, _ref12$action2$autoDe, autoDebitWithToken, _ref13, _ref13$paymentMethodI, _ref13$paymentMethodI2, _ref13$paymentMethodI3, paymentMethodType, isAppWebview, backScheme, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -723,9 +726,16 @@ var ComponentApp = /*#__PURE__*/function () {
                 if (ComponentSignEnum.EASY_PAY_WALLET === _this6._componentSign) {
                   _ref11 = params.paymentSessionConfig || {}, _ref11$productSceneVe = _ref11.productSceneVersion, productSceneVersion = _ref11$productSceneVe === void 0 ? '' : _ref11$productSceneVe, _ref11$productScene = _ref11.productScene, productScene = _ref11$productScene === void 0 ? '' : _ref11$productScene;
                   _ref12 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref12$action = _ref12.action, _ref12$action2 = _ref12$action === void 0 ? {} : _ref12$action, _ref12$action2$enable = _ref12$action2.enableSignAgreement, enableSignAgreement = _ref12$action2$enable === void 0 ? false : _ref12$action2$enable, _ref12$action2$autoDe = _ref12$action2.autoDebitWithToken, autoDebitWithToken = _ref12$action2$autoDe === void 0 ? false : _ref12$action2$autoDe;
+                  _ref13 = ((_this6$_renderParams3 = _this6._renderParams) === null || _this6$_renderParams3 === void 0 ? void 0 : _this6$_renderParams3.paymentSessionMetaData) || {}, _ref13$paymentMethodI = _ref13.paymentMethodInfoView, _ref13$paymentMethodI2 = _ref13$paymentMethodI === void 0 ? {} : _ref13$paymentMethodI, _ref13$paymentMethodI3 = _ref13$paymentMethodI2.paymentMethodType, paymentMethodType = _ref13$paymentMethodI3 === void 0 ? '' : _ref13$paymentMethodI3;
                   if (productScene === ProductSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
-                    ///EasyPay 2.0 首次传signAgreement字段
+                    isAppWebview = _this6._isAppWebview || false; ///EasyPay 2.0 首次传signAgreement字段
                     params['signAgreement'] = enableSignAgreement;
+                    if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
+                      backScheme = getBackScheme(undefined, _this6.AMSSDK.logger);
+                      if (backScheme && backScheme !== 'https') {
+                        params['h5FromApp'] = encodeURIComponent(backScheme);
+                      }
+                    }
                   }
                 }
                 // 带上标记告知WebCheckOut SDK已发送submitpay请求
@@ -1371,6 +1381,8 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "handleRedirect",
     value: function handleRedirect(data) {
       var _data$isDestroy,
+        _data$isCallApp,
+        _data$callAppDetectSu,
         _this7 = this;
       var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var _data = typeof data === 'string' ? {
@@ -1380,38 +1392,48 @@ var ComponentApp = /*#__PURE__*/function () {
         schemeUrl: (data === null || data === void 0 ? void 0 : data.schemeUrl) || '',
         normalUrl: (data === null || data === void 0 ? void 0 : data.normalUrl) || '',
         target: data === null || data === void 0 ? void 0 : data.target,
-        isDestroy: (_data$isDestroy = data === null || data === void 0 ? void 0 : data.isDestroy) !== null && _data$isDestroy !== void 0 ? _data$isDestroy : true
+        isDestroy: (_data$isDestroy = data === null || data === void 0 ? void 0 : data.isDestroy) !== null && _data$isDestroy !== void 0 ? _data$isDestroy : true,
+        isCallApp: (_data$isCallApp = data === null || data === void 0 ? void 0 : data.isCallApp) !== null && _data$isCallApp !== void 0 ? _data$isCallApp : false,
+        callAppDetectSuccessDelay: (_data$callAppDetectSu = data === null || data === void 0 ? void 0 : data.callAppDetectSuccessDelay) !== null && _data$callAppDetectSu !== void 0 ? _data$callAppDetectSu : 2000
       });
       this.AMSSDK.logger.logInfo({
         title: 'sdk_event_call_url_start'
       }, _objectSpread({}, data)).send();
-      var successCallback = function successCallback(type, url) {
+      var successCallback = function successCallback(type, url, durationInSeconds) {
         _this7.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
           message: "Successfully opened the app,".concat(type, ": ").concat(url)
         });
-        _this7.AMSSDK.logger.logInfo({
-          title: 'sdk_event_call_url_success'
-        }, {
+        var extra = {
           redirectInfo: JSON.stringify(_data),
           openType: type,
           url: url,
           fromFastSdk: fromFastSdk
-        }).send();
+        };
+        if (durationInSeconds) {
+          extra['durationInSeconds'] = durationInSeconds;
+        }
+        _this7.AMSSDK.logger.logInfo({
+          title: 'sdk_event_call_url_success'
+        }, extra).send();
       };
-      var failCallback = function failCallback(type, url) {
+      var failCallback = function failCallback(type, url, durationInSeconds) {
         _this7.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_ERROR,
           message: "Failed to open app,applinkUrl: ".concat(_data === null || _data === void 0 ? void 0 : _data.applinkUrl, " schemeUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.schemeUrl, " normalUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.normalUrl)
         });
-        _this7.AMSSDK.logger.logInfo({
-          title: 'sdk_error_call_url_failed'
-        }, {
+        var extra = {
           redirectInfo: JSON.stringify(_data),
           openType: type,
           url: url,
           fromFastSdk: fromFastSdk
-        }).send();
+        };
+        if (durationInSeconds) {
+          extra['durationInSeconds'] = durationInSeconds;
+        }
+        _this7.AMSSDK.logger.logInfo({
+          title: 'sdk_error_call_url_failed'
+        }, extra).send();
       };
 
       // 支持 target: _blank，新开tab页打开
@@ -1429,6 +1451,26 @@ var ComponentApp = /*#__PURE__*/function () {
       }
       // 销毁iframe和全局loading
       if (_data !== null && _data !== void 0 && _data.isDestroy) this.cleanContainer();
+      // 唤端
+      if (_data !== null && _data !== void 0 && _data.isCallApp && _data !== null && _data !== void 0 && _data.schemeUrl) {
+        var startCallAppTime = new Date();
+        var detectSuccessDelay = typeof (data === null || data === void 0 ? void 0 : data.callAppDetectSuccessDelay) === 'number' ? data.callAppDetectSuccessDelay : 5000;
+        this.AMSSDK._redirect({
+          schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl,
+          callAppJudgeTime: detectSuccessDelay
+        }).then(function () {
+          var endCallAppTime = new Date();
+          var durationInMilliseconds = endCallAppTime.getTime() - startCallAppTime.getTime();
+          var durationInSeconds = durationInMilliseconds / 1000;
+          successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl, durationInSeconds);
+        }).catch(function () {
+          var endCallAppTime = new Date();
+          var durationInMilliseconds = endCallAppTime.getTime() - startCallAppTime.getTime();
+          var durationInSeconds = durationInMilliseconds / 1000;
+          failCallback(RedirectType.SchemeUrl, _data.schemeUrl, durationInSeconds);
+        });
+        return;
+      }
       this.AMSSDK._redirect({
         applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
       }).then(function () {
@@ -1453,9 +1495,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref13) {
-      var _ref13$closeDialogDat = _ref13.closeDialogData,
-        closeDialogData = _ref13$closeDialogDat === void 0 ? {} : _ref13$closeDialogDat;
+    value: function handleDeclareInfo(_ref14) {
+      var _ref14$closeDialogDat = _ref14.closeDialogData,
+        closeDialogData = _ref14$closeDialogDat === void 0 ? {} : _ref14$closeDialogDat;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });
@@ -1632,6 +1674,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     renderDisplayType: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.renderDisplayType,
                     appearance: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.appearance,
                     notRedirectAfterComplete: ((_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.notRedirectAfterComplete) === true,
+                    isAppWebview: this._isAppWebview,
                     merchantAppointParam: this._merchantAppointParam,
                     allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     /** 地址组件集成的参数 */

package/esm/types/index.d.ts

@@ -110,6 +110,7 @@ export interface IcreateComponent {
         themeType?: string;
         accentColor?: string;
     };
+    isAppWebview?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
 }
 export interface IappendIframeNodesParams extends IcreateComponent {
@@ -660,24 +661,6 @@ export type IAppendParams = {
     componentSign: ComponentSignEnum;
     iframeNodesParams: IappendIframeNodesParams;
 };
-export declare enum EventCallbackCode {
-    Failed = "Failed",
-    Completed = "Completed"
-}
-export interface IElementOptions {
-    sessionData: string;
-    environment?: string;
-    locale?: string;
-    mode?: string;
-    onEventCallback?: ({ code, message }: {
-        code: EventCallbackCode;
-        message: string;
-    }) => void;
-    loading?: {
-        onStartLoading: () => void;
-        onEndLoading: () => void;
-    };
-}
 export declare enum AccountStatusEnum {
     EFFECTIVE = "EFFECTIVE",
     UNREGISTERED = "UNREGISTERED"

package/esm/types/index.js

@@ -209,11 +209,6 @@ export var ProductSceneVersion = /*#__PURE__*/function (ProductSceneVersion) {
   ProductSceneVersion["V2"] = "2.0";
   return ProductSceneVersion;
 }({});
-export var EventCallbackCode = /*#__PURE__*/function (EventCallbackCode) {
-  EventCallbackCode["Failed"] = "Failed";
-  EventCallbackCode["Completed"] = "Completed";
-  return EventCallbackCode;
-}({});
 export var AccountStatusEnum = /*#__PURE__*/function (AccountStatusEnum) {
   AccountStatusEnum["EFFECTIVE"] = "EFFECTIVE";
   AccountStatusEnum["UNREGISTERED"] = "UNREGISTERED";

package/esm/util/getBackScheme.d.ts

@@ -0,0 +1,5 @@
+import { Logger } from './logger';
+/**
+ * 通过配置规则检测 UA 和获得回跳 scheme
+ */
+export declare function getBackScheme(mockUa?: string, logger?: Logger): any;

package/esm/util/getBackScheme.js

@@ -0,0 +1,42 @@
+import { isAndroid, isIOS } from "./ua";
+import { RULES } from "../constant/index";
+/**
+ * 通过配置规则检测 UA 和获得回跳 scheme
+ */
+export function getBackScheme(mockUa, logger) {
+  var ua = mockUa || window.navigator.userAgent || '';
+  // 获取规则
+  var uaMatchedRule = RULES;
+  var matchedRule;
+  var matched = null;
+  for (var i = 0; i < uaMatchedRule.length; i++) {
+    var rule = uaMatchedRule[i];
+    matched = ua.match(rule.matchRule);
+    if (matched) {
+      matchedRule = rule;
+      break;
+    }
+  }
+  if (!matchedRule) {
+    logBackScheme(logger, ua, '');
+    return;
+  }
+  if (isAndroid(ua)) {
+    logBackScheme(logger, ua, matchedRule.andScheme);
+    return matchedRule.andScheme;
+  }
+  if (isIOS(ua)) {
+    logBackScheme(logger, ua, matchedRule.iosScheme);
+    return matchedRule.iosScheme;
+  }
+}
+function logBackScheme(logger, userAgent, scheme) {
+  if (logger) {
+    logger.logInfo({
+      title: 'a3753.b101271.c377460'
+    }, {
+      userAgent: userAgent,
+      backScheme: scheme
+    });
+  }
+}

package/esm/util/ua/index.d.ts

@@ -0,0 +1,2 @@
+export * from './isAndroid';
+export * from './isIOS';

package/esm/util/ua/index.js

@@ -0,0 +1,2 @@
+export * from "./isAndroid";
+export * from "./isIOS";

package/esm/util/ua/isAndroid.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 当前运行环境是否 Android
+ */
+export declare function isAndroid(mockUA?: string): boolean;

package/esm/util/ua/isAndroid.js

@@ -0,0 +1,7 @@
+/**
+ * 当前运行环境是否 Android
+ */
+export function isAndroid(mockUA) {
+  var ua = (mockUA || navigator.userAgent).toLowerCase();
+  return /android|adr|linux/.test(ua);
+}

package/esm/util/ua/isIOS.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 当前运行环境是否 IOS
+ */
+export declare function isIOS(mockUA?: string): boolean;

package/esm/util/ua/isIOS.js

@@ -0,0 +1,7 @@
+/**
+ * 当前运行环境是否 IOS
+ */
+export function isIOS(mockUA) {
+  var ua = (mockUA || navigator.userAgent).toLowerCase();
+  return /iphone|ipad|ipod|ios|macintosh/.test(ua);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1726046231-dev.0",
+  "version": "0.0.1726046231-dev.2",
   "description": "",
   "author": "",
   "main": "esm/index.js",
@@ -16,6 +16,7 @@
   "scripts": {
     "build": "father build",
     "build:w": "father dev",
+    "dev": "father dev",
     "ci": "npm run lint",
     "cov": "jest --coverage",
     "format": "prettier --write --no-error-on-unmatched-pattern \"**/*.{js,jsx,ts,tsx,md,json,css,less}\"",