companion_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4343a3a67cf68ea8d4bcaeb3aa4348933fd645a7f622600320510230861780f
-  data.tar.gz: 0da00a10c193798c6914b711272503ea2cd2d1673fac2284fcb276ae644defe9
+  metadata.gz: cadd9a439d14d28b69c7b61c9e78c92a1ac3dfffbff7458a098d16441fad2618
+  data.tar.gz: 87bc717c1e5c9971abd427fe3f6ece4c29872b2327a089e979b9ce2e122ef5fb
 SHA512:
-  metadata.gz: 778381e42a5bdc38c8559dbae155aff105182e4fd202df9b11d5c0b1ea040e6d9d9df8a65b3b95569d568d6a30aef0e33cc888249c648083b30e087d1965691c
-  data.tar.gz: e599dcba3cfd10e8daeea576667f680d1efb0278c7d8ac7c8a0a722d2090b6df8cb8b39c7bf0470f9cdb8f2f7ef43a86533003a03f219f96196f0fcf218a1018
+  metadata.gz: 3951ef0c5404df9fa927281cd288ac50ddf00da655e773b0bfbdc5c11d76a7259a62265c38a8ef596808242b7b990f5593ab7dcdc8e78e3ec8213898a050af80
+  data.tar.gz: ebaa49f51a4ebd7afe857091b15b80491b119e4eb3084b3f40f8e0c1dd3144a0e4010f2182dceb583838648f537f7648a8e33af6cbbe7da0f2d148be050ce923

data/companion_api.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '~> 5'
   spec.add_dependency 'faraday', '~> 0.9'
+  spec.add_dependency 'faraday-cookie_jar', '~> 0.0.6'
   spec.add_dependency 'faraday_middleware', '~> 0.12.2'
-  spec.add_dependency 'httpclient', '~> 2.8.3'
   spec.add_dependency 'nokogiri', '~> 1.8.5'
   spec.add_dependency 'pbkdf2-ruby', '~> 0.2.1'
 

data/lib/companion_api.rb

@@ -1,6 +1,6 @@
 require 'faraday'
-require 'httpclient'
 require 'faraday_middleware'
+require 'faraday-cookie_jar'
 require 'nokogiri'
 
 require 'json'
@@ -26,11 +26,15 @@ require 'companion_api/resources/market'
 module CompanionApi
   class << self
     def uuid
-      @uuid ||= SecureRandom.uuid.upcase
+      @uuid ||= generate_uuid
     end
 
     def refresh_uuid
-      @uuid = SecureRandom.uuid.upcase
+      @uuid = generate_uuid
+    end
+
+    def generate_uuid
+      SecureRandom.uuid.upcase
     end
 
     def pbkdf2(value, salt)

data/lib/companion_api/base.rb

@@ -31,5 +31,14 @@ module CompanionApi
     def loggedin?
       @login.character.present?
     end
+
+    def valid_token?
+      last_login = @profile.get("lastLogin")
+      return false if last_login.blank?
+
+      diff = Time.now.to_i - last_login
+      # we use 12 hours for now to refresh tokens a bit more often and prevent expiring
+      diff < 12 * 60 * 60
+    end
   end
 end

data/lib/companion_api/error.rb

@@ -2,4 +2,5 @@ module CompanionApi
   class Error < StandardError; end
   class LoginError < StandardError; end
   class TokenExpiredError < StandardError; end
+  class ApiError < StandardError; end
 end

data/lib/companion_api/request.rb

@@ -35,7 +35,7 @@ module CompanionApi
         'Accept-Language' => 'en-gb',
         'Accept-Encoding' => 'br, gzip, deflate',
         'User-Agent'      => 'ffxivcomapp-e/1.0.3.0 CFNetwork/974.2.1 Darwin/18.0.0',
-        'request-id'      => @args[:requestId] || CompanionApi.uuid,
+        'request-id'      => @args[:requestId] || CompanionApi.generate_uuid,
         'token'           => @args[:token],
       }
 
@@ -55,15 +55,18 @@ module CompanionApi
     def execute!(method)
       CompanionApi.debug("executing %{method} to endpoint %{endpoint} with url %{uri}", method: method, endpoint: endpoint, uri: @args[:uri])
 
+      # FileUtils.touch("/tmp/cookies.dat")
+
+      # jar = HTTP::CookieJar.new
+      # jar.load("/tmp/cookies.dat")
+
       conn = Faraday.new(url: @args[:uri]) do |builder|
         # builder.response :logger
         builder.request :url_encoded
         builder.use FaradayMiddleware::FollowRedirects
-        builder.adapter :httpclient
-
-        # builder.adapter :httpclient do |http|
-        #   http.set_cookie_store("/tmp/test.dat")
-        # end
+        # builder.use :cookie_jar, jar: jar
+        builder.use :cookie_jar
+        builder.adapter :net_http
       end
 
       30.times do
@@ -77,6 +80,7 @@ module CompanionApi
 
         CompanionApi.debug("received status %{status}", status: res.status)
 
+        raise CompanionApi::ApiError, res.body if res.status == 500
         raise CompanionApi::TokenExpiredError, 'token has expired' if res.status == 403
 
         return res if @args[:return202] || res.status != 202

data/lib/companion_api/resources/account.rb

@@ -73,6 +73,8 @@ module CompanionApi
 
         raise CompanionApi::LoginError, 'Login status could not be validated.' if res.status != 202
 
+        @profile.set("lastLogin", Time.now.to_i)
+
         CompanionApi.refresh_uuid
         true
       end

data/lib/companion_api/resources/login.rb

@@ -30,14 +30,20 @@ module CompanionApi
       def characters
         return @characters if @characters.present?
 
-        req = CompanionApi::Request.new(
-          uri:      CompanionApi::Request::URI,
-          endpoint: '/login/characters',
-          token:    @profile.get("token"),
-        )
-
-        res = req.get!
-        json = JSON.parse(res.body)
+        json = {}
+        3.times do
+          req = CompanionApi::Request.new(
+            uri:      CompanionApi::Request::URI,
+            endpoint: '/login/characters',
+            token:    @profile.get("token"),
+          )
+
+          res = req.get!
+          json = JSON.parse(res.body)
+          break if json["accounts"].present?
+
+          sleep(0.5)
+        end
 
         raise CompanionApi::LoginError, 'no valid accounts found' if json["accounts"].blank?
 

data/lib/companion_api/resources/market.rb

@@ -32,7 +32,10 @@ module CompanionApi
         )
 
         res = req.get!
-        JSON.parse(res.body)
+        json = JSON.parse(res.body)
+        raise CompanionApi::ApiError, 'got an error message from companion api' if json["error"].present? && json["error"]["code"].present?
+
+        json
       end
     end
   end

data/lib/companion_api/version.rb

@@ -1,3 +1,3 @@
 module CompanionApi
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: companion_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nils Berenbold
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement