game_machine 0.0.11 → 1.0.2

data/java/project/src/main/java/com/game_machine/tutorial/LootGenerator.java

@@ -0,0 +1,26 @@
+package com.game_machine.tutorial;
+
+import GameMachine.Messages.GameMessage;
+import akka.event.Logging;
+import akka.event.LoggingAdapter;
+
+import com.game_machine.core.Commands;
+import com.game_machine.core.GameMessageActor;
+
+public class LootGenerator extends GameMessageActor {
+	public static String name = "tutorial_loot_generator";
+	LoggingAdapter log = Logging.getLogger(getContext().system(), this);
+	
+	public void awake() {
+		Commands.clientManagerRegister(name);
+	}
+
+	public void onGameMessage(GameMessage gameMessage) {
+
+	}
+
+	private void onPlayerDisconnect(String playerId) {
+
+	}
+
+}

data/java/{src → project/src}/main/resources/game_machine.java.stg

@@ -117,6 +117,7 @@ import java.util.Map;
 import com.game_machine.entity_system.Entity;
 import com.game_machine.entity_system.Entities;
 import com.game_machine.entity_system.Component;
+import com.game_machine.core.LocalLinkedBuffer;
 
 <if(options.generate_pipe_schema)>
 import com.dyuproject.protostuff.Pipe;
@@ -698,7 +699,7 @@ public byte[] toJson() {
 }
 		
 public byte[] toProtobuf() {
-	LinkedBuffer buffer = LinkedBuffer.allocate(1024);
+	LinkedBuffer buffer = LocalLinkedBuffer.get;
 	byte[] bytes = null;
 
 	try {
@@ -708,6 +709,7 @@ public byte[] toProtobuf() {
 		e.printStackTrace();
 		throw new RuntimeException("Protobuf encoding failed");
 	}
+	buffer.clear();
 	return bytes;
 }
 

data/java/project/src/main/resources/logback.properties

@@ -0,0 +1,13 @@
+# Loggly input key, set this to enable logging to loggly via syslog
+#logback.loggly.inputKey = myinputkey
+
+# Syslog logging
+#logback.syslog.host = localhost
+#logback.syslog.port = 5514
+#logback.syslog.facility = LOCAL5
+
+# Log level
+logback.level = info
+
+# Logfile path is relative to app root
+logback.logfile = log/development.log

data/java/project/src/main/resources/logback.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="120 seconds" debug="true">
+
+	<property file="java/project/src/main/resources/logback.properties" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
+
+	<if condition='isDefined("logback.logfile")'>
+		<then>
+			<appender name="FILE" class="ch.qos.logback.core.FileAppender">
+				<file>${logback.logfile}</file>
+				<encoder>
+					<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+					</pattern>
+				</encoder>
+			</appender>
+		</then>
+	</if>
+
+	<if condition='isDefined("logback.syslog.host")'>
+		<then>
+			<appender name="SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
+				<syslogHost>${logback.syslog.host}</syslogHost>
+				<port>${logback.syslog.port}</port>
+				<facility>${logback.syslog.facility}</facility>
+				<suffixPattern>game_machine: [%thread] %logger %msg
+				</suffixPattern>
+				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+					<level>INFO</level>
+				</filter>
+			</appender>
+		</then>
+	</if>
+
+
+	<if condition='isDefined("logback.loggly.inputKey")'>
+		<then>
+			<appender name="SYSLOG_LOGGLY" class="ch.qos.logback.classic.net.SyslogAppender">
+				<syslogHost>logs-01.loggly.com</syslogHost>
+				<facility>LOCAL5</facility>
+				<suffixPattern>game_machine - - [${logback.loggly.inputKey}@41058]: [%thread] %logger %msg
+				</suffixPattern>
+				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+					<level>INFO</level>
+				</filter>
+			</appender>
+
+		</then>
+	</if>
+
+	<root level="${logback.level}">
+		<if condition='isDefined("logback.loggly.inputKey")'>
+			<then>
+				<appender-ref ref="SYSLOG_LOGGLY" />
+			</then>
+		</if>
+		<if condition='isDefined("logback.syslog.host")'>
+			<then>
+				<appender-ref ref="SYSLOG" />
+			</then>
+		</if>
+		<if condition='isDefined("logback.logfile")'>
+			<then>
+				<appender-ref ref="FILE" />
+			</then>
+		</if>
+
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>

data/java/src/main/java/game/MyGameActor.java

@@ -0,0 +1,26 @@
+package game;
+
+import GameMachine.Messages.GameMessage;
+import akka.event.Logging;
+import akka.event.LoggingAdapter;
+
+import com.game_machine.core.Commands;
+import com.game_machine.core.GameMessageActor;
+
+public class MyGameActor extends GameMessageActor {
+  public static String name = "my_game_actor";
+  LoggingAdapter log = Logging.getLogger(getContext().system(), this);
+  
+  public void awake() {
+    Commands.clientManagerRegister(name);
+  }
+
+  public void onGameMessage(GameMessage gameMessage) {
+
+  }
+
+  private void onPlayerDisconnect(String playerId) {
+
+  }
+
+}

data/lib/game_machine.rb

@@ -1,4 +1,3 @@
-
 require 'rbconfig'
 
 require_relative 'game_machine/ruby_extensions/nilclass'
@@ -18,23 +17,24 @@ module GameMachine
     ENV.fetch('JAVA_ROOT')
   end
 end
+
 require 'java'
 
-jars = Dir[File.join(GameMachine.app_root, 'java/lib', '*.jar')]
-jars.each {|jar| require jar}
+jars = Dir[File.join(GameMachine.java_root, 'lib', '*.jar')]
+jars.each do |jar|
+  require jar
+end
 
-#java_import 'com.game_machine.core.net.client.UdtClient'
-#java_import 'com.game_machine.core.net.client.UdtClientHandler'
 
 require_relative 'game_machine/java_lib'
 
 require_relative 'game_machine/protobuf'
 require_relative 'game_machine/version'
 require_relative 'game_machine/grid'
-require_relative 'game_machine/game_loader'
 require_relative 'game_machine/message_buffer'
 require_relative 'game_machine/vector'
 require_relative 'game_machine/logger'
+require_relative 'game_machine/hocon_config'
 require_relative 'game_machine/app_config'
 require_relative 'game_machine/helpers/state_machine'
 require_relative 'game_machine/actor'
@@ -42,18 +42,16 @@ require_relative 'game_machine/commands'
 require_relative 'game_machine/model'
 require_relative 'game_machine/models'
 require_relative 'game_machine/handlers/authentication'
-require_relative 'game_machine/hashring'
 require_relative 'game_machine/application'
 require_relative 'game_machine/game_systems'
 require_relative 'game_machine/handlers/request'
 require_relative 'game_machine/handlers/game'
+require_relative 'game_machine/handlers/player_authentication'
 require_relative 'game_machine/actor/builder'
 require_relative 'game_machine/message_queue'
 require_relative 'game_machine/object_db'
 require_relative 'game_machine/write_behind_cache'
 require_relative 'game_machine/data_store'
-require_relative 'game_machine/auth_handlers/base'
-require_relative 'game_machine/auth_handlers/public'
 require_relative 'game_machine/system_monitor'
 require_relative 'game_machine/cluster_monitor'
 require_relative 'game_machine/system_stats'
@@ -63,23 +61,26 @@ require_relative 'game_machine/scheduler'
 require_relative 'game_machine/endpoints'
 require_relative 'game_machine/protobuf_extensions/entity_helper'
 require_relative 'game_machine/helpers/game_message'
-require_relative 'game_machine/grid_replicator'
 require_relative 'game_machine/akka'
 require_relative 'game_machine/clients'
 require_relative 'game_machine/mono_server'
 require_relative 'game_machine/restart_watcher'
 require_relative 'game_machine/uniqueid'
+require_relative 'game_machine/wavefront_ext'
+require_relative 'game_machine/routes'
+require_relative 'game_machine/default_handlers'
+require_relative 'game_machine/cloud_updater'
 
-if Config::CONFIG['target_os'] == 'linux'
-  require_relative 'game_machine/navigation'
+if RbConfig::CONFIG['host_os'].match(/linux/i)
+  #require_relative 'game_machine/navigation'
 else
   GameMachine.logger.info "Pathfinding disabled (windows support not yet available)"
 end
 
-
 java.util.concurrent.TimeUnit::MILLISECONDS
 java.util.concurrent.TimeUnit::SECONDS
 
-
-
-
+Signal.trap("TERM") {
+  puts "Caught SIGTERM, exiting"
+  System.exit(0)
+}

data/lib/game_machine/actor.rb

@@ -3,5 +3,5 @@ require_relative 'actor/system'
 require_relative 'actor/base'
 require_relative 'actor/factory'
 require_relative 'actor/ref'
-require_relative 'actor/mono_actor'
 require_relative 'actor/development'
+require_relative 'actor/game_actor'

data/lib/game_machine/actor/base.rb

@@ -5,7 +5,7 @@ module GameMachine
     class MissingHashringError < StandardError;end
 
     # @abstract All game actors inherit fromm this class
-    class Base < JavaLib::UntypedActor
+    class Base < JavaLib::GameActor
   
       ON_RECEIVE_HOOKS = {}
 
@@ -49,23 +49,8 @@ module GameMachine
           end
         end
 
-        def reset_hashrings
-          @@hashrings = nil
-        end
-
-        def hashrings
-          @@hashrings ||= java.util.concurrent.ConcurrentHashMap.new
-        end
-
         def hashring(name)
-          hashrings.fetch(name,nil)
-        end
-
-        def add_hashring(name,hashring)
-          if hashring(name)
-            raise DuplicateHashringError, "name=#{name}"
-          end
-          hashrings[name] = hashring
+          JavaLib::Hashring.get_hashring(name)
         end
 
         # Find a local actor by name
@@ -90,7 +75,6 @@ module GameMachine
         # on a consistent hashing of the id.
         # @return [Actor::Ref]
         def find_distributed_local(id,name=self.name)
-          ensure_hashring(name)
           Actor::Ref.new(local_distributed_path(id, name),name)
         end
 
@@ -99,7 +83,6 @@ module GameMachine
         # any server in the cluster
         # @return [Actor::Ref]
         def find_distributed(id,name=self.name)
-          ensure_hashring(name)
           Actor::Ref.new(distributed_path(id, name),name)
         end
 
@@ -125,25 +108,19 @@ module GameMachine
 
         private
 
-        def ensure_hashring(name)
-          unless hashring(name)
-            raise MissingHashringError
-          end
-        end
-
         def remote_path(server,name)
-          "#{Akka.address_for(server)}/user/#{name}"
+          "#{server}/user/#{name}"
         end
 
         def local_distributed_path(id,name)
-          bucket = hashring(name).bucket_for(id)
-          "/user/#{bucket}"
+          node = hashring(name).node_for(id)
+          "/user/#{node}"
         end
 
         def distributed_path(id,name)
-          server = Akka.instance.hashring.bucket_for(id)
-          bucket = hashring(name).bucket_for(id)
-          "#{server}/user/#{bucket}"
+          server = Akka.instance.hashring.node_for(id)
+          node = hashring(name).node_for(id)
+          "#{server}/user/#{node}"
         end
 
       end

data/lib/game_machine/actor/builder.rb

@@ -86,8 +86,8 @@ module GameMachine
         GameMachine.logger.debug "Game actor #{@name} starting"
         if @create_hashring
           hashring = create_hashring(@hashring_size)
-          hashring.buckets.map do |bucket_name|
-            @actor_system.actor_of(@props, bucket_name)
+          hashring.nodes.to_a.each do |node_name|
+            @actor_system.actor_of(@props, node_name)
           end
         else
           @actor_system.actor_of(@props, @name)
@@ -97,10 +97,9 @@ module GameMachine
 
       private
 
-      def create_hashring(bucket_count)
-        hashring = Hashring.create_actor_ring(@name,bucket_count)
-        @klass.add_hashring(@name,hashring)
-        hashring
+      def create_hashring(node_count)
+        node_names = (0..node_count).map {|r| "#{@name}#{r}"}
+        JavaLib::Hashring.new(@name,node_names,3)
       end
 
     end

data/lib/game_machine/actor/game_actor.rb

@@ -0,0 +1,55 @@
+require_relative '../commands'
+require_relative '../model'
+require_relative '../models'
+module GameMachine
+  module Actor
+    class GameActor < Base
+      include GameMachine::Commands
+      include GameMachine::Models
+      attr_reader :player_id
+
+      def awake(args)
+      end
+
+      def on_player_disconnect(player_id)
+      end
+
+      def new_game_message
+        MessageLib::GameMessage.new
+      end
+      
+      def post_init(*args)
+        awake(args)
+        commands.misc.client_manager_register(self.class.name)
+      end
+
+      def call_mono(klass,message)
+        commands.misc.call_mono(klass,message)
+      end
+
+      def tell_player(game_message,target=player_id)
+        commands.player.send_game_message(game_message,target)
+      end
+
+      def tell_game_actor(game_message,target)
+        game_message.player_id = player_id
+        Actor::Base.find(target.name).tell(game_message)
+      end
+
+      def on_receive(message)
+        @player_id = nil
+
+        if message.is_a?(MessageLib::GameMessage)
+          @player_id = message.player_id
+          set_player_id(message.player_id)
+          on_game_message(message)
+        elsif message.is_a?(MessageLib::ClientManagerEvent)
+          if message.event == 'disconnected'
+            on_player_disconnect(message.player_id)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/game_machine/actor/reloadable.rb

@@ -21,6 +21,11 @@ module GameMachine
           end
         end
 
+        def games_root
+          File.join(GameMachine.app_root,'/games')
+        end
+
+        
         def register(name)
           registered_actors[File.basename(name.underscore)] = name
         end
@@ -32,7 +37,7 @@ module GameMachine
         end
 
         def update_paths(first_run=false)
-          Dir.glob(File.join(GameLoader.games_root,'**','*.rb')).each do |file|
+          Dir.glob(File.join(games_root,'**','*.rb')).each do |file|
             mtime = File.mtime(file)
             basename = File.basename(file,'.rb')