Another attempt

Signed-off-by: Fijxu <fijxu@nadeko.net>

.forgejo/workflows/ci.yml

@@ -34,8 +34,8 @@ jobs:
       with:
         images: git.nadeko.net/fijxu/invidious
         tags: |
-          type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-          type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+          type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-experimental-,enable=${{ github.ref == format('refs/heads/{0}', 'experimental') }}
+          type=raw,value=latest-experimental,enable=${{ github.ref == format('refs/heads/{0}', 'experimental') }}
 
     - uses: https://code.forgejo.org/docker/build-push-action@v5
       name: Build images

src/invidious.cr

@@ -67,12 +67,11 @@ REDIS_DB = Redis::PooledClient.new(unixsocket: CONFIG.redis_socket || nil, url:
 if REDIS_DB.ping
   puts "Connected to redis"
 end
-ARCHIVE_URL     = URI.parse("https://archive.org")
-PUBSUB_URL      = URI.parse("https://pubsubhubbub.appspot.com")
-REDDIT_URL      = URI.parse("https://www.reddit.com")
-YT_URL          = URI.parse("https://www.youtube.com")
-HOST_URL        = make_host_url(Kemal.config)
-EXT_VIDEOP_LIST = gen_videoplayback_proxy_list()
+ARCHIVE_URL = URI.parse("https://archive.org")
+PUBSUB_URL  = URI.parse("https://pubsubhubbub.appspot.com")
+REDDIT_URL  = URI.parse("https://www.reddit.com")
+YT_URL      = URI.parse("https://www.youtube.com")
+HOST_URL    = make_host_url(Kemal.config)
 
 CHARS_SAFE         = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
 TEST_IDS           = {"AgbeGFYluEA", "BaW_jenozKc", "a9LDPn-MO4I", "ddFvjfvPnqk", "iqKdEhx-dD4"}
@@ -189,14 +188,10 @@ Invidious::Jobs.register Invidious::Jobs::ClearExpiredItemsJob.new
 
 Invidious::Jobs.register Invidious::Jobs::InstanceListRefreshJob.new
 
-if !CONFIG.external_videoplayback_proxy.empty?
+if CONFIG.external_videoplayback_proxy
   Invidious::Jobs.register Invidious::Jobs::CheckExternalProxy.new
 end
 
-if CONFIG.refresh_tokens
-  Invidious::Jobs.register Invidious::Jobs::RefreshTokens.new
-end
-
 Invidious::Jobs.start_all
 
 def popular_videos

src/invidious/config.cr

@@ -45,8 +45,6 @@ struct ConfigPreferences
   property vr_mode : Bool = true
   property show_nick : Bool = true
   property save_player_pos : Bool = false
-  property po_token : String = ""
-  property visitor_data : String = ""
 
   def to_tuple
     {% begin %}
@@ -89,8 +87,6 @@ class Config
 
   # Used to tell Invidious it is behind a proxy, so links to resources should be https://
   property https_only : Bool?
-  # Enable or disable CSP
-  property csp : Bool? = true
   # HMAC signing key for CSRF tokens and verifying pubsub subscriptions
   property hmac_key : String = ""
   # Domain to be used for links to resources on the site where an absolute URL is required
@@ -180,12 +176,7 @@ class Config
   # of the backend
   property backends_delimiter : String = "|"
 
-  # External videoplayback proxies list. They should include `https://`
-  # at the start of the URI
-  property external_videoplayback_proxy : Array(String) = [] of String
-
-  # Job to refresh tokens from a Redis compatible DB
-  property refresh_tokens : Bool = true
+  property external_videoplayback_proxy : String?
 
   # Materialious redirects
   property materialious_domain : String?

src/invidious/database/videos.cr

@@ -10,8 +10,8 @@ module Invidious::Database::Videos
       ON CONFLICT (id) DO NOTHING
     SQL
 
-    REDIS_DB.set(video.id, video.info.to_json, ex: 14400)
-    REDIS_DB.set(video.id + ":time", video.updated, ex: 14400)
+    REDIS_DB.set(video.id, video.info.to_json, ex: 3600)
+    REDIS_DB.set(video.id + ":time", video.updated, ex: 3600)
   end
 
   def delete(id)

src/invidious/helpers/redis_tokens.cr

@@ -1,25 +0,0 @@
-module Tokens
-  extend self
-  @@po_token : String | Nil
-  @@visitor_data : String | Nil
-
-  def refresh_tokens
-    @@po_token = REDIS_DB.get("invidious:po_token")
-    @@visitor_data = REDIS_DB.get("invidious:visitor_data")
-    LOGGER.debug("RefreshTokens: Tokens are:")
-    LOGGER.debug("RefreshTokens: po_token: #{@@po_token}")
-    LOGGER.debug("RefreshTokens: visitor_data: #{@@visitor_data}")
-  end
-
-  def get_tokens
-    return {@@po_token, @@visitor_data}
-  end
-
-  def get_po_token
-    return @@po_token
-  end
-
-  def get_visitor_data
-    return @@visitor_data
-  end
-end

src/invidious/helpers/utils.cr

@@ -383,17 +383,3 @@ def parse_link_endpoint(endpoint : JSON::Any, text : String, video_id : String)
   end
   return text
 end
-
-# Generates a list of external videoplayback proxies for
-# CSP
-def gen_videoplayback_proxy_list
-  if !CONFIG.external_videoplayback_proxy.empty?
-    external_videoplayback_proxy = ""
-    CONFIG.external_videoplayback_proxy.each do |proxy|
-      external_videoplayback_proxy += " #{proxy}"
-    end
-  else
-    external_videoplayback_proxy = ""
-  end
-  return external_videoplayback_proxy
-end

src/invidious/http_server/utils.cr

@@ -4,27 +4,17 @@ module Invidious::HttpServer
   module Utils
     extend self
 
-    @@proxy_alive : String = ""
+    @@proxy_alive : Bool = false
 
     def check_external_proxy
-      CONFIG.external_videoplayback_proxy.each do |proxy|
-        begin
-          response = HTTP::Client.get(proxy)
-          if response.status_code == 200
-            @@proxy_alive = proxy
-            LOGGER.debug("CheckExternalProxy: Proxy set to: '#{proxy}'")
-            break
-          end
-        rescue
-          LOGGER.debug("CheckExternalProxy: Proxy '#{proxy}' is not available")
-        end
+      begin
+        response = HTTP::Client.get("#{CONFIG.external_videoplayback_proxy}")
+        @@proxy_alive = response.status_code == 200
+      rescue
+        @@proxy_alive = false
       end
     end
 
-    def get_external_proxy
-      return @@proxy_alive
-    end
-
     def proxy_video_url(raw_url : String, *, region : String? = nil, absolute : Bool = false)
       url = URI.parse(raw_url)
 
@@ -35,8 +25,8 @@ module Invidious::HttpServer
       url.query_params = params
 
       if absolute
-        if !@@proxy_alive.empty?
-          return "#{@@proxy_alive}#{url.request_target}"
+        if @@proxy_alive
+          return "#{CONFIG.external_videoplayback_proxy}#{url.request_target}"
         else
           return "#{HOST_URL}#{url.request_target}"
         end

src/invidious/jobs/refresh_tokens.cr

@@ -1,13 +0,0 @@
-class Invidious::Jobs::RefreshTokens < Invidious::Jobs::BaseJob
-  def initialize
-  end
-
-  def begin
-    loop do
-      Tokens.refresh_tokens
-      LOGGER.info("RefreshTokens: Done, sleeping for 5 seconds")
-      sleep 5.seconds
-      Fiber.yield
-    end
-  end
-end

src/invidious/routes/api/manifest.cr

@@ -210,13 +210,7 @@ module Invidious::Routes::API::Manifest
 
         raw_params["host"] = uri.host.not_nil!
 
-        proxy = Invidious::HttpServer::Utils.get_external_proxy
-
-        if !proxy.empty?
-          "#{proxy}/videoplayback?#{raw_params}"
-        else
-          "#{HOST_URL}/videoplayback?#{raw_params}"
-        end
+        "#{HOST_URL}/videoplayback?#{raw_params}"
       end
     end
 

src/invidious/routes/api/v1/videos.cr

@@ -263,60 +263,59 @@ module Invidious::Routes::API::V1::Videos
 
     annotations = ""
 
-    # case source
-    # when "archive"
-    #   if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id))
-    #     annotations = cached_annotation.annotations
-    #   else
-    #     index = CHARS_SAFE.index!(id[0]).to_s.rjust(2, '0')
+    case source
+    when "archive"
+      if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id))
+        annotations = cached_annotation.annotations
+      else
+        index = CHARS_SAFE.index!(id[0]).to_s.rjust(2, '0')
 
