|
1 | 1 | import { |
2 | 2 | asDateTimestampMs, |
| 3 | +isFutureDateTimestampMs, |
3 | 4 | resolveExpiresAtMsFromDurationMs, |
4 | 5 | } from "openclaw/plugin-sdk/number-runtime"; |
5 | 6 | import type { ClawdbotConfig, RuntimeEnv } from "../runtime-api.js"; |
@@ -55,13 +56,22 @@ export function resetProcessedFeishuCardActionTokensForTests(): void {
|
55 | 56 | } |
56 | 57 | |
57 | 58 | function pruneProcessedCardActionTokens(now: number): void { |
| 59 | +const validNow = asDateTimestampMs(now); |
| 60 | +if (validNow === undefined) { |
| 61 | +processedCardActionTokens.clear(); |
| 62 | +return; |
| 63 | +} |
58 | 64 | for (const [key, entry] of processedCardActionTokens.entries()) { |
59 | | -if (entry.expiresAt <= now) { |
| 65 | +if (!isFutureDateTimestampMs(entry.expiresAt, { nowMs: validNow })) { |
60 | 66 | processedCardActionTokens.delete(key); |
61 | 67 | } |
62 | 68 | } |
63 | 69 | } |
64 | 70 | |
| 71 | +function resolveProcessedCardActionTokenExpiresAt(now: number): number | undefined { |
| 72 | +return resolveExpiresAtMsFromDurationMs(FEISHU_CARD_ACTION_TOKEN_TTL_MS, { nowMs: now }); |
| 73 | +} |
| 74 | + |
65 | 75 | function beginFeishuCardActionToken(params: { |
66 | 76 | token: string; |
67 | 77 | accountId: string; |
@@ -75,13 +85,17 @@ function beginFeishuCardActionToken(params: {
|
75 | 85 | } |
76 | 86 | const key = `${params.accountId}:${normalizedToken}`; |
77 | 87 | const existing = processedCardActionTokens.get(key); |
78 | | -if (existing && existing.expiresAt > now) { |
| 88 | +if (existing && isFutureDateTimestampMs(existing.expiresAt, { nowMs: now })) { |
79 | 89 | return false; |
80 | 90 | } |
81 | | -processedCardActionTokens.set(key, { |
82 | | -status: "inflight", |
83 | | -expiresAt: now + FEISHU_CARD_ACTION_TOKEN_TTL_MS, |
84 | | -}); |
| 91 | +processedCardActionTokens.delete(key); |
| 92 | +const expiresAt = resolveProcessedCardActionTokenExpiresAt(now); |
| 93 | +if (expiresAt !== undefined) { |
| 94 | +processedCardActionTokens.set(key, { |
| 95 | +status: "inflight", |
| 96 | + expiresAt, |
| 97 | +}); |
| 98 | +} |
85 | 99 | return true; |
86 | 100 | } |
87 | 101 | |
@@ -95,9 +109,15 @@ function completeFeishuCardActionToken(params: {
|
95 | 109 | if (!normalizedToken) { |
96 | 110 | return; |
97 | 111 | } |
98 | | -processedCardActionTokens.set(`${params.accountId}:${normalizedToken}`, { |
| 112 | +const key = `${params.accountId}:${normalizedToken}`; |
| 113 | +const expiresAt = resolveProcessedCardActionTokenExpiresAt(now); |
| 114 | +if (expiresAt === undefined) { |
| 115 | +processedCardActionTokens.delete(key); |
| 116 | +return; |
| 117 | +} |
| 118 | +processedCardActionTokens.set(key, { |
99 | 119 | status: "completed", |
100 | | -expiresAt: now + FEISHU_CARD_ACTION_TOKEN_TTL_MS, |
| 120 | + expiresAt, |
101 | 121 | }); |
102 | 122 | } |
103 | 123 | |
|
