dango 0.2.6 → 0.3.0

data/lib/dango/client_framework.rb

@@ -32,7 +32,7 @@ class DangoClientFramework
   # メイン処理
   def initialize(env, config = nil)
     if !config
-      config = YAML.load(open("#{RAILS_ROOT}/dango/config/#{env}.yml", "rb"){|fh| fh.read})
+      config = YAML.load(open("#{RAILS_ROOT}/config/dango/#{env}.yml", "rb"){|fh| fh.read})
     end
     
     @config = config
@@ -45,6 +45,8 @@ class DangoClientFramework
 #    @connection_client_log_level = Logger::DEBUG  # 未定義時にこのログレベルになる
     @connection_client_log_level = Logger::INFO   # 未定義時にこのログレベルになる
     
+    @connection_encode_type = EncodeTypeMarshal
+    
     @recv_count = 0 # 受信回数
     @send_count = 0 # 送信回数
     
@@ -100,6 +102,12 @@ class DangoClientFramework
     
     # データ受信用のスレッドの開始
     @thread_receive = Thread.start{ thread_main() }
+    
+    # エンコードタイプ変更を送信
+    send_obj = {"encode_type" => @connection_encode_type}
+    send_action("_change_encode_type", send_obj)
+    logger.info "_change_encode_type=#{@connection_encode_type.inspect}"
+    
   end
   
   attr_reader(:sid)

data/lib/dango/framework_base.rb

@@ -100,13 +100,15 @@ module DangoFrameworkModule
   include ErrorMessage
   
   CommMaxDigit = 5                 # 通信の最大桁数
-  MaxLen       = 1024              # 通信の一度の送信バイト数
+  MaxLenRecv   = 1024              # 通信の一度の送信バイト数
+  MaxLenSend   = 1024              # 通信の一度の送信バイト数
   
-  DefaultDataType = 0              # デフォルトのデータのタイプ
+  EncodeTypeJSON = 0                  # エンコードのタイプのJSON
+  EncodeTypeYAML = 1                  # エンコードのタイプのYAML
+  EncodeTypeMarshal = 2               # エンコードのタイプのMarshal
+  
+  DefaultEncodeType = EncodeTypeJSON  # デフォルトのエンコードのタイプ
   
-  # 0 = JSON
-  # 1 = YAML
-  # 2 = Marshal
   
   # デバッグ出力用のメソッド
   def debug_print(str)
@@ -168,7 +170,7 @@ module DangoFrameworkModule
     end
     
     ## サイズとデータタイプを取得
-    dtype, size = size_str[0, 5].unpack("cN")
+    encode_type, size = size_str[0, 5].unpack("cN")
     
     ## データがない場合
     if size == nil || size == 0
@@ -185,7 +187,7 @@ module DangoFrameworkModule
     ret_data_orig = ""
     
     while size > 0
-      read_len = MaxLen > size ? size : MaxLen
+      read_len = MaxLenRecv > size ? size : MaxLenRecv
       begin
 #        this_ret_data_orig = sock.readpartial(read_len)
 #        this_ret_data_orig = sock.sysread(read_len)
@@ -211,11 +213,11 @@ module DangoFrameworkModule
     begin
       if ret_data == "" || ret_data == "{}" # データが空ならparseしない
         data = []
-      elsif dtype == 0
+      elsif encode_type == EncodeTypeJSON
         data = JSON.parse(ret_data)
-      elsif dtype == 1
+      elsif encode_type == EncodeTypeYAML
         data = YAML::load(ret_data)
-      elsif dtype == 2
+      elsif encode_type == EncodeTypeMarshal
         data = Marshal.load(ret_data)
       end
     rescue
@@ -225,18 +227,19 @@ module DangoFrameworkModule
   
   # データ送信処理
   def dango_send_data(sock, send_objs, options = {})
-#    logger.debug "dango_send_data:sock=#{sock.inspect} dtype=#{dtype}"
-    
-    dtype = options[:type] || DefaultDataType
+    encode_type = options[:encode_type] || DefaultEncodeType
+#    logger.debug "dango_send_data:sock=#{sock.inspect} encode_type=#{encode_type}"
     
     if send_objs == []
       send_data_orig = ""
-    elsif dtype == 0
+    elsif encode_type == EncodeTypeJSON
       send_data_orig = JSON.generate(send_objs)
-    elsif dtype == 1
+    elsif encode_type == EncodeTypeYAML
       send_data_orig = send_objs.to_yaml
-    elsif dtype == 2
+    elsif encode_type == EncodeTypeMarshal
       send_data_orig = Marshal.dump(send_objs)
+    else
+      send_data_orig = JSON.generate(send_objs)
     end
     
 #    logger.debug "dango_send_data:#{send_data_orig.inspect}"
@@ -257,7 +260,7 @@ module DangoFrameworkModule
     
 #    size_str = sprintf("%0#{CommMaxDigit}d", size)
     
-    size_str = [dtype, size].pack("cN")
+    size_str = [encode_type, size].pack("cN")
 #    logger.debug "size=#{size}:size_str=#{size_str.inspect}"
     
     send_buf = size_str + "\n" + send_data

data/lib/dango/monitor/dango_monitor_client.rb

@@ -17,7 +17,7 @@ class DangoMonitorClient < DangoClientFramework
   
   def initialize()
     @env = ENV['RAILS_ENV'] || 'development'
-    config = YAML.load(open("#{RAILS_ROOT}/dango/config/#{@env}.yml", "rb"){|fh| fh.read})
+    config = YAML.load(open("#{RAILS_ROOT}/config/dango/#{@env}.yml", "rb"){|fh| fh.read})
     super(@env, config)
   end
   

data/lib/dango/server_framework.rb

@@ -298,9 +298,11 @@ class DangoServerFramework
       sid = session[:sid]
       
       session[:peer_addr] = sock.peeraddr
-      session[:peer_ip_adress] = sock.peeraddr[3]
+      session[:peer_ip_address] = sock.peeraddr[3]
       session[:peer_host] = sock.peeraddr[2]
       
+      session[:encode_type] = DefaultEncodeType
+      
       logger.debug "thread_main:start_session. sid=#{sid} sock=#{sock} thread.current=#{Thread.current.object_id}"
       
       socket_list.add(sid, sock)
@@ -363,16 +365,6 @@ EOF
 #          logger.debug "ret_objs is empty. "
           
         else # 受信データがあれば
-          if ! session[:connected] # まだdango_connectを呼び出していないなら
-            # 接続直後のsid通知
-            send_obj = {"_sid"=>sid}
-            send_notice("_notice_sid", sid, send_obj)
-            logger.debug "_notice_sid #{sid} "
-            
-            dango_connect() # 接続時メソッド呼び出し
-            session[:connected] = true
-          end
-          
           ret_objs.each do |ret_obj| # 受信データループ
             if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
               logger.warn "no action error:#{ret_obj.inspect}"
@@ -399,6 +391,9 @@ EOF
               elsif action_name == '_response' # 送信パケットの返事なら
                 action_name_is_response(ret_obj)
                 
+              elsif action_name == '_change_encode_type' # エンコードタイプの変更なら
+                action_name_is_change_encode_type(ret_obj)
+                
               else # メンテナンスコマンド以外のユーザーアクション名なら
                 logger.debug "receive_action:#{sid}:#{action_name}:"
                 begin
@@ -415,6 +410,16 @@ EOF
             session.delete(:_action_name)
             session.delete(:_return)
           end
+          
+          if ! session[:connected] # まだdango_connectを呼び出していないなら
+            # 接続直後のsid通知
+            send_obj = {"_sid"=>sid}
+            send_notice("_notice_sid", sid, send_obj)
+            logger.debug "_notice_sid #{sid} "
+            
+            dango_connect() # 接続時メソッド呼び出し
+            session[:connected] = true
+          end
         end
         
       end # loop
@@ -479,6 +484,12 @@ EOF
     end
   end
   
+  # action_nameが送信パケットの返事なら
+  def action_name_is_change_encode_type(ret_obj)
+    logger.debug "action_name_is_change_encode_type: #{ret_obj['encode_type'].inspect}"
+    session[:encode_type] = ret_obj['encode_type']
+  end
+  
   # 各種サーバー仕様の変数設定
   def set_server_variables() 
     # debug
@@ -731,7 +742,7 @@ EOF
     raise(DangoFrameworkError, "sids is not Array.") if ! sids.is_a?(Array)
     
 #    timeout = options[:timeout] || @send_receive_timeout_default_sec
-    dtype = options[:type] || 0
+    encode_type = options[:encode_type] || 0
     
     send_obj_dup = send_obj.deep_dup
     send_obj_dup["notice"] = notice_name.to_s
@@ -743,7 +754,7 @@ EOF
       send_id = notice_name.to_s + Time.now.to_f.to_s + rand().to_s
       send_obj_dup["_id"] = send_id
       
-      @queue_send_notice.push([sid, send_obj_dup, dtype].deep_dup)
+      @queue_send_notice.push([sid, send_obj_dup, encode_type].deep_dup)
     end # end sids.each
     
 #    raise(DangoFrameworkConnectionError, "send_notice:error happened.") if is_error
@@ -769,14 +780,14 @@ EOF
         end
         
         send_data_sid_list = {}
-        send_data_dtype_list = {}
+        send_data_encode_type_list = {}
         send_data_list.each do |one_send_data| # sidごとに分ける
-          sid      = one_send_data[0]
-          send_obj = one_send_data[1]
-          dtype    = one_send_data[2]
+          sid          = one_send_data[0]
+          send_obj     = one_send_data[1]
+          encode_type  = one_send_data[2]
           send_data_sid_list[sid] = [] if ! send_data_sid_list.has_key?(sid)
           send_data_sid_list[sid].push(send_obj)
-          send_data_dtype_list[sid] = dtype
+          send_data_encode_type_list[sid] = encode_type
         end
         
         # sidごとにデータをまとめ送り
@@ -797,7 +808,7 @@ EOF
             
 #            logger.debug one_send_data_list.pretty_inspect
             
-            dango_send_data(sock, one_send_data_list, :type=>send_data_dtype_list[sid]) # データ送信
+            dango_send_data(sock, one_send_data_list, :type=>send_data_encode_type_list[sid]) # データ送信
             
           rescue DangoFrameworkConnectionError
             logger.info "thread_send_notice_queue:failed send. sid=#{sid} sock=#{sock.inspect} #{$!.class}"

data/lib/dango/tasks/dango_rake.rb

@@ -91,7 +91,7 @@ def check_dango_connect()
   require 'dango/tester/dango_tester_client'
   
   # コンフィグから check_dango_process_cmd を取得
-  config = YAML.load(open("dango/config/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
+  config = YAML.load(open("config/dango/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
   
   serv_info = {}
   serv_info["host"] = config['network']['host'] || 'localhost'
@@ -157,7 +157,7 @@ namespace :dango do
     is_alive_server = check_dango_connect() if is_pid_exist  # サーバーへの通信を使ったチェック
     
     # コンフィグから check_dango_process_cmd を取得
-    config = YAML.load(open("dango/config/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
+    config = YAML.load(open("config/dango/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
     check_dango_process_cmd = config['server']['check_dango_process_cmd'] || nil
     
     # is_pid_existがないならcheck_dango_process_cmd実行
@@ -227,7 +227,7 @@ namespace :dango do
       require "yaml"
       require 'dango/monitor/dango_monitor_client.rb'
       
-      system_message = YAML.load(open("dango/config/system_message.yml", "rb"){|fh| fh.read})
+      system_message = YAML.load(open("config/dango/system_message.yml", "rb"){|fh| fh.read})
       message = system_message[message_type]
       
       begin

data/lib/dango/tester/dango_tester_client.rb

@@ -49,7 +49,8 @@ class DangoTesterClient
       rescue
         client_conn = nil
         raise("connection error for retry times over.") if i == ConnectionRetryTimes - 1
-        puts "connection failed. sleep #{ConnectionRetryIntervalSec}" if @debug
+        puts "#{$!.class} #{$!.message} #{$!.backtrace.inspect}" if @debug
+        puts "connection failed. sleep #{ConnectionRetryIntervalSec}"
         sleep ConnectionRetryIntervalSec
       end
     end
@@ -117,6 +118,7 @@ class TestClient < DangoClientFramework
   def initialize(env, config, c_name)
     @config = config
     @client_name = c_name # クライアント名
+    @client_data = {} # データ保管用
     
     @receive_cache_auto_delete_sec = config['tester']['receive_cache_auto_delete_sec']
     
@@ -135,6 +137,14 @@ class TestClient < DangoClientFramework
   
   attr_accessor(:client_name)
   
+  # データ保管用の場所を作っておく
+  def []=(key, value)
+    @client_data[key] = value
+  end
+  def [](key)
+    @client_data[key]
+  end
+  
   # dango_client_send_receive_data用の共有メモリ
   def send_receive_shared_init
     @send_receive_shared = SharedMemoryStore.new

data/lib/dango/version.rb

@@ -1,8 +1,8 @@
 module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
-    TINY  = 6
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/dango.rb

@@ -0,0 +1,7 @@
+# == About dango.rb
+#
+# show http://dango-net.org/page/demo
+#
+
+require "dango/version.rb"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-15 00:00:00 +09:00
+date: 2008-06-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.3.0
     version: 
 description: Realtime communications network framework for Ruby and Flash on Rails.
 email: keisuke@rccn.com
@@ -41,6 +41,7 @@ extra_rdoc_files:
 files: 
 - README.txt
 - LICENSE
+- lib/dango.rb
 - lib/dango/client_framework.rb
 - lib/dango/framework_base.rb
 - lib/dango/server_framework.rb