@paykka/card-checkout-ui 0.21.2 → 0.22.0

package/dist/es/api/modules/apple-pay/index.js

@@ -3,7 +3,10 @@ import { http } from "../../http.js";
 const getMerchantSession = async (params, options) => {
   return http.post(
     `${apiPrefix}/apple-pay/create-session`,
-    { merchant_id: params.merchantId },
+    {
+      merchant_id: params.merchantId,
+      merchant_product_id: params.merchantProductId
+    },
     options
   );
 };

package/dist/es/api/modules/checkout/map.js

@@ -69,6 +69,7 @@ const checkoutMap = (res = {}) => {
   return {
     country: res.country,
     merchantId: res.merchant_id,
+    merchantProductId: res.merchant_product_id,
     sessionId: res.session_id,
     clientKey: res.client_key,
     status: res.status,

package/dist/es/api/modules/get-browser-params.js

@@ -35,7 +35,7 @@ const getBaseBrowserParams = async (params = {}) => {
     terminal_type: terminalType,
     fraud_detection_id: fraudDetectionId,
     // 当前组件库版本（构建时由 define 注入）
-    app_version: "0.21.2"
+    app_version: "0.22.0"
   };
 };
 const getBrowserParams = async (params = {}) => {

package/dist/es/api/modules/risk/index.js

@@ -29,7 +29,8 @@ const reportUrls = async (params) => {
   return http.post("/pub/fraud-detection/report/urls", {
     client_key: params.clientKey,
     fraud_detection_mode: params.fraudDetectionMode,
-    data: params.data
+    data: params.data,
+    browser: params.browser
   });
 };
 export {

package/dist/es/components/ApplePay/index.js

@@ -368,12 +368,16 @@ const ApplePay = w((props) => {
     initApplePaySession({
       request,
       onValidate: async () => {
-        var _a2, _b2, _c;
+        var _a2;
         onEvent == null ? void 0 : onEvent(ApplePayEventType.APPLE_PAY_VALIDATE_MERCHANT);
-        const merchantSession = await getMerchantSession(
-          ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.sessionMode) === SessionMode.HOSTED ? {} : { merchantId: (_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.merchantId }
-        );
-        (_c = applePaySession.current) == null ? void 0 : _c.completeMerchantValidation(merchantSession);
+        const checkout = session == null ? void 0 : session.checkout;
+        const merchantSession = await getMerchantSession({
+          // 仅 DROP_IN / COMPONENT 收银台需要传 merchantId，HOSTED 不传
+          merchantId: (checkout == null ? void 0 : checkout.sessionMode) === SessionMode.HOSTED ? void 0 : checkout == null ? void 0 : checkout.merchantId,
+          // 没有 merchantProductId 时用 sessionId 兜底
+          merchantProductId: (checkout == null ? void 0 : checkout.merchantProductId) || (checkout == null ? void 0 : checkout.sessionId)
+        });
+        (_a2 = applePaySession.current) == null ? void 0 : _a2.completeMerchantValidation(merchantSession);
       },
       onAuthorized: async (event) => {
         var _a2;

package/dist/es/core/logger.js

@@ -1,13 +1,19 @@
 var _a;
 import { origin2Env, DEV_ORIGIN, FAT_ORIGIN, SANDBOX_ORIGIN, HK_ORIGIN, EU_ORIGIN, loggerEnvInfoMap } from "./environment.js";
 import { STRIPE_RADAR_SCRIPT_ORIGIN, WORLDPAY_JSC_ORIGIN } from "../out/config.js";
+import { EnvEventType } from "../types/event.js";
 import "../utils/card-brand/brands.js";
+import { getFingerprint } from "../utils/system-info/finger-print.js";
 import "../utils/system-info/get-browser-info.js";
 import { parseUrl } from "../utils/location.js";
+import { encodeBase64, decodeBase64 } from "../utils/base64.js";
 import "../core.js";
 import "./context.js";
 import "../out/fraud-detection.js";
 const COMPONENT_PID = "71667dde4a0247c187c1c26bdc3aadcf";
+const LOGGER_TAG_PREFIX = "tr";
+const LOGGER_TAG_STORAGE_KEY = "paykka_buic";
+const LOGGER_TAG_TABLE = "BFOZkRHwuCJ8Gr1sThX5PpLb-MUIxjdn0oY3DilAtva7ySKzNmVQ6WE9_ef42gqc";
 const REPORT_ORIGINS = [
   DEV_ORIGIN,
   FAT_ORIGIN,
@@ -43,14 +49,25 @@ class PayKKaLogger {
     if (options.sid) {
       (_a2 = window.sessionStorage) == null ? void 0 : _a2.setItem("felogger_sid", options.sid);
     }
+    const tag = await this.getTag();
     (_b = window.JlFeLogger) == null ? void 0 : _b.init({
       pid: options.pid || COMPONENT_PID,
       env: loggerEnvInfo.env,
-      release: "0.21.2",
+      release: "0.22.0",
       imgUrl: loggerEnvInfo.imgUrl,
       postUrl: loggerEnvInfo.postUrl,
+      tag,
       beforeSend: this.beforeSendEvent
     });
+    this.reportEnvInfo();
+  }
+  reportEnvInfo() {
+    this.reportCustomEvent(EnvEventType.ENV_INFO, {
+      itg: "npm",
+      benv: "npm",
+      ifr: window.self !== window.top,
+      v: "0.22.0"
+    });
   }
   /** 上报自定义事件 */
   reportCustomEvent(event, data) {
@@ -79,6 +96,32 @@ class PayKKaLogger {
     var _a2;
     (_a2 = window.JlFeLogger) == null ? void 0 : _a2.setOptions(options);
   }
+  async getTag() {
+    var _a2;
+    const fingerprint = this.getCachedFingerprint() || await getFingerprint();
+    if (!fingerprint) {
+      return "";
+    }
+    const tag = `${LOGGER_TAG_PREFIX}_${fingerprint}_${Date.now()}`;
+    try {
+      (_a2 = window.localStorage) == null ? void 0 : _a2.setItem(LOGGER_TAG_STORAGE_KEY, encodeBase64(tag, LOGGER_TAG_TABLE));
+    } catch {
+    }
+    return tag;
+  }
+  /** 读取缓存中的设备指纹段，缓存缺失或损坏时返回空串 */
+  getCachedFingerprint() {
+    var _a2;
+    try {
+      const [prefix, fingerprint] = decodeBase64(
+        ((_a2 = window.localStorage) == null ? void 0 : _a2.getItem(LOGGER_TAG_STORAGE_KEY)) || "",
+        LOGGER_TAG_TABLE
+      ).split("_");
+      return prefix === LOGGER_TAG_PREFIX && fingerprint ? fingerprint : "";
+    } catch {
+      return "";
+    }
+  }
   /**
    * 在日志上报前执行，拦截部分日志上报
    * 1. 过滤接口日志，只上报收银台相关接口，用接口域名判断

package/dist/es/index.js

@@ -87,7 +87,7 @@ import "./out/fraud-detection.js";
 import "./core/logger.js";
 import { ECollMode } from "./types/fraud-detection.js";
 import { MessageAction } from "./types/message.js";
-import { ApplePayEventType, FraudDetectionEventType, GooglePayEventType, LoggerEventType, PaymentEventType, SecurityIframeEventType, ThreeDSEventType, WechatPayEventType } from "./types/event.js";
+import { ApplePayEventType, EnvEventType, FraudDetectionEventType, GooglePayEventType, PaymentEventType, SecurityIframeEventType, ThreeDSEventType, WechatPayEventType } from "./types/event.js";
 export {
   Alipay,
   AlipayHK,
@@ -119,6 +119,7 @@ export {
   EPS,
   EPayKKaEnv,
   EncryptedCard,
+  EnvEventType,
   Fpx,
   FraudDetectionEventType,
   GCash,
@@ -133,7 +134,6 @@ export {
   LinePay,
   LinkAja,
   LocaleKey,
-  LoggerEventType,
   MayBankQRPay,
   MbWay,
   MessageAction,

package/dist/es/out/fraud-detection.js

@@ -28,6 +28,7 @@ import { getChannelSDKConfig } from "../api/modules/risk/index.js";
 import { setApiUrl, setCDNUrl, setApiPrefix } from "../config.js";
 import { ChannelCode } from "../constant.js";
 import { apiEnv, cdnEnv } from "../core/environment.js";
+import { PayKKaLogger } from "../core/logger.js";
 import { ECollMode } from "../types/fraud-detection.js";
 import { FraudDetectionEventType } from "../types/event.js";
 import { difference } from "../utils/array.js";
@@ -36,14 +37,36 @@ import { PayKKaDetection } from "./paykka-detection.js";
 import { StripeRadar } from "./stripe-radar.js";
 import { WorldpayDDCManager } from "./worldpay-ddc-manager.js";
 import { WorldpayJSC } from "./worldpay-jsc.js";
+const isIIFE = typeof __IS_IIFE__ !== "undefined" && __IS_IIFE__;
 const DEFAULT_ENV = "eu";
 const DEFAULT_MODES = [ECollMode.SR, ECollMode.WP, ECollMode.WJ];
 let instance = null;
 function getFraudDetectionInstance(config, options) {
+  const env = config.env || DEFAULT_ENV;
+  const logger = isIIFE ? new PayKKaLogger() : void 0;
+  const loggerReady = logger == null ? void 0 : logger.init({ env }).catch(() => void 0);
+  loggerReady == null ? void 0 : loggerReady.then(() => logger == null ? void 0 : logger.reportCustomEvent(FraudDetectionEventType.FRAUD_DETECTION_CDN));
   if (!instance) {
-    instance = new FraudDetection(config, options);
+    instance = new FraudDetection(config, {
+      ...options,
+      // 保留原有事件回调，同时将同一批事件转发给 CDN logger。
+      onEvent: (event, data) => {
+        var _a;
+        (_a = options == null ? void 0 : options.onEvent) == null ? void 0 : _a.call(options, event, data);
+        logger == null ? void 0 : logger.reportCustomEvent(event, data);
+      }
+    });
   }
-  return instance;
+  return {
+    async getFraudDetectionId(options2) {
+      await loggerReady;
+      return instance.getFraudDetectionId(options2);
+    },
+    async createFraudDetection() {
+      await loggerReady;
+      return instance.createFraudDetection();
+    }
+  };
 }
 class FraudDetection {
   constructor(config, options) {
@@ -60,7 +83,7 @@ class FraudDetection {
     __publicField(this, "channelConfig");
     __publicField(this, "channelConfigPromise");
     /** 是否是 IIFE 模式，在 build 时通过 define 定义，如果 IIFE 为 true，说明商户是直接引入 SDK，用于 API 支付 */
-    __publicField(this, "isIIFE", typeof __IS_IIFE__ !== "undefined" && __IS_IIFE__);
+    __publicField(this, "isIIFE", isIIFE);
     __privateAdd(this, _sessionMode, void 0);
     const { env, clientKey, modes } = config;
     this.modes = (modes == null ? void 0 : modes.length) ? [...modes] : DEFAULT_MODES;

package/dist/es/out/paykka-detection.js

@@ -10,6 +10,7 @@ import "../core/context.js";
 import "./fraud-detection.js";
 import { ChannelCode } from "../constant.js";
 import "../core/logger.js";
+import { getBrowserParams } from "../api/modules/get-browser-params.js";
 import { reportUrls } from "../api/modules/risk/index.js";
 import { encryptAES } from "../utils/encrypt.js";
 import { BaseFraudDetection } from "./base-fraud-detection.js";
@@ -41,6 +42,7 @@ const _PayKKaDetection = class _PayKKaDetection extends BaseFraudDetection {
     const res = await reportUrls({
       clientKey,
       fraudDetectionMode: sessionMode,
+      browser: await getBrowserParams(),
       data: await encryptAES(clientKey, JSON.stringify(data))
     });
     return res;

package/dist/es/types/event.js

@@ -7,6 +7,7 @@ var FraudDetectionEventType = /* @__PURE__ */ ((FraudDetectionEventType2) => {
   FraudDetectionEventType2["FRAUD_DETECTION_TIMEOUT"] = "fraudDetection:timeout";
   FraudDetectionEventType2["FRAUD_DETECTION_LOAD_ERROR"] = "fraudDetection:loadError";
   FraudDetectionEventType2["FRAUD_DETECTION_WARNING"] = "fraudDetection:warning";
+  FraudDetectionEventType2["FRAUD_DETECTION_CDN"] = "fraudDetection:cdn";
   return FraudDetectionEventType2;
 })(FraudDetectionEventType || {});
 var ApplePayEventType = /* @__PURE__ */ ((ApplePayEventType2) => {
@@ -58,16 +59,15 @@ var SecurityIframeEventType = /* @__PURE__ */ ((SecurityIframeEventType2) => {
   SecurityIframeEventType2["SECURITY_IFRAME_LOAD_ERROR"] = "securityIframe:loadError";
   return SecurityIframeEventType2;
 })(SecurityIframeEventType || {});
-var LoggerEventType = /* @__PURE__ */ ((LoggerEventType2) => {
-  LoggerEventType2["ENV"] = "logger:env";
-  LoggerEventType2["BEHAVIOR"] = "logger:behavior";
-  return LoggerEventType2;
-})(LoggerEventType || {});
+var EnvEventType = /* @__PURE__ */ ((EnvEventType2) => {
+  EnvEventType2["ENV_INFO"] = "env:info";
+  return EnvEventType2;
+})(EnvEventType || {});
 export {
   ApplePayEventType,
+  EnvEventType,
   FraudDetectionEventType,
   GooglePayEventType,
-  LoggerEventType,
   PaymentEventType,
   SecurityIframeEventType,
   ThreeDSEventType,

package/dist/es/utils/base64.js

@@ -0,0 +1,20 @@
+const BASE64_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+const encodeBase64 = (value, table = BASE64_TABLE) => {
+  try {
+    return btoa(value).split("").map((char) => char === "=" ? "" : table[BASE64_TABLE.indexOf(char)]).join("");
+  } catch {
+    return "";
+  }
+};
+const decodeBase64 = (value, table = BASE64_TABLE) => {
+  try {
+    const base64 = value.split("").map((char) => BASE64_TABLE[table.indexOf(char)] ?? "").join("");
+    return atob(base64 + "=".repeat((4 - base64.length % 4) % 4));
+  } catch {
+    return "";
+  }
+};
+export {
+  decodeBase64,
+  encodeBase64
+};

package/dist/es/utils/system-info/finger-print.js

@@ -4,7 +4,11 @@ const loadFingerprint = async () => {
 };
 let fingerPrint = "";
 const getFingerprint = async () => {
-  return fingerPrint || (fingerPrint = (await loadFingerprint()).visitorId);
+  try {
+    return fingerPrint || (fingerPrint = (await loadFingerprint()).visitorId);
+  } catch {
+    return "";
+  }
 };
 export {
   getFingerprint

package/dist/types/api/modules/apple-pay/index.d.ts

@@ -1,4 +1,5 @@
 import { type RequestOptions } from '../../http';
 export declare const getMerchantSession: (params: {
     merchantId?: string;
+    merchantProductId?: string;
 }, options?: RequestOptions) => Promise<any>;

package/dist/types/api/modules/checkout/type.d.ts

@@ -53,6 +53,8 @@ export interface ChannelParams {
 export interface CheckoutRes {
     /** 商户 ID */
     merchantId: string;
+    /** 产品 ID */
+    merchantProductId?: string;
     /** 支持的支付方式 */
     supportMethods: PaymentMethod[];
     /** 支付方式 */

package/dist/types/api/modules/risk/index.d.ts

@@ -26,4 +26,5 @@ export declare const reportUrls: (params: {
     clientKey: string;
     fraudDetectionMode?: string;
     data: string;
+    browser?: Recordable;
 }) => Promise<any>;

package/dist/types/core/error.d.ts

@@ -1,14 +1,3 @@
-/** 前端错误信息枚举，为了防止与后端 code 冲突做的区分 */
-export declare enum EPayKKaErrorReason {
-    /** worldpay ddc 错误 */
-    DDC_ERROR = "DDC_ERROR",
-    /** worldpay ddc 超时 */
-    DDC_TIMEOUT = "DDC_TIMEOUT",
-    /** 欺诈检测数据转换错误 */
-    FRAUD_DETECTION_ID_FORMAT_ERROR = "FRAUD_DETECTION_ID_FORMAT_ERROR",
-    /** stripe radar 错误 */
-    STRIPE_RADAR_ERROR = "STRIPE_RADAR_ERROR"
-}
 export declare enum EPayKKaError {
     /** 加载资源错误 */
     LOAD_ERROR = "LOAD_ERROR",
@@ -30,7 +19,7 @@ export declare class PayKKaError extends Error {
     code?: string;
     /** 错误原因 */
     cause?: any;
-    constructor(type: keyof typeof EPayKKaError, msg?: string | EPayKKaErrorReason, info?: {
+    constructor(type: keyof typeof EPayKKaError, msg?: string, info?: {
         code?: string;
         cause?: any;
     });

package/dist/types/core/logger.d.ts

@@ -7,7 +7,7 @@ import type { PayKKaError } from '../core';
 import { type EventData, type EventType, type PayKKaEnvType } from '../types';
 type LoggerCollect = 'ENV' | 'BEHAVIOR';
 interface LoggerOptions {
-    /** 监控项目 id */
+    /** 监控项目 id，默认使用收银台组件 id */
     pid?: string;
     /** 监控会话 id */
     sid?: string;
@@ -36,6 +36,7 @@ export interface RequestLogInfo {
 export declare class PayKKaLogger {
     constructor();
     init(options?: LoggerOptions): Promise<void>;
+    private reportEnvInfo;
     /** 上报自定义事件 */
     reportCustomEvent(event: EventType, data?: EventData<EventType>): void;
     /** 上报错误 */
@@ -43,6 +44,9 @@ export declare class PayKKaLogger {
     /** 上报请求 */
     reportRequestEvent(request: RequestLogInfo): void;
     setLoggerOptions(options: Recordable): void;
+    private getTag;
+    /** 读取缓存中的设备指纹段，缓存缺失或损坏时返回空串 */
+    private getCachedFingerprint;
     /**
      * 在日志上报前执行，拦截部分日志上报
      * 1. 过滤接口日志，只上报收银台相关接口，用接口域名判断

package/dist/types/types/event.d.ts

@@ -6,7 +6,7 @@ import type { PaymentMethod } from '../constant';
  * 事件类型
  * 适用于埋点上报
  */
-export type EventType = FraudDetectionEventType | ApplePayEventType | GooglePayEventType | PaymentEventType | ThreeDSEventType | LoggerEventType | SecurityIframeEventType | WechatPayEventType;
+export type EventType = FraudDetectionEventType | ApplePayEventType | GooglePayEventType | PaymentEventType | ThreeDSEventType | SecurityIframeEventType | WechatPayEventType | EnvEventType;
 export type EventData<T extends EventType> = EventDataMapping[T];
 /** fraud detection 事件类型 */
 export declare enum FraudDetectionEventType {
@@ -25,7 +25,9 @@ export declare enum FraudDetectionEventType {
     /** fraud detection 加载失败 */
     FRAUD_DETECTION_LOAD_ERROR = "fraudDetection:loadError",
     /** fraud detection 警告事件 */
-    FRAUD_DETECTION_WARNING = "fraudDetection:warning"
+    FRAUD_DETECTION_WARNING = "fraudDetection:warning",
+    /** fraud detection CDN 脚本环境标识 */
+    FRAUD_DETECTION_CDN = "fraudDetection:cdn"
 }
 export declare enum ApplePayEventType {
     /** Apple Pay 环境检测失败 */
@@ -101,11 +103,10 @@ export declare enum SecurityIframeEventType {
     /** 安全 iframe 加载失败 */
     SECURITY_IFRAME_LOAD_ERROR = "securityIframe:loadError"
 }
-export declare enum LoggerEventType {
-    /** 设备 */
-    ENV = "logger:env",
-    /** 行为 */
-    BEHAVIOR = "logger:behavior"
+/** 组件运行环境事件类型 */
+export declare enum EnvEventType {
+    /** 组件初始化时的运行环境信息 */
+    ENV_INFO = "env:info"
 }
 export interface EventDataMapping {
     [FraudDetectionEventType.FRAUD_DETECTION_TRANSFORM_ERROR]: undefined;
@@ -116,6 +117,7 @@ export interface EventDataMapping {
     [FraudDetectionEventType.FRAUD_DETECTION_ERROR]: FraudDetectionErrorData;
     [FraudDetectionEventType.FRAUD_DETECTION_TIMEOUT]: FraudDetectionBaseData;
     [FraudDetectionEventType.FRAUD_DETECTION_WARNING]: FraudDetectionBaseData & CommonEventData;
+    [FraudDetectionEventType.FRAUD_DETECTION_CDN]: undefined;
     [ApplePayEventType.APPLE_PAY_LOAD_ERROR]: undefined;
     [ApplePayEventType.APPLE_PAY_CAN_NOT_USE]: undefined;
     [ApplePayEventType.APPLE_PAY_BUTTON_CLICKED]: undefined;
@@ -143,16 +145,26 @@ export interface EventDataMapping {
     [ThreeDSEventType.THREE_DS_INNER_CHANNEL]: undefined;
     [SecurityIframeEventType.SECURITY_IFRAME_LOADED]: SecurityIframeBaseData;
     [SecurityIframeEventType.SECURITY_IFRAME_LOAD_ERROR]: SecurityIframeBaseData;
-    [LoggerEventType.ENV]: Recordable;
-    [LoggerEventType.BEHAVIOR]: Recordable;
     [WechatPayEventType.WECHAT_PAY_START]: undefined;
     [WechatPayEventType.WECHAT_PAY_SUCCESS]: undefined;
     [WechatPayEventType.WECHAT_PAY_FAILURE]: CommonEventData;
     [WechatPayEventType.WECHAT_PAY_CANCELLED]: undefined;
+    [EnvEventType.ENV_INFO]: EnvInfoData;
 }
 export interface CommonEventData {
     message?: string;
 }
+/** 组件运行环境信息，key 使用缩写，与 logger 的 url 参数风格保持一致 */
+export interface EnvInfoData {
+    /** 接入方式 */
+    itg: string;
+    /** 构建环境 */
+    benv: string;
+    /** 是否运行在 iframe 中 */
+    ifr: boolean;
+    /** 组件版本 */
+    v: string;
+}
 export interface FraudDetectionBaseData {
     /** 当前渠道 */
     channel: ChannelCode;

package/dist/types/utils/base64.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Base64 编解码
+ * 默认使用标准字母表；传入一张置换后的字母表即可得到私有变体，编解码必须传同一张表
+ */
+/**
+ * 将字符串编码为 Base64
+ * @params value 原始字符串
+ * @params table 字母表，需为 64 个互不重复的字符；默认标准字母表
+ * @returns 编码结果（不含填充），编码失败返回空串
+ */
+export declare const encodeBase64: (value: string, table?: string) => string;
+/**
+ * 将 Base64 字符串解码
+ * @params value Base64 字符串
+ * @params table 编码时使用的同一张字母表；默认标准字母表
+ * @returns 解码结果，解码失败返回空串
+ */
+export declare const decodeBase64: (value: string, table?: string) => string;

package/dist/types/utils/index.d.ts

@@ -10,6 +10,7 @@ export * from './iframe';
 export * from './location';
 export * from './redirect';
 export * from './array';
+export * from './base64';
 export * from './detect';
 export * from './date';
 export * from './object';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paykka/card-checkout-ui",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "type": "module",
   "main": "dist/paykka-card-checkout-ui.umd.js",
   "module": "dist/es/index.js",
@@ -34,6 +34,10 @@
     "changeset:pre-exit": "changeset pre exit",
     "changeset:version": "changeset version",
     "changeset:release": "changeset publish",
+    "version:dev": "node scripts/version.cjs dev",
+    "version:fat": "node scripts/version.cjs fat",
+    "version:sandbox": "node scripts/version.cjs sandbox",
+    "version:prod": "node scripts/version.cjs prod",
     "release:dev": "node scripts/release.cjs dev",
     "release:fat": "node scripts/release.cjs fat",
     "release:sandbox": "node scripts/release.cjs sandbox",