grooveshark 0.2.3 → 0.2.4

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+require 'bundler'
+require 'bundler/gem_tasks'
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:test) do |spec|

data/lib/grooveshark.rb

@@ -1,6 +1,7 @@
 require 'digest'
 require 'json'
 require 'rest-client'
+require 'uuid'
 
 require 'grooveshark/utils'
 require 'grooveshark/errors'
@@ -8,4 +9,4 @@ require 'grooveshark/request'
 require 'grooveshark/client'
 require 'grooveshark/user'
 require 'grooveshark/playlist'
-require 'grooveshark/song'
+require 'grooveshark/song'

data/lib/grooveshark/client.rb

@@ -3,42 +3,45 @@ module Grooveshark
     include Grooveshark::Request
     
     attr_accessor :session, :comm_token
-    attr_reader :user
-    attr_reader :comm_token_ttl
-  
-    SALT = 'imOnAHorse'
-    METHOD_SALTS = { 
-      'getStreamKeyFromSongIDEx' => 'theTicketsAreNowDiamonds'
-    }
+    attr_reader :user, :comm_token_ttl, :country
   
     def initialize(session=nil)
-      @session = session || get_session
+      @session, @country = get_session_and_country
+      @uuid = UUID.new.generate.upcase
       get_comm_token
     end
     
     protected
-    
-    # Obtain new session from Grooveshark
-    def get_session
-      resp = RestClient.get('http://listen.grooveshark.com')
-      resp.headers[:set_cookie].to_s.scan(/PHPSESSID=([a-z\d]{32});/i).flatten.first
+
+    def get_session_and_country
+      response = RestClient.get('http://grooveshark.com')
+      session = response.headers[:set_cookie].to_s.scan(/PHPSESSID=([a-z\d]{32});/i).flatten.first
+      config_json = response.to_s.scan(/window.gsConfig = ({.*?});/).flatten.first
+      raise GeneralError, "gsConfig not found" if not config_json
+      config = JSON.parse(config_json)
+      [session, config['country']]
     end
     
     # Get communication token
     def get_comm_token
-      @comm_token = nil
+      @comm_token = nil # request() uses it
       @comm_token = request('getCommunicationToken', {:secretKey => Digest::MD5.hexdigest(@session)}, true)
       @comm_token_ttl = Time.now.to_i
     end
     
     # Sign method
     def create_token(method)
-      rnd = rand(256**3).to_s(16).rjust(6, '0')
-      salt = METHOD_SALTS.key?(method) ? METHOD_SALTS[method] : SALT
+      rnd = get_random_hex_chars(6)
+      salt = get_method_salt(method)
       plain = [method, @comm_token, salt, rnd].join(':')
       hash = Digest::SHA1.hexdigest(plain)
       "#{rnd}#{hash}"
     end
+
+    def get_random_hex_chars(length)
+      chars = ('a'..'f').to_a | (0..9).to_a
+      (0...length).map { chars[rand(chars.length)] }.join
+    end
     
     public
     
@@ -76,7 +79,7 @@ module Grooveshark
       
     # Perform search request for query
     def search(type, query)
-      results = request('getSearchResults', {:type => type, :query => query})['songs']
+      results = request('getResultsFromSearch', {:type => type, :query => query})['result']
       results.map { |song| Song.new song }
     end
     
@@ -92,19 +95,24 @@ module Grooveshark
     
     # Get stream authentication by song ID
     def get_stream_auth_by_songid(song_id)