-    #     # IA doesn't handle leading hyphens,
-    #     # so we use https://archive.org/details/youtubeannotations_64
-    #     if index == "62"
-    #       index = "64"
-    #       id = id.sub(/^-/, 'A')
-    #     end
+        # IA doesn't handle leading hyphens,
+        # so we use https://archive.org/details/youtubeannotations_64
+        if index == "62"
+          index = "64"
+          id = id.sub(/^-/, 'A')
+        end
 
-    #     file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml")
+        file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml")
 
-    #     location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))
+        location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))
 
-    #     if !location.headers["Location"]?
-    #       env.response.status_code = location.status_code
-    #     end
+        if !location.headers["Location"]?
+          env.response.status_code = location.status_code
+        end
 
-    #     response = make_client(URI.parse(location.headers["Location"]), &.get(location.headers["Location"]))
+        response = make_client(URI.parse(location.headers["Location"]), &.get(location.headers["Location"]))
 
-    #     if response.body.empty?
-    #       haltf env, 404
-    #     end
+        if response.body.empty?
+          haltf env, 404
+        end
 
-    #     if response.status_code != 200
-    #       haltf env, response.status_code
-    #     end
+        if response.status_code != 200
+          haltf env, response.status_code
+        end
 
-    #     annotations = response.body
+        annotations = response.body
 
