polycopy 0.3.1 → 0.3.3

package/dist/cli.js

@@ -3,7 +3,7 @@
 const child_process = require("child_process");
 const fs = require("fs");
 const path = require("path");
-const processLock = require("./process-lock-y_yjnMCr.js");
+const processLock = require("./process-lock-BbcEGnAP.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
-const processLock = require("./process-lock-y_yjnMCr.js");
+const processLock = require("./process-lock-BbcEGnAP.js");
 const grammy = require("grammy");
 const log4js = require("log4js");
 const path = require("path");
@@ -908,7 +908,12 @@ class RelayClient extends EventEmitter__default.default {
     );
     this.postTimeout = setTimeout(() => {
       const postData = this.makePostData();
-      if (!postData) return;
+      if (!postData) {
+        logger.warning("no postData", this.pendingTransactions);
+        telegramService.warning("no postData");
+        this.postTimeout = null;
+        return;
+      }
       const { total, transactions, postTransactions, postEvent } = postData;
       logger.info(
         "RelayClient",
@@ -1075,6 +1080,21 @@ class RelayClient extends EventEmitter__default.default {
       logger.info(` - pending: ${this.pendingTransactions.length}`);
     });
   }
+  removeTransaction(conditionId) {
+    const index = this.pendingTransactions.findIndex(
+      (pt) => pt.conditionId === conditionId
+    );
+    if (index > -1) {
+      const removed = this.pendingTransactions[index];
+      this.pendingTransactions.splice(index, 1);
+      logger.info("RelayClient", "remove transaction", removed);
+      logger.info(` - pending: ${this.pendingTransactions.length}`);
+      if (this.pendingTransactions.length === 0 && this.postTimeout) {
+        clearTimeout(this.postTimeout);
+        logger.info("检测到提交队列已清空，终止定时任务");
+      }
+    }
+  }
   checkSubmit(conditionId) {
     if (this.resetsTime) {
       throw Error(
@@ -1314,7 +1334,11 @@ class Redeemer extends EventEmitter__default.default {
           logger.lines(...messages);
           telegramService.info(messages.join("\n"));
         }
-        logger.info("redeem 提交结果:", txHash || error);
+        if (txHash) {
+          logger.success("redeem 提交结果:", txHash);
+        } else {
+          logger.warning("redeem 提交结果:", error);
+        }
       }
     );
     const unListenRequestLimit = listenEvent(
@@ -1329,8 +1353,8 @@ class Redeemer extends EventEmitter__default.default {
     );
     const unListenResets = listenEvent(relayClient, "resets", () => {
       this.running = false;
-      this.start();
-      telegramService.info("AutoRedeem 已重启");
+      this.start(true);
+      telegramService.info("自动 redeem 已重启");
     });
     return () => {
       unListenPosted();
@@ -1394,7 +1418,7 @@ class Redeemer extends EventEmitter__default.default {
   }
   toMessages(eventRecords) {
     return eventRecords.map(
-      ({ position, execCount, postSuccessTime }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC (执行次数: ${execCount}${postSuccessTime ? `确认时长: ${(Date.now() - postSuccessTime) / 1e3}s` : ""})`
+      ({ position, execCount, postSuccessTime }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC (执行次数: ${execCount}${postSuccessTime ? ` 确认时长: ${(Date.now() - postSuccessTime) / 1e3}s` : ""})`
     );
   }
   async autoRedeem() {
@@ -1406,6 +1430,7 @@ class Redeemer extends EventEmitter__default.default {
       return;
     }
     const preSize = this.records.size;
+    const relayClient = this.options.relayClient;
     for (const position of redeemablePositions) {
       const conditionId = position.conditionId;
       let record = this.records.get(conditionId);
@@ -1416,7 +1441,6 @@ class Redeemer extends EventEmitter__default.default {
           timeout: false
         };
         this.records.set(conditionId, record);
-        const relayClient = this.options.relayClient;
         relayClient.submitRedeem(conditionId).then(() => {
           record.postSuccessTime = Date.now();
         }).catch((error) => {
@@ -1438,6 +1462,7 @@ class Redeemer extends EventEmitter__default.default {
           timeoutRecords.push(record);
         }
       } else {
+        relayClient.removeTransaction(conditionId);
         successRecords.push(record);
         this.records.delete(conditionId);
       }
@@ -1464,13 +1489,14 @@ class Redeemer extends EventEmitter__default.default {
     }
     if (successRecords.length > 0) this.emit("redeemed");
   }
-  start() {
+  start(restart) {
     if (this.running) return;
     this.running = true;
     this.timer = setPromiseInterval__default.default(
       this.autoRedeem.bind(this),
       AUTO_REDEEM_INTERVAL
     );
+    logger.success(restart ? "自动 redeem 已重启" : "自动 redeem 已启动");
   }
   stop() {
     setPromiseInterval.clearPromiseInterval(this.timer);

package/dist/{process-lock-y_yjnMCr.js → process-lock-BbcEGnAP.js}

@@ -144,12 +144,12 @@ async function runConfigWizard(existingConfig) {
     console.log("✅ 验证成功");
   }
   const currentAdminChatId = currentTelegram?.adminChatId;
-  const adminHint = currentAdminChatId ? "回车保持，skip 清除" : "回车跳过";
+  const adminHint = currentAdminChatId ? "回车=保持, clear=清除" : "回车=跳过";
   const adminChatIdInput = await question(
     ` - 管理员 Chat ID [${currentAdminChatId || "未配置"}] (用于接收重要通知, ${adminHint}): `
   );
   let adminChatId = currentAdminChatId;
-  if (adminChatIdInput.trim().toLowerCase() === "skip") {
+  if (adminChatIdInput.trim().toLowerCase() === "clear") {
     adminChatId = void 0;
   } else if (adminChatIdInput.trim()) {
     const parsed = parseInt(adminChatIdInput.trim());
@@ -163,44 +163,44 @@ async function runConfigWizard(existingConfig) {
   console.log("提示: 以下配置项都可以跳过，留空后将无法自动跟单");
   const currentPrivateKey = currentPolymarket?.privateKey || "";
   const pkDisplay = currentPrivateKey ? "已配置" : "未配置";
-  const pkHint = currentPrivateKey ? "回车保持，skip 清除" : "回车跳过";
+  const pkHint = currentPrivateKey ? "回车=保持, clear=清除" : "回车=跳过";
   const privateKeyInput = await question(
     ` - 钱包私钥 [${pkDisplay}] (${pkHint}): `
   );
-  const privateKeyTrimmed = privateKeyInput.trim().toLowerCase() === "skip" ? "" : privateKeyInput.trim() || currentPrivateKey;
+  const privateKeyTrimmed = privateKeyInput.trim().toLowerCase() === "clear" ? "" : privateKeyInput.trim() || currentPrivateKey;
   let funderAddress = currentPolymarket?.funderAddress;
   let builderCreds = currentPolymarket?.builderCreds;
   if (privateKeyTrimmed) {
     const funderDisplay = funderAddress || "未配置";
-    const funderHint = funderAddress ? "回车保持，skip 清除" : "回车跳过";
+    const funderHint = funderAddress ? "回车=保持, clear=清除" : "回车=跳过";
     const funderInput = await question(
       ` - Polymarket 账户地址 [${funderDisplay}] (${funderHint}): `
     );
-    if (funderInput.trim().toLowerCase() === "skip") {
+    if (funderInput.trim().toLowerCase() === "clear") {
       funderAddress = void 0;
     } else if (funderInput.trim()) {
       funderAddress = funderInput.trim();
     }
     const hasBuilderCreds = !!builderCreds;
     const builderDisplay = hasBuilderCreds ? "已配置" : "未配置";
-    const builderHint = hasBuilderCreds ? "y=重新配置, n=清除, 回车=保持" : "y=配置, 回车=跳过, 前往 https://polymarket.com/settings?tab=builder 申请";
+    const builderHint = hasBuilderCreds ? "y=重新配置, clear=清除, 回车=保持" : "y=配置, 回车=跳过";
     const needBuilderCreds = await question(
-      ` - Builder API [${builderDisplay}] (${builderHint}): `
+      ` - Builder API [${builderDisplay}] (用于自动 redeem, ${builderHint}, 前往 https://polymarket.com/settings?tab=builder 申请): `
     );
     const needBuilderCredsLower = needBuilderCreds.trim().toLowerCase();
-    const shouldConfigBuilder = needBuilderCredsLower === "y" || !needBuilderCredsLower && hasBuilderCreds;
+    const shouldConfigBuilder = needBuilderCredsLower === "y";
     if (shouldConfigBuilder) {
       const keyDisplay = builderCreds?.key ? `${builderCreds.key.substring(0, 10)}...` : "未配置";
       const builderKey = await question(
-        `   - API Key [${keyDisplay}] (回车保持): `
+        `   - API Key [${keyDisplay}] (回车=保持): `
       );
       const secretDisplay = builderCreds?.secret ? "已配置" : "未配置";
       const builderSecret = await question(
-        `   - API Secret [${secretDisplay}] (回车保持): `
+        `   - API Secret [${secretDisplay}] (回车=保持): `
       );
       const passDisplay = builderCreds?.passphrase ? "已配置" : "未配置";
       const builderPassphrase = await question(
-        `   - API Passphrase [${passDisplay}] (回车保持): `
+        `   - API Passphrase [${passDisplay}] (回车=保持): `
       );
       if (!builderKey.trim() && !builderSecret.trim() && !builderPassphrase.trim()) {
         builderCreds = currentPolymarket?.builderCreds;
@@ -211,7 +211,7 @@ async function runConfigWizard(existingConfig) {
           passphrase: builderPassphrase.trim() || builderCreds?.passphrase || ""
         };
       }
-    } else {
+    } else if (needBuilderCredsLower === "clear") {
       builderCreds = void 0;
     }
   } else {
@@ -226,8 +226,6 @@ async function runConfigWizard(existingConfig) {
   );
   if (needTradingConfig.trim().toLowerCase() === "y") {
     tradingConfig = await configureTrading(currentTrading);
-  } else {
-    tradingConfig = currentTrading || {};
   }
   const config = {
     telegram: {
@@ -319,7 +317,7 @@ async function configureTrading(existingConfig) {
     const valueDisplay = existingValue !== void 0 ? `${existingValue}${unit}` : `${defaultValue}${unit}`;
     const valueHint = isFixed ? "USDC金额" : "0-1比例";
     const valueInput = await question(
-      ` - 使用金数值 [${valueDisplay}] (${valueHint}): `
+      ` - 使用金数值 [${valueDisplay}] (${valueHint}, 回车=保持): `
     );
     if (!valueInput.trim()) {
       if (existingValue !== void 0) {
@@ -347,7 +345,7 @@ async function configureTrading(existingConfig) {
   while (true) {
     const buyDisplay = existingBuyPrice !== void 0 ? existingBuyPrice : defaultBuyPrice;
     const buyPriceInput = await question(
-      ` - 买价 [${buyDisplay}] (0.1-0.99): `
+      ` - 买价 [${buyDisplay}] (0.1-0.99, 回车=保持): `
     );
     if (!buyPriceInput.trim()) {
       buyPrice = existingBuyPrice ?? defaultBuyPrice;
@@ -368,7 +366,7 @@ async function configureTrading(existingConfig) {
     const sellDisplay = String(existingSellPrice ?? defaultSellPrice);
     const minSell = buyPrice ?? 0.98;
     const sellPriceInput = await question(
-      ` - 卖价 [${sellDisplay}] (>${minSell} 且 <=1, 1=不卖出等待自动 redeem): `
+      ` - 卖价 [${sellDisplay}] (>${minSell} 且 <=1, 1=不卖出等待自动 redeem, 回车=保持): `
     );
     if (!sellPriceInput.trim()) {
       sellPrice = existingSellPrice ?? defaultSellPrice;
@@ -431,7 +429,7 @@ async function ensureConfig() {
   if (!hasPolyMarketConfig(config)) {
     console.log("未检测到 PolyMarket 配置");
     const useFullWizard = await question(
-      "是否要运行完整配置向导？(y/n，默认 n，选择 n 将跳过配置): "
+      "是否要运行完整配置向导？(y=运行向导, 回车=跳过): "
     );
     if (useFullWizard.trim().toLowerCase() === "y") {
       const updatedConfig = await runConfigWizard(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {