gameoverseer 0.1.2 → 0.1.3

data/lib/gameoverseer/services/services.rb

@@ -1,31 +1,38 @@
-module GameOverseer
-  module Services
-    LIST = []
-    ACTIVE=[]
-
-    def self.register(klass)
-      LIST << klass
-    end
-
-    def self.enable
-      LIST.each do |service|
-        _service = service.new
-        _service.enable
-        GameOverseer::Console.log "Services> #{_service.class} #{_service.version}"
-        ACTIVE << _service
-      end
-    end
-
-    def self.client_connected(client_id, ip_address)
-      ACTIVE.each do |service|
-        service.client_connected(client_id, ip_address) if defined?(service.client_connected)
-      end
-    end
-
-    def self.client_disconnected(client_id)
-      ACTIVE.each do |service|
-        service.client_disconnected(client_id) if defined?(service.client_disconnected)
-      end
-    end
-  end
-end
+module GameOverseer
+  module Services
+    LIST = []
+    ACTIVE=[]
+
+    # Adds klass to list
+    # @param klass [Service] Service class to add to services list
+    def self.register(klass)
+      LIST << klass
+    end
+
+    # instantiates the Services in 'LIST' and adds them to the 'ACTIVE' list
+    def self.enable
+      LIST.each do |service|
+        _service = service.new
+        GameOverseer::Console.log "Services> #{_service.class} #{_service.version}"
+        ACTIVE << _service
+      end
+    end
+
+    # Tells all services that have 'client_connected' defined that 'client_id' has connected
+    # @param client_id [Integer] ID of client
+    # @param ip_address [String] ip address of client
+    def self.client_connected(client_id, ip_address)
+      ACTIVE.each do |service|
+        service.client_connected(client_id, ip_address) if defined?(service.client_connected)
+      end
+    end
+
+    # Tells all services that have 'client_disconnected' defined that 'client_id' is now disconnected
+    # @param client_id [Integer] ID of client
+    def self.client_disconnected(client_id)
+      ACTIVE.each do |service|
+        service.client_disconnected(client_id) if defined?(service.client_disconnected)
+      end
+    end
+  end
+end

data/lib/gameoverseer/version.rb

@@ -1,4 +1,4 @@
-module GameOverseer
-  VERSION = "0.1.2"
-  RELEASE_NAME = "Blank Slate" # 1.0.0 is to be "Ice Crystal"
-end
+module GameOverseer
+  VERSION = "0.1.3"
+  RELEASE_NAME = "Blank Slate" # 1.0 is to be "Ice Crystal"
+end

data/lib/gameoverseer.rb

@@ -1,57 +1,59 @@
-require "set"
-
-require "gosu"
-require "celluloid"
-require "renet"
-require "multi_json"
-
-require_relative "gameoverseer/version"
-
-require_relative "gameoverseer/console/console"
-
-require_relative "gameoverseer/channels/channel_manager"
-
-require_relative "gameoverseer/messages/message_manager"
-
-require_relative "gameoverseer/clients/client_manager"
-
-require_relative "gameoverseer/services/service"
-require_relative "gameoverseer/services/services"
-
-require_relative "gameoverseer/input_handler/input_handler"
-
-require_relative "gameoverseer/server/renet_server"
-require_relative "gameoverseer/server/encryption"
-
-# TEMP
-Thread.abort_on_exception = true
-
-# TODO: Move to own file
-module GameOverseer
-  def self.activate(host, port)
-    GameOverseer::ChannelManager.new
-    GameOverseer::MessageManager.new
-    GameOverseer::ClientManager.new
-
-    # @console = GameOverseer::Console.new
-    @server  = GameOverseer::ENetServerRunner.new
-
-    # Thread.new {@console.show}
-    Thread.new {@server.start(host, port)}
-    sleep
-
-    at_exit do
-      # GameOverseer::Console.instance.close
-      @server.supervisor.terminate if defined?(@server.supervisor.terminate)
-      puts "Server Shutdown"
-    end
-  end
-
-  def self.deactivate
-    puts "ALERT \"CONSOLE CLOSED. LOST CONTROL OF SERVER.\""
-    @server.supervisor.terminate
-  end
-end
-
-# Activate self, remove this before a release.
-# GameOverseer.activate("localhost", 56789)
+require "set"
+require "openssl"
+
+require "gosu"
+require "concurrent"
+require "renet"
+require "multi_json"
+
+require_relative "gameoverseer/version"
+
+require_relative "gameoverseer/console/console"
+
+require_relative "gameoverseer/channels/channel_manager"
+
+require_relative "gameoverseer/messages/message_manager"
+
+require_relative "gameoverseer/clients/client_manager"
+
+require_relative "gameoverseer/services/service"
+require_relative "gameoverseer/services/services"
+
+require_relative "gameoverseer/input_handler/input_handler"
+
+require_relative "gameoverseer/packet_handler/packet_handler"
+require_relative "gameoverseer/encryption_handler/encryption_handler"
+
+require_relative "gameoverseer/server/renet_server"
+
+
+Thread.abort_on_exception = true
+# General purpose game server that uses services (plugins) for logic.
+module GameOverseer
+
+  # Start server
+  def self.activate(host, port, packet_handler = PacketHandler, encryption_handler = nil)
+    GameOverseer::ChannelManager.new
+    GameOverseer::MessageManager.new
+    GameOverseer::ClientManager.new
+
+    @console = GameOverseer::Console.new
+    @server  = GameOverseer::ENetServerRunner.new
+
+    Thread.new {@server.start(host, port, packet_handler, encryption_handler)}
+    @console.show
+    sleep
+
+    at_exit do
+      GameOverseer::Console.instance.close
+      @server.supervisor.terminate if defined?(@server.supervisor.terminate)
+      puts "Server Shutdown"
+    end
+  end
+
+  # Stop server
+  def self.deactivate
+    puts "ALERT \"CONSOLE CLOSED. LOST CONTROL OF SERVER.\""
+    @server.supervisor.terminate
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1 @@
+require "minitest"