-    #     cache_annotation(id, annotations)
-    #   end
-    # else # "youtube"
-    #   response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")
+        cache_annotation(id, annotations)
+      end
+    else # "youtube"
+      response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")
 
-    #   if response.status_code != 200
-    #     haltf env, response.status_code
-    #   end
+      if response.status_code != 200
+        haltf env, response.status_code
+      end
 
-    #   annotations = response.body
-    # end
+      annotations = response.body
+    end
 
-    # etag = sha256(annotations)[0, 16]
-    # if env.request.headers["If-None-Match"]?.try &.== etag
-    #   haltf env, 304
-    # else
-    #   env.response.headers["ETag"] = etag
-    #   annotations
-    # end
-    annotations
+    etag = sha256(annotations)[0, 16]
+    if env.request.headers["If-None-Match"]?.try &.== etag
+      haltf env, 304
+    else
+      env.response.headers["ETag"] = etag
+      annotations
+    end
   end
 
   def self.comments(env)

src/invidious/routes/before_all.cr

@@ -28,6 +28,12 @@ module Invidious::Routes::BeforeAll
       extra_media_csp = ""
     end
 
+    if CONFIG.external_videoplayback_proxy
+      external_videoplayback_proxy = " #{CONFIG.external_videoplayback_proxy}"
+    else
+      external_videoplayback_proxy = ""
+    end
+
     # Only allow the pages at /embed/* to be embedded
     if env.request.resource.starts_with?("/embed")
       frame_ancestors = "'self' file: http: https:"
