gameoverseer 0.1.1 → 0.1.2

data/README.md

@@ -30,7 +30,7 @@ require 'gameoverseer'
 # Write a service for your game
 class GameWorld < GameOverseer::Service
   def setup
-    channel_manager.register('game_world')
+    channel_manager.register_channel('game_world', self)
   end
 
   def process(data)

data/lib/gameoverseer/channels/channel_manager.rb

@@ -6,11 +6,7 @@ module GameOverseer
     FAULT=3
     def initialize
       @channels = {}
-      ChannelManager.instance = self # quick and lazy way to remove objectspace
-      # 'chat' => GameOverseer::InternalService::Chat,
-      # 'handshake' => GameOverseer::InternalService::Handshake,
-      # 'broadcast' => GameOverseer::InternalService::Broadcast,
-      # 'environment' => GameOverseer::InternalService::Environment
+      ChannelManager.instance = self
     end
 
     def register_channel(channel, service)

data/lib/gameoverseer/clients/client_manager.rb

@@ -13,15 +13,25 @@ module GameOverseer
     end
 
     def update(client_id, key, value)
-      @clients.each_with_index do |hash, index|
+      @clients.each do |hash|
         if hash[:client_id] == client_id
           hash[key] = value
         end
       end
     end
 
+    def get(client_id)
+      _hash = @clients.detect do |hash|
+        if hash[:client_id] == client_id
+          true
+        end
+      end
+
+      return _hash
+    end
+
     def remove(client_id)
-      @clients.each_with_index do |hash, index|
+      @clients.each do |hash|
         if hash[:client_id] == client_id
           @clients.delete(hash)
           GameOverseer::Services.client_disconnected(client_id)

data/lib/gameoverseer/console/console.rb

@@ -1,7 +1,7 @@
 module GameOverseer
   class Console < Gosu::Window
     include Celluloid
-    # TODO: Use Gosu::Window.record to lower number of objects that need to be updated
+    # TODO: Use Gosu::Window.record to lower number of objects that need to be drawn
 
     PENDING_LOG = []
     def initialize

data/lib/gameoverseer/messages/message_manager.rb

@@ -8,7 +8,7 @@ module GameOverseer
     end
 
     def message(client_id, string, reliable = false, channel = ChannelManager::CHAT)
-      GameOverseer::ENetServer.instance.send(client_id, string, reliable, channel)
+      GameOverseer::ENetServer.instance.transmit(client_id, string, reliable, channel)
       GameOverseer::Console.log("MessageManager> #{string}-#{client_id}")
     end
 

data/lib/gameoverseer/server/encryption.rb

@@ -0,0 +1,31 @@
+module GameOverseer
+  module Encryption
+
+    # OpenSSL Public/Private Key Encryption For Initial Handshaking And Authentication Masking.
+    def generate(size = 512)
+      @openssl_keys = OpenSSL::PKey::RSA.new(size)
+    end
+
+    def public_key
+      generate unless defined?(@openssl_keys)
+      @openssl_keys.public_key.to_pem
+    end
+
+    def openssl_keys
+      generate unless defined?(@openssl_keys)
+      @openssl_keys
+    end
+
+    # return encrypted string
+    def encrypt(string)
+      generate unless defined?(@openssl_keys)
+      @openssl_keys.private_encrypt(string)
+    end
+
+    # return decrypted string
+    def decrypt(string)
+      generate unless defined?(@openssl_keys)
+      @openssl_keys.public_decrypt(string)
+    end
+  end
+end

data/lib/gameoverseer/server/renet_server.rb

@@ -42,12 +42,12 @@ module GameOverseer
       @client_manager.remove(client_id)
     end
 
-    # send (private packet)
-    def send(client_id, message, reliable = false, channel = ChannelManager::CHAT)
+    # send message to a specific client
+    def transmit(client_id, message, reliable = false, channel = ChannelManager::CHAT)
       @server.send_packet(client_id, message, reliable, channel)
     end
 
-    # boardcast (global packet)
+    # send message to all connected clients
     def broadcast(message, reliable = false, channel = ChannelManager::CHAT)
       @server.broadcast_packet(message, reliable, channel)
     end
@@ -61,7 +61,7 @@ module GameOverseer
         data = MultiJson.load(data)
         process_data(data, client_id)
       rescue MultiJson::ParseError => e
-        send(client_id, " \"channel\": \"__UNDEFINED__\", \"mode\": \"__UNDEFINED__\", \"data\": {\"code\": 400, \"message\": \"Invalid JSON received.\"}}", true, ChannelManager::FAULT)
+        transmit(client_id, " \"channel\": \"__UNDEFINED__\", \"mode\": \"__UNDEFINED__\", \"data\": {\"code\": 400, \"message\": \"Invalid JSON received.\"}}", true, ChannelManager::FAULT)
         GameOverseer::Console.log("Server> Parse error: '#{e.to_s}'. Bad data: '#{data}' received from client.")
       end
     end

data/lib/gameoverseer/services/service.rb

@@ -1,15 +1,17 @@
 module GameOverseer
   class Service
     attr_accessor :client_id
+    attr_reader :safe_methods
 
     def self.inherited(subclass)
-      GameOverseer::Console.log "Service> added '#{subclass}' to Services::List."
       Services.register(subclass)
+      GameOverseer::Console.log "Service> added '#{subclass}' to Services::List."
     end
 
     def initialize
       if defined?(self.setup)
         @client_id = 0
+        @safe_methods = []
         setup
       end
     end
@@ -27,35 +29,60 @@ module GameOverseer
     end
 
     def version