data/test-clients/protocol-lib.rb

@@ -1,13 +1,13 @@
-require "multi_json"
-
-PROTOCOLS = {
-  # Client
-  handshake_extend_hand: MultiJson.dump({'channel' => 'handshake', 'mode' => 'extend_hand'}),
-  handshake_authenticate: "{'channel'=> 'handshake', \"mode\": \"authenticate\", \"data\": {\"auth_key\": \"public_key_encrypted_auth_key\"}}",
-
-
-  # Server
-  handshake_public_key: "{\"channel\": \"handshake\", \"mode\": \"public_key\", \"data\": {\"public_key\": \"really_long_string\"}}",
-  handshake_authenticated: "{\"channel\": \"handshake\", \"mode\": \"authenticated\", \"data\": {\"code\": 200, \"message\": \"Successfully authenticated.\"}}",
-  handshake_bad_authentication: "{\"channel\": \"handshake\", \"mode\": \"bad_authentication\", \"data\": {\"code\": 401, \"message\": \"Could not authenticate.\"}}"
-}
+require "multi_json"
+
+PROTOCOLS = {
+  # Client
+  handshake_extend_hand: MultiJson.dump({'channel' => 'handshake', 'mode' => 'extend_hand'}),
+  handshake_authenticate: "{'channel'=> 'handshake', \"mode\": \"authenticate\", \"data\": {\"auth_key\": \"public_key_encrypted_auth_key\"}}",
+
+
+  # Server
+  handshake_public_key: "{\"channel\": \"handshake\", \"mode\": \"public_key\", \"data\": {\"public_key\": \"really_long_string\"}}",
+  handshake_authenticated: "{\"channel\": \"handshake\", \"mode\": \"authenticated\", \"data\": {\"code\": 200, \"message\": \"Successfully authenticated.\"}}",
+  handshake_bad_authentication: "{\"channel\": \"handshake\", \"mode\": \"bad_authentication\", \"data\": {\"code\": 401, \"message\": \"Could not authenticate.\"}}"
+}

data/test-clients/test-client-alpha.rb

@@ -1,36 +1,36 @@
-require "celluloid/io"
-require "multi_json"
-require "net/ssh"
-require_relative "protocol-lib"
-
-class TestClientAlpha
-  include Celluloid::IO
-  finalizer :finish
-
-  def initialize(host, port)
-    @client = UDPSocket.new
-    @client.connect(host, port)
-    run
-  end
-
-  def run
-    @client.send("#{PROTOCOLS[:handshake_extend_hand]}", 0)
-    socket = @client.recvfrom(1024)
-    response = MultiJson.load(socket[0])
-    public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
-     public_key = OpenSSL::PKey::RSA.new public_key_pem
-    encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}"}})
-    p encrypted_auth_key_response
-    @client.send("#{encrypted_auth_key_response}", 0)
-  end
-
-  def finish
-    @client.close if @client
-  end
-end
-
-start_time = Time.now
-
-  TestClientAlpha.supervise('localhost', 56789)
-
-puts "Time to complete: #{Time.now-start_time}"
+require "celluloid/io"
+require "multi_json"
+require "net/ssh"
+require_relative "protocol-lib"
+
+class TestClientAlpha
+  include Celluloid::IO
+  finalizer :finish
+
+  def initialize(host, port)
+    @client = UDPSocket.new
+    @client.connect(host, port)
+    run
+  end
+
+  def run
+    @client.send("#{PROTOCOLS[:handshake_extend_hand]}", 0)
+    socket = @client.recvfrom(1024)
+    response = MultiJson.load(socket[0])
+    public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
+     public_key = OpenSSL::PKey::RSA.new public_key_pem
+    encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}"}})
+    p encrypted_auth_key_response
+    @client.send("#{encrypted_auth_key_response}", 0)
+  end
+
+  def finish
+    @client.close if @client
+  end
+end
+
+start_time = Time.now
+
+  TestClientAlpha.supervise('localhost', 56789)
+
+puts "Time to complete: #{Time.now-start_time}"

data/test-clients/test-client-beta.rb