@@ -43,9 +49,9 @@ module Invidious::Routes::BeforeAll
       "style-src 'self' 'unsafe-inline'",
       "img-src 'self' data:",
       "font-src 'self' data:",
-      "connect-src 'self'" + EXT_VIDEOP_LIST,
+      "connect-src 'self'" + external_videoplayback_proxy,
       "manifest-src 'self'",
-      "media-src 'self' blob:" + extra_media_csp + EXT_VIDEOP_LIST,
+      "media-src 'self' blob:" + extra_media_csp,
       "child-src 'self' blob:",
       "frame-src 'self'",
       "frame-ancestors " + frame_ancestors,

src/invidious/routes/preferences.cr

@@ -86,12 +86,6 @@ module Invidious::Routes::PreferencesRoute
     show_nick ||= "off"
     show_nick = show_nick == "on"
 
-    po_token = env.params.body["po_token"]?.try &.as(String)
-    po_token ||= CONFIG.default_user_preferences.po_token
-
-    visitor_data = env.params.body["visitor_data"]?.try &.as(String)
-    visitor_data ||= CONFIG.default_user_preferences.visitor_data
-
     comments = [] of String
     2.times do |i|
       comments << (env.params.body["comments[#{i}]"]?.try &.as(String) || CONFIG.default_user_preferences.comments[i])
@@ -186,8 +180,6 @@ module Invidious::Routes::PreferencesRoute
       vr_mode:                     vr_mode,
       show_nick:                   show_nick,
       save_player_pos:             save_player_pos,
-      po_token:                    po_token,
-      visitor_data:                visitor_data,
     }.to_json)
 
     if user = env.get? "user"

src/invidious/routes/video_playback.cr

@@ -298,16 +298,7 @@ module Invidious::Routes::VideoPlayback
     end
 
     if local
-      external_proxy = Invidious::HttpServer::Utils.get_external_proxy
-      if !external_proxy.empty?
-        url = URI.parse(url)
-        external_proxy = URI.parse(external_proxy)
-        url.host = external_proxy.host
-        url.port = external_proxy.port
-        url = url.to_s
-      else
-        url = URI.parse(url).request_target.not_nil!
-      end
+      url = URI.parse(url).request_target.not_nil!
       url += "&title=#{URI.encode_www_form(title, space_to_plus: false)}" if title
     end
 

src/invidious/routes/watch.cr

@@ -3,9 +3,6 @@
 module Invidious::Routes::Watch
   def self.handle(env)
     locale = env.get("preferences").as(Preferences).locale
-    user_po_token = env.get("preferences").as(Preferences).po_token
-    user_visitor_data = env.get("preferences").as(Preferences).visitor_data
-
     region = env.params.query["region"]?
 
     if env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
@@ -55,7 +52,7 @@ module Invidious::Routes::Watch
     env.params.query.delete_all("listen")
 
     begin
-      video = get_video(id, region: params.region, po_token: user_po_token, visitor_data: user_visitor_data)
+      video = get_video(id, region: params.region)
     rescue ex : NotFoundException
       LOGGER.error("get_video not found: #{id} : #{ex.message}")
       return error_template(404, ex)

src/invidious/user/preferences.cr

@@ -57,10 +57,6 @@ struct Preferences
   property volume : Int32 = CONFIG.default_user_preferences.volume
   property save_player_pos : Bool = CONFIG.default_user_preferences.save_player_pos
 
-  @[YAML::Field(converter: Preferences::ProcessString)]
-  property po_token : String = ""
-  property visitor_data : String = ""
-
   module BoolToString
     def self.to_json(value : String, json : JSON::Builder)
       json.string value

src/invidious/videos.cr

@@ -294,7 +294,7 @@ struct Video
   predicate_bool upcoming, isUpcoming
 end
 
-def get_video(id, refresh = true, region = nil, force_refresh = false, po_token = "", visitor_data = "")
+def get_video(id, refresh = true, region = nil, force_refresh = false)
   if (video = Invidious::Database::Videos.select(id)) && !region
     # If record was last updated over 10 minutes ago, or video has since premiered,
     # refresh (expire param in response lasts for 6 hours)
@@ -304,7 +304,7 @@ def get_video(id, refresh = true, region = nil, force_refresh = false, po_token
        force_refresh ||
        video.schema_version != Video::SCHEMA_VERSION # cache control
       begin
-        video = fetch_video(id, region, po_token, visitor_data)
+        video = fetch_video(id, region)
         Invidious::Database::Videos.insert(video)
       rescue ex
         Invidious::Database::Videos.delete(id)
@@ -312,7 +312,7 @@ def get_video(id, refresh = true, region = nil, force_refresh = false, po_token
       end
     end
   else
-    video = fetch_video(id, region, po_token, visitor_data)
+    video = fetch_video(id, region)
     Invidious::Database::Videos.insert(video) if !region
   end
 
@@ -320,11 +320,11 @@ def get_video(id, refresh = true, region = nil, force_refresh = false, po_token
 rescue DB::Error
   # Avoid common `DB::PoolRetryAttemptsExceeded` error and friends
   # Note: All DB errors inherit from `DB::Error`
-  return fetch_video(id, region, po_token, visitor_data)
+  return fetch_video(id, region)
 end
 
-def fetch_video(id, region, po_token, visitor_data)
-  info = extract_video_info(video_id: id, user_po_token: po_token, user_visitor_data: visitor_data)
+def fetch_video(id, region)
+  info = extract_video_info(video_id: id, level: 0)
 
   if reason = info["reason"]?
     if reason == "Video unavailable"

src/invidious/videos/parser.cr

@@ -50,18 +50,22 @@ def parse_related_video(related : JSON::Any) : Hash(String, JSON::Any)?
   }
 end
 
-def extract_video_info(video_id : String, user_po_token, user_visitor_data)
+def extract_video_info(video_id : String, *, level = 0, client_type = YoutubeAPI::ClientType::WebMobileT2)
+  # Infinite recursion prevention
+  level += 1
+  if level >= 3
+    return {
+      "version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
+      "reason"  => JSON::Any.new("All counter-measures exhausted"),
+    }
+  end
+
   # Init client config for the API
   client_config = YoutubeAPI::ClientConfig.new
-
-  redis_po_token, redis_visitor_data = Tokens.get_tokens
-
-  po_token = (user_po_token if !user_po_token.empty?) || redis_po_token || CONFIG.po_token
-  visitor_data = (user_visitor_data if !user_visitor_data.empty?) || redis_visitor_data || CONFIG.visitor_data
+  client_config.client_type = client_type
 
   # Fetch data from the player endpoint
-  player_response = YoutubeAPI.player(video_id: video_id, params: "2AMB", client_config: client_config, po_token: po_token, visitor_data: visitor_data)
-
+  player_response = YoutubeAPI.player(video_id: video_id, params: "2AMB", client_config: client_config)
   playability_status = player_response.dig?("playabilityStatus", "status").try &.as_s
 
   if playability_status != "OK"
@@ -70,10 +74,15 @@ def extract_video_info(video_id : String, user_po_token, user_visitor_data)
     reason ||= subreason.try &.[]("runs").as_a.map(&.[]("text")).join("")
     reason ||= player_response.dig("playabilityStatus", "reason").as_s
 
-    # Stop here if video is not a scheduled livestream or
-    # for LOGIN_REQUIRED when videoDetails element is not found because retrying won't help
-    if !{"LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status) ||
+    # Show the playability status in the reason message
+    reason = "#{reason} (#{playability_status})"
+
+    if (playability_status == "UNPLAYABLE" && reason.includes?("Get the YouTube app")) || reason.includes?("protect our community")
+      return extract_video_info(video_id: video_id, level: level, client_type: YoutubeAPI::ClientType::IOS)
+    elsif !{"LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status) ||
        playability_status == "LOGIN_REQUIRED" && !player_response.dig?("videoDetails")
+      # Stop here if video is not a scheduled livestream or
+      # for LOGIN_REQUIRED when videoDetails element is not found because retrying won't help
       return {
         "version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
         "reason"  => JSON::Any.new(reason),
@@ -97,7 +106,7 @@ def extract_video_info(video_id : String, user_po_token, user_visitor_data)
   end
 
   # Don't fetch the next endpoint if the video is unavailable.
-  if {"OK", "LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status)
+  if {"OK", "LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED", "UNPLAYABLE"}.any?(playability_status)
     next_response = YoutubeAPI.next({"videoId": video_id, "params": ""})
     player_response = player_response.merge(next_response)
   end
@@ -107,24 +116,14 @@ def extract_video_info(video_id : String, user_po_token, user_visitor_data)
 
   new_player_response = nil
 
-  # Don't use Android client if po_token is passed because po_token doesn't
-  # work for Android client.
-  if reason.nil? && po_token.nil?
-    # Fetch the video streams using an Android client in order to get the
-    # decrypted URLs and maybe fix throttling issues (#2194). See the
-    # following issue for an explanation about decrypted URLs:
-    # https://github.com/TeamNewPipe/NewPipeExtractor/issues/562
-    client_config.client_type = YoutubeAPI::ClientType::AndroidTestSuite
-    new_player_response = try_fetch_streaming_data(video_id, client_config, po_token, visitor_data)
+  if reason || DECRYPT_FUNCTION.nil? || CONFIG.po_token.nil?
+    client_config.client_type = YoutubeAPI::ClientType::IOS
+    new_player_response = try_fetch_streaming_data(video_id, client_config)
   end
 
-  # Last hope
-  # Only trigger if reason found and po_token or didn't work wth Android client.
-  # TvHtml5ScreenEmbed now requires sig helper for it to work but po_token is not required
-  # if the IP address is not blocked.
-  if po_token.nil? && reason || po_token.nil? && new_player_response.nil?
+  if reason && !DECRYPT_FUNCTION.nil? && CONFIG.po_token.nil?
     client_config.client_type = YoutubeAPI::ClientType::TvHtml5ScreenEmbed
-    new_player_response = try_fetch_streaming_data(video_id, client_config, po_token, visitor_data)
+    new_player_response = try_fetch_streaming_data(video_id, client_config)
   end
 
   # Replace player response and reset reason
@@ -145,7 +144,7 @@ def extract_video_info(video_id : String, user_po_token, user_visitor_data)
   if streaming_data = player_response["streamingData"]?
     %w[formats adaptiveFormats].each do |key|
       streaming_data.as_h[key]?.try &.as_a.each do |format|
-        format.as_h["url"] = JSON::Any.new(convert_url(format, po_token))
+        format.as_h["url"] = JSON::Any.new(convert_url(format))
       end
     end
 
@@ -158,9 +157,9 @@ def extract_video_info(video_id : String, user_po_token, user_visitor_data)
   return params
 end
 
-def try_fetch_streaming_data(id : String, client_config : YoutubeAPI::ClientConfig, po_token, visitor_data) : Hash(String, JSON::Any)?
+def try_fetch_streaming_data(id : String, client_config : YoutubeAPI::ClientConfig) : Hash(String, JSON::Any)?
   LOGGER.debug("try_fetch_streaming_data: [#{id}] Using #{client_config.client_type} client.")
-  response = YoutubeAPI.player(video_id: id, params: "2AMB", client_config: client_config, po_token: po_token, visitor_data: visitor_data)
+  response = YoutubeAPI.player(video_id: id, params: "2AMB", client_config: client_config)
 
   playability_status = response["playabilityStatus"]["status"]
   LOGGER.debug("try_fetch_streaming_data: [#{id}] Got playabilityStatus == #{playability_status}.")
@@ -460,7 +459,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
   return params
 end
 
-private def convert_url(fmt, po_token)
+private def convert_url(fmt)
   if cfr = fmt["signatureCipher"]?.try { |json| HTTP::Params.parse(json.as_s) }
     sp = cfr["sp"]
     url = URI.parse(cfr["url"])
@@ -475,13 +474,15 @@ private def convert_url(fmt, po_token)
     params = url.query_params
   end
 
-  n = DECRYPT_FUNCTION.try &.decrypt_nsig(params["n"])
-  params["n"] = n if n
+  if old_n = params["n"]?
+    n = DECRYPT_FUNCTION.try &.decrypt_nsig(old_n)
+    params["n"] = n if n
+  end
 
-  if !po_token.nil?
-    params["pot"] = po_token
-  elsif token = CONFIG.po_token
-    params["pot"] = token
+  if token = CONFIG.po_token
+    if {"WEB", "TVHTML5"}.any? { |x| params["c"].starts_with?(x) }
+      params["pot"] = token
+    end
   end
 
   url.query_params = params

src/invidious/views/components/player.ecr

@@ -4,9 +4,6 @@
     <% if params.autoplay %>autoplay<% end %>
     <% if params.video_loop %>loop<% end %>
     <% if params.controls %>controls<% end %>>
-    <% if (hlsvp = video.hls_manifest_url) && !CONFIG.disabled?("livestreams") %>
-        <source src="<%= URI.parse(hlsvp).request_target %><% if params.local %>?local=true<% end %>" type="application/x-mpegURL" label="livestream">
-    <% else %>
         <% if params.listen %>
             <% # default to 128k m4a stream
                best_m4a_stream_index = 0
@@ -57,6 +54,11 @@
             <% end %>
         <% end %>
 
+    <% if (hlsvp = video.hls_manifest_url) && !CONFIG.disabled?("livestreams") %>
+        <source src="<%= URI.parse(hlsvp).request_target %><% if params.local %>?local=true<% end %>" type="application/x-mpegURL" label="livestream">
+    <% end %>
+
+
         <% preferred_captions.each do |caption| %>
             <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name %>" label="<%= caption.name %>">
         <% end %>
@@ -64,7 +66,6 @@
         <% captions.each do |caption| %>
             <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name %>" label="<%= caption.name %>">
         <% end %>
-    <% end %>
 </video>
 
 <script id="player_data" type="application/json">

src/invidious/views/user/preferences.ecr

@@ -126,16 +126,6 @@
                 <input name="save_player_pos" id="save_player_pos" type="checkbox" <% if preferences.save_player_pos %>checked<% end %>>
             </div>
 
-			<div class="pure-control-group">
-                <label for="po_token"><%= translate(locale, "preferences_po_token") %></label>
-                <input name="po_token" id="po_token" type="text" value="<%= preferences.po_token %>">
-            </div>
-
-			<div class="pure-control-group">
-                <label for="visitor_data"><%= translate(locale, "preferences_visitor_data") %></label>
-                <input name="visitor_data" id="visitor_data" type="text" value="<%= preferences.visitor_data %>">
-            </div>
-
             <legend><%= translate(locale, "preferences_category_visual") %></legend>
 
             <div class="pure-control-group">

src/invidious/yt_backend/youtube_api.cr

@@ -3,8 +3,6 @@
 #
 
 module YoutubeAPI
-  @@visitor_data : String = ""
-
   extend self
 
   # For Android versions, see https://en.wikipedia.org/wiki/Android_version_history
@@ -19,7 +17,7 @@ module YoutubeAPI
   # For Apple device names, see https://gist.github.com/adamawolf/3048717
   # For iOS versions, see https://en.wikipedia.org/wiki/IOS_version_history#Releases,
   # then go to the dedicated article of the major version you want.
-  private IOS_APP_VERSION = "19.32.8"
+  private IOS_APP_VERSION = "19.40.4"
   private IOS_USER_AGENT  = "com.google.ios.youtube/#{IOS_APP_VERSION} (iPhone14,5; U; CPU iOS 17_6 like Mac OS X;)"
   private IOS_VERSION     = "17.6.1.21G93" # Major.Minor.Patch.Build
 
@@ -30,6 +28,7 @@ module YoutubeAPI
     Web
     WebEmbeddedPlayer
     WebMobile
+    WebMobileT2
     WebScreenEmbed
 
     Android
@@ -50,7 +49,7 @@ module YoutubeAPI
     ClientType::Web => {
       name:       "WEB",
       name_proto: "1",
-      version:    "2.20240814.00.00",
+      version:    "2.20241010.01.00",
       screen:     "WATCH_FULL_SCREEN",
       os_name:    "Windows",
       os_version: WINDOWS_VERSION,
@@ -68,11 +67,19 @@ module YoutubeAPI
     ClientType::WebMobile => {
       name:       "MWEB",
       name_proto: "2",
-      version:    "2.20240813.02.00",
+      version:    "2.20241010.02.00",
       os_name:    "Android",
       os_version: ANDROID_VERSION,
       platform:   "MOBILE",
     },
+    ClientType::WebMobileT2 => {
+      name:       "MWEB_TIER_2",
+      name_proto: "27",
+      version:    "9.20241010",
+      os_name:    "iPhone",
+      os_version: IOS_VERSION,
+      platform:   "MOBILE",
+    },
     ClientType::WebScreenEmbed => {
       name:       "WEB",
       name_proto: "1",
@@ -322,9 +329,7 @@ module YoutubeAPI
       client_context["client"]["platform"] = platform
     end
 
-    if !@@visitor_data.empty?
-      client_context["client"]["visitorData"] = @@visitor_data
-    elsif CONFIG.visitor_data.is_a?(String)
+    if CONFIG.visitor_data.is_a?(String)
       client_context["client"]["visitorData"] = CONFIG.visitor_data.as(String)
     end
 
@@ -459,13 +464,8 @@ module YoutubeAPI
     video_id : String,
     *, # Force the following parameters to be passed by name
     params : String,
-    client_config : ClientConfig | Nil = nil,
-    po_token : String | Nil,
-    visitor_data : String | Nil,
+    client_config : ClientConfig | Nil = nil
   )
-    if visitor_data
-      @@visitor_data = visitor_data
-    end
     # Playback context, separate because it can be different between clients
     playback_ctx = {
       "html5Preference" => "HTML5_PREF_WANTS",
@@ -491,7 +491,7 @@ module YoutubeAPI
         "contentPlaybackContext" => playback_ctx,
       },
       "serviceIntegrityDimensions" => {
-        "poToken" => po_token || CONFIG.po_token,
+        "poToken" => CONFIG.po_token,
       },
     }
 
@@ -605,7 +605,7 @@ module YoutubeAPI
   def _post_json(
     endpoint : String,
     data : Hash,
-    client_config : ClientConfig | Nil,
+    client_config : ClientConfig | Nil
   ) : Hash(String, JSON::Any)
     # Use the default client config if nil is passed
     client_config ||= DEFAULT_CLIENT_CONFIG
@@ -625,9 +625,7 @@ module YoutubeAPI
       headers["User-Agent"] = user_agent
     end
 
-    if !@@visitor_data.empty?
-      headers["X-Goog-Visitor-Id"] = @@visitor_data
-    elsif CONFIG.visitor_data.is_a?(String)
+    if CONFIG.visitor_data.is_a?(String)
       headers["X-Goog-Visitor-Id"] = CONFIG.visitor_data.as(String)
     end