From c7ed97a452a2742c95d6a6ed3501ae8417baf356 Mon Sep 17 00:00:00 2001 From: lenafx Date: Thu, 18 Dec 2025 15:17:43 +0100 Subject: [PATCH] fixed discord rpc on anime --- desktop/package-lock.json | 144 ++++++++++++++++++++++---- desktop/package.json | 2 +- desktop/src/api/rpc/rp.service.ts | 101 +++++++----------- desktop/src/api/rpc/rpc.controller.ts | 17 ++- desktop/src/scripts/anime/player.js | 74 +++++++++---- 5 files changed, 235 insertions(+), 103 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index eba635d..3177433 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@fastify/static": "^8.3.0", - "@ryuziii/discord-rpc": "^1.0.1-rc.1", + "@xhayper/discord-rpc": "^1.3.0", "bcryptjs": "^3.0.3", "bindings": "^1.5.0", "cheerio": "^1.1.2", @@ -98,6 +98,65 @@ "dev": true, "license": "MIT" }, + "node_modules/@discordjs/collection": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz", + "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==", + "license": "Apache-2.0", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" + } + }, + "node_modules/@discordjs/rest": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.0.tgz", + "integrity": "sha512-RDYrhmpB7mTvmCKcpj+pc5k7POKszS4E2O9TYc+U+Y4iaCP+r910QdO43qmpOja8LRr1RJ0b3U+CqVsnPqzf4w==", + "license": "Apache-2.0", + "dependencies": { + "@discordjs/collection": "^2.1.1", + "@discordjs/util": "^1.1.1", + "@sapphire/async-queue": "^1.5.3", + "@sapphire/snowflake": "^3.5.3", + "@vladfrangu/async_event_emitter": "^2.4.6", + "discord-api-types": "^0.38.16", + "magic-bytes.js": "^1.10.0", + "tslib": "^2.6.3", + "undici": "6.21.3" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" + } + }, + "node_modules/@discordjs/rest/node_modules/undici": { + "version": "6.21.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz", + "integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, + "node_modules/@discordjs/util": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz", + "integrity": "sha512-3LKP7F2+atl9vJFhaBjn4nOaSWahZ/yWjOvA4e5pnXkt2qyXRCHLxoBQy81GFtLGCq7K9lPm9R517M1U+/90Qg==", + "license": "Apache-2.0", + "dependencies": { + "discord-api-types": "^0.38.33" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" + } + }, "node_modules/@electron/asar": { "version": "3.2.18", "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.18.tgz", @@ -1364,14 +1423,24 @@ "node": ">=14" } }, - "node_modules/@ryuziii/discord-rpc": { - "version": "1.0.1-rc.1", - "resolved": "https://registry.npmjs.org/@ryuziii/discord-rpc/-/discord-rpc-1.0.1-rc.1.tgz", - "integrity": "sha512-q9YgU8Rj9To1LWzo4u8cXOHUorEkB5KZ5cdW80KoYtAUx+nQy7wYCEFiNh8kcmqFqQ8m3Fsx1IXx3UpVymkaSw==", - "license": "ISC", - "dependencies": { - "@types/ws": "^8.18.1", - "ws": "^8.18.3" + "node_modules/@sapphire/async-queue": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.5.tgz", + "integrity": "sha512-cvGzxbba6sav2zZkH8GPf2oGk9yYoD5qrNWdu9fRehifgnFZJMV+nuy2nON2roRO4yQQ+v7MK/Pktl/HgfsUXg==", + "license": "MIT", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/@sapphire/snowflake": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz", + "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==", + "license": "MIT", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" } }, "node_modules/@sindresorhus/is": { @@ -1520,6 +1589,7 @@ "version": "24.10.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz", "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==", + "dev": true, "license": "MIT", "dependencies": { "undici-types": "~7.16.0" @@ -1555,15 +1625,6 @@ "license": "MIT", "optional": true }, - "node_modules/@types/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/yauzl": { "version": "2.10.3", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", @@ -1575,6 +1636,31 @@ "@types/node": "*" } }, + "node_modules/@vladfrangu/async_event_emitter": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.7.tgz", + "integrity": "sha512-Xfe6rpCTxSxfbswi/W/Pz7zp1WWSNn4A0eW4mLkQUewCrXXtMj31lCg+iQyTkh/CkusZSq9eDflu7tjEDXUY6g==", + "license": "MIT", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/@xhayper/discord-rpc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@xhayper/discord-rpc/-/discord-rpc-1.3.0.tgz", + "integrity": "sha512-0NmUTiODl7u3UEjmO6y0Syp3dmgVLAt2EHrH4QKTQcXRwtF8Wl7Eipdn/GSSZ8HkDwxQFvcDGJMxT9VWB0pH8g==", + "license": "ISC", + "dependencies": { + "@discordjs/rest": "^2.5.1", + "@vladfrangu/async_event_emitter": "^2.4.6", + "discord-api-types": "^0.38.16", + "ws": "^8.18.3" + }, + "engines": { + "node": ">=18.20.7" + } + }, "node_modules/@xmldom/xmldom": { "version": "0.8.11", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz", @@ -3051,6 +3137,15 @@ "node": "*" } }, + "node_modules/discord-api-types": { + "version": "0.38.37", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.37.tgz", + "integrity": "sha512-Cv47jzY1jkGkh5sv0bfHYqGgKOWO1peOrGMkDFM4UmaGMOTgOW8QSexhvixa9sVOiz8MnVOBryWYyw/CEVhj7w==", + "license": "MIT", + "workspaces": [ + "scripts/actions/documentation" + ] + }, "node_modules/dmg-builder": { "version": "26.0.12", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.0.12.tgz", @@ -4983,6 +5078,12 @@ "node": "20 || >=22" } }, + "node_modules/magic-bytes.js": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.12.1.tgz", + "integrity": "sha512-ThQLOhN86ZkJ7qemtVRGYM+gRgR8GEXNli9H/PMvpnZsE44Xfh3wx9kGJaldg314v85m+bFW6WBMaVHJc/c3zA==", + "license": "MIT" + }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -7444,6 +7545,12 @@ } } }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -7497,6 +7604,7 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "dev": true, "license": "MIT" }, "node_modules/unique-filename": { diff --git a/desktop/package.json b/desktop/package.json index 7d034f8..95f01a5 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -13,7 +13,7 @@ "type": "commonjs", "dependencies": { "@fastify/static": "^8.3.0", - "@ryuziii/discord-rpc": "^1.0.1-rc.1", + "@xhayper/discord-rpc": "^1.3.0", "bcryptjs": "^3.0.3", "bindings": "^1.5.0", "cheerio": "^1.1.2", diff --git a/desktop/src/api/rpc/rp.service.ts b/desktop/src/api/rpc/rp.service.ts index dd3e98b..406ff7b 100644 --- a/desktop/src/api/rpc/rp.service.ts +++ b/desktop/src/api/rpc/rp.service.ts @@ -1,16 +1,18 @@ -// @ts-ignore -import { DiscordRPCClient } from "@ryuziii/discord-rpc"; +import { Client } from "@xhayper/discord-rpc"; -let rpcClient: DiscordRPCClient | null = null; +let rpcClient: Client | null = null; let reconnectTimer: NodeJS.Timeout | null = null; -let connected: boolean = false; +let connected = false; type RPCMode = "watching" | "reading" | string; interface RPCData { details?: string; state?: string; - mode?: RPCMode; + mode?: string; + startTimestamp?: number; + endTimestamp?: number; + paused?: boolean; version?: string; } @@ -30,91 +32,68 @@ function attemptReconnect(clientId: string) { } export function initRPC(clientId: string) { - if (rpcClient) { - try { rpcClient.destroy(); } catch (e) {} + try { rpcClient.destroy(); } catch {} rpcClient = null; } + if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; } - console.log(`Discord RPC: Starting with id ...${clientId.slice(-4)}`); - - try { - - rpcClient = new DiscordRPCClient({ - clientId: clientId, - transport: 'ipc' - }); - } catch (err) { - console.error('Discord RPC:', err); - return; - } + rpcClient = new Client({ clientId }); rpcClient.on("ready", () => { connected = true; - const user = rpcClient?.user ? rpcClient.user.username : 'User'; - console.log(`Discord RPC: Authenticated for: ${user}`); + console.log("Discord RPC conectado"); setTimeout(() => { - setActivity({ details: "Browsing", state: "In App", mode: "idle" }); + setActivity({ details: "Browsing", state: "In App" }); }, 1000); }); - rpcClient.on('disconnected', () => { - console.log('Discord RPC: Desconexión detectada.'); + rpcClient.on("disconnected", () => { + connected = false; attemptReconnect(clientId); }); - rpcClient.on('error', (err: { message: any; }) => { - console.error('[Discord RPC] Error:', err.message); - - if (connected) { - attemptReconnect(clientId); - } + rpcClient.on("error", () => { + if (connected) attemptReconnect(clientId); }); - try { - rpcClient.connect().catch((err: { message: any; }) => { - console.error('Discord RPC: Error al conectar', err.message); - - attemptReconnect(clientId); - }); - } catch (err) { - console.error('Discord RPC: Error al iniciar la conexión', err); + rpcClient.login().catch(() => { attemptReconnect(clientId); - } + }); } export function setActivity(data: RPCData = {}) { if (!rpcClient || !connected) return; - let type; - let state = data.state; - let details = data.details; + let type = 0; + if (data.mode === "watching") type = 3; + if (data.mode === "reading") type = 0; - if (data.mode === "watching") { - type = 3 - } else if (data.mode === "reading") { - type = 0 + const activity: any = { + details: data.details, + state: data.state, + type, + instance: false + }; + + if (data.paused) { + activity.largeImageText = "⏸ "; + delete activity.startTimestamp; + delete activity.endTimestamp; } else { - type = 0 + activity.largeImageKey = "bigpicture"; + activity.largeImageText = data.version ?? "v2.0.0"; + + if (data.startTimestamp && data.endTimestamp) { + activity.startTimestamp = data.startTimestamp; + activity.endTimestamp = data.endTimestamp; + } } - - try { - rpcClient.setActivity({ - details: details, - state: state, - type: type, - startTimestamp: new Date(), - largeImageKey: "bigpicture", - largeImageText: "v2.0.0", - instance: false - }); - } catch (error) { - console.error("Discord RPC: Failed to set activity", error); - } + rpcClient.user?.setActivity(activity); } \ No newline at end of file diff --git a/desktop/src/api/rpc/rpc.controller.ts b/desktop/src/api/rpc/rpc.controller.ts index 42c0a28..53a1421 100644 --- a/desktop/src/api/rpc/rpc.controller.ts +++ b/desktop/src/api/rpc/rpc.controller.ts @@ -11,16 +11,29 @@ export function init() { } export async function setRPC(request: FastifyRequest, reply: FastifyReply) { - const { details, state, mode } = request.body as { + const { + details, + state, + mode, + startTimestamp, + endTimestamp, + paused + } = request.body as { details?: string; state?: string; mode?: "watching" | "reading" | string; + startTimestamp?: number; + endTimestamp?: number; + paused?: boolean; }; setActivity({ details, state, - mode + mode, + startTimestamp, + endTimestamp, + paused }); return reply.send({ ok: true }); diff --git a/desktop/src/scripts/anime/player.js b/desktop/src/scripts/anime/player.js index 72072b7..a97545e 100644 --- a/desktop/src/scripts/anime/player.js +++ b/desktop/src/scripts/anime/player.js @@ -7,6 +7,8 @@ let currentExtension = ''; let plyrInstance; let hlsInstance; let totalEpisodes = 0; +let animeTitle = ""; + const params = new URLSearchParams(window.location.search); const firstKey = params.keys().next().value; @@ -40,11 +42,8 @@ async function loadMetadata() { let format = ''; let seasonYear = ''; let season = ''; - let episodesCount = 0; - let characters = []; if (isAnilistFormat) { - title = data.title.romaji || data.title.english || data.title.native || 'Anime Title'; description = data.description || 'No description available.'; coverImage = data.coverImage?.large || data.coverImage?.medium || ''; @@ -64,18 +63,9 @@ async function loadMetadata() { document.getElementById('anime-title-details').innerText = title; document.getElementById('anime-title-details2').innerText = title; + animeTitle = title; document.title = `Watching ${title} - Ep ${currentEpisode}`; - fetch("/api/rpc", { - method: "POST", - headers: {"Content-Type": "application/json"}, - body: JSON.stringify({ - details: title, - state: `Episode ${currentEpisode}`, - mode: "watching" - }) - }); - const tempDiv = document.createElement('div'); tempDiv.innerHTML = description; document.getElementById('detail-description').innerText = tempDiv.textContent || tempDiv.innerText || 'No description available.'; @@ -350,21 +340,63 @@ function playVideo(url, subtitles = []) { settings: ['captions', 'quality', 'speed'] }); - let alreadyTriggered = false; + let rpcActive = false; + let lastSeek = 0; - video.addEventListener('timeupdate', () => { + video.addEventListener("play", () => { if (!video.duration) return; - const percent = (video.currentTime / video.duration) * 100; + const elapsed = Math.floor(video.currentTime); + const start = Math.floor(Date.now() / 1000) - elapsed; + const end = start + Math.floor(video.duration); - if (percent >= 80 && !alreadyTriggered) { - alreadyTriggered = true; - sendProgress(); - } + sendRPC({ + startTimestamp: start, + endTimestamp: end + }); + + rpcActive = true; }); + video.addEventListener("pause", () => { + if (!rpcActive) return; - video.play().catch(() => console.log("Autoplay blocked")); + sendRPC({ + paused: true + }); + }); + + video.addEventListener("seeking", () => { + lastSeek = video.currentTime; + }); + + video.addEventListener("seeked", () => { + if (video.paused || !rpcActive) return; + + const elapsed = Math.floor(video.currentTime); + const start = Math.floor(Date.now() / 1000) - elapsed; + const end = start + Math.floor(video.duration); + + sendRPC({ + startTimestamp: start, + endTimestamp: end + }); + }); + + function sendRPC({ startTimestamp, endTimestamp, paused = false } = {}) { + fetch("/api/rpc", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + details: animeTitle, + state: `Episode ${currentEpisode}`, + mode: "watching", + startTimestamp, + endTimestamp, + paused + }) + }); + } } function setLoading(message) {