@pisell/private-materials 6.6.5 → 6.6.7

package/lib/components/eftposPay/payo/config.js

@@ -42,6 +42,7 @@ var import_helper = require("../helper");
 var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_hooks2 = require("./hooks");
+var import_payment = require("./payment");
 var POS = ({
   api,
   onChange
@@ -68,6 +69,13 @@ var POS = ({
   const initRef = (0, import_react.useRef)(false);
   const unloadRef = (0, import_react.useRef)(false);
   const [check] = (0, import_hooks2.useValidate)(1e3 * 60);
+  const { run: paymentRun, clean: paymentClean } = (0, import_payment.usePayment)({
+    payApi: api.pay,
+    checkApi: api.check,
+    shouldContinue: () => {
+      return !(unloadRef.current || !netRef.current);
+    }
+  });
   (0, import_react.useEffect)(() => {
     failRef.current = fail;
   }, [fail]);
@@ -126,7 +134,7 @@ var POS = ({
     );
   };
   (0, import_react.useEffect)(() => {
-    var _a, _b;
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -145,82 +153,98 @@ var POS = ({
       })
     );
     controllerRef.current = new AbortController();
-    const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
-      {
-        ...(custom == null ? void 0 : custom.platform) ? {
-          operator_id: custom.operator_id,
-          operator_type: custom.operator_type,
-          platform: custom.platform,
-          custom_payment_id: custom.custom_payment_id,
-          service_charge: {
-            amount: payRef.current.surMoney,
-            percentage: payRef.current.surPercentRate
-          },
-          original_amount: payRef.current.amount
-        } : {},
-        order_id: orderIdRef.current,
-        amount: payRef.current.total,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+    const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
+    const apiParams = isPay ? {
+      ...(custom == null ? void 0 : custom.platform) ? {
+        operator_id: custom.operator_id,
+        operator_type: custom.operator_type,
+        platform: custom.platform,
+        custom_payment_id: custom.custom_payment_id
+      } : {},
+      original_amount: payRef.current.amount,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
+      },
+      order_id: orderIdRef.current,
+      amount: payRef.current.total,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    ) : api.refund(
-      {
-        order_id: orderIdRef.current,
-        amount: amountRef.current,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+      )
+    } : {
+      order_id: orderIdRef.current,
+      amount: amountRef.current,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    );
-    resultPromise.then((res) => {
-      console.log("netRef.current111 = ", netRef.current);
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (res && `${res.code}` === "200") {
-        success(res);
-        return;
-      }
-      return Promise.reject(res);
-    }).catch((err) => {
-      console.log(
-        "netRef.current222 = ",
-        netRef.current,
-        unloadRef.current,
-        err
-      );
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
-        checkApi();
-        return;
-      }
-      failRef.current(err, true);
-    });
+      )
+    };
+    if (isPay) {
+      paymentRun({
+        paymentType: import_payment.ActionType.Pay,
+        paymentNum: numRef.current,
+        orderId: orderIdRef.current,
+        deviceId: (_c = deviceRef.current) == null ? void 0 : _c.id,
+        params: apiParams,
+        callbacks: {
+          onSuccess: (res) => {
+            success(res);
+          },
+          onError: (err) => {
+            console.log("err = >>>>>", err);
+            failRef.current(err, true);
+          }
+        }
+      });
+      return;
+    } else {
+      const resultPromise = api.refund(apiParams, { signal: controllerRef.current.signal });
+      resultPromise.then((res) => {
+        console.log("netRef.current111 = ", netRef.current);
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (res && `${res.code}` === "200") {
+          success(res);
+          return;
+        }
+        return Promise.reject(res);
+      }).catch((err) => {
+        console.log(
+          "netRef.current222 = ",
+          netRef.current,
+          unloadRef.current,
+          err
+        );
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
+          checkApi();
+          return;
+        }
+        failRef.current(err, true);
+      });
+    }
   }, [api, check, dispatch, onChange]);
   (0, import_react.useEffect)(
     () => () => {
@@ -230,6 +254,7 @@ var POS = ({
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
+      paymentClean();
     },
     []
   );

package/lib/components/eftposPay/payo/payment.js

@@ -0,0 +1,357 @@
+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/payo/payment.ts
+var payment_exports = {};
+__export(payment_exports, {
+  ActionType: () => ActionType,
+  usePayment: () => usePayment
+});
+module.exports = __toCommonJS(payment_exports);
+var import_react = require("react");
+var import_const = require("../const");
+var import_log = __toESM(require("../utils/log"));
+var QUERY_START_DELAY = 1e3 * 10;
+var GLOBAL_TIMEOUT = 1e3 * 60 * 2;
+var REQUEST_TIMEOUT = 1e3 * 10;
+var QUERY_INTERVAL = 1e3 * 2;
+var ActionType = /* @__PURE__ */ ((ActionType2) => {
+  ActionType2["Pay"] = "pay";
+  ActionType2["Refund"] = "refund";
+  ActionType2["Query"] = "query";
+  return ActionType2;
+})(ActionType || {});
+var isRequestFailed = (code) => {
+  return code && `${code}` !== import_const.PayStatus.Timeout && `${code}` !== import_const.PayStatus.PayTimeout;
+};
+var usePayment = (options) => {
+  const { payApi, refundApi, checkApi, shouldContinue = () => true } = options;
+  const payControllerRef = (0, import_react.useRef)(null);
+  const queryControllerRef = (0, import_react.useRef)(null);
+  const queryStartTimerRef = (0, import_react.useRef)(null);
+  const globalTimeoutTimerRef = (0, import_react.useRef)(
+    null
+  );
+  const requestTimeoutTimerRef = (0, import_react.useRef)(
+    null
+  );
+  const queryIntervalTimerRef = (0, import_react.useRef)(
+    null
+  );
+  const isFinishedRef = (0, import_react.useRef)(false);
+  const isQueryingRef = (0, import_react.useRef)(false);
+  const callbacksRef = (0, import_react.useRef)(null);
+  const isRequestTimeoutRef = (0, import_react.useRef)(false);
+  const currentQueryIdRef = (0, import_react.useRef)(0);
+  const currentRunIdRef = (0, import_react.useRef)(0);
+  const clean = (params) => {
+    const { clearCallbacks = true } = params || {};
+    console.log("🧹 清理所有资源", { clearCallbacks });
+    if (payControllerRef.current) {
+      payControllerRef.current.abort();
+      payControllerRef.current = null;
+    }
+    if (queryControllerRef.current) {
+      queryControllerRef.current.abort();
+      queryControllerRef.current = null;
+    }
+    if (queryStartTimerRef.current) {
+      clearTimeout(queryStartTimerRef.current);
+      queryStartTimerRef.current = null;
+    }
+    if (globalTimeoutTimerRef.current) {
+      clearTimeout(globalTimeoutTimerRef.current);
+      globalTimeoutTimerRef.current = null;
+    }
+    if (requestTimeoutTimerRef.current) {
+      clearTimeout(requestTimeoutTimerRef.current);
+      requestTimeoutTimerRef.current = null;
+    }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+      queryIntervalTimerRef.current = null;
+    }
+    isQueryingRef.current = false;
+    isFinishedRef.current = false;
+    isRequestTimeoutRef.current = false;
+    if (clearCallbacks !== false) {
+      callbacksRef.current = null;
+    }
+  };
+  const finish = () => {
+    if (!isFinishedRef.current) {
+      clean();
+      isFinishedRef.current = true;
+      import_log.default.clearLogs();
+    }
+  };
+  const handleFinalSuccess = (res, type) => {
+    var _a, _b;
+    if (isFinishedRef.current || !shouldContinue()) {
+      console.log(`⚠️ 已完成或不应继续处理，忽略${type}操作成功结果`);
+      return;
+    }
+    (_b = (_a = callbacksRef.current) == null ? void 0 : _a.onSuccess) == null ? void 0 : _b.call(_a, res);
+    import_log.default.addLog({ title: "最终结果：支付成功", content: { type, res } });
+    finish();
+  };
+  const handleFinalError = (error, type) => {
+    var _a, _b;
+    if (isFinishedRef.current || !shouldContinue()) {
+      console.log(`⚠️ 已完成或不应继续处理，忽略${type}操作错误`);
+      return;
+    }
+    (_b = (_a = callbacksRef.current) == null ? void 0 : _a.onError) == null ? void 0 : _b.call(_a, error);
+    import_log.default.addLog({
+      title: "最终结果：支付失败",
+      content: { type, error }
+    });
+    finish();
+  };
+  const createTimeoutPromise = (timeoutMs) => {
+    return new Promise((_, reject) => {
+      requestTimeoutTimerRef.current = setTimeout(() => {
+        console.log(`⏱️ 单次查询超时（${timeoutMs / 1e3}秒），强制终止`);
+        isRequestTimeoutRef.current = true;
+        if (queryControllerRef.current) {
+          queryControllerRef.current.abort();
+        }
+        reject(new Error("REQUEST_TIMEOUT"));
+      }, timeoutMs);
+    });
+  };
+  const performQuery = async (paymentNum) => {
+    if (isFinishedRef.current || !shouldContinue()) {
+      import_log.default.addLog({
+        title: "支付轮询前置校验：支付已完成或不应继续处理，取消查询"
+      });
+      return;
+    }
+    if (queryControllerRef.current) {
+      queryControllerRef.current.abort();
+      queryControllerRef.current = null;
+    }
+    if (requestTimeoutTimerRef.current) {
+      clearTimeout(requestTimeoutTimerRef.current);
+      requestTimeoutTimerRef.current = null;
+    }
+    const queryId = Date.now();
+    currentQueryIdRef.current = queryId;
+    isRequestTimeoutRef.current = false;
+    queryControllerRef.current = new AbortController();
+    const { signal } = queryControllerRef.current;
+    try {
+      import_log.default.addLog({ title: "支付轮询：开始单次查询" });
+      const res = await Promise.race([
+        checkApi({ number: paymentNum }, { signal }),
+        createTimeoutPromise(REQUEST_TIMEOUT)
+      ]);
+      if (requestTimeoutTimerRef.current) {
+        clearTimeout(requestTimeoutTimerRef.current);
+        requestTimeoutTimerRef.current = null;
+      }
+      if (queryId < currentQueryIdRef.current) {
+        import_log.default.addLog({ title: "支付轮询结果：过期的查询响应，忽略" });
+        return;
+      }
+      if (isFinishedRef.current || !shouldContinue()) {
+        import_log.default.addLog({ title: "支付轮询结果：支付已完成或不应继续处理" });
+        return;
+      }
+      if (res && `${res.code}` === "200") {
+        import_log.default.addLog({ title: "支付轮询结果：支付成功" });
+        handleFinalSuccess(res, "query" /* Query */);
+        return;
+      }
+      if (isRequestFailed(res == null ? void 0 : res.code)) {
+        import_log.default.addLog({
+          title: "支付轮询结果：有明确错误code，停止轮询",
+          content: res
+        });
+        handleFinalError(res, "query" /* Query */);
+      } else {
+        import_log.default.addLog({
+          title: "支付轮询结果：查询返回失败但没有明确code或超时code，继续轮询",
+          content: res
+        });
+        scheduleNextQuery(paymentNum);
+      }
+    } catch (error) {
+      if (requestTimeoutTimerRef.current) {
+        clearTimeout(requestTimeoutTimerRef.current);
+        requestTimeoutTimerRef.current = null;
+      }
+      if (queryId < currentQueryIdRef.current) {
+        import_log.default.addLog({
+          title: "支付轮询结果：error-过期的查询异常，忽略"
+        });
+        return;
+      }
+      if (isFinishedRef.current || !shouldContinue()) {
+        return;
+      }
+      if (isRequestTimeoutRef.current || (error == null ? void 0 : error.name) === "AbortError" || (error == null ? void 0 : error.message) === "REQUEST_TIMEOUT") {
+        import_log.default.addLog({
+          title: "支付轮询结果：error-请求被取消或超时，继续轮询"
+        });
+        scheduleNextQuery(paymentNum);
+        return;
+      }
+      if (isRequestFailed(error == null ? void 0 : error.code)) {
+        import_log.default.addLog({
+          title: "支付轮询结果：error-有明确错误code，停止轮询",
+          content: error
+        });
+        handleFinalError(error, "query" /* Query */);
+      } else {
+        import_log.default.addLog({
+          title: "支付轮询结果：error-无明确code或者code不是超时，继续轮询",
+          content: error
+        });
+        scheduleNextQuery(paymentNum);
+      }
+    }
+  };
+  const scheduleNextQuery = (paymentNum) => {
+    if (isFinishedRef.current || !shouldContinue()) {
+      return;
+    }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+    }
+    queryIntervalTimerRef.current = setTimeout(() => {
+      import_log.default.addLog({ title: "支付轮询：安排下一次查询" });
+      performQuery(paymentNum);
+    }, QUERY_INTERVAL);
+  };
+  const startQuery = (paymentNum) => {
+    if (isFinishedRef.current || !shouldContinue() || isQueryingRef.current) {
+      return;
+    }
+    isQueryingRef.current = true;
+    globalTimeoutTimerRef.current = setTimeout(() => {
+      if (isFinishedRef.current) {
+        return;
+      }
+      console.log("⏱️ 轮询全局超时（2分钟），终止所有请求");
+      import_log.default.addLog({ title: "轮询全局超时（2分钟），终止所有请求" });
+      handleFinalError(
+        { code: import_const.PayStatus.Timeout, message: "交易超时" },
+        "query" /* Query */
+      );
+    }, GLOBAL_TIMEOUT);
+    performQuery(paymentNum);
+  };
+  const run = async (options2) => {
+    const {
+      paymentType = "pay" /* Pay */,
+      params,
+      paymentNum,
+      callbacks
+    } = options2;
+    const runId = Date.now();
+    currentRunIdRef.current = runId;
+    const { pay_param_base64, ...otherParams } = params || {};
+    import_log.default.init(paymentNum, {
+      orderId: options2 == null ? void 0 : options2.orderId,
+      deviceId: options2 == null ? void 0 : options2.deviceId,
+      paymentType: `PAYO_${paymentType}`,
+      params: otherParams
+    });
+    isFinishedRef.current = true;
+    clean({ clearCallbacks: false });
+    callbacksRef.current = callbacks;
+    queryStartTimerRef.current = setTimeout(() => {
+      import_log.default.addLog({ title: "支付后10秒开始轮询" });
+      startQuery(paymentNum);
+    }, QUERY_START_DELAY);
+    payControllerRef.current = new AbortController();
+    const { signal } = payControllerRef.current;
+    try {
+      import_log.default.addLog({ title: "发起支付请求" });
+      const resultPromise = paymentType === "pay" /* Pay */ ? payApi : refundApi;
+      if (!resultPromise) {
+        throw new Error(
+          `${paymentType === "pay" /* Pay */ ? "支付" : "退款"}接口不存在`
+        );
+      }
+      const res = await (resultPromise == null ? void 0 : resultPromise(params, { signal }));
+      if (runId < currentRunIdRef.current) {
+        import_log.default.addLog({ title: "支付响应过期，忽略" });
+        return;
+      }
+      if (isFinishedRef.current || !shouldContinue()) {
+        import_log.default.addLog({ title: "支付返回时已完成或不应继续处理" });
+        return;
+      }
+      if (res && `${res.code}` === "200") {
+        import_log.default.addLog({ title: "支付接口成功" });
+        handleFinalSuccess(res, paymentType);
+        return;
+      }
+      if (isRequestFailed(res == null ? void 0 : res.code)) {
+        import_log.default.addLog({ title: "支付接口返回失败", content: { res } });
+        handleFinalError(res, "pay" /* Pay */);
+      } else {
+        import_log.default.addLog({
+          title: "支付超时或无明确错误，等待轮询结果",
+          content: { res }
+        });
+      }
+    } catch (error) {
+      if (runId < currentRunIdRef.current) {
+        import_log.default.addLog({ title: "支付响应过期，忽略" });
+        return;
+      }
+      if (isFinishedRef.current || !shouldContinue()) {
+        import_log.default.addLog({ title: "支付异常时已完成或不应继续处理" });
+        return;
+      }
+      if (isRequestFailed(error == null ? void 0 : error.code)) {
+        import_log.default.addLog({ title: "支付接口异常", content: { error } });
+        handleFinalError(error, paymentType);
+      } else {
+        import_log.default.addLog({
+          title: "支付超时或无明确错误，等待轮询结果",
+          content: { error }
+        });
+      }
+    }
+  };
+  const stop = () => {
+    import_log.default.addLog({ title: "手动停止支付流程" });
+    clean();
+    isFinishedRef.current = true;
+  };
+  return { run, stop, clean };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ActionType,
+  usePayment
+});

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eftposPay/tip.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面