feat(realdebrid): add multi-account settings model
This commit is contained in:
Sucukdeluxe
@@ -1,5 +1,6 @@
|
||||
import { parseDebridLinkApiKeys } from "../shared/debrid-link-keys";
|
||||
import { parseMegaDebridAccounts } from "../shared/mega-debrid-accounts";
|
||||
import { parseRealDebridApiAccounts } from "../shared/real-debrid-accounts";
|
||||
import type { AppSettings, DebridAccountStatus } from "../shared/types";
|
||||
|
||||
const REDACTED = "[geschützt]";
|
||||
@@ -45,6 +46,7 @@ export function collectAccountStatusRedactionValues(settings?: AppSettings, inpu
|
||||
const values = new Set<string>();
|
||||
if (settings) {
|
||||
addRedaction(values, settings.token);
|
||||
addRedaction(values, settings.realDebridApiTokens);
|
||||
addRedaction(values, settings.megaPassword);
|
||||
addRedaction(values, settings.megaCredentials);
|
||||
addRedaction(values, settings.megaDebridApiCredentials);
|
||||
@@ -66,6 +68,9 @@ export function collectAccountStatusRedactionValues(settings?: AppSettings, inpu
|
||||
for (const key of parseDebridLinkApiKeys(settings.debridLinkApiKeys)) {
|
||||
addRedaction(values, key.token);
|
||||
}
|
||||
for (const account of parseRealDebridApiAccounts(settings.realDebridApiTokens)) {
|
||||
addRedaction(values, account.token);
|
||||
}
|
||||
}
|
||||
const inputIdentity = getInputString(input, "identity");
|
||||
const inputSecret = getInputString(input, "secret");
|
||||
|
||||
@@ -44,8 +44,14 @@ export function defaultSettings(): AppSettings {
|
||||
const baseDir = path.join(os.homedir(), "Desktop", "Multi-Debrid-Downloader");
|
||||
return {
|
||||
language: "en",
|
||||
token: "",
|
||||
realDebridUseWebLogin: false,
|
||||
token: "",
|
||||
realDebridUseWebLogin: false,
|
||||
realDebridApiTokens: "",
|
||||
realDebridWebAccountIds: [],
|
||||
realDebridDisabledAccountIds: [],
|
||||
realDebridAccountDailyLimitBytes: {},
|
||||
realDebridAccountDailyUsageBytes: {},
|
||||
realDebridAccountTotalUsageBytes: {},
|
||||
megaLogin: "",
|
||||
megaPassword: "",
|
||||
megaCredentials: "",
|
||||
|
||||
@@ -10,6 +10,7 @@ export interface CredentialProtector {
|
||||
const MASKED_CREDENTIAL = "••••••••";
|
||||
const CREDENTIAL_KEYS = [
|
||||
"token",
|
||||
"realDebridApiTokens",
|
||||
"megaLogin",
|
||||
"megaPassword",
|
||||
"megaCredentials",
|
||||
|
||||
+53
-10
@@ -6,6 +6,7 @@ import { getDebridLinkApiKeyIds } from "../shared/debrid-link-keys";
|
||||
import { getMegaDebridAccountIds, mergeMegaDebridCredentialPools, parseMegaDebridAccounts } from "../shared/mega-debrid-accounts";
|
||||
import { AppSettings, AudioStripSummary, BandwidthScheduleEntry, DebridAccountStatus, DebridFallbackProvider, DebridProvider, DownloadItem, DownloadStatus, HistoryEntry, HistoryRetentionMode, LogStorageLocation, PackageEntry, PackagePriority, SessionState } from "../shared/types";
|
||||
import { getProviderUsageDayKey } from "../shared/provider-daily-limits";
|
||||
import { getRealDebridAccountIds, normalizeRealDebridWebAccountIds, parseRealDebridApiAccounts, serializeRealDebridApiAccounts } from "../shared/real-debrid-accounts";
|
||||
import { defaultSettings } from "./constants";
|
||||
import { needsPersistedSettingsRewrite, protectPersistedSettings, restorePersistedSettings } from "./credential-protection";
|
||||
import { logger } from "./logger";
|
||||
@@ -270,15 +271,20 @@ function normalizeDebridAccountStatuses(
|
||||
value: unknown,
|
||||
megaIds: string[],
|
||||
debridLinkIds: string[],
|
||||
realDebridConfigured: boolean
|
||||
realDebridIds: string[],
|
||||
legacyRealDebridTargetId: string | null
|
||||
): Record<string, DebridAccountStatus> {
|
||||
const allowed = new Set([...megaIds, ...debridLinkIds, ...(realDebridConfigured ? ["svc-realdebrid"] : [])]);
|
||||
const allowed = new Set([...megaIds, ...debridLinkIds, ...realDebridIds]);
|
||||
const result: Record<string, DebridAccountStatus> = {};
|
||||
if (value && typeof value === "object" && !Array.isArray(value)) {
|
||||
for (const [key, raw] of Object.entries(value as Record<string, unknown>)) {
|
||||
if (!allowed.has(key) || !raw || typeof raw !== "object") {
|
||||
continue;
|
||||
}
|
||||
for (const [storedKey, raw] of Object.entries(value as Record<string, unknown>)) {
|
||||
const key = storedKey === "svc-realdebrid" ? legacyRealDebridTargetId : storedKey;
|
||||
if (!key || !allowed.has(key) || !raw || typeof raw !== "object") {
|
||||
continue;
|
||||
}
|
||||
if (storedKey === "svc-realdebrid" && result[key]) {
|
||||
continue;
|
||||
}
|
||||
const entry = raw as Partial<DebridAccountStatus>;
|
||||
if (typeof entry.accountId !== "string" || typeof entry.checkedAt !== "number") {
|
||||
continue;
|
||||
@@ -295,7 +301,7 @@ function normalizeDebridAccountStatuses(
|
||||
email = undefined;
|
||||
}
|
||||
result[key] = {
|
||||
accountId: entry.accountId,
|
||||
accountId: key,
|
||||
provider,
|
||||
label: String(entry.label || ""),
|
||||
maskedLogin: String(entry.maskedLogin || ""),
|
||||
@@ -439,6 +445,28 @@ export function normalizeSettings(settings: AppSettings): AppSettings {
|
||||
? normalizeStringList(settings.megaDebridWebDisabledAccountIds, megaDebridWebAccountIds)
|
||||
: legacyMegaDisabledAccountIds.filter((id) => megaDebridWebAccountIds.includes(id));
|
||||
const megaDebridDisabledAccountIds = [...new Set([...megaDebridApiDisabledAccountIds, ...megaDebridWebDisabledAccountIds])];
|
||||
const legacyRealDebridToken = asText(settings.token);
|
||||
const hasRealDebridApiPool = Object.prototype.hasOwnProperty.call(settings, "realDebridApiTokens");
|
||||
const storedRealDebridApiTokens = serializeRealDebridApiAccounts(
|
||||
parseRealDebridApiAccounts(String(settings.realDebridApiTokens ?? "")).map((entry) => entry.token)
|
||||
);
|
||||
const realDebridApiTokens = hasRealDebridApiPool
|
||||
? storedRealDebridApiTokens
|
||||
: serializeRealDebridApiAccounts([legacyRealDebridToken]);
|
||||
const hasRealDebridWebPool = Object.prototype.hasOwnProperty.call(settings, "realDebridWebAccountIds");
|
||||
let realDebridWebAccountIds = normalizeRealDebridWebAccountIds(settings.realDebridWebAccountIds);
|
||||
if (!hasRealDebridWebPool && Boolean(settings.realDebridUseWebLogin)) {
|
||||
realDebridWebAccountIds = ["rdw_legacy"];
|
||||
}
|
||||
const realDebridAccountIds = getRealDebridAccountIds({
|
||||
realDebridApiTokens,
|
||||
realDebridWebAccountIds,
|
||||
realDebridDisabledAccountIds: []
|
||||
});
|
||||
const realDebridDisabledAccountIds = normalizeStringList(settings.realDebridDisabledAccountIds, realDebridAccountIds);
|
||||
const legacyRealDebridTargetId = Boolean(settings.realDebridUseWebLogin) && realDebridWebAccountIds.includes("rdw_legacy")
|
||||
? "rdw_legacy"
|
||||
: (parseRealDebridApiAccounts(realDebridApiTokens)[0]?.id || realDebridWebAccountIds[0] || null);
|
||||
const providerDailyUsageDayRaw = asText(settings.providerDailyUsageDay);
|
||||
const providerDailyUsageDay = /^\d{4}-\d{2}-\d{2}$/.test(providerDailyUsageDayRaw)
|
||||
? providerDailyUsageDayRaw
|
||||
@@ -469,8 +497,16 @@ export function normalizeSettings(settings: AppSettings): AppSettings {
|
||||
const debridLinkDisabledKeyIds = normalizeStringList(settings.debridLinkDisabledKeyIds, debridLinkApiKeyIds);
|
||||
const normalized: AppSettings = {
|
||||
language: settings.language === "de" ? "de" : "en",
|
||||
token: asText(settings.token),
|
||||
realDebridUseWebLogin: Boolean(settings.realDebridUseWebLogin),
|
||||
token: asText(settings.token),
|
||||
realDebridUseWebLogin: Boolean(settings.realDebridUseWebLogin),
|
||||
realDebridApiTokens,
|
||||
realDebridWebAccountIds,
|
||||
realDebridDisabledAccountIds,
|
||||
realDebridAccountDailyLimitBytes: normalizeNamedByteMap(settings.realDebridAccountDailyLimitBytes, realDebridAccountIds),
|
||||
realDebridAccountDailyUsageBytes: providerDailyUsageDay === currentUsageDay
|
||||
? normalizeNamedByteMap(settings.realDebridAccountDailyUsageBytes, realDebridAccountIds)
|
||||
: {},
|
||||
realDebridAccountTotalUsageBytes: normalizeNamedByteMap(settings.realDebridAccountTotalUsageBytes, realDebridAccountIds),
|
||||
megaLogin,
|
||||
megaPassword,
|
||||
megaCredentials,
|
||||
@@ -588,7 +624,8 @@ export function normalizeSettings(settings: AppSettings): AppSettings {
|
||||
settings.debridAccountStatuses,
|
||||
megaDebridAccountIds,
|
||||
debridLinkApiKeyIds,
|
||||
Boolean(settings.realDebridUseWebLogin || asText(settings.token))
|
||||
realDebridAccountIds,
|
||||
legacyRealDebridTargetId
|
||||
),
|
||||
providerDailyUsageDay: providerDailyUsageDay === currentUsageDay ? providerDailyUsageDay : currentUsageDay,
|
||||
scheduledStartEpochMs: clampNumber(settings.scheduledStartEpochMs, defaults.scheduledStartEpochMs, 0, Number.MAX_SAFE_INTEGER)
|
||||
@@ -742,6 +779,12 @@ function readSettingsFile(filePath: string): LoadedSettingsFile | null {
|
||||
if (!Object.prototype.hasOwnProperty.call(parsed, "megaDebridWebDisabledAccountIds")) {
|
||||
delete (mergedInput as Partial<AppSettings>).megaDebridWebDisabledAccountIds;
|
||||
}
|
||||
if (!Object.prototype.hasOwnProperty.call(parsed, "realDebridApiTokens")) {
|
||||
delete (mergedInput as Partial<AppSettings>).realDebridApiTokens;
|
||||
}
|
||||
if (!Object.prototype.hasOwnProperty.call(parsed, "realDebridWebAccountIds")) {
|
||||
delete (mergedInput as Partial<AppSettings>).realDebridWebAccountIds;
|
||||
}
|
||||
const merged = normalizeSettings(mergedInput);
|
||||
return { settings: merged, needsCredentialRewrite };
|
||||
} catch (error) {
|
||||
|
||||
@@ -0,0 +1,175 @@
|
||||
export interface RealDebridAccountBase {
|
||||
id: string;
|
||||
kind: "api" | "web";
|
||||
index: number;
|
||||
label: string;
|
||||
maskedLogin: string;
|
||||
enabled: boolean;
|
||||
}
|
||||
|
||||
export interface RealDebridApiAccountEntry extends RealDebridAccountBase {
|
||||
kind: "api";
|
||||
token: string;
|
||||
}
|
||||
|
||||
export interface RealDebridWebAccountEntry extends RealDebridAccountBase {
|
||||
kind: "web";
|
||||
}
|
||||
|
||||
export type RealDebridAccountEntry = RealDebridApiAccountEntry | RealDebridWebAccountEntry;
|
||||
|
||||
export type RealDebridAccountSettings = {
|
||||
realDebridApiTokens?: string;
|
||||
realDebridWebAccountIds?: string[];
|
||||
realDebridDisabledAccountIds?: string[];
|
||||
};
|
||||
|
||||
const WEB_ACCOUNT_ID_RE = /^rdw_[A-Za-z0-9_-]{1,96}$/;
|
||||
const SHA256_INITIAL = [
|
||||
0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
|
||||
0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
|
||||
] as const;
|
||||
const SHA256_CONSTANTS = [
|
||||
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
|
||||
0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
|
||||
0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
|
||||
0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
|
||||
0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
|
||||
0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
|
||||
0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
|
||||
0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
|
||||
] as const;
|
||||
|
||||
function rotateRight(value: number, count: number): number {
|
||||
return (value >>> count) | (value << (32 - count));
|
||||
}
|
||||
|
||||
function sha256(text: string): string {
|
||||
const bytes = new TextEncoder().encode(text);
|
||||
const paddingLength = (64 - ((bytes.length + 1 + 8) % 64)) % 64;
|
||||
const data = new Uint8Array(bytes.length + 1 + paddingLength + 8);
|
||||
data.set(bytes);
|
||||
data[bytes.length] = 0x80;
|
||||
let bitLength = BigInt(bytes.length) * 8n;
|
||||
for (let index = 0; index < 8; index += 1) {
|
||||
data[data.length - 1 - index] = Number(bitLength & 0xffn);
|
||||
bitLength >>= 8n;
|
||||
}
|
||||
const hash: number[] = [...SHA256_INITIAL];
|
||||
const words = new Uint32Array(64);
|
||||
for (let offset = 0; offset < data.length; offset += 64) {
|
||||
const view = new DataView(data.buffer, data.byteOffset + offset, 64);
|
||||
for (let index = 0; index < 16; index += 1) {
|
||||
words[index] = view.getUint32(index * 4, false);
|
||||
}
|
||||
for (let index = 16; index < 64; index += 1) {
|
||||
const previous15 = words[index - 15];
|
||||
const previous2 = words[index - 2];
|
||||
const sigma0 = rotateRight(previous15, 7) ^ rotateRight(previous15, 18) ^ (previous15 >>> 3);
|
||||
const sigma1 = rotateRight(previous2, 17) ^ rotateRight(previous2, 19) ^ (previous2 >>> 10);
|
||||
words[index] = (words[index - 16] + sigma0 + words[index - 7] + sigma1) >>> 0;
|
||||
}
|
||||
let [a, b, c, d, e, f, g, h] = hash;
|
||||
for (let index = 0; index < 64; index += 1) {
|
||||
const upperSigma1 = rotateRight(e, 6) ^ rotateRight(e, 11) ^ rotateRight(e, 25);
|
||||
const choice = (e & f) ^ (~e & g);
|
||||
const temporary1 = (h + upperSigma1 + choice + SHA256_CONSTANTS[index] + words[index]) >>> 0;
|
||||
const upperSigma0 = rotateRight(a, 2) ^ rotateRight(a, 13) ^ rotateRight(a, 22);
|
||||
const majority = (a & b) ^ (a & c) ^ (b & c);
|
||||
const temporary2 = (upperSigma0 + majority) >>> 0;
|
||||
h = g;
|
||||
g = f;
|
||||
f = e;
|
||||
e = (d + temporary1) >>> 0;
|
||||
d = c;
|
||||
c = b;
|
||||
b = a;
|
||||
a = (temporary1 + temporary2) >>> 0;
|
||||
}
|
||||
hash[0] = (hash[0] + a) >>> 0;
|
||||
hash[1] = (hash[1] + b) >>> 0;
|
||||
hash[2] = (hash[2] + c) >>> 0;
|
||||
hash[3] = (hash[3] + d) >>> 0;
|
||||
hash[4] = (hash[4] + e) >>> 0;
|
||||
hash[5] = (hash[5] + f) >>> 0;
|
||||
hash[6] = (hash[6] + g) >>> 0;
|
||||
hash[7] = (hash[7] + h) >>> 0;
|
||||
}
|
||||
return hash.map((value) => value.toString(16).padStart(8, "0")).join("");
|
||||
}
|
||||
|
||||
function normalizeTokens(values: readonly string[]): string[] {
|
||||
const seen = new Set<string>();
|
||||
const result: string[] = [];
|
||||
for (const value of values) {
|
||||
const token = String(value || "").trim();
|
||||
if (!token || seen.has(token)) {
|
||||
continue;
|
||||
}
|
||||
seen.add(token);
|
||||
result.push(token);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function getRealDebridApiAccountId(token: string): string {
|
||||
return `rda_${sha256(String(token || "").trim()).slice(0, 32)}`;
|
||||
}
|
||||
|
||||
export function isRealDebridWebAccountId(value: string): boolean {
|
||||
return WEB_ACCOUNT_ID_RE.test(String(value || "").trim());
|
||||
}
|
||||
|
||||
export function parseRealDebridApiAccounts(raw: string): RealDebridApiAccountEntry[] {
|
||||
return normalizeTokens(String(raw || "").split(/[\n,]+/)).map((token, index) => ({
|
||||
id: getRealDebridApiAccountId(token),
|
||||
kind: "api",
|
||||
token,
|
||||
index,
|
||||
label: `API-Token ${index + 1}`,
|
||||
maskedLogin: "Geschützter API-Token",
|
||||
enabled: true
|
||||
}));
|
||||
}
|
||||
|
||||
export function serializeRealDebridApiAccounts(tokens: readonly string[]): string {
|
||||
return normalizeTokens(tokens).join("\n");
|
||||
}
|
||||
|
||||
export function normalizeRealDebridWebAccountIds(raw: unknown): string[] {
|
||||
if (!Array.isArray(raw)) {
|
||||
return [];
|
||||
}
|
||||
const seen = new Set<string>();
|
||||
const result: string[] = [];
|
||||
for (const value of raw) {
|
||||
const id = String(value || "").trim();
|
||||
if (!isRealDebridWebAccountId(id) || seen.has(id)) {
|
||||
continue;
|
||||
}
|
||||
seen.add(id);
|
||||
result.push(id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function getRealDebridAccounts(settings: RealDebridAccountSettings): RealDebridAccountEntry[] {
|
||||
const disabled = new Set(Array.isArray(settings.realDebridDisabledAccountIds) ? settings.realDebridDisabledAccountIds : []);
|
||||
const apiAccounts = parseRealDebridApiAccounts(settings.realDebridApiTokens || "").map((entry) => ({
|
||||
...entry,
|
||||
enabled: !disabled.has(entry.id)
|
||||
}));
|
||||
const webAccounts = normalizeRealDebridWebAccountIds(settings.realDebridWebAccountIds).map((id, index) => ({
|
||||
id,
|
||||
kind: "web" as const,
|
||||
index,
|
||||
label: `Browser-Login ${index + 1}`,
|
||||
maskedLogin: "Geschützter Browser-Login",
|
||||
enabled: !disabled.has(id)
|
||||
}));
|
||||
return [...apiAccounts, ...webAccounts];
|
||||
}
|
||||
|
||||
export function getRealDebridAccountIds(settings: RealDebridAccountSettings): string[] {
|
||||
return getRealDebridAccounts(settings).map((entry) => entry.id);
|
||||
}
|
||||
+7
-1
@@ -95,7 +95,13 @@ export interface DebridAccountStatus {
|
||||
export interface AppSettings {
|
||||
language: AppLanguage;
|
||||
token: string;
|
||||
realDebridUseWebLogin: boolean;
|
||||
realDebridUseWebLogin: boolean;
|
||||
realDebridApiTokens: string;
|
||||
realDebridWebAccountIds: string[];
|
||||
realDebridDisabledAccountIds: string[];
|
||||
realDebridAccountDailyLimitBytes: Record<string, number>;
|
||||
realDebridAccountDailyUsageBytes: Record<string, number>;
|
||||
realDebridAccountTotalUsageBytes: Record<string, number>;
|
||||
megaLogin: string;
|
||||
megaPassword: string;
|
||||
megaCredentials: string;
|
||||
|
||||
Reference in New Issue
Block a user