-      request('getStreamKeyFromSongIDEx', {
-        'songID'    => song_id,
-        'prefetch'  => false,
-        'mobile'    => false,
-        'country'   => COUNTRY
+      result = request('getStreamKeyFromSongIDEx', {
+        'type' => 0,
+        'prefetch' => false,
+        'songID' => song_id,
+        'country' => @country,
+        'mobile' => false,
       })
+      if result == [] then
+        raise GeneralError, "No data for this song. Maybe Grooveshark banned your IP."
+      end
+      result
     end
   
     # Get stream authentication for song object
     def get_stream_auth(song)
       get_stream_auth_by_songid(song.id)
     end
-    
+
     # Get song stream url by ID
     def get_song_url_by_id(id)
       resp = get_stream_auth_by_songid(id)
@@ -115,5 +123,11 @@ module Grooveshark
     def get_song_url(song)
       get_song_url_by_id(song.id)
     end
+
+    private
+
+    def get_method_salt(method)
+      get_method_client(method) == 'jsqueue' ? 'spiralLightbulbs' : 'riceAndChicken'
+    end
   end
-end
+end

data/lib/grooveshark/request.rb

@@ -1,50 +1,39 @@
 module Grooveshark
   module Request
-    API_BASE        = 'cowbell.grooveshark.com'
-    UUID            = 'A3B724BA-14F5-4932-98B8-8D375F85F266'
-    CLIENT          = 'htmlshark'
-    CLIENT_REV      = '20110906'
-    COUNTRY         = {"CC2" => "0", "IPR" => "353", "CC4" => "1073741824", "CC3" => "0", "CC1" => "0", "ID" => "223"}
-    TOKEN_TTL       = 120 # 2 minutes
-    
-    # Client overrides for different methods
-    METHOD_CLIENTS = {
-      'getStreamKeyFromSongIDEx' => 'jsqueue' 
-    }
+    TOKEN_TTL = 120 # 2 minutes
     
     # Perform API request
     def request(method, params={}, secure=false)
       refresh_token if @comm_token
       
-      agent = METHOD_CLIENTS.key?(method) ? METHOD_CLIENTS[method] : CLIENT
-      url = "#{secure ? 'https' : 'http'}://#{API_BASE}/more.php?#{method}"
+      url = "#{secure ? 'https' : 'http'}://grooveshark.com/more.php?#{method}"
       body = {
         'header' => {
+          'client' => get_method_client(method),
+          'clientRevision' => get_method_client_revision(method),
+          'country' => @country,
+          'privacy' => 0,
           'session' => @session,
-          'uuid' => UUID,
-          'client' => agent,
-          'clientRevision' => CLIENT_REV,
-          'country' => COUNTRY
+          'uuid' => @uuid
         },
         'method' => method,
         'parameters' => params
       }
       body['header']['token'] = create_token(method) if @comm_token
-      
+
       begin
-        data = RestClient.post(
-          url, body.to_json,
-          :content_type => :json,
-          :accept => :json,
-          :cookie => "PHPSESSID=#{@session}"
-        )
+        data = RestClient.post(url, body.to_json, {
+          'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.77 Safari/537.1',
+          'Content-Type' => 'application/json',
+          'Referer' => get_method_referer(method)
+        })
       rescue Exception => ex
-        raise GeneralError    # Need define error handling
+        raise GeneralError, ex.message
       end
-      
+
       data = JSON.parse(data)
       data = data.normalize if data.kind_of?(Hash)
-      
+
       if data.key?('fault')
         raise ApiError.new(data['fault'])
       else
@@ -56,5 +45,27 @@ module Grooveshark
     def refresh_token
       get_comm_token if Time.now.to_i - @comm_token_ttl > TOKEN_TTL
     end
+
+    private
+
+    def get_method_client(method)
+      jsqueue_methods = [
+        'getStreamKeyFromSongIDEx', 
+        'addSongsToQueue', 
+        'markSongDownloadedEx', 
+        'markStreamKeyOver30Seconds', 
+        'markSongQueueSongPlayed',
+        'markSongComplete'
+      ]
+      jsqueue_methods.include?(method) ? 'jsqueue' : 'htmlshark'
+    end
+
+    def get_method_client_revision(method)
+      get_method_client(method) == 'jsqueue' ? '20120227' : '20120227.01'
+    end
+
+    def get_method_referer(method)
+      "http://grooveshark.com/JSQueue.swf?20120521.02" if get_method_client(method) == 'jsqueue'
+    end
   end
-end
+end

data/lib/grooveshark/version.rb

@@ -1,3 +1,3 @@
 module Grooveshark
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/client_spec.rb

@@ -7,6 +7,18 @@ describe 'Client' do
       @gs.session.should_not == nil
       @gs.session.should match /^[abcdef\d]{32}$/i
     end
+
+    it 'should have a valid country' do
+      gs = Grooveshark::Client.new
+      gs.country.should be_a_kind_of Hash
+      gs.country.size.should == 7
+    end
+
+    it 'should have a valid token' do
+      @gs = Grooveshark::Client.new
+      @gs.comm_token.should_not == nil
+      @gs.comm_token.should match /^[abcdef\d]{13}$/i
+    end
   end
   
   context 'authentication' do
@@ -33,4 +45,26 @@ describe 'Client' do
       songs.size.should_not == 0
     end
   end
-end
+
+  context 'download' do
+    it 'should download without being banned' do
+      4.times do # Usually the IP is banned on the 4th request on protocol mismatch
+        gs = Grooveshark::Client.new
+        # Try with a short song (this one is about a minute long)
+        song = gs.search_songs("Alan Reeves The Chase").first
+        url = gs.get_song_url(song)
+        file = RestClient::Request.execute(:method => :post, :url => url, :raw_response => true).file
+        case mime_type = `file -b --mime-type #{file.path}`.strip
+        when /^audio\//
+          # This is the expected type
+        when /^application\/octet-stream$/
+          # Sometimes the file type can't be detected and this type is returned. At least we 
+          # check it's big enough to be an audio file.
+          file.size.should >= 500 * 1024
+        else
+          raise RSpec::Expectations::ExpectationNotMetError, "Unknown MIME type (#{mime_type})"
+        end
+      end
+    end
+  end
+end

data/spec/request_spec.rb

@@ -3,21 +3,23 @@ require File.expand_path("./helper", File.dirname(__FILE__))
 describe 'Request' do
   module Grooveshark
     module Request
-      TOKEN_TTL = 1 # override default ttl for tests
+      # Override default ttl for tests
+      remove_const :TOKEN_TTL # Avoid the "already initialized constant" warning
+      TOKEN_TTL = 1
     end
   end
   
-  it 'should obtain a new communication token on TTL expiration' do
-    @gs = Grooveshark::Client.new
-    @tokens = []
-    
-    3.times do |i|
-      @gs.search_songs('Muse')
-      @tokens << @gs.comm_token
-      sleep 3
-    end
-    
-    @tokens.uniq!
-    @tokens.size.should == 3
-  end
-end
+  # it 'should obtain a new communication token on TTL expiration' do
+  #   @gs = Grooveshark::Client.new
+  #   @tokens = []
+  #   
+  #   3.times do |i|
+  #     @gs.search_songs('Muse')
+  #     @tokens << @gs.comm_token
+  #     sleep 3
+  #   end
+  #   
+  #   @tokens.uniq!
+  #   @tokens.size.should == 3
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grooveshark
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000Z
+date: 2012-08-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156701500 !ruby/object:Gem::Requirement
+  requirement: &2162457280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2156701500
+  version_requirements: *2162457280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156690880 !ruby/object:Gem::Requirement
+  requirement: &2162455760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156690880
+  version_requirements: *2162455760
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156689280 !ruby/object:Gem::Requirement
+  requirement: &2162448280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156689280
+  version_requirements: *2162448280
 description: Unofficial ruby library for consuming the Grooveshark API.
 email: dan.sosedoff@gmail.com
 executables: []
@@ -52,6 +52,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Gemfile
 - README.rdoc
 - Rakefile
 - grooveshark.gemspec
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Grooveshark API
@@ -97,3 +98,4 @@ test_files:
 - spec/helper.rb
 - spec/request_spec.rb
 - spec/utils_spec.rb
+has_rdoc: