Compare commits

..

No commits in common. "30737f93207bf11239ca13f6212e271f616e8983" and "b41b7c9de6a936a8cfffc96c67054b86c91f90e9" have entirely different histories.

3 changed files with 13 additions and 32 deletions

View File

@ -1,6 +1,6 @@
{
"name": "real-debrid-downloader",
"version": "1.7.121",
"version": "1.7.120",
"description": "Desktop downloader",
"main": "build/main/main/main.js",
"author": "Sucukdeluxe",

View File

@ -1545,16 +1545,10 @@ class MegaDebridClient {
});
const text = await response.text();
if (!response.ok) {
if (response.status === 401 || response.status === 403) {
this.clearTokenCache();
}
return null;
}
const payload = parseJsonSafe(text);
if (!payload || payload.response_code !== "ok") {
if (payload && String(payload.response_code || "").toLowerCase().includes("token")) {
this.clearTokenCache();
}
return null;
}
const token = String(payload.token || "").trim();
@ -2473,7 +2467,7 @@ class DebridLinkClient {
throw new Error("aborted");
}
if (poll > 0) {
await sleepWithSignal(2000, signal);
await new Promise((resolve) => setTimeout(resolve, 2000));
}
const refreshed = await this.fetchDownloaderEntry(apiKey, id, signal);
if (refreshed) {
@ -2744,7 +2738,7 @@ class LinkSnappyClient {
throw error;
}
if (attempt < REQUEST_RETRIES) {
await sleepWithSignal(retryDelay(attempt), signal);
await sleep(retryDelay(attempt), signal);
}
}
}
@ -2814,7 +2808,7 @@ class OneFichierClient {
throw error;
}
if (attempt < REQUEST_RETRIES) {
await sleepWithSignal(retryDelay(attempt), signal);
await sleep(retryDelay(attempt), signal);
}
}
}

View File

