maniaplanet-rpc 0.0.4 → 0.1.0

data/lib/maniaplanet_rpc/maniaplanet_client.rb

@@ -1,29 +1,29 @@
 require 'xmlrpc/client'
+require 'thread'
 
-class ManiaplanetClient < XMLRPC::Client
+class ManiaConnection
 
-  attr_accessor :request_handle, :ip, :port, :protocol
+  include XMLRPC::ParserWriterChooseMixin
 
-  def initialize(ip, port)
+  def initialize(ip, port, callback)
+    @callback = callback
     @request_handle = 0x80000000
     @ip = ip
     @port = port
+    @send_queue = Queue.new
+    @socket = TCPSocket.new ip, port
+    @protocol = 0
+    authenticate
   end
 
-  def new_socket(ip, port)
-    socket = TCPSocket.new ip, port
-    authenticate socket
-    socket
-  end
-
-  def authenticate(socket)
-    header = socket.recv(4).unpack "Vsize"
+  def authenticate
+    header = @socket.recv(4).unpack "Vsize"
 
     if header[0] > 64
       raise Exception, "Wrong low-level protocol header!"
     end
 
-    handshake = socket.recv header[0]
+    handshake = @socket.recv header[0]
 
     if handshake == "GBXRemote 1"
       @protocol = 1
@@ -32,14 +32,30 @@ class ManiaplanetClient < XMLRPC::Client
     else
       raise Exception, "Unknown protocol version!"
     end
-    puts "Handshake Complete"
   end
 
-  def read_response(socket)
-    response = ""
+  def start
     loop do
-      if protocol == 1
-        content = socket.recv 4
+      sleep(1.0/24.0)
+      tick
+    end
+  end
+
+  def call(method, *args)
+    @request_handle = @request_handle + 1
+    @send_queue.push [@request_handle, create().methodCall(method, *args)]
+    @request_handle - 0x80000000
+  end
+
+  def tick
+    write
+    read
+  end
+
+  def read
+    if IO.select([@socket], nil, nil, 0) != nil
+      if @protocol == 1
+        content = @socket.recv 4
         if content.bytesize == 0
           raise Exception, "Cannot read size!"
         end
@@ -47,7 +63,7 @@ class ManiaplanetClient < XMLRPC::Client
         size = result[0]
         receive_handle = @request_handle
       else
-        content = socket.recv 8
+        content = @socket.recv 8
         if content.bytesize == 0
           raise Exception, "Cannot read size/handle!"
         end
@@ -68,34 +84,54 @@ class ManiaplanetClient < XMLRPC::Client
       response_length = 0
 
       while response_length < size
-        response << socket.recv(size - response_length)
+        response << @socket.recv(size - response_length)
         response_length = response.bytesize
       end
 
-      if @request_handle - 0x80000000 != receive_handle
-        # TODO: Add support for callbacks here.
+      if @callback.response_map[receive_handle] == nil
+        @callback.parse_callback parser().parseMethodResponse(response)
+      else
+        @callback.response_map[receive_handle].call parser().parseMethodResponse(response)
       end
+    end
+  end
 
-
-      break if @request_handle - 0x80000000 == receive_handle
+  def write
+    while @send_queue.length > 0
+      request = @send_queue.pop
+      if @protocol == 1
+        bytes = [request[1].bytesize, request[1]].pack("Va*")
+      else
+        bytes = [request[1].bytesize, request[0], request[1]].pack("VVa*")
+      end
+      @socket.write bytes
     end
-    response
   end
 
-  def write_request(socket,request)
-    @request_handle = @request_handle + 1
-    if protocol == 1
-      bytes = [request.bytesize, request].pack("Va*")
-    else
-      bytes = [request.bytesize, @request_handle, request].pack("VVa*")
+end
+
+class ManiaClient
+
+  attr_reader :connection
+  attr_accessor :response_map
+
+  def initialize(ip, port)
+    @response_map = {}
+    @connection = ManiaConnection.new ip, port, self
+    Thread.new do
+      @connection.start
     end
-    socket.write bytes
   end
 
-  def do_rpc(request, async) # TODO: Handle async requests
-    sock = new_socket ip, port
-    write_request sock, request
-    read_response sock
+  def parse_callback(message)
+    # TODO: Fix
   end
 
+  def call(method, *args, &block)
+    if block_given?
+      @response_map[@connection.call(method, *args)] = block
+    else
+      @response_map[@connection.call(method, *args)] = proc {}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maniaplanet-rpc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies: []
 description: maniaplanet-rpc is a library for interfacing with maniaplanet servers
   using their custom variant of xml-rpc