重构更新账号日志功能,添加开发者模式
This commit is contained in:
@@ -12,21 +12,176 @@
|
||||
normalizeAccountRunHistoryHelperBaseUrl,
|
||||
} = deps;
|
||||
|
||||
function normalizeTimestamp(value) {
|
||||
const timestamp = Date.parse(String(value || ''));
|
||||
return Number.isFinite(timestamp) ? timestamp : 0;
|
||||
}
|
||||
|
||||
function normalizeRetryCount(value) {
|
||||
const count = Math.floor(Number(value) || 0);
|
||||
return count > 0 ? count : 0;
|
||||
}
|
||||
|
||||
function normalizeFinalStatus(status = '') {
|
||||
const normalized = String(status || '').trim().toLowerCase();
|
||||
if (!normalized) {
|
||||
return '';
|
||||
}
|
||||
if (normalized === 'success') {
|
||||
return 'success';
|
||||
}
|
||||
if (normalized === 'failed' || /_failed$/.test(normalized)) {
|
||||
return 'failed';
|
||||
}
|
||||
if (normalized === 'stopped' || /_stopped$/.test(normalized)) {
|
||||
return 'stopped';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function extractFailedStep(status = '', detail = '') {
|
||||
const normalizedStatus = String(status || '').trim().toLowerCase();
|
||||
const statusMatch = normalizedStatus.match(/^step(\d+)_failed$/);
|
||||
if (statusMatch) {
|
||||
const step = Number(statusMatch[1]);
|
||||
return Number.isInteger(step) && step > 0 ? step : null;
|
||||
}
|
||||
|
||||
const text = String(detail || '').trim();
|
||||
const detailMatch = text.match(/(?:Step\s+(\d+)|步骤\s*(\d+))/i);
|
||||
if (!detailMatch) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const step = Number(detailMatch[1] || detailMatch[2]);
|
||||
return Number.isInteger(step) && step > 0 ? step : null;
|
||||
}
|
||||
|
||||
function isPhoneVerificationFailure(detail = '') {
|
||||
const text = String(detail || '').trim();
|
||||
if (!text) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return /add[_\s-]?phone/i.test(text)
|
||||
|| /手机号(?:验证|页面|页)|手机(?:号)?页面|出现手机号验证/.test(text)
|
||||
|| /进入了手机号页面/.test(text);
|
||||
}
|
||||
|
||||
function buildFailureLabel(finalStatus, failedStep, failureDetail = '') {
|
||||
if (finalStatus === 'success') {
|
||||
return '流程完成';
|
||||
}
|
||||
if (finalStatus !== 'failed') {
|
||||
return '';
|
||||
}
|
||||
if (isPhoneVerificationFailure(failureDetail)) {
|
||||
return '出现手机号验证';
|
||||
}
|
||||
if (Number.isInteger(failedStep) && failedStep > 0) {
|
||||
return `步骤 ${failedStep} 失败`;
|
||||
}
|
||||
return '流程失败';
|
||||
}
|
||||
|
||||
function buildRecordId(email = '') {
|
||||
return String(email || '').trim().toLowerCase();
|
||||
}
|
||||
|
||||
function normalizeSource(value = '') {
|
||||
return String(value || '').trim().toLowerCase() === 'auto' ? 'auto' : 'manual';
|
||||
}
|
||||
|
||||
function normalizeAutoRunContext(context) {
|
||||
if (!context || typeof context !== 'object') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const currentRun = Math.max(0, Math.floor(Number(context.currentRun) || 0));
|
||||
const totalRuns = Math.max(0, Math.floor(Number(context.totalRuns) || 0));
|
||||
const attemptRun = Math.max(0, Math.floor(Number(context.attemptRun) || 0));
|
||||
|
||||
if (!currentRun && !totalRuns && !attemptRun) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
currentRun,
|
||||
totalRuns,
|
||||
attemptRun,
|
||||
};
|
||||
}
|
||||
|
||||
function buildAutoRunContextFromState(state = {}) {
|
||||
return normalizeAutoRunContext({
|
||||
currentRun: state.autoRunCurrentRun,
|
||||
totalRuns: state.autoRunTotalRuns,
|
||||
attemptRun: state.autoRunAttemptRun,
|
||||
});
|
||||
}
|
||||
|
||||
function getRetryCountFromState(state = {}) {
|
||||
if (!Boolean(state.autoRunning)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const attemptRun = Math.max(0, Math.floor(Number(state.autoRunAttemptRun) || 0));
|
||||
return attemptRun > 1 ? attemptRun - 1 : 0;
|
||||
}
|
||||
|
||||
function normalizeAccountRunHistoryRecord(record) {
|
||||
if (!record || typeof record !== 'object') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const email = String(record.email || '').trim();
|
||||
const password = String(record.password || '').trim();
|
||||
const finalStatus = normalizeFinalStatus(record.finalStatus || record.status || '');
|
||||
|
||||
if (!email || !password || !finalStatus || finalStatus === 'stopped') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const finishedAt = String(record.finishedAt || record.recordedAt || '').trim();
|
||||
const failureDetail = finalStatus === 'failed'
|
||||
? String(record.failureDetail || record.reason || '').trim()
|
||||
: '';
|
||||
const failedStepCandidate = Number(record.failedStep);
|
||||
const failedStep = Number.isInteger(failedStepCandidate) && failedStepCandidate > 0
|
||||
? failedStepCandidate
|
||||
: extractFailedStep(record.finalStatus || record.status || '', failureDetail);
|
||||
const autoRunContext = normalizeAutoRunContext(record.autoRunContext);
|
||||
const retryCount = normalizeRetryCount(
|
||||
record.retryCount !== undefined
|
||||
? record.retryCount
|
||||
: ((autoRunContext?.attemptRun || 0) > 1 ? autoRunContext.attemptRun - 1 : 0)
|
||||
);
|
||||
const source = normalizeSource(record.source || (autoRunContext ? 'auto' : 'manual'));
|
||||
|
||||
return {
|
||||
recordId: String(record.recordId || '').trim() || buildRecordId(email),
|
||||
email,
|
||||
password,
|
||||
finalStatus,
|
||||
finishedAt,
|
||||
retryCount,
|
||||
failureLabel: String(record.failureLabel || '').trim() || buildFailureLabel(finalStatus, failedStep, failureDetail),
|
||||
failureDetail,
|
||||
failedStep: Number.isInteger(failedStep) && failedStep > 0 ? failedStep : null,
|
||||
source,
|
||||
autoRunContext: source === 'auto' ? autoRunContext : null,
|
||||
};
|
||||
}
|
||||
|
||||
function normalizeAccountRunHistory(records) {
|
||||
if (!Array.isArray(records)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return records
|
||||
.filter((item) => item && typeof item === 'object')
|
||||
.map((item) => ({
|
||||
email: String(item.email || '').trim(),
|
||||
password: String(item.password || '').trim(),
|
||||
status: String(item.status || '').trim().toLowerCase(),
|
||||
recordedAt: String(item.recordedAt || '').trim(),
|
||||
reason: String(item.reason || '').trim(),
|
||||
}))
|
||||
.filter((item) => item.email && item.password && item.status);
|
||||
.map((item) => normalizeAccountRunHistoryRecord(item))
|
||||
.filter(Boolean)
|
||||
.sort((left, right) => normalizeTimestamp(right.finishedAt) - normalizeTimestamp(left.finishedAt));
|
||||
}
|
||||
|
||||
async function getPersistedAccountRunHistory() {
|
||||
@@ -39,25 +194,63 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function setPersistedAccountRunHistory(records) {
|
||||
const normalizedHistory = normalizeAccountRunHistory(records);
|
||||
await chrome.storage.local.set({
|
||||
[ACCOUNT_RUN_HISTORY_STORAGE_KEY]: normalizedHistory,
|
||||
});
|
||||
return normalizedHistory;
|
||||
}
|
||||
|
||||
function buildAccountRunHistoryRecord(state = {}, status = '', reason = '') {
|
||||
const email = String(state.email || '').trim();
|
||||
const password = String(state.password || state.customPassword || '').trim();
|
||||
const normalizedStatus = String(status || '').trim().toLowerCase();
|
||||
const normalizedReason = String(reason || '').trim();
|
||||
const finalStatus = normalizeFinalStatus(status);
|
||||
|
||||
if (!email || !password || !normalizedStatus) {
|
||||
if (!email || !password || !finalStatus || finalStatus === 'stopped') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const failureDetail = finalStatus === 'failed' ? String(reason || '').trim() : '';
|
||||
const failedStep = finalStatus === 'failed' ? extractFailedStep(status, failureDetail) : null;
|
||||
const source = Boolean(state.autoRunning) ? 'auto' : 'manual';
|
||||
const autoRunContext = source === 'auto' ? buildAutoRunContextFromState(state) : null;
|
||||
const retryCount = source === 'auto' ? getRetryCountFromState(state) : 0;
|
||||
const finishedAt = new Date().toISOString();
|
||||
|
||||
return {
|
||||
recordId: buildRecordId(email),
|
||||
email,
|
||||
password,
|
||||
status: normalizedStatus,
|
||||
recordedAt: new Date().toISOString(),
|
||||
reason: normalizedReason,
|
||||
finalStatus,
|
||||
finishedAt,
|
||||
retryCount,
|
||||
failureLabel: buildFailureLabel(finalStatus, failedStep, failureDetail),
|
||||
failureDetail,
|
||||
failedStep: Number.isInteger(failedStep) && failedStep > 0 ? failedStep : null,
|
||||
source,
|
||||
autoRunContext,
|
||||
};
|
||||
}
|
||||
|
||||
function upsertAccountRunHistoryRecord(history, record) {
|
||||
const normalizedHistory = normalizeAccountRunHistory(history);
|
||||
if (!record) {
|
||||
return normalizedHistory;
|
||||
}
|
||||
|
||||
const recordId = String(record.recordId || '').trim();
|
||||
const emailKey = String(record.email || '').trim().toLowerCase();
|
||||
const nextHistory = normalizedHistory.filter((item) => {
|
||||
const itemRecordId = String(item.recordId || '').trim();
|
||||
const itemEmailKey = String(item.email || '').trim().toLowerCase();
|
||||
return itemRecordId !== recordId && itemEmailKey !== emailKey;
|
||||
});
|
||||
|
||||
nextHistory.unshift(record);
|
||||
return normalizeAccountRunHistory(nextHistory);
|
||||
}
|
||||
|
||||
async function appendAccountRunHistoryRecord(status, stateOverride = null, reason = '') {
|
||||
const state = stateOverride || await getState();
|
||||
const record = buildAccountRunHistoryRecord(state, status, reason);
|
||||
@@ -66,14 +259,39 @@
|
||||
}
|
||||
|
||||
const history = await getPersistedAccountRunHistory();
|
||||
history.push(record);
|
||||
await chrome.storage.local.set({
|
||||
[ACCOUNT_RUN_HISTORY_STORAGE_KEY]: history,
|
||||
});
|
||||
const nextHistory = upsertAccountRunHistoryRecord(history, record);
|
||||
await setPersistedAccountRunHistory(nextHistory);
|
||||
return record;
|
||||
}
|
||||
|
||||
function shouldAppendAccountRunTextFile(state = {}) {
|
||||
function summarizeAccountRunHistory(records = []) {
|
||||
return normalizeAccountRunHistory(records).reduce((summary, record) => {
|
||||
summary.total += 1;
|
||||
if (record.finalStatus === 'success') {
|
||||
summary.success += 1;
|
||||
} else if (record.finalStatus === 'failed') {
|
||||
summary.failed += 1;
|
||||
}
|
||||
summary.retryTotal += normalizeRetryCount(record.retryCount);
|
||||
return summary;
|
||||
}, {
|
||||
total: 0,
|
||||
success: 0,
|
||||
failed: 0,
|
||||
retryTotal: 0,
|
||||
});
|
||||
}
|
||||
|
||||
function buildAccountRunHistorySnapshotPayload(records = []) {
|
||||
const normalizedHistory = normalizeAccountRunHistory(records);
|
||||
return {
|
||||
generatedAt: new Date().toISOString(),
|
||||
summary: summarizeAccountRunHistory(normalizedHistory),
|
||||
records: normalizedHistory,
|
||||
};
|
||||
}
|
||||
|
||||
function shouldSyncAccountRunHistorySnapshot(state = {}) {
|
||||
if (!Boolean(state.accountRunHistoryTextEnabled)) {
|
||||
return false;
|
||||
}
|
||||
@@ -82,49 +300,40 @@
|
||||
return Boolean(helperBaseUrl);
|
||||
}
|
||||
|
||||
async function appendAccountRunHistoryTextFile(record, stateOverride = null) {
|
||||
const normalizedRecord = record && typeof record === 'object'
|
||||
? record
|
||||
: buildAccountRunHistoryRecord(stateOverride || await getState(), '');
|
||||
if (!normalizedRecord?.email || !normalizedRecord?.password || !normalizedRecord?.status) {
|
||||
return null;
|
||||
}
|
||||
function shouldAppendAccountRunTextFile(state = {}) {
|
||||
return shouldSyncAccountRunHistorySnapshot(state);
|
||||
}
|
||||
|
||||
async function syncAccountRunHistorySnapshot(records, stateOverride = null) {
|
||||
const state = stateOverride || await getState();
|
||||
if (!shouldAppendAccountRunTextFile(state)) {
|
||||
return null;
|
||||
if (!shouldSyncAccountRunHistorySnapshot(state)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
const helperBaseUrl = normalizeAccountRunHistoryHelperBaseUrl(state.accountRunHistoryHelperBaseUrl);
|
||||
let response;
|
||||
try {
|
||||
response = await fetch(buildLocalHelperEndpoint(helperBaseUrl, '/append-account-log'), {
|
||||
response = await fetch(buildLocalHelperEndpoint(helperBaseUrl, '/sync-account-run-records'), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
email: normalizedRecord.email,
|
||||
password: normalizedRecord.password,
|
||||
status: normalizedRecord.status,
|
||||
recordedAt: normalizedRecord.recordedAt,
|
||||
reason: normalizedRecord.reason || '',
|
||||
}),
|
||||
body: JSON.stringify(buildAccountRunHistorySnapshotPayload(records)),
|
||||
});
|
||||
} catch (err) {
|
||||
throw new Error(`账号文本记录写入失败:无法连接本地 helper(${getErrorMessage(err)})`);
|
||||
throw new Error(`账号记录快照同步失败:无法连接本地 helper(${getErrorMessage(err)})`);
|
||||
}
|
||||
|
||||
let payload = null;
|
||||
try {
|
||||
payload = await response.json();
|
||||
} catch (err) {
|
||||
throw new Error(`账号文本记录写入失败:本地 helper 返回了无法解析的响应(${getErrorMessage(err)})`);
|
||||
throw new Error(`账号记录快照同步失败:本地 helper 返回了无法解析的响应(${getErrorMessage(err)})`);
|
||||
}
|
||||
|
||||
if (!response.ok || payload?.ok === false) {
|
||||
throw new Error(`账号文本记录写入失败:${payload?.error || `HTTP ${response.status}`}`);
|
||||
throw new Error(`账号记录快照同步失败:${payload?.error || `HTTP ${response.status}`}`);
|
||||
}
|
||||
|
||||
return payload?.filePath || '';
|
||||
@@ -138,9 +347,10 @@
|
||||
}
|
||||
|
||||
try {
|
||||
const filePath = await appendAccountRunHistoryTextFile(record, state);
|
||||
const history = await getPersistedAccountRunHistory();
|
||||
const filePath = await syncAccountRunHistorySnapshot(history, state);
|
||||
if (filePath) {
|
||||
await addLog(`账号记录已追加到本地文本:${filePath}`, 'info');
|
||||
await addLog(`账号记录快照已同步到本地:${filePath}`, 'info');
|
||||
}
|
||||
} catch (err) {
|
||||
await addLog(getErrorMessage(err), 'warn');
|
||||
@@ -149,14 +359,40 @@
|
||||
return record;
|
||||
}
|
||||
|
||||
async function clearAccountRunHistory(stateOverride = null) {
|
||||
const state = stateOverride || await getState();
|
||||
const history = await getPersistedAccountRunHistory();
|
||||
await setPersistedAccountRunHistory([]);
|
||||
|
||||
try {
|
||||
const filePath = await syncAccountRunHistorySnapshot([], state);
|
||||
if (filePath) {
|
||||
await addLog(`账号记录快照已同步到本地:${filePath}`, 'info');
|
||||
}
|
||||
} catch (err) {
|
||||
await addLog(getErrorMessage(err), 'warn');
|
||||
}
|
||||
|
||||
return {
|
||||
clearedCount: history.length,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
appendAccountRunRecord,
|
||||
appendAccountRunHistoryRecord,
|
||||
appendAccountRunHistoryTextFile,
|
||||
buildAccountRunHistoryRecord,
|
||||
buildAccountRunHistorySnapshotPayload,
|
||||
clearAccountRunHistory,
|
||||
getPersistedAccountRunHistory,
|
||||
normalizeAccountRunHistory,
|
||||
normalizeAccountRunHistoryRecord,
|
||||
normalizeFinalStatus,
|
||||
setPersistedAccountRunHistory,
|
||||
shouldAppendAccountRunTextFile,
|
||||
shouldSyncAccountRunHistorySnapshot,
|
||||
summarizeAccountRunHistory,
|
||||
syncAccountRunHistorySnapshot,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
broadcastDataUpdate,
|
||||
cancelScheduledAutoRun,
|
||||
checkIcloudSession,
|
||||
clearAccountRunHistory,
|
||||
clearAutoRunTimerAlarm,
|
||||
clearLuckmailRuntimeState,
|
||||
clearStopRequest,
|
||||
@@ -270,6 +271,18 @@
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
case 'CLEAR_ACCOUNT_RUN_HISTORY': {
|
||||
const state = await getState();
|
||||
if (isAutoRunLockedState(state)) {
|
||||
throw new Error('自动流程运行中,当前不能清理邮箱记录。');
|
||||
}
|
||||
if (typeof clearAccountRunHistory !== 'function') {
|
||||
return { ok: true, clearedCount: 0 };
|
||||
}
|
||||
const result = await clearAccountRunHistory(state);
|
||||
return { ok: true, ...result };
|
||||
}
|
||||
|
||||
case 'EXECUTE_STEP': {
|
||||
clearStopRequest();
|
||||
if (message.source === 'sidepanel') {
|
||||
|
||||
Reference in New Issue
Block a user