diff --git a/package-lock.json b/package-lock.json index d8c6d6c3d5..7c8e4d15ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@freearhey/core": "^0.14.3", "@freearhey/storage-js": "^0.1.0", "@inquirer/prompts": "^7.8.0", - "@iptv-org/sdk": "^1.1.4", + "@iptv-org/sdk": "^1.4.0", "@octokit/core": "^7.0.3", "@octokit/plugin-paginate-graphql": "^6.0.0", "@octokit/plugin-paginate-rest": "^13.1.1", @@ -726,15 +726,12 @@ } }, "node_modules/@freearhey/search-js": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@freearhey/search-js/-/search-js-0.2.1.tgz", - "integrity": "sha512-RXVJ2AaXjnrLPpLHCOWrdgtYc4SZplYl905INFmhL6V8jcyIrX+qrjkAjwAHqWDTnJSYfSG9D9Xr+EyKx/eXng==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@freearhey/search-js/-/search-js-0.3.0.tgz", + "integrity": "sha512-wsUBM1vA+fRqGZ+G5EnR7v52KxomoCsVOnlv43kHWt2G/LNs5pGM+aLAyx0MO/sDyBo3ADgw1h30Ydi6+1CMeQ==", "license": "MIT", - "dependencies": { - "lodash": "^4.17.21" - }, "engines": { - "node": ">=16.0.0" + "node": ">=16.6.0" } }, "node_modules/@freearhey/storage-js": { @@ -1126,15 +1123,15 @@ } }, "node_modules/@iptv-org/sdk": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@iptv-org/sdk/-/sdk-1.1.4.tgz", - "integrity": "sha512-NFviCin8V9rKPP+GG7xZ0mVi+WCwxqTFzjRH8or9KVLemFXrGI+ibGQ1PgiGUadRFSxTejXo2Dvwjwdwr2NTiQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@iptv-org/sdk/-/sdk-1.4.0.tgz", + "integrity": "sha512-elnrVBBaZAGKlcb/2+5M1BuHSjD10z5yUsPn3sRY/9a9kwgbcsZ2h6ylh0QON0FY54xy8Ee1Y5ORuc45o3VLVw==", "license": "UNLICENSED", "dependencies": { "@freearhey/core": "^0.15.1", - "@freearhey/search-js": "^0.2.1", + "@freearhey/search-js": "^0.3.0", "@ntlab/sfetch": "^1.2.0", - "axios": "^1.11.0", + "axios": "^1.15.2", "dayjs": "^1.11.18" } }, @@ -3169,9 +3166,6 @@ "cpu": [ "arm64" ], - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3185,9 +3179,6 @@ "cpu": [ "arm64" ], - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3201,9 +3192,6 @@ "cpu": [ "ppc64" ], - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3217,9 +3205,6 @@ "cpu": [ "riscv64" ], - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3233,9 +3218,6 @@ "cpu": [ "riscv64" ], - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3249,9 +3231,6 @@ "cpu": [ "s390x" ], - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3265,9 +3244,6 @@ "cpu": [ "x64" ], - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3281,9 +3257,6 @@ "cpu": [ "x64" ], - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ diff --git a/package.json b/package.json index 416124fe20..f90541275a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@freearhey/core": "^0.14.3", "@freearhey/storage-js": "^0.1.0", "@inquirer/prompts": "^7.8.0", - "@iptv-org/sdk": "^1.1.4", + "@iptv-org/sdk": "^1.4.0", "@octokit/core": "^7.0.3", "@octokit/plugin-paginate-graphql": "^6.0.0", "@octokit/plugin-paginate-rest": "^13.1.1", diff --git a/scripts/commands/playlist/update.ts b/scripts/commands/playlist/update.ts index 5436443cf6..81db4dce69 100644 --- a/scripts/commands/playlist/update.ts +++ b/scripts/commands/playlist/update.ts @@ -1,4 +1,4 @@ -import { isURI, getStreamInfo, loadIssues, createThread } from '../../utils' +import { getStreamInfo, loadIssues, createThread } from '../../utils' import { STREAMS_DIR, LOGS_DIR } from '../../constants' import { Playlist, Issue, Stream } from '../../models' import { loadData, data as apiData } from '../../api' @@ -12,6 +12,15 @@ const skippedIssues = new Collection() const logger = new Logger({ level: 5 }) let streams = new Collection() +let cache = new Collection() + +function cacheData() { + cache = streams.clone() +} + +function resetData() { + streams = cache +} async function main() { logger.info('loading data from api...') @@ -97,7 +106,11 @@ async function removeStream(issue: Issue) { log.start() const data = issue.data - if (data.missing('stream_url')) return + if (data.missing('stream_url')) { + log.error('The request is missing the "Stream URL"') + skippedIssues.add(issue) + return + } const streamUrls = data.getString('stream_url') || '' @@ -105,55 +118,119 @@ async function removeStream(issue: Issue) { streamUrls .split(/\r?\n/) .filter(Boolean) - .forEach(link => { + .forEach((link: string) => { const found: Stream = streams.first((_stream: Stream) => _stream.url === link.trim()) if (found) { found.removed = true changed = true + log.info(`The stream with the URL "${link}" has been removed from the playlists`) + } else { + log.error(`The stream with the URL "${link}" is missing from the playlists`) } }) - if (changed) processedIssues.add(issue) + if (changed) { + processedIssues.add(issue) + } else { + log.error(`None of the URLs specified in the request were found in the playlists`) + skippedIssues.add(issue) + } } async function editStream(issue: Issue) { + const log = createThread(issue, 'streams/edit') + log.start() + const data = issue.data - if (data.missing('stream_url')) return + const streamUrl = data.getString('stream_url') - const stream: Stream = streams.first( - (_stream: Stream) => _stream.url === data.getString('stream_url') - ) - if (!stream) return - - const streamId = data.getString('stream_id') || '' - const [channelId, feedId] = streamId.split('@') - - if (channelId) { - stream.channel = channelId - stream.feed = feedId - stream.updateTvgId().updateTitle().updateFilepath() + if (!streamUrl) { + log.error('The request is missing the "Stream URL"') + skippedIssues.add(issue) + return } + const stream: Stream = streams.first((_stream: Stream) => _stream.url === streamUrl) + if (!stream) { + log.error(`The stream with the URL "${streamUrl}" is already in the playlists`) + skippedIssues.add(issue) + return + } + + cacheData() + stream.updateWithIssue(data) + const errors = new Collection() + errors.concat(stream.validate()) + if (errors.isNotEmpty()) { + errors.forEach((err: Error) => { + log.error(err.message) + }) + skippedIssues.add(issue) + resetData() + log.info('All changes have been reverted') + return + } + + log.info('The stream description has been updated') + processedIssues.add(issue) } async function addStream(issue: Issue) { + const log = createThread(issue, 'streams/add') + log.start() + const data = issue.data - if (data.missing('stream_id') || data.missing('stream_url')) return - if (streams.includes((_stream: Stream) => _stream.url === data.getString('stream_url'))) return - const streamUrl = data.getString('stream_url') || '' - if (!isURI(streamUrl)) return + if (data.missing('stream_id')) { + log.error('The request is missing the "Stream ID"') + skippedIssues.add(issue) + return + } + + const streamUrl = data.getString('stream_url') + if (!streamUrl) { + log.error('The request is missing the "Stream URL"') + skippedIssues.add(issue) + return + } + + if (streams.includes((_stream: Stream) => _stream.url === streamUrl)) { + log.error(`The stream with the URL "${streamUrl}" is already included in the playlists`) + skippedIssues.add(issue) + return + } const streamId = data.getString('stream_id') || '' const [channelId, feedId] = streamId.split('@') const channel: sdk.Models.Channel | undefined = apiData.channelsKeyById.get(channelId) - if (!channel) return + if (!channel) { + log.error(`There is no channel with the ID "${channelId}" in the database`) + skippedIssues.add(issue) + return + } + + const blocklistRecords: sdk.Models.BlocklistRecord[] | undefined = + apiData.blocklistRecordsGroupedByChannel.get(channelId) + if (blocklistRecords) { + blocklistRecords.forEach((record: sdk.Models.BlocklistRecord) => { + if (record.reason === 'dmca') { + log.error( + `The channel has been added to our blocklist due to the claims of the copyright holder: ${record.ref}` + ) + } else if (record.reason === 'nsfw') { + log.error(`The channel has been added to our blocklist due to NSFW content: ${record.ref}`) + } + }) + skippedIssues.add(issue) + return + } + + cacheData() - const label = data.getString('label') || '' const httpUserAgent = data.getString('http_user_agent') || null const httpReferrer = data.getString('http_referrer') || null @@ -177,12 +254,27 @@ async function addStream(issue: Issue) { url: streamUrl, user_agent: httpUserAgent, referrer: httpReferrer, - quality + quality, + label: data.getString('label') || '' }) - stream.label = label stream.updateTitle().updateFilepath() streams.add(stream) + + const errors = new Collection() + errors.concat(stream.validate()) + if (errors.isNotEmpty()) { + errors.forEach((err: Error) => { + log.error(err.message) + }) + skippedIssues.add(issue) + resetData() + log.info('All changes have been reverted') + return + } + + log.info('The stream has been added to playlists') + processedIssues.add(issue) } diff --git a/scripts/models/issue.ts b/scripts/models/issue.ts index 4b81d69484..28458ce75d 100644 --- a/scripts/models/issue.ts +++ b/scripts/models/issue.ts @@ -1,15 +1,15 @@ -import { IssueData } from '../core' +import { DataSet } from '../core' type IssueProps = { number: number labels: string[] - data: IssueData + data: DataSet } export class Issue { number: number labels: string[] - data: IssueData + data: DataSet constructor({ number, labels, data }: IssueProps) { this.number = number diff --git a/scripts/models/stream.ts b/scripts/models/stream.ts index 243c751c46..61dace58cf 100644 --- a/scripts/models/stream.ts +++ b/scripts/models/stream.ts @@ -1,8 +1,8 @@ +import { normalizeURL, isURI } from '../utils' import { Collection } from '@freearhey/core' import parser from 'iptv-playlist-parser' -import { normalizeURL } from '../utils' import * as sdk from '@iptv-org/sdk' -import { IssueData } from '../core' +import { DataSet } from '../core' import { data } from '../api' import path from 'node:path' @@ -12,15 +12,32 @@ export class Stream extends sdk.Models.Stream { groupTitle: string = 'Undefined' removed: boolean = false tvgId?: string - label: string | null statusCode?: string - updateWithIssue(issueData: IssueData): this { + validate(): Collection { + const errors = new Collection() + if (!isURI(this.url)) { + errors.add(new Error(`The stream URL "${this.url}" is invalid`)) + } + + return errors + } + + updateWithIssue(dataSet: DataSet): this { + const streamId = dataSet.getString('stream_id') || '' + const [channelId, feedId] = streamId.split('@') + + if (channelId) { + this.channel = channelId + this.feed = feedId + this.updateTvgId().updateTitle().updateFilepath() + } + const data = { - label: issueData.getString('label'), - quality: issueData.getString('quality'), - httpUserAgent: issueData.getString('http_user_agent'), - httpReferrer: issueData.getString('http_referrer') + label: dataSet.getString('label'), + quality: dataSet.getString('quality'), + httpUserAgent: dataSet.getString('http_user_agent'), + httpReferrer: dataSet.getString('http_referrer') } if (data.label !== undefined) this.label = data.label diff --git a/scripts/utils.ts b/scripts/utils.ts index 929a379ebb..6c4cc2c1e4 100644 --- a/scripts/utils.ts +++ b/scripts/utils.ts @@ -18,7 +18,7 @@ import fs from 'node:fs' export function isURI(string: string): boolean { try { const url = new URL(string) - return /^(http:|https:|mmsh:|rtsp:|rtmp:)/.test(url.protocol) + return /^(http:|https:|mmsh:|rtsp:|rtmp:|srt:|rtp:|udp:)/.test(url.protocol) } catch { return false } diff --git a/tests/__data__/expected/playlist_update/streams/fr.m3u b/tests/__data__/expected/playlist_update/streams/fr.m3u index 12427bf56b..63258336fb 100644 --- a/tests/__data__/expected/playlist_update/streams/fr.m3u +++ b/tests/__data__/expected/playlist_update/streams/fr.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="TFX.fr@SD",TFX (720p) +#EXTINF:-1 tvg-id="TFX.fr@SD",TFX #EXTVLCOPT:http-referrer=https://pkpakiplay.xyz/ #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1 -https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.mpd?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY +srt://stream.alabbassia.com:8890?mode=caller&latency=200&streamid=read:live/alabbassia diff --git a/tests/__data__/input/issues.js b/tests/__data__/input/issues.js index 206a5571a7..c51bc99da3 100644 --- a/tests/__data__/input/issues.js +++ b/tests/__data__/input/issues.js @@ -538,7 +538,7 @@ module.exports = [ closed_at: null, author_association: 'COLLABORATOR', active_lock_reason: null, - body: '### Stream ID\n\nTFX.fr\n\n### Stream URL\n\nhttps://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.mpd?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY\n\n### Label\n\nNone\n\n### HTTP User Agent\n\nMozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1\n\n### HTTP Referrer\n\nhttps://pkpakiplay.xyz/\n\n### Notes (optional)\n\nSource: https://github.com/iptv-org/iptv-org.github.io/issues/1381\n\n### Contributing Guide\n\n- [X] I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md)', + body: '### Stream ID\n\nTFX.fr\n\n### Stream URL\n\nsrt://stream.alabbassia.com:8890?mode=caller&latency=200&streamid=read:live/alabbassia\n\n### Label\n\nNone\n\n### HTTP User Agent\n\nMozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1\n\n### HTTP Referrer\n\nhttps://pkpakiplay.xyz/\n\n### Notes (optional)\n\nSource: https://github.com/iptv-org/iptv-org.github.io/issues/1381\n\n### Contributing Guide\n\n- [X] I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md)', reactions: { url: 'https://api.github.com/repos/iptv-org/iptv/issues/14175/reactions', total_count: 0,