@paykka/card-checkout-ui 0.13.16 → 0.14.0

package/dist/es/core/checkout.js

@@ -1,9 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
@@ -26,7 +20,7 @@ var __privateMethod = (obj, member, method) => {
   __accessCheck(obj, member, "access private method");
   return method;
 };
-var _id, _config, _envConfig, _session, _theme, _componentInsts, _addressCore, _initPromise, _doInit, doInit_fn;
+var _id, _config, _envConfig, _session, _theme, _componentInsts, _addressCore, _logger, _payment, _initPromise, _doInit, doInit_fn;
 import { PaymentEventType } from "../types/event.js";
 import { create } from "./create.js";
 import { Session } from "./session.js";
@@ -36,15 +30,14 @@ import { apiEnv, cdnEnv } from "./environment.js";
 import { isEmptyObject } from "../utils/is.js";
 import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
-import { getUrlParam } from "../utils/location.js";
 import { deepMerge } from "../utils/object.js";
 import { genShortId } from "../utils/string.js";
 import "./context.js";
-import { d } from "../core.js";
 import { AddressCore } from "./address.js";
 import { PayKKaTheme } from "./theme.js";
+import { PayKKaLogger } from "./logger.js";
+import { PayKKaPayment } from "./payment.js";
 import "../out/worldpay-jsc-origin.js";
-const PROCESSING_PARAM_NAME = "m";
 const DEFAULT_CHECKOUT_CONFIG = {
   enableInitValidation: true,
   apiPrefix: "/session",
@@ -63,21 +56,14 @@ class PayKKaCheckout {
     __privateAdd(this, _session, void 0);
     __privateAdd(this, _theme, void 0);
     __privateAdd(this, _componentInsts, []);
-    /**
-     * 地址处理
-     * 与 session 一样，我们要保证 addressCore 在 PayKKaCheckout 实例中保持唯一
-     */
+    /** 地址处理实例，在 PayKKaCheckout 实例中保持唯一 */
     __privateAdd(this, _addressCore, void 0);
+    /** 监控上报实例，在 PayKKaCheckout 实例中保持唯一 */
+    __privateAdd(this, _logger, void 0);
+    /** 支付相关实例，在 PayKKaCheckout 实例中保持唯一 */
+    __privateAdd(this, _payment, void 0);
     /** 初始化状态标志，防止重复初始化 */
     __privateAdd(this, _initPromise, void 0);
-    // TODO: 这俩属性不应该放在这里，但他们是在 PayKKaCheckout 实例中保持唯一的数据，还没想好放哪里
-    /** 当前正在处理的支付方式，在第三方支付页面跳回收银台时，会通过 url 参数传递过来 */
-    __publicField(this, "processingPaymentMethod", null);
-    /**
-     * 当前启用的支付方式（禁用则展示禁用样式）
-     * 在 DropIn 且有正在处理的支付方式时，会设置为当前支付方式，并把其他支付方式设为禁用
-     */
-    __publicField(this, "enablePaymentMethod", d(null));
     __privateSet(this, _id, genShortId(6));
     __privateSet(this, _config, config);
     this.init();
@@ -116,16 +102,17 @@ class PayKKaCheckout {
     const extraParams = (_b = (_a = __privateGet(this, _config))._getExtraParams) == null ? void 0 : _b.call(_a, "info");
     __privateSet(this, _session, new Session({ sessionId, clientKey }, extraParams));
     return __privateGet(this, _session).ready().then(() => {
-      var _a2, _b2;
+      var _a2, _b2, _c, _d, _e;
       if (isEmptyObject((_a2 = __privateGet(this, _session)) == null ? void 0 : _a2.checkout)) {
         onInitError == null ? void 0 : onInitError(new PayKKaError("ERROR", "Checkout is empty"));
         return;
       }
       const { supportMethods = [], status } = ((_b2 = __privateGet(this, _session)) == null ? void 0 : _b2.checkout) || {};
       if (status === "SUCCESS") {
-        onSuccess == null ? void 0 : onSuccess({});
+        onSuccess == null ? void 0 : onSuccess({}, { paymentMethod: (_c = __privateGet(this, _session).checkout) == null ? void 0 : _c.paymentMethod });
         return;
       }
+      (_e = __privateGet(this, _logger)) == null ? void 0 : _e.setLoggerOptions({ uid: (_d = __privateGet(this, _session).checkout) == null ? void 0 : _d.merchantId });
       onPaymentMethodsReady == null ? void 0 : onPaymentMethodsReady(supportMethods);
     }).catch((error) => {
       onInitError == null ? void 0 : onInitError(error);
@@ -155,10 +142,20 @@ class PayKKaCheckout {
     __privateGet(this, _theme).init((_a = __privateGet(this, _session).checkout) == null ? void 0 : _a.theme);
   }
   initOtherData() {
-    const res = getUrlParam(PROCESSING_PARAM_NAME);
-    if (res) {
-      this.processingPaymentMethod = res;
+    __privateSet(this, _payment, new PayKKaPayment(__privateGet(this, _session)));
+    __privateGet(this, _payment).init();
+  }
+  async initLogger() {
+    const { reportLogger = true, env, onEvent } = __privateGet(this, _config);
+    if (reportLogger) {
+      __privateSet(this, _logger, new PayKKaLogger());
+      await __privateGet(this, _logger).init({ env });
     }
+    __privateGet(this, _config).onEvent = (type, data) => {
+      var _a;
+      (_a = __privateGet(this, _logger)) == null ? void 0 : _a.reportCustomEvent(type, data);
+      onEvent == null ? void 0 : onEvent(type, data);
+    };
   }
   get session() {
     return __privateGet(this, _session);
@@ -175,29 +172,77 @@ class PayKKaCheckout {
   get id() {
     return __privateGet(this, _id);
   }
-  /** 创建组件，把 session 作为组件的 props 传递 */
+  /**
+   * 创建组件
+   * @param component 组件
+   * @param props 组件 props
+   */
   create(component, props) {
     var _a;
-    const { onSubmit, onSuccess, onError, onTimeout, onExpired } = __privateGet(this, _config);
+    const {
+      onSubmit,
+      onSuccess,
+      onError,
+      onTimeout,
+      onExpired,
+      onAuthorized,
+      onSubmitResponse
+    } = __privateGet(this, _config);
     const coreProps = this.getCoreProps();
     const combinedProps = {
       onSubmit,
       onSuccess,
       onTimeout,
       onExpired,
+      onAuthorized,
+      onSubmitResponse,
+      onError,
       ...coreProps,
-      ...props,
-      onError: (error) => {
-        var _a2, _b;
-        onError == null ? void 0 : onError(error);
+      ...props
+    };
+    const componentInst = create(component, {
+      ...combinedProps,
+      onSubmit: (formValidateError, context) => {
+        var _a2, _b, _c;
+        if (!formValidateError) {
+          (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_START, context);
+        }
+        (_c = combinedProps.onSubmit) == null ? void 0 : _c.call(combinedProps, formValidateError, context);
+      },
+      onExpired: (context) => {
+        var _a2, _b, _c;
+        (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_EXPIRED, context);
+        (_c = combinedProps.onExpired) == null ? void 0 : _c.call(combinedProps, context);
+      },
+      onTimeout: (type, context) => {
+        var _a2, _b, _c;
+        (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_TIMEOUT, context);
+        (_c = combinedProps.onTimeout) == null ? void 0 : _c.call(combinedProps, type, context);
+      },
+      onSuccess: (res, context) => {
+        var _a2, _b, _c;
+        (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_SUCCESS, context);
+        (_c = combinedProps.onSuccess) == null ? void 0 : _c.call(combinedProps, res, context);
+      },
+      onError: (error, context) => {
+        var _a2, _b, _c;
         (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_FAILURE, {
           message: error.message,
-          code: error.code
+          code: error.code,
+          ...context
         });
+        (_c = combinedProps.onError) == null ? void 0 : _c.call(combinedProps, error, context);
+      },
+      onAuthorized: (context) => {
+        var _a2, _b, _c;
+        (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_AUTHORIZED, context);
+        (_c = combinedProps.onAuthorized) == null ? void 0 : _c.call(combinedProps, context);
+      },
+      onSubmitResponse: (payRes, context) => {
+        var _a2, _b, _c;
+        (_b = (_a2 = this.config).onEvent) == null ? void 0 : _b.call(_a2, PaymentEventType.PAYMENT_RESPONSE, context);
+        (_c = combinedProps.onSubmitResponse) == null ? void 0 : _c.call(combinedProps, payRes, context);
       }
-    };
-    const componentInst = create(component, {
-      ...combinedProps
     });
     (_a = __privateGet(this, _componentInsts)) == null ? void 0 : _a.push(componentInst);
     return componentInst;
@@ -207,18 +252,22 @@ class PayKKaCheckout {
       session: __privateGet(this, _session),
       core: this,
       threeDSFrame: __privateGet(this, _config).threeDSFrame,
-      hidePaymentButton: __privateGet(this, _config).hidePaymentButton
+      hidePaymentButton: __privateGet(this, _config).hidePaymentButton,
+      autoQuery: __privateGet(this, _config).autoQuery
     };
   }
-  resetEnablePaymentMethod() {
-    this.enablePaymentMethod.value = null;
-  }
   getAddressCore() {
     if (!__privateGet(this, _addressCore)) {
       __privateSet(this, _addressCore, new AddressCore());
     }
     return __privateGet(this, _addressCore);
   }
+  get logger() {
+    return __privateGet(this, _logger);
+  }
+  get payment() {
+    return __privateGet(this, _payment);
+  }
 }
 _id = new WeakMap();
 _config = new WeakMap();
@@ -227,9 +276,12 @@ _session = new WeakMap();
 _theme = new WeakMap();
 _componentInsts = new WeakMap();
 _addressCore = new WeakMap();
+_logger = new WeakMap();
+_payment = new WeakMap();
 _initPromise = new WeakMap();
 _doInit = new WeakSet();
 doInit_fn = async function() {
+  await this.initLogger();
   this.initCheckoutConfig();
   this.initEnv();
   this.initLocale();

package/dist/es/core/create-child.js

@@ -0,0 +1,68 @@
+import { create } from "./create.js";
+import { PaymentEventType } from "../types/event.js";
+const createCheckoutChild = (core, component, dropInProps, childProps) => {
+  const {
+    onSubmit,
+    onSuccess,
+    onError,
+    onTimeout,
+    onExpired,
+    onAuthorized,
+    onSubmitResponse
+  } = core.config;
+  const combinedProps = {
+    onSubmit,
+    onSuccess,
+    onError,
+    onTimeout,
+    onExpired,
+    onAuthorized,
+    onSubmitResponse,
+    ...core.getCoreProps(),
+    ...dropInProps,
+    ...childProps
+  };
+  const wrappedProps = {
+    ...combinedProps,
+    onSubmit: (error, context) => {
+      var _a, _b, _c;
+      console.log("dropin内部代理onSubmit", dropInProps == null ? void 0 : dropInProps.onSubmit, onSubmit);
+      if (childProps == null ? void 0 : childProps.onSubmit) {
+        if (!error) {
+          (_b = (_a = core.config).onEvent) == null ? void 0 : _b.call(_a, PaymentEventType.PAYMENT_START, {
+            paymentMethod: context.paymentMethod
+          });
+        }
+      }
+      (_c = combinedProps == null ? void 0 : combinedProps.onSubmit) == null ? void 0 : _c.call(combinedProps, error, context);
+    },
+    onSuccess: (data, context) => {
+      var _a;
+      (_a = combinedProps.onSuccess) == null ? void 0 : _a.call(combinedProps, data, context);
+    },
+    onError: (error, context) => {
+      var _a;
+      (_a = combinedProps.onError) == null ? void 0 : _a.call(combinedProps, error, context);
+    },
+    onTimeout: (type, context) => {
+      var _a;
+      (_a = combinedProps.onTimeout) == null ? void 0 : _a.call(combinedProps, type, context);
+    },
+    onExpired: (context) => {
+      var _a;
+      (_a = combinedProps.onExpired) == null ? void 0 : _a.call(combinedProps, context);
+    },
+    onAuthorized: (context) => {
+      var _a;
+      (_a = combinedProps.onAuthorized) == null ? void 0 : _a.call(combinedProps, context);
+    },
+    onSubmitResponse: (payRes, context) => {
+      var _a;
+      (_a = combinedProps.onSubmitResponse) == null ? void 0 : _a.call(combinedProps, payRes, context);
+    }
+  };
+  return create(component, wrappedProps);
+};
+export {
+  createCheckoutChild
+};

package/dist/es/core/environment.js

@@ -1,6 +1,14 @@
+const DEV_ORIGIN = "https://checkout-dev.eu.paykka.com";
+const FAT_ORIGIN = "https://checkout-fat.eu.paykka.com";
 const SANDBOX_ORIGIN = "https://checkout-sandbox.aq.paykka.com";
 const HK_ORIGIN = "https://checkout.aq.paykka.com";
 const EU_ORIGIN = "https://checkout.eu.paykka.com";
+const origin2Env = {
+  ...{},
+  [SANDBOX_ORIGIN]: "sandbox",
+  [HK_ORIGIN]: "hk",
+  [EU_ORIGIN]: "eu"
+};
 const apiEnv = {
   dev: "",
   fat: "",
@@ -15,7 +23,21 @@ const cdnEnv = {
   hk: `${HK_ORIGIN}/cp`,
   eu: `${EU_ORIGIN}/cp`
 };
+const loggerEnvInfoMap = {
+  dev: {},
+  fat: {},
+  sandbox: {},
+  hk: {},
+  eu: {}
+};
 export {
+  DEV_ORIGIN,
+  EU_ORIGIN,
+  FAT_ORIGIN,
+  HK_ORIGIN,
+  SANDBOX_ORIGIN,
   apiEnv,
-  cdnEnv
+  cdnEnv,
+  loggerEnvInfoMap,
+  origin2Env
 };

package/dist/es/core/error.js

@@ -4,6 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+import { safeStringify } from "../utils/index.js";
 var EPayKKaError = /* @__PURE__ */ ((EPayKKaError2) => {
   EPayKKaError2["LOAD_ERROR"] = "LOAD_ERROR";
   EPayKKaError2["ERROR"] = "ERROR";
@@ -12,13 +13,25 @@ var EPayKKaError = /* @__PURE__ */ ((EPayKKaError2) => {
   return EPayKKaError2;
 })(EPayKKaError || {});
 class PayKKaError extends Error {
-  constructor(type, message, info) {
+  constructor(type, msg, info) {
+    const message = safeStringify({
+      msg,
+      type,
+      code: info == null ? void 0 : info.code
+    });
     super(message);
+    /** 错误名称，用来在上报时进行区分 */
+    __publicField(this, "name", "PayKKaError");
     /** 错误类型 */
     __publicField(this, "type");
-    /** 错误代码 */
+    /** 错误信息 */
+    __publicField(this, "msg");
+    /** 错误码 */
     __publicField(this, "code");
+    /** 错误原因 */
+    __publicField(this, "cause");
     this.type = type;
+    this.msg = msg;
     this.code = info == null ? void 0 : info.code;
     this.cause = info == null ? void 0 : info.cause;
   }