dango 0.0.18 → 0.0.19

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2007 Keisuke Minami
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Manifest.txt

@@ -1,5 +1,6 @@
 Manifest.txt
 README.txt
+MIT-LICENSE
 lib/dango/client_framework.rb
 lib/dango/framework_base.rb
 lib/dango/server_framework.rb

data/README.txt

@@ -30,16 +30,9 @@ Download and install  dango with the following.
 
 == Simple Example
 
-  ruby "rubygems" # you use rubygems
-  ruby "image_size"
-  ruby "open-uri"
-  open("http://www.rubycgi.org/image/ruby_gtk_book_title.jpg", "rb") do |fh|
-    p ImageSize.new(fh.read).get_size
-  end
-
 == Licence
 
-This code is free to use under the terms of the Ruby's licence. 
+This code is free to use under the terms of the MIT licence. 
 
 == Contact
 

data/lib/dango/client_framework.rb

@@ -237,7 +237,7 @@ class DangoClientFramework
         
         # 送信スレッドが開始していなければ開始
         if !receive_thread
-          receive_thread = Thread.start do
+          receive_thread = Thread.start(action_name, send_obj) do
             cs_client_send_data(action_name, send_obj)
           end
         end

data/lib/dango/framework_base.rb

@@ -187,12 +187,12 @@ module DangoFrameworkModule
 #    cs_logger.debug "ret_data_orig:#{ret_data_orig.inspect}"
     
     ret_data = cs_receive_decrypt(ret_data_orig[0..-2])
+#    cs_logger.debug "ret_data:#{ret_data.inspect}"
     
     @recv_count += 1 if @recv_count # 受信回数カウント
-#    cs_logger.debug "ret_data:#{ret_data.inspect}"
     
     begin
-      if ret_data == "\n" # データが空ならparseしない
+      if ret_data == "" || ret_data == "{}" # データが空ならparseしない
         data = {}
       elsif dtype == 0
         data = JSON.parse(ret_data)

data/lib/dango/server_framework.rb

@@ -16,9 +16,10 @@ require "dango/mutex_socket_list"
 class DangoServerFramework
   include DangoFrameworkModule
   
-  SendReceiveSleepIntervalSec = 0.1  # データ送信後の順の際のタイムアウトチェック間隔秒
-  SendReceiveTimeoutDefaultSec = 2.0 # データ送受信時のデフォルトタイムアウト秒数
-  SendTimeoutSec = 10.0    # データ送受信時の送信のタイムアウト秒数
+  SendReceiveSleepIntervalSec = 0.1   # データ送信後の順の際のタイムアウトチェック間隔秒
+  SendReceiveTimeoutDefaultSec = 2.0  # データ送受信時のデフォルトタイムアウト秒数
+  SendTimeoutSec = 10.0               # データ送受信時の送信のタイムアウト秒数
+  HeratBeatIntervalSec = 60.0         # S=>Cのハートビートの送信タイミング
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -87,6 +88,7 @@ class DangoServerFramework
     mutex_socket_list_init()              # ソケット毎用のmutexを初期化
     @mutex_proc_thread = Mutex.new        # スレッドが同時起動しないようにするためのMutex
     cs_server_init()                      # 初期設定読み込み
+    heart_beat_thread_start()             # ハートビートスレッドの開始
     
     @mutex_send_response = Mutex.new      # 送信レスポンス用のMutex
     @arr_send_response = []               # 送信レスポンス用のキャッシュ
@@ -94,8 +96,8 @@ class DangoServerFramework
     @gserver = DangoGServer.new(self, @connection_server_port, 
                                 @connection_server_host, 
                                 @connection_server_max_connections)
-    @gserver.audit = true                  # Turn logging on.
-    @gserver.start 
+    @gserver.audit = true                 # Turn logging on.
+    @gserver.start
   end
   
   # サーバーのループ時のクラス読み直し処理
@@ -192,11 +194,9 @@ class DangoServerFramework
       cs_connect() # 接続時メソッド呼び出し
       
       # 接続直後のsid通知
-#      Thread.start do
-        send_obj = {"_sid"=>sid}
-        cs_server_send_data(sid, "_notice_sid", send_obj)
-        cs_logger.debug "_notice_sid #{sid} #{Time.now_to_s}"
-#      end
+      send_obj = {"_sid"=>sid}
+      cs_server_send_data(sid, "_notice_sid", send_obj)
+      cs_logger.debug "_notice_sid #{sid} #{Time.now_to_s}"
       
       # 誰かが接続したときに60秒以上経った@arr_send_responseを削除
       @mutex_send_response.synchronize do
