overlook-csgo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4315287d2d511f86432769b0502b8c577f01f224
-  data.tar.gz: d01328bc2470a355e6518211c3edb7b44b9517a8
+  metadata.gz: 2c589e51df4df33aa3df5fd0567e68f3523d3fa2
+  data.tar.gz: 42af28212e75f9dd36803373850d30ac978ae64b
 SHA512:
-  metadata.gz: 96719088e5dee74f35585db2972f95909004a068eaf351b5db4399f6985b3f2d6d3adfc7301eb326cabeb0d6575871032cc8a4ca0d5cb28549fec83d123cf9e2
-  data.tar.gz: ed622e5f5992827ddc2c2473a8183f2dcd5b55b5224c08c297fc5b97d6ae955e148ffbfb3639a248294e78f964c246afff232750d3f015a761026560e352a04b
+  metadata.gz: feb1c94c5bad6ea0394c3af67271dc99c82c7083413aac67eba859ad9d00182bc33e7f7fffd4faaee9db73d64186ca0dceb631c3efe33a00061a1f318f93a31b
+  data.tar.gz: ff4e2db1be562e5ed52e5eb10c661b25db4c79e70f1964b128bf7fa586fc725903003f4dd34a5bc8d6db172e5c671edd2fcb8d57e10fbd0cb4f3abd9b39be76d

data/.gitignore

@@ -1,5 +1,5 @@
 pkg/*
 tmp/*
-lib/proto/downloaded/*
+lib/proto/proto/*
 .DS_Store
-spec/.DS_Store
+spec/.DS_Store

data/Gemfile.lock

@@ -10,12 +10,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    ast (2.2.0)
+    ast (2.3.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    beefcake (1.1.0)
+    beefcake (1.2.0)
     codeclimate-engine-rb (0.3.1)
       virtus (~> 1.0)
     coderay (1.1.1)
@@ -42,7 +42,7 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     method_source (0.8.2)
-    parser (2.3.0.6)
+    parser (2.3.1.0)
       ast (~> 2.2)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -55,7 +55,7 @@ GEM
       spoon (~> 0.0)
     rainbow (2.1.0)
     rake (10.5.0)
-    reek (3.11)
+    reek (4.0.2)
       codeclimate-engine-rb (~> 0.3.1)
       parser (~> 2.3, >= 2.3.0.6)
       rainbow (~> 2.0)
@@ -63,7 +63,7 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -72,15 +72,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby_parser (3.8.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    rubycritic (2.8.0)
+    rubycritic (2.9.1)
       colorize
       flay (= 2.7.0)
       flog (= 4.3.2)
       launchy (= 2.4.3)
-      parser (~> 2.3)
-      reek (= 3.11)
+      parser (= 2.3.1.0)
+      reek (= 4.0.2)
       ruby_parser (~> 3.8)
       virtus (~> 1.0)
     sexp_processor (4.7.0)

data/Rakefile

@@ -4,3 +4,41 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+namespace :proto do
+  desc 'Update the generated proto'
+  task :update do
+    proto_version = '2.6.0'
+
+    FileUtils.mkdir_p('./lib/proto/proto')
+    FileUtils.mkdir_p('./lib/proto/compiled')
+
+    base_url = "https://raw.githubusercontent.com/SteamRE/SteamKit/master/Resources/Protobufs/csgo/"
+    protos   = %w(cstrike15_gcmessages.proto cstrike15_usermessages.proto netmessages.proto steammessages.proto)
+
+    Dir.chdir('./lib/proto/proto') do
+      protos.each do |file|
+        `curl -O #{base_url}/#{file}`
+      end
+
+      `curl -L https://github.com/google/protobuf/archive/v#{proto_version}.tar.gz -o protobuf.tar.gz`
+      `rm -f protobuf.tar`
+      `gunzip protobuf.tar.gz`
+      `tar -xvzf protobuf.tar`
+
+      protos.each do |file|
+        `protoc --beefcake_out ../compiled -I . -I protobuf-#{proto_version}/src #{file}`
+
+        %w(key_t class_t sendprop_t descriptor_t sounddata_t).each do |broken|
+          fixed = broken
+          fixed[0] = fixed[0].capitalize
+
+          `sed 's/#{broken}/#{fixed}/g' #{file}`
+        end
+      end
+    end
+
+
+    puts "**** Beefcake generates some invalid Ruby, the generated files may need small hand corrections ****"
+  end
+end

data/lib/overlook.rb

@@ -7,8 +7,8 @@ require 'overlook/byte_reader'
 
 require 'proto/compiled/descriptor.pb'
 require 'proto/compiled/netmessages.pb'
-require 'proto/compiled/cstrike15_usermessages.pb'
 require 'proto/compiled/cstrike15_gcmessages.pb'
+require 'proto/compiled/cstrike15_usermessages.pb'
 
 require 'steamidlib'
 

data/lib/overlook/csgo/demo/user_message_message_handler.rb

@@ -6,8 +6,9 @@ module Overlook
       class UserMessageMessageHandler
         include SteamIDs
 
-        SERVER_RANK_UPDATE_MESSAGE_TYPE = 52
-        XP_UPDATE_MESSAGE_TYPE          = 65
+        SERVER_RANK_UPDATE_MESSAGE_TYPE     = 52
+        XP_UPDATE_MESSAGE_TYPE              = 65
+        SEND_PLAYER_ITEM_DROP_MESSAGE_TYPE  = 61
 
         def initialize(parser)
           @parser = parser
@@ -17,13 +18,23 @@ module Overlook
           user_message = CSVCMsg_UserMessage.decode(message)
 
           case user_message.msg_type
+          when SEND_PLAYER_ITEM_DROP_MESSAGE_TYPE
+            # nop
           when XP_UPDATE_MESSAGE_TYPE
             xp_update_message =  CCSUsrMsg_XpUpdate.decode(user_message.msg_data)
-
             community_id = SteamID32.parse("[U:1:#{xp_update_message.data.account_id}]").to_steamID64.to_s
-            xp_update_message.data.xp_progress_data.each do |update|
-              # wip
-            end
+
+            xp_update = {
+              community_id => {
+                xp: xp_update_message.data.current_xp,
+                lvl: xp_update_message.data.current_level,
+                progress: xp_update_message.data.xp_progress_data.map do |item|
+                  { category: item.xp_category, xp: item.xp_points }
+                end
+              }
+            }
+
+            @parser.emit(:xp_update, xp_update)
           when SERVER_RANK_UPDATE_MESSAGE_TYPE
             server_rank_update_message = CCSUsrMsg_ServerRankUpdate.decode(user_message.msg_data)
 
@@ -32,7 +43,7 @@ module Overlook
               # [U:1:account_id]
               community_id = SteamID32.parse("[U:1:#{update.account_id}]").to_steamID64.to_s
 
-              @parser.emit(:rank_update, 
+              @parser.emit(:rank_update,
                             { community_id: community_id, rank: update.rank_new })
             end
           end

data/lib/overlook/version.rb

@@ -1,3 +1,3 @@
 module Overlook
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/proto/compiled/cstrike15_gcmessages.pb.rb

@@ -151,6 +151,18 @@ class MatchEndItemUpdates
   include Beefcake::Message
 end
 
+class ScoreLeaderboardData
+  include Beefcake::Message
+
+  class Entry
+    include Beefcake::Message
+  end
+
+  class AccountEntries
+    include Beefcake::Message
+  end
+end
+
 class PlayerQuestData
   include Beefcake::Message
 
@@ -259,10 +271,6 @@ class CMsgGCCStrike15_v2_MatchmakingServer2GCKick
   include Beefcake::Message
 end
 
-class CDataGCCStrike15_v2_MatchmakingLockedInMatch
-  include Beefcake::Message
-end
-
 class CMsgGCCStrike15_v2_MatchmakingGC2ServerRankUpdate
   include Beefcake::Message
 end
@@ -689,6 +697,23 @@ class MatchEndItemUpdates
   optional :item_attr_delta_value, :uint32, 3
 end
 
+class ScoreLeaderboardData
+
+  class Entry
+    optional :tag, :uint32, 1
+    optional :val, :uint32, 2
+  end
+
+  class AccountEntries
+    optional :accountid, :uint32, 1
+    repeated :entries, ScoreLeaderboardData::Entry, 2
+  end
+  optional :quest_id, :uint64, 1
+  optional :score, :uint32, 2
+  repeated :accountentries, ScoreLeaderboardData::AccountEntries, 3
+  repeated :matchentries, ScoreLeaderboardData::Entry, 5
+end
+
 class PlayerQuestData
 
   class QuestItemData
@@ -706,6 +731,9 @@ end
 
 class CMsgGC_ServerQuestUpdateData
   repeated :player_quest_data, PlayerQuestData, 1
+  optional :binary_data, :bytes, 2
+  optional :mm_game_mode, :uint32, 3
+  optional :missionlbsdata, ScoreLeaderboardData, 4
 end
 
 class CMsgGCCStrike15_v2_MatchmakingGCOperationalStats
@@ -828,12 +856,14 @@ class CMsgGCCStrike15_v2_MatchmakingServerReservationResponse
   optional :reward_item_attr_reward_idx, :uint32, 11
   optional :reward_drop_list, :uint32, 12
   optional :tournament_tag, :string, 13
+  optional :steamdatagram_port, :uint32, 14
 end
 
 class CMsgGCCStrike15_v2_MatchmakingGC2ClientReserve
   optional :serverid, :uint64, 1
-  optional :serverip, :uint32, 2
-  optional :serverport, :uint32, 3
+  optional :server_address, :string, 7
+  optional :legacy_serverip, :uint32, 2
+  optional :legacy_serverport, :uint32, 3
   optional :reservationid, :uint64, 4
   optional :reservation, CMsgGCCStrike15_v2_MatchmakingGC2ServerReserve, 5
   optional :map, :string, 6
@@ -880,6 +910,7 @@ class CMsgGCCStrike15_v2_MatchmakingServerMatchEnd
   optional :replay_cluster_id, :uint32, 6
   optional :aborted_match, :bool, 7
   optional :match_end_quest_data, CMsgGC_ServerQuestUpdateData, 8
+  optional :server_version, :uint32, 9
 end
 
 class CMsgGCCStrike15_v2_MatchmakingClient2GCHello
@@ -928,13 +959,6 @@ class CMsgGCCStrike15_v2_MatchmakingServer2GCKick
   optional :reason, :uint32, 3
 end
 
-class CDataGCCStrike15_v2_MatchmakingLockedInMatch
-  optional :client_reservation, CMsgGCCStrike15_v2_MatchmakingGC2ClientReserve, 1
-  optional :server_stats, CMsgGCCStrike15_v2_MatchmakingServerRoundStats, 2
-  optional :rtime32_server_info, :uint32, 3
-  optional :last_round_stats_temp, CMsgGCCStrike15_v2_MatchmakingServerRoundStats, 4
-end
-
 class CMsgGCCStrike15_v2_MatchmakingGC2ServerRankUpdate
   repeated :rankings, PlayerRankingInfo, 1
   optional :match_id, :uint64, 2
@@ -973,6 +997,7 @@ class CMsgGCCStrike15_v2_ClientReportServer
   optional :rpt_abusivemodels, :uint32, 2
   optional :rpt_badmotd, :uint32, 3
   optional :rpt_listingabuse, :uint32, 4
+  optional :rpt_inventoryabuse, :uint32, 5
   optional :match_id, :uint64, 8
 end
 

data/lib/proto/compiled/cstrike15_usermessages.pb.rb

@@ -65,6 +65,7 @@ module ECstrike15UserMessages
   CS_UM_ReportHit = 64
   CS_UM_XpUpdate = 65
   CS_UM_QuestProgress = 66
+  CS_UM_ScoreLeaderboardData = 67
 end
 
 class CCSUsrMsg_VGUIMenu
@@ -219,6 +220,10 @@ class CCSUsrMsg_QuestProgress
   include Beefcake::Message
 end
 
+class CCSUsrMsg_ScoreLeaderboardData
+  include Beefcake::Message
+end
+
 class CCSUsrMsg_XRankGet
   include Beefcake::Message
 end
@@ -443,6 +448,7 @@ end
 class CCSUsrMsg_Damage
   optional :amount, :int32, 1
   optional :inflictor_world_pos, CMsgVector, 2
+  optional :victim_entindex, :int32, 3
 end
 
 class CCSUsrMsg_RadioText
@@ -478,11 +484,11 @@ class CCSUsrMsg_ProcessSpottedEntityUpdate
 end
 
 class CCSUsrMsg_SendPlayerItemDrops
-  # repeated :entity_updates, CEconItemPreviewDataBlock, 1
+  repeated :entity_updates, CEconItemPreviewDataBlock, 1
 end
 
 class CCSUsrMsg_SendPlayerItemFound
-  # optional :iteminfo, CEconItemPreviewDataBlock, 1
+  optional :iteminfo, CEconItemPreviewDataBlock, 1
   optional :entindex, :int32, 2
 end
 
@@ -556,6 +562,11 @@ class CCSUsrMsg_QuestProgress
   optional :quest_id, :uint32, 1
   optional :normal_points, :uint32, 2
   optional :bonus_points, :uint32, 3
+  optional :is_event_quest, :bool, 4
+end
+
+class CCSUsrMsg_ScoreLeaderboardData
+  optional :data, ScoreLeaderboardData, 1
 end
 
 class CCSUsrMsg_XRankGet
@@ -619,10 +630,6 @@ class CCSUsrMsg_ServerRankUpdate
   repeated :rank_update, CCSUsrMsg_ServerRankUpdate::RankUpdate, 1
 end
 
-class CMsgGCCstrike15_v2_GC2ServerNotifyXPRewarded
-  include Beefcake::Message
-end
-
 class CCSUsrMsg_XpUpdate
   optional :data, CMsgGCCstrike15_v2_GC2ServerNotifyXPRewarded, 1
 end

data/lib/proto/compiled/netmessages.pb.rb

@@ -26,6 +26,7 @@ module CLC_Messages
   clc_SplitPlayerConnect = 16
   clc_ClientMessage = 17
   clc_CmdKeyValues = 18
+  clc_HltvReplay = 20
 end
 
 module VoiceDataFormat_t
@@ -67,6 +68,14 @@ module SVC_Messages
   svc_PaintmapData = 33
   svc_CmdKeyValues = 34
   svc_EncryptedData = 35
+  svc_HltvReplay = 36
+end
+
+module ReplayEventType_t
+  REPLAY_EVENT_CANCEL = 0
+  REPLAY_EVENT_DEATH = 1
+  REPLAY_EVENT_GENERIC = 2
+  REPLAY_EVENT_STUCK_NEED_FULL_UPDATE = 3
 end
 
 class CMsgVector
@@ -268,7 +277,7 @@ class CSVCMsg_GameEventList
     include Beefcake::Message
   end
 
-  class Descriptor
+  class Descriptor_t
     include Beefcake::Message
   end
 end
@@ -301,6 +310,14 @@ class CSVCMsg_EncryptedData
   include Beefcake::Message
 end
 
+class CSVCMsg_HltvReplay
+  include Beefcake::Message
+end
+
+class CCLCMsg_HltvReplay
+  include Beefcake::Message
+end
+
 class CMsgVector
   optional :x, :float, 1
   optional :y, :float, 2
@@ -330,6 +347,7 @@ class CNETMsg_Tick
   optional :host_computationtime, :uint32, 4
   optional :host_computationtime_std_deviation, :uint32, 5
   optional :host_framestarttime_std_deviation, :uint32, 6
+  optional :hltv_replay_flags, :uint32, 7
 end
 
 class CNETMsg_StringCmd
@@ -591,6 +609,7 @@ end
 class CSVCMsg_UserMessage
   optional :msg_type, :int32, 1
   optional :msg_data, :bytes, 2
+  optional :passthrough, :int32, 3
 end
 
 class CSVCMsg_PaintmapData
@@ -613,6 +632,7 @@ class CSVCMsg_GameEvent
   optional :event_name, :string, 1
   optional :eventid, :int32, 2
   repeated :keys, CSVCMsg_GameEvent::Key_t, 3
+  optional :passthrough, :int32, 4
 end
 
 class CSVCMsg_GameEventList
@@ -622,12 +642,12 @@ class CSVCMsg_GameEventList
     optional :name, :string, 2
   end
 
-  class Descriptor
+  class Descriptor_t
     optional :eventid, :int32, 1
     optional :name, :string, 2
     repeated :keys, CSVCMsg_GameEventList::Key_t, 3
   end
-  repeated :descriptors, CSVCMsg_GameEventList::Descriptor, 1
+  repeated :descriptors, CSVCMsg_GameEventList::Descriptor_t, 1
 end
 
 class CSVCMsg_TempEntities
@@ -685,3 +705,21 @@ class CSVCMsg_EncryptedData
   optional :encrypted, :bytes, 1
   optional :key_type, :int32, 2
 end
+
+class CSVCMsg_HltvReplay
+  optional :delay, :int32, 1
+  optional :primary_target, :int32, 2
+  optional :replay_stop_at, :int32, 3
+  optional :replay_start_at, :int32, 4
+  optional :replay_slowdown_begin, :int32, 5
+  optional :replay_slowdown_end, :int32, 6
+  optional :replay_slowdown_rate, :float, 7
+end
+
+class CCLCMsg_HltvReplay
+  optional :request, :int32, 1
+  optional :slowdown_length, :float, 2
+  optional :slowdown_rate, :float, 3
+  optional :primary_target_ent_index, :int32, 4
+  optional :event_time, :float, 5
+end

data/lib/proto/compiled/steammessages.pb.rb

@@ -649,6 +649,15 @@ class CGCSystemMsg_GetAccountDetails_Response
   optional :suspension_end_time, :uint32, 21
   optional :currency, :string, 22
   optional :steam_level, :uint32, 23
+  optional :friend_count, :uint32, 24
+  optional :account_creation_time, :uint32, 25
+  optional :is_steamguard_enabled, :bool, 27
+  optional :is_phone_verified, :bool, 28
+  optional :is_two_factor_auth_enabled, :bool, 29
+  optional :two_factor_enabled_time, :uint32, 30
+  optional :phone_verification_time, :uint32, 31
+  optional :phone_id, :uint64, 33
+  optional :is_phone_identifying, :bool, 34
 end
 
 class CMsgGCGetPersonaNames

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlook-csgo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Taylor Finnell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake