@alipay/ams-checkout 0.0.1747014711-dev.6 → 0.0.1747014711-dev.7

package/esm/core/component/ckp/index.js

@@ -9,7 +9,7 @@ import { v4 as uuid } from 'uuid';
 import { EnvironmentEnum } from "../../../types";
 import { queryParse } from "../../../util";
 import { LogConfig, Logger } from "../../../util/logger";
-import { handleRedirect } from "../element/util";
+import { handleRedirect } from "../../../util/redirect";
 var CKP_PAYMENT_PAGE_HOST = {
   DEV: 'https://dev.page.alipay.net',
   TEST: 'https://test.page.alipay.net',

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

@@ -33,7 +33,8 @@ import { ElementContainerService } from "../elementContainerService"; // 引入
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
 import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode } from "../type";
-import { checkCanMount, checkCanUpdate, handleRedirect, showToast } from "../util";
+import { checkCanMount, checkCanUpdate, showToast } from "../util";
+import { handleRedirect } from "../../../../util/redirect";
 var TIMEOUT_DURATION = 10000;
 var ElementController = /*#__PURE__*/function () {
   // 新增变量

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

@@ -49,13 +49,6 @@ export declare function generateIframeSrc({ paymentSessionObj, paymentSession, i
     appVersion: string;
     link?: string;
 }): string;
-export declare function handleRedirect(data: any, fromFastSdk?: boolean): void;
-export declare function redirect(data: {
-    normalUrl?: string;
-    schemeUrl?: string;
-    applinkUrl?: string;
-    callAppJudgeTime?: number;
-}): Promise<void>;
 export declare function showToast(options?: IToastOptions, callback?: Function): void;
 export declare const isElementMobile: () => boolean;
 /**

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

@@ -10,12 +10,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { ERRORMESSAGE } from "../../../constant";
 import { IElementStatus } from "../../../foundation";
 import { getIframeUrl } from "../../../plugin/component/cashierApp";
-import { DisplayTypeEnum, RedirectType, TargetEnum, terminalTypeEnum } from "../../../types";
-import { device } from "../../../util/index";
-import CallApp from "../../../util/intl-callapp/es/main";
+import { DisplayTypeEnum } from "../../../types";
 import { getComponentSign, parseSessionData } from "../index";
 import { ELEMENT_ENVIRONMENT } from "./type";
 var formatElementOption = function formatElementOption(options) {
@@ -135,195 +132,6 @@ export function generateIframeSrc(_ref3) {
   console.log('[debug] generateIframeSrc', path, locationSearch);
   return "".concat(path, "?").concat(locationSearch);
 }
-export function handleRedirect(data) {
-  var _data$isDestroy, _data$isCallApp, _data$callAppDetectSu;
-  var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  console.log('local payment sdk new element redirect arg ----', this);
-  var _data = typeof data === 'string' ? {
-    normalUrl: data
-  } : _objectSpread(_objectSpread({}, data), {}, {
-    applinkUrl: (data === null || data === void 0 ? void 0 : data.applinkUrl) || '',
-    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,
-    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
-  });
-  // const logParams = {
-  //   applinkUrl: data?.applinkUrl || '',
-  //   schemeUrl: data?.schemeUrl || '',
-  //   normalUrl: data?.normalUrl || '',
-  //   target: data?.target,
-  //   isDestroy: data?.isDestroy ?? true,
-  //   isCallApp: data?.isCallApp ?? false,
-  //   callAppDetectSuccessDelay: data?.callAppDetectSuccessDelay ?? 2000,
-  // };
-  // this.AMSSDK.logger
-  //   .logInfo(
-  //     {
-  //       title: 'sdk_event_call_url_start',
-  //     },
-  //     {
-  //       redirectInfo: JSON.stringify(logParams),
-  //     },
-  //   )
-  //   .send();
-  var successCallback = function successCallback(type, url, durationInSeconds) {
-    // TODO
-    // event.dispatchToSDK(EVENT.eventCallback.name, {
-    //   code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
-    //   message: `Successfully opened the app,${type}: ${url}`,
-    // });
-    var extra = {
-      redirectInfo: JSON.stringify(_data),
-      openType: type,
-      url: url,
-      fromFastSdk: fromFastSdk
-    };
-    if (durationInSeconds) {
-      extra['durationInSeconds'] = durationInSeconds;
-    }
-    //   this.AMSSDK.logger
-    //     .logInfo(
-    //       {
-    //         title: 'sdk_event_call_url_success',
-    //       },
-    //       extra,
-    //     )
-    //     .send();
-  };
-  var failCallback = function failCallback(type, url, durationInSeconds) {
-    // event.dispatchToSDK(EVENT.eventCallback.name, {
-    //   code: eventCodeEnum.SDK_CALL_URL_ERROR,
-    //   message: `Failed to open app,applinkUrl: ${_data?.applinkUrl} schemeUrl: ${_data?.schemeUrl} normalUrl: ${_data?.normalUrl}`,
-    // });
-    var extra = {
-      redirectInfo: JSON.stringify(_data),
-      openType: type,
-      url: url,
-      fromFastSdk: fromFastSdk
-    };
-    if (durationInSeconds) {
-      extra['durationInSeconds'] = durationInSeconds;
-    }
-    //   this.AMSSDK.logger
-    //     .logInfo(
-    //       {
-    //         title: 'sdk_error_call_url_failed',
-    //       },
-    //       extra,
-    //     )
-    //     .send();
-  };
-
-  // 支持 target: _blank，新开tab页打开
-  if (_data.target === TargetEnum.BLANK) {
-    if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
-    successCallback(RedirectType.NormalUrl, _data.normalUrl);
-    window.open(_data.normalUrl);
-    return;
-  }
-  if (_data.target === TargetEnum.REPLACE && !(_data !== null && _data !== void 0 && _data.applinkUrl) && !(_data !== null && _data !== void 0 && _data.schemeUrl)) {
-    if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
-    successCallback(RedirectType.NormalUrl, _data.normalUrl);
-    window.location.replace(_data.normalUrl);
-    return;
-  }
-  // TODO 销毁iframe和全局loading
-  // if (_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;
-    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;
-  }
-  redirect({
-    applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
-  }).then(function () {
-    successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-  }).catch(function () {
-    if (_data !== null && _data !== void 0 && _data.applinkUrl) failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-    return redirect({
-      schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
-    });
-  }).then(function () {
-    successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-  }).catch(function () {
-    if (_data !== null && _data !== void 0 && _data.schemeUrl) failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-    return redirect({
-      normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
-    });
-  }).then(function () {
-    successCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
-  }).catch(function () {
-    failCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
-  });
-}
-export function redirect(data) {
-  return new Promise(function (resolve, reject) {
-    var terminalType = device.isMobile ? terminalTypeEnum.WAP : terminalTypeEnum.WEB;
-    var isWeb = terminalType === terminalTypeEnum.WEB;
-    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();
-        window.location.href = normalUrl;
-        return;
-      }
-      reject(ERRORMESSAGE.SDK_CALL_URL_ERROR.REDIRECT_ERROR);
-    };
-    var callAppFunc = function callAppFunc() {
-      if (!schemeUrl && !applinkUrl) {
-        jumpFunc();
-        return;
-      }
-      var config = {
-        fallback: function fallback() {
-          jumpFunc();
-        },
-        successCb: function successCb() {
-          resolve();
-        },
-        delay: 0
-      };
-      if (callAppJudgeTime) {
-        config['resultJudgmentTime'] = callAppJudgeTime;
-      }
-      try {
-        var callLib = new CallApp(config);
-        callLib.open({
-          scheme: schemeUrl,
-          link: applinkUrl
-        });
-      } catch (error) {
-        jumpFunc();
-      }
-    };
-    if (isWeb) {
-      jumpFunc();
-    } else {
-      callAppFunc();
-    }
-  });
-}
 export function showToast() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var callback = arguments.length > 1 ? arguments[1] : undefined;

package/esm/util/redirect.d.ts

@@ -0,0 +1,7 @@
+export declare function handleRedirect(data: any, fromFastSdk?: boolean): void;
+export declare function redirect(data: {
+    normalUrl?: string;
+    schemeUrl?: string;
+    applinkUrl?: string;
+    callAppJudgeTime?: number;
+}): Promise<void>;

package/esm/util/redirect.js

@@ -0,0 +1,199 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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 { ERRORMESSAGE } from "../constant";
+import CallApp from "./intl-callapp/es/main";
+import { RedirectType, TargetEnum, terminalTypeEnum } from "../types";
+import { device } from ".";
+export function handleRedirect(data) {
+  var _data$isDestroy, _data$isCallApp, _data$callAppDetectSu;
+  var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  console.log('local payment sdk new element redirect arg ----', this);
+  var _data = typeof data === 'string' ? {
+    normalUrl: data
+  } : _objectSpread(_objectSpread({}, data), {}, {
+    applinkUrl: (data === null || data === void 0 ? void 0 : data.applinkUrl) || '',
+    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,
+    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
+  });
+  // const logParams = {
+  //   applinkUrl: data?.applinkUrl || '',
+  //   schemeUrl: data?.schemeUrl || '',
+  //   normalUrl: data?.normalUrl || '',
+  //   target: data?.target,
+  //   isDestroy: data?.isDestroy ?? true,
+  //   isCallApp: data?.isCallApp ?? false,
+  //   callAppDetectSuccessDelay: data?.callAppDetectSuccessDelay ?? 2000,
+  // };
+  // this.AMSSDK.logger
+  //   .logInfo(
+  //     {
+  //       title: 'sdk_event_call_url_start',
+  //     },
+  //     {
+  //       redirectInfo: JSON.stringify(logParams),
+  //     },
+  //   )
+  //   .send();
+  var successCallback = function successCallback(type, url, durationInSeconds) {
+    // TODO
+    // event.dispatchToSDK(EVENT.eventCallback.name, {
+    //   code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
+    //   message: `Successfully opened the app,${type}: ${url}`,
+    // });
+    var extra = {
+      redirectInfo: JSON.stringify(_data),
+      openType: type,
+      url: url,
+      fromFastSdk: fromFastSdk
+    };
+    if (durationInSeconds) {
+      extra['durationInSeconds'] = durationInSeconds;
+    }
+    //   this.AMSSDK.logger
+    //     .logInfo(
+    //       {
+    //         title: 'sdk_event_call_url_success',
+    //       },
+    //       extra,
+    //     )
+    //     .send();
+  };
+  var failCallback = function failCallback(type, url, durationInSeconds) {
+    // event.dispatchToSDK(EVENT.eventCallback.name, {
+    //   code: eventCodeEnum.SDK_CALL_URL_ERROR,
+    //   message: `Failed to open app,applinkUrl: ${_data?.applinkUrl} schemeUrl: ${_data?.schemeUrl} normalUrl: ${_data?.normalUrl}`,
+    // });
+    var extra = {
+      redirectInfo: JSON.stringify(_data),
+      openType: type,
+      url: url,
+      fromFastSdk: fromFastSdk
+    };
+    if (durationInSeconds) {
+      extra['durationInSeconds'] = durationInSeconds;
+    }
+    //   this.AMSSDK.logger
+    //     .logInfo(
+    //       {
+    //         title: 'sdk_error_call_url_failed',
+    //       },
+    //       extra,
+    //     )
+    //     .send();
+  };
+
+  // 支持 target: _blank，新开tab页打开
+  if (_data.target === TargetEnum.BLANK) {
+    if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
+    successCallback(RedirectType.NormalUrl, _data.normalUrl);
+    window.open(_data.normalUrl);
+    return;
+  }
+  if (_data.target === TargetEnum.REPLACE && !(_data !== null && _data !== void 0 && _data.applinkUrl) && !(_data !== null && _data !== void 0 && _data.schemeUrl)) {
+    if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
+    successCallback(RedirectType.NormalUrl, _data.normalUrl);
+    window.location.replace(_data.normalUrl);
+    return;
+  }
+  // TODO 销毁iframe和全局loading
+  // if (_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;
+    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;
+  }
+  redirect({
+    applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
+  }).then(function () {
+    successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
+  }).catch(function () {
+    if (_data !== null && _data !== void 0 && _data.applinkUrl) failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
+    return redirect({
+      schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
+    });
+  }).then(function () {
+    successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
+  }).catch(function () {
+    if (_data !== null && _data !== void 0 && _data.schemeUrl) failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
+    return redirect({
+      normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
+    });
+  }).then(function () {
+    successCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
+  }).catch(function () {
+    failCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
+  });
+}
+export function redirect(data) {
+  return new Promise(function (resolve, reject) {
+    var terminalType = device.isMobile ? terminalTypeEnum.WAP : terminalTypeEnum.WEB;
+    var isWeb = terminalType === terminalTypeEnum.WEB;
+    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();
+        window.location.href = normalUrl;
+        return;
+      }
+      reject(ERRORMESSAGE.SDK_CALL_URL_ERROR.REDIRECT_ERROR);
+    };
+    var callAppFunc = function callAppFunc() {
+      if (!schemeUrl && !applinkUrl) {
+        jumpFunc();
+        return;
+      }
+      var config = {
+        fallback: function fallback() {
+          jumpFunc();
+        },
+        successCb: function successCb() {
+          resolve();
+        },
+        delay: 0
+      };
+      if (callAppJudgeTime) {
+        config['resultJudgmentTime'] = callAppJudgeTime;
+      }
+      try {
+        var callLib = new CallApp(config);
+        callLib.open({
+          scheme: schemeUrl,
+          link: applinkUrl
+        });
+      } catch (error) {
+        jumpFunc();
+      }
+    };
+    if (isWeb) {
+      jumpFunc();
+    } else {
+      callAppFunc();
+    }
+  });
+}

package/package.json

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