Mirrors/CrunchyDL
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed video token handeling

Browse Source
This commit is contained in:
stratuma 2024-05-24 20:18:25 +02:00
parent 4cb0c59ccf
commit 7772693134
1 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
src/api/routes/crunchyroll/crunchyroll.service.ts
View File

@ -453,6 +453,8 @@ export async function crunchyGetPlaylist(q: string, geo: string | undefined) {
data.geo = geo data.geo = geo
playlist = data playlist = data
deleteVideoToken(q, playlist.token)
} else { } else {
const error = await response.text() const error = await response.text()
const errorJSON: { const errorJSON: {
@ -502,99 +504,94 @@ export async function crunchyGetPlaylist(q: string, geo: string | undefined) {
throw new Error(e as string) throw new Error(e as string)
} }
if (isProxyActive) await deleteVideoToken(q, playlist.token) if (isProxyActive) {
decrementPlaylistCounter() for (const p of proxies) {
if (p.code !== login.country) {
for (const p of proxies) { await incrementPlaylistCounter()
if (p.code !== login.country) {
await incrementPlaylistCounter() const logindata = await crunchyLogin(account.username, account.password, p.code)
const logindata = await crunchyLogin(account.username, account.password, p.code) if (!logindata) return
if (!logindata) return const headers = {
Authorization: `Bearer ${logindata.access_token}`,
const headers = { 'X-Cr-Disable-Drm': 'true',
Authorization: `Bearer ${logindata.access_token}`, 'User-Agent': 'Crunchyroll/1.8.0 Nintendo Switch/12.3.12.0 UE4/4.27'
'X-Cr-Disable-Drm': 'true',
'User-Agent': 'Crunchyroll/1.8.0 Nintendo Switch/12.3.12.0 UE4/4.27'
}
const responseProx = await fetch(
`https://cr-play-service.prd.crunchyrollsvc.com/v1/${q}${
endpoints.find((e) => e.id === endpoint) ? endpoints.find((e) => e.id === endpoint)?.url : '/console/switch/play'
}`,
{
method: 'GET',
headers: headers
} }
)
const responseProx = await fetch(
if (responseProx.ok) { `https://cr-play-service.prd.crunchyrollsvc.com/v1/${q}${
const dataProx: VideoPlaylistNoGEO = JSON.parse(await responseProx.text()) endpoints.find((e) => e.id === endpoint) ? endpoints.find((e) => e.id === endpoint)?.url : '/console/switch/play'
}`,
dataProx.hardSubs = Object.values((dataProx as any).hardSubs) {
method: 'GET',
dataProx.subtitles = Object.values((dataProx as any).subtitles) headers: headers
for (const v of dataProx.versions) {
if (!playlist.versions.find((ver) => ver.guid === v.guid)) {
playlist.versions.push({ ...v, geo: p.code })
} }
} )
for (const v of dataProx.subtitles) { if (responseProx.ok) {
if (!playlist.subtitles.find((ver) => ver.language === v.language)) { const dataProx: VideoPlaylistNoGEO = JSON.parse(await responseProx.text())
playlist.subtitles.push({ ...v, geo: p.code })
dataProx.hardSubs = Object.values((dataProx as any).hardSubs)
dataProx.subtitles = Object.values((dataProx as any).subtitles)
for (const v of dataProx.versions) {
if (!playlist.versions.find((ver) => ver.guid === v.guid)) {
playlist.versions.push({ ...v, geo: p.code })
}
} }
}
for (const v of dataProx.subtitles) {
for (const v of dataProx.hardSubs) { if (!playlist.subtitles.find((ver) => ver.language === v.language)) {
if (!playlist.hardSubs.find((ver) => ver.hlang === v.hlang)) { playlist.subtitles.push({ ...v, geo: p.code })
playlist.hardSubs.push({ ...v, geo: p.code }) }
} }
}
for (const v of dataProx.hardSubs) {
await deleteVideoToken(q, dataProx.token) if (!playlist.hardSubs.find((ver) => ver.hlang === v.hlang)) {
} else { playlist.hardSubs.push({ ...v, geo: p.code })
decrementPlaylistCounter() }
const error = await responseProx.text() }
const errorJSON: {
activeStreams: { deleteVideoToken(q, dataProx.token)
accountId: string } else {
active: boolean decrementPlaylistCounter()
assetId: string const error = await responseProx.text()
clientId: string const errorJSON: {
contentId: string activeStreams: {
country: string accountId: string
createdTimestamp: string active: boolean
deviceSubtype: string assetId: string
deviceType: string clientId: string
episodeIdentity: string contentId: string
id: string country: string
token: string createdTimestamp: string
}[] deviceSubtype: string
} = await JSON.parse(error) deviceType: string
episodeIdentity: string
if (errorJSON && errorJSON.activeStreams && errorJSON.activeStreams.length !== 0) { id: string
for (const e of errorJSON.activeStreams) { token: string
await deleteVideoToken(e.contentId, e.token) }[]
} = await JSON.parse(error)
if (errorJSON && errorJSON.activeStreams && errorJSON.activeStreams.length !== 0) {
for (const e of errorJSON.activeStreams) {
deleteVideoToken(e.contentId, e.token)
}
server.logger.log({
level: 'error',
message: 'Refetching Crunchyroll Video Playlist & Deleting all Video Token because too many streams',
error: errorJSON,
timestamp: new Date().toISOString(),
section: 'playlistCrunchyrollFetch'
})
} }
server.logger.log({
level: 'error',
message: 'Refetching Crunchyroll Video Playlist & Deleting all Video Token because too many streams',
error: errorJSON,
timestamp: new Date().toISOString(),
section: 'playlistCrunchyrollFetch'
})
} }
} }
} }
} }
await incrementPlaylistCounter()
await activateVideoToken(q, playlist.token)
return { data: playlist, account_id: login.account_id } return { data: playlist, account_id: login.account_id }
} }
@ -630,6 +627,7 @@ export async function removeVideoToken(content: string, token: string) {
return 'ok' return 'ok'
} else { } else {
decrementPlaylistCounter()
const error = await response.text() const error = await response.text()
// messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error) // messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error)
server.logger.log({ server.logger.log({
@ -675,6 +673,7 @@ export async function deleteVideoToken(content: string, token: string) {
return 'ok' return 'ok'
} else { } else {
decrementPlaylistCounter()
const error = await response.text() const error = await response.text()
// messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error) // messageBox('error', ['Cancel'], 2, 'Failed to delete Crunchyroll Video Token', 'Failed to delete Crunchyroll Video Token', error)
server.logger.log({ server.logger.log({
@ -702,6 +701,7 @@ export async function activateVideoToken(content: string, token: string) {
Authorization: `Bearer ${login.access_token}` Authorization: `Bearer ${login.access_token}`
} }
await incrementPlaylistCounter()
const response = await fetch(`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${content}/${token}/keepAlive?playhead=1`, { const response = await fetch(`https://cr-play-service.prd.crunchyrollsvc.com/v1/token/${content}/${token}/keepAlive?playhead=1`, {
method: 'PATCH', method: 'PATCH',
headers: headers headers: headers
@ -716,8 +716,6 @@ export async function activateVideoToken(content: string, token: string) {
section: 'tokenDeletionCrunchyrollFetch' section: 'tokenDeletionCrunchyrollFetch'
}) })
decrementPlaylistCounter()
return 'ok' return 'ok'
} else { } else {
const error = await response.text() const error = await response.text()
@ -757,6 +755,8 @@ export async function crunchyGetPlaylistMPD(q: string, geo: string | undefined)
const contentID = match[1] const contentID = match[1]
const playlistID = match[2] const playlistID = match[2]
await activateVideoToken(contentID, playlistID)
try { try {
const response = await fetch(q, { const response = await fetch(q, {
method: 'GET', method: 'GET',
@ -764,7 +764,7 @@ export async function crunchyGetPlaylistMPD(q: string, geo: string | undefined)
}) })
if (response.ok) { if (response.ok) {
await deleteVideoToken(contentID, playlistID) deleteVideoToken(contentID, playlistID)
const raw = await response.text() const raw = await response.text()
const parsed = mpdParse(raw) const parsed = mpdParse(raw)
@ -780,7 +780,6 @@ export async function crunchyGetPlaylistMPD(q: string, geo: string | undefined)
if (errorJSON.error === 'Invalid streaming token') { if (errorJSON.error === 'Invalid streaming token') {
decrementPlaylistCounter() decrementPlaylistCounter()
await incrementPlaylistCounter()
await activateVideoToken(contentID, playlistID) await activateVideoToken(contentID, playlistID)
return await crunchyGetPlaylistMPD(q, geo) return await crunchyGetPlaylistMPD(q, geo)
} }
@ -881,11 +880,11 @@ export async function checkAccountMaxStreams() {
if (!data.items || data.items.length === 0) return 1 if (!data.items || data.items.length === 0) return 1
if (data.items.find((i) => i.benefit === 'concurrent_streams.4')) return 2 if (data.items.find((i) => i.benefit === 'concurrent_streams.4')) return 4
if (data.items.find((i) => i.benefit === 'concurrent_streams.1')) return 1 if (data.items.find((i) => i.benefit === 'concurrent_streams.1')) return 1
if (data.items.find((i) => i.benefit === 'concurrent_streams.6')) return 3 if (data.items.find((i) => i.benefit === 'concurrent_streams.6')) return 6
return 1 return 1
} else { } else {