@@ -223,9 +223,12 @@ class DangoServerFramework
           policy_data = '<cross-domain-policy><allow-access-from domain="*" to-ports="*" /></cross-domain-policy>'
           sock.send(policy_data, 0)
           sock.flush
-          raise(DangoFrameworkError, "policy file sent. disconnectiong...")
+          raise(DangoFrameworkFlashPolicyError, "policy file sent. disconnectiong...")
           
-        elsif ret_obj != {} # 受信データがあれば
+        elsif ret_obj == {} # 受信データがなければ
+#          cs_logger.debug "ret_obj is empty. #{Time.now_to_s}"
+          
+        else # 受信データがあれば
           if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
             cs_logger.error "no action error:#{ret_obj.inspect}"
             raise(DangoFrameworkError, "no action error") 
@@ -267,6 +270,9 @@ class DangoServerFramework
         
       end # loop
       
+    rescue DangoFrameworkFlashPolicyError
+      cs_logger.debug "Flash policy file send. #{Thread.current.object_id} #{Time.now_to_s}"
+      
     rescue DangoFrameworkReadNoDataError
       cs_logger.debug "read no data. maybe client closed. #{Thread.current.object_id} #{Time.now_to_s}"
       
@@ -485,6 +491,31 @@ class DangoServerFramework
     cs_server_receive_decrypt(str)
   end
   
+  # ハートビートスレッドの開始
+  def heart_beat_thread_start
+    Thread.start do
+      loop do
+        begin
+          sleep HeratBeatIntervalSec
+          
+          if ! @gserver.stopped? # gserverが起動していれば
+            cs_logger.debug "heart_beat_thread_start #{Time.now_to_s}"
+            
+            # 全員へ空パケットを送信
+            socket_list.keys.each do |sid|
+              cs_logger.debug "heart_beat_thread_start:sid=#{sid}"
+              sock = socket_list[sid]
+              cs_send_data(sock, {})
+            end
+          end
+          
+        rescue
+          cs_logger.error "Exception #{Thread.current.object_id} #{Time.now_to_s} #{error_message($!, 'u')}"
+        end
+      end
+    end
+  end
+  
   # サーバーからクライアントへのデータ送信
   def cs_server_send_data(sid, notice_name, send_obj, options = {})
     cs_logger.debug "cs_server_send_data(#{sid.inspect}, #{notice_name.inspect}) #{Time.now_to_s}"
@@ -495,25 +526,27 @@ class DangoServerFramework
     timeout = options[:timeout] || SendReceiveTimeoutDefaultSec
     dtype = options[:type] || 0
     
-    sock = socket_list[sid]
-    raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
-    raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
-    
-#    cs_logger.debug "cs_server_send_data:sending data notice_name=#{notice_name.inspect}"
-    send_obj_dup = send_obj.deep_dup
-    send_obj_dup["notice"] = notice_name.to_s
-    
-    # データ送信時にクライアントからのレスポンスを確認する（Flashのバグらしきもの対策）
-#    if notice_name.to_s =~ /^return_/
-#      cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
-#      cs_logger.debug "cs_server_send_data:finish send data notice_name=#{notice_name.inspect}\n"
-#    else
+    # sidの通知の場合はレスポンスを気にしない
     if notice_name.to_s == "_notice_sid"
+      sock = socket_list[sid]
+      raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
+      raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
+      
+      send_obj_dup = send_obj.deep_dup
+      send_obj_dup["notice"] = notice_name.to_s
+      
       cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #      cs_logger.debug "cs_server_send_data:finish send data notice_name=#{notice_name.inspect}\n"
     else
-      Thread.start do
+      Thread.start(sid, notice_name, send_obj, dtype, timeout) do
         begin
+          sock = socket_list[sid]
+          raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
+          raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
+          
+          send_obj_dup = send_obj.deep_dup
+          send_obj_dup["notice"] = notice_name.to_s
+          
           mutex_socket_list.synchronize(sid) do
 #            cs_logger.debug "mutex_socket_list:synchronize:#{notice_name} #{sid} #{Time.now_to_s}"
             
@@ -521,7 +554,7 @@ class DangoServerFramework
             send_obj_dup["_id"] = Digest::MD5.hexdigest(digest_key)
             have_came_response = nil
             
-            receive_thread = Thread.start do
+            receive_thread = Thread.start(sock, send_obj_dup, dtype) do
               begin
                 cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #                cs_logger.debug "cs_server_send_data:sent:notice_name=#{send_obj_dup['_id']} #{notice_name.inspect} #{sid} #{Time.now_to_s}"

