From 2bbe02b69dc1fc4fe08a8d4dac51679e3300920b Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 5 Apr 2025 03:47:24 -0300 Subject: [PATCH] rebase --- invidious-companion | 2 +- patches/0001-ci-update-deno-to-2.2.5.patch | 4 +-- ...-for-an-external-videoplayback-proxy.patch | 4 +-- ...external-videoplayback-proxy-via-inf.patch | 26 ++++++++----------- ...ion-limit-on-DASH-streams-to-save-ba.patch | 4 +-- ...-env-variable-to-set-verify_requests.patch | 4 +-- ...eat-add-support-for-multiple-proxies.patch | 4 +-- ...-to-disable-potoken-generation-check.patch | 4 +-- ...add-proxy-retries-on-innertube-error.patch | 4 +-- .../0009-add-metrics-for-proxy-retries.patch | 4 +-- ...10-fix-fix-tokio-overflow-on-compile.patch | 4 +-- ...variable-for-youtube_session.frequen.patch | 4 +-- 12 files changed, 32 insertions(+), 36 deletions(-) diff --git a/invidious-companion b/invidious-companion index 0f41fe1..ca08ef1 160000 --- a/invidious-companion +++ b/invidious-companion @@ -1 +1 @@ -Subproject commit 0f41fe19781d9ce29b2043fbc8b184197ba2b6bf +Subproject commit ca08ef176acf6af7b6339670335a329db8196634 diff --git a/patches/0001-ci-update-deno-to-2.2.5.patch b/patches/0001-ci-update-deno-to-2.2.5.patch index 7189768..b2a2d81 100644 --- a/patches/0001-ci-update-deno-to-2.2.5.patch +++ b/patches/0001-ci-update-deno-to-2.2.5.patch @@ -1,7 +1,7 @@ -From 070f466db16386cf6e54b7880d84f79b4413cba4 Mon Sep 17 00:00:00 2001 +From 16ba943bf29f1745273eaeea29993c6eb710f287 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:37:34 -0300 -Subject: [PATCH 01/11] ci: update deno to 2.2.5 +Subject: [PATCH 01/12] ci: update deno to 2.2.5 --- Dockerfile | 2 +- diff --git a/patches/0002-feat-add-support-for-an-external-videoplayback-proxy.patch b/patches/0002-feat-add-support-for-an-external-videoplayback-proxy.patch index 48bee59..e10a58a 100644 --- a/patches/0002-feat-add-support-for-an-external-videoplayback-proxy.patch +++ b/patches/0002-feat-add-support-for-an-external-videoplayback-proxy.patch @@ -1,7 +1,7 @@ -From b652b922781ddbd3889a03a101015edee5cfa06f Mon Sep 17 00:00:00 2001 +From f335b46fafac4babfd1a267d5a719c606d89c890 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 18:44:10 -0300 -Subject: [PATCH 02/11] feat: add support for an external videoplayback proxy +Subject: [PATCH 02/12] feat: add support for an external videoplayback proxy --- config/config.example.toml | 1 + diff --git a/patches/0003-feat-report-the-external-videoplayback-proxy-via-inf.patch b/patches/0003-feat-report-the-external-videoplayback-proxy-via-inf.patch index 94a5273..2b88667 100644 --- a/patches/0003-feat-report-the-external-videoplayback-proxy-via-inf.patch +++ b/patches/0003-feat-report-the-external-videoplayback-proxy-via-inf.patch @@ -1,35 +1,31 @@ -From 8939348608c58d7e658ec4deab390e7e5acf3718 Mon Sep 17 00:00:00 2001 +From ada8d2b388d68abe6c5e54eb8f86214bb4a92e22 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 18:52:53 -0300 -Subject: [PATCH 03/11] feat: report the external videoplayback proxy via /info +Subject: [PATCH 03/12] feat: report the external videoplayback proxy via /info endpoint --- - src/routes/index.ts | 6 ++---- + src/routes/index.ts | 2 ++ src/routes/info.ts | 17 +++++++++++++++++ - 2 files changed, 19 insertions(+), 4 deletions(-) + 2 files changed, 19 insertions(+) create mode 100644 src/routes/info.ts diff --git a/src/routes/index.ts b/src/routes/index.ts -index 5aa9fa1..6448e3d 100644 +index 5aa9fa1..fde6a15 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts -@@ -10,7 +10,7 @@ import getDownloadHandler from "./invidious_routes/download.ts"; - import videoPlaybackProxy from "./videoPlaybackProxy.ts"; +@@ -11,6 +11,7 @@ import videoPlaybackProxy from "./videoPlaybackProxy.ts"; import health from "./health.ts"; import type { Config } from "../lib/helpers/config.ts"; --import metrics from "./metrics.ts"; + import metrics from "./metrics.ts"; +import info from "./info.ts"; export const routes = ( app: Hono, -@@ -33,7 +33,5 @@ export const routes = ( - app.route("/api/v1/captions", invidiousCaptionsApi); - app.route("/videoplayback", videoPlaybackProxy); - app.route("/healthz", health); -- if (config.server.enable_metrics) { -- app.route("/metrics", metrics); -- } +@@ -36,4 +37,5 @@ export const routes = ( + if (config.server.enable_metrics) { + app.route("/metrics", metrics); + } + app.route("/info", info); }; diff --git a/src/routes/info.ts b/src/routes/info.ts diff --git a/patches/0004-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch b/patches/0004-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch index 20dd860..90c9300 100644 --- a/patches/0004-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch +++ b/patches/0004-feat-add-resolution-limit-on-DASH-streams-to-save-ba.patch @@ -1,7 +1,7 @@ -From ee6196d73a27ef3155189583c4a0ae4aad566a82 Mon Sep 17 00:00:00 2001 +From d09d9d37f9ed91dea72e4520fa61222ebc96fd9b Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:02:01 -0300 -Subject: [PATCH 04/11] feat: add resolution limit on DASH streams to save +Subject: [PATCH 04/12] feat: add resolution limit on DASH streams to save bandwidth --- diff --git a/patches/0005-feat-add-env-variable-to-set-verify_requests.patch b/patches/0005-feat-add-env-variable-to-set-verify_requests.patch index 49105af..e69e7d9 100644 --- a/patches/0005-feat-add-env-variable-to-set-verify_requests.patch +++ b/patches/0005-feat-add-env-variable-to-set-verify_requests.patch @@ -1,7 +1,7 @@ -From fb707c08fae6bad7477ffae8570ea1746243b7a2 Mon Sep 17 00:00:00 2001 +From 1e1584338b7b023db0196062a998bd0e6ca9a394 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:06:04 -0300 -Subject: [PATCH 05/11] feat: add env variable to set verify_requests +Subject: [PATCH 05/12] feat: add env variable to set verify_requests --- src/lib/helpers/config.ts | 4 +++- diff --git a/patches/0006-feat-add-support-for-multiple-proxies.patch b/patches/0006-feat-add-support-for-multiple-proxies.patch index fb9f33f..6a5ef3f 100644 --- a/patches/0006-feat-add-support-for-multiple-proxies.patch +++ b/patches/0006-feat-add-support-for-multiple-proxies.patch @@ -1,7 +1,7 @@ -From a6742b9291518bd3dbe2599ec9acab30cfbf5e50 Mon Sep 17 00:00:00 2001 +From de0779fbbb394ab5378490194148dea4692f80ee Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 19:20:52 -0300 -Subject: [PATCH 06/11] feat: add support for multiple proxies +Subject: [PATCH 06/12] feat: add support for multiple proxies --- src/lib/helpers/getFetchClient.ts | 17 ++++++++++++++++- diff --git a/patches/0007-feat-add-option-to-disable-potoken-generation-check.patch b/patches/0007-feat-add-option-to-disable-potoken-generation-check.patch index efd5e4a..fbc16ac 100644 --- a/patches/0007-feat-add-option-to-disable-potoken-generation-check.patch +++ b/patches/0007-feat-add-option-to-disable-potoken-generation-check.patch @@ -1,7 +1,7 @@ -From ef1188070f4beaab5a7332ea1542a06d47099a82 Mon Sep 17 00:00:00 2001 +From cfa953c99a59d38c5b3a0a540da75a5144c3469d Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 24 Mar 2025 20:34:33 -0300 -Subject: [PATCH 07/11] feat: add option to disable potoken generation check +Subject: [PATCH 07/12] feat: add option to disable potoken generation check --- config/config.example.toml | 1 + diff --git a/patches/0008-add-proxy-retries-on-innertube-error.patch b/patches/0008-add-proxy-retries-on-innertube-error.patch index f4bb4dd..d16cb6e 100644 --- a/patches/0008-add-proxy-retries-on-innertube-error.patch +++ b/patches/0008-add-proxy-retries-on-innertube-error.patch @@ -1,7 +1,7 @@ -From 980102372e0368917533c1bd8c4b8380b05ee775 Mon Sep 17 00:00:00 2001 +From ad3280baeed89bc68a655469dd5db10161d2421a Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:04:47 -0300 -Subject: [PATCH 08/11] add proxy retries on innertube error +Subject: [PATCH 08/12] add proxy retries on innertube error --- src/lib/helpers/config.ts | 1 + diff --git a/patches/0009-add-metrics-for-proxy-retries.patch b/patches/0009-add-metrics-for-proxy-retries.patch index 304c143..b6d793b 100644 --- a/patches/0009-add-metrics-for-proxy-retries.patch +++ b/patches/0009-add-metrics-for-proxy-retries.patch @@ -1,7 +1,7 @@ -From 7e9c64913cb6085d94e0f2e3977d831573592fc9 Mon Sep 17 00:00:00 2001 +From b33b8ee6f6ac106dc1515ad610df61c23051fe7e Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:07:28 -0300 -Subject: [PATCH 09/11] add metrics for proxy retries +Subject: [PATCH 09/12] add metrics for proxy retries --- src/lib/helpers/metrics.ts | 5 +++++ diff --git a/patches/0010-fix-fix-tokio-overflow-on-compile.patch b/patches/0010-fix-fix-tokio-overflow-on-compile.patch index dc98bde..19e8ee7 100644 --- a/patches/0010-fix-fix-tokio-overflow-on-compile.patch +++ b/patches/0010-fix-fix-tokio-overflow-on-compile.patch @@ -1,7 +1,7 @@ -From b35e273dbbb21e872697892bdc2a2352e3161411 Mon Sep 17 00:00:00 2001 +From 702ebebb73b60e0afa8d3658b20fabcbc8515496 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 25 Mar 2025 00:24:07 -0300 -Subject: [PATCH 10/11] fix: fix tokio overflow on compile +Subject: [PATCH 10/12] fix: fix tokio overflow on compile --- Dockerfile | 2 ++ diff --git a/patches/0011-Add-environment-variable-for-youtube_session.frequen.patch b/patches/0011-Add-environment-variable-for-youtube_session.frequen.patch index c3c2cc9..01b059e 100644 --- a/patches/0011-Add-environment-variable-for-youtube_session.frequen.patch +++ b/patches/0011-Add-environment-variable-for-youtube_session.frequen.patch @@ -1,7 +1,7 @@ -From 0f41fe19781d9ce29b2043fbc8b184197ba2b6bf Mon Sep 17 00:00:00 2001 +From 6d9b72e9a8c8bc56932add51db801f7801396ca3 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Wed, 26 Mar 2025 12:24:49 -0300 -Subject: [PATCH 11/11] Add environment variable for youtube_session.frequency +Subject: [PATCH 11/12] Add environment variable for youtube_session.frequency --- src/lib/helpers/config.ts | 4 +++-