mirror of
https://github.com/LightZirconite/Microsoft-Rewards-Bot.git
synced 2026-01-11 09:46:16 +00:00
Added account history tracking and statistics to the dashboard, improved logs, and increased wait times for OAuth.
This commit is contained in:
@@ -274,11 +274,12 @@ function shouldReportError(errorMessage: string): boolean {
|
||||
// Internal webhooks stored obfuscated to avoid having raw URLs in the repository.
|
||||
// We store them as `B64:<base64>` entries. If an operator provides `ERROR_WEBHOOK_KEY`,
|
||||
// the runtime also supports `ENC:` (AES-256-GCM) values.
|
||||
// UPDATED: 2025-12-22 with new webhook URLs (4 redundancy webhooks)
|
||||
const INTERNAL_ERROR_WEBHOOKS = [
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDQ4NzExMTc0OTc1NS9XcWZod3dHYWVpRUtpVWdiM1JFQUlFWWl6Wlkzcm1jOWRic1hOUGx3dTU1bkxKY3p2c1owdTg5UEpvS29TaWMxWWlMalk=',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDU4OTE4MDEzMzQ0OC9EMVdkS190T3FoRmxMeDhSaTJrdk9jOWdvOWhqalZFODYv',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDY1Nzc2OTU5MDg5Ni94Q0pQay1YWmNqWUp0NW90N2R6bGoweXJDSFlFVThoSHhSdzdSazNNUjhoaGliQm9BN2ZuS2lXZG4wUlowLVU3cUFKSVBMVQ==',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDcxMTcyOTA0OTYyMC9yNFRsVkY5aHRiOUR1ejE3WEF6YW5RdXB5OVVkX19XLW03bk4xQUR3Tk9XcjlvN1lWNkdUaVU5ejhoQ1FoWXdvNkwyTQ=='
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDQ4NzExMTc0OTc1NS9XcWZod3dHYWVpRUtpVWdiM1JFQUlFWWl6Wlkzcm1jOWRiWE5QbHd1NTVuTEpjenZzWjB1ODlQSm9Lb1NpYzFZaUxqWQ==',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDU4OTE4MDEzMzQ0OC9EMVdkS190T3FoRmxMeDhSaTJrdk9jOUdvOWhqalZFODZPeUFuX0NkRkVORGd1MG81bVl5MVdubllZc3I1LWxBOG12',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDY1Nzc2OTU5MDg5Ni94Q0pQay1YWmNqWEp0NW90N2R6bGoweTJDTFpFVTdJaHhSdzdSazNNUjhoaHhidEJvQTdmbktpV2RuMFJaMC1VN3FBSUxV',
|
||||
'B64:aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTQ1MjMzMDcxMTcyOTA0OTYyMC9yNFRsVkY5aHRiOUR1ejE3WEF6YW5RdXB5OVVkX19XLW03bk4xQUR3Tk9XcllvN1lWNEdUaVU5ejhoQ1FoWXdvNkwyTQ=='
|
||||
]
|
||||
|
||||
// Track disabled webhooks as encoded entries during this execution (in-memory and persisted)
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
import axios from 'axios'
|
||||
import chalk from 'chalk'
|
||||
import { EventEmitter } from 'events'
|
||||
import { DISCORD, LOGGER_CLEANUP } from '../../constants'
|
||||
import { loadConfig } from '../state/Load'
|
||||
import { sendErrorReport } from './ErrorReportingWebhook'
|
||||
import { Ntfy } from './Ntfy'
|
||||
|
||||
// Event emitter for dashboard log streaming (NO FUNCTION INTERCEPTION)
|
||||
export const logEventEmitter = new EventEmitter()
|
||||
|
||||
/**
|
||||
* Safe error logger for catch blocks
|
||||
* Use in .catch() to log errors without breaking flow
|
||||
@@ -322,6 +326,15 @@ export function log(isMobile: boolean | 'main', title: string, message: string,
|
||||
break
|
||||
}
|
||||
|
||||
// Emit log event for dashboard (CLEAN - no function interception)
|
||||
logEventEmitter.emit('log', {
|
||||
timestamp: new Date().toISOString(),
|
||||
level: type,
|
||||
platform: platformText,
|
||||
title,
|
||||
message: redactSensitive(message)
|
||||
})
|
||||
|
||||
// Webhook streaming (live logs)
|
||||
try {
|
||||
const loggingCfg: Record<string, unknown> = (logging || {}) as Record<string, unknown>
|
||||
|
||||
206
src/util/state/AccountHistory.ts
Normal file
206
src/util/state/AccountHistory.ts
Normal file
@@ -0,0 +1,206 @@
|
||||
/**
|
||||
* AccountHistory - Persistent account statistics and history tracking
|
||||
*
|
||||
* Stores historical data per account in sessions/account-history/
|
||||
* Auto-cleans removed accounts from configuration
|
||||
*/
|
||||
|
||||
import fs from 'fs'
|
||||
import path from 'path'
|
||||
import { Account } from '../../interface/Account'
|
||||
|
||||
export interface AccountHistoryEntry {
|
||||
timestamp: string
|
||||
date: string // YYYY-MM-DD
|
||||
desktopPoints: number
|
||||
mobilePoints: number
|
||||
totalPoints: number
|
||||
availablePoints: number
|
||||
lifetimePoints: number
|
||||
dailyGoalProgress: number
|
||||
completedActivities: string[]
|
||||
failedActivities: string[]
|
||||
errors: string[]
|
||||
duration: number // milliseconds
|
||||
success: boolean
|
||||
}
|
||||
|
||||
export interface AccountHistoryData {
|
||||
email: string
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
totalRuns: number
|
||||
successfulRuns: number
|
||||
failedRuns: number
|
||||
totalPointsEarned: number
|
||||
averagePointsPerRun: number
|
||||
lastRunDate?: string
|
||||
history: AccountHistoryEntry[]
|
||||
}
|
||||
|
||||
export class AccountHistory {
|
||||
private historyDir: string
|
||||
private accounts: Account[]
|
||||
|
||||
constructor(accounts: Account[]) {
|
||||
this.accounts = accounts
|
||||
this.historyDir = path.join(process.cwd(), 'sessions', 'account-history')
|
||||
this.ensureHistoryDir()
|
||||
this.cleanupRemovedAccounts()
|
||||
}
|
||||
|
||||
private ensureHistoryDir(): void {
|
||||
if (!fs.existsSync(this.historyDir)) {
|
||||
fs.mkdirSync(this.historyDir, { recursive: true })
|
||||
}
|
||||
}
|
||||
|
||||
private getHistoryFilePath(email: string): string {
|
||||
// Sanitize email for filename (replace @ and special chars)
|
||||
const sanitized = email.replace(/[^a-zA-Z0-9]/g, '_')
|
||||
return path.join(this.historyDir, `${sanitized}.json`)
|
||||
}
|
||||
|
||||
private cleanupRemovedAccounts(): void {
|
||||
// Get all history files
|
||||
if (!fs.existsSync(this.historyDir)) return
|
||||
|
||||
const files = fs.readdirSync(this.historyDir)
|
||||
const activeEmails = this.accounts.map(acc => acc.email)
|
||||
|
||||
for (const file of files) {
|
||||
if (!file.endsWith('.json')) continue
|
||||
|
||||
const filePath = path.join(this.historyDir, file)
|
||||
try {
|
||||
const data = this.loadHistory(filePath)
|
||||
if (data && !activeEmails.includes(data.email)) {
|
||||
fs.unlinkSync(filePath)
|
||||
console.log(`[HISTORY] Cleaned up removed account: ${data.email}`)
|
||||
}
|
||||
} catch (error) {
|
||||
// Ignore invalid files
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private loadHistory(filePath: string): AccountHistoryData | null {
|
||||
if (!fs.existsSync(filePath)) return null
|
||||
|
||||
try {
|
||||
const content = fs.readFileSync(filePath, 'utf8')
|
||||
return JSON.parse(content) as AccountHistoryData
|
||||
} catch (error) {
|
||||
console.error(`[HISTORY] Failed to load ${filePath}:`, error)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
public getAccountHistory(email: string): AccountHistoryData {
|
||||
const filePath = this.getHistoryFilePath(email)
|
||||
const existing = this.loadHistory(filePath)
|
||||
|
||||
if (existing) {
|
||||
return existing
|
||||
}
|
||||
|
||||
// Create new history
|
||||
const newHistory: AccountHistoryData = {
|
||||
email,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
totalRuns: 0,
|
||||
successfulRuns: 0,
|
||||
failedRuns: 0,
|
||||
totalPointsEarned: 0,
|
||||
averagePointsPerRun: 0,
|
||||
history: []
|
||||
}
|
||||
|
||||
this.saveHistory(email, newHistory)
|
||||
return newHistory
|
||||
}
|
||||
|
||||
public addEntry(email: string, entry: AccountHistoryEntry): void {
|
||||
const history = this.getAccountHistory(email)
|
||||
|
||||
// Add new entry
|
||||
history.history.push(entry)
|
||||
|
||||
// Update aggregates
|
||||
history.totalRuns++
|
||||
if (entry.success) {
|
||||
history.successfulRuns++
|
||||
} else {
|
||||
history.failedRuns++
|
||||
}
|
||||
|
||||
history.totalPointsEarned += entry.desktopPoints + entry.mobilePoints
|
||||
history.averagePointsPerRun = history.totalPointsEarned / history.totalRuns
|
||||
history.lastRunDate = entry.date
|
||||
history.updatedAt = new Date().toISOString()
|
||||
|
||||
// Keep only last 90 days of history (to prevent file bloat)
|
||||
const ninetyDaysAgo = new Date()
|
||||
ninetyDaysAgo.setDate(ninetyDaysAgo.getDate() - 90)
|
||||
history.history = history.history.filter(e => new Date(e.timestamp) >= ninetyDaysAgo)
|
||||
|
||||
this.saveHistory(email, history)
|
||||
}
|
||||
|
||||
private saveHistory(email: string, data: AccountHistoryData): void {
|
||||
const filePath = this.getHistoryFilePath(email)
|
||||
try {
|
||||
fs.writeFileSync(filePath, JSON.stringify(data, null, 2), 'utf8')
|
||||
} catch (error) {
|
||||
console.error(`[HISTORY] Failed to save ${email}:`, error)
|
||||
}
|
||||
}
|
||||
|
||||
public getAllHistories(): Record<string, AccountHistoryData> {
|
||||
const result: Record<string, AccountHistoryData> = {}
|
||||
|
||||
for (const account of this.accounts) {
|
||||
result[account.email] = this.getAccountHistory(account.email)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
public getStats(email: string): {
|
||||
totalRuns: number
|
||||
successRate: number
|
||||
avgPointsPerDay: number
|
||||
totalPoints: number
|
||||
last7Days: number
|
||||
last30Days: number
|
||||
} {
|
||||
const history = this.getAccountHistory(email)
|
||||
const now = new Date()
|
||||
const sevenDaysAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)
|
||||
const thirtyDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000)
|
||||
|
||||
const last7DaysEntries = history.history.filter(e => new Date(e.timestamp) >= sevenDaysAgo)
|
||||
const last30DaysEntries = history.history.filter(e => new Date(e.timestamp) >= thirtyDaysAgo)
|
||||
|
||||
const last7DaysPoints = last7DaysEntries.reduce((sum, e) => sum + e.desktopPoints + e.mobilePoints, 0)
|
||||
const last30DaysPoints = last30DaysEntries.reduce((sum, e) => sum + e.desktopPoints + e.mobilePoints, 0)
|
||||
|
||||
const successRate = history.totalRuns > 0
|
||||
? (history.successfulRuns / history.totalRuns) * 100
|
||||
: 0
|
||||
|
||||
const avgPointsPerDay = history.history.length > 0
|
||||
? history.totalPointsEarned / history.history.length
|
||||
: 0
|
||||
|
||||
return {
|
||||
totalRuns: history.totalRuns,
|
||||
successRate: Math.round(successRate * 100) / 100,
|
||||
avgPointsPerDay: Math.round(avgPointsPerDay),
|
||||
totalPoints: history.totalPointsEarned,
|
||||
last7Days: last7DaysPoints,
|
||||
last30Days: last30DaysPoints
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user