data/lib/dango/tester/dango_tester_client.rb

@@ -103,6 +103,7 @@ class TestClient < DangoClientFramework
     cs_logger.debug "trap_receive_data:#{receive_name}:#{Time.now_to_s}"
     timeout = options[:timeout] || ReceiveTrapTimeoutSec
     trap_proc = options[:proc] || nil
+    trap_loop = options[:loop] || nil # procがある場合のみ有効なフラグ
     raise(ArgumentError, ":proc is not Proc class.") if trap_proc && ! trap_proc.is_a?(Proc)
     
     # 戻ってきたデータのチェックメソッド
@@ -124,46 +125,51 @@ class TestClient < DangoClientFramework
     if ! @trap_thread_hash.has_key?(receive_name)
       
       # スレッド開始
-      th = Thread.start do
-        send_receive_shared[receive_name] = nil
-        if timeout == 0
-          end_reserved_time = Time.at(0)         # 0ならepochを入れる
-        else
-          end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
-        end
-        
-        # タイムアウトチェック
+      th = Thread.start(receive_name, timeout, trap_proc, trap_loop) do
         loop do
-          if end_reserved_time != Time.at(0) && end_reserved_time < Time.now
-            raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}:\nclient_name=#{@client_name}(#{self.sid}):\nreceive_name=#{receive_name} \n#{Time.now_to_s}") 
+          send_receive_shared[receive_name] = nil
+          if timeout == 0
+            end_reserved_time = Time.at(0)         # 0ならepochを入れる
+          else
+            end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
           end
           
-          # 戻ってきたデータがあれば
-          if send_receive_shared[receive_name]
-            cs_logger.debug "receive_name:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
-            break 
+          # タイムアウトチェック
+          loop do
+            if end_reserved_time != Time.at(0) && end_reserved_time < Time.now
+              raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}:\nclient_name=#{@client_name}(#{self.sid}):\nreceive_name=#{receive_name} \n#{Time.now_to_s}") 
+            end
+            
+            # 戻ってきたデータがあれば
+            if send_receive_shared[receive_name]
+              cs_logger.debug "receive_name:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
+              break 
+            end
+            
+            sleep SendReceiveSleepIntervalSec # スリープ
           end
           
-          sleep SendReceiveSleepIntervalSec # スリープ
-        end
-        
-        # 戻ってきたデータがあるかどうかチェック
-        if !send_receive_shared[receive_name] 
-          raise(DangoFrameworkError, "received data is none. sid=#{sid} receive_name=#{receive_name}")
-        end
-        
-        # :procが設定されている場合は、それを呼び出す
-        if trap_proc
-          cs_logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} #{Time.now_to_s}"
-          trap_proc.call(send_receive_shared[receive_name])
+          # 戻ってきたデータがあるかどうかチェック
+          if !send_receive_shared[receive_name] 
+            raise(DangoFrameworkError, "received data is none. sid=#{self.sid} receive_name=#{receive_name}")
+          end
           
-        # :procが設定されていなければ、wait用に@receive_arrに入れておく
-        else
-          @receive_mutex.synchronize do
-            cs_logger.debug "receive_name:#{receive_name}:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
-            @receive_arr.push([receive_name, send_receive_shared[receive_name]])
+          # :procが設定されている場合は、それを呼び出す
+          if trap_proc
+            cs_logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} #{Time.now_to_s}"
+            trap_proc.call(send_receive_shared[receive_name])
+            break if ! trap_loop # loopする必要がなければスレッド終了
+            
+          # :procが設定されていなければ、wait用に@receive_arrに入れておく
+          else
+            @receive_mutex.synchronize do
+              cs_logger.debug "receive_name:#{receive_name}:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
+              @receive_arr.push([receive_name, send_receive_shared[receive_name]])
+            end
+            break # スレッド終了
+            
           end
-        end
+        end # loop
       end # Thread
       
       @trap_thread_hash[receive_name] = th

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 18
+    TINY  = 19
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.18
-date: 2007-10-22 00:00:00 +09:00
+  version: 0.0.19
+date: 2007-10-24 00:00:00 +09:00
 summary: Ruby - Flash conneciton network flamework
 require_paths: 
 - lib
@@ -31,6 +31,7 @@ authors:
 files: 
 - Manifest.txt
 - README.txt
+- MIT-LICENSE
 - lib/dango/client_framework.rb
 - lib/dango/framework_base.rb
 - lib/dango/server_framework.rb