rocketleague 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ed39bb3ba4b136142265cf60efaa5fdf8d96f3c
-  data.tar.gz: 55a75d94479eeef90f327e296165ea13d6c01999
+  metadata.gz: b31f5a906cf1de804ed0f63dee9258d5da5c118c
+  data.tar.gz: 32f65d9df7c9378390b360a145d4972a69084654
 SHA512:
-  metadata.gz: 5eeeeddf927edfd6b573c10a87921e4fdfab02b2587a7e1ea1be6c72a071d0132d89f5ab6f34d6e973854e624a4992b98b995b9da67c95b8e2c7e558ee7825ca
-  data.tar.gz: 8658ba7ac5be7cd8fe0139e2007b40dd30d0224a87e2e26dbd7de8d1e3570ee364c11e7a64a80f7ed60e20ca2d297a63bdce805e48a88783e725c06cbc73de72
+  metadata.gz: c087768063c3279852fd773d6a4e3d0054f0bc0d566d74db0fea705c48b5a12fcc2b4ae70b4433549dbaffe2bbcea41d3097ace220bf2b8858a37950f48c9294
+  data.tar.gz: a4756cf270e1064626a47c7456e8276ad182125b7e15cba7b087744e105a2ee30c4afad7bed1b090addbac262c7055d9fb9f5ab8b61d20d5c7b80c75eb8ec282

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
-rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+sudo: false
+before_install: gem install bundler
+script:
+  - bundle exec rake test
+  - gem build rocketleague.gemspec

data/README.md

@@ -1,4 +1,4 @@
-# RocketLeague [![Gem](https://img.shields.io/gem/v/rocketleague.svg?style=flat-square)](https://rubygems.org/gems/rocketleague)
+# RocketLeague [![Gem](https://img.shields.io/gem/v/rocketleague.svg?style=flat-square)](https://rubygems.org/gems/rocketleague) [![Travis](https://img.shields.io/travis/rltracker/rocketleague/master.svg?style=flat-square)](https://travis-ci.org/rltracker/rocketleague/branches)
 
 *Who needs standards?* ¯\\\_(ツ)\_/¯
 
@@ -14,10 +14,10 @@ gem install rocketleague
 require "rocketleague"
 
 # these parameters seem to change very rarely
-rl = RocketLeague::API.new "https://psyonix-rl.appspot.com", 342373649, "Steam", "dUe3SE4YsR8B0c30E6r7F2KqpZSbGiVx", "pX9pn8F4JnBpoO8Aa219QC6N7g18FJ0F"
+rl = RocketLeague::API.new "https://psyonix-rl.appspot.com", 342373649, "Steam", "pX9pn8F4JnBpoO8Aa219QC6N7g18FJ0F"
 
 # let's start a session!
-rl.login 123456789, "MyUserName", "MyAuthCode"
+rl.login 123456789, "MyUserName", "MyAuthCode", "MyAuthTicket", "dUe3SE4YsR8B0c30E6r7F2KqpZSbGiVx"
 
 # we want to get some generic info + game servers
 payload = rl.procencode([["GetGenericDataAll"], ["GetGameServerPingList"]])

data/lib/rocketleague/api.rb

@@ -4,48 +4,50 @@ require "net/https"
 
 module RocketLeague
   class API
-    DEFAULT_HEADERS = {
-      "Content-Type" => "application/x-www-form-urlencoded",
-      "Environment" => "Prod",
-      "User-Agent" => "UE3-TA,UE3Ver(10897)",
-      "Cache-Control" => "no-cache"
-    }
+    attr_accessor :session_id
+    attr_accessor :default_headers
 
     # initializes the API
     # api_url should be "https://psyonix-rl.appspot.com"
     # build_id changes with every Rocket League update
     # platform is one of "Steam", "PS4", "XboxOne"
-    # login_secret_key should be "dUe3SE4YsR8B0c30E6r7F2KqpZSbGiVx" (it's not very secret)
-    # call_proc_key should be "pX9pn8F4JnBpoO8Aa219QC6N7g18FJ0F"
-    def initialize(api_url, build_id, platform, login_secret_key, call_proc_key)
+    # call_proc_key is usually "pX9pn8F4JnBpoO8Aa219QC6N7g18FJ0F"
+    def initialize(api_url, build_id, platform, call_proc_key)
+      # default headers sent with every request
+      @default_headers = {
+        "Content-Type" => "application/x-www-form-urlencoded",
+        "Environment" => "Prod",
+        "User-Agent" => "UE3-TA,UE3Ver(10897)",
+        "Cache-Control" => "no-cache"
+      }
+
       @api_url = api_url
       @build_id = build_id
       @platform = platform
-      @login_secret_key = login_secret_key
       @call_proc_key = call_proc_key
     end
 
     # returns a Psyonix-Style www-form-urlencoded string
     # which always starts with '&'
     # and keys are not encoded (e.g. contain unencoded '[]')
-    def formencode obj
-      params = [""]
+    def formencode(obj)
+      params = ""
       obj.each do |key, val|
         if val.kind_of? Array
           val.each do |v|
-            params << "#{key}=#{URI.encode_www_form_component(v)}"
+            params += "&#{key}=#{URI.encode_www_form_component(v)}"
           end
         else
-          params << "#{key}=#{URI.encode_www_form_component(val)}"
+          params += "&#{key}=#{URI.encode_www_form_component(val)}"
         end
       end
-      params.join("&")
+      params
     end
 
     # decodes a www-form-urlencoded string
     # returns a key-value Hash, where values are either strings
     # or Array of strings if the key is not unique
-    def formdecode str
+    def formdecode(str)
       result = {}
       URI.decode_www_form(str).each do |pair|
         key = pair.first
@@ -69,7 +71,7 @@ module RocketLeague
     # followed by option arguments
     #
     # returns a `formencode` string with 'Proc[]=' function names and 'P#P=' arguments, where '#' is the index of the Proc
-    def procencode commands
+    def procencode(commands)
       payload = {}
       procs = []
       commands.each_with_index do |cmd, i|
@@ -82,16 +84,30 @@ module RocketLeague
 
     # parses the response to a Proc request
     # returns an Array of results, which should be analogue to the `procencode` command order.
-    # each result is an Array of `formdecode` Hashes.
-    def procparse response
+    # each result is an Array of `formdecode` Hashes and/or RuntimeErrors
+    def procparse(response)
       results = []
-      parts = response.split(/^\r\n/, -1) # Psyonix ¯\_(ツ)_/¯
-      parts.pop
+      # remove trailing empty line
+      response.gsub! /\r?\n\z/, ''
+      # split on empty lines
+      # may be first, intermediate, or last line
+      # may be using CRLF or LF
+      # Psyonix ¯\_(ツ)_/¯
+      parts = response.split(/^\r?$\n|\r?\n\r?\n|\r?$\n$/, -1)
       parts.each do |part|
         result = []
-        lines = part.split "\r\n"
+        lines = part.split /\r?\n/, -1
         lines.each do |line|
-          result << formdecode(line)
+          # PROCEDURE ERROR = Function does not exist
+          # SCRIPT ERROR    = Function parameters missing or invalid
+          # SQL ERROR       = Data not available
+          if line =~ /^(PROCEDURE|SCRIPT|SQL) ERROR/
+            # Can be on a single line while others are fine
+            # We don't want to raise an exception cause 1 line failed
+            result << RuntimeError.new(line)
+          else
+            result << formdecode(line)
+          end
         end
         results << result
       end
@@ -99,40 +115,42 @@ module RocketLeague
     end
 
     # performs a POST request to the Rocket League API
-    # with the `DEFAULT_HEADERS` and `extra_headers`
+    # with the `default_headers` and `extra_headers`
     # SessionID and CallProcKey headers are added unless SessionID is unset
     # returns HTTPResponse
-    def request(path, exra_headers = {}, payload)
+    def request(path,exra_headers = {}, payload)
       uri = URI.parse(@api_url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = (uri.scheme == "https")
 
-      if @SessionID
+      if @session_id
         # Used for all requests except initial auth call
         exra_headers.merge!({
-          "SessionID" => @SessionID,
+          "SessionID" => @session_id,
           "CallProcKey" => @call_proc_key
         })
       end
 
-      req = Net::HTTP::Post.new(path, DEFAULT_HEADERS.merge(exra_headers))
+      req = Net::HTTP::Post.new(path, @default_headers.merge(exra_headers))
       req.body = payload
       http.request(req)
     end
 
     # initiates a new session by authenticating against the API
-    # returns boolean whether a SessionID was returned
-    def login player_id, player_name, auth_code
+    # login_secret_key is usually "dUe3SE4YsR8B0c30E6r7F2KqpZSbGiVx"
+    # returns boolean whether a SessionID was received
+    def login(player_id, player_name, auth_code, auth_ticket, login_secret_key)
       payload = formencode({
         "PlayerName" => player_name,
         "PlayerID" => player_id,
         "Platform" => @platform,
         "BuildID" => @build_id,
         "AuthCode" => auth_code,
+        "AuthTicket" => auth_ticket,
         "IssuerID" => 0
       })
-      response = request("/auth/", {"LoginSecretKey" => @login_secret_key }, payload)
-      !!(@SessionID = response["sessionid"])
+      response = request("/auth/", {"LoginSecretKey" => login_secret_key }, payload)
+      !!(@session_id = response["sessionid"])
     end
   end
 end

data/lib/rocketleague/version.rb

@@ -1,3 +1,3 @@
 module RocketLeague
-  VERSION = "0.0.3"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketleague
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - rltracker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler