rubytube 0.2.0 → 0.3.0

data/lib/rubytube/extractor.rb

@@ -1,177 +1,177 @@
-module RubyTube
-  class Extractor
-    class << self
-      def playability_status(watch_html)
-        player_response = initial_player_response(watch_html)
-        player_response = JSON.parse(player_response)
-        status_obj = player_response['playabilityStatus'] || {}
-      
-        if status_obj.has_key?('liveStreamability')
-          return ['LIVE_STREAM', 'Video is a live stream.']
-        end
-      
-        if status_obj.has_key?('status')
-          if status_obj.has_key?('reason')
-            return [status_obj['status'], [status_obj['reason']]]
-          end
-      
-          if status_obj.has_key?('messages')
-            return [status_obj['status'], status_obj['messages']]
-          end
-        end
-      
-        [nil, [nil]]
-      end
-
-      def video_id(url)
-        return Utils.regex_search(/(?:v=|\/)([0-9A-Za-z_-]{11}).*/, url, 1)
-      end
-
-      def js_url(html)
-        begin
-          base_js = get_ytplayer_config(html)['assets']['js']
-        rescue RegexMatchError, NoMethodError
-          base_js = get_ytplayer_js(html)
-        end
-
-        "https://youtube.com#{base_js}"
-      end
-
-      def mime_type_codec(mime_type_codec)
-        pattern = %r{(\w+\/\w+)\;\scodecs=\"([a-zA-Z\-0-9.,\s]*)\"}
-        results = mime_type_codec.match(pattern)
-      
-        raise RegexMatchError.new("mime_type_codec, pattern=#{pattern}") if results.nil?
-      
-        mime_type, codecs = results.captures
-        [mime_type, codecs.split(",").map(&:strip)]
-      end
-
-      def get_ytplayer_js(html)
-        js_url_patterns = [
-          %r{(/s/player/[\w\d]+/[\w\d_/.]+/base\.js)},
-        ]
-
-        js_url_patterns.each do |pattern|
-          function_match = html.match(pattern)
-          if function_match
-            return function_match[1]
-          end
-        end
-
-        raise RegexMatchError.new('get_ytplayer_js', 'js_url_patterns')
-      end
-
-      def get_ytplayer_config(html)
-        config_patterns = [
-          /ytplayer\.config\s*=\s*/,
-          /ytInitialPlayerResponse\s*=\s*/
-        ]
-
-        config_patterns.each do |pattern|
-          begin
-            return Parser.parse_for_object(html, pattern)
-          rescue HTMLParseError => e
-            next
-          end
-        end
-
-        setconfig_patterns = [
-          /yt\.setConfig\(.*['\"]PLAYER_CONFIG['\"]:\s*/
-        ]
-
-        setconfig_patterns.each do |pattern|
-          begin
-            return Parser.parse_for_object(html, pattern)
-          rescue HTMLParseError => e
-            next
-          end
-        end
-
-        raise RegexMatchError.new('get_ytplayer_config', 'config_patterns, setconfig_patterns')
-      end
-
-      def apply_signature(stream_manifest, vid_info, js)
-        cipher = Cipher.new(js)
-
-        stream_manifest.each_with_index do |stream, i|
-          begin
-            url = stream['url']
-          rescue NoMethodError
-            live_stream = vid_info.fetch('playabilityStatus', {})['liveStreamability']
-            if live_stream
-              raise LiveStreamError.new('UNKNOWN')
-            end
-          end
-
-          if url.include?("signature") || 
-            (!stream.key?("s") && (url.include?("&sig=") || url.include?("&lsig=")))
-            # For certain videos, YouTube will just provide them pre-signed, in
-            # which case there's no real magic to download them and we can skip
-            # the whole signature descrambling entirely.
-            next
-          end
-
-          signature = cipher.get_signature(stream['s'])
-
-          parsed_url = URI.parse(url)
-
-          query_params = CGI.parse(parsed_url.query)
-          query_params.transform_values!(&:first)
-          query_params['sig'] = signature
-          unless query_params.key?('ratebypass')
-            initial_n = query_params['n'].split('')
-            new_n = cipher.calculate_n(initial_n)
-            query_params['n'] = new_n
-          end
-
-          url = "#{parsed_url.scheme}://#{parsed_url.host}#{parsed_url.path}?#{URI.encode_www_form(query_params)}"
-
-          stream_manifest[i]["url"] = url
-        end
-      end
-
-      def apply_descrambler(stream_data)
-        return if stream_data.has_key?('url')
-
-        # Merge formats and adaptiveFormats into a single array
-        formats = []
-        formats += stream_data['formats'] if stream_data.has_key?('formats')
-        formats += stream_data['adaptiveFormats'] if stream_data.has_key?('adaptiveFormats')
-
-        # Extract url and s from signatureCiphers as necessary
-        formats.each do |data|
-          unless data.has_key?('url')
-            if data.has_key?('signatureCipher')
-              cipher_url = URI.decode_www_form(data['signatureCipher']).to_h
-              data['url'] = cipher_url['url']
-              data['s'] = cipher_url['s']
-            end
-          end
-          data['is_otf'] = data['type'] == 'FORMAT_STREAM_TYPE_OTF'
-        end
-
-        formats
-      end
-
-      private
-
-      def initial_player_response(watch_html)
-        patterns = [
-          "window\\[['\"]ytInitialPlayerResponse['\"]\\]\\s*=\\s*",
-          "ytInitialPlayerResponse\\s*=\\s*"
-        ]
-      
-        patterns.each do |pattern|
-          begin
-            return Parser.parse_for_object(watch_html, pattern)
-          rescue HTMLParseError
-            next
-          end
-        end
-      
-        raise RegexMatchError.new('initial_player_response', 'initial_player_response_pattern')
-      end
-    end
-  end
-end
+module RubyTube
+  class Extractor
+    class << self
+      def playability_status(watch_html)
+        player_response = initial_player_response(watch_html)
+        player_response = JSON.parse(player_response)
+        status_obj = player_response['playabilityStatus'] || {}
+      
+        if status_obj.has_key?('liveStreamability')
+          return ['LIVE_STREAM', 'Video is a live stream.']
+        end
+      
+        if status_obj.has_key?('status')
+          if status_obj.has_key?('reason')
+            return [status_obj['status'], [status_obj['reason']]]
+          end
+      
+          if status_obj.has_key?('messages')
+            return [status_obj['status'], status_obj['messages']]
+          end
+        end
+      
+        [nil, [nil]]
+      end
+
+      def video_id(url)
+        return Utils.regex_search(/(?:v=|\/)([0-9A-Za-z_-]{11}).*/, url, 1)
+      end
+
+      def js_url(html)
+        begin
+          base_js = get_ytplayer_config(html)['assets']['js']
+        rescue RegexMatchError, NoMethodError
+          base_js = get_ytplayer_js(html)
+        end
+
+        "https://youtube.com#{base_js}"
+      end
+
+      def mime_type_codec(mime_type_codec)
+        pattern = %r{(\w+\/\w+)\;\scodecs=\"([a-zA-Z\-0-9.,\s]*)\"}
+        results = mime_type_codec.match(pattern)
+      
+        raise RegexMatchError.new("mime_type_codec, pattern=#{pattern}") if results.nil?
+      
+        mime_type, codecs = results.captures
+        [mime_type, codecs.split(",").map(&:strip)]
+      end
+
+      def get_ytplayer_js(html)
+        js_url_patterns = [
+          %r{(/s/player/[\w\d]+/[\w\d_/.]+/base\.js)},
+        ]
+
+        js_url_patterns.each do |pattern|
+          function_match = html.match(pattern)
+          if function_match
+            return function_match[1]
+          end
+        end
+
+        raise RegexMatchError.new('get_ytplayer_js', 'js_url_patterns')
+      end
+
+      def get_ytplayer_config(html)
+        config_patterns = [
+          /ytplayer\.config\s*=\s*/,
+          /ytInitialPlayerResponse\s*=\s*/
+        ]
+
+        config_patterns.each do |pattern|
+          begin
+            return Parser.parse_for_object(html, pattern)
+          rescue HTMLParseError => e
+            next
+          end
+        end
+
+        setconfig_patterns = [
+          /yt\.setConfig\(.*['\"]PLAYER_CONFIG['\"]:\s*/
+        ]
+
+        setconfig_patterns.each do |pattern|
+          begin
+            return Parser.parse_for_object(html, pattern)
+          rescue HTMLParseError => e
+            next
+          end
+        end
+
+        raise RegexMatchError.new('get_ytplayer_config', 'config_patterns, setconfig_patterns')
+      end
+
+      def apply_signature(stream_manifest, vid_info, js)
+        cipher = Cipher.new(js)
+
+        stream_manifest.each_with_index do |stream, i|
+          begin
+            url = stream['url']
+          rescue NoMethodError
+            live_stream = vid_info.fetch('playabilityStatus', {})['liveStreamability']
+            if live_stream
+              raise LiveStreamError.new('UNKNOWN')
+            end
+          end
+
+          if url.include?("signature") || 
+            (!stream.key?("s") && (url.include?("&sig=") || url.include?("&lsig=")))
+            # For certain videos, YouTube will just provide them pre-signed, in
+            # which case there's no real magic to download them and we can skip
+            # the whole signature descrambling entirely.
+            next
+          end
+
+          signature = cipher.get_signature(stream['s'])
+
+          parsed_url = URI.parse(url)
+
+          query_params = CGI.parse(parsed_url.query)
+          query_params.transform_values!(&:first)
+          query_params['sig'] = signature
+          unless query_params.key?('ratebypass')
+            initial_n = query_params['n'].split('')
+            new_n = cipher.calculate_n(initial_n)
+            query_params['n'] = new_n
+          end
+
+          url = "#{parsed_url.scheme}://#{parsed_url.host}#{parsed_url.path}?#{URI.encode_www_form(query_params)}"
+
+          stream_manifest[i]["url"] = url
+        end
+      end
+
+      def apply_descrambler(stream_data)
+        return if stream_data.has_key?('url')
+
+        # Merge formats and adaptiveFormats into a single array
+        formats = []
+        formats += stream_data['formats'] if stream_data.has_key?('formats')
+        formats += stream_data['adaptiveFormats'] if stream_data.has_key?('adaptiveFormats')
+
+        # Extract url and s from signatureCiphers as necessary
+        formats.each do |data|
+          unless data.has_key?('url')
+            if data.has_key?('signatureCipher')
+              cipher_url = URI.decode_www_form(data['signatureCipher']).to_h
+              data['url'] = cipher_url['url']
+              data['s'] = cipher_url['s']
+            end
+          end
+          data['is_otf'] = data['type'] == 'FORMAT_STREAM_TYPE_OTF'
+        end
+
+        formats
+      end
+
+      private
+
+      def initial_player_response(watch_html)
+        patterns = [
+          "window\\[['\"]ytInitialPlayerResponse['\"]\\]\\s*=\\s*",
+          "ytInitialPlayerResponse\\s*=\\s*"
+        ]
+      
+        patterns.each do |pattern|
+          begin
+            return Parser.parse_for_object(watch_html, pattern)
+          rescue HTMLParseError
+            next
+          end
+        end
+      
+        raise RegexMatchError.new('initial_player_response', 'initial_player_response_pattern')
+      end
+    end
+  end
+end

data/lib/rubytube/innertube.rb

@@ -1,105 +1,105 @@
-module RubyTube
-  class InnerTube
-    DEFALUT_CLIENTS = {
-      'WEB' => {
-        context: {
-          client: {
-            clientName: 'WEB',
-            clientVersion: '2.20200720.00.02'
-          }
-        },
-        header: { 'User-Agent': 'Mozilla/5.0' },
-        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-      },
-      'ANDROID_MUSIC' => {
-        context: {
-          client: {
-            clientName: 'ANDROID_MUSIC',
-            clientVersion: '5.16.51',
-            androidSdkVersion: 30,
-          },
-        },
-        header: { 'User-Agent': 'com.google.android.apps.youtube.music/'},
-        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-      },
-      'ANDROID_EMBED' => {
-        context: {
-            client: {
-                clientName: 'ANDROID_EMBEDDED_PLAYER',
-                clientVersion: '17.31.35',
-                clientScreen: 'EMBED',
-                androidSdkVersion: 30,
-            }
-        },
-        header: { 'User-Agent': 'com.google.android.youtube/' },
-        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8'
-      },
-    }
-
-    BASE_URL = 'https://www.youtube.com/youtubei/v1'
-
-    attr_accessor :context, :header, :api_key, :access_token, :refresh_token, :use_oauth, :allow_cache, :expires
-
-    def initialize(client: 'ANDROID_MUSIC', use_oauth: false, allow_cache: false)
-      self.context = DEFALUT_CLIENTS[client][:context]
-      self.header  = DEFALUT_CLIENTS[client][:header]
-      self.api_key = DEFALUT_CLIENTS[client][:api_key]
-      self.use_oauth = use_oauth
-      self.allow_cache = allow_cache
-    end
-
-    def cache_tokens
-      return unless allow_cache
-
-      # TODO:
-    end
-
-    def refresh_bearer_token(force: false)
-      # TODO:
-    end
-
-    def fetch_bearer_token
-      # TODO:
-    end
-
-    def send(endpoint, query, data)
-      if use_oauth
-        query.delete(:key)
-      end
-
-      headers = {
-        'Content-Type': 'application/json',
-      }
-
-      if use_oauth
-        if access_token
-          refresh_bearer_token
-          headers['Authorization'] = "Bearer #{access_token}"
-        else
-          fetch_bearer_token
-          headers['Authorization'] = "Bearer #{access_token}"
-        end
-      end
-
-      options = {}
-      options[:headers] = headers.merge(header)
-
-      options[:query] = {
-        key: api_key,
-        contentCheckOk: true,
-        racyCheckOk: true,
-      }.merge(query)
-      options[:data] = data
-
-      resp = Request.post(endpoint, options)
-      JSON.parse(resp)
-    end
-
-    def player(video_id)
-      endpoint = "#{BASE_URL}/player"
-      query = { 'videoId' => video_id }
-
-      send(endpoint, query, {context: context})
-    end
-  end
-end
+module RubyTube
+  class InnerTube
+    DEFALUT_CLIENTS = {
+      'WEB' => {
+        context: {
+          client: {
+            clientName: 'WEB',
+            clientVersion: '2.20200720.00.02'
+          }
+        },
+        header: { 'User-Agent': 'Mozilla/5.0' },
+        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
+      },
+      'ANDROID_MUSIC' => {
+        context: {
+          client: {
+            clientName: 'ANDROID_MUSIC',
+            clientVersion: '5.16.51',
+            androidSdkVersion: 30,
+          },
+        },
+        header: { 'User-Agent': 'com.google.android.apps.youtube.music/'},
+        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
+      },
+      'ANDROID_EMBED' => {
+        context: {
+            client: {
+                clientName: 'ANDROID_EMBEDDED_PLAYER',
+                clientVersion: '17.31.35',
+                clientScreen: 'EMBED',
+                androidSdkVersion: 30,
+            }
+        },
+        header: { 'User-Agent': 'com.google.android.youtube/' },
+        api_key: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8'
+      },
+    }
+
+    BASE_URL = 'https://www.youtube.com/youtubei/v1'
+
+    attr_accessor :context, :header, :api_key, :access_token, :refresh_token, :use_oauth, :allow_cache, :expires
+
+    def initialize(client: 'ANDROID_MUSIC', use_oauth: false, allow_cache: false)
+      self.context = DEFALUT_CLIENTS[client][:context]
+      self.header  = DEFALUT_CLIENTS[client][:header]
+      self.api_key = DEFALUT_CLIENTS[client][:api_key]
+      self.use_oauth = use_oauth
+      self.allow_cache = allow_cache
+    end
+
+    def cache_tokens
+      return unless allow_cache
+
+      # TODO:
+    end
+
+    def refresh_bearer_token(force: false)
+      # TODO:
+    end
+
+    def fetch_bearer_token
+      # TODO:
+    end
+
+    def send(endpoint, query, data)
+      if use_oauth
+        query.delete(:key)
+      end
+
+      headers = {
+        'Content-Type': 'application/json',
+      }
+
+      if use_oauth
+        if access_token
+          refresh_bearer_token
+          headers['Authorization'] = "Bearer #{access_token}"
+        else
+          fetch_bearer_token
+          headers['Authorization'] = "Bearer #{access_token}"
+        end
+      end
+
+      options = {}
+      options[:headers] = headers.merge(header)
+
+      options[:query] = {
+        key: api_key,
+        contentCheckOk: true,
+        racyCheckOk: true,
+      }.merge(query)
+      options[:data] = data
+
+      resp = Request.post(endpoint, options)
+      JSON.parse(resp)
+    end
+
+    def player(video_id)
+      endpoint = "#{BASE_URL}/player"
+      query = { 'videoId' => video_id }
+
+      send(endpoint, query, {context: context})
+    end
+  end
+end

data/lib/rubytube/monostate.rb

@@ -1,5 +1,5 @@
-module RubyTube
-  class Monostate
-    attr_accessor :title, :duration
-  end
-end
+module RubyTube
+  class Monostate
+    attr_accessor :title, :duration
+  end
+end