game_machine 0.0.11 → 1.0.2

data/lib/game_machine/handlers/request.rb

@@ -12,16 +12,14 @@ module GameMachine
           if message.has_player_logout
             if Authentication.authenticated?(message.player)
               unregister_client(message)
-              commands.misc.player_status_change(message.player.id,:unregistered)
             end
           elsif message.has_player
-            update_entities(message)
+             update_entities(message)
             if Authentication.authenticated?(message.player)
               game_handler.tell(message)
             else
               if @auth_handler.authenticate!(message.player)
                 register_client(message)
-                commands.misc.player_status_change(message.player.id,:registered)
                 game_handler.tell(message)
               end
             end
@@ -35,6 +33,14 @@ module GameMachine
 
       private
 
+      def update_entities(message)
+        if message.get_entity_list
+          message.get_entity_list.each do |entity|
+            entity.set_player(message.player)
+          end
+        end
+      end
+
       def register_client(message)
         GameMachine.logger.info "Register #{message.player.id}"
         player_id = message.player.id
@@ -71,14 +77,6 @@ module GameMachine
         @game_handler ||= Handlers::Game.find
       end
 
-      def update_entities(message)
-        if message.get_entity_list
-          message.get_entity_list.each do |entity|
-            entity.set_player(message.player)
-          end
-        end
-      end
-
     end
   end
 end

data/lib/game_machine/hocon_config.rb

@@ -0,0 +1,81 @@
+require 'java'
+require File.join(ENV['JAVA_ROOT'], 'lib', 'config-1.2.1.jar')
+
+module GameMachine
+  class HoconConfig
+
+    def self.config
+      java_import 'com.typesafe.config.Config'
+      java_import 'com.typesafe.config.ConfigFactory'
+      file = File.join(ENV['APP_ROOT'],'config',"#{ENV['GAME_ENV']}.conf")
+      data = File.read(file)
+      config = ConfigFactory.parseString(data).getConfig('gamemachine')
+      top = [:handlers, :routers, :jdbc, :datastore, :gamecloud, :grids, :couchbase, :http, :udp, :tcp, :akka, :admin, :regions, :client]
+      conf = OpenStruct.new
+      top.each {|t| conf.send("#{t}=",OpenStruct.new)}
+
+      conf.environment = config.get_string('environment')
+      conf.use_regions = config.get_boolean('use_regions')
+      conf.orm = config.get_boolean('orm')
+      conf.mono_enabled = config.get_boolean('mono_enabled')
+      conf.seeds = config.get_string_list('seeds')
+
+      conf.regions = config.get_list('regions').map {|i| i.map(&:unwrapped)}
+
+      conf.client.protocol = config.get_string('client.protocol')
+
+      conf.handlers.team = config.get_string('handlers.team')
+      conf.handlers.auth = config.get_string('handlers.auth')
+
+      conf.routers.game_handler = config.get_int('routers.game_handler')
+      conf.routers.request_handler = config.get_int('routers.request_handler')
+      conf.routers.udp = config.get_int('routers.udp')
+      conf.routers.objectdb = config.get_int('routers.objectdb')
+
+      conf.datastore.store = config.get_string('datastore.store')
+      conf.datastore.serialization = config.get_string('datastore.serialization')
+      conf.datastore.cache_write_interval = config.get_int('datastore.cache_write_interval')
+      conf.datastore.cache_writes_per_second = config.get_int('datastore.cache_writes_per_second')
+
+      conf.gamecloud.host = config.get_string('gamecloud.host')
+      conf.gamecloud.user = config.get_string('gamecloud.user')
+      conf.gamecloud.api_key = config.get_string('gamecloud.api_key')
+
+      conf.grids.default = config.get_string('grids.default')
+      conf.grids.aoe = config.get_string('grids.aoe')
+      conf.grids.local_chat = config.get_string('grids.local_chat')
+
+      conf.couchbase.bucket = config.get_string('couchbase.bucket')
+      conf.couchbase.password = config.get_string('couchbase.password')
+      conf.couchbase.servers = config.get_string_list('couchbase.servers').to_a
+
+      conf.jdbc.hostname = config.get_string('jdbc.hostname')
+      conf.jdbc.port = config.get_int('jdbc.port')
+      conf.jdbc.database = config.get_string('jdbc.database')
+      conf.jdbc.url = config.get_string('jdbc.url')
+      conf.jdbc.ds = config.get_string('jdbc.ds')
+      conf.jdbc.driver = config.get_string('jdbc.driver')
+      conf.jdbc.username = config.get_string('jdbc.username')
+      conf.jdbc.password = config.get_string('jdbc.password')
+
+      conf.http.enabled = config.get_boolean('http.enabled')
+      conf.http.host = config.get_string('http.host')
+      conf.http.port = config.get_int('http.port')
+
+      conf.tcp.enabled = config.get_boolean('tcp.enabled')
+      conf.tcp.host = config.get_string('tcp.host')
+      conf.tcp.port = config.get_int('tcp.port')
+
+      conf.udp.enabled = config.get_boolean('udp.enabled')
+      conf.udp.host = config.get_string('udp.host')
+      conf.udp.port = config.get_int('udp.port')
+
+      conf.akka.host = config.get_string('akka.host')
+      conf.akka.port = config.get_int('akka.port')
+
+      conf.admin.user = config.get_string('admin.user')
+      conf.admin.pass = config.get_string('admin.pass')
+      conf
+    end
+  end
+end