-      raise "Method 'version' on class '#{self}' not defined, see '#{__FILE__}#version' in GameOverseer source."
       # Please use the sematic versioning system,
       # http://semver.org
       #
       # e.g.
       # "1.5.9"
       # (Major.Minor.Patch)
+      "0.0.0-default"
+    end
+
+    # Sets methods that are safe for `data_to_method` to call
+    def set_safe_methods(array)
+      raise "argument must be an array or strings or symbols" unless array.is_a?(Array)
+      @safe_methods = array
     end
 
     protected
     def channel_manager
-      @channel_manager = ChannelManager.instance
-      @channel_manager
+      ChannelManager.instance
     end
 
     def message_manager
-      @message_manager = MessageManager.instance# ObjectSpace.each_object(GameOverseer::MessageManager).first unless defined?(@message_manager)
-      @message_manager
+      MessageManager.instance
+    end
+
+    def client_manager
+      ClientManager.instance
     end
 
     def data_to_method(data)
-      self.send(data['mode'], data)
-      [self.methods - Class.methods].each do |method|
+      @safe_methods.each do |method|
         if data['mode'] == method.to_s
           self.send(data['mode'], data)
         end
       end
     end
 
+    # Calls Proc immediately then every milliseconds, async.
+    def every(milliseconds, &block)
+      Thread.new do
+        loop do
+          block.call
+          sleep(milliseconds/1000.0)
+        end
+      end
+    end
+
+    # Calls Proc after milliseconds have passed, async.
+    def after(milliseconds, &block)
+      Thread.new do
+        sleep(milliseconds/1000.0)
+        block.call
+      end
+    end
+
     def log(string, color = Gosu::Color::RED)
       GameOverseer::Console.log_with_color(string, color)
     end

data/lib/gameoverseer/version.rb

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

data/lib/gameoverseer.rb

@@ -17,12 +17,11 @@ require_relative "gameoverseer/clients/client_manager"
 
 require_relative "gameoverseer/services/service"
 require_relative "gameoverseer/services/services"
-require_relative "gameoverseer/services/internal/services"
 
 require_relative "gameoverseer/input_handler/input_handler"
 
 require_relative "gameoverseer/server/renet_server"
-require_relative "gameoverseer/server/handshake"
+require_relative "gameoverseer/server/encryption"
 
 # TEMP
 Thread.abort_on_exception = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gameoverseer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -94,13 +94,8 @@ files:
 - lib/gameoverseer/console/console.rb
 - lib/gameoverseer/input_handler/input_handler.rb
 - lib/gameoverseer/messages/message_manager.rb
-- lib/gameoverseer/server/handshake.rb
+- lib/gameoverseer/server/encryption.rb
 - lib/gameoverseer/server/renet_server.rb
-- lib/gameoverseer/services/internal/broadcast.rb
-- lib/gameoverseer/services/internal/chat.rb
-- lib/gameoverseer/services/internal/environment.rb
-- lib/gameoverseer/services/internal/handshake.rb
-- lib/gameoverseer/services/internal/services.rb
 - lib/gameoverseer/services/service.rb
 - lib/gameoverseer/services/services.rb
 - lib/gameoverseer/version.rb

data/lib/gameoverseer/server/handshake.rb

@@ -1,19 +0,0 @@
-module GameOverseer
-  class HandShake
-
-    # OpenSSL Public/Private Key Encryption For Initial Handshaking And Authentication Masking.
-    def self.generate
-      @keys = OpenSSL::PKey::RSA.new 512
-    end
-
-    def self.public_key
-      generate unless defined?(@keys)
-      @keys.public_key.to_pem
-    end
-
-    def self.keys
-      generate unless defined?(@keys)
-      @keys
-    end
-  end
-end

data/lib/gameoverseer/services/internal/broadcast.rb

@@ -1,13 +0,0 @@
-module GameOverseer
-  class InternalService
-    class Broadcast < GameOverseer::Service
-      def setup
-        channel_manager.register_channel('broadcast', self)
-      end
-
-      def version
-        "0.1.0"
-      end
-    end
-  end
-end

data/lib/gameoverseer/services/internal/chat.rb

@@ -1,9 +0,0 @@
-module GameOverseer
-  class InternalService
-    class Chat < GameOverseer::Service
-      def version
-        "0.1.0"
-      end
-    end
-  end
-end

data/lib/gameoverseer/services/internal/environment.rb

@@ -1,9 +0,0 @@
-module GameOverseer
-  class InternalService
-    class Environment < GameOverseer::Service
-      def version
-        "0.1.0"
-      end
-    end
-  end
-end

data/lib/gameoverseer/services/internal/handshake.rb

@@ -1,25 +0,0 @@
-module GameOverseer
-  class InternalService
-    class Handshake < GameOverseer::Service
-      def setup
-        channel_manager.register_channel('handshake', self)
-      end
-
-      def process(data)
-        data_to_method(data)
-      end
-
-      def extend_hand(data)
-        message = MultiJson.dump({channel: 'handshake', mode: 'public_key', data: {public_key: GameOverseer::HandShake.public_key}})
-        message_manager.message("#{message}", client_id, true, ChannelManager::HANDSHAKE)
-        log("#{self.class}> #{message}.", Gosu::Color::RED)
-      end
-
-
-
-      def version
-        "0.1.0"
-      end
-    end
-  end
-end

data/lib/gameoverseer/services/internal/services.rb

@@ -1,3 +0,0 @@
-require_relative "chat"
-require_relative "handshake"
-require_relative "environment"