@ -501,14 +501,6 @@ function ensureBaseDir(baseDir: string): void {
fs.mkdirSync(baseDir, { recursive: true });
}
/** JSON replacer that sanitizes NaN/Infinity to null to prevent file corruption. */
function safeJsonReplacer(_key: string, value: unknown): unknown {
if (typeof value === "number" && !Number.isFinite(value)) {
return null;
}
return value;
}
function asRecord(value: unknown): Record<string, unknown> | null {
if (!value || typeof value !== "object" || Array.isArray(value)) {
return null;
@ -616,16 +608,11 @@ export function normalizeLoadedSession(raw: unknown): SessionState {
};
}
let orphanedItemCount = 0;
for (const [itemId, item] of Object.entries(itemsById)) {
if (!packagesById[item.packageId]) {
orphanedItemCount += 1;
delete itemsById[itemId];
}
}
if (orphanedItemCount > 0) {
logger.warn(`normalizeLoadedSession: ${orphanedItemCount} verwaiste Items entfernt (fehlende Pakete)`);
}
for (const pkg of Object.values(packagesById)) {
pkg.itemIds = pkg.itemIds.filter((itemId) => {
@ -684,7 +671,7 @@ export function loadSettings(paths: StoragePaths): AppSettings {
if (backupLoaded) {
logger.warn("Konfiguration defekt, Backup-Datei wird verwendet");
try {
const payload = JSON.stringify(backupLoaded, safeJsonReplacer, 2);
const payload = JSON.stringify(backupLoaded, null, 2);
const tempPath = `${paths.configFile}.tmp`;
fs.writeFileSync(tempPath, payload, "utf8");
syncRenameWithExdevFallback(tempPath, paths.configFile);
@ -775,7 +762,7 @@ export function saveSettings(paths: StoragePaths, settings: AppSettings): void {
}
}
const persisted = sanitizeCredentialPersistence(normalizeSettings(settings));
const payload = JSON.stringify(persisted, safeJsonReplacer, 2);
const payload = JSON.stringify(persisted, null, 2);
const tempPath = `${paths.configFile}.tmp`;
try {
fs.writeFileSync(tempPath, payload, "utf8");
@ -809,7 +796,7 @@ async function writeSettingsPayload(paths: StoragePaths, payload: string): Promi
export async function saveSettingsAsync(paths: StoragePaths, settings: AppSettings): Promise<void> {
const persisted = sanitizeCredentialPersistence(normalizeSettings(settings));
const payload = JSON.stringify(persisted, safeJsonReplacer, 2);
const payload = JSON.stringify(persisted, null, 2);
if (asyncSettingsSaveRunning) {
asyncSettingsSaveQueued = { paths, settings };
return;
@ -866,7 +853,7 @@ export function loadSession(paths: StoragePaths): SessionState {
if (backupPkgCount > 0) {
logger.warn(`Session-Datei ist leer (0 Pakete), aber Backup hat ${backupPkgCount} Pakete — verwende Backup`);
try {
const payload = JSON.stringify({ ...backup, updatedAt: Date.now() }, safeJsonReplacer);
const payload = JSON.stringify({ ...backup, updatedAt: Date.now() });
const tempPath = sessionTempPath(paths.sessionFile, "sync");
fs.writeFileSync(tempPath, payload, "utf8");
syncRenameWithExdevFallback(tempPath, paths.sessionFile);
@ -884,7 +871,7 @@ export function loadSession(paths: StoragePaths): SessionState {
if (backup) {
logger.warn("Session defekt, Backup-Datei wird verwendet");
try {
const payload = JSON.stringify({ ...backup, updatedAt: Date.now() }, safeJsonReplacer);
const payload = JSON.stringify({ ...backup, updatedAt: Date.now() });
const tempPath = sessionTempPath(paths.sessionFile, "sync");
fs.writeFileSync(tempPath, payload, "utf8");
syncRenameWithExdevFallback(tempPath, paths.sessionFile);
@ -902,7 +889,7 @@ export function loadSession(paths: StoragePaths): SessionState {
if (tmpSession && Object.keys(tmpSession.packages).length > 0) {
logger.warn(`Session aus temporaerer Datei wiederhergestellt: ${tmpPath} (${Object.keys(tmpSession.packages).length} Pakete)`);
try {
const payload = JSON.stringify({ ...tmpSession, updatedAt: Date.now() }, safeJsonReplacer);
const payload = JSON.stringify({ ...tmpSession, updatedAt: Date.now() });
fs.writeFileSync(paths.sessionFile, payload, "utf8");
} catch {
// ignore restore write failure
@ -926,7 +913,7 @@ export function saveSession(paths: StoragePaths, session: SessionState): void {
// Best-effort backup; proceed even if it fails
}
}
const payload = JSON.stringify({ ...session, updatedAt: Date.now() }, safeJsonReplacer);
const payload = JSON.stringify({ ...session, updatedAt: Date.now() });
const tempPath = sessionTempPath(paths.sessionFile, "sync");
try {
fs.writeFileSync(tempPath, payload, "utf8");
@ -996,7 +983,7 @@ export function cancelPendingAsyncSaves(): void {
}
export async function saveSessionAsync(paths: StoragePaths, session: SessionState): Promise<void> {
const payload = JSON.stringify({ ...session, updatedAt: Date.now() }, safeJsonReplacer);
const payload = JSON.stringify({ ...session, updatedAt: Date.now() });
await saveSessionPayloadAsync(paths, payload);
}
@ -1049,7 +1036,7 @@ export function loadHistory(paths: StoragePaths): HistoryEntry[] {
export function saveHistory(paths: StoragePaths, entries: HistoryEntry[]): void {
ensureBaseDir(paths.baseDir);
const trimmed = entries.slice(0, MAX_HISTORY_ENTRIES);
const payload = JSON.stringify(trimmed, safeJsonReplacer, 2);
const payload = JSON.stringify(trimmed, null, 2);
const tempPath = `${paths.historyFile}.tmp`;
try {
fs.writeFileSync(tempPath, payload, "utf8");