polycopy 0.3.3 → 0.3.5

package/dist/index.js

@@ -843,7 +843,6 @@ class ClobClientWrapper {
 }
 const CTF_ADDRESS = viem.getAddress("0x4d97dcd97ec945f40cf65f87097ace5ea0476045");
 const USDC_ADDRESS = viem.getAddress("0x2791bca1f2de4661ed88a30c99a7a9449aa84174");
-const SUBMIT_ERROR_SYMBOL = "__SUBMIT_ERROR__";
 class RelayClient extends EventEmitter__default.default {
   lastPostTime;
   resetsTime;
@@ -855,7 +854,6 @@ class RelayClient extends EventEmitter__default.default {
     this.options = {
       batchSize: options.batchSize || 10,
       postInterval: options.postInterval || 7.5 * 60 * 1e3,
-      maxRetry: 3,
       ...options
     };
   }
@@ -877,7 +875,7 @@ class RelayClient extends EventEmitter__default.default {
       merge: []
     };
     for (const { type, conditionId, execCount, transaction } of transactions) {
-      postEvent[type].push({ conditionId, execCount, done: false });
+      postEvent[type].push({ conditionId, execCount });
       postTransactions.push(transaction);
     }
     return {
@@ -888,11 +886,9 @@ class RelayClient extends EventEmitter__default.default {
     };
   }
   logPostedEvent(type, postedEvent) {
-    const { success, failed } = postedEvent[type];
-    if (success.length + failed.length > 0) {
-      logger.info(
-        ` - ${type}: [success: ${success.length} failed: ${failed.length} nextRetry: ${failed.filter(({ done }) => !done).length}]`
-      );
+    const count = postedEvent[type].length;
+    if (count > 0) {
+      logger.info(` - ${type}: ${count}`);
     }
   }
   exec() {
@@ -915,11 +911,7 @@ class RelayClient extends EventEmitter__default.default {
         return;
       }
       const { total, transactions, postTransactions, postEvent } = postData;
-      logger.info(
-        "RelayClient",
-        "post transactions:",
-        `${transactions.length}/${total}`
-      );
+      logger.info("RelayClient", "post:", `${transactions.length}/${total}`);
       logger.info(` - pending: ${this.pendingTransactions.length}`);
       this.emit("post", postEvent);
       const onPosted = (txHash, error) => {
@@ -927,44 +919,23 @@ class RelayClient extends EventEmitter__default.default {
         const postedEvent = {
           txHash,
           error,
-          redeem: {
-            success: [],
-            failed: []
-          },
-          merge: {
-            success: [],
-            failed: []
-          }
+          redeem: [],
+          merge: []
         };
         const resolveTx = txHash ? (pt) => {
           pt.resolve(txHash);
-          const success = postedEvent[pt.type].success;
-          success.push({
-            conditionId: pt.conditionId,
-            execCount: pt.execCount,
-            done: true
-          });
         } : (pt) => {
-          let done;
-          if (pt.execCount >= this.options.maxRetry) {
-            pt.reject(error);
-            done = true;
-          } else {
-            this.pendingTransactions.push(pt);
-            done = false;
-          }
-          const failed = postedEvent[pt.type].failed;
-          failed.push({
-            conditionId: pt.conditionId,
-            execCount: pt.execCount,
-            done
-          });
+          this.pendingTransactions.push(pt);
         };
         for (const pt of transactions) {
           pt.execCount++;
+          postedEvent[pt.type].push({
+            conditionId: pt.conditionId,
+            execCount: pt.execCount
+          });
           resolveTx(pt);
         }
-        logger.info("RelayClient", "post transactions done:");
+        logger.info("RelayClient", "posted:", txHash || error);
         this.logPostedEvent("redeem", postedEvent);
         this.logPostedEvent("merge", postedEvent);
         logger.info(` - pending: ${this.pendingTransactions.length}`);
@@ -1066,13 +1037,12 @@ class RelayClient extends EventEmitter__default.default {
     };
   }
   addTransaction(type, conditionId, transaction) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       this.pendingTransactions.push({
         type,
         conditionId,
         transaction,
         execCount: 0,
-        reject,
         resolve
       });
       this.exec();
@@ -1091,6 +1061,7 @@ class RelayClient extends EventEmitter__default.default {
       logger.info(` - pending: ${this.pendingTransactions.length}`);
       if (this.pendingTransactions.length === 0 && this.postTimeout) {
         clearTimeout(this.postTimeout);
+        this.postTimeout = null;
         logger.info("检测到提交队列已清空，终止定时任务");
       }
     }
@@ -1098,17 +1069,13 @@ class RelayClient extends EventEmitter__default.default {
   checkSubmit(conditionId) {
     if (this.resetsTime) {
       throw Error(
-        `request limit before: ${new Date(this.resetsTime).toLocaleString()}`,
-        { cause: SUBMIT_ERROR_SYMBOL }
+        `request limit before: ${new Date(this.resetsTime).toLocaleString()}`
       );
     }
     if (this.pendingTransactions.some((pt) => pt.conditionId === conditionId)) {
-      throw Error("duplicate conditionId", { cause: SUBMIT_ERROR_SYMBOL });
+      throw Error("duplicate conditionId");
     }
   }
-  isSubmitError(error) {
-    return error?.cause === SUBMIT_ERROR_SYMBOL;
-  }
   async submitRedeem(conditionId) {
     this.checkSubmit(conditionId);
     return this.addTransaction(
@@ -1296,7 +1263,7 @@ 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;
+const TIMEOUT = 30 * 60 * 1e3;
 class Redeemer extends EventEmitter__default.default {
   options;
   running = false;
@@ -1313,32 +1280,14 @@ class Redeemer extends EventEmitter__default.default {
     const unListenPosted = listenEvent(
       relayClient,
       "posted",
-      ({ 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) {
+      ({ redeem }) => {
+        const postedRecords = this.updatePostedRecords(redeem);
+        if (postedRecords.length > 0) {
           logger.lines(
-            `🟡 redeem 待确认: ${pendingRecords.length} 个`,
-            ...this.toMessages(pendingRecords)
+            `🟡 redeem 待确认: ${postedRecords.length} 个`,
+            ...this.toMessages(postedRecords)
           );
         }
-        const failedRecords = this.updateEventRecords(
-          redeem.failed.filter(({ done }) => done)
-        );
-        if (failedRecords.length > 0) {
-          const messages = [
-            `🔴 redeem 失败（重试超限）: ${failedRecords.length} 个`,
-            ...this.toMessages(failedRecords)
-          ];
-          logger.lines(...messages);
-          telegramService.info(messages.join("\n"));
-        }
-        if (txHash) {
-          logger.success("redeem 提交结果:", txHash);
-        } else {
-          logger.warning("redeem 提交结果:", error);
-        }
       }
     );
     const unListenRequestLimit = listenEvent(
@@ -1362,12 +1311,12 @@ class Redeemer extends EventEmitter__default.default {
       unListenResets();
     };
   }
-  updateEventRecords(events) {
+  updatePostedRecords(events) {
     const records = [];
-    for (const { conditionId, execCount } of events) {
+    for (const { conditionId } of events) {
       const record = this.getRecord(conditionId);
       if (record) {
-        record.execCount = execCount;
+        record.execCount++;
         records.push(record);
       }
     }
@@ -1418,9 +1367,26 @@ 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, createTime }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC (执行次数: ${execCount} 确认时长: ${(Date.now() - createTime) / 1e3}s)`
     );
   }
+  submitRedeem(record) {
+    const conditionId = record.position.conditionId;
+    this.options.relayClient.submitRedeem(conditionId).then(() => {
+      record.postSuccess = true;
+    }).catch((error) => {
+      logger.error(
+        "redeem 提交失败:",
+        record.position.slug,
+        record.position.outcome,
+        error
+      );
+      telegramService.error(
+        "redeem 提交失败",
+        [record.position.slug, record.position.outcome].join(" ")
+      );
+    });
+  }
   async autoRedeem() {
     let redeemablePositions;
     try {
@@ -1438,17 +1404,12 @@ class Redeemer extends EventEmitter__default.default {
         record = {
           position,
           execCount: 0,
+          createTime: Date.now(),
+          postSuccess: false,
           timeout: false
         };
         this.records.set(conditionId, record);
-        relayClient.submitRedeem(conditionId).then(() => {
-          record.postSuccessTime = Date.now();
-        }).catch((error) => {
-          if (relayClient.isSubmitError(error)) {
-            logger.error("Redeem 提交失败:", conditionId, error);
-            telegramService.error(`Redeem 提交失败: ${conditionId}`);
-          }
-        });
+        this.submitRedeem(record);
       }
       record.position = position;
     }
@@ -1457,9 +1418,18 @@ class Redeemer extends EventEmitter__default.default {
     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) {
+        if (!record.timeout && now - record.createTime >= TIMEOUT) {
           record.timeout = true;
           timeoutRecords.push(record);
+          if (record.postSuccess) {
+            logger.info(
+              "重新提交超时 redeem:",
+              record.position.slug,
+              record.position.outcome
+            );
+            record.postSuccess = false;
+            this.submitRedeem(record);
+          }
         }
       } else {
         relayClient.removeTransaction(conditionId);
@@ -1467,24 +1437,25 @@ class Redeemer extends EventEmitter__default.default {
         this.records.delete(conditionId);
       }
     }
+    const messages = [];
+    const curSize = this.records.size;
     if (timeoutRecords.length > 0) {
-      const messages = [
+      messages.push(
         `🔴 redeem 超时: ${timeoutRecords.length} 个`,
         ...this.toMessages(timeoutRecords)
-      ];
-      logger.lines(...messages);
-      telegramService.info(messages.join("\n"));
+      );
     }
     if (successRecords.length > 0) {
-      const messages = [
+      messages.push(
         `🟢 redeem 成功: ${successRecords.length} 个`,
         ...this.toMessages(successRecords)
-      ];
+      );
+    }
+    if (messages.length > 0) {
+      messages.push(`待确认总数: ${curSize} 个`);
       logger.lines(...messages);
       telegramService.info(messages.join("\n"));
-    }
-    const curSize = this.records.size;
-    if (curSize !== preSize) {
+    } else if (curSize !== preSize) {
       logger.info(`redeem 待确认总数: ${curSize} 个`);
     }
     if (successRecords.length > 0) this.emit("redeemed");

package/package.json

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