Compare commits
1 Commits
v1.3.3
...
feat/revok
| Author | SHA1 | Date | |
|---|---|---|---|
| f3bc59e6d0 |
@@ -1,33 +1,4 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#1B2838"/>
|
||||
<stop offset="100%" stop-color="#101419"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#66C0F4"/>
|
||||
<stop offset="100%" stop-color="#1A9FFF"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
|
||||
<!-- Outer Rounded Container -->
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<rect x="2" y="2" width="508" height="508" rx="98" stroke="white" stroke-opacity="0.05" stroke-width="4"/>
|
||||
|
||||
<!-- Tracking Ring (Detailed) -->
|
||||
<circle cx="256" cy="256" r="180" stroke="#66C0F4" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
|
||||
<!-- Central Shield Symbol -->
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
|
||||
<!-- "Ban" Intersect (Stylized Cross) -->
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#1B2838" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
|
||||
<!-- Glass Highlight -->
|
||||
<path d="M100 100C150 60 362 60 412 100" stroke="white" stroke-opacity="0.1" stroke-width="20" stroke-linecap="round"/>
|
||||
<rect width="512" height="512" rx="64" fill="#171A21"/>
|
||||
<path d="M256 64C150.13 64 64 150.13 64 256C64 361.87 150.13 448 256 448C361.87 448 448 361.87 448 256C448 150.13 375.73 64 256 64ZM256 405.33C173.6 405.33 106.67 338.4 106.67 256C106.67 221.33 118.4 189.33 138.13 164.27L347.73 373.87C322.67 393.6 290.67 405.33 256 405.33ZM373.87 347.73L164.27 138.13C189.33 118.4 221.33 106.67 256 106.67C338.4 106.67 405.33 173.6 405.33 256C405.33 290.67 393.6 322.67 373.87 347.73Z" fill="#66C0F4"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 604 B |
@@ -1,21 +0,0 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#EFF1F5"/>
|
||||
<stop offset="100%" stop-color="#DCE0E8"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#1E66F5"/>
|
||||
<stop offset="100%" stop-color="#179299"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<circle cx="256" cy="256" r="180" stroke="#1E66F5" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#EFF1F5" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,21 +0,0 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#1E1E2E"/>
|
||||
<stop offset="100%" stop-color="#11111B"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#B4BEFE"/>
|
||||
<stop offset="100%" stop-color="#89B4FA"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<circle cx="256" cy="256" r="180" stroke="#B4BEFE" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#1E1E2E" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,21 +0,0 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#3B4252"/>
|
||||
<stop offset="100%" stop-color="#2E3440"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#88C0D0"/>
|
||||
<stop offset="100%" stop-color="#81A1C1"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<circle cx="256" cy="256" r="180" stroke="#88C0D0" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#3B4252" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,21 +0,0 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#1B2838"/>
|
||||
<stop offset="100%" stop-color="#101419"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#66C0F4"/>
|
||||
<stop offset="100%" stop-color="#1A9FFF"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<circle cx="256" cy="256" r="180" stroke="#66C0F4" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#1B2838" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,21 +0,0 @@
|
||||
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient id="bg_grad" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#1A1B26"/>
|
||||
<stop offset="100%" stop-color="#10101A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="symbol_grad" x1="256" y1="100" x2="256" y2="412" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0%" stop-color="#7AA2F7"/>
|
||||
<stop offset="100%" stop-color="#3D59A1"/>
|
||||
</linearGradient>
|
||||
<filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
|
||||
<feGaussianBlur stdDeviation="15" result="blur"/>
|
||||
<feComposite in="SourceGraphic" in2="blur" operator="over"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<rect width="512" height="512" rx="100" fill="url(#bg_grad)"/>
|
||||
<circle cx="256" cy="256" r="180" stroke="#7AA2F7" stroke-width="8" stroke-dasharray="20 10" opacity="0.2"/>
|
||||
<circle cx="256" cy="256" r="160" stroke="url(#symbol_grad)" stroke-width="20" stroke-linecap="round" stroke-dasharray="350 500" filter="url(#glow)"/>
|
||||
<path d="M256 120L360 160V260C360 330 310 380 256 400C202 380 152 330 152 260V160L256 120Z" fill="url(#symbol_grad)" filter="url(#glow)"/>
|
||||
<path d="M210 220L302 312M302 220L210 312" stroke="#1A1B26" stroke-width="24" stroke-linecap="round" opacity="0.8"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -60,23 +60,9 @@ const initBackend = () => {
|
||||
};
|
||||
// --- System Tray ---
|
||||
const createTray = () => {
|
||||
// Try to find the icon in various standard locations
|
||||
const possiblePaths = [
|
||||
path_1.default.join(__dirname, '..', 'assets-build'), // Dev
|
||||
path_1.default.join(process.resourcesPath, 'assets-build'), // Packaged (External)
|
||||
path_1.default.join(electron_1.app.getAppPath(), 'dist', 'assets-build'), // Packaged (Internal dist)
|
||||
path_1.default.join(electron_1.app.getAppPath(), 'assets-build') // Packaged (Internal root)
|
||||
];
|
||||
let assetsDir = '';
|
||||
for (const p of possiblePaths) {
|
||||
if (fs_1.default.existsSync(p)) {
|
||||
assetsDir = p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
const possibleIcons = ['icon.png', 'icon.svg'];
|
||||
const assetsDir = path_1.default.join(__dirname, '..', 'assets-build');
|
||||
const possibleIcons = ['icon.svg', 'icon.png'];
|
||||
let iconPath = '';
|
||||
if (assetsDir) {
|
||||
for (const name of possibleIcons) {
|
||||
const fullPath = path_1.default.join(assetsDir, name);
|
||||
if (fs_1.default.existsSync(fullPath)) {
|
||||
@@ -84,31 +70,27 @@ const createTray = () => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(`[Tray] Resolved assets directory: ${assetsDir || 'NOT FOUND'}`);
|
||||
console.log(`[Tray] Attempting to initialize with icon: ${iconPath || 'NONE FOUND'}`);
|
||||
if (!iconPath) {
|
||||
console.warn(`[Tray] FAILED: No valid icon found in searched paths.`);
|
||||
console.warn(`[Tray] FAILED: No valid icon found in ${assetsDir}`);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const icon = electron_1.nativeImage.createFromPath(iconPath).resize({ width: 16, height: 16 });
|
||||
tray = new electron_1.Tray(icon);
|
||||
tray.setToolTip('Ultimate Ban Tracker');
|
||||
tray.on('click', () => { if (mainWindow) {
|
||||
tray.on('click', () => {
|
||||
if (mainWindow) {
|
||||
mainWindow.show();
|
||||
mainWindow.focus();
|
||||
} });
|
||||
// Load initial themed icon
|
||||
const config = store.get('serverConfig');
|
||||
if (config?.theme) {
|
||||
setAppIcon(config.theme);
|
||||
}
|
||||
else {
|
||||
updateTrayMenu(); // Fallback to refresh menu
|
||||
});
|
||||
updateTrayMenu();
|
||||
console.log(`[Tray] Successfully initialized`);
|
||||
}
|
||||
catch (e) {
|
||||
console.error(`[Tray] Critical error during initialization: ${e.message}`);
|
||||
}
|
||||
catch (e) { }
|
||||
};
|
||||
const updateTrayMenu = () => {
|
||||
if (!tray)
|
||||
@@ -126,7 +108,11 @@ const updateTrayMenu = () => {
|
||||
click: () => handleSwitchAccount(acc.loginName)
|
||||
})) : [{ label: 'No accounts found', enabled: false }]
|
||||
},
|
||||
{ label: 'Sync Now', enabled: !!config?.enabled, click: () => syncAccounts(true) },
|
||||
{
|
||||
label: 'Sync Now',
|
||||
enabled: !!config?.enabled,
|
||||
click: () => syncAccounts()
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ label: 'Show Dashboard', click: () => { if (mainWindow)
|
||||
mainWindow.show(); } },
|
||||
@@ -134,21 +120,6 @@ const updateTrayMenu = () => {
|
||||
]);
|
||||
tray.setContextMenu(contextMenu);
|
||||
};
|
||||
const setAppIcon = (themeName = 'steam') => {
|
||||
const assetsDir = path_1.default.join(__dirname, '..', 'assets-build', 'icons');
|
||||
const iconPath = path_1.default.join(assetsDir, `${themeName}.svg`);
|
||||
if (!fs_1.default.existsSync(iconPath))
|
||||
return;
|
||||
const icon = electron_1.nativeImage.createFromPath(iconPath);
|
||||
// Update Tray
|
||||
if (tray) {
|
||||
tray.setImage(icon.resize({ width: 16, height: 16 }));
|
||||
}
|
||||
// Update Main Window
|
||||
if (mainWindow) {
|
||||
mainWindow.setIcon(icon);
|
||||
}
|
||||
};
|
||||
// --- Steam Logic ---
|
||||
const killSteam = async () => {
|
||||
return new Promise((resolve) => {
|
||||
@@ -184,10 +155,67 @@ const handleSwitchAccount = async (loginName) => {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
// --- Scraper Helper ---
|
||||
const scrapeAccountData = async (account) => {
|
||||
const now = new Date();
|
||||
// --- Sync Worker ---
|
||||
const syncAccounts = async () => {
|
||||
initBackend();
|
||||
let accounts = store.get('accounts');
|
||||
let hasChanges = false;
|
||||
if (backend) {
|
||||
try {
|
||||
const shared = await backend.getSharedAccounts();
|
||||
for (const s of shared) {
|
||||
const exists = accounts.find(a => a.steamId === s.steamId);
|
||||
if (!exists) {
|
||||
accounts.push({
|
||||
_id: `shared_${s.steamId}`,
|
||||
steamId: s.steamId, personaName: s.personaName, avatar: s.avatar, profileUrl: s.profileUrl,
|
||||
vacBanned: s.vacBanned, gameBans: s.gameBans, cooldownExpiresAt: s.cooldownExpiresAt,
|
||||
loginName: s.loginName || '', steamLoginSecure: s.steamLoginSecure, loginConfig: s.loginConfig,
|
||||
sessionUpdatedAt: s.sessionUpdatedAt, autoCheckCooldown: !!s.steamLoginSecure,
|
||||
status: (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none', lastBanCheck: new Date().toISOString()
|
||||
});
|
||||
hasChanges = true;
|
||||
}
|
||||
else {
|
||||
const sDate = s.sessionUpdatedAt ? new Date(s.sessionUpdatedAt) : new Date(0);
|
||||
const lDate = exists.sessionUpdatedAt ? new Date(exists.sessionUpdatedAt) : new Date(0);
|
||||
if (sDate > lDate) {
|
||||
if (s.loginName)
|
||||
exists.loginName = s.loginName;
|
||||
if (s.loginConfig)
|
||||
exists.loginConfig = s.loginConfig;
|
||||
if (s.steamLoginSecure) {
|
||||
exists.steamLoginSecure = s.steamLoginSecure;
|
||||
exists.autoCheckCooldown = true;
|
||||
exists.authError = false;
|
||||
}
|
||||
exists.sessionUpdatedAt = s.sessionUpdatedAt;
|
||||
hasChanges = true;
|
||||
}
|
||||
if (s.cooldownExpiresAt && (!exists.cooldownExpiresAt || new Date(s.cooldownExpiresAt) > new Date(exists.cooldownExpiresAt))) {
|
||||
exists.cooldownExpiresAt = s.cooldownExpiresAt;
|
||||
hasChanges = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
if (hasChanges) {
|
||||
store.set('accounts', accounts);
|
||||
if (mainWindow)
|
||||
mainWindow.webContents.send('accounts-updated', accounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
if (accounts.length === 0)
|
||||
return;
|
||||
const updatedAccounts = [...accounts];
|
||||
let scrapeChanges = false;
|
||||
for (const account of updatedAccounts) {
|
||||
try {
|
||||
const now = new Date();
|
||||
const lastCheck = account.lastBanCheck ? new Date(account.lastBanCheck) : new Date(0);
|
||||
if ((now.getTime() - lastCheck.getTime()) / 3600000 > 6 || !account.personaName) {
|
||||
const profile = await (0, steam_web_1.fetchProfileData)(account.steamId, account.steamLoginSecure);
|
||||
const bans = await (0, steam_web_1.scrapeBanStatus)(profile.profileUrl, account.steamLoginSecure);
|
||||
account.personaName = profile.personaName;
|
||||
@@ -202,162 +230,59 @@ const scrapeAccountData = async (account) => {
|
||||
if (localPath)
|
||||
account.localAvatar = localPath;
|
||||
}
|
||||
if (account.steamLoginSecure) {
|
||||
if (account.loginName) {
|
||||
const config = steam_client_1.steamClient.extractAccountConfig(account.loginName);
|
||||
if (config) {
|
||||
account.loginConfig = config;
|
||||
account.sessionUpdatedAt = new Date().toISOString();
|
||||
}
|
||||
}
|
||||
if (backend)
|
||||
await backend.shareAccount(account);
|
||||
scrapeChanges = true;
|
||||
}
|
||||
if (account.autoCheckCooldown && account.steamLoginSecure) {
|
||||
if (account.cooldownExpiresAt && new Date(account.cooldownExpiresAt) > now)
|
||||
continue;
|
||||
const lastScrape = account.lastScrapeTime ? new Date(account.lastScrapeTime) : new Date(0);
|
||||
if ((now.getTime() - lastScrape.getTime()) / 3600000 > 8) {
|
||||
await new Promise(r => setTimeout(r, Math.floor(Math.random() * 60000) + 5000));
|
||||
try {
|
||||
const result = await (0, scraper_1.scrapeCooldown)(account.steamId, account.steamLoginSecure);
|
||||
account.authError = false;
|
||||
account.lastScrapeTime = now.toISOString();
|
||||
account.lastScrapeTime = new Date().toISOString();
|
||||
if (result.isActive) {
|
||||
account.cooldownExpiresAt = result.expiresAt ? result.expiresAt.toISOString() : new Date(Date.now() + 86400000).toISOString();
|
||||
if (backend)
|
||||
await backend.pushCooldown(account.steamId, account.cooldownExpiresAt, now.toISOString());
|
||||
await backend.pushCooldown(account.steamId, account.cooldownExpiresAt);
|
||||
}
|
||||
else {
|
||||
else if (account.cooldownExpiresAt) {
|
||||
account.cooldownExpiresAt = undefined;
|
||||
if (backend)
|
||||
await backend.pushCooldown(account.steamId, undefined, now.toISOString());
|
||||
await backend.pushCooldown(account.steamId, undefined);
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
if (e instanceof scraper_1.SteamAuthError) {
|
||||
account.authError = true;
|
||||
}
|
||||
else {
|
||||
console.error(`[Scraper] Temporary error for ${account.personaName}: ${e.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (backend && !account._id.startsWith('shared_')) {
|
||||
await backend.shareAccount(account);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (e) {
|
||||
console.error(`[Scraper] Failed to scrape ${account.personaName}:`, e);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
// --- Sync Worker ---
|
||||
const syncAccounts = async (isManual = false) => {
|
||||
console.log(`[Sync] Phase 1: Pulling from server...`);
|
||||
initBackend();
|
||||
let accounts = store.get('accounts');
|
||||
let hasChanges = false;
|
||||
if (backend) {
|
||||
try {
|
||||
const shared = await backend.getSharedAccounts();
|
||||
for (const s of shared) {
|
||||
const exists = accounts.find(a => a.steamId === s.steamId);
|
||||
if (!exists) {
|
||||
accounts.push({
|
||||
_id: `shared_${s.steamId}`, steamId: s.steamId, personaName: s.personaName,
|
||||
avatar: s.avatar, profileUrl: s.profileUrl, vacBanned: s.vacBanned,
|
||||
gameBans: s.gameBans, cooldownExpiresAt: s.cooldownExpiresAt,
|
||||
loginName: s.loginName || '', steamLoginSecure: s.steamLoginSecure,
|
||||
loginConfig: s.loginConfig, sessionUpdatedAt: s.sessionUpdatedAt,
|
||||
autoCheckCooldown: !!s.steamLoginSecure, status: (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none',
|
||||
lastBanCheck: new Date().toISOString(), sharedWith: s.sharedWith
|
||||
});
|
||||
hasChanges = true;
|
||||
}
|
||||
else {
|
||||
const sDate = s.sessionUpdatedAt ? new Date(s.sessionUpdatedAt) : new Date(0);
|
||||
const lDate = exists.sessionUpdatedAt ? new Date(exists.sessionUpdatedAt) : new Date(0);
|
||||
// 1. SENSITIVE DATA SYNC (Credentials)
|
||||
const sSessionDate = s.sessionUpdatedAt ? new Date(s.sessionUpdatedAt) : new Date(0);
|
||||
const lSessionDate = exists.sessionUpdatedAt ? new Date(exists.sessionUpdatedAt) : new Date(0);
|
||||
const isLocalAccount = !exists._id.startsWith('shared_');
|
||||
const isLocalSessionHealthy = exists.steamLoginSecure && !exists.authError;
|
||||
// SMART OVERWRITE LOGIC:
|
||||
// - If it's a remote shared account: Newest wins.
|
||||
// - If it's a LOCAL account: Only overwrite if our local session is broken/missing.
|
||||
const shouldOverwriteCredentials = !isLocalAccount ? (sSessionDate > lSessionDate) : (!isLocalSessionHealthy && sSessionDate > lSessionDate);
|
||||
if (shouldOverwriteCredentials) {
|
||||
if (s.loginName)
|
||||
exists.loginName = s.loginName;
|
||||
if (s.loginConfig)
|
||||
exists.loginConfig = s.loginConfig;
|
||||
if (s.steamLoginSecure) {
|
||||
exists.steamLoginSecure = s.steamLoginSecure;
|
||||
exists.autoCheckCooldown = true;
|
||||
exists.authError = false;
|
||||
}
|
||||
exists.sessionUpdatedAt = s.sessionUpdatedAt;
|
||||
hasChanges = true;
|
||||
}
|
||||
// 2. Metadata Sync (Pull) - Always "Newest Wins"
|
||||
const sMetaDate = s.lastMetadataCheck ? new Date(s.lastMetadataCheck) : new Date(0);
|
||||
const lMetaDate = exists.lastBanCheck ? new Date(exists.lastBanCheck) : new Date(0);
|
||||
if (sMetaDate > lMetaDate) {
|
||||
exists.personaName = s.personaName;
|
||||
exists.avatar = s.avatar;
|
||||
exists.vacBanned = s.vacBanned;
|
||||
exists.gameBans = s.gameBans;
|
||||
exists.status = (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none';
|
||||
exists.lastBanCheck = s.lastMetadataCheck;
|
||||
hasChanges = true;
|
||||
}
|
||||
// Cooldown Sync (Pull)
|
||||
const sScrapeDate = s.lastScrapeTime ? new Date(s.lastScrapeTime) : new Date(0);
|
||||
const lScrapeDate = exists.lastScrapeTime ? new Date(exists.lastScrapeTime) : new Date(0);
|
||||
if (sScrapeDate > lScrapeDate) {
|
||||
exists.cooldownExpiresAt = s.cooldownExpiresAt;
|
||||
exists.lastScrapeTime = s.lastScrapeTime;
|
||||
hasChanges = true;
|
||||
}
|
||||
if (JSON.stringify(exists.sharedWith) !== JSON.stringify(s.sharedWith)) {
|
||||
exists.sharedWith = s.sharedWith;
|
||||
hasChanges = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
if (hasChanges) {
|
||||
store.set('accounts', accounts);
|
||||
if (mainWindow)
|
||||
mainWindow.webContents.send('accounts-updated', accounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
// Phase 2: Background Scrapes
|
||||
const runScrapes = async () => {
|
||||
console.log(`[Sync] Phase 2: Starting background checks for ${accounts.length} accounts...`);
|
||||
const currentAccounts = [...store.get('accounts')];
|
||||
let scrapeChanges = false;
|
||||
for (const account of currentAccounts) {
|
||||
try {
|
||||
const now = new Date();
|
||||
if (backend && !account._id.startsWith('shared_'))
|
||||
await backend.shareAccount(account);
|
||||
const lastCheck = account.lastBanCheck ? new Date(account.lastBanCheck) : new Date(0);
|
||||
const lastScrape = account.lastScrapeTime ? new Date(account.lastScrapeTime) : new Date(0);
|
||||
const needsMetadata = (now.getTime() - lastCheck.getTime()) / 3600000 > 6 || !account.personaName;
|
||||
const needsCooldown = account.autoCheckCooldown && account.steamLoginSecure && (now.getTime() - lastScrape.getTime()) / 3600000 > 8;
|
||||
if (needsMetadata || needsCooldown || isManual) {
|
||||
if (!isManual && needsCooldown)
|
||||
await new Promise(r => setTimeout(r, Math.floor(Math.random() * 30000) + 5000));
|
||||
if (await scrapeAccountData(account))
|
||||
scrapeChanges = true;
|
||||
}
|
||||
catch (e) {
|
||||
if (e.message.includes('cookie') || e.message.includes('Sign In')) {
|
||||
account.authError = true;
|
||||
scrapeChanges = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (error) { }
|
||||
}
|
||||
if (scrapeChanges) {
|
||||
store.set('accounts', currentAccounts);
|
||||
store.set('accounts', updatedAccounts);
|
||||
if (mainWindow)
|
||||
mainWindow.webContents.send('accounts-updated', currentAccounts);
|
||||
mainWindow.webContents.send('accounts-updated', updatedAccounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
console.log('[Sync] Sync cycle finished.');
|
||||
};
|
||||
if (isManual)
|
||||
await runScrapes();
|
||||
else
|
||||
runScrapes();
|
||||
};
|
||||
const scheduleNextSync = () => {
|
||||
setTimeout(async () => { await syncAccounts(false); scheduleNextSync(); }, isDev ? 300000 : 1800000);
|
||||
setTimeout(async () => { await syncAccounts(); scheduleNextSync(); }, isDev ? 120000 : 1800000);
|
||||
};
|
||||
// --- Discovery ---
|
||||
const addingAccounts = new Set();
|
||||
@@ -380,20 +305,11 @@ const handleLocalAccountsFound = async (localAccounts) => {
|
||||
const profile = await (0, steam_web_1.fetchProfileData)(local.steamId);
|
||||
const bans = await (0, steam_web_1.scrapeBanStatus)(profile.profileUrl);
|
||||
const localPath = await downloadAvatar(profile.steamId, profile.avatar);
|
||||
// Wait and retry snagging the config (Steam takes time to write it)
|
||||
let loginConfig = undefined;
|
||||
for (let i = 0; i < 3; i++) {
|
||||
await new Promise(r => setTimeout(r, 2000));
|
||||
loginConfig = steam_client_1.steamClient.extractAccountConfig(local.accountName);
|
||||
if (loginConfig)
|
||||
break;
|
||||
}
|
||||
currentAccounts.push({
|
||||
_id: Date.now().toString() + Math.random().toString().slice(2, 5),
|
||||
steamId: local.steamId, personaName: profile.personaName || local.accountName,
|
||||
loginName: local.accountName, autoCheckCooldown: false, avatar: profile.avatar,
|
||||
localAvatar: localPath, profileUrl: profile.profileUrl,
|
||||
loginConfig, sessionUpdatedAt: loginConfig ? new Date().toISOString() : undefined,
|
||||
status: (bans.vacBanned || bans.gameBans > 0) ? 'banned' : 'none',
|
||||
vacBanned: bans.vacBanned, gameBans: bans.gameBans, lastBanCheck: new Date().toISOString()
|
||||
});
|
||||
@@ -410,7 +326,7 @@ const handleLocalAccountsFound = async (localAccounts) => {
|
||||
updateTrayMenu();
|
||||
}
|
||||
};
|
||||
// --- Main Window ---
|
||||
// --- Main Window Creation ---
|
||||
function createWindow() {
|
||||
mainWindow = new electron_1.BrowserWindow({
|
||||
width: 1280, height: 800, title: "Ultimate Ban Tracker", backgroundColor: '#171a21', autoHideMenuBar: true,
|
||||
@@ -429,6 +345,7 @@ function createWindow() {
|
||||
else
|
||||
mainWindow.loadFile(path_1.default.join(__dirname, '..', 'dist', 'index.html'));
|
||||
}
|
||||
// --- App Lifecycle ---
|
||||
electron_1.app.whenReady().then(() => {
|
||||
electron_1.protocol.handle('steam-resource', (request) => {
|
||||
let rawPath = decodeURIComponent(request.url.replace('steam-resource://', ''));
|
||||
@@ -447,7 +364,7 @@ electron_1.app.whenReady().then(() => {
|
||||
createWindow();
|
||||
createTray();
|
||||
initBackend();
|
||||
setTimeout(() => syncAccounts(false), 5000);
|
||||
setTimeout(syncAccounts, 5000);
|
||||
scheduleNextSync();
|
||||
steam_client_1.steamClient.startWatching(handleLocalAccountsFound);
|
||||
});
|
||||
@@ -474,7 +391,7 @@ electron_1.ipcMain.handle('login-to-server', async () => {
|
||||
return false;
|
||||
return new Promise((resolve) => {
|
||||
const authWindow = new electron_1.BrowserWindow({
|
||||
width: 800, height: 700, parent: mainWindow || undefined, modal: true, title: 'Login to Server',
|
||||
width: 800, height: 700, parent: mainWindow || undefined, modal: true, title: 'Login to Ban Tracker Server',
|
||||
webPreferences: { nodeIntegration: false, contextIsolation: true }
|
||||
});
|
||||
authWindow.loadURL(`${config.url}/auth/steam`);
|
||||
@@ -484,15 +401,13 @@ electron_1.ipcMain.handle('login-to-server', async () => {
|
||||
return;
|
||||
captured = true;
|
||||
let serverSteamId = undefined;
|
||||
let isAdmin = false;
|
||||
try {
|
||||
const payload = JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
|
||||
serverSteamId = payload.steamId;
|
||||
isAdmin = !!payload.isAdmin;
|
||||
}
|
||||
catch (e) { }
|
||||
const current = store.get('serverConfig');
|
||||
store.set('serverConfig', { ...current, token, serverSteamId, isAdmin, enabled: true });
|
||||
store.set('serverConfig', { ...current, token, serverSteamId, enabled: true });
|
||||
initBackend();
|
||||
authWindow.close();
|
||||
resolve(true);
|
||||
@@ -516,21 +431,7 @@ electron_1.ipcMain.handle('login-to-server', async () => {
|
||||
});
|
||||
});
|
||||
electron_1.ipcMain.handle('get-server-user-info', () => ({ steamId: store.get('serverConfig').serverSteamId }));
|
||||
electron_1.ipcMain.handle('sync-now', async () => { await syncAccounts(true); return true; });
|
||||
electron_1.ipcMain.handle('scrape-account', async (event, steamId) => {
|
||||
const accounts = store.get('accounts');
|
||||
const account = accounts.find(a => a.steamId === steamId);
|
||||
if (!account)
|
||||
return false;
|
||||
const success = await scrapeAccountData(account);
|
||||
if (success) {
|
||||
store.set('accounts', accounts);
|
||||
if (mainWindow)
|
||||
mainWindow.webContents.send('accounts-updated', accounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
return success;
|
||||
});
|
||||
electron_1.ipcMain.handle('sync-now', async () => { await syncAccounts(); return true; });
|
||||
electron_1.ipcMain.handle('add-account', async (event, { identifier }) => {
|
||||
try {
|
||||
initBackend();
|
||||
@@ -548,7 +449,7 @@ electron_1.ipcMain.handle('add-account', async (event, { identifier }) => {
|
||||
loginName: existing.loginName || '', steamLoginSecure: existing.steamLoginSecure,
|
||||
loginConfig: existing.loginConfig, sessionUpdatedAt: existing.sessionUpdatedAt,
|
||||
autoCheckCooldown: !!existing.steamLoginSecure, status: (existing.vacBanned || existing.gameBans > 0) ? 'banned' : 'none',
|
||||
lastBanCheck: new Date().toISOString(), sharedWith: existing.sharedWith
|
||||
lastBanCheck: new Date().toISOString()
|
||||
};
|
||||
store.set('accounts', [...accounts, newAccount]);
|
||||
updateTrayMenu();
|
||||
@@ -615,67 +516,18 @@ electron_1.ipcMain.handle('revoke-all-account-access', async (event, steamId) =>
|
||||
});
|
||||
electron_1.ipcMain.handle('get-community-accounts', async () => { initBackend(); return backend ? await backend.getCommunityAccounts() : []; });
|
||||
electron_1.ipcMain.handle('get-server-users', async () => { initBackend(); return backend ? await backend.getServerUsers() : []; });
|
||||
// --- Admin IPC ---
|
||||
electron_1.ipcMain.handle('admin-get-stats', async () => { initBackend(); return backend ? await backend.getAdminStats() : null; });
|
||||
electron_1.ipcMain.handle('admin-get-users', async () => { initBackend(); return backend ? await backend.getAdminUsers() : []; });
|
||||
electron_1.ipcMain.handle('admin-delete-user', async (event, userId) => { initBackend(); if (backend)
|
||||
await backend.deleteUser(userId); return true; });
|
||||
electron_1.ipcMain.handle('admin-get-accounts', async () => { initBackend(); return backend ? await backend.getAdminAccounts() : []; });
|
||||
electron_1.ipcMain.handle('admin-remove-account', async (event, steamId) => { initBackend(); if (backend)
|
||||
await backend.forceRemoveAccount(steamId); return true; });
|
||||
electron_1.ipcMain.handle('force-sync', async () => { await syncAccounts(true); return true; });
|
||||
electron_1.ipcMain.handle('update-app-icon', (event, themeName) => {
|
||||
setAppIcon(themeName);
|
||||
return true;
|
||||
});
|
||||
electron_1.ipcMain.handle('switch-account', async (event, loginName) => {
|
||||
if (!loginName)
|
||||
return false;
|
||||
try {
|
||||
// PROACTIVE SYNC: Try to snag the freshest token before we kill Steam
|
||||
const accounts = store.get('accounts');
|
||||
const account = accounts.find(a => a.loginName === loginName);
|
||||
if (account && !account._id.startsWith('shared_')) {
|
||||
const freshConfig = steam_client_1.steamClient.extractAccountConfig(loginName);
|
||||
if (freshConfig) {
|
||||
account.loginConfig = freshConfig;
|
||||
account.sessionUpdatedAt = new Date().toISOString();
|
||||
if (backend)
|
||||
await backend.shareAccount(account);
|
||||
store.set('accounts', accounts);
|
||||
}
|
||||
}
|
||||
await killSteam();
|
||||
if (process.platform === 'win32') {
|
||||
const regBase = 'reg add "HKCU\\Software\\Valve\\Steam"';
|
||||
const commands = [
|
||||
`${regBase} /v AutoLoginUser /t REG_SZ /d "${loginName}" /f`,
|
||||
`${regBase} /v RememberPassword /t REG_DWORD /d 1 /f`,
|
||||
`${regBase} /v AlreadyLoggedIn /t REG_DWORD /d 1 /f`,
|
||||
`${regBase} /v WantsOfflineMode /t REG_DWORD /d 0 /f`
|
||||
];
|
||||
await new Promise((res, rej) => (0, child_process_1.exec)(commands.join(' && '), (e) => e ? rej(e) : res()));
|
||||
if (account && account.loginConfig)
|
||||
steam_client_1.steamClient.injectAccountConfig(loginName, account.loginConfig);
|
||||
}
|
||||
else if (process.platform === 'linux') {
|
||||
await steam_client_1.steamClient.setAutoLoginUser(loginName, account?.loginConfig, account?.steamId);
|
||||
}
|
||||
startSteam();
|
||||
return true;
|
||||
}
|
||||
catch (e) {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
electron_1.ipcMain.handle('switch-account', async (event, loginName) => await handleSwitchAccount(loginName));
|
||||
electron_1.ipcMain.handle('open-external', (event, url) => electron_1.shell.openExternal(url));
|
||||
electron_1.ipcMain.handle('open-steam-app-login', async () => {
|
||||
console.log('[SteamClient] Preparing for fresh login...');
|
||||
await killSteam();
|
||||
if (process.platform === 'win32') {
|
||||
// Clear auto-login registry
|
||||
const clearReg = 'reg add "HKCU\\Software\\Valve\\Steam" /v AutoLoginUser /t REG_SZ /d "" /f';
|
||||
await new Promise((res) => (0, child_process_1.exec)(clearReg, () => res()));
|
||||
}
|
||||
else if (process.platform === 'linux') {
|
||||
// On Linux we can use the steamClient helper to set an empty user
|
||||
await steam_client_1.steamClient.setAutoLoginUser("", undefined, "");
|
||||
}
|
||||
const command = process.platform === 'win32' ? 'start steam://open/login' : 'xdg-open steam://open/login';
|
||||
@@ -683,20 +535,34 @@ electron_1.ipcMain.handle('open-steam-app-login', async () => {
|
||||
return true;
|
||||
});
|
||||
electron_1.ipcMain.handle('open-steam-login', async (event, expectedSteamId) => {
|
||||
// Use a unique partition per account to prevent session bleeding
|
||||
const partitionId = expectedSteamId ? `persist:steam-login-${expectedSteamId}` : 'persist:steam-login-new';
|
||||
const loginSession = electron_1.session.fromPartition(partitionId);
|
||||
if (!expectedSteamId)
|
||||
// If adding a brand new account, explicitly clear previous trash
|
||||
if (!expectedSteamId) {
|
||||
console.log('[Auth] Clearing session for new account login...');
|
||||
await loginSession.clearStorageData({ storages: ['cookies', 'localstorage', 'indexdb'] });
|
||||
}
|
||||
// If we have an existing cookie string for this account, pre-inject it
|
||||
if (expectedSteamId) {
|
||||
const accounts = store.get('accounts');
|
||||
const account = accounts.find(a => a.steamId === expectedSteamId);
|
||||
if (account?.steamLoginSecure) {
|
||||
console.log(`[Auth] Pre-injecting existing cookies for ${account.personaName}...`);
|
||||
const cookiePairs = account.steamLoginSecure.split(';').map(c => c.trim());
|
||||
for (const pair of cookiePairs) {
|
||||
const [name, value] = pair.split('=');
|
||||
if (name && value) {
|
||||
try {
|
||||
await loginSession.cookies.set({ url: 'https://steamcommunity.com', domain: 'steamcommunity.com', name, value, path: '/', secure: true, httpOnly: name.includes('Secure') });
|
||||
await loginSession.cookies.set({
|
||||
url: 'https://steamcommunity.com',
|
||||
domain: 'steamcommunity.com',
|
||||
name: name,
|
||||
value: value,
|
||||
path: '/',
|
||||
secure: true,
|
||||
httpOnly: name.includes('Secure')
|
||||
});
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ electron_1.contextBridge.exposeInMainWorld('electronAPI', {
|
||||
revokeAccountAccess: (steamId, targetSteamId) => electron_1.ipcRenderer.invoke('revoke-account-access', steamId, targetSteamId),
|
||||
revokeAllAccountAccess: (steamId) => electron_1.ipcRenderer.invoke('revoke-all-account-access', steamId),
|
||||
openExternal: (url) => electron_1.ipcRenderer.invoke('open-external', url),
|
||||
updateAppIcon: (theme) => electron_1.ipcRenderer.invoke('update-app-icon', theme),
|
||||
openSteamAppLogin: () => electron_1.ipcRenderer.invoke('open-steam-app-login'),
|
||||
openSteamLogin: (steamId) => electron_1.ipcRenderer.invoke('open-steam-login', steamId),
|
||||
// Server Config & Auth
|
||||
@@ -20,15 +19,8 @@ electron_1.contextBridge.exposeInMainWorld('electronAPI', {
|
||||
loginToServer: () => electron_1.ipcRenderer.invoke('login-to-server'),
|
||||
getServerUserInfo: () => electron_1.ipcRenderer.invoke('get-server-user-info'),
|
||||
syncNow: () => electron_1.ipcRenderer.invoke('sync-now'),
|
||||
scrapeAccount: (steamId) => electron_1.ipcRenderer.invoke('scrape-account', steamId),
|
||||
getCommunityAccounts: () => electron_1.ipcRenderer.invoke('get-community-accounts'),
|
||||
getServerUsers: () => electron_1.ipcRenderer.invoke('get-server-users'),
|
||||
// Admin API
|
||||
adminGetStats: () => electron_1.ipcRenderer.invoke('admin-get-stats'),
|
||||
adminGetUsers: () => electron_1.ipcRenderer.invoke('admin-get-users'),
|
||||
adminDeleteUser: (userId) => electron_1.ipcRenderer.invoke('admin-delete-user', userId),
|
||||
adminGetAccounts: () => electron_1.ipcRenderer.invoke('admin-get-accounts'),
|
||||
adminRemoveAccount: (steamId) => electron_1.ipcRenderer.invoke('admin-remove-account', steamId),
|
||||
onAccountsUpdated: (callback) => {
|
||||
const subscription = (_event, accounts) => callback(accounts);
|
||||
electron_1.ipcRenderer.on('accounts-updated', subscription);
|
||||
|
||||
@@ -68,23 +68,19 @@ class BackendService {
|
||||
loginName: account.loginName,
|
||||
steamLoginSecure: account.steamLoginSecure,
|
||||
loginConfig: account.loginConfig,
|
||||
sessionUpdatedAt: account.sessionUpdatedAt,
|
||||
lastMetadataCheck: account.lastBanCheck,
|
||||
lastScrapeTime: account.lastScrapeTime,
|
||||
cooldownExpiresAt: account.cooldownExpiresAt
|
||||
sessionUpdatedAt: account.sessionUpdatedAt
|
||||
}, { headers: this.headers });
|
||||
}
|
||||
catch (e) {
|
||||
console.error('[Backend] Failed to share account');
|
||||
}
|
||||
}
|
||||
async pushCooldown(steamId, cooldownExpiresAt, lastScrapeTime) {
|
||||
async pushCooldown(steamId, cooldownExpiresAt) {
|
||||
if (!this.token)
|
||||
return;
|
||||
try {
|
||||
await axios_1.default.patch(`${this.url}/api/sync/${steamId}/cooldown`, {
|
||||
cooldownExpiresAt,
|
||||
lastScrapeTime
|
||||
cooldownExpiresAt
|
||||
}, { headers: this.headers });
|
||||
}
|
||||
catch (e) {
|
||||
@@ -134,59 +130,5 @@ class BackendService {
|
||||
throw new Error(e.response?.data?.message || 'Failed to revoke all access');
|
||||
}
|
||||
}
|
||||
// --- Admin API ---
|
||||
async getAdminStats() {
|
||||
if (!this.token)
|
||||
return null;
|
||||
try {
|
||||
const response = await axios_1.default.get(`${this.url}/api/admin/stats`, { headers: this.headers });
|
||||
return response.data;
|
||||
}
|
||||
catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
async getAdminUsers() {
|
||||
if (!this.token)
|
||||
return [];
|
||||
try {
|
||||
const response = await axios_1.default.get(`${this.url}/api/admin/users`, { headers: this.headers });
|
||||
return response.data;
|
||||
}
|
||||
catch (e) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
async deleteUser(userId) {
|
||||
if (!this.token)
|
||||
return;
|
||||
try {
|
||||
await axios_1.default.delete(`${this.url}/api/admin/users/${userId}`, { headers: this.headers });
|
||||
}
|
||||
catch (e) {
|
||||
throw new Error(e.response?.data?.message || 'Failed to delete user');
|
||||
}
|
||||
}
|
||||
async getAdminAccounts() {
|
||||
if (!this.token)
|
||||
return [];
|
||||
try {
|
||||
const response = await axios_1.default.get(`${this.url}/api/admin/accounts`, { headers: this.headers });
|
||||
return response.data;
|
||||
}
|
||||
catch (e) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
async forceRemoveAccount(steamId) {
|
||||
if (!this.token)
|
||||
return;
|
||||
try {
|
||||
await axios_1.default.delete(`${this.url}/api/admin/accounts/${steamId}`, { headers: this.headers });
|
||||
}
|
||||
catch (e) {
|
||||
throw new Error(e.response?.data?.message || 'Failed to remove account');
|
||||
}
|
||||
}
|
||||
}
|
||||
exports.BackendService = BackendService;
|
||||
|
||||
@@ -36,17 +36,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.scrapeCooldown = exports.SteamAuthError = void 0;
|
||||
exports.scrapeCooldown = void 0;
|
||||
const axios_1 = __importDefault(require("axios"));
|
||||
const cheerio = __importStar(require("cheerio"));
|
||||
// Custom error to identify session death
|
||||
class SteamAuthError extends Error {
|
||||
constructor(message) {
|
||||
super(message);
|
||||
this.name = "SteamAuthError";
|
||||
}
|
||||
}
|
||||
exports.SteamAuthError = SteamAuthError;
|
||||
const scrapeCooldown = async (steamId, steamLoginSecure) => {
|
||||
const url = `https://steamcommunity.com/profiles/${steamId}/gcpd/730?tab=matchmaking`;
|
||||
try {
|
||||
@@ -55,38 +47,35 @@ const scrapeCooldown = async (steamId, steamLoginSecure) => {
|
||||
'Cookie': steamLoginSecure,
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
|
||||
},
|
||||
timeout: 10000,
|
||||
validateStatus: (status) => status < 500 // Allow redirects to handle them manually
|
||||
timeout: 10000
|
||||
});
|
||||
// If Steam redirects us to the login page, the cookie is dead
|
||||
if (response.data.includes('Sign In') || response.request.path.includes('/login')) {
|
||||
throw new SteamAuthError('Invalid or expired steamLoginSecure cookie');
|
||||
}
|
||||
const $ = cheerio.load(response.data);
|
||||
if (!response.data.includes('Personal Game Data')) {
|
||||
throw new SteamAuthError('Session invalid: Personal Game Data not accessible');
|
||||
if (response.data.includes('Sign In') || !response.data.includes('Personal Game Data')) {
|
||||
throw new Error('Invalid or expired steamLoginSecure cookie');
|
||||
}
|
||||
// 1. Locate the specific table containing cooldown info
|
||||
let expirationDate = undefined;
|
||||
$('table').each((_, table) => {
|
||||
const headers = $(table).find('th').map((_, th) => $(th).text().trim()).get();
|
||||
const expirationIndex = headers.findIndex(h => h.includes('Competitive Cooldown Expiration') || h.includes('Cooldown Expiration'));
|
||||
const expirationIndex = headers.findIndex(h => h.includes('Competitive Cooldown Expiration'));
|
||||
if (expirationIndex !== -1) {
|
||||
const rows = $(table).find('tr').not(':has(th)');
|
||||
rows.each((_, row) => {
|
||||
const dateText = $(row).find('td').eq(expirationIndex).text().trim();
|
||||
const firstRow = $(table).find('tr').not(':has(th)').first();
|
||||
const dateText = firstRow.find('td').eq(expirationIndex).text().trim();
|
||||
if (dateText && dateText !== '') {
|
||||
const cleanDateText = dateText.replace(' GMT', ' UTC');
|
||||
const parsed = new Date(cleanDateText);
|
||||
if (!isNaN(parsed.getTime())) {
|
||||
if (!expirationDate || parsed > expirationDate)
|
||||
expirationDate = parsed;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
if (expirationDate && expirationDate.getTime() > Date.now()) {
|
||||
return { isActive: true, expiresAt: expirationDate };
|
||||
console.log(`[Scraper] Found active cooldown until: ${expirationDate.toISOString()}`);
|
||||
return {
|
||||
isActive: true,
|
||||
expiresAt: expirationDate
|
||||
};
|
||||
}
|
||||
const content = $('#personal_game_data_content').text();
|
||||
if (content.includes('Competitive Cooldown') || content.includes('Your account is currently')) {
|
||||
@@ -95,10 +84,8 @@ const scrapeCooldown = async (steamId, steamLoginSecure) => {
|
||||
return { isActive: false };
|
||||
}
|
||||
catch (error) {
|
||||
if (error instanceof SteamAuthError)
|
||||
console.error(`[Scraper] Error for ${steamId}:`, error.message);
|
||||
throw error;
|
||||
console.error(`[Scraper] Network/Internal Error for ${steamId}:`, error.message);
|
||||
throw error; // Generic errors don't trigger re-auth
|
||||
}
|
||||
};
|
||||
exports.scrapeCooldown = scrapeCooldown;
|
||||
|
||||
@@ -21,8 +21,7 @@ class SteamClientService {
|
||||
if (platform === 'win32') {
|
||||
const possiblePaths = [
|
||||
'C:\\Program Files (x86)\\Steam',
|
||||
'C:\\Program Files\\Steam',
|
||||
path_1.default.join(process.env.APPDATA || '', 'Steam'),
|
||||
'C:\\Program Files\\Steam'
|
||||
];
|
||||
this.steamPath = possiblePaths.find(p => fs_1.default.existsSync(p)) || null;
|
||||
}
|
||||
@@ -30,8 +29,7 @@ class SteamClientService {
|
||||
const possiblePaths = [
|
||||
path_1.default.join(home, '.steam/steam'),
|
||||
path_1.default.join(home, '.local/share/Steam'),
|
||||
path_1.default.join(home, '.var/app/com.valvesoftware.Steam/.steam/steam'), // Flatpak
|
||||
path_1.default.join(home, 'snap/steam/common/.steam/steam'), // Snap
|
||||
path_1.default.join(home, '.var/app/com.valvesoftware.Steam/.steam/steam')
|
||||
];
|
||||
this.steamPath = possiblePaths.find(p => fs_1.default.existsSync(p)) || null;
|
||||
}
|
||||
@@ -49,29 +47,12 @@ class SteamClientService {
|
||||
return null;
|
||||
return path_1.default.join(this.steamPath, 'config', 'config.vdf');
|
||||
}
|
||||
safeWriteVdf(filePath, data) {
|
||||
const tempPath = `${filePath}.tmp_${Date.now()}`;
|
||||
const dir = path_1.default.dirname(filePath);
|
||||
try {
|
||||
if (!fs_1.default.existsSync(dir))
|
||||
fs_1.default.mkdirSync(dir, { recursive: true });
|
||||
const vdfContent = (0, simple_vdf_1.stringify)(data);
|
||||
fs_1.default.writeFileSync(tempPath, vdfContent, 'utf-8');
|
||||
fs_1.default.renameSync(tempPath, filePath);
|
||||
}
|
||||
catch (e) {
|
||||
console.error(`[SteamClient] Atomic write failed for ${filePath}: ${e.message}`);
|
||||
if (fs_1.default.existsSync(tempPath))
|
||||
fs_1.default.unlinkSync(tempPath);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
startWatching(callback) {
|
||||
this.onAccountsChanged = callback;
|
||||
const loginUsersPath = this.getLoginUsersPath();
|
||||
if (loginUsersPath && fs_1.default.existsSync(loginUsersPath)) {
|
||||
this.readLocalAccounts();
|
||||
chokidar_1.default.watch(loginUsersPath, { persistent: true, ignoreInitial: true }).on('change', () => {
|
||||
chokidar_1.default.watch(loginUsersPath, { persistent: true }).on('change', () => {
|
||||
this.readLocalAccounts();
|
||||
});
|
||||
}
|
||||
@@ -82,26 +63,25 @@ class SteamClientService {
|
||||
return;
|
||||
try {
|
||||
const content = fs_1.default.readFileSync(filePath, 'utf-8');
|
||||
if (!content.trim())
|
||||
return;
|
||||
const data = (0, simple_vdf_1.parse)(content);
|
||||
if (!data || !data.users)
|
||||
return;
|
||||
const accounts = [];
|
||||
for (const [steamId64, userData] of Object.entries(data.users)) {
|
||||
const user = userData;
|
||||
if (!user || !user.AccountName)
|
||||
continue;
|
||||
accounts.push({
|
||||
steamId: steamId64, accountName: user.AccountName,
|
||||
personaName: user.PersonaName || user.AccountName,
|
||||
steamId: steamId64,
|
||||
accountName: user.AccountName,
|
||||
personaName: user.PersonaName,
|
||||
timestamp: parseInt(user.Timestamp) || 0
|
||||
});
|
||||
}
|
||||
if (this.onAccountsChanged)
|
||||
this.onAccountsChanged(accounts);
|
||||
}
|
||||
catch (error) { }
|
||||
catch (error) {
|
||||
console.error('[SteamClient] Error parsing loginusers.vdf:', error);
|
||||
}
|
||||
}
|
||||
extractAccountConfig(accountName) {
|
||||
const configPath = this.getConfigVdfPath();
|
||||
@@ -111,60 +91,63 @@ class SteamClientService {
|
||||
const content = fs_1.default.readFileSync(configPath, 'utf-8');
|
||||
const data = (0, simple_vdf_1.parse)(content);
|
||||
const accounts = data?.InstallConfigStore?.Software?.Valve?.Steam?.Accounts;
|
||||
return (accounts && accounts[accountName]) ? accounts[accountName] : null;
|
||||
if (accounts && accounts[accountName]) {
|
||||
return accounts[accountName];
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
return null;
|
||||
console.error('[SteamClient] Failed to extract config.vdf data');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
injectAccountConfig(accountName, accountData) {
|
||||
const configPath = this.getConfigVdfPath();
|
||||
if (!configPath)
|
||||
return;
|
||||
// Create directory if it doesn't exist
|
||||
const configDir = path_1.default.dirname(configPath);
|
||||
if (!fs_1.default.existsSync(configDir))
|
||||
fs_1.default.mkdirSync(configDir, { recursive: true });
|
||||
let data = { InstallConfigStore: { Software: { Valve: { Steam: { Accounts: {} } } } } };
|
||||
if (fs_1.default.existsSync(configPath)) {
|
||||
try {
|
||||
const content = fs_1.default.readFileSync(configPath, 'utf-8');
|
||||
const parsed = (0, simple_vdf_1.parse)(content);
|
||||
if (parsed && typeof parsed === 'object')
|
||||
data = parsed;
|
||||
data = (0, simple_vdf_1.parse)(content);
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
const ensurePath = (obj, keys) => {
|
||||
let curr = obj;
|
||||
for (const key of keys) {
|
||||
if (!curr[key] || typeof curr[key] !== 'object')
|
||||
curr[key] = {};
|
||||
curr = curr[key];
|
||||
}
|
||||
return curr;
|
||||
};
|
||||
const steamAccounts = ensurePath(data, ['InstallConfigStore', 'Software', 'Valve', 'Steam', 'Accounts']);
|
||||
// FAILPROOF: Force crucial flags that Steam uses to decide session validity
|
||||
steamAccounts[accountName] = {
|
||||
...accountData,
|
||||
RememberPassword: "1",
|
||||
AllowAutoLogin: "1",
|
||||
Timestamp: Math.floor(Date.now() / 1000).toString()
|
||||
};
|
||||
// Ensure structure exists
|
||||
if (!data.InstallConfigStore)
|
||||
data.InstallConfigStore = {};
|
||||
if (!data.InstallConfigStore.Software)
|
||||
data.InstallConfigStore.Software = {};
|
||||
if (!data.InstallConfigStore.Software.Valve)
|
||||
data.InstallConfigStore.Software.Valve = {};
|
||||
if (!data.InstallConfigStore.Software.Valve.Steam)
|
||||
data.InstallConfigStore.Software.Valve.Steam = {};
|
||||
if (!data.InstallConfigStore.Software.Valve.Steam.Accounts)
|
||||
data.InstallConfigStore.Software.Valve.Steam.Accounts = {};
|
||||
data.InstallConfigStore.Software.Valve.Steam.Accounts[accountName] = accountData;
|
||||
try {
|
||||
this.safeWriteVdf(configPath, data);
|
||||
console.log(`[SteamClient] Safely injected session for ${accountName}`);
|
||||
fs_1.default.writeFileSync(configPath, (0, simple_vdf_1.stringify)(data));
|
||||
console.log(`[SteamClient] Injected login config for ${accountName} into config.vdf`);
|
||||
}
|
||||
catch (e) {
|
||||
console.error('[SteamClient] Failed to write config.vdf');
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
async setAutoLoginUser(accountName, accountConfig, steamId) {
|
||||
const platform = os_1.default.platform();
|
||||
const loginUsersPath = this.getLoginUsersPath();
|
||||
if (loginUsersPath) {
|
||||
const configDir = path_1.default.dirname(loginUsersPath);
|
||||
if (!fs_1.default.existsSync(configDir))
|
||||
fs_1.default.mkdirSync(configDir, { recursive: true });
|
||||
let data = { users: {} };
|
||||
if (fs_1.default.existsSync(loginUsersPath)) {
|
||||
try {
|
||||
const content = fs_1.default.readFileSync(loginUsersPath, 'utf-8');
|
||||
const parsed = (0, simple_vdf_1.parse)(content);
|
||||
if (parsed && parsed.users)
|
||||
data = parsed;
|
||||
data = (0, simple_vdf_1.parse)(content);
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
@@ -173,7 +156,7 @@ class SteamClientService {
|
||||
let found = false;
|
||||
for (const [id, user] of Object.entries(data.users)) {
|
||||
const u = user;
|
||||
if (u.AccountName?.toLowerCase() === accountName.toLowerCase()) {
|
||||
if (u.AccountName.toLowerCase() === accountName.toLowerCase()) {
|
||||
u.mostrecent = "1";
|
||||
u.RememberPassword = "1";
|
||||
u.AllowAutoLogin = "1";
|
||||
@@ -186,8 +169,8 @@ class SteamClientService {
|
||||
u.mostrecent = "0";
|
||||
}
|
||||
}
|
||||
if (!found && steamId && accountName) {
|
||||
console.log(`[SteamClient] Provisioning new user profile for ${accountName}`);
|
||||
if (!found && steamId) {
|
||||
console.log(`[SteamClient] Provisioning user ${accountName} into loginusers.vdf`);
|
||||
data.users[steamId] = {
|
||||
AccountName: accountName,
|
||||
PersonaName: accountName,
|
||||
@@ -201,49 +184,51 @@ class SteamClientService {
|
||||
};
|
||||
}
|
||||
try {
|
||||
this.safeWriteVdf(loginUsersPath, data);
|
||||
fs_1.default.writeFileSync(loginUsersPath, (0, simple_vdf_1.stringify)(data));
|
||||
}
|
||||
catch (e) { }
|
||||
catch (e) {
|
||||
console.error('[SteamClient] Failed to write loginusers.vdf');
|
||||
}
|
||||
// Injection of the actual authentication blob
|
||||
if (accountConfig && accountName) {
|
||||
}
|
||||
if (accountConfig) {
|
||||
this.injectAccountConfig(accountName, accountConfig);
|
||||
}
|
||||
// --- Linux Registry / Registry.vdf Hardening ---
|
||||
if (platform === 'linux') {
|
||||
const regLocations = [
|
||||
path_1.default.join(os_1.default.homedir(), '.steam', 'registry.vdf'),
|
||||
path_1.default.join(os_1.default.homedir(), '.steam', 'steam', 'registry.vdf')
|
||||
];
|
||||
for (const regPath of regLocations) {
|
||||
if (!fs_1.default.existsSync(path_1.default.dirname(regPath)))
|
||||
continue;
|
||||
let regData = { Registry: { HKCU: { Software: { Valve: { Steam: { AutoLoginUser: "", RememberPassword: "1", AlreadyLoggedIn: "1" } } } } } };
|
||||
let regData = { Registry: { HKCU: { Software: { Valve: { Steam: {} } } } } };
|
||||
if (fs_1.default.existsSync(regPath)) {
|
||||
try {
|
||||
const content = fs_1.default.readFileSync(regPath, 'utf-8');
|
||||
const parsed = (0, simple_vdf_1.parse)(content);
|
||||
if (parsed && typeof parsed === 'object')
|
||||
regData = parsed;
|
||||
regData = (0, simple_vdf_1.parse)(content);
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
const ensurePath = (obj, keys) => {
|
||||
let curr = obj;
|
||||
for (const key of keys) {
|
||||
if (!curr[key] || typeof curr[key] !== 'object')
|
||||
curr[key] = {};
|
||||
curr = curr[key];
|
||||
else {
|
||||
const regDir = path_1.default.dirname(regPath);
|
||||
if (!fs_1.default.existsSync(regDir))
|
||||
fs_1.default.mkdirSync(regDir, { recursive: true });
|
||||
}
|
||||
return curr;
|
||||
const setPath = (obj, keys, val) => {
|
||||
let curr = obj;
|
||||
for (let i = 0; i < keys.length - 1; i++) {
|
||||
if (!curr[keys[i]])
|
||||
curr[keys[i]] = {};
|
||||
curr = curr[keys[i]];
|
||||
}
|
||||
curr[keys[keys.length - 1]] = val;
|
||||
};
|
||||
const steamKey = ensurePath(regData, ['Registry', 'HKCU', 'Software', 'Valve', 'Steam']);
|
||||
steamKey.AutoLoginUser = accountName;
|
||||
steamKey.RememberPassword = "1";
|
||||
steamKey.AlreadyLoggedIn = "1";
|
||||
steamKey.WantsOfflineMode = "0";
|
||||
const steamReg = ['Registry', 'HKCU', 'Software', 'Valve', 'Steam'];
|
||||
setPath(regData, [...steamReg, 'AutoLoginUser'], accountName);
|
||||
setPath(regData, [...steamReg, 'RememberPassword'], "1");
|
||||
setPath(regData, [...steamReg, 'AlreadyLoggedIn'], "1");
|
||||
setPath(regData, [...steamReg, 'WantsOfflineMode'], "0");
|
||||
try {
|
||||
this.safeWriteVdf(regPath, regData);
|
||||
fs_1.default.writeFileSync(regPath, (0, simple_vdf_1.stringify)(regData));
|
||||
console.log(`[SteamClient] Registry updated: ${regPath}`);
|
||||
}
|
||||
catch (e) { }
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import axios from 'axios';
|
||||
import fs from 'fs';
|
||||
import { pathToFileURL } from 'url';
|
||||
import { fetchProfileData, scrapeBanStatus } from './services/steam-web';
|
||||
import { scrapeCooldown, SteamAuthError } from './services/scraper';
|
||||
import { scrapeCooldown } from './services/scraper';
|
||||
import { steamClient, LocalSteamAccount } from './services/steam-client';
|
||||
import { BackendService } from './services/backend';
|
||||
|
||||
@@ -40,7 +40,6 @@ interface Account {
|
||||
cooldownExpiresAt?: string;
|
||||
authError?: boolean;
|
||||
notes?: string;
|
||||
sharedWith?: any[];
|
||||
}
|
||||
|
||||
interface ServerConfig {
|
||||
@@ -49,7 +48,6 @@ interface ServerConfig {
|
||||
serverSteamId?: string;
|
||||
enabled: boolean;
|
||||
theme?: string;
|
||||
isAdmin?: boolean;
|
||||
}
|
||||
|
||||
// --- App State ---
|
||||
@@ -93,26 +91,10 @@ const initBackend = () => {
|
||||
|
||||
// --- System Tray ---
|
||||
const createTray = () => {
|
||||
// Try to find the icon in various standard locations
|
||||
const possiblePaths = [
|
||||
path.join(__dirname, '..', 'assets-build'), // Dev
|
||||
path.join(process.resourcesPath, 'assets-build'), // Packaged (External)
|
||||
path.join(app.getAppPath(), 'dist', 'assets-build'), // Packaged (Internal dist)
|
||||
path.join(app.getAppPath(), 'assets-build') // Packaged (Internal root)
|
||||
];
|
||||
|
||||
let assetsDir = '';
|
||||
for (const p of possiblePaths) {
|
||||
if (fs.existsSync(p)) {
|
||||
assetsDir = p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const possibleIcons = ['icon.png', 'icon.svg'];
|
||||
const assetsDir = path.join(__dirname, '..', 'assets-build');
|
||||
const possibleIcons = ['icon.svg', 'icon.png'];
|
||||
let iconPath = '';
|
||||
|
||||
if (assetsDir) {
|
||||
for (const name of possibleIcons) {
|
||||
const fullPath = path.join(assetsDir, name);
|
||||
if (fs.existsSync(fullPath)) {
|
||||
@@ -120,13 +102,11 @@ const createTray = () => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`[Tray] Resolved assets directory: ${assetsDir || 'NOT FOUND'}`);
|
||||
console.log(`[Tray] Attempting to initialize with icon: ${iconPath || 'NONE FOUND'}`);
|
||||
|
||||
if (!iconPath) {
|
||||
console.warn(`[Tray] FAILED: No valid icon found in searched paths.`);
|
||||
console.warn(`[Tray] FAILED: No valid icon found in ${assetsDir}`);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -134,22 +114,24 @@ const createTray = () => {
|
||||
const icon = nativeImage.createFromPath(iconPath).resize({ width: 16, height: 16 });
|
||||
tray = new Tray(icon);
|
||||
tray.setToolTip('Ultimate Ban Tracker');
|
||||
tray.on('click', () => { if (mainWindow) { mainWindow.show(); mainWindow.focus(); } });
|
||||
|
||||
// Load initial themed icon
|
||||
const config = store.get('serverConfig');
|
||||
if (config?.theme) {
|
||||
setAppIcon(config.theme);
|
||||
} else {
|
||||
updateTrayMenu(); // Fallback to refresh menu
|
||||
tray.on('click', () => {
|
||||
if (mainWindow) {
|
||||
mainWindow.show();
|
||||
mainWindow.focus();
|
||||
}
|
||||
});
|
||||
updateTrayMenu();
|
||||
console.log(`[Tray] Successfully initialized`);
|
||||
} catch (e: any) {
|
||||
console.error(`[Tray] Critical error during initialization: ${e.message}`);
|
||||
}
|
||||
} catch (e) { }
|
||||
};
|
||||
|
||||
const updateTrayMenu = () => {
|
||||
if (!tray) return;
|
||||
const accounts = store.get('accounts') as Account[];
|
||||
const config = store.get('serverConfig');
|
||||
|
||||
const contextMenu = Menu.buildFromTemplate([
|
||||
{ label: `Ultimate Ban Tracker v${app.getVersion()}`, enabled: false },
|
||||
{ type: 'separator' },
|
||||
@@ -161,33 +143,19 @@ const updateTrayMenu = () => {
|
||||
click: () => handleSwitchAccount(acc.loginName)
|
||||
})) : [{ label: 'No accounts found', enabled: false }]
|
||||
},
|
||||
{ label: 'Sync Now', enabled: !!config?.enabled, click: () => syncAccounts(true) },
|
||||
{
|
||||
label: 'Sync Now',
|
||||
enabled: !!config?.enabled,
|
||||
click: () => syncAccounts()
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ label: 'Show Dashboard', click: () => { if (mainWindow) mainWindow.show(); } },
|
||||
{ label: 'Quit', click: () => { (app as any).isQuitting = true; app.quit(); } }
|
||||
]);
|
||||
|
||||
tray.setContextMenu(contextMenu);
|
||||
};
|
||||
|
||||
const setAppIcon = (themeName: string = 'steam') => {
|
||||
const assetsDir = path.join(__dirname, '..', 'assets-build', 'icons');
|
||||
const iconPath = path.join(assetsDir, `${themeName}.svg`);
|
||||
|
||||
if (!fs.existsSync(iconPath)) return;
|
||||
|
||||
const icon = nativeImage.createFromPath(iconPath);
|
||||
|
||||
// Update Tray
|
||||
if (tray) {
|
||||
tray.setImage(icon.resize({ width: 16, height: 16 }));
|
||||
}
|
||||
|
||||
// Update Main Window
|
||||
if (mainWindow) {
|
||||
mainWindow.setIcon(icon);
|
||||
}
|
||||
};
|
||||
|
||||
// --- Steam Logic ---
|
||||
const killSteam = async () => {
|
||||
return new Promise<void>((resolve) => {
|
||||
@@ -220,53 +188,8 @@ const handleSwitchAccount = async (loginName: string) => {
|
||||
} catch (e) { return false; }
|
||||
};
|
||||
|
||||
// --- Scraper Helper ---
|
||||
const scrapeAccountData = async (account: Account) => {
|
||||
const now = new Date();
|
||||
try {
|
||||
const profile = await fetchProfileData(account.steamId, account.steamLoginSecure);
|
||||
const bans = await scrapeBanStatus(profile.profileUrl, account.steamLoginSecure);
|
||||
account.personaName = profile.personaName; account.profileUrl = profile.profileUrl;
|
||||
account.vacBanned = bans.vacBanned; account.gameBans = bans.gameBans;
|
||||
account.status = (bans.vacBanned || bans.gameBans > 0) ? 'banned' : 'none';
|
||||
account.lastBanCheck = now.toISOString();
|
||||
if (profile.avatar && (!account.localAvatar || profile.avatar !== account.avatar)) {
|
||||
account.avatar = profile.avatar;
|
||||
const localPath = await downloadAvatar(account.steamId, profile.avatar);
|
||||
if (localPath) account.localAvatar = localPath;
|
||||
}
|
||||
if (account.steamLoginSecure) {
|
||||
try {
|
||||
const result = await scrapeCooldown(account.steamId, account.steamLoginSecure);
|
||||
account.authError = false; account.lastScrapeTime = now.toISOString();
|
||||
if (result.isActive) {
|
||||
account.cooldownExpiresAt = result.expiresAt ? result.expiresAt.toISOString() : new Date(Date.now() + 86400000).toISOString();
|
||||
if (backend) await backend.pushCooldown(account.steamId, account.cooldownExpiresAt, now.toISOString());
|
||||
} else {
|
||||
account.cooldownExpiresAt = undefined;
|
||||
if (backend) await backend.pushCooldown(account.steamId, undefined, now.toISOString());
|
||||
}
|
||||
} catch (e: any) {
|
||||
if (e instanceof SteamAuthError) {
|
||||
account.authError = true;
|
||||
} else {
|
||||
console.error(`[Scraper] Temporary error for ${account.personaName}: ${e.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (backend && !account._id.startsWith('shared_')) {
|
||||
await backend.shareAccount(account);
|
||||
}
|
||||
return true;
|
||||
} catch (e) {
|
||||
console.error(`[Scraper] Failed to scrape ${account.personaName}:`, e);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
// --- Sync Worker ---
|
||||
const syncAccounts = async (isManual = false) => {
|
||||
console.log(`[Sync] Phase 1: Pulling from server...`);
|
||||
const syncAccounts = async () => {
|
||||
initBackend();
|
||||
let accounts = store.get('accounts') as Account[];
|
||||
let hasChanges = false;
|
||||
@@ -278,66 +201,26 @@ const syncAccounts = async (isManual = false) => {
|
||||
const exists = accounts.find(a => a.steamId === s.steamId);
|
||||
if (!exists) {
|
||||
accounts.push({
|
||||
_id: `shared_${s.steamId}`, steamId: s.steamId, personaName: s.personaName,
|
||||
avatar: s.avatar, profileUrl: s.profileUrl, vacBanned: s.vacBanned,
|
||||
gameBans: s.gameBans, cooldownExpiresAt: s.cooldownExpiresAt,
|
||||
loginName: s.loginName || '', steamLoginSecure: s.steamLoginSecure,
|
||||
loginConfig: s.loginConfig, sessionUpdatedAt: s.sessionUpdatedAt,
|
||||
autoCheckCooldown: !!s.steamLoginSecure, status: (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none',
|
||||
lastBanCheck: new Date().toISOString(), sharedWith: s.sharedWith
|
||||
_id: `shared_${s.steamId}`,
|
||||
steamId: s.steamId, personaName: s.personaName, avatar: s.avatar, profileUrl: s.profileUrl,
|
||||
vacBanned: s.vacBanned, gameBans: s.gameBans, cooldownExpiresAt: s.cooldownExpiresAt,
|
||||
loginName: s.loginName || '', steamLoginSecure: s.steamLoginSecure, loginConfig: s.loginConfig,
|
||||
sessionUpdatedAt: s.sessionUpdatedAt, autoCheckCooldown: !!s.steamLoginSecure,
|
||||
status: (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none', lastBanCheck: new Date().toISOString()
|
||||
});
|
||||
hasChanges = true;
|
||||
} else {
|
||||
const sDate = s.sessionUpdatedAt ? new Date(s.sessionUpdatedAt) : new Date(0);
|
||||
const lDate = exists.sessionUpdatedAt ? new Date(exists.sessionUpdatedAt) : new Date(0);
|
||||
// 1. SENSITIVE DATA SYNC (Credentials)
|
||||
const sSessionDate = s.sessionUpdatedAt ? new Date(s.sessionUpdatedAt) : new Date(0);
|
||||
const lSessionDate = exists.sessionUpdatedAt ? new Date(exists.sessionUpdatedAt) : new Date(0);
|
||||
|
||||
const isLocalAccount = !exists._id.startsWith('shared_');
|
||||
const isLocalSessionHealthy = exists.steamLoginSecure && !exists.authError;
|
||||
|
||||
// SMART OVERWRITE LOGIC:
|
||||
// - If it's a remote shared account: Newest wins.
|
||||
// - If it's a LOCAL account: Only overwrite if our local session is broken/missing.
|
||||
const shouldOverwriteCredentials = !isLocalAccount ? (sSessionDate > lSessionDate) : (!isLocalSessionHealthy && sSessionDate > lSessionDate);
|
||||
|
||||
if (shouldOverwriteCredentials) {
|
||||
if (sDate > lDate) {
|
||||
if (s.loginName) exists.loginName = s.loginName;
|
||||
if (s.loginConfig) exists.loginConfig = s.loginConfig;
|
||||
if (s.steamLoginSecure) {
|
||||
exists.steamLoginSecure = s.steamLoginSecure;
|
||||
exists.autoCheckCooldown = true;
|
||||
exists.authError = false;
|
||||
}
|
||||
if (s.steamLoginSecure) { exists.steamLoginSecure = s.steamLoginSecure; exists.autoCheckCooldown = true; exists.authError = false; }
|
||||
exists.sessionUpdatedAt = s.sessionUpdatedAt;
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
// 2. Metadata Sync (Pull) - Always "Newest Wins"
|
||||
const sMetaDate = s.lastMetadataCheck ? new Date(s.lastMetadataCheck) : new Date(0);
|
||||
const lMetaDate = exists.lastBanCheck ? new Date(exists.lastBanCheck) : new Date(0);
|
||||
if (sMetaDate > lMetaDate) {
|
||||
exists.personaName = s.personaName;
|
||||
exists.avatar = s.avatar;
|
||||
exists.vacBanned = s.vacBanned;
|
||||
exists.gameBans = s.gameBans;
|
||||
exists.status = (s.vacBanned || s.gameBans > 0) ? 'banned' : 'none';
|
||||
exists.lastBanCheck = s.lastMetadataCheck;
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
// Cooldown Sync (Pull)
|
||||
const sScrapeDate = s.lastScrapeTime ? new Date(s.lastScrapeTime) : new Date(0);
|
||||
const lScrapeDate = exists.lastScrapeTime ? new Date(exists.lastScrapeTime) : new Date(0);
|
||||
if (sScrapeDate > lScrapeDate) {
|
||||
if (s.cooldownExpiresAt && (!exists.cooldownExpiresAt || new Date(s.cooldownExpiresAt) > new Date(exists.cooldownExpiresAt))) {
|
||||
exists.cooldownExpiresAt = s.cooldownExpiresAt;
|
||||
exists.lastScrapeTime = s.lastScrapeTime;
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
if (JSON.stringify(exists.sharedWith) !== JSON.stringify(s.sharedWith)) {
|
||||
exists.sharedWith = s.sharedWith;
|
||||
hasChanges = true;
|
||||
}
|
||||
}
|
||||
@@ -351,39 +234,68 @@ const syncAccounts = async (isManual = false) => {
|
||||
updateTrayMenu();
|
||||
}
|
||||
|
||||
// Phase 2: Background Scrapes
|
||||
const runScrapes = async () => {
|
||||
console.log(`[Sync] Phase 2: Starting background checks for ${accounts.length} accounts...`);
|
||||
const currentAccounts = [...store.get('accounts') as Account[]];
|
||||
if (accounts.length === 0) return;
|
||||
|
||||
const updatedAccounts = [...accounts];
|
||||
let scrapeChanges = false;
|
||||
for (const account of currentAccounts) {
|
||||
|
||||
for (const account of updatedAccounts) {
|
||||
try {
|
||||
const now = new Date();
|
||||
if (backend && !account._id.startsWith('shared_')) await backend.shareAccount(account);
|
||||
const lastCheck = account.lastBanCheck ? new Date(account.lastBanCheck) : new Date(0);
|
||||
const lastScrape = account.lastScrapeTime ? new Date(account.lastScrapeTime) : new Date(0);
|
||||
const needsMetadata = (now.getTime() - lastCheck.getTime()) / 3600000 > 6 || !account.personaName;
|
||||
const needsCooldown = account.autoCheckCooldown && account.steamLoginSecure && (now.getTime() - lastScrape.getTime()) / 3600000 > 8;
|
||||
if ((now.getTime() - lastCheck.getTime()) / 3600000 > 6 || !account.personaName) {
|
||||
const profile = await fetchProfileData(account.steamId, account.steamLoginSecure);
|
||||
const bans = await scrapeBanStatus(profile.profileUrl, account.steamLoginSecure);
|
||||
account.personaName = profile.personaName; account.profileUrl = profile.profileUrl;
|
||||
account.vacBanned = bans.vacBanned; account.gameBans = bans.gameBans;
|
||||
account.status = (bans.vacBanned || bans.gameBans > 0) ? 'banned' : 'none';
|
||||
account.lastBanCheck = now.toISOString();
|
||||
if (profile.avatar && (!account.localAvatar || profile.avatar !== account.avatar)) {
|
||||
account.avatar = profile.avatar;
|
||||
const localPath = await downloadAvatar(account.steamId, profile.avatar);
|
||||
if (localPath) account.localAvatar = localPath;
|
||||
}
|
||||
if (account.loginName) {
|
||||
const config = steamClient.extractAccountConfig(account.loginName);
|
||||
if (config) { account.loginConfig = config; account.sessionUpdatedAt = new Date().toISOString(); }
|
||||
}
|
||||
if (backend) await backend.shareAccount(account);
|
||||
scrapeChanges = true;
|
||||
}
|
||||
|
||||
if (needsMetadata || needsCooldown || isManual) {
|
||||
if (!isManual && needsCooldown) await new Promise(r => setTimeout(r, Math.floor(Math.random() * 30000) + 5000));
|
||||
if (await scrapeAccountData(account)) scrapeChanges = true;
|
||||
if (account.autoCheckCooldown && account.steamLoginSecure) {
|
||||
if (account.cooldownExpiresAt && new Date(account.cooldownExpiresAt) > now) continue;
|
||||
const lastScrape = account.lastScrapeTime ? new Date(account.lastScrapeTime) : new Date(0);
|
||||
if ((now.getTime() - lastScrape.getTime()) / 3600000 > 8) {
|
||||
await new Promise(r => setTimeout(r, Math.floor(Math.random() * 60000) + 5000));
|
||||
try {
|
||||
const result = await scrapeCooldown(account.steamId, account.steamLoginSecure);
|
||||
account.authError = false; account.lastScrapeTime = new Date().toISOString();
|
||||
if (result.isActive) {
|
||||
account.cooldownExpiresAt = result.expiresAt ? result.expiresAt.toISOString() : new Date(Date.now() + 86400000).toISOString();
|
||||
if (backend) await backend.pushCooldown(account.steamId, account.cooldownExpiresAt);
|
||||
} else if (account.cooldownExpiresAt) {
|
||||
account.cooldownExpiresAt = undefined;
|
||||
if (backend) await backend.pushCooldown(account.steamId, undefined);
|
||||
}
|
||||
scrapeChanges = true;
|
||||
} catch (e: any) {
|
||||
if (e.message.includes('cookie') || e.message.includes('Sign In')) { account.authError = true; scrapeChanges = true; }
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (error) { }
|
||||
}
|
||||
|
||||
if (scrapeChanges) {
|
||||
store.set('accounts', currentAccounts);
|
||||
if (mainWindow) mainWindow.webContents.send('accounts-updated', currentAccounts);
|
||||
store.set('accounts', updatedAccounts);
|
||||
if (mainWindow) mainWindow.webContents.send('accounts-updated', updatedAccounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
console.log('[Sync] Sync cycle finished.');
|
||||
};
|
||||
|
||||
if (isManual) await runScrapes(); else runScrapes();
|
||||
};
|
||||
|
||||
const scheduleNextSync = () => {
|
||||
setTimeout(async () => { await syncAccounts(false); scheduleNextSync(); }, isDev ? 300000 : 1800000);
|
||||
setTimeout(async () => { await syncAccounts(); scheduleNextSync(); }, isDev ? 120000 : 1800000);
|
||||
};
|
||||
|
||||
// --- Discovery ---
|
||||
@@ -402,21 +314,11 @@ const handleLocalAccountsFound = async (localAccounts: LocalSteamAccount[]) => {
|
||||
const profile = await fetchProfileData(local.steamId);
|
||||
const bans = await scrapeBanStatus(profile.profileUrl);
|
||||
const localPath = await downloadAvatar(profile.steamId, profile.avatar);
|
||||
|
||||
// Wait and retry snagging the config (Steam takes time to write it)
|
||||
let loginConfig = undefined;
|
||||
for (let i = 0; i < 3; i++) {
|
||||
await new Promise(r => setTimeout(r, 2000));
|
||||
loginConfig = steamClient.extractAccountConfig(local.accountName);
|
||||
if (loginConfig) break;
|
||||
}
|
||||
|
||||
currentAccounts.push({
|
||||
_id: Date.now().toString() + Math.random().toString().slice(2, 5),
|
||||
steamId: local.steamId, personaName: profile.personaName || local.accountName,
|
||||
loginName: local.accountName, autoCheckCooldown: false, avatar: profile.avatar,
|
||||
localAvatar: localPath, profileUrl: profile.profileUrl,
|
||||
loginConfig, sessionUpdatedAt: loginConfig ? new Date().toISOString() : undefined,
|
||||
status: (bans.vacBanned || bans.gameBans > 0) ? 'banned' : 'none',
|
||||
vacBanned: bans.vacBanned, gameBans: bans.gameBans, lastBanCheck: new Date().toISOString()
|
||||
});
|
||||
@@ -432,21 +334,28 @@ const handleLocalAccountsFound = async (localAccounts: LocalSteamAccount[]) => {
|
||||
}
|
||||
};
|
||||
|
||||
// --- Main Window ---
|
||||
// --- Main Window Creation ---
|
||||
function createWindow() {
|
||||
mainWindow = new BrowserWindow({
|
||||
width: 1280, height: 800, title: "Ultimate Ban Tracker", backgroundColor: '#171a21', autoHideMenuBar: true,
|
||||
webPreferences: { preload: path.join(__dirname, 'preload.js'), nodeIntegration: false, contextIsolation: true }
|
||||
});
|
||||
|
||||
mainWindow.setMenu(null);
|
||||
|
||||
mainWindow.on('close', (event) => {
|
||||
if (!(app as any).isQuitting) { event.preventDefault(); mainWindow?.hide(); }
|
||||
if (!(app as any).isQuitting) {
|
||||
event.preventDefault();
|
||||
mainWindow?.hide();
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
if (isDev) mainWindow.loadURL('http://localhost:5173');
|
||||
else mainWindow.loadFile(path.join(__dirname, '..', 'dist', 'index.html'));
|
||||
}
|
||||
|
||||
// --- App Lifecycle ---
|
||||
app.whenReady().then(() => {
|
||||
protocol.handle('steam-resource', (request) => {
|
||||
let rawPath = decodeURIComponent(request.url.replace('steam-resource://', ''));
|
||||
@@ -455,10 +364,11 @@ app.whenReady().then(() => {
|
||||
if (!fs.existsSync(absolutePath)) return new Response('Not Found', { status: 404 });
|
||||
try { return net.fetch(pathToFileURL(absolutePath).toString()); } catch (e) { return new Response('Error', { status: 500 }); }
|
||||
});
|
||||
|
||||
createWindow();
|
||||
createTray();
|
||||
initBackend();
|
||||
setTimeout(() => syncAccounts(false), 5000);
|
||||
setTimeout(syncAccounts, 5000);
|
||||
scheduleNextSync();
|
||||
steamClient.startWatching(handleLocalAccountsFound);
|
||||
});
|
||||
@@ -483,20 +393,17 @@ ipcMain.handle('login-to-server', async () => {
|
||||
if (!config.url) return false;
|
||||
return new Promise<boolean>((resolve) => {
|
||||
const authWindow = new BrowserWindow({
|
||||
width: 800, height: 700, parent: mainWindow || undefined, modal: true, title: 'Login to Server',
|
||||
width: 800, height: 700, parent: mainWindow || undefined, modal: true, title: 'Login to Ban Tracker Server',
|
||||
webPreferences: { nodeIntegration: false, contextIsolation: true }
|
||||
});
|
||||
authWindow.loadURL(`${config.url}/auth/steam`);
|
||||
let captured = false;
|
||||
const saveServerAuth = (token: string) => {
|
||||
if (captured) return; captured = true;
|
||||
let serverSteamId = undefined; let isAdmin = false;
|
||||
try {
|
||||
const payload = JSON.parse(Buffer.from(token.split('.')[1]!, 'base64').toString());
|
||||
serverSteamId = payload.steamId; isAdmin = !!payload.isAdmin;
|
||||
} catch (e) {}
|
||||
let serverSteamId = undefined;
|
||||
try { const payload = JSON.parse(Buffer.from(token.split('.')[1]!, 'base64').toString()); serverSteamId = payload.steamId; } catch (e) {}
|
||||
const current = store.get('serverConfig');
|
||||
store.set('serverConfig', { ...current, token, serverSteamId, isAdmin, enabled: true });
|
||||
store.set('serverConfig', { ...current, token, serverSteamId, enabled: true });
|
||||
initBackend();
|
||||
authWindow.close();
|
||||
resolve(true);
|
||||
@@ -516,21 +423,7 @@ ipcMain.handle('login-to-server', async () => {
|
||||
});
|
||||
|
||||
ipcMain.handle('get-server-user-info', () => ({ steamId: store.get('serverConfig').serverSteamId }));
|
||||
ipcMain.handle('sync-now', async () => { await syncAccounts(true); return true; });
|
||||
|
||||
ipcMain.handle('scrape-account', async (event, steamId: string) => {
|
||||
const accounts = store.get('accounts') as Account[];
|
||||
const account = accounts.find(a => a.steamId === steamId);
|
||||
if (!account) return false;
|
||||
const success = await scrapeAccountData(account);
|
||||
if (success) {
|
||||
store.set('accounts', accounts);
|
||||
if (mainWindow) mainWindow.webContents.send('accounts-updated', accounts);
|
||||
updateTrayMenu();
|
||||
}
|
||||
return success;
|
||||
});
|
||||
|
||||
ipcMain.handle('sync-now', async () => { await syncAccounts(); return true; });
|
||||
ipcMain.handle('add-account', async (event, { identifier }) => {
|
||||
try {
|
||||
initBackend();
|
||||
@@ -547,7 +440,7 @@ ipcMain.handle('add-account', async (event, { identifier }) => {
|
||||
loginName: existing.loginName || '', steamLoginSecure: existing.steamLoginSecure,
|
||||
loginConfig: existing.loginConfig, sessionUpdatedAt: existing.sessionUpdatedAt,
|
||||
autoCheckCooldown: !!existing.steamLoginSecure, status: (existing.vacBanned || existing.gameBans > 0) ? 'banned' : 'none',
|
||||
lastBanCheck: new Date().toISOString(), sharedWith: existing.sharedWith
|
||||
lastBanCheck: new Date().toISOString()
|
||||
};
|
||||
store.set('accounts', [...accounts, newAccount]);
|
||||
updateTrayMenu();
|
||||
@@ -609,89 +502,64 @@ ipcMain.handle('revoke-all-account-access', async (event, steamId: string) => {
|
||||
|
||||
ipcMain.handle('get-community-accounts', async () => { initBackend(); return backend ? await backend.getCommunityAccounts() : []; });
|
||||
ipcMain.handle('get-server-users', async () => { initBackend(); return backend ? await backend.getServerUsers() : []; });
|
||||
|
||||
// --- Admin IPC ---
|
||||
ipcMain.handle('admin-get-stats', async () => { initBackend(); return backend ? await backend.getAdminStats() : null; });
|
||||
ipcMain.handle('admin-get-users', async () => { initBackend(); return backend ? await backend.getAdminUsers() : []; });
|
||||
ipcMain.handle('admin-delete-user', async (event, userId: string) => { initBackend(); if (backend) await backend.deleteUser(userId); return true; });
|
||||
ipcMain.handle('admin-get-accounts', async () => { initBackend(); return backend ? await backend.getAdminAccounts() : []; });
|
||||
ipcMain.handle('admin-remove-account', async (event, steamId: string) => { initBackend(); if (backend) await backend.forceRemoveAccount(steamId); return true; });
|
||||
|
||||
ipcMain.handle('force-sync', async () => { await syncAccounts(true); return true; });
|
||||
|
||||
ipcMain.handle('update-app-icon', (event, themeName: string) => {
|
||||
setAppIcon(themeName);
|
||||
return true;
|
||||
});
|
||||
|
||||
ipcMain.handle('switch-account', async (event, loginName: string) => {
|
||||
if (!loginName) return false;
|
||||
try {
|
||||
// PROACTIVE SYNC: Try to snag the freshest token before we kill Steam
|
||||
const accounts = store.get('accounts') as Account[];
|
||||
const account = accounts.find(a => a.loginName === loginName);
|
||||
if (account && !account._id.startsWith('shared_')) {
|
||||
const freshConfig = steamClient.extractAccountConfig(loginName);
|
||||
if (freshConfig) {
|
||||
account.loginConfig = freshConfig;
|
||||
account.sessionUpdatedAt = new Date().toISOString();
|
||||
if (backend) await backend.shareAccount(account);
|
||||
store.set('accounts', accounts);
|
||||
}
|
||||
}
|
||||
|
||||
await killSteam();
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
const regBase = 'reg add "HKCU\\Software\\Valve\\Steam"';
|
||||
const commands = [
|
||||
`${regBase} /v AutoLoginUser /t REG_SZ /d "${loginName}" /f`,
|
||||
`${regBase} /v RememberPassword /t REG_DWORD /d 1 /f`,
|
||||
`${regBase} /v AlreadyLoggedIn /t REG_DWORD /d 1 /f`,
|
||||
`${regBase} /v WantsOfflineMode /t REG_DWORD /d 0 /f`
|
||||
];
|
||||
await new Promise<void>((res, rej) => exec(commands.join(' && '), (e) => e ? rej(e) : res()));
|
||||
if (account && account.loginConfig) steamClient.injectAccountConfig(loginName, account.loginConfig);
|
||||
} else if (process.platform === 'linux') {
|
||||
await steamClient.setAutoLoginUser(loginName, account?.loginConfig, account?.steamId);
|
||||
}
|
||||
startSteam();
|
||||
return true;
|
||||
} catch (e) { return false; }
|
||||
});
|
||||
|
||||
ipcMain.handle('switch-account', async (event, loginName: string) => await handleSwitchAccount(loginName));
|
||||
ipcMain.handle('open-external', (event, url: string) => shell.openExternal(url));
|
||||
|
||||
ipcMain.handle('open-steam-app-login', async () => {
|
||||
console.log('[SteamClient] Preparing for fresh login...');
|
||||
await killSteam();
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
// Clear auto-login registry
|
||||
const clearReg = 'reg add "HKCU\\Software\\Valve\\Steam" /v AutoLoginUser /t REG_SZ /d "" /f';
|
||||
await new Promise<void>((res) => exec(clearReg, () => res()));
|
||||
} else if (process.platform === 'linux') {
|
||||
// On Linux we can use the steamClient helper to set an empty user
|
||||
await steamClient.setAutoLoginUser("", undefined, "");
|
||||
}
|
||||
|
||||
const command = process.platform === 'win32' ? 'start steam://open/login' : 'xdg-open steam://open/login';
|
||||
exec(command);
|
||||
return true;
|
||||
});
|
||||
|
||||
ipcMain.handle('open-steam-login', async (event, expectedSteamId: string) => {
|
||||
// Use a unique partition per account to prevent session bleeding
|
||||
const partitionId = expectedSteamId ? `persist:steam-login-${expectedSteamId}` : 'persist:steam-login-new';
|
||||
const loginSession = session.fromPartition(partitionId);
|
||||
if (!expectedSteamId) await loginSession.clearStorageData({ storages: ['cookies', 'localstorage', 'indexdb'] });
|
||||
|
||||
// If adding a brand new account, explicitly clear previous trash
|
||||
if (!expectedSteamId) {
|
||||
console.log('[Auth] Clearing session for new account login...');
|
||||
await loginSession.clearStorageData({ storages: ['cookies', 'localstorage', 'indexdb'] });
|
||||
}
|
||||
|
||||
// If we have an existing cookie string for this account, pre-inject it
|
||||
if (expectedSteamId) {
|
||||
const accounts = store.get('accounts') as Account[];
|
||||
const account = accounts.find(a => a.steamId === expectedSteamId);
|
||||
if (account?.steamLoginSecure) {
|
||||
console.log(`[Auth] Pre-injecting existing cookies for ${account.personaName}...`);
|
||||
const cookiePairs = account.steamLoginSecure.split(';').map(c => c.trim());
|
||||
for (const pair of cookiePairs) {
|
||||
const [name, value] = pair.split('=');
|
||||
if (name && value) {
|
||||
try { await loginSession.cookies.set({ url: 'https://steamcommunity.com', domain: 'steamcommunity.com', name, value, path: '/', secure: true, httpOnly: name.includes('Secure') }); } catch (e) {}
|
||||
try {
|
||||
await loginSession.cookies.set({
|
||||
url: 'https://steamcommunity.com',
|
||||
domain: 'steamcommunity.com',
|
||||
name: name,
|
||||
value: value,
|
||||
path: '/',
|
||||
secure: true,
|
||||
httpOnly: name.includes('Secure')
|
||||
});
|
||||
} catch (e) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return new Promise<boolean>((resolve) => {
|
||||
const loginWindow = new BrowserWindow({
|
||||
width: 800, height: 700, parent: mainWindow || undefined, modal: true, title: 'Login to Steam',
|
||||
|
||||
@@ -10,7 +10,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
revokeAccountAccess: (steamId: string, targetSteamId: string) => ipcRenderer.invoke('revoke-account-access', steamId, targetSteamId),
|
||||
revokeAllAccountAccess: (steamId: string) => ipcRenderer.invoke('revoke-all-account-access', steamId),
|
||||
openExternal: (url: string) => ipcRenderer.invoke('open-external', url),
|
||||
updateAppIcon: (theme: string) => ipcRenderer.invoke('update-app-icon', theme),
|
||||
openSteamAppLogin: () => ipcRenderer.invoke('open-steam-app-login'),
|
||||
openSteamLogin: (steamId: string) => ipcRenderer.invoke('open-steam-login', steamId),
|
||||
|
||||
@@ -20,17 +19,9 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
loginToServer: () => ipcRenderer.invoke('login-to-server'),
|
||||
getServerUserInfo: () => ipcRenderer.invoke('get-server-user-info'),
|
||||
syncNow: () => ipcRenderer.invoke('sync-now'),
|
||||
scrapeAccount: (steamId: string) => ipcRenderer.invoke('scrape-account', steamId),
|
||||
getCommunityAccounts: () => ipcRenderer.invoke('get-community-accounts'),
|
||||
getServerUsers: () => ipcRenderer.invoke('get-server-users'),
|
||||
|
||||
// Admin API
|
||||
adminGetStats: () => ipcRenderer.invoke('admin-get-stats'),
|
||||
adminGetUsers: () => ipcRenderer.invoke('admin-get-users'),
|
||||
adminDeleteUser: (userId: string) => ipcRenderer.invoke('admin-delete-user', userId),
|
||||
adminGetAccounts: () => ipcRenderer.invoke('admin-get-accounts'),
|
||||
adminRemoveAccount: (steamId: string) => ipcRenderer.invoke('admin-remove-account', steamId),
|
||||
|
||||
onAccountsUpdated: (callback: (accounts: any[]) => void) => {
|
||||
const subscription = (_event: IpcRendererEvent, accounts: any[]) => callback(accounts);
|
||||
ipcRenderer.on('accounts-updated', subscription);
|
||||
|
||||
@@ -62,22 +62,18 @@ export class BackendService {
|
||||
loginName: account.loginName,
|
||||
steamLoginSecure: account.steamLoginSecure,
|
||||
loginConfig: account.loginConfig,
|
||||
sessionUpdatedAt: account.sessionUpdatedAt,
|
||||
lastMetadataCheck: account.lastBanCheck,
|
||||
lastScrapeTime: account.lastScrapeTime,
|
||||
cooldownExpiresAt: account.cooldownExpiresAt
|
||||
sessionUpdatedAt: account.sessionUpdatedAt
|
||||
}, { headers: this.headers });
|
||||
} catch (e) {
|
||||
console.error('[Backend] Failed to share account');
|
||||
}
|
||||
}
|
||||
|
||||
public async pushCooldown(steamId: string, cooldownExpiresAt?: string, lastScrapeTime?: string) {
|
||||
public async pushCooldown(steamId: string, cooldownExpiresAt?: string) {
|
||||
if (!this.token) return;
|
||||
try {
|
||||
await axios.patch(`${this.url}/api/sync/${steamId}/cooldown`, {
|
||||
cooldownExpiresAt,
|
||||
lastScrapeTime
|
||||
cooldownExpiresAt
|
||||
}, { headers: this.headers });
|
||||
} catch (e) {
|
||||
console.error(`[Backend] Failed to push cooldown for ${steamId}`);
|
||||
@@ -123,48 +119,4 @@ export class BackendService {
|
||||
throw new Error(e.response?.data?.message || 'Failed to revoke all access');
|
||||
}
|
||||
}
|
||||
|
||||
// --- Admin API ---
|
||||
|
||||
public async getAdminStats() {
|
||||
if (!this.token) return null;
|
||||
try {
|
||||
const response = await axios.get(`${this.url}/api/admin/stats`, { headers: this.headers });
|
||||
return response.data;
|
||||
} catch (e) { return null; }
|
||||
}
|
||||
|
||||
public async getAdminUsers() {
|
||||
if (!this.token) return [];
|
||||
try {
|
||||
const response = await axios.get(`${this.url}/api/admin/users`, { headers: this.headers });
|
||||
return response.data;
|
||||
} catch (e) { return []; }
|
||||
}
|
||||
|
||||
public async deleteUser(userId: string) {
|
||||
if (!this.token) return;
|
||||
try {
|
||||
await axios.delete(`${this.url}/api/admin/users/${userId}`, { headers: this.headers });
|
||||
} catch (e: any) {
|
||||
throw new Error(e.response?.data?.message || 'Failed to delete user');
|
||||
}
|
||||
}
|
||||
|
||||
public async getAdminAccounts() {
|
||||
if (!this.token) return [];
|
||||
try {
|
||||
const response = await axios.get(`${this.url}/api/admin/accounts`, { headers: this.headers });
|
||||
return response.data;
|
||||
} catch (e) { return []; }
|
||||
}
|
||||
|
||||
public async forceRemoveAccount(steamId: string) {
|
||||
if (!this.token) return;
|
||||
try {
|
||||
await axios.delete(`${this.url}/api/admin/accounts/${steamId}`, { headers: this.headers });
|
||||
} catch (e: any) {
|
||||
throw new Error(e.response?.data?.message || 'Failed to remove account');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,14 +6,6 @@ export interface CooldownData {
|
||||
expiresAt?: Date;
|
||||
}
|
||||
|
||||
// Custom error to identify session death
|
||||
export class SteamAuthError extends Error {
|
||||
constructor(message: string) {
|
||||
super(message);
|
||||
this.name = "SteamAuthError";
|
||||
}
|
||||
}
|
||||
|
||||
export const scrapeCooldown = async (steamId: string, steamLoginSecure: string): Promise<CooldownData> => {
|
||||
const url = `https://steamcommunity.com/profiles/${steamId}/gcpd/730?tab=matchmaking`;
|
||||
|
||||
@@ -23,44 +15,43 @@ export const scrapeCooldown = async (steamId: string, steamLoginSecure: string):
|
||||
'Cookie': steamLoginSecure,
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
|
||||
},
|
||||
timeout: 10000,
|
||||
validateStatus: (status) => status < 500 // Allow redirects to handle them manually
|
||||
timeout: 10000
|
||||
});
|
||||
|
||||
// If Steam redirects us to the login page, the cookie is dead
|
||||
if (response.data.includes('Sign In') || response.request.path.includes('/login')) {
|
||||
throw new SteamAuthError('Invalid or expired steamLoginSecure cookie');
|
||||
}
|
||||
|
||||
const $ = cheerio.load(response.data);
|
||||
|
||||
if (!response.data.includes('Personal Game Data')) {
|
||||
throw new SteamAuthError('Session invalid: Personal Game Data not accessible');
|
||||
if (response.data.includes('Sign In') || !response.data.includes('Personal Game Data')) {
|
||||
throw new Error('Invalid or expired steamLoginSecure cookie');
|
||||
}
|
||||
|
||||
// 1. Locate the specific table containing cooldown info
|
||||
let expirationDate: Date | undefined = undefined;
|
||||
|
||||
$('table').each((_, table) => {
|
||||
const headers = $(table).find('th').map((_, th) => $(th).text().trim()).get();
|
||||
const expirationIndex = headers.findIndex(h => h.includes('Competitive Cooldown Expiration') || h.includes('Cooldown Expiration'));
|
||||
const expirationIndex = headers.findIndex(h => h.includes('Competitive Cooldown Expiration'));
|
||||
|
||||
if (expirationIndex !== -1) {
|
||||
const rows = $(table).find('tr').not(':has(th)');
|
||||
rows.each((_, row) => {
|
||||
const dateText = $(row).find('td').eq(expirationIndex).text().trim();
|
||||
const firstRow = $(table).find('tr').not(':has(th)').first();
|
||||
const dateText = firstRow.find('td').eq(expirationIndex).text().trim();
|
||||
|
||||
if (dateText && dateText !== '') {
|
||||
const cleanDateText = dateText.replace(' GMT', ' UTC');
|
||||
const parsed = new Date(cleanDateText);
|
||||
|
||||
if (!isNaN(parsed.getTime())) {
|
||||
if (!expirationDate || parsed > (expirationDate as Date)) expirationDate = parsed;
|
||||
expirationDate = parsed;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
if (expirationDate && (expirationDate as Date).getTime() > Date.now()) {
|
||||
return { isActive: true, expiresAt: expirationDate };
|
||||
console.log(`[Scraper] Found active cooldown until: ${(expirationDate as Date).toISOString()}`);
|
||||
return {
|
||||
isActive: true,
|
||||
expiresAt: expirationDate
|
||||
};
|
||||
}
|
||||
|
||||
const content = $('#personal_game_data_content').text();
|
||||
@@ -70,8 +61,7 @@ export const scrapeCooldown = async (steamId: string, steamLoginSecure: string):
|
||||
|
||||
return { isActive: false };
|
||||
} catch (error: any) {
|
||||
if (error instanceof SteamAuthError) throw error;
|
||||
console.error(`[Scraper] Network/Internal Error for ${steamId}:`, error.message);
|
||||
throw error; // Generic errors don't trigger re-auth
|
||||
console.error(`[Scraper] Error for ${steamId}:`, error.message);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -26,16 +26,14 @@ class SteamClientService {
|
||||
if (platform === 'win32') {
|
||||
const possiblePaths = [
|
||||
'C:\\Program Files (x86)\\Steam',
|
||||
'C:\\Program Files\\Steam',
|
||||
path.join(process.env.APPDATA || '', 'Steam'),
|
||||
'C:\\Program Files\\Steam'
|
||||
];
|
||||
this.steamPath = possiblePaths.find(p => fs.existsSync(p)) || null;
|
||||
} else if (platform === 'linux') {
|
||||
const possiblePaths = [
|
||||
path.join(home, '.steam/steam'),
|
||||
path.join(home, '.local/share/Steam'),
|
||||
path.join(home, '.var/app/com.valvesoftware.Steam/.steam/steam'), // Flatpak
|
||||
path.join(home, 'snap/steam/common/.steam/steam'), // Snap
|
||||
path.join(home, '.var/app/com.valvesoftware.Steam/.steam/steam')
|
||||
];
|
||||
this.steamPath = possiblePaths.find(p => fs.existsSync(p)) || null;
|
||||
}
|
||||
@@ -55,27 +53,13 @@ class SteamClientService {
|
||||
return path.join(this.steamPath, 'config', 'config.vdf');
|
||||
}
|
||||
|
||||
private safeWriteVdf(filePath: string, data: any) {
|
||||
const tempPath = `${filePath}.tmp_${Date.now()}`;
|
||||
const dir = path.dirname(filePath);
|
||||
try {
|
||||
if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
|
||||
const vdfContent = stringify(data);
|
||||
fs.writeFileSync(tempPath, vdfContent, 'utf-8');
|
||||
fs.renameSync(tempPath, filePath);
|
||||
} catch (e: any) {
|
||||
console.error(`[SteamClient] Atomic write failed for ${filePath}: ${e.message}`);
|
||||
if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
public startWatching(callback: (accounts: LocalSteamAccount[]) => void) {
|
||||
this.onAccountsChanged = callback;
|
||||
const loginUsersPath = this.getLoginUsersPath();
|
||||
|
||||
if (loginUsersPath && fs.existsSync(loginUsersPath)) {
|
||||
this.readLocalAccounts();
|
||||
chokidar.watch(loginUsersPath, { persistent: true, ignoreInitial: true }).on('change', () => {
|
||||
chokidar.watch(loginUsersPath, { persistent: true }).on('change', () => {
|
||||
this.readLocalAccounts();
|
||||
});
|
||||
}
|
||||
@@ -84,72 +68,79 @@ class SteamClientService {
|
||||
private readLocalAccounts() {
|
||||
const filePath = this.getLoginUsersPath();
|
||||
if (!filePath || !fs.existsSync(filePath)) return;
|
||||
|
||||
try {
|
||||
const content = fs.readFileSync(filePath, 'utf-8');
|
||||
if (!content.trim()) return;
|
||||
const data = parse(content) as any;
|
||||
if (!data || !data.users) return;
|
||||
|
||||
const accounts: LocalSteamAccount[] = [];
|
||||
for (const [steamId64, userData] of Object.entries(data.users)) {
|
||||
const user = userData as any;
|
||||
if (!user || !user.AccountName) continue;
|
||||
accounts.push({
|
||||
steamId: steamId64, accountName: user.AccountName,
|
||||
personaName: user.PersonaName || user.AccountName,
|
||||
steamId: steamId64,
|
||||
accountName: user.AccountName,
|
||||
personaName: user.PersonaName,
|
||||
timestamp: parseInt(user.Timestamp) || 0
|
||||
});
|
||||
}
|
||||
|
||||
if (this.onAccountsChanged) this.onAccountsChanged(accounts);
|
||||
} catch (error) { }
|
||||
} catch (error) {
|
||||
console.error('[SteamClient] Error parsing loginusers.vdf:', error);
|
||||
}
|
||||
}
|
||||
|
||||
public extractAccountConfig(accountName: string): any | null {
|
||||
const configPath = this.getConfigVdfPath();
|
||||
if (!configPath || !fs.existsSync(configPath)) return null;
|
||||
|
||||
try {
|
||||
const content = fs.readFileSync(configPath, 'utf-8');
|
||||
const data = parse(content) as any;
|
||||
|
||||
const accounts = data?.InstallConfigStore?.Software?.Valve?.Steam?.Accounts;
|
||||
return (accounts && accounts[accountName]) ? accounts[accountName] : null;
|
||||
} catch (e) { return null; }
|
||||
if (accounts && accounts[accountName]) {
|
||||
return accounts[accountName];
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[SteamClient] Failed to extract config.vdf data');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public injectAccountConfig(accountName: string, accountData: any) {
|
||||
const configPath = this.getConfigVdfPath();
|
||||
if (!configPath) return;
|
||||
|
||||
// Create directory if it doesn't exist
|
||||
const configDir = path.dirname(configPath);
|
||||
if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
|
||||
|
||||
let data: any = { InstallConfigStore: { Software: { Valve: { Steam: { Accounts: {} } } } } };
|
||||
|
||||
if (fs.existsSync(configPath)) {
|
||||
try {
|
||||
const content = fs.readFileSync(configPath, 'utf-8');
|
||||
const parsed = parse(content) as any;
|
||||
if (parsed && typeof parsed === 'object') data = parsed;
|
||||
data = parse(content) as any;
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
const ensurePath = (obj: any, keys: string[]) => {
|
||||
let curr = obj;
|
||||
for (const key of keys) {
|
||||
if (!curr[key] || typeof curr[key] !== 'object') curr[key] = {};
|
||||
curr = curr[key];
|
||||
}
|
||||
return curr;
|
||||
};
|
||||
// Ensure structure exists
|
||||
if (!data.InstallConfigStore) data.InstallConfigStore = {};
|
||||
if (!data.InstallConfigStore.Software) data.InstallConfigStore.Software = {};
|
||||
if (!data.InstallConfigStore.Software.Valve) data.InstallConfigStore.Software.Valve = {};
|
||||
if (!data.InstallConfigStore.Software.Valve.Steam) data.InstallConfigStore.Software.Valve.Steam = {};
|
||||
if (!data.InstallConfigStore.Software.Valve.Steam.Accounts) data.InstallConfigStore.Software.Valve.Steam.Accounts = {};
|
||||
|
||||
const steamAccounts = ensurePath(data, ['InstallConfigStore', 'Software', 'Valve', 'Steam', 'Accounts']);
|
||||
|
||||
// FAILPROOF: Force crucial flags that Steam uses to decide session validity
|
||||
steamAccounts[accountName] = {
|
||||
...accountData,
|
||||
RememberPassword: "1",
|
||||
AllowAutoLogin: "1",
|
||||
Timestamp: Math.floor(Date.now() / 1000).toString()
|
||||
};
|
||||
data.InstallConfigStore.Software.Valve.Steam.Accounts[accountName] = accountData;
|
||||
|
||||
try {
|
||||
this.safeWriteVdf(configPath, data);
|
||||
console.log(`[SteamClient] Safely injected session for ${accountName}`);
|
||||
} catch (e) { }
|
||||
fs.writeFileSync(configPath, stringify(data));
|
||||
console.log(`[SteamClient] Injected login config for ${accountName} into config.vdf`);
|
||||
} catch (e) {
|
||||
console.error('[SteamClient] Failed to write config.vdf');
|
||||
}
|
||||
}
|
||||
|
||||
public async setAutoLoginUser(accountName: string, accountConfig?: any, steamId?: string): Promise<boolean> {
|
||||
@@ -157,12 +148,14 @@ class SteamClientService {
|
||||
const loginUsersPath = this.getLoginUsersPath();
|
||||
|
||||
if (loginUsersPath) {
|
||||
const configDir = path.dirname(loginUsersPath);
|
||||
if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
|
||||
|
||||
let data: any = { users: {} };
|
||||
if (fs.existsSync(loginUsersPath)) {
|
||||
try {
|
||||
const content = fs.readFileSync(loginUsersPath, 'utf-8');
|
||||
const parsed = parse(content) as any;
|
||||
if (parsed && parsed.users) data = parsed;
|
||||
data = parse(content) as any;
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
@@ -171,7 +164,7 @@ class SteamClientService {
|
||||
let found = false;
|
||||
for (const [id, user] of Object.entries(data.users)) {
|
||||
const u = user as any;
|
||||
if (u.AccountName?.toLowerCase() === accountName.toLowerCase()) {
|
||||
if (u.AccountName.toLowerCase() === accountName.toLowerCase()) {
|
||||
u.mostrecent = "1";
|
||||
u.RememberPassword = "1";
|
||||
u.AllowAutoLogin = "1";
|
||||
@@ -184,8 +177,8 @@ class SteamClientService {
|
||||
}
|
||||
}
|
||||
|
||||
if (!found && steamId && accountName) {
|
||||
console.log(`[SteamClient] Provisioning new user profile for ${accountName}`);
|
||||
if (!found && steamId) {
|
||||
console.log(`[SteamClient] Provisioning user ${accountName} into loginusers.vdf`);
|
||||
data.users[steamId] = {
|
||||
AccountName: accountName,
|
||||
PersonaName: accountName,
|
||||
@@ -200,16 +193,16 @@ class SteamClientService {
|
||||
}
|
||||
|
||||
try {
|
||||
this.safeWriteVdf(loginUsersPath, data);
|
||||
} catch (e) { }
|
||||
fs.writeFileSync(loginUsersPath, stringify(data));
|
||||
} catch (e) {
|
||||
console.error('[SteamClient] Failed to write loginusers.vdf');
|
||||
}
|
||||
}
|
||||
|
||||
// Injection of the actual authentication blob
|
||||
if (accountConfig && accountName) {
|
||||
if (accountConfig) {
|
||||
this.injectAccountConfig(accountName, accountConfig);
|
||||
}
|
||||
|
||||
// --- Linux Registry / Registry.vdf Hardening ---
|
||||
if (platform === 'linux') {
|
||||
const regLocations = [
|
||||
path.join(os.homedir(), '.steam', 'registry.vdf'),
|
||||
@@ -217,28 +210,37 @@ class SteamClientService {
|
||||
];
|
||||
|
||||
for (const regPath of regLocations) {
|
||||
if (!fs.existsSync(path.dirname(regPath))) continue;
|
||||
let regData: any = { Registry: { HKCU: { Software: { Valve: { Steam: { AutoLoginUser: "", RememberPassword: "1", AlreadyLoggedIn: "1" } } } } } };
|
||||
let regData: any = { Registry: { HKCU: { Software: { Valve: { Steam: {} } } } } };
|
||||
|
||||
if (fs.existsSync(regPath)) {
|
||||
try {
|
||||
const content = fs.readFileSync(regPath, 'utf-8');
|
||||
const parsed = parse(content) as any;
|
||||
if (parsed && typeof parsed === 'object') regData = parsed;
|
||||
regData = parse(content) as any;
|
||||
} catch (e) { }
|
||||
} else {
|
||||
const regDir = path.dirname(regPath);
|
||||
if (!fs.existsSync(regDir)) fs.mkdirSync(regDir, { recursive: true });
|
||||
}
|
||||
|
||||
const ensurePath = (obj: any, keys: string[]) => {
|
||||
const setPath = (obj: any, keys: string[], val: string) => {
|
||||
let curr = obj;
|
||||
for (const key of keys) { if (!curr[key] || typeof curr[key] !== 'object') curr[key] = {}; curr = curr[key]; }
|
||||
return curr;
|
||||
for (let i = 0; i < keys.length - 1; i++) {
|
||||
if (!curr[keys[i]!]) curr[keys[i]!] = {};
|
||||
curr = curr[keys[i]!];
|
||||
}
|
||||
curr[keys[keys.length - 1]!] = val;
|
||||
};
|
||||
|
||||
const steamKey = ensurePath(regData, ['Registry', 'HKCU', 'Software', 'Valve', 'Steam']);
|
||||
steamKey.AutoLoginUser = accountName;
|
||||
steamKey.RememberPassword = "1";
|
||||
steamKey.AlreadyLoggedIn = "1";
|
||||
steamKey.WantsOfflineMode = "0";
|
||||
try { this.safeWriteVdf(regPath, regData); } catch (e) { }
|
||||
const steamReg = ['Registry', 'HKCU', 'Software', 'Valve', 'Steam'];
|
||||
setPath(regData, [...steamReg, 'AutoLoginUser'], accountName);
|
||||
setPath(regData, [...steamReg, 'RememberPassword'], "1");
|
||||
setPath(regData, [...steamReg, 'AlreadyLoggedIn'], "1");
|
||||
setPath(regData, [...steamReg, 'WantsOfflineMode'], "0");
|
||||
|
||||
try {
|
||||
fs.writeFileSync(regPath, stringify(regData));
|
||||
console.log(`[SteamClient] Registry updated: ${regPath}`);
|
||||
} catch (e) { }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Ultimate Ban Tracker</title>
|
||||
<title>frontend</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
4
frontend/package-lock.json
generated
4
frontend/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ultimate-ban-tracker-desktop",
|
||||
"version": "1.3.3",
|
||||
"version": "1.2.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ultimate-ban-tracker-desktop",
|
||||
"version": "1.3.3",
|
||||
"version": "1.2.0",
|
||||
"license": "SEE LICENSE IN LICENSE",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ultimate-ban-tracker-desktop",
|
||||
"description": "Professional Steam Account Manager & Ban Tracker",
|
||||
"version": "1.3.3",
|
||||
"version": "1.2.0",
|
||||
"author": "Nils Pukropp <nils@narl.io>",
|
||||
"homepage": "https://narl.io",
|
||||
"license": "SEE LICENSE IN LICENSE",
|
||||
@@ -28,8 +28,7 @@
|
||||
},
|
||||
"files": [
|
||||
"dist/**/*",
|
||||
"dist-electron/**/*",
|
||||
"assets-build/**/*"
|
||||
"dist-electron/**/*"
|
||||
],
|
||||
"linux": {
|
||||
"target": [
|
||||
|
||||
@@ -27,7 +27,6 @@ export interface ServerConfig {
|
||||
token?: string;
|
||||
serverSteamId?: string;
|
||||
enabled: boolean;
|
||||
isAdmin?: boolean;
|
||||
}
|
||||
|
||||
interface AccountsContextType {
|
||||
@@ -49,17 +48,9 @@ interface AccountsContextType {
|
||||
updateServerConfig: (config: Partial<ServerConfig>) => Promise<void>;
|
||||
loginToServer: () => Promise<void>;
|
||||
syncNow: () => Promise<void>;
|
||||
scrapeAccount: (steamId: string) => Promise<boolean>;
|
||||
getCommunityAccounts: () => Promise<any[]>;
|
||||
getServerUsers: () => Promise<any[]>;
|
||||
refreshAccounts: (showLoading?: boolean) => Promise<void>;
|
||||
|
||||
// Admin Methods
|
||||
adminGetStats: () => Promise<any>;
|
||||
adminGetUsers: () => Promise<any[]>;
|
||||
adminDeleteUser: (userId: string) => Promise<void>;
|
||||
adminGetAccounts: () => Promise<any[]>;
|
||||
adminRemoveAccount: (steamId: string) => Promise<void>;
|
||||
}
|
||||
|
||||
const AccountsContext = createContext<AccountsContextType | undefined>(undefined);
|
||||
@@ -115,12 +106,6 @@ export const AccountsProvider: React.FC<{ children: React.ReactNode }> = ({ chil
|
||||
}
|
||||
};
|
||||
|
||||
const scrapeAccount = async (steamId: string) => {
|
||||
const success = await (window as any).electronAPI.scrapeAccount(steamId);
|
||||
if (success) await syncNow();
|
||||
return success;
|
||||
};
|
||||
|
||||
const addAccount = async (data: { identifier: string }) => {
|
||||
await (window as any).electronAPI.addAccount(data);
|
||||
await refreshAccounts();
|
||||
@@ -189,19 +174,11 @@ export const AccountsProvider: React.FC<{ children: React.ReactNode }> = ({ chil
|
||||
return await (window as any).electronAPI.getServerUsers();
|
||||
};
|
||||
|
||||
// --- Admin Methods ---
|
||||
const adminGetStats = async () => (window as any).electronAPI.adminGetStats();
|
||||
const adminGetUsers = async () => (window as any).electronAPI.adminGetUsers();
|
||||
const adminDeleteUser = async (userId: string) => (window as any).electronAPI.adminDeleteUser(userId);
|
||||
const adminGetAccounts = async () => (window as any).electronAPI.adminGetAccounts();
|
||||
const adminRemoveAccount = async (steamId: string) => (window as any).electronAPI.adminRemoveAccount(steamId);
|
||||
|
||||
return (
|
||||
<AccountsContext.Provider value={{
|
||||
accounts, serverConfig, isLoading, isSyncing, addAccount, updateAccount, deleteAccount,
|
||||
switchAccount, openSteamAppLogin, openSteamLogin, updateServerConfig, loginToServer,
|
||||
getCommunityAccounts, getServerUsers, shareAccountWithUser, revokeAccountAccess, revokeAllAccountAccess, syncNow, refreshAccounts,
|
||||
scrapeAccount, adminGetStats, adminGetUsers, adminDeleteUser, adminGetAccounts, adminRemoveAccount
|
||||
getCommunityAccounts, getServerUsers, shareAccountWithUser, revokeAccountAccess, revokeAllAccountAccess, syncNow, refreshAccounts
|
||||
}}>
|
||||
{children}
|
||||
</AccountsContext.Provider>
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
DialogActions, CircularProgress, Paper, Chip,
|
||||
Table, TableBody, TableCell, TableContainer, TableHead, TableRow,
|
||||
Switch, FormControlLabel, Divider, List, ListItem, ListItemText, ListItemSecondaryAction,
|
||||
Select, MenuItem, FormControl, InputLabel, Tabs, Tab
|
||||
Select, MenuItem, FormControl, InputLabel
|
||||
} from '@mui/material';
|
||||
import SearchIcon from '@mui/icons-material/Search';
|
||||
import AddIcon from '@mui/icons-material/Add';
|
||||
@@ -25,116 +25,11 @@ import GppBadIcon from '@mui/icons-material/GppBad';
|
||||
import PeopleIcon from '@mui/icons-material/People';
|
||||
import VerifiedUserIcon from '@mui/icons-material/VerifiedUser';
|
||||
import WorkspacePremiumIcon from '@mui/icons-material/WorkspacePremium';
|
||||
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
|
||||
import StorageIcon from '@mui/icons-material/Storage';
|
||||
import GroupIcon from '@mui/icons-material/Group';
|
||||
import AccountTreeIcon from '@mui/icons-material/AccountTree';
|
||||
import { useAccounts, type Account } from '../hooks/useAccounts';
|
||||
import { useAppTheme } from '../theme/ThemeContext';
|
||||
import type { ThemeType } from '../theme/SteamTheme';
|
||||
import NebulaBanner from '../components/NebulaBanner';
|
||||
|
||||
const AdminPanel: React.FC<{ open: boolean, onClose: () => void }> = ({ open, onClose }) => {
|
||||
const { adminGetStats, adminGetUsers, adminDeleteUser, adminGetAccounts, adminRemoveAccount } = useAccounts();
|
||||
const [tab, setTab] = useState(0);
|
||||
const [stats, setStats] = useState<any>(null);
|
||||
const [users, setUsers] = useState<any[]>([]);
|
||||
const [accounts, setAccounts] = useState<any[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const loadData = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
if (tab === 0) setStats(await adminGetStats());
|
||||
if (tab === 1) setUsers(await adminGetUsers());
|
||||
if (tab === 2) setAccounts(await adminGetAccounts());
|
||||
} catch (e) {}
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
useEffect(() => { if (open) loadData(); }, [open, tab]);
|
||||
|
||||
const handleDeleteUser = async (id: string) => {
|
||||
if (window.confirm("Wipe this user and all their accounts?")) {
|
||||
await adminDeleteUser(id);
|
||||
loadData();
|
||||
}
|
||||
};
|
||||
|
||||
const handleForceRemove = async (steamId: string) => {
|
||||
if (window.confirm("Force remove this account from server?")) {
|
||||
await adminRemoveAccount(steamId);
|
||||
loadData();
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Dialog open={open} onClose={onClose} maxWidth="md" fullWidth>
|
||||
<DialogTitle sx={{ bgcolor: 'background.paper', color: 'text.primary', display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<AdminPanelSettingsIcon color="primary" /> Server Administration
|
||||
</DialogTitle>
|
||||
<Tabs value={tab} onChange={(_, v) => setTab(v)} sx={{ bgcolor: 'background.paper', borderBottom: 1, borderColor: 'divider' }}>
|
||||
<Tab icon={<StorageIcon />} label="Overview" />
|
||||
<Tab icon={<GroupIcon />} label="Users" />
|
||||
<Tab icon={<AccountTreeIcon />} label="Global Accounts" />
|
||||
</Tabs>
|
||||
<DialogContent sx={{ bgcolor: 'background.paper', minHeight: 400, pt: 2 }}>
|
||||
{loading ? <Box sx={{ display: 'flex', justifyContent: 'center', mt: 10 }}><CircularProgress /></Box> : (
|
||||
<>
|
||||
{tab === 0 && stats && (
|
||||
<Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', gap: 2, mt: 2 }}>
|
||||
{[
|
||||
{ label: 'Total Users', value: stats.users },
|
||||
{ label: 'Total Accounts', value: stats.accounts },
|
||||
{ label: 'Active Cooldowns', value: stats.activeCooldowns }
|
||||
].map((s) => (
|
||||
<Paper key={s.label} sx={{ p: 3, textAlign: 'center', bgcolor: 'rgba(0,0,0,0.1)' }}>
|
||||
<Typography variant="h4" color="primary" sx={{ fontWeight: 'bold' }}>{s.value}</Typography>
|
||||
<Typography variant="caption" color="textSecondary">{s.label}</Typography>
|
||||
</Paper>
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
{tab === 1 && (
|
||||
<List>
|
||||
{users.map(u => (
|
||||
<ListItem key={u._id} divider sx={{ borderColor: 'divider' }}>
|
||||
<Avatar src={u.avatar} sx={{ mr: 2 }} />
|
||||
<ListItemText primary={u.personaName} secondary={u.steamId} primaryTypographyProps={{ color: 'text.primary' }} />
|
||||
<ListItemSecondaryAction>
|
||||
<IconButton color="error" onClick={() => handleDeleteUser(u._id)}><DeleteIcon /></IconButton>
|
||||
</ListItemSecondaryAction>
|
||||
</ListItem>
|
||||
))}
|
||||
</List>
|
||||
)}
|
||||
{tab === 2 && (
|
||||
<List>
|
||||
{accounts.map(a => (
|
||||
<ListItem key={a.steamId} divider sx={{ borderColor: 'divider' }}>
|
||||
<Avatar src={a.avatar} variant="square" sx={{ mr: 2 }} />
|
||||
<ListItemText
|
||||
primary={a.personaName}
|
||||
secondary={`Owned by: ${a.addedBy?.personaName || 'Unknown'} (${a.steamId})`}
|
||||
primaryTypographyProps={{ color: 'text.primary' }}
|
||||
/>
|
||||
<ListItemSecondaryAction>
|
||||
<IconButton color="error" onClick={() => handleForceRemove(a.steamId)}><DeleteIcon /></IconButton>
|
||||
</ListItemSecondaryAction>
|
||||
</ListItem>
|
||||
))}
|
||||
</List>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</DialogContent>
|
||||
<DialogActions sx={{ bgcolor: 'background.paper', p: 2 }}>
|
||||
<Button onClick={onClose} variant="contained" color="inherit">Close Panel</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
const Dashboard: React.FC = () => {
|
||||
const { currentTheme, setTheme } = useAppTheme();
|
||||
const {
|
||||
@@ -144,7 +39,6 @@ const Dashboard: React.FC = () => {
|
||||
|
||||
const [searchTerm, setSearchTerm] = useState('');
|
||||
const [isSettingsOpen, setIsSettingsOpen] = useState(false);
|
||||
const [isAdminPanelOpen, setIsAdminPanelOpen] = useState(false);
|
||||
const [serverUrl, setServerUrl] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
@@ -176,15 +70,6 @@ const Dashboard: React.FC = () => {
|
||||
</Typography>
|
||||
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 2, WebkitAppRegion: 'no-drag' } as any}>
|
||||
{/* Admin Button - Only visible if isAdmin is true */}
|
||||
{serverConfig?.isAdmin && (
|
||||
<Tooltip title="Open Admin Panel">
|
||||
<IconButton color="primary" onClick={() => setIsAdminPanelOpen(true)}>
|
||||
<AdminPanelSettingsIcon />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
)}
|
||||
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', mr: 1 }}>
|
||||
{isSyncing ? (
|
||||
<CircularProgress size={16} sx={{ color: 'primary.main', mr: 1 }} />
|
||||
@@ -361,9 +246,6 @@ const Dashboard: React.FC = () => {
|
||||
<Button onClick={() => setIsSettingsOpen(false)} color="inherit" variant="contained">Done</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
|
||||
{/* Admin Panel */}
|
||||
<AdminPanel open={isAdminPanelOpen} onClose={() => setIsAdminPanelOpen(false)} />
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
@@ -376,12 +258,11 @@ const AccountRow: React.FC<{
|
||||
onSwitch: (login: string) => void,
|
||||
onAuth: () => void
|
||||
}> = ({ account, onDelete, onSwitch, onAuth }) => {
|
||||
const { shareAccountWithUser, revokeAccountAccess, revokeAllAccountAccess, getServerUsers, serverConfig, scrapeAccount } = useAccounts();
|
||||
const { shareAccountWithUser, revokeAccountAccess, revokeAllAccountAccess, getServerUsers, serverConfig } = useAccounts();
|
||||
const [timeLeft, setTimeLeft] = useState<string | null>(null);
|
||||
const [isShareOpen, setIsShareOpen] = useState(false);
|
||||
const [targetUserId, setTargetUserId] = useState('');
|
||||
const [isSharing, setIsSharing] = useState(false);
|
||||
const [isRefreshing, setIsRefreshing] = useState(false);
|
||||
const [serverUsers, setServerUsers] = useState<any[]>([]);
|
||||
|
||||
const cooldownDate = account?.cooldownExpiresAt ? new Date(account.cooldownExpiresAt) : null;
|
||||
@@ -405,12 +286,6 @@ const AccountRow: React.FC<{
|
||||
const [imgSrc, setImgSrc] = useState(avatarSrc);
|
||||
useEffect(() => { setImgSrc(avatarSrc); }, [avatarSrc]);
|
||||
|
||||
const handleRefresh = async () => {
|
||||
setIsRefreshing(true);
|
||||
await scrapeAccount(account.steamId);
|
||||
setIsRefreshing(false);
|
||||
};
|
||||
|
||||
const handleOpenShare = async () => {
|
||||
setIsShareOpen(true);
|
||||
try {
|
||||
@@ -419,7 +294,8 @@ const AccountRow: React.FC<{
|
||||
(window as any).electronAPI.getServerUserInfo()
|
||||
]);
|
||||
const filtered = (Array.isArray(users) ? users : []).filter(u =>
|
||||
u.steamId !== selfInfo.steamId && u.steamId !== account.steamId
|
||||
u.steamId !== selfInfo.steamId &&
|
||||
u.steamId !== account.steamId
|
||||
);
|
||||
setServerUsers(filtered);
|
||||
} catch (e) {}
|
||||
@@ -529,12 +405,7 @@ const AccountRow: React.FC<{
|
||||
{account.steamLoginSecure && !account.authError ? <VerifiedUserIcon fontSize="inherit" /> : (account.authError ? <LockResetIcon fontSize="inherit" /> : <BoltIcon fontSize="inherit" />)}
|
||||
</IconButton>
|
||||
{account.steamLoginSecure && !account.authError && (
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
|
||||
<Typography variant="caption" sx={{ color: 'success.main', fontWeight: 'bold', fontSize: '0.6rem' }}>TRACKING</Typography>
|
||||
<IconButton size="small" onClick={handleRefresh} disabled={isRefreshing} sx={{ p: 0.2, color: 'text.secondary', '&:hover': { color: 'primary.main' } }}>
|
||||
{isRefreshing ? <CircularProgress size={10} color="inherit" /> : <SyncIcon sx={{ fontSize: 12 }} />}
|
||||
</IconButton>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
</Tooltip>
|
||||
|
||||
@@ -31,27 +31,8 @@ export const AppThemeProvider: React.FC<{ children: React.ReactNode }> = ({ chil
|
||||
if (api?.updateServerConfig) {
|
||||
await api.updateServerConfig({ theme });
|
||||
}
|
||||
if (api?.updateAppIcon) {
|
||||
try {
|
||||
await api.updateAppIcon(theme);
|
||||
} catch (e) { }
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const updateIcon = async () => {
|
||||
const api = (window as any).electronAPI;
|
||||
if (api?.updateAppIcon && currentTheme) {
|
||||
try {
|
||||
await api.updateAppIcon(currentTheme);
|
||||
} catch (e) {
|
||||
console.warn("[ThemeContext] updateAppIcon failed (likely not registered yet)");
|
||||
}
|
||||
}
|
||||
};
|
||||
updateIcon();
|
||||
}, [currentTheme]);
|
||||
|
||||
const theme = useMemo(() => getTheme(currentTheme), [currentTheme]);
|
||||
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user