polycopy 0.2.8 → 0.2.9

package/dist/index.js

@@ -869,24 +869,32 @@ class RelayClient extends EventEmitter__default.default {
   }
   makePostData() {
     const total = this.pendingTransactions.length;
-    const transactions = this.pendingTransactions.sort((a, b) => a.retryNum - b.retryNum).splice(0, this.options.batchSize);
+    const transactions = this.pendingTransactions.sort((a, b) => a.execCount - b.execCount).splice(0, this.options.batchSize);
     if (transactions.length === 0) return null;
     const postTransactions = [];
-    const postConditionIds = {
+    const postEvent = {
       redeem: [],
       merge: []
     };
-    for (const { type, conditionId, transaction } of transactions) {
-      postConditionIds[type].push(conditionId);
+    for (const { type, conditionId, execCount, transaction } of transactions) {
+      postEvent[type].push({ conditionId, execCount, done: false });
       postTransactions.push(transaction);
     }
     return {
       total,
       transactions,
-      postConditionIds,
+      postEvent,
       postTransactions
     };
   }
+  logPostedEvent(type, postedEvent) {
+    const { success, failed } = postedEvent[type];
+    if (success.length + failed.length > 0) {
+      logger.info(
+        ` - ${type}: [success: ${success.length} failed: ${failed.length}(done: ${failed.filter(({ done }) => done).length})]`
+      );
+    }
+  }
   exec() {
     if (this.postTimeout || this.pendingTransactions.length === 0 || this.resetsTime) {
       return;
@@ -901,17 +909,17 @@ class RelayClient extends EventEmitter__default.default {
     this.postTimeout = setTimeout(() => {
       const postData = this.makePostData();
       if (!postData) return;
-      const { total, transactions, postTransactions, postConditionIds } = postData;
+      const { total, transactions, postTransactions, postEvent } = postData;
       logger.info(
         "RelayClient",
         "post transactions:",
         `${transactions.length}/${total}`
       );
       logger.info(` - pending: ${this.pendingTransactions.length}`);
-      this.emit("post", postConditionIds);
+      this.emit("post", postEvent);
       const onPosted = (txHash, error) => {
         this.lastPostTime = Date.now();
-        const postedRet = {
+        const postedEvent = {
           txHash,
           error,
           redeem: {
@@ -925,30 +933,37 @@ class RelayClient extends EventEmitter__default.default {
         };
         const resolveTx = txHash ? (pt) => {
           pt.resolve(txHash);
-          const success = postedRet[pt.type].success;
-          success.push(pt.conditionId);
+          const success = postedEvent[pt.type].success;
+          success.push({
+            conditionId: pt.conditionId,
+            execCount: pt.execCount,
+            done: true
+          });
         } : (pt) => {
-          if (pt.retryNum >= this.options.maxRetry) {
+          let done;
+          if (pt.execCount >= this.options.maxRetry) {
             pt.reject(error);
-            const failed = postedRet[pt.type].failed;
-            failed.push(pt.conditionId);
+            done = true;
           } else {
             this.pendingTransactions.push(pt);
+            done = false;
           }
+          const failed = postedEvent[pt.type].failed;
+          failed.push({
+            conditionId: pt.conditionId,
+            execCount: pt.execCount,
+            done
+          });
         };
         for (const pt of transactions) {
-          pt.retryNum++;
+          pt.execCount++;
           resolveTx(pt);
         }
         logger.info("RelayClient", "post transactions done:");
-        logger.info(
-          ` - redeem: [success: ${postedRet.redeem.success.length} failed: ${postedRet.redeem.failed.length}]`
-        );
-        logger.info(
-          ` - merge: [success: ${postedRet.merge.success.length} failed: ${postedRet.merge.failed.length}]`
-        );
+        this.logPostedEvent("redeem", postedEvent);
+        this.logPostedEvent("merge", postedEvent);
         logger.info(` - pending: ${this.pendingTransactions.length}`);
-        this.emit("posted", postedRet);
+        this.emit("posted", postedEvent);
       };
       this.post(postTransactions).then((txHash) => onPosted(txHash)).catch((e) => {
         const requestLimit = this.testRequestLimit(e);
@@ -1051,7 +1066,7 @@ class RelayClient extends EventEmitter__default.default {
         type,
         conditionId,
         transaction,
-        retryNum: 0,
+        execCount: 0,
         reject,
         resolve
       });
@@ -1261,11 +1276,12 @@ function listenEvent(e, eventName, callback) {
 }
 const DATA_API_HOST = "https://data-api.polymarket.com";
 const AUTO_REDEEM_INTERVAL = 60 * 1e3;
+const TIMEOUT = 15 * 60 * 1e3;
 class Redeemer extends EventEmitter__default.default {
   options;
   running = false;
   timer;
-  submitted = /* @__PURE__ */ new Map();
+  records = /* @__PURE__ */ new Map();
   unListenRelayClient;
   constructor(options) {
     super();
@@ -1274,25 +1290,31 @@ class Redeemer extends EventEmitter__default.default {
   }
   listenRelayClient() {
     const { relayClient } = this.options;
-    const unListenPost = listenEvent(relayClient, "post", ({ redeem }) => {
-      logger.lines(
-        `post redeem（待确认）:`,
-        ...this.toMessages(this.mapSubmittedPositions(redeem))
-      );
-    });
     const unListenPosted = listenEvent(
       relayClient,
       "posted",
-      ({ redeem, error }) => {
-        const failedPositions = this.mapSubmittedPositions(redeem.failed);
-        if (failedPositions.length > 0) {
+      ({ txHash, redeem, error }) => {
+        const pendingEvents = [...redeem.success];
+        for (const r of redeem.failed) if (!r.done) pendingEvents.push(r);
+        const pendingRecords = this.updateEventRecords(pendingEvents);
+        if (pendingRecords.length > 0) {
+          logger.lines(
+            `🟡 redeem（待确认）: ${pendingRecords.length} 个`,
+            ...this.toMessages(pendingRecords)
+          );
+        }
+        const failedRecords = this.updateEventRecords(
+          redeem.failed.filter(({ done }) => done)
+        );
+        if (failedRecords.length > 0) {
           const messages = [
-            `🔴 redeem 失败已放弃（重试超限）: ${failedPositions.length} 个`,
-            ...this.toMessages(failedPositions)
+            `🔴 redeem 失败（重试超限）: ${failedRecords.length} 个`,
+            ...this.toMessages(failedRecords)
           ];
-          logger.lines(...messages, error);
+          logger.lines(...messages);
           telegramService.info(messages.join("\n"));
         }
+        logger.info("redeem 提交结果:", txHash || error);
       }
     );
     const unListenRequestLimit = listenEvent(
@@ -1311,24 +1333,29 @@ class Redeemer extends EventEmitter__default.default {
       telegramService.info("AutoRedeem 已重启");
     });
     return () => {
-      unListenPost();
       unListenPosted();
       unListenRequestLimit();
       unListenResets();
     };
   }
-  mapSubmittedPositions(conditions) {
-    const positions = [];
-    for (const cId of conditions) {
-      const position = this.submitted.get(cId);
-      if (position) {
-        positions.push(position);
-      } else {
-        logger.error("no submitted failed position", cId);
-        telegramService.error(`no submitted failed position: ${cId}`);
+  updateEventRecords(events) {
+    const records = [];
+    for (const { conditionId, execCount } of events) {
+      const record = this.getRecord(conditionId);
+      if (record) {
+        record.execCount = execCount;
+        records.push(record);
       }
     }
-    return positions;
+    return records;
+  }
+  getRecord(conditionId) {
+    const record = this.records.get(conditionId);
+    if (!record) {
+      logger.error("no record for", conditionId);
+      telegramService.error(`no record for: ${conditionId}`);
+    }
+    return record;
   }
   /**
    * 获取可 Redeem 的仓位
@@ -1365,9 +1392,9 @@ class Redeemer extends EventEmitter__default.default {
     }
     return positions;
   }
-  toMessages(positions) {
-    return positions.map(
-      (position) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC`
+  toMessages(eventRecords) {
+    return eventRecords.map(
+      ({ position, execCount, postSuccessTime }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC (执行次数: ${execCount} ${postSuccessTime ? `确认时长: ${(Date.now() - postSuccessTime) / 1e3}s` : ""})`
     );
   }
   async autoRedeem() {
@@ -1378,36 +1405,64 @@ class Redeemer extends EventEmitter__default.default {
       logger.error("自动 redeem: 获取仓位失败", error);
       return;
     }
+    const preSize = this.records.size;
     for (const position of redeemablePositions) {
       const conditionId = position.conditionId;
-      if (!this.submitted.has(conditionId)) {
+      let record = this.records.get(conditionId);
+      if (!record) {
+        record = {
+          position,
+          execCount: 0,
+          timeout: false
+        };
+        this.records.set(conditionId, record);
         const relayClient = this.options.relayClient;
-        relayClient.submitRedeem(conditionId).catch((error) => {
+        relayClient.submitRedeem(conditionId).then(() => {
+          record.postSuccessTime = Date.now();
+        }).catch((error) => {
           if (relayClient.isSubmitError(error)) {
             logger.error("submitRedeem failed:", conditionId, error);
             telegramService.error(`submitRedeem failed: ${conditionId}`);
           }
         });
       }
-      this.submitted.set(conditionId, position);
+      record.position = position;
     }
-    const successPositions = [];
-    for (const [conditionId, position] of this.submitted.entries()) {
-      if (!redeemablePositions.some((p) => p.conditionId === conditionId)) {
-        successPositions.push(position);
-        this.submitted.delete(conditionId);
+    const now = Date.now();
+    const successRecords = [];
+    const timeoutRecords = [];
+    for (const [conditionId, record] of this.records.entries()) {
+      if (redeemablePositions.some((p) => p.conditionId === conditionId)) {
+        if (!record.timeout && record.postSuccessTime && now - record.postSuccessTime >= TIMEOUT) {
+          record.timeout = true;
+          timeoutRecords.push(record);
+        }
+      } else {
+        successRecords.push(record);
+        this.records.delete(conditionId);
       }
     }
-    if (successPositions.length > 0) {
+    if (timeoutRecords.length > 0) {
       const messages = [
-        `🟢 redeem 成功: ${successPositions.length} 个`,
-        ...this.toMessages(successPositions)
+        `🔴 redeem 超时: ${timeoutRecords.length} 个`,
+        ...this.toMessages(timeoutRecords)
       ];
       logger.lines(...messages);
       telegramService.info(messages.join("\n"));
     }
-    logger.info(`redeem 待确认总数: ${this.submitted.size} 个`);
-    if (successPositions.length > 0) this.emit("redeemed");
+    if (successRecords.length > 0) {
+      const messages = [
+        `🟢 redeem 成功: ${successRecords.length} 个`,
+        ...this.toMessages(successRecords)
+      ];
+      logger.lines(...messages);
+      telegramService.info(messages.join("\n"));
+      this.emit("redeemed");
+    }
+    const curSize = this.records.size;
+    if (curSize !== preSize) {
+      logger.info(`redeem 待确认总数: ${curSize} 个`);
+    }
   }
   start() {
     if (this.running) return;

package/package.json

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