@@ -1,37 +1,37 @@
-require "celluloid/io"
-require "multi_json"
-require "net/ssh"
-require 'uri'
-require_relative "protocol-lib"
-
-class TestClientBeta
-  include Celluloid::IO
-  finalizer :finish
-
-  def initialize(host, port)
-    @client = Celluloid::IO::TCPSocket.new(host, port)
-    run
-  end
-
-  def run
-    @client.puts("#{PROTOCOLS[:handshake_extend_hand]}")
-    line = @client.gets
-    p line
-    response = MultiJson.load(line)
-    public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
-     public_key = OpenSSL::PKey::RSA.new public_key_pem
-    encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
-    p encrypted_auth_key_response
-    @client.puts("#{encrypted_auth_key_response.inspect}")
-  end
-
-  def finish
-    @client.close if @client
-  end
-end
-
-start_time = Time.now
-
-  TestClientBeta.supervise("127.0.0.1", 56789)
-
-puts "Time to complete: #{Time.now-start_time}"
+require "celluloid/io"
+require "multi_json"
+require "net/ssh"
+require 'uri'
+require_relative "protocol-lib"
+
+class TestClientBeta
+  include Celluloid::IO
+  finalizer :finish
+
+  def initialize(host, port)
+    @client = Celluloid::IO::TCPSocket.new(host, port)
+    run
+  end
+
+  def run
+    @client.puts("#{PROTOCOLS[:handshake_extend_hand]}")
+    line = @client.gets
+    p line
+    response = MultiJson.load(line)
+    public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
+     public_key = OpenSSL::PKey::RSA.new public_key_pem
+    encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
+    p encrypted_auth_key_response
+    @client.puts("#{encrypted_auth_key_response.inspect}")
+  end
+
+  def finish
+    @client.close if @client
+  end
+end
+
+start_time = Time.now
+
+  TestClientBeta.supervise("127.0.0.1", 56789)
+
+puts "Time to complete: #{Time.now-start_time}"

data/test-clients/test-client-gamma.rb

@@ -1,59 +1,62 @@
-require "multi_json"
-require "net/ssh"
-require 'uri'
-require "renet"
-require_relative "protocol-lib"
-
-class TestClientGamma
-  HANDSHAKE = 2
-  # include Celluloid
-
-  def initialize(host, port)
-    @client = ENet::Connection.new(host, port, 4, 0, 0)
-
-    @client.on_connection(method(:on_connect))
-    @client.on_packet_receive(method(:on_packet))
-    @client.on_disconnection(method(:on_disconnect))
-
-    @client.connect(2000)
-    @client.send_packet("#{PROTOCOLS[:handshake_extend_hand]}", true, HANDSHAKE)
-    run
-  end
-
-  def run
-    loop do
-      @client.update(0)
-    end
-  end
-
-  def on_packet(data, channel)
-    p "P: #{data}-#{channel}"
-    handle_connection(data, channel)
-  end
-
-  def on_connect(data = 0, channel = 0)
-    p "C: #{data}-#{channel}"
-  end
-
-  def on_disconnect(data = 0, channel = 0)
-    p "D: #{data}-#{channel}"
-  end
-
-  def handle_connection(data, channel)
-    response = MultiJson.load(data)
-    case response['channel']
-    when 'handshake'
-      public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
-      public_key = OpenSSL::PKey::RSA.new public_key_pem
-      encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
-      @client.send_packet(encrypted_auth_key_response, true, HANDSHAKE)
-      puts "PAST"
-    end
-  end
-end
-
-start_time = Time.now
-
-TestClientGamma.new("localhost", 56789)
-
-puts "Time to complete: #{Time.now-start_time}"
+require "multi_json"
+require 'uri'
+require "renet"
+require_relative "protocol-lib"
+
+class TestClientGamma
+  HANDSHAKE = 2
+  # include Celluloid
+
+  def initialize(host, port)
+    @client = ENet::Connection.new(host, port, 4, 0, 0)
+
+    @client.on_connection(method(:on_connect))
+    @client.on_packet_receive(method(:on_packet))
+    @client.on_disconnection(method(:on_disconnect))
+
+    @client.connect(2000)
+    @client.send_packet("#{PROTOCOLS[:handshake_extend_hand]}", true, HANDSHAKE)
+
+    puts "Running...."
+    run
+  end
+
+  def run
+    loop do
+      @client.update(0)
+    end
+  end
+
+  def on_packet(data, channel)
+    p "P: #{data}-#{channel}"
+    handle_connection(data, channel)
+  end
+
+  def on_connect(data = 0, channel = 0)
+    p "C: #{data}-#{channel}"
+  end
+
+  def on_disconnect(data = 0, channel = 0)
+    p "D: #{data}-#{channel}"
+  end
+
+  def handle_connection(data, channel)
+    response = MultiJson.load(data)
+    case response['channel']
+    when 'handshake'
+      public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
+      public_key = OpenSSL::PKey::RSA.new public_key_pem
+      encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
+      @client.send_packet(encrypted_auth_key_response, true, HANDSHAKE)
+      puts "PAST"
+    else
+      puts "hmm"
+    end
+  end
+end
+
+start_time = Time.now
+
+TestClientGamma.new("localhost", 56789)
+
+puts "Time to complete: #{Time.now-start_time}"