From 25eb88fdf817def691763cc8a8470cc9b710061c Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 22:34:21 -0300 Subject: [PATCH] add missing metrics on potoken.ts (youtubePlayerParsing) --- ...-support-for-an-external-videoplayback-proxy.patch | 2 +- ...ort-the-external-videoplayback-proxy-via-inf.patch | 2 +- ...-resolution-limit-on-DASH-streams-to-save-ba.patch | 2 +- ...feat-add-env-variable-to-set-verify_requests.patch | 2 +- .../0005-feat-add-support-for-multiple-proxies.patch | 2 +- patches/0006-ci-update-deno-to-2.2.4.patch | 2 +- ...0007-fix-cut-off-secret_key-to-16-characters.patch | 2 +- ...d-option-to-disable-potoken-generation-check.patch | 2 +- ...t-add-support-for-encrypted-query-parameters.patch | 2 +- .../0010-add-proxy-retries-on-innertube-error.patch | 2 +- patches/0011-add-support-for-prometheus-metrics.patch | 11 ++++++----- patches/0012-add-metrics-for-proxy-retries.patch | 2 +- patches/0013-fix-fix-tokio-overflow-on-compile.patch | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) diff --git a/patches/0001-feat-add-support-for-an-external-videoplayback-proxy.patch b/patches/0001-feat-add-support-for-an-external-videoplayback-proxy.patch index 0077e69..0e9d0cb 100644 --- a/patches/0001-feat-add-support-for-an-external-videoplayback-proxy.patch +++ b/patches/0001-feat-add-support-for-an-external-videoplayback-proxy.patch @@ -1,4 +1,4 @@ -From 7851eff59e43a0d5fbbfd9a334e360e651ad425d Mon Sep 17 00:00:00 2001 +From c3c8c0cd98efe772e0b980ae724e2dc8ab15f3d6 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 18:44:10 -0300 Subject: [PATCH 01/13] feat: add support for an external videoplayback proxy diff --git a/patches/0002-feat-report-the-external-videoplayback-proxy-via-inf.patch b/patches/0002-feat-report-the-external-videoplayback-proxy-via-inf.patch index 713de24..595e762 100644 --- a/patches/0002-feat-report-the-external-videoplayback-proxy-via-inf.patch +++ b/patches/0002-feat-report-the-external-videoplayback-proxy-via-inf.patch @@ -1,4 +1,4 @@ -From 928235f1990e44543f6ee64d98826fb5b6dad54f Mon Sep 17 00:00:00 2001 +From c5edaf6ddf54e3fb91ddfc9fe2756329fb07f7d3 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 18:52:53 -0300 Subject: [PATCH 02/13] feat: report the external videoplayback proxy via /info diff --git a/patches/0003-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch b/patches/0003-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch index ab084fa..cfe04ef 100644 --- a/patches/0003-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch +++ b/patches/0003-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch @@ -1,4 +1,4 @@ -From 900ea1d2c60cc9e251c6f327e6acc1cf85b5c0dd Mon Sep 17 00:00:00 2001 +From a60fe70697496cf26f139bac27d2d06cac164355 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:02:01 -0300 Subject: [PATCH 03/13] feat: add resolution limit on DASH streams to save diff --git a/patches/0004-feat-add-env-variable-to-set-verify_requests.patch b/patches/0004-feat-add-env-variable-to-set-verify_requests.patch index bd2ce13..54f59d8 100644 --- a/patches/0004-feat-add-env-variable-to-set-verify_requests.patch +++ b/patches/0004-feat-add-env-variable-to-set-verify_requests.patch @@ -1,4 +1,4 @@ -From 85fd63770061b5c8410f318fe508371db9c3bfa7 Mon Sep 17 00:00:00 2001 +From 3111af203b193db043893b965880a8cb636475b2 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:06:04 -0300 Subject: [PATCH 04/13] feat: add env variable to set verify_requests diff --git a/patches/0005-feat-add-support-for-multiple-proxies.patch b/patches/0005-feat-add-support-for-multiple-proxies.patch index 2fcc359..a1bc157 100644 --- a/patches/0005-feat-add-support-for-multiple-proxies.patch +++ b/patches/0005-feat-add-support-for-multiple-proxies.patch @@ -1,4 +1,4 @@ -From 0a7ae6d4acd1aa0ac1d99467ef5dc3a7e7e75bde Mon Sep 17 00:00:00 2001 +From 4a1bb8d20f50ac71a27afd60d8765f97db0d7bc7 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:20:52 -0300 Subject: [PATCH 05/13] feat: add support for multiple proxies diff --git a/patches/0006-ci-update-deno-to-2.2.4.patch b/patches/0006-ci-update-deno-to-2.2.4.patch index beac54c..46e269d 100644 --- a/patches/0006-ci-update-deno-to-2.2.4.patch +++ b/patches/0006-ci-update-deno-to-2.2.4.patch @@ -1,4 +1,4 @@ -From fd9e11162bde15d53fecedf3fa8114f02dcda052 Mon Sep 17 00:00:00 2001 +From 1cb4d096aaf963ad2018c18043ec6c6f687d81bc Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:37:34 -0300 Subject: [PATCH 06/13] ci: update deno to 2.2.4 diff --git a/patches/0007-fix-cut-off-secret_key-to-16-characters.patch b/patches/0007-fix-cut-off-secret_key-to-16-characters.patch index 2c8492f..347583e 100644 --- a/patches/0007-fix-cut-off-secret_key-to-16-characters.patch +++ b/patches/0007-fix-cut-off-secret_key-to-16-characters.patch @@ -1,4 +1,4 @@ -From 47295d3babce911018e1aa92554a1ff1dfb24d29 Mon Sep 17 00:00:00 2001 +From 2b69d230936fc6989aab62a7b10816a828234f78 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 20:22:19 -0300 Subject: [PATCH 07/13] fix: cut off secret_key to 16 characters diff --git a/patches/0008-feat-add-option-to-disable-potoken-generation-check.patch b/patches/0008-feat-add-option-to-disable-potoken-generation-check.patch index 13d9a41..86313ec 100644 --- a/patches/0008-feat-add-option-to-disable-potoken-generation-check.patch +++ b/patches/0008-feat-add-option-to-disable-potoken-generation-check.patch @@ -1,4 +1,4 @@ -From 76489c09990cfeda96d99b7ad72a0b47d7231364 Mon Sep 17 00:00:00 2001 +From 1e3808f741cd6fd5065c539d1b93b09e888aba20 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 20:34:33 -0300 Subject: [PATCH 08/13] feat: add option to disable potoken generation check diff --git a/patches/0009-feat-add-support-for-encrypted-query-parameters.patch b/patches/0009-feat-add-support-for-encrypted-query-parameters.patch index bbe6de1..7261214 100644 --- a/patches/0009-feat-add-support-for-encrypted-query-parameters.patch +++ b/patches/0009-feat-add-support-for-encrypted-query-parameters.patch @@ -1,4 +1,4 @@ -From a5c04d5daba5f12bd078b76c18d0d2fa073a3893 Mon Sep 17 00:00:00 2001 +From 522b4c07a38c17fb822ffbd3b7d331f06c517816 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 21:38:33 -0300 Subject: [PATCH 09/13] feat: add support for encrypted query parameters diff --git a/patches/0010-add-proxy-retries-on-innertube-error.patch b/patches/0010-add-proxy-retries-on-innertube-error.patch index 4a00927..f4bfa6f 100644 --- a/patches/0010-add-proxy-retries-on-innertube-error.patch +++ b/patches/0010-add-proxy-retries-on-innertube-error.patch @@ -1,4 +1,4 @@ -From 33f634b5cd1c5e052a712817b1aabdbbe8b54479 Mon Sep 17 00:00:00 2001 +From cf2b1bf9570193caf2dba89bcb70d5866c3ff48c Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:04:47 -0300 Subject: [PATCH 10/13] add proxy retries on innertube error diff --git a/patches/0011-add-support-for-prometheus-metrics.patch b/patches/0011-add-support-for-prometheus-metrics.patch index 90585e0..c14c2b7 100644 --- a/patches/0011-add-support-for-prometheus-metrics.patch +++ b/patches/0011-add-support-for-prometheus-metrics.patch @@ -1,4 +1,4 @@ -From fb9be9f05295bd556839e88614f0422b4959cc70 Mon Sep 17 00:00:00 2001 +From 47408b3c92af445f7d73056ce68c325437c78be1 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 18 Mar 2025 16:38:23 -0300 Subject: [PATCH 11/13] add support for prometheus metrics @@ -23,7 +23,7 @@ fix: add missing metrics argument src/lib/helpers/config.ts | 11 +- src/lib/helpers/metrics.ts | 112 + src/lib/helpers/youtubePlayerHandling.ts | 34 +- - src/lib/jobs/potoken.ts | 84 +- + src/lib/jobs/potoken.ts | 85 +- src/lib/types/HonoVariables.ts | 2 + src/main.ts | 20 +- src/routes/index.ts | 4 + @@ -32,7 +32,7 @@ fix: add missing metrics argument src/routes/invidious_routes/latestVersion.ts | 2 + src/routes/metrics.ts | 11 + src/routes/youtube_api_routes/player.ts | 2 + - 15 files changed, 252 insertions(+), 2016 deletions(-) + 15 files changed, 253 insertions(+), 2016 deletions(-) create mode 100644 src/lib/helpers/metrics.ts create mode 100644 src/routes/metrics.ts @@ -2366,7 +2366,7 @@ index 396eabf..2ae878d 100644 return videoOnlyNecessaryInfo; diff --git a/src/lib/jobs/potoken.ts b/src/lib/jobs/potoken.ts -index 3e5dfc0..ed082a0 100644 +index 3e5dfc0..e7da3c0 100644 --- a/src/lib/jobs/potoken.ts +++ b/src/lib/jobs/potoken.ts @@ -7,6 +7,7 @@ import { @@ -2385,7 +2385,7 @@ index 3e5dfc0..ed082a0 100644 ): Promise<{ innertubeClient: Innertube; tokenMinter: BG.WebPoMinter }> => { if (innertubeClient.session.po_token) { innertubeClient = await Innertube.create({ -@@ -135,48 +137,50 @@ export const poTokenGenerate = async ( +@@ -135,48 +137,51 @@ export const poTokenGenerate = async ( generate_session_locally: true, }); @@ -2446,6 +2446,7 @@ index 3e5dfc0..ed082a0 100644 + videoId: video.id, + config, + tokenMinter: integrityTokenBasedMinter, ++ metrics, + overrideCache: true, + }); + const videoInfo = youtubeVideoInfo( diff --git a/patches/0012-add-metrics-for-proxy-retries.patch b/patches/0012-add-metrics-for-proxy-retries.patch index 5193966..fdb15d7 100644 --- a/patches/0012-add-metrics-for-proxy-retries.patch +++ b/patches/0012-add-metrics-for-proxy-retries.patch @@ -1,4 +1,4 @@ -From a3ea592b89c4bc27ac087d4207563d82a9c50592 Mon Sep 17 00:00:00 2001 +From 31634246f1bd2081b4cbce8045c71c89153465a3 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:07:28 -0300 Subject: [PATCH 12/13] add metrics for proxy retries diff --git a/patches/0013-fix-fix-tokio-overflow-on-compile.patch b/patches/0013-fix-fix-tokio-overflow-on-compile.patch index 3d36ba1..df16017 100644 --- a/patches/0013-fix-fix-tokio-overflow-on-compile.patch +++ b/patches/0013-fix-fix-tokio-overflow-on-compile.patch @@ -1,4 +1,4 @@ -From 17122bda7e85d01d0ae799098306424e672ccf7d Mon Sep 17 00:00:00 2001 +From bb87a733b0255abe1827d8e23e5b75bebe35f6ee Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:24:07 -0300 Subject: [PATCH 13/13] fix: fix tokio overflow on compile