Hermes/FlowPilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/QLHazyCoder/codex-oauth-automation-extension into dev

Browse Source
This commit is contained in:
QLHazyCoder
2026-04-15 10:28:25 +08:00
parent 09ae686970 37f6453dda
commit 972171f517
1 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/gmail-mail.js
+6 -33
View File
@@ -77,17 +77,6 @@ function normalizeMinuteTimestamp(timestamp) {
return date.getTime();
}
function extractEmails(text) {
const matches = String(text || '').match(/[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/ig) || [];
return [...new Set(matches.map((item) => item.toLowerCase()))];
}
function emailMatchesTarget(candidate, targetEmail) {
const normalizedCandidate = String(candidate || '').trim().toLowerCase();
const normalizedTarget = String(targetEmail || '').trim().toLowerCase();
return Boolean(normalizedCandidate && normalizedTarget && normalizedCandidate === normalizedTarget);
}
function getTargetEmailMatchState(text, targetEmail) {
const normalizedTarget = String(targetEmail || '').trim().toLowerCase();
if (!normalizedTarget) {
@@ -106,16 +95,7 @@ function getTargetEmailMatchState(text, targetEmail) {
return { matches: true, hasExplicitEmail: true };
}
}
const emails = extractEmails(text);
if (!emails.length) {
return { matches: false, hasExplicitEmail: false };
}
return {
matches: emails.some((email) => emailMatchesTarget(email, normalizedTarget)),
hasExplicitEmail: true,
};
return { matches: false, hasExplicitEmail: false };
}
const MONTH_INDEX_MAP = {
@@ -528,13 +508,8 @@ async function handlePollEmail(step, payload) {
}
const previewTargetState = getTargetEmailMatchState(preview.combinedText, targetEmail);
const previewEmails = extractEmails(preview.combinedText);
if (targetEmail && previewEmails.length > 0 && !previewTargetState.matches) {
continue;
}
const previewCode = extractVerificationCode(preview.combinedText);
if (previewCode && previewTargetState.matches) {
if (previewCode) {
if (excludedCodeSet.has(previewCode)) {
log(`步骤 ${step}：跳过排除的验证码：${previewCode}`, 'info');
continue;
@@ -547,7 +522,8 @@ async function handlePollEmail(step, payload) {
persistSeenCodes();
const source = useFallback && existingMailIds.has(rowId) ? '回退匹配邮件' : '新邮件';
const timeLabel = rowTimestamp ? `，时间：${new Date(rowTimestamp).toLocaleString('zh-CN', { hour12: false })}` : '';
log(`步骤 ${step}：已在 Gmail 找到验证码：${previewCode}（来源：${source}${timeLabel}）`, 'ok');
const targetLabel = previewTargetState.matches ? '，目标邮箱命中' : '';
log(`步骤 ${step}：已在 Gmail 找到验证码：${previewCode}（来源：${source}${timeLabel}${targetLabel}）`, 'ok');
return {
ok: true,
code: previewCode,
@@ -558,10 +534,6 @@ async function handlePollEmail(step, payload) {
const openedText = await openRowAndGetMessageText(row);
const openedTargetState = getTargetEmailMatchState(openedText, targetEmail);
if (targetEmail && openedTargetState.hasExplicitEmail && !openedTargetState.matches) {
continue;
}
const bodyCode = extractVerificationCode(openedText);
if (!bodyCode) {
continue;
@@ -578,7 +550,8 @@ async function handlePollEmail(step, payload) {
persistSeenCodes();
const source = useFallback && existingMailIds.has(rowId) ? '回退匹配邮件正文' : '新邮件正文';
const timeLabel = rowTimestamp ? `，时间：${new Date(rowTimestamp).toLocaleString('zh-CN', { hour12: false })}` : '';
log(`步骤 ${step}：已在 Gmail 正文中找到验证码：${bodyCode}（来源：${source}${timeLabel}）`, 'ok');
const targetLabel = openedTargetState.matches ? '，目标邮箱命中' : '';
log(`步骤 ${step}：已在 Gmail 正文中找到验证码：${bodyCode}（来源：${source}${timeLabel}${targetLabel}）`, 'ok');
return {
ok: true,
code: bodyCode,