data/lib/game_machine/java_lib.rb

@@ -18,7 +18,17 @@ module GameMachine
     include_package 'com.dyuproject.protostuff'
   end
 
+  module TutorialLib
+    include_package 'com.game_machine.examples'
+  end
+
+  module ModelLib
+    include_package 'com.game_machine.orm.models'
+  end
+  
   module JavaLib
+    java_import 'com.typesafe.config.Config'
+    java_import 'com.typesafe.config.ConfigFactory'
     java_import 'akka.cluster.ClusterEvent'
     java_import 'akka.contrib.pattern.ClusterSingletonManager'
     java_import 'akka.contrib.pattern.ClusterSingletonProxy'
@@ -38,6 +48,9 @@ module GameMachine
     include_package 'akka.camel'
     java_import 'com.game_machine.core.Grid'
     include_package 'com.game_machine.core'
+    include_package 'com.game_machine.orm'
+    include_package 'com.game_machine.authentication'
+    include_package 'com.game_machine.ui'
     include_package 'java.net'
     include_package 'java.util.concurrent.atomic'
     include_package 'scala.concurrent.duration'
@@ -46,6 +59,6 @@ module GameMachine
     include_package 'java.util'
     include_package 'java.io'
     include_package 'com.couchbase.client'
-    include_package 'io.netty.channel'
+    #include_package 'io.netty.channel'
   end
 end

data/lib/game_machine/logger.rb

@@ -1,39 +1,26 @@
-require 'rjack-logback'
 
 module GameMachine
-  module Logger
-
-    LOGGER = RJack::SLF4J[ 'game_machine' ]
-
-    def stdout(message)
-      unless ENV['GAME_ENV'] == 'test'
-        print "#{message}\n"
+  
+  class JavaLogger
+    [:info, :error, :warn, :fatal, :debug].each do |name|
+      define_method(name) do |msg|
+        JavaLib::GameMachineLoader.logger.send(name.to_sym,msg)
       end
     end
+  end
+
+  module Logger
+    LOGGER = JavaLogger.new
 
     def logfile
       File.join(ENV['APP_ROOT'], 'log',"#{ENV['GAME_ENV']}.log")
     end
 
-    def configure_logging
-      RJack::Logback.configure do
-        console = RJack::Logback::ConsoleAppender.new do |a|
-        end
-
-        file = RJack::Logback::FileAppender.new(logfile) do |a|
-        end
-
-        RJack::Logback.root.add_appender( file )
-        RJack::Logback.root.level = RJack::Logback::INFO
-      end
-    end
-
     def logger
       LOGGER
     end
-
+    
   end
 end
 
 GameMachine.send(:extend, GameMachine::Logger)
-GameMachine.configure_logging

data/lib/game_machine/models.rb

@@ -18,3 +18,4 @@ require_relative 'models/find_match'
 require_relative 'models/match'
 require_relative 'models/start_match'
 require_relative 'models/end_match'
+

data/lib/game_machine/mono_server.rb

@@ -11,7 +11,12 @@ module GameMachine
       # it will just get restarted
       Thread.new do
         loop do
-          system("cd #{mono_path} && mono server.exe #{Application.config.mono_gateway_port}")
+          case RbConfig::CONFIG['host_os']
+          when /mswin|windows/i
+            system("cd #{mono_path} && server.exe")
+          else
+            system("cd #{mono_path} && mono server.exe")
+          end
           sleep 10
         end
       end

data/lib/game_machine/object_db.rb

@@ -32,12 +32,13 @@ module GameMachine
       WriteBehindCache.find_distributed(entity.id).tell(entity)
     end
 
-    def get_entity(entity_id)
+    def get_entity(entity_id,klass)
       entity = entities.fetch(entity_id,nil)
       if entity.nil?
-        entity = store.get(entity_id)
+        entity = store.get(entity_id,klass)
+      else
+        entity.clone
       end
-      entity
     end
 
     def on_receive(message)
@@ -45,7 +46,7 @@ module GameMachine
         procname = message.get_update_method.to_sym
         current_entity_id = message.get_current_entity_id
         update_entity = message.get_update_entity
-        current_entity = get_entity(current_entity_id)
+        current_entity = get_entity(current_entity_id,'Entity')
         if self.class.dbprocs.has_key?(procname)
           dbproc = self.class.dbprocs[procname]
           returned_entity = dbproc.call(
@@ -59,11 +60,16 @@ module GameMachine
 
       elsif message.is_a?(MessageLib::ObjectdbPut)
         set_entity(message.get_entity)
-        sender.tell(true)
+        get_sender.tell(true,nil)
       elsif message.is_a?(MessageLib::ObjectdbGet)
-        sender.tell(get_entity(message.get_entity_id) || false)
+        if entity = get_entity(message.get_entity_id,message.get_klass)
+          get_sender.tell(entity,nil)
+        end
       elsif message.is_a?(MessageLib::ObjectdbDel)
         delete_entity(message.get_entity_id)
+      elsif message.respond_to?(:get_id)
+        set_entity(message)
+        get_sender.tell(true,nil)
       else
         unhandled(message)
       end

data/lib/game_machine/protobuf.rb

@@ -1,6 +1,6 @@
 
 if ['development','test'].include?(GameMachine.env)
-  require_relative '../../java/local_lib/protostuff-compiler-1.0.7-jarjar.jar'
+  require_relative '../../java/project/local_lib/protostuff-compiler-1.0.8-jarjar.jar'
   require_relative 'protobuf/game_messages'
   require_relative 'protobuf/generate'
 end

data/lib/game_machine/protobuf/game_messages.rb

@@ -8,12 +8,22 @@ module GameMachine
         @messages = IO.readlines(message_file)
       end
 
+      def persistent_messages
+        [].tap do |message_names|
+          messages.each do |line|
+            if line.match(/^\s*?(local_persistent|persistent)_message\s+?(\w+?)\s+?{/)
+              message_names << $2
+            end
+          end
+        end
+      end
+
       def create_entity_fields
         [].tap do |fields|
           messages.each do |line|
-            if line.match(/^\s*?message\s+?(\w+?)\s+?{/)
-              name = $1[0,1].downcase + $1[1..-1]
-              fields << "optional #{$1} #{name} = #{starting_field_number};"
+            if line.match(/^\s*?(persistent)?_?message\s+?(\w+?)\s+?{/)
+              name = $2[0,1].downcase + $2[1..-1]
+              fields << "optional #{$2} #{name} = #{starting_field_number};"
               @starting_field_number += 1
             end
           end

data/lib/game_machine/protobuf/generate.rb

@@ -2,6 +2,7 @@ require 'java'
 require 'pathname'
 require 'erb'
 require 'fileutils'
+require 'active_support/inflector'
 
 java_import java.lang.System
 java_import com.dyuproject.protostuff.compiler.CachingProtoLoader
@@ -17,6 +18,10 @@ module GameMachine
         @app_root = app_root
       end
 
+      def java_root
+        ENV['JAVA_ROOT']
+      end
+      
       def self.compile(path)
         loader = CachingProtoLoader.new
         file = java.io.File.new(path)
@@ -24,33 +29,124 @@ module GameMachine
       end
 
       def erb_template
-        File.join(app_root,'java','component.erb')
+        File.join(java_root,'component.erb')
+      end
+
+      def model_template
+        File.join(java_root,'model.erb')
+      end
+
+      def model_src
+        File.join(java_root,'src','main','java','com', 'game_machine','orm','models')
       end
 
       def java_src
-        File.join(app_root,'java','src','main','java','GameMachine', 'Messages')
+        File.join(java_root,'src','main','java','GameMachine', 'Messages')
       end
 
       def config_path
         File.join(app_root,'config')
       end
 
-      def write_components(proto)
+      def write_components(proto,persistent_messages)
         messages = proto.getMessages.reject {|message| message.getName == 'Components'}
         FileUtils.mkdir_p(java_src)
+        FileUtils.mkdir_p(model_src)
+        message_names = proto.getMessages.map {|m| m.get_name}
+        messages_index = proto.getMessages.each_with_object({}) {|v,res| res[v.getName] = v}
+
         proto.getMessages.each do |message|
+          message_fields = []
+          message.get_fields.each do |field|
+            if message_names.include?(field.getJavaType.to_s) && !field.is_repeated
+              message_fields << field.get_java_type.to_s
+            end
+          end
+          unless message_fields.empty?
+            #puts "#{message.getName} #{message_fields.inspect}"
+          end
+
           klass = message.getName
+          persistent = persistent_messages.include?(klass)
           #puts "Message: #{message.getName}"
-          out = ERB.new(File.read(erb_template),nil,'-').result(binding)
+          out = ERB.new(File.read(erb_template),0,'>').result(binding)
+          out = out.gsub(/^(\s*\r\n){2,}/,"\r\n")
           src_file = File.join(java_src,"#{message.getName}.java")
           File.open(src_file,'w') {|f| f.write out}
+
+          if persistent
+            out = ERB.new(File.read(model_template),0,'<>').result(binding)
+            out = out.gsub(/^(\s*\r\n){2,}/,"\r\n")
+            out = out.gsub(/^(\s*\n){2,}/,"\n")
+            src_file = File.join(model_src,"#{message.getName}.java")
+            File.open(src_file,'w') {|f| f.write out}
+          end
           #message.getFields.each do |field|
+          #  puts field.default_value_set
           #  puts field.getJavaType
           #  puts field.toString
           #end
         end
       end
 
+      def sql_column_name(klass,field)
+        "#{klass.underscore}_#{field.name.underscore}"
+      end
+
+      def sql_field(klass,field,dbtype,force_null=false)
+        if dbtype == 'mysql'
+          txt = case field.getJavaType.to_s
+          when 'boolean'
+            "`#{sql_column_name(klass,field)}` tinyint(4)"
+          when 'double'
+            "`#{sql_column_name(klass,field)}` double"
+          when 'float'
+            "`#{sql_column_name(klass,field)}` float"
+          when 'long'
+            "`#{sql_column_name(klass,field)}` int(11)"
+          when 'int'
+            "`#{sql_column_name(klass,field)}` int(11)"
+          when 'String'
+            "`#{sql_column_name(klass,field)}` varchar(128)"
+          end
+        elsif dbtype == 'postgres'
+          txt = case field.getJavaType.to_s
+          when 'boolean'
+            "#{sql_column_name(klass,field)} integer"
+          when 'double'
+            "#{sql_column_name(klass,field)} double precision"
+          when 'float'
+            "#{sql_column_name(klass,field)} double precision"
+          when 'long'
+            "#{sql_column_name(klass,field)} integer"
+          when 'int'
+            "#{sql_column_name(klass,field)} integer"
+          when 'String'
+            "#{sql_column_name(klass,field)} character varying(128)"
+          end
+        end
+
+        return nil if txt.nil?
+
+        if force_null
+          return "#{txt} DEFAULT NULL,"
+        end
+
+        if field.is_required
+          txt = "#{txt} NOT NULL,"
+        else
+          txt = "#{txt} DEFAULT NULL,"
+        end
+      end
+      
+      def simple_value?(field)
+        if ['boolean','double','float','long','int','String'].include?(field.getJavaType.to_s)
+          true
+        else
+          false
+        end
+      end
+
       def get_type(field)
         if field.getJavaType.to_s == 'int'
           return 'Integer'
@@ -70,17 +166,23 @@ module GameMachine
       end
 
       def generate
+        FileUtils.rm Dir.glob(File.join(java_src,'*.java'))
         game_protofile = File.join(config_path,'game_messages.proto')
         protofile = File.join(config_path,'messages.proto')
 
         if File.exists?(game_protofile)
           game_messages = File.read(game_protofile)
+          game_messages = game_messages.gsub('local_persistent_message','message')
+          game_messages = game_messages.gsub('local_message','message')
+          game_messages = game_messages.gsub('persistent_message','message')
           gm = Protobuf::GameMessages.new(game_protofile)
+          persistent_messages = gm.persistent_messages
           entity_fields = gm.create_entity_fields
           game_entity_fields = entity_fields.join("\n")
         else
           game_messages = ''
           game_entity_fields = ''
+          persistent_messages = []
         end
         messages = File.read(protofile)
 
@@ -102,7 +204,7 @@ module GameMachine
         # throw an exception
         proto = self.class.compile(combined_messages_protofile)
 
-        write_components(proto)
+        write_components(proto,persistent_messages)
         #FileUtils.rm(combined_messages_protofile)
         combined_messages
       end