@pisell/private-materials 6.6.61 → 6.6.63

package/lib/components/eftposPay/tyro/index.js

@@ -42,6 +42,7 @@ var import_decimal = require("decimal.js");
 var import_helper = require("../helper");
 var import_step = __toESM(require("../component/step/step"));
 var import_hooks2 = require("../hooks");
+var import_payLog = __toESM(require("../utils/payLog"));
 var Minute = 1e3 * 60;
 var tyro_default = ({
   api,
@@ -98,6 +99,7 @@ var tyro_default = ({
     console.log(integrationKey, tid, mid);
     iClient.terminalInfo(
       ({ status: status2, message, terminalInfo }) => {
+        import_payLog.default.log("Tyro：终端信息回调", { status: status2, terminalInfo, message });
         if (status2 === "success" && (terminalInfo == null ? void 0 : terminalInfo.available)) {
           cb();
         }
@@ -110,7 +112,7 @@ var tyro_default = ({
     );
   };
   const refundOrder = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -173,6 +175,8 @@ var tyro_default = ({
         })
       );
     });
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
+    import_payLog.default.log("Tyro：发起退款", { number: numRef == null ? void 0 : numRef.current, amount: (_d = requestParams.current) == null ? void 0 : _d.amount });
     iClient.initiateRefund(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -250,6 +254,8 @@ var tyro_default = ({
         })
       );
     });
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
+    import_payLog.default.log("Tyro：发起支付", { number: numRef.current, amount: requestParams.current.amount });
     iClient.initiatePurchase(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -267,6 +273,7 @@ var tyro_default = ({
     }
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    import_payLog.default.log("Tyro：恢复上次交易");
     iClient.continueLastTransaction({
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -275,8 +282,7 @@ var tyro_default = ({
     });
   };
   const receiptCallbackImpl = ({ signatureRequired, merchantReceipt }) => {
-    console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
-    console.log("商家小票 小票内容 = \n", merchantReceipt);
+    import_payLog.default.log("Tyro：小票回调", { signatureRequired, hasReceipt: !!merchantReceipt });
     const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
     if (signatureRequired) {
@@ -289,6 +295,7 @@ var tyro_default = ({
   };
   const statusMessageCallbackImpl = (message) => {
     var _a;
+    import_payLog.default.log("Tyro：状态消息", { message });
     const translateMsg = import_utils.locales.getText("page.eftpos-pay.text.tyro")(message);
     const msg = Array.isArray(translateMsg) ? translateMsg.reduce(
       (accumulator, currentValue) => accumulator + " " + currentValue,
@@ -319,7 +326,7 @@ var tyro_default = ({
     );
   };
   const questionCallbackImpl = (question, answerCallback) => {
-    console.log("Question is " + JSON.stringify(question));
+    import_payLog.default.log("Tyro：交互问题回调", { question });
     setStatus(-1);
     setManually(false);
     const msg = import_utils.locales.getText("page.eftpos-pay.text.tyro")(question.text);
@@ -375,15 +382,7 @@ var tyro_default = ({
     var _a, _b;
     setStatus(-1);
     setManually(false);
-    console.log(
-      "Response = " + JSON.stringify(response),
-      ", Request =  ",
-      JSON.stringify(requestParams.current)
-    );
-    console.log(
-      " 客户小票 response.customerReceipt = \n",
-      response.customerReceipt
-    );
+    import_payLog.default.log("Tyro：交易完成回调", { response });
     const receipt = [
       // merchantReceiptRef.current?.merchantReceipt,
       response == null ? void 0 : response.customerReceipt
@@ -488,20 +487,22 @@ var tyro_default = ({
     if (load && TyroRef.current) {
       const IClient = TyroRef.current.IClient;
       if (IClient) {
-        console.log("apiKey = ", apiKey, "posProductData = ", posProductData);
         const iclient = new IClient(apiKey, posProductData);
-        console.log(iclient.posProductData);
         iClientRef.current = iclient;
+        import_payLog.default.log("Tyro：SDK 初始化完成");
         if (isCancelRef.current) {
           return;
         }
         if (!numRef.current) {
           if (modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay) {
+            import_payLog.default.log("Tyro：支付交易，查询终端信息");
             getTerminalInfo(payOrder);
           } else if (modeRef.current === import_const.ModeEnum.Refund) {
+            import_payLog.default.log("Tyro：退款交易，查询终端信息");
             getTerminalInfo(refundOrder);
           }
         } else {
+          import_payLog.default.log("Tyro：恢复上次交易，查询终端信息");
           getTerminalInfo(continueLastOrder);
         }
       }
@@ -520,8 +521,8 @@ var tyro_default = ({
       };
     }
     if (status === 0) {
-      console.log("开始倒计时...");
       clear = setTimeout(() => {
+        import_payLog.default.log("Tyro：连接超时");
         dispatch(
           (0, import_store.updateState)({
             status: "fail"
@@ -554,7 +555,7 @@ var tyro_default = ({
       if (!iClient) {
         return;
       }
-      console.log("倒计时到了");
+      import_payLog.default.log("Tyro：交易超时，显示手动标记");
       setManually(true);
     }, Minute);
     return () => {
@@ -564,6 +565,7 @@ var tyro_default = ({
     };
   }, [status]);
   const onManually = () => {
+    import_payLog.default.log("Tyro：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -580,12 +582,14 @@ var tyro_default = ({
       return;
     }
     if (status > 0) {
+      import_payLog.default.log("Tyro：取消当前交易");
       iClient.cancelCurrentTransaction();
       return;
     }
     if (isCancelRef.current) {
       return;
     }
+    import_payLog.default.log("Tyro：取消（交易未开始）");
     isCancelRef.current = true;
     dispatch(
       (0, import_store.updateState)({

package/lib/components/eftposPay/utils/payLog.d.ts

@@ -0,0 +1,81 @@
+export interface PayLogContext {
+    /** 渠道 */
+    channel?: string;
+    /** 订单ID */
+    orderId?: string | number;
+    /** 设备ID */
+    deviceId?: string | number;
+    /** 支付类型：PAYO / WINDCAVE / LINKLY / TYRO */
+    paymentType?: string;
+    /** 交易记录号 */
+    transactionNumber?: string;
+    /** 模式：pay / refund / query */
+    mode?: string;
+    /** 其他扩展信息 */
+    extra?: Record<string, any>;
+}
+declare class PayLog {
+    private static instance;
+    private sessionKey;
+    private context;
+    private logs;
+    private startTime;
+    private flushed;
+    private constructor();
+    static getInstance(): PayLog;
+    /**
+     * 初始化一次交易会话
+     * - 生成唯一 sessionKey
+     * - 恢复上报 localStorage 中残留的旧日志
+     * - 接受部分 context（后续可通过 setContext 补充）
+     */
+    init(context?: Partial<PayLogContext>): void;
+    /**
+     * 补充/更新上下文信息
+     * 新值覆盖旧值，extra 做浅合并
+     */
+    setContext(partial: Partial<PayLogContext>): void;
+    /**
+     * 记录一条日志
+     */
+    log(title: string, data?: any): void;
+    /**
+     * 上报日志到飞书并清理 localStorage
+     */
+    flush(customTitle?: string): Promise<void>;
+    /**
+     * flush + 重置内部状态
+     */
+    destroy(): void;
+    /**
+     * 构建 sendWarningLog 所需的 content 数组
+     */
+    private buildContent;
+    /**
+     * 持久化当前会话到 localStorage
+     */
+    private persistToStorage;
+    /**
+     * 从 localStorage 移除指定 session
+     */
+    private removeFromStorage;
+    /**
+     * 获取 localStorage 中所有 session
+     */
+    private getAllSessions;
+    /**
+     * 恢复上报 localStorage 中残留的旧日志（崩溃/异常退出场景）
+     */
+    private recoverOrphanedLogs;
+}
+declare const payLog: PayLog;
+export default payLog;
+/**
+ * 在根组件中使用，管理 PayLog 生命周期
+ * - mount 时 init（+ 恢复上报残留日志）
+ * - unmount 时 flush
+ */
+export declare function usePayLog(context?: Partial<PayLogContext>): {
+    log: (title: string, data?: any) => void;
+    setContext: (partial: Partial<PayLogContext>) => void;
+};

package/lib/components/eftposPay/utils/payLog.js

@@ -0,0 +1,321 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftposPay/utils/payLog.ts
+var payLog_exports = {};
+__export(payLog_exports, {
+  default: () => payLog_default,
+  usePayLog: () => usePayLog
+});
+module.exports = __toCommonJS(payLog_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_react = require("react");
+var import_utils = require("@pisell/utils");
+var STORAGE_KEY = "pisell2_eftpos_paylog";
+var ERROR_KEYWORDS = ["失败", "错误", "异常", "error", "fail", "timeout", "超时"];
+function generateSessionKey() {
+  const ts = Date.now();
+  const rand = Math.random().toString(36).substring(2, 8);
+  return `eft_${ts}_${rand}`;
+}
+function isErrorLog(title) {
+  const lower = title.toLowerCase();
+  return ERROR_KEYWORDS.some((kw) => lower.includes(kw));
+}
+function shallowEqual(a, b) {
+  if (a === b) return true;
+  if (a == null && b == null) return true;
+  if (a == null || b == null) return false;
+  try {
+    return JSON.stringify(a) === JSON.stringify(b);
+  } catch {
+    return false;
+  }
+}
+function compressLogs(logs) {
+  if (logs.length === 0) return [];
+  const result = [];
+  let i = 0;
+  while (i < logs.length) {
+    const current = logs[i];
+    if (isErrorLog(current.t)) {
+      result.push({ t: current.t, ts: current.ts, d: current.d });
+      i++;
+      continue;
+    }
+    let j = i + 1;
+    while (j < logs.length && logs[j].t === current.t && !isErrorLog(logs[j].t)) {
+      j++;
+    }
+    const count = j - i;
+    if (count === 1) {
+      result.push({ t: current.t, ts: current.ts, d: current.d });
+    } else {
+      const last = logs[j - 1];
+      const entry = {
+        t: current.t,
+        ts: current.ts,
+        count,
+        lastTs: last.ts
+      };
+      if (current.d !== void 0) entry.d = current.d;
+      if (!shallowEqual(current.d, last.d) && last.d !== void 0) {
+        entry.lastD = last.d;
+      }
+      result.push(entry);
+    }
+    i = j;
+  }
+  return result;
+}
+var PayLog = class _PayLog {
+  static instance;
+  sessionKey = null;
+  context = {};
+  logs = [];
+  startTime = 0;
+  flushed = false;
+  constructor() {
+  }
+  static getInstance() {
+    if (!_PayLog.instance) {
+      _PayLog.instance = new _PayLog();
+    }
+    return _PayLog.instance;
+  }
+  /**
+   * 初始化一次交易会话
+   * - 生成唯一 sessionKey
+   * - 恢复上报 localStorage 中残留的旧日志
+   * - 接受部分 context（后续可通过 setContext 补充）
+   */
+  init(context) {
+    try {
+      this.recoverOrphanedLogs();
+      this.sessionKey = generateSessionKey();
+      this.context = context || {};
+      this.logs = [];
+      this.startTime = Date.now();
+      this.flushed = false;
+      this.log("PayLog 初始化", context);
+    } catch (error) {
+      console.error("PayLog init error:", error);
+    }
+  }
+  /**
+   * 补充/更新上下文信息
+   * 新值覆盖旧值，extra 做浅合并
+   */
+  setContext(partial) {
+    var _a;
+    if (!this.sessionKey) return;
+    const { extra, ...rest } = partial;
+    Object.assign(this.context, rest);
+    if (extra) {
+      this.context.extra = { ...((_a = this.context) == null ? void 0 : _a.extra) || {}, ...extra || {} };
+    }
+    this.persistToStorage();
+  }
+  /**
+   * 记录一条日志
+   */
+  log(title, data) {
+    if (!this.sessionKey) {
+      console.warn("PayLog: 未初始化，日志将被忽略 -", title);
+      return;
+    }
+    const entry = {
+      t: title,
+      ts: (0, import_dayjs.default)().format("HH:mm:ss.SSS")
+    };
+    if (data !== void 0) {
+      entry.d = data;
+    }
+    this.logs.push(entry);
+    this.persistToStorage();
+  }
+  /**
+   * 上报日志到飞书并清理 localStorage
+   */
+  async flush(customTitle) {
+    if (this.flushed || !this.sessionKey) return;
+    this.flushed = true;
+    const _sessionKey = this.sessionKey;
+    try {
+      const elapsed = ((Date.now() - this.startTime) / 1e3).toFixed(1);
+      const compressed = compressLogs(this.logs);
+      const { paymentType, mode, orderId } = this.context;
+      const title = customTitle || `[EFTPOS] ${paymentType || "Unknown"}-${mode || "unknown"}-${orderId || "Unknown"}`;
+      const content = this.buildContent(compressed, elapsed);
+      await (0, import_utils.sendWarningLog)({ title, content });
+      this.removeFromStorage(_sessionKey);
+    } catch (error) {
+      console.error("PayLog flush error:", error);
+    } finally {
+      this.sessionKey = null;
+    }
+  }
+  /**
+   * flush + 重置内部状态
+   */
+  destroy() {
+    this.flush();
+    this.sessionKey = null;
+    this.context = {};
+    this.logs = [];
+    this.startTime = 0;
+    this.flushed = false;
+  }
+  // ─── 私有方法 ───
+  /**
+   * 构建 sendWarningLog 所需的 content 数组
+   */
+  buildContent(compressed, elapsed) {
+    const ctx = this.context;
+    return [
+      { key: "sessionKey", value: this.sessionKey || "" },
+      { key: "发起时间", value: (0, import_dayjs.default)(this.startTime).format("YYYY-MM-DD HH:mm:ss") },
+      { key: "交易号", value: String(ctx.transactionNumber || "未知") },
+      { key: "订单ID", value: String(ctx.orderId || "未知") },
+      { key: "设备ID", value: String(ctx.deviceId || "未知") },
+      { key: "支付类型", value: String(ctx.paymentType || "未知") },
+      { key: "模式", value: String(ctx.mode || "未知") },
+      { key: "渠道", value: String(ctx.channel || "未知") },
+      { key: "总耗时", value: `${elapsed}s` },
+      // { key: '日志条数(原始/压缩)', value: `${this.logs.length}/${compressed.length}` },
+      { key: "时间线", value: JSON.stringify(compressed) }
+    ];
+  }
+  /**
+   * 持久化当前会话到 localStorage
+   */
+  persistToStorage() {
+    if (!this.sessionKey) return;
+    try {
+      const all = this.getAllSessions();
+      all[this.sessionKey] = {
+        sessionKey: this.sessionKey,
+        context: this.context,
+        logs: this.logs,
+        startTime: this.startTime
+      };
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(all));
+    } catch (error) {
+      console.error("PayLog persist error:", error);
+    }
+  }
+  /**
+   * 从 localStorage 移除指定 session
+   */
+  removeFromStorage(key) {
+    try {
+      const all = this.getAllSessions();
+      delete all[key];
+      if (Object.keys(all).length === 0) {
+        localStorage.removeItem(STORAGE_KEY);
+      } else {
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(all));
+      }
+    } catch (error) {
+      console.error("PayLog removeFromStorage error:", error);
+    }
+  }
+  /**
+   * 获取 localStorage 中所有 session
+   */
+  getAllSessions() {
+    try {
+      const raw = localStorage.getItem(STORAGE_KEY);
+      if (!raw) return {};
+      return JSON.parse(raw);
+    } catch {
+      return {};
+    }
+  }
+  /**
+   * 恢复上报 localStorage 中残留的旧日志（崩溃/异常退出场景）
+   */
+  recoverOrphanedLogs() {
+    try {
+      const all = this.getAllSessions();
+      const keys = Object.keys(all);
+      if (keys.length === 0) return;
+      for (const key of keys) {
+        const session = all[key];
+        try {
+          const elapsed = ((Date.now() - session.startTime) / 1e3).toFixed(1);
+          const compressed = compressLogs(session.logs);
+          const ctx = session.context;
+          const title = `[PRE][EFTPOS] ${ctx.paymentType || "未知支付"}-${ctx.mode || "未知模式"}-${ctx.orderId || "未知订单ID"}`;
+          const content = [
+            { key: "sessionKey", value: session.sessionKey },
+            { key: "发起时间", value: (0, import_dayjs.default)(session.startTime).format("YYYY-MM-DD HH:mm:ss") },
+            { key: "交易号", value: String(ctx.transactionNumber || "未知") },
+            { key: "订单ID", value: String(ctx.orderId || "未知") },
+            { key: "设备ID", value: String(ctx.deviceId || "未知") },
+            { key: "支付类型", value: String(ctx.paymentType || "未知") },
+            { key: "模式", value: String(ctx.mode || "未知") },
+            { key: "总耗时", value: `${elapsed}s` },
+            { key: "日志条数(原始/压缩)", value: `${session.logs.length}/${compressed.length}` },
+            { key: "时间线", value: JSON.stringify(compressed) }
+          ];
+          (0, import_utils.sendWarningLog)({ title, content });
+          this.removeFromStorage(key);
+        } catch (err) {
+          console.error(`PayLog: 恢复上报失败 (${key}):`, err);
+          this.removeFromStorage(key);
+        }
+      }
+    } catch (error) {
+      console.error("PayLog recoverOrphanedLogs error:", error);
+    }
+  }
+};
+var payLog = PayLog.getInstance();
+var payLog_default = payLog;
+function usePayLog(context) {
+  const initialized = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    if (!initialized.current) {
+      initialized.current = true;
+      payLog.init(context);
+    }
+    return () => {
+      payLog.log("流程结束，上报日志");
+      payLog.destroy();
+    };
+  }, []);
+  return {
+    log: (title, data) => payLog.log(title, data),
+    setContext: (partial) => payLog.setContext(partial)
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  usePayLog
+});

package/lib/components/eftposPay/windcave/const.js

@@ -60,7 +60,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
     custom: other ? { ...other, list: [], step: 1 /* Free */ } : { list: [], step: 1 /* Free */ },
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eftposPay/windcave/receiptAction.js

@@ -40,6 +40,7 @@ var import_const = require("../const");
 var import_store = require("../store");
 var import_hooks = require("../hooks");
 var import_const2 = require("./const");
+var import_payLog = __toESM(require("../utils/payLog"));
 var ReceiptAction = ({
   api,
   onChange
@@ -67,6 +68,7 @@ var ReceiptAction = ({
     listRef.current = custom == null ? void 0 : custom.list;
   }, [custom == null ? void 0 : custom.list]);
   const onAccept = () => {
+    import_payLog.default.log("Windcave：签名-点击确认");
     dispatch((0, import_store.updateStatus)(import_const.StatusEnum.Loading));
     dispatch(
       (0, import_store.updateCustom)({
@@ -144,6 +146,7 @@ var ReceiptAction = ({
     });
   };
   const onBack = () => {
+    import_payLog.default.log("Windcave：签名-点击后退");
     dispatch(
       (0, import_store.updateState)({
         title: import_utils.locales.getText("page.eftpos-pay.text.waiting.signature"),
@@ -154,6 +157,7 @@ var ReceiptAction = ({
     dispatch((0, import_store.updateCustom)({ receiptPage: "receipt" }));
   };
   const onConfirm = () => {
+    import_payLog.default.log("Windcave：签名-点击取消");
     dispatch(
       (0, import_store.updateState)({
         title: import_utils.locales.getText("page.eftpos-pay.text.processing"),
@@ -243,6 +247,7 @@ var ReceiptAction = ({
     });
   };
   const onDecline = () => {
+    import_payLog.default.log("Windcave：签名-点击取消");
     dispatch(
       (0, import_store.updateState)({
         title: import_utils.locales.getText("page.eftpos-pay.text.signature.title"),