XLiveServices 0.0.2 → 0.1.0

data/lib/xlive_services/marketplace_public.rb

@@ -12,6 +12,10 @@ module XLiveServices
         global :convert_response_tags_to, :camelcase
         global :soap_version, 2
         global :namespaces, { 'xmlns:a' => 'http://www.w3.org/2005/08/addressing' }
+        global :open_timeout, 3
+        global :ssl_version, :TLSv1
+        global :ssl_verify_mode, :none if LiveIdentity.isAvailable?
+        global :ssl_ca_cert_file, XLiveServices::CERT_FILE
 
         ConfigurationName = 'IMarketplacePublic'
 
@@ -22,11 +26,13 @@ module XLiveServices
         end
 
         def initialize(endpoint, wgxService)
+            raise 'Invalid WgxService Token!' if wgxService.nil? or wgxService.Token.nil? or wgxService.Token.empty?
             @WgxService = wgxService
             client.globals[:endpoint] = endpoint
         end
 
         def self.BuildOfferGUID(offerID, titleID=nil)
+            return offerID.to_s if offerID.to_s.match(/^[a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12}$/i)
             titleID = offerID >> 32 if titleID.nil?
             offerID &= 0xffffffff
             "%08x-0000-4000-8000-0000%08x" % [offerID, titleID]
@@ -42,12 +48,12 @@ module XLiveServices
 
         def GetPurchaseHistory(locale, pageNum = 1, orderBy = SortField::Title)
             client.globals[:soap_header] = GetHeader(__callee__)
-            client.call __callee__, message: { locale: locale, pageNum: pageNum, orderBy: Utils::Serialization::Serialize('enum', orderBy) }
+            client.call __callee__, message: { locale: locale, pageNum: pageNum, orderBy: Utils::Serialization::Serialize(orderBy, 'enum') }
         end
 
         def ReadUserSettings(titleID, settings)
             client.globals[:soap_header] = GetHeader(__callee__)
-            client.call __callee__, message: { titleID: titleID, settings: Utils::Serialization::Serialize('uint[]', settings) }
+            client.call __callee__, message: { titleID: titleID, settings: Utils::Serialization::Serialize(settings, 'uint[]') }
         end
 
         def GetOfferDetailsPublic(locale, offerGUID)
@@ -72,7 +78,7 @@ module XLiveServices
 
         def GetMediaUrls(urls, offerGUID)
             client.globals[:soap_header] = GetHeader(__callee__)
-            client.call __callee__, message: { urls: Utils::Serialization::Serialize('string[]', urls), offerID: offerGUID }
+            client.call __callee__, message: { urls: Utils::Serialization::Serialize(urls, 'string[]'), offerID: offerGUID }
         end
 
     end

data/lib/xlive_services/media.rb

@@ -0,0 +1,95 @@
+require 'tempfile'
+require 'libmspack'
+require 'multi_xml'
+
+module XLiveServices
+    module Media
+        class DownloadError < RuntimeError; end
+        class DownloadForbidden < DownloadError; end
+
+        def self.Download(urls, target, overwrite = false, keep = false)
+            uris = []
+            urls.each do |url|
+                uris << [URI.parse(url), url]
+            end
+            uris.each do |uri|
+                path = File::expand_path(File.basename(uri.first.path), target)
+                request = HTTPI::Request.new(uri.last)
+                response = nil
+                file = nil
+                begin
+                    if overwrite or not File.exist?(path) or File::size(path).zero?
+                        response = nil
+                        file = File.open(path, 'wb')
+                        request.on_body do |data|
+                            file.write(data)
+                        end
+                        yield(request, path)
+                        response = HTTPI.get(request)
+                        if response.error?
+                            file.truncate(0)
+                            if response.code == 403
+                                raise DownloadForbidden.new(response.body)
+                            else
+                                raise DownloadError.new(response.code)
+                            end
+                        end
+                        file.close
+                        file = nil
+                    else
+                        yield(nil, path)
+                    end
+                    urls.delete(uri.last)
+                rescue Exception => e
+                    file.close if file
+                    FileUtils.remove_file(path, true) unless keep
+                    raise e
+                end
+            end
+        end
+
+        def self.IsManifest?(path)
+            parts = path.split('.')
+            return false if parts.length < 2
+            parts[-2].end_with?('_manifest')
+        end
+
+        def self.IsSupportedManifest?(path)
+            path.end_with?('.cab')
+        end
+
+        def self.GetManifestLinks(manifest_cab)
+            links = []
+            decompressor = LibMsPack::CabDecompressor.new
+            decompressor.setParam(LibMsPack::MSCABD_PARAM_FIXMSZIP, 1)
+            cab = decompressor.open(manifest_cab)
+            begin
+                file = cab.files
+                begin
+                    if file.getFilename.casecmp('Content\OfferManifest.xml').zero?
+                        xmlFile = Tempfile.new('manifest_xml')
+                        decompressor.extract(file, xmlFile.path)
+                        begin
+                            xmlFile.open
+                            data = MultiXml.parse(xmlFile)
+                            items = data['OfferManifest']['Items']['Item']
+                            items = [items] unless items.is_a?(Array)
+                            items.each do |item|
+                                links << item['Link']['Url']
+                            end
+                        ensure
+                            xmlFile.close
+                            xmlFile.unlink
+                        end
+                        break
+                    end
+                end until (file = file.next).nil?
+            ensure
+                decompressor.close(cab)
+                decompressor.destroy
+            end
+            links
+        end
+
+    end
+end

data/lib/xlive_services/utils.rb

@@ -18,8 +18,19 @@ module XLiveServices
             namespace + configurationName + '/' + name
         end
 
+        def self.CleanURLs(urls)
+            clean = []
+            urls.each do |url|
+                uri = URI.parse(url)
+                uri.query = nil
+                uri.fragment = nil
+                clean << uri.to_s
+            end
+            clean
+        end
+
         class Serialization
-            def self.Serialize(type, data)
+            def self.Serialize(data, type)
                 serialized = {}
                 case type
                 when 'enum'
@@ -33,6 +44,17 @@ module XLiveServices
                 end
                 serialized
             end
+
+            def self.Deserialize(data, type)
+                unserialized = nil
+                case type
+                when 'string[]'
+                    unserialized = data['string']
+                    unserialized = [] unless unserialized
+                    unserialized = [unserialized] unless unserialized.is_a?(Array)
+                end
+                unserialized
+            end
         end
     end
 end

data/lib/xlive_services/version.rb

@@ -1,3 +1,4 @@
 module XLiveServices
-    VERSION = '0.0.2'
+    VERSION = '0.1.0'
 end
+

data/lib/xlive_services/xlive.rb

@@ -11,9 +11,14 @@ module XLiveServices
             @Locale = 'en-US'
             @Locale = locale if locale
             @Config = XLiveServices.GetLcwConfig(@Locale)
-            @Live = LiveIdentity.new(LiveIdGUID, LiveIdVersion, :NO_UI, { :IDCRL_OPTION_ENVIRONMENT => 'Production' })
+            @Live   = nil
+            @Identity = nil
 
-            if username.nil?
+            if LiveIdentity.isAvailable?
+                @Live = LiveIdentity.new(LiveIdGUID, LiveIdVersion, :NO_UI, { :IDCRL_OPTION_ENVIRONMENT => 'Production' })
+            end
+
+            if username.nil? and @Live
                 identities = @Live.GetIdentities(LiveIdentity::PPCRL_CREDTYPE_PASSWORD)
                 @Username = identities.GetNextIdentityName
                 if !@Username
@@ -25,53 +30,77 @@ module XLiveServices
                 @Username = username
             end
 
-            @Identity = @Live.GetIdentity(@Username, :IDENTITY_SHARE_ALL)
-            if !@Identity.HasPersistedCredential?(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY)
-                @Identity.SetCredential(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY, @Username)
+            if @Live
+                @Identity = @Live.GetIdentity(@Username, :IDENTITY_SHARE_ALL)
+                if !@Identity.HasPersistedCredential?(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY)
+                   @Identity.SetCredential(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY, @Username)
+                end
             end
 
-            if password
-                @Identity.SetCredential(LiveIdentity::PPCRL_CREDTYPE_PASSWORD, password)
-            elsif !@Identity.HasPersistedCredential?(LiveIdentity::PPCRL_CREDTYPE_PASSWORD)
-                raise XLiveServicesError.new("No Password for #{@Username}!")
+            if @Identity
+                if password
+                    @Identity.SetCredential(LiveIdentity::PPCRL_CREDTYPE_PASSWORD, password)
+                elsif !@Identity.HasPersistedCredential?(LiveIdentity::PPCRL_CREDTYPE_PASSWORD)
+                    raise XLiveServicesError.new("No Password for #{@Username}!")
+                end
             end
         end
 
         def PersistCredentials
+            return false unless @Identity
             @Identity.PersistCredential(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY)
             @Identity.PersistCredential(LiveIdentity::PPCRL_CREDTYPE_PASSWORD)
         end
 
         def RemovePersistedCredentials
+            return false unless @Identity
             @Identity.RemovePersistedCredential(LiveIdentity::PPCRL_CREDTYPE_PASSWORD)
             @Identity.RemovePersistedCredential(LiveIdentity::PPCRL_CREDTYPE_MEMBERNAMEONLY)
         end
 
         def IsAuthenticated?
-            @Identity.IsAuthenticated?
+            if @Identity
+                @Identity.IsAuthenticated?
+            else
+               nil
+            end
         end
 
         def Authenticate
-            return if IsAuthenticated?()
+            return true if IsAuthenticated?()
+            return false unless @Identity
             @Identity.Authenticate(nil, :LOGONIDENTITY_ALLOW_PERSISTENT_COOKIES)
         end
 
-        def GetUserAuthService
+        def SetUserAuthService(service)
+            @GetUserAuthService = service
+        end
+
+        def GetUserAuthService()
             @GetUserAuthService ||= XLiveServices.GetUserAuthService(@Identity, @Config)
         end
 
-        def GetUserAuthorizationInfo
-            userAuthorization = XLiveServices.GetUserAuthorization(@Config[:URL][:GetUserAuth].first, GetUserAuthService())
+        def GetUserAuthorizationInfo(authURL = nil)
+            authURL = @Config[:URL][:GetUserAuth].first if authURL.nil?
+            userAuthorization = XLiveServices.GetUserAuthorization(authURL, GetUserAuthService())
             userAuthorization['GetUserAuthorizationInfo']
         end
 
+        def SetWgxService(service)
+            @WgxService = service
+        end
+
         def GetWgxService
             @WgxService ||= XLiveServices.GetWgxService(@Identity, @Config)
         end
 
-        def GetMarketplace
+        def GetMarketplace(host = nil, path = nil)
+            # Main service url https://services.gamesforwindows.com/SecurePublic/MarketPlacePublic.svc
             # Alternative service url https://services.gamesforwindows.com/SecurePublic/MarketplaceRestSecure.svc
-            XLiveServices::MarketplacePublic.new(@Config[:URL][:WgxService].first, GetWgxService())
+            uri = URI(@Config[:URL][:WgxService].first)
+            uri.host = host if host # eg. services.xboxlive.com
+            uri.path = path if path
+            XLiveServices::MarketplacePublic.new(uri.to_s, GetWgxService())
         end
     end
 end

data/lib/xlive_services/xlive_services.rb

@@ -3,11 +3,19 @@ require 'multi_xml'
 require 'live_identity'
 
 module XLiveServices
-    class XLiveServicesError < RuntimeError; end
+    class XLiveServicesError < RuntimeError
+        attr_accessor :Code
+        attr_accessor :Body
+    end
+    class XLiveServicesUnauthorized < XLiveServicesError; end
 
     def self.GetLcwConfig(locale = 'en-US')
         raise XLiveServicesError.new('Invalid Locale!') if locale.nil? or locale.empty?
-        response = HTTPI.get(HTTPI::Request.new("https://live.xbox.com/#{locale}/GetLcwConfig.ashx"))
+        request = HTTPI::Request.new("https://live.xbox.com/#{locale}/GetLcwConfig.ashx")
+        request.auth.ssl.ca_cert_file = CERT_FILE
+        request.auth.ssl.ssl_version = :TLSv1_2
+        request.auth.ssl.verify_mode = :none if LiveIdentity.isAvailable?
+        response = HTTPI.get(request)
         raise "Error! HTTP Status Code: #{response.code}" if response.error?
         XLiveServices.ParseConfig(MultiXml.parse(response.body))
     end
@@ -24,6 +32,7 @@ module XLiveServices
     end
 
     def self.DoAuth(identity, serviceName, policy)
+        return nil unless identity
         identity.GetService(serviceName, policy)
     end
 
@@ -38,13 +47,24 @@ module XLiveServices
     end
 
     def self.GetUserAuthorization(url, userAuthService)
-        raise XLiveServicesError.new('Invalid AuthService Token!') if userAuthService.Token.nil? or userAuthService.Token.empty?
+        raise XLiveServicesError.new('Invalid AuthService Token!') if userAuthService.nil? or userAuthService.Token.nil? or userAuthService.Token.empty?
         request = HTTPI::Request.new(url)
         request.body = { :serviceType => 1, :titleId => 0 }
+        request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         request.headers['Authorization'] = "WLID1.0 #{userAuthService.Token}"
         request.headers['X-ClientType']  = 'panorama'
+        request.auth.ssl.ca_cert_file = CERT_FILE
+        request.auth.ssl.verify_mode = :none if LiveIdentity.isAvailable?
         response = HTTPI.post(request)
-        raise "Error! HTTP Status Code: #{response.code} #{response.body}" if response.error?
+        if response.error?
+            message = "Error! HTTP Status Code: #{response.code}"
+            error_class = XLiveServicesError
+            error_class = XLiveServicesUnauthorized if response.code == 401
+            error_exception = error_class.new(message)
+            error_exception.Code = response.code
+            error_exception.Body = response.body
+            raise error_exception
+        end
         MultiXml.parse(response.body)
     end
 

metadata

@@ -1,153 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: XLiveServices
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: LiveIdentity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: libmspack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A library to consume Xbox LIVE and Games for Windows LIVE services.
@@ -157,9 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - README.md
 - Rakefile
@@ -169,6 +183,7 @@ files:
 - lib/xlive_services.rb
 - lib/xlive_services/hresult.rb
 - lib/xlive_services/marketplace_public.rb
+- lib/xlive_services/media.rb
 - lib/xlive_services/utils.rb
 - lib/xlive_services/version.rb
 - lib/xlive_services/xlive.rb
@@ -185,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Interact with Xbox LIVE and Games for Windows LIVE services.