steam-condenser 0.8.0 → 0.9.0

data/lib/steam/community/tf2/tf2_stats.rb

@@ -12,12 +12,12 @@ class TF2Stats < GameStats
   attr_reader :accumulated_points
   
   # Creates a TF2Stats object by calling the super constructor with the game
-  # name "TF2"
+  # name "tf2"
   def initialize(steam_id)
-    super steam_id, "TF2"
+    super steam_id, 'tf2'
 
     if public?
-      @accumulated_points = @xml_data.elements["stats"].elements["accumulatedPoints"].text.to_i
+      @accumulated_points = @xml_data.elements['stats/accumulatedPoints'].text.to_i
     end
   end
   
@@ -28,8 +28,8 @@ class TF2Stats < GameStats
 
     if @class_stats.nil?
       @class_stats = Hash.new
-      @xml_data.elements["stats"].elements.each("classData") do |class_data|
-        @class_stats[class_data.elements["className"].text] = TF2Class.new class_data
+      @xml_data.elements.each('stats/classData') do |class_data|
+        @class_stats[class_data.elements['className'].text] = TF2Class.new(class_data)
       end
     end
     

data/lib/steam/packets/rcon/rcon_exec_response.rb

@@ -1,20 +1,18 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "steam/packets/rcon/rcon_packet"
 
 class RCONExecResponse < RCONPacket
-  
+
   def initialize(request_id, command_response)
     super request_id, RCONPacket::SERVERDATA_RESPONSE_VALUE, command_response
   end
-  
+
   def get_response
-    return @content_data.array
+    @content_data.array[0..-3]
   end
-  
-end
+
+end

data/lib/steam/packets/s2a_rules_packet.rb

@@ -2,27 +2,34 @@
 # terms of the new BSD License.
 #
 # Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
 
 require "steam/packets/steam_packet"
 
 # The S2A_RULES_Packet class represents the response to a A2S_RULES
 # request send to the server.
 class S2A_RULES_Packet < SteamPacket
-  
+
   # Creates a S2A_RULES response object based on the data received.
   def initialize(content_data)
     if content_data == nil
       raise Exception.new("Wrong formatted A2A_RULES response packet.")
     end
-    
+
     super SteamPacket::S2A_RULES_HEADER, content_data
-    
-    @rules_hash = Hash.new @content_data.get_short
 
-    while @content_data.remaining > 0
-      @rules_hash[@content_data.get_string] = @content_data.get_string
+    rules_count = @content_data.get_short
+
+    @rules_hash = {}
+
+    rules_count.times do
+      rule  = @content_data.get_string
+      value = @content_data.get_string
+
+      # This is a workaround for servers sending corrupt replies
+      break if rule.empty? or value.empty?
+
+      @rules_hash[rule] = value
+      puts "#{rule} = #{value}"
     end
   end
 

data/lib/steam/servers/game_server.rb

@@ -142,13 +142,11 @@ class GameServer
     unless rcon_password.nil? or @player_hash.empty?
       rcon_auth(rcon_password)
       players = rcon_exec('status').split("\n")[7..-1]
-      if is_a? GoldSrcServer
-        players.pop
-      end
+      players.pop if is_a? GoldSrcServer
 
       players.each do |player|
         player_data = split_player_status(player)
-        @player_hash[player_data[1]].add_info(*player_data)
+        @player_hash[player_data[1]].add_info(*player_data) if @player_hash.key?(player_data[1])
       end
     end
   end

data/lib/steam/servers/goldsrc_server.rb

@@ -10,7 +10,7 @@ class GoldSrcServer < GameServer
 
   # Splits the player status obtained with +rcon status+
   def self.split_player_status(player_status)
-    player_data = player_status.match(/#( \d|\d\d) +"(.*)" +(\d+) +(.*)/).to_a[1..-1]
+    player_data = player_status.match(/# *(\d+) +"(.*)" +(\d+) +(.*)/).to_a[1..-1]
     player_data[3] = player_data[3].split
     player_data.flatten!
     player_data[0] = player_data[2]
@@ -23,14 +23,14 @@ class GoldSrcServer < GameServer
     super port_number
     @socket = GoldSrcSocket.new ip_address, port_number, is_hltv
   end
-  
+
   def rcon_auth(password)
     @rcon_password = password
     return true
   end
-  
+
   def rcon_exec(command)
     return @socket.rcon_exec(@rcon_password, command).strip
   end
-  
-end
+
+end

data/lib/steam/servers/source_server.rb

@@ -15,35 +15,35 @@ class SourceServer < GameServer
 
   # Splits the player status obtained with +rcon status+
   def self.split_player_status(player_status)
-    player_data = player_status.match(/#( \d|\d\d) +"(.*)" +(.*)/).to_a[1..-1]
+    player_data = player_status.match(/# *(\d+) +"(.*)" +(.*)/).to_a[1..-1]
     player_data[2] = player_data[2].split
     player_data.flatten
   end
-  
+
   def initialize(ip_address, port_number = 27015)
     super port_number
     @rcon_socket = RCONSocket.new ip_address, port_number
     @socket = SourceSocket.new ip_address, port_number
   end
-  
+
   def rcon_auth(password)
     @rcon_request_id = rand 2**16
-    
+
     @rcon_socket.send RCONAuthRequest.new(@rcon_request_id, password)
     @rcon_socket.get_reply
     reply = @rcon_socket.get_reply
-    
+
     if reply.request_id == -1
       raise RCONNoAuthException.new
     end
-    
+
     return reply.get_request_id == @rcon_request_id
   end
-  
+
   def rcon_exec(command)
     @rcon_socket.send RCONExecRequest.new(@rcon_request_id, command)
     response_packets = Array.new
-    
+
     begin
       begin
         response_packet = @rcon_socket.get_reply
@@ -53,13 +53,13 @@ class SourceServer < GameServer
     rescue TimeoutException
       raise $! if response_packets.empty?
     end
-    
+
     response = String.new
     response_packets.each do |packet|
       response << packet.get_response
     end
-    
+
     return response.strip
   end
 
-end
+end

data/lib/steam/sockets/rcon_socket.rb

@@ -1,38 +1,39 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
-require "socket_channel"
-require "steam/packets/rcon/rcon_packet"
-require "steam/packets/rcon/rcon_packet_factory"
-require "steam/sockets/steam_socket"
+require 'socket_channel'
+require 'exceptions/rcon_ban_exception'
+require 'steam/packets/rcon/rcon_packet'
+require 'steam/packets/rcon/rcon_packet_factory'
+require 'steam/sockets/steam_socket'
 
 class RCONSocket < SteamSocket
-  
+
   def initialize(ip_address, port_number)
     super ip_address, port_number
     @channel = SocketChannel.open
   end
-  
+
   def send(data_packet)
     if !@channel.connected?
       @channel.connect @remote_socket
     end
-    
+
     @buffer = ByteBuffer.wrap data_packet.get_bytes
     @channel.write @buffer
   end
-  
+
   def get_reply
-    self.receive_packet 1440
+    if self.receive_packet(1440) == 0
+      raise RCONBanException
+    end
     packet_data = @buffer.array[0..@buffer.limit]
     packet_size = @buffer.get_long + 4
-    
+
     if packet_size > 1440
-      remaining_bytes = packet_size - 1440
+      remaining_bytes = packet_size - @buffer.limit
       begin
         if remaining_bytes < 1440
           self.receive_packet remaining_bytes
@@ -43,8 +44,8 @@ class RCONSocket < SteamSocket
         remaining_bytes -= @buffer.limit
       end while remaining_bytes > 0
     end
-    
+
     return RCONPacketFactory.get_packet_from_data(packet_data)
   end
-  
-end
+
+end

data/lib/steam/sockets/steam_socket.rb

@@ -1,9 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008, Sebastian Staudt
-#
-# $Id$
+# Copyright (c) 2008-2009, Sebastian Staudt
 
 require "abstract_class"
 require "byte_buffer"
@@ -41,19 +39,18 @@ class SteamSocket
       @buffer = ByteBuffer.allocate buffer_length
     end
     
-    @channel.read @buffer
-    bytes_read = @buffer.position
+    bytes_read = @channel.read(@buffer)
     @buffer.rewind
     @buffer.limit = bytes_read
     
-    return bytes_read
+    bytes_read
   end
   
   def send(data_packet)
     warn "Sending data packet of type \"#{data_packet.class.to_s}\"."
     
-    @buffer = ByteBuffer.wrap data_packet.to_s
-    @channel.write @buffer
+    @buffer = ByteBuffer.wrap(data_packet.to_s)
+    @channel.write(@buffer)
   end
   
   def finalize

data/lib/steam/steam_player.rb

@@ -8,9 +8,9 @@ require 'exceptions/steam_condenser_exception'
 # The SteamPlayer class represents a player connected to a server
 class SteamPlayer
 
-  attr_reader :connect_time, :id, :name, :loss, :ping, :real_id, :score, :state,
-              :steam_id
-  
+  attr_reader :client_port, :connect_time, :id, :ip_address, :name, :loss,
+              :ping, :real_id, :score, :state, :steam_id
+
   # Creates a new SteamPlayer object based on the given information
   def initialize(id, name, score, connect_time)
     @connect_time = connect_time
@@ -32,7 +32,7 @@ class SteamPlayer
     if steam_id == 'BOT'
       @state = player_data[0]
     else
-      @addr  = player_data[4]
+      @ip_address, @client_port  = player_data[4].split(':')
       @loss  = player_data[2]
       @ping  = player_data[1]
       @state = player_data[3]
@@ -47,5 +47,5 @@ class SteamPlayer
       "\##{@id} \"#{@name}\", Score: #{@score}, Time: #{@connect_time}"
     end
   end
-  
+
 end

data/test/byte_buffer_tests.rb

@@ -0,0 +1,76 @@
+# This code is free software; you can redistribute it and/or modify it under the
+# terms of the new BSD License.
+#
+# Copyright (c) 2009, Sebastian Staudt
+
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+require 'byte_buffer'
+
+class ByteBufferTests < Test::Unit::TestCase
+
+  def test_allocate
+    buffer = ByteBuffer.allocate(10)
+    assert_equal("\0" * 10, buffer.array)
+  end
+
+  def test_get_byte
+    buffer = ByteBuffer.wrap('test')
+    assert_equal('t'[0], buffer.get_byte)
+    assert_equal(3, buffer.remaining)
+  end
+
+  def test_get_float
+    buffer = ByteBuffer.wrap('test')
+    assert_equal('7.71353668494131e+31', buffer.get_float.to_s)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_get_long
+    buffer = ByteBuffer.wrap('test')
+    assert_equal(1953719668, buffer.get_long)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_get_short
+    buffer = ByteBuffer.wrap('test')
+    assert_equal(25972, buffer.get_short)
+    assert_equal(2, buffer.remaining)
+  end
+
+  def test_get_signed_long
+    buffer = ByteBuffer.wrap("   \255")
+    assert_equal(-1390403552, buffer.get_signed_long)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_get_string
+    buffer = ByteBuffer.wrap("test\0test")
+    assert_equal('test', buffer.get_string)
+    assert_equal(4, buffer.remaining)
+  end
+
+  def test_put
+    buffer = ByteBuffer.wrap('te')
+    buffer.put('st')
+    assert_equal('st', buffer.array)
+    buffer = ByteBuffer.allocate(4)
+    buffer.put('test')
+    assert_equal('test', buffer.array)
+  end
+
+  def test_rewind
+    buffer = ByteBuffer.wrap('test')
+    assert_equal(25972, buffer.get_short)
+    buffer.rewind
+    assert_equal(25972, buffer.get_short)
+  end
+
+  def test_wrap
+    string = 'test'
+    buffer = ByteBuffer.wrap(string)
+    assert_equal(string, buffer.array)
+  end
+
+end

data/test/datagram_channel_tests.rb

@@ -0,0 +1,42 @@
+# This code is free software; you can redistribute it and/or modify it under the
+# terms of the new BSD License.
+#
+# Copyright (c) 2009, Sebastian Staudt
+
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+
+require 'byte_buffer'
+require 'datagram_channel'
+
+class DatagramChannelTests < Test::Unit::TestCase
+
+  def test_read_write
+    port = rand(65536 - 1024) + 1024
+
+    socket = UDPSocket.new
+    socket.bind('localhost', port)
+
+    channel = DatagramChannel.open
+    channel.connect('localhost', port)
+
+    string = 'test'
+    
+    buffer = ByteBuffer.wrap(string)
+    channel.write(buffer)
+    sent, socket_addr = socket.recvfrom(4)
+    socket.send(string, 0, 'localhost', socket_addr[1])
+    buffer = ByteBuffer.allocate(4)
+    channel.read(buffer)
+
+    channel.close
+    socket.close
+
+    received = buffer.array
+
+    assert_equal(string, sent)
+    assert_equal(string, received)
+  end
+
+end