shooting_star 3.2.1 → 3.2.2

data/History.txt

@@ -1,13 +1,28 @@
+*** 3.2.2 / 2007-08-26
++ 3 major enhancements:
+  + Profiling by RubyProf if CONFIG.profile.
+  + Serialized event execution.
+  + Separated type and phase on connection management.
++ 3 minor enhancements:
+  + Added new task meteor_strike:update for updating plugin.
+  + Refined a code of reconnection in flash client.
+  + Updated chat generator.
++ 2 minor spec changes:
+  + Added lib/version.rb.
+  + Added :without_logging to shooting_star.yml
++ 1 minor bugfix:
+  + Renamed helper module of a chat generator template.
+
 *** 3.2.1 / 2007-08-09
-+ 1 critical bugfix:
++ 2 critical bugfixes:
   + Fixed a behaviour of xhr client initialization.
+  + Fixed a behaviour of flash client initialization.
 
 *** 3.2.0 / 2007-08-09
 + 3 major enhancements:
   + Automatic activation/deactivation of flash client.
   + Ported meteor_strike.swf from CS3 to mtasc.
   + Heart beat.
-  - Serialized event execution.
 + 7 minor enhancements:
   + shooting_star.yml is processed by ERB.
   + Updated implementation of observers.

data/Manifest.txt

@@ -4,6 +4,7 @@ README.txt
 Rakefile
 bin/shooting_star
 lib/shooting_star.rb
+lib/shooting_star/version.rb
 lib/shooting_star/server.rb
 lib/shooting_star/shooter.rb
 lib/shooting_star/channel.rb
@@ -26,9 +27,12 @@ vendor/plugins/meteor_strike/lib
 vendor/plugins/meteor_strike/lib/meteor_strike.rb
 vendor/plugins/meteor_strike/lib/meteor_strike
 vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb
+vendor/plugins/meteor_strike/lib/meteor_strike/controller.rb
 vendor/plugins/meteor_strike/views
 vendor/plugins/meteor_strike/views/xhr.rhtml
 vendor/plugins/meteor_strike/views/flash.rhtml
+vendor/plugins/meteor_strike/tasks
+vendor/plugins/meteor_strike/tasks/meteor_strike.rake
 vendor/plugins/meteor_strike/test
 vendor/plugins/meteor_strike/test/meteor_strike_test.rb
 vendor/plugins/meteor_strike/generators

data/Rakefile

@@ -10,9 +10,10 @@ namespace :gem do
 
   $: << './lib'
   $: << './ext'
-  require 'shooting_star'
+  require 'shooting_star/version'
 
   Hoe.new('shooting_star', ShootingStar::VERSION) do |hoe|
+
     hoe.author = 'Genki Takiuchi'
     hoe.email = 'takiuchi@drecom.co.jp'
     hoe.description = 'Comet server.'
@@ -69,3 +70,20 @@ file 'public/meteor_strike.swf' => 'as/meteor_strike.as' do
       '-swf public/meteor_strike.swf',
       '-main as/meteor_strike.as'].join(' ')
 end
+
+desc 'making ext'
+task :ext => 'ext/asteroid.so'
+
+file 'ext/asteroid.so' => 'ext/Makefile' do
+  cwd = `pwd`
+  cd 'ext/'
+  sh 'make'
+  cd cwd.chomp
+end
+
+file 'ext/Makefile' => 'ext/extconf.rb' do
+  cwd = `pwd`
+  cd 'ext/'
+  sh 'ruby extconf.rb'
+  cd cwd.chomp
+end

data/ext/asteroid.c

@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "extconf.h"
@@ -21,7 +22,6 @@
  * -------------------------------------------------------------------------- */
 #ifdef HAVE_SYS_EVENT_H
 #include <sys/event.h>
-#include <sys/time.h>
 typedef int asteroid_pollfd_t;
 typedef struct kevent asteroid_poll_event_t;
 #endif
@@ -137,6 +137,7 @@ void Init_asteroid(){
   Asteroid = rb_define_module("Asteroid");
   rb_define_singleton_method(Asteroid, "run", asteroid_s_run, 3);
   rb_define_singleton_method(Asteroid, "stop", asteroid_s_stop, 0);
+  rb_define_singleton_method(Asteroid, "now", asteroid_s_now, 0);
   rb_define_class_variable(Asteroid, "@@clients", clients = rb_hash_new());
 }
 
@@ -204,12 +205,18 @@ static VALUE asteroid_s_stop(VALUE Self){
   return Qnil;
 }
 
+static VALUE asteroid_s_now(VALUE Self){
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return rb_float_new(now.tv_sec + now.tv_usec/1000000.0);
+}
+
 static VALUE asteroid_server_send_data(VALUE Self, VALUE Data){
   VALUE Fd = rb_iv_get(Self, "@fd");
   int fd = FIX2INT(Fd), remain = RSTRING(Data)->len, len, trial = 100;
   char *data = StringValuePtr(Data);
   while(remain){
-    len = send(fd, data, remain, MSG_NOSIGNAL);
+    len = send(fd, data, remain, MSG_DONTWAIT|MSG_NOSIGNAL);
     if(len == -1){
       if(errno == EAGAIN && --trial){
         rb_thread_schedule();

data/ext/asteroid.h

@@ -1,4 +1,5 @@
 static VALUE asteroid_s_run(VALUE Self, VALUE Host, VALUE Port, VALUE Module);
 static VALUE asteroid_s_stop(VALUE Self);
+static VALUE asteroid_s_now(VALUE Self);
 static VALUE asteroid_server_send_data(VALUE Self, VALUE Data);
 static VALUE asteroid_server_write_and_close(VALUE Self);

data/lib/shooting_star/channel.rb

@@ -10,16 +10,23 @@ module ShootingStar
       @@channels[path] = self
     end
 
+    # A message is sent to observers if params includes a :event key.
+    # If there are no observers, the message is sent to clients.
+    # Others are sent to clients.
     def transmit(id, params)
+      need_event_handling = false
       if event = params[:event]
         observers = @@observers.has_key?(@path) ? @@observers[@path].dup : nil
         observers.each do |name, obs|
           begin obs.__send__(event, params) if obs.respond_to?(event)
           rescue Exception; Channel.ignore(@path, name) end
         end if observers
+        need_event_handling = observers.nil? || observers.empty?
       end
-      @waiters.each do |signature, server|
-        server.commit if server.respond(id, params)
+      if event.nil? || need_event_handling
+        @waiters.each do |signature, server|
+          server.commit if server.respond(id, params)
+        end
       end
     end
 

data/lib/shooting_star/server.rb

@@ -57,17 +57,19 @@ module ShootingStar
       @channel_path ||= CGI.unescape(channel_path)
       @query = "channel=#{channel_path}&sig=#{@signature}"
       @type = @params['__t__']
+      @phase = @params['__p__']
       # process verb
       if !@type
-        make_connection(path)
+        make_xhr_connection(path)
       else
         prepare_channel(@channel_path)
         @uid = @@uids[@signature] ||= @params['uid']
         @tag = @@tags[@signature] ||=
           (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
-        if !@@servers[@signature] && @type != 'rc'
+        unless @phase == 'reconnect'
+          make_flash_connection if @type == 'flash'
           notify(:event => :enter, :uid => @uid, :tag => @tag)
-          log "Connected: #{@uid}"
+          log{"Connected: #{@uid}"}
         end
         @executing = @@executings[@signature] ||= Hash.new
         @@servers[@signature] = self
@@ -76,7 +78,7 @@ module ShootingStar
     rescue MethodNotAcceptable
       write_and_close
     rescue Exception => e
-      log "ERROR: #{e.message}\n#{e.backtrace.join("\n")}\n#{data}"
+      log{"ERROR: #{e.message}\n#{e.backtrace.join("\n")}\n#{data}"}
       write_and_close
     end
 
@@ -91,9 +93,9 @@ module ShootingStar
       @@uids.delete(@signature)
       @@tags.delete(@signature)
       @@executings.delete(@signature)
-      log "Disconnected: #{@uid}:#{@signature}"
+      log{"Disconnected: #{@uid}:#{@signature}"}
       if Channel.cleanup(@channel_path)
-        log "Channel closed: #{@channel_path}"
+        log{"Channel closed: #{@channel_path}"}
       end
     end
 
@@ -113,24 +115,18 @@ module ShootingStar
       return false if @unbound || !@waiting
       @executing.each{|id, params| execute(id, params)}
       return false if @execution.empty?
-      return false unless send_data(@type == 'f' ? "#{@execution}\0" :
+      return false unless send_data(@type == 'flash' ? "#{@execution}\0" :
         "HTTP/1.1 200 OK\nContent-Type: text/javascript\n\n#{@execution}")
-      @committed_at = Time.now
+      @committed_at = Asteroid::now
       @execution = ''
-      @executing = Hash.new
+      @executing.clear
       @@executings.delete(@signature)
-      unless @type == 'f'
+      unless @type == 'flash'
         @waiting = nil
         write_and_close
       end
       true
     end
-
-    # noticed execution and remove the command from execution buffer.
-    def executed(id) 
-      @executing = @@executings[@signature] ||= Hash.new
-      @executing.delete(id)
-    end
     
     # update current status of servant.
     def update(uid, tag)
@@ -140,7 +136,7 @@ module ShootingStar
         @@tags[@signature] = @tag = tag
         notify(:event => :enter, :uid => @uid, :tag => @tag)
       end
-      log "Update: #{@uid}:#{@tag.join(',')}"
+      log{"Update: #{@uid}:#{@tag.join(',')}"}
     end
 
     def uid; @@uids[@signature] end
@@ -152,31 +148,31 @@ module ShootingStar
     end
 
   private
-    def log(*arg, &block) ShootingStar::log(*arg, &block) end
+    def log(&block) ShootingStar::log(&block) end
 
     # check session timeout
     def session_timeout?
       return true unless @committed_at
-      Time.now - @committed_at > ShootingStar::CONFIG.session_timeout
+      Asteroid::now - @committed_at > ShootingStar::CONFIG.session_timeout
     end
 
     # broadcast event to clients.
     def notify(params = {})
       return unless Channel[@channel_path]
       event_id = ShootingStar::timestamp
-      log "Event(#{event_id}): #{@channel_path}:#{params.inspect}"
+      log{"Event(#{event_id}): #{@channel_path}:#{params.inspect}"}
       Channel[@channel_path].transmit("event-#{event_id}", params)
     rescue Exception => e
-      log "ERROR: #{e.message}\n#{e.backtrace.join("\n")}"
+      log{"ERROR: #{e.message}\n#{e.backtrace.join("\n")}"}
     end
 
     # wait for commands or events until they occur. if they're already in
     # the execution buffer, they'll be flushed and return on the spot.
     def wait_for
       @waiting = true
-      log "Wait for: #{@channel_path}:#{@uid}:#{@tag.join(',')}:#{@signature}"
+      log{"Wait for: #{@channel_path}:#{@uid}:#{@tag.inspect}:#{@signature}"}
       if prepare_channel(@channel_path).join(self)
-        log "Flushed: #{@channel_path}:#{@uid}:#{@tag.join(',')}:#{@signature}"
+        log{"Flushed: #{@channel_path}:#{@uid}:#{@tag.inspect}:#{@signature}"}
       end
     end
 
@@ -184,41 +180,68 @@ module ShootingStar
     def prepare_channel(channel_path)
       unless Channel[channel_path]
         Channel.new(channel_path)
-        log "Channel opened: #{channel_path}"
+        log{"Channel opened: #{channel_path}"}
       end
       Channel[channel_path]
     end
 
     # add execution line to the buffer.
     def execute(id, params)
-      sweep_timeout = ShootingStar::CONFIG.sweep_timeout
       @executing[id] = params
       query = @query.sub(%r[\&sig=\d+], '')
       query += "&" + FormEncoder.encode(params) if params
-      @execution += <<-"EOH"
-      (function(){
-        var ms1 = document.getElementById('meteor-strike-1-form');
-        var box = ms1 ? ms1.parentNode : document.body;
-        var iframe = document.createElement('iframe');
-        var remove = function(){box.removeChild(iframe)};
-        var timer = setTimeout(remove, #{sweep_timeout});
-        iframe.onload = function(){
-          clearTimeout(timer);
-          setTimeout(remove, 0);
+      @execution += "meteorStrike.execute(#{id.to_json},#{query.to_json});"
+    end
+
+    def executioner(initial_serial_id = 0)
+      sweep_timeout = ShootingStar::CONFIG.sweep_timeout
+      <<-"EOH"
+        var meteorStrike = window.meteorStrike || new Object;
+        meteorStrike.execute = function(id, query){
+          var channel = #{@channel_path.to_json};
+          var ms = meteorStrike[channel] = meteorStrike[channel] || new Object;
+          ms.serialId = ms.serialId || #{initial_serial_id};
+          var ms1 = document.getElementById('meteor-strike-1-form');
+          var box = ms1 ? ms1.parentNode : document.body;
+          var iframe = document.createElement('iframe');
+          var remove = function(){
+            if(iframe) box.removeChild(iframe);
+            iframe = null;
+          };
+          var timer = setTimeout(remove, #{sweep_timeout});
+          var ready = function(){
+            clearTimeout(timer);
+            setTimeout(remove, 0);
+          };
+          iframe.onload = ready;
+          iframe.onreadystatechange = function(){
+            if(this.readyState == 'complete') ready();
+          };
+          iframe.src = ['#{@params['execute']}/', id, '?', query,
+            '&__s__=', ms.serialId++].join('');
+          box.appendChild(iframe);
         };
-        iframe.src = '#{@params['execute']}/#{id}?#{query}';
-        box.appendChild(iframe);
-      })();
       EOH
     end
 
-    # make client connect us.
-    def make_connection(path)
+    # make flash client connect us.
+    def make_flash_connection
+      query = @query.sub(%r[\&sig=\d+], '')
+      query += "&" + FormEncoder.encode(:event => :init, :type => :flash)
+      event_id = MD5.new("event-init-flash-#{Asteroid::now}").to_s
+      send_data executioner + %Q{
+        meteorStrike.execute(#{event_id.to_json}, #{query.to_json});
+      } + "\0"
+    end
+
+    # make xhr client connect us.
+    def make_xhr_connection(path)
       assets = URI.parse(@params['execute'])
       assets.path = '/javascripts/prototype.js'
       assets.query = assets.fragment = nil
-      query = @query.sub(%r[\&sig=\d+], '')
+      query = @query.sub(%r[\&sig=\d+], '') + '&__s__=0'
       query += "&" + FormEncoder.encode(:event => :init, :type => :xhr)
+      event_id = MD5.new("event-init-xhr-#{Asteroid::now}").to_s
       heartbeat = @params['heartbeat'].to_i
       send_data "HTTP/1.1 200 OK\nContent-Type: text/html\n\n" +
       <<-"EOH"
@@ -229,16 +252,18 @@ module ShootingStar
       <script type="text/javascript" src="#{assets}"></script>
       <script type="text/javascript">
       //<![CDATA[
-      var connect = function(reconnect)
-      { var body = $H(#{@params.to_json});
-        body.__t__ = reconnect ? 'rc' : 'c';
-        var request = new Ajax.Request(#{path.to_json},
-          {evalScript: true, onComplete: function(xhr){
+      #{executioner(1)}
+      var connect = function(reconnect){ 
+        var body = $H(#{@params.to_json});
+        body.__t__ = 'xhr';
+        body.__p__ = reconnect ? 'reconnect' : 'connect';
+        var request = new Ajax.Request(#{path.to_json}, {evalScript: true,
+          onComplete: function(xhr){
             setTimeout(function(){connect(true)},
               xhr.getResponseHeader('Content-Type') ? 0 : 3000);
           }, postBody: body.toQueryString()});
-        var disconnect = function()
-        { request.options.onComplete = function(){};
+        var disconnect = function(){
+          request.options.onComplete = function(){};
           request.transport.abort();
         };
         Event.observe(window, 'unload', disconnect);
@@ -249,7 +274,7 @@ module ShootingStar
       setTimeout(function(){connect(false)}, 0);
       //]]>
       </script></head><body>
-        <iframe src="#{@params['execute']}/0?#{query}"></iframe>
+        <iframe src="#{@params['execute']}/#{event_id}?#{query}"></iframe>
       </body></html>
       EOH
     rescue Exception

data/lib/shooting_star/shooter.rb

@@ -6,7 +6,8 @@ module ShootingStar
     # broadcast/multicast message
     def shoot(channel_path, id, tag, options = {})
       return unless Channel[channel_path]
-      log "Shot: #{channel_path}:#{id}:#{tag.join(',')}:#{options}"
+      tag ||= []
+      log{"Shot: #{channel_path}:#{id}:#{tag.join(',')}:#{options}"}
       Channel[channel_path].transmit(id, options.merge(:tag => tag))
     end
 
@@ -49,12 +50,6 @@ module ShootingStar
       servers(channel_path, tag).map{|s| s.signature}
     end
 
-    # notification entry point of message execution.
-    def executed(sig, id)
-      ::ShootingStar::Server[sig].executed(id)
-    rescue Exception
-    end
-
     # observe server side events
     def observe(channel_path, observer)
       Channel.observe(channel_path, observer)
@@ -62,7 +57,7 @@ module ShootingStar
     end
 
   private
-    def log(*arg, &block) ShootingStar::log(*arg, &block) end
+    def log(&block) ShootingStar::log(&block) end
 
     def servers(channel_path, tag = nil)
       return [] unless Channel[channel_path]

data/lib/shooting_star/version.rb

@@ -0,0 +1,3 @@
+module ShootingStar
+  VERSION = '3.2.2'
+end

data/lib/shooting_star.rb

@@ -5,19 +5,19 @@ require 'yaml'
 require 'ftools'
 require 'fileutils'
 require 'erb'
+require 'shooting_star/version'
 require 'shooting_star/config'
 require 'shooting_star/shooter'
 
 module ShootingStar
-  VERSION = '3.2.1'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
     :pid_file => 'tmp/pids/shooting_star.pid',
     :log_file => 'log/shooting_star.log',
     :daemon => false,
     :slient => false,
-    :session_timeout => 10,
-    :sweep_timeout => 500_000)
+    :session_timeout => 10.0,
+    :sweep_timeout => 30_000)
 
   def self.configure(options = {})
     if @log_file
@@ -35,6 +35,8 @@ module ShootingStar
     @@shooter ||= DRb.start_service && DRbObject.new(nil, CONFIG.shooter.uri)
   end
 
+  def self.timestamp; ("%.6f" % Asteroid::now).tr('.', '') end
+
   # install config file and plugin
   def self.init
     base_dir = CONFIG.directory || FileUtils.pwd
@@ -63,13 +65,22 @@ module ShootingStar
 
   def self.start(&block)
     if File.exist?(CONFIG.pid_file)
-      log 'shooting_star is already running.'
-      return
+      begin
+        shooter.signature
+        log{'shooting_star is already running.'}
+        return
+      rescue Exception
+        log{'shooting_star seems having been shut down incorrectly.'}
+      end
     end
     if CONFIG.daemon
       Signal.trap(:ALRM){exit} and sleep if fork
       Process.setsid
     end
+    if CONFIG.profile
+      require 'ruby-prof'
+      RubyProf.start
+    end
     require 'shooting_star/shooter'
     @@druby = DRb.start_service(CONFIG.shooter.uri, Shooter.new)
     require 'shooting_star/server'
@@ -81,14 +92,17 @@ module ShootingStar
       Signal.trap(:INT) do
         Asteroid::stop
         @@druby.stop_service
-        log "shooting_star service stopped."
+        log{"shooting_star service stopped."}
         File.rm_f(CONFIG.pid_file)
+        if CONFIG.profile
+          RubyProf::FlatPrinter.new(RubyProf.stop).print(STDOUT, 0)
+        end
       end
       Signal.trap(:EXIT) do
         File.rm_f(CONFIG.pid_file)
         @log_file.close if @log_file
       end
-      log "shooting_star service started."
+      log{"shooting_star service started."}
       Process.kill(:ALRM, Process.ppid) rescue nil if CONFIG.daemon
       block.call if block
     end
@@ -102,7 +116,7 @@ module ShootingStar
     end
     Thread.pass while File.exist?(CONFIG.pid_file)
   rescue Errno::ENOENT
-    log "shooting_star service is not running."
+    log{"shooting_star service is not running."}
   rescue Errno::ESRCH
     File.unlink(CONFIG.pid_file)
   ensure
@@ -135,16 +149,13 @@ module ShootingStar
     puts "#{'-' * 79}\n%11d %s\n#{'-' * 79}" % [total_observers, 'TOTAL']
   end
 
-  def self.timestamp
-    now = Time.now
-    "%d%06d" % [now.tv_sec, now.tv_usec]
-  end
-
 private
-  def self.log(*arg, &block)
-    puts(*arg, &block) unless CONFIG.silent
+  def self.log(&block)
+    return if CONFIG.without_logging
+    message = block.call if block
+    puts(message) unless CONFIG.silent
     @log_file ||= open(CONFIG.log_file, 'a')
-    @log_file.puts(*arg, &block) if @log_file
+    @log_file.puts(message) if @log_file
   end
 end
 __END__

data/test/ext/asteroid_test.rb

@@ -20,14 +20,9 @@ end
 
 class ShootingStarTest < Test::Unit::TestCase
   def setup
-    mutex = Mutex.new
-    mutex.lock
-    @thread = Thread.new do
-      Asteroid::run('127.0.0.1', 7124, Server) do
-        mutex.unlock
-      end
-    end
-    mutex.lock
+    flag = false
+    @thread = Thread.new{Asteroid::run('127.0.0.1', 7124, Server){flag = true}}
+    Thread.pass until flag
   end
 
   def teardown

data/test/lib/shooting_star_test.rb

@@ -19,10 +19,9 @@ class ShootingStarTest < Test::Unit::TestCase
       :log_file => 'log/shooting_star.test.log',
       :server => {:host => '127.0.0.1', :port => 8081},
       :shooter => {:uri => 'druby://127.0.0.1:7124'}
-    mutex = Mutex.new
-    mutex.lock
-    @thread = Thread.new{ShootingStar.start{mutex.unlock}}
-    mutex.lock
+    flag = false
+    @thread = Thread.new{ShootingStar.start{flag = true}}
+    Thread.pass until flag
     @query = "sig=0123456789&execute=http://127.0.0.1:4001/meteor/strike"
     @query2 = "sig=1123456789&execute=http://127.0.0.1:4001/meteor/strike"
   end
@@ -49,19 +48,18 @@ class ShootingStarTest < Test::Unit::TestCase
     assert_not_nil result.index('test\/channel')
     client.close
 
-    mutex = Mutex.new
-    mutex.lock
+    flag = false
     Thread.new do
       client = TCPSocket.open('127.0.0.1', 8081)
       send(client, "POST", "test/channel", "#{@query}&__t__=c")
-      mutex.unlock
+      flag = true
     end
-    mutex.lock
+    Thread.pass until flag
     shooter = DRbObject.new_with_uri('druby://127.0.0.1:7124')
     assert_not_nil shooter
     shooter.shoot("test/channel", 12, [])
     assert_not_nil result = client.read
-    assert_not_nil result.index('meteor/strike/12')
+    assert_not_nil result.index('meteorStrike.execute(12,')
   end
 
   def test_multi_user_communication
@@ -74,27 +72,28 @@ class ShootingStarTest < Test::Unit::TestCase
     observer = TestObserver.new
     assert_not_nil observer
     shooter.observe('test/channel', observer)
-    mutex = Mutex.new
-    mutex.lock
+    flag = false
     assert_nil observer.params
     Thread.new do
       send(client1, "POST", "test/channel", "#{@query}&__t__=c")
-      mutex.unlock
+      flag = true
     end
-    mutex.lock
-    assert_nil observer.params
+    Thread.pass until flag
+    assert_not_nil observer.params
+    assert_equal :enter, observer.params[:event]
+    flag = false
     Thread.new do
       send(client2, "POST", "test/channel", "#{@query2}&__t__=c")
-      mutex.unlock
+      flag = true
     end
-    mutex.lock
+    Thread.pass until flag
     assert_not_nil observer.params
     assert_equal :enter, observer.params[:event]
-    assert_not_nil result1 = client1.read
-    assert_not_nil result1.index('meteor/strike/event-')
     shooter.shoot("test/channel", 12, [])
+    assert_not_nil result1 = client1.read
+    assert_not_nil result1.index('meteorStrike.execute(12,')
     assert_not_nil result2 = client2.read
-    assert_not_nil result2.index('meteor/strike/12')
+    assert_not_nil result2.index('meteorStrike.execute(12,')
   end
 
   def test_xmlsocket_server

data/vendor/plugins/meteor_strike/generators/chat/templates/controller.rb

@@ -2,6 +2,7 @@ class <%= class_name %>Controller < ApplicationController
   layout '<%= file_name %>', :only => :index
 
   def index
+    session[:name] ||= 'guest'
     @chats = <%= class_name %>.find(:all).reverse
   end
 
@@ -9,24 +10,43 @@ class <%= class_name %>Controller < ApplicationController
     @chat = <%= class_name %>.find(params[:id])
   end
 
-  def talk
-    @chat = <%= class_name %>.create!(params[:chat])
-    content = render_component_as_string :action => 'show', :id => @chat.id
-    javascript = render_to_string :update do |page|
-      page.insert_html :top, 'chat-list', content
-    end
-    Meteor.shoot '<%= file_name %>', javascript
+  def listen
+    session[:name] = params[:name]
     render :update do |page|
-      page[:chat_message].clear
-      page[:chat_message].focus
+      page << <<-"EOH"
+        meteorStrike['<%= file_name %>'].update(#{session[:name].to_json});
+      EOH
+    end
+  end
+
+  def talk
+    @chat = <%= class_name %>.new(
+      :name => session[:name], :message => params[:message])
+    if @chat.save
+      content = render_component_as_string :action => 'show', :id => @chat.id
+      javascript = render_to_string :update do |page|
+        page.insert_html :top, 'chat-list', content
+      end
+      Meteor.shoot '<%= file_name %>', javascript
+      render :update do |page|
+        page[:message].clear
+        page[:message].focus
+      end
+    else
+      render :nothing => true
     end
   end
 
-  def connect
+  def event
+    message = case params[:event]
+    when 'init'; "connection established by #{params[:type]}."
+    when 'enter'; "#{params[:uid]} joined."
+    when 'leave'; "#{params[:uid]} left."
+    end
     @chat = <%= class_name %>.new(
       :name => '(* system *)',
       :created_at => Time.now,
-      :message => "connection established on #{params[:client_type]}.")
+      :message => message)
     render :action => 'show'
   end
 end

data/vendor/plugins/meteor_strike/generators/chat/templates/helper.rb

@@ -1,2 +1,2 @@
-module MeteorHelper
+module <%= class_name %>Helper
 end

data/vendor/plugins/meteor_strike/generators/chat/templates/index.rhtml

@@ -1,18 +1,17 @@
-<%% form_remote_for(:chat, :url => {:action => 'talk'}) do |f| %>
-  <%%= f.text_field :name %>
+<%% form_remote_tag(:url => {:action => 'listen'}) do |f| %>
+  <%%= text_field_tag :name, session[:name] %>
+  <%%= submit_tag 'Listen' %><br />
+<%% end %>
+<%% form_remote_tag(:url => {:action => 'talk'}) do |f| %>
+  <%%= text_field_tag :message %>
   <%%= submit_tag 'Talk' %><br />
-  <%%= f.text_area :message, :rows => 3 %>
 <%% end %>
 <ul id="chat-list">
-<%% for chat in @chats %>
-  <%%= render_component :action => 'show', :id => chat.id %>
-<%% end %>
+  <%% for chat in @chats %>
+    <%%= render_component :action => 'show', :id => chat.id %>
+  <%% end %>
 </ul>
-<%%= meteor_strike '<%= file_name %>', :event => %Q{
-  switch(params.event){
-  case 'init':
-    new Ajax.Updater('chat-list', #{url_for(:action => 'connect').to_json}, {
-      insertion: Insertion.Top, parameters: {client_type: params.type}});
-    break;
-  }
-} %>
+<%%= meteor_strike '<%= file_name %>', :uid => session[:name], :event => %Q{
+  new Ajax.Updater('chat-list', #{url_for(:action => 'event').to_json}, {
+    insertion: Insertion.Top, parameters: params})}
+%>

data/vendor/plugins/meteor_strike/generators/meteor/templates/controller.rb

@@ -1,7 +1,6 @@
 class MeteorController < ApplicationController
   layout nil
   caches_action :strike
-  after_filter :notify_execution, :only => [:strike]
 
   def strike
     @channel = params[:channel]
@@ -24,9 +23,4 @@ class MeteorController < ApplicationController
     Meteor.shooter.sweep
     render :nothing => true
   end
-
-private
-  def notify_execution
-    Meteor.shooter.executed(params[:sig], params[:id])
-  end
 end

data/vendor/plugins/meteor_strike/generators/meteor/templates/view.rhtml

@@ -9,8 +9,8 @@
     var javascript = #{@javascript.to_json};
     var execute = function(){
       var ms = parent.parent.meteorStrike[channel];
-      if(ms) ms.execute(javascript);
-      else setTimeout(execute, 0);
+      if(ms) ms.evaluate(javascript, #{params[:__s__]});
+      else setTimeout(evaluate, 0);
     };
     execute();
   })();

data/vendor/plugins/meteor_strike/lib/meteor_strike/controller.rb

@@ -0,0 +1,37 @@
+module MeteorStrike
+  module Controller
+    def self.included(base)
+      base.class_eval do
+        after_filter :meteor_strike
+        hide_action :meteor_strike
+        hide_action :install_meteor_strike
+      end
+    end
+
+    def install_meteor_strike
+      if parent_controller
+        parent_controller.install_meteor_strike
+      else
+        @install_meteor_strike ||= 0
+        @install_meteor_strike += 1
+      end
+    end
+
+    def meteor_strike
+      return unless @install_meteor_strike
+      result = <<-"EOH"
+        <script language="VBScript">
+        '<![CDATA[
+        On Error Resume Next
+      EOH
+      (1..@install_meteor_strike).each do |i|
+        result << <<-"EOH"
+        Sub meteor_strike_#{i}_FSCommand(ByVal command, ByVal args)
+          Call meteor_strike_#{i}_DoFSCommand(command, args)
+        End Sub
+        EOH
+      end
+      response.body.sub!(%r{</head>}i, "#{result}\n']]>\n</script></head>")
+    end
+  end
+end

data/vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb

@@ -18,7 +18,7 @@ module MeteorStrike
         cc += 'post-check=0, pre-check=0'
         controller.headers['Cache-Control'] = cc
       end
-      @meteor_strike ||= 0 and @meteor_strike += 1
+      @meteor_strike = controller.install_meteor_strike
       config = Meteor::config
       server = Meteor::server
       shooting_star_uri = "#{server}/#{channel}"
@@ -27,17 +27,19 @@ module MeteorStrike
         shooting_star_uri = [subdomain, shooting_star_uri].join('.')
       end
       uri = url_for(:only_path => false).split('/')[0..2].join('/')
-      uid = options[:uid] ? CGI.escape(options[:uid].to_s) : ''
+      uid = options[:uid] ? options[:uid].to_s : ''
+      escaped_uid = CGI.escape(uid)
       tags = options[:tag] || []
       tag = tags.map{|i| CGI.escape(i.to_s)}.join(',')
       update_uri = "#{uri}/meteor/update"
-      sig = Meteor.shooter.signature
+      now = Time.now
+      sig = "%d%06d" % [now.tv_sec, now.tv_usec]
       iframe_id = "meteor-strike-#{@meteor_strike}"
       host_port = (server.split(':') << '80')[0..1].join(':')
-      flash_vars = ["channel=#{channel}", "tag=#{tag}", "uid=#{uid}",
+      flash_vars = ["channel=#{channel}", "tag=#{tag}", "uid=#{escaped_uid}",
         "sig=#{sig}", "base_uri=#{uri}", "server=#{host_port}",
-        "heartbeat=#{options[:heartbeat]}", "debug=#{options[:debug].to_json}"
-      ].join('&')
+        "heartbeat=#{options[:heartbeat]}", "debug=#{options[:debug].to_json}",
+        "meteor_strike_id=#{@meteor_strike}"].join('&')
       unless options[:noflash]
         @flash_html = render :use_full_path => false,
           :file => File.join(PLUGIN_ROOT, 'views/flash.rhtml'),

data/vendor/plugins/meteor_strike/lib/meteor_strike.rb

@@ -1,5 +1,9 @@
+require 'meteor_strike/controller'
 require 'meteor_strike/helper'
+require 'action_controller'
 
 module MeteorStrike
   PLUGIN_ROOT = File.join(File.dirname(__FILE__), '..')
 end
+
+ActionController::Base.__send__ :include, MeteorStrike::Controller

data/vendor/plugins/meteor_strike/tasks/meteor_strike.rake

@@ -0,0 +1,7 @@
+namespace :meteor_strike do
+  desc 'Update meteor_strike plugin'
+  task :update do
+    sh 'shooting_star init'
+    sh './script/generate meteor -f'
+  end
+end

data/vendor/plugins/meteor_strike/views/xhr.rhtml

@@ -11,6 +11,7 @@
     <input name="tag" /><input name="uid" /><input name="sig" />
     <input name="heartbeat" value="<%= options[:heartbeat] %>" />
   </form>
+  <div id="<%= iframe_id %>-flash"></div>
   <%= javascript_tag %Q{
     var meteorStrike = meteorStrike || $H();
     meteorStrike.getFlashVersion = function(){
@@ -41,40 +42,53 @@
         return $A(tags).uniq().map(encode).join(',');
       };
       var ms = meteorStrike[channel] = meteorStrike[channel] || new Object;
-      Event.observe(window, 'load', function(){
-        ms.getTags = function(){return TAGS};
-        ms.getUid = function(){return UID};
-        ms.execute = function(js){eval(js)};
-        ms.event = function(params){
-          if(params.event == 'init'){
-            if(ms.connection) return Element.remove('#{iframe_id}');
-            ms.connection = params.type;
+      ms.getTags = function(){return TAGS};
+      ms.getUid = function(){return UID};
+      ms.executionQueue = {};
+      ms.executionCounter = 0;
+      ms.evaluate = function(js, serialId){
+        ms.executionQueue[serialId] = js;
+        if(serialId == ms.executionCounter){
+          while(js = ms.executionQueue[ms.executionCounter]){
+            eval(js);
+            delete ms.executionQueue[ms.executionCounter];
+            ++ms.executionCounter;
           }
-          (function(){#{options[:event]}})();
-        };
-        ms.update = function(uid, tags){
-          new Ajax.Request(#{update_uri.to_json}, {postBody: $H({
-            channel: channel, uid: uid || UID,
-            tag: encodeTags(tags || TAGS), sig: #{sig.to_json}
-          }).toQueryString(), asynchronous: true});
-          UID = uid, TAGS = tags;
-        };
-        ms.tuneIn = function(tags){
-          ms.update(UID, TAGS.concat(tags || []).uniq());
-        };
-        ms.tuneOut = function(tags){
-          ms.update(UID, Array.prototype.without.apply(TAGS, tags));
-        };
-        ms.tuneInOut = function(tagsIn, tagsOut){
-          var tags = TAGS.concat(tagsIn || []).uniq();
-          ms.update(UID, Array.prototype.without.apply(tags, tagsOut));
-        };
-        ms.tuneOutIn = function(tagsOut, tagsIn){
-          var tags = Array.prototype.without.apply(TAGS, tagsOut);
-          ms.update(UID, tags.concat(tagsIn || []).uniq());
-        };
-        setTimeout(ms.connector = function(){ 
+        }
+      };
+      ms.event = function(params){
+        if(params.event == 'init'){
           if(ms.connection) return;
+          if(ms.connecting && ms.connecting != params.type) return;
+          ms.connection = params.type;
+        }
+        (function(){#{options[:event]}})();
+      };
+      ms.update = function(uid, tags){
+        new Ajax.Request(#{update_uri.to_json}, {postBody: $H({
+          channel: channel, uid: uid || UID,
+          tag: encodeTags(tags || TAGS), sig: #{sig.to_json}
+        }).toQueryString(), asynchronous: true});
+        UID = uid, TAGS = tags;
+      };
+      ms.tuneIn = function(tags){
+        ms.update(UID, TAGS.concat(tags || []).uniq());
+      };
+      ms.tuneOut = function(tags){
+        ms.update(UID, Array.prototype.without.apply(TAGS, tags));
+      };
+      ms.tuneInOut = function(tagsIn, tagsOut){
+        var tags = TAGS.concat(tagsIn || []).uniq();
+        ms.update(UID, Array.prototype.without.apply(tags, tagsOut));
+      };
+      ms.tuneOutIn = function(tagsOut, tagsIn){
+        var tags = Array.prototype.without.apply(TAGS, tagsOut);
+        ms.update(UID, tags.concat(tagsIn || []).uniq());
+      };
+      Event.observe(window, 'load', function(){
+        setTimeout(ms.connector = function(){
+          if(ms.connection) return;
+          if(ms.connecting && ms.connecting != 'xhr') return;
           var form = $("#{iframe_id}-form");
           form.uid.value = #{uid.to_json};
           form.tag.value = #{tag.to_json};
@@ -88,26 +102,23 @@
     function meteor_strike_#{@meteor_strike}_DoFSCommand(command, args){
       var ms = meteorStrike[#{channel.to_json}];
       switch(command){
-      case 'execute': ms.execute(args); break;
+      case 'execute':
+        if(ms.connection == 'flash' || ms.connecting == 'flash') eval(args);
+        else if($('#{iframe_id}-flash')) Element.remove('#{iframe_id}-flash');
+        break;
       case 'event':
-        if(args == 'connect') ms.event({event: 'init', type: 'flash'});
+        switch(args){
+        case 'connect': // intercept xhr connection
+          ms.connecting = 'flash';
+          if(ms.connection != 'flash') ms.connection = null;
+          if($('#{iframe_id}')) Element.remove('#{iframe_id}');
+          break;
+        }
         break;
       }
     }
-    if(navigator.appName && navigator.appName.indexOf("Microsoft") != -1 &&
-      navigator.userAgent.indexOf("Windows") != -1 &&
-      navigator.userAgent.indexOf("Windows 3.1") == -1){
-      document.write([
-        '<script language="VBScript"\\>',
-        'On Error Resume Next',
-        ['Sub meteor_strike_', #{@meteor_strike},
-         '_FSCommand(ByVal command, ByVal args)'].join(''),
-        ['  Call meteor_strike_', #{@meteor_strike},
-         '_DoFSCommand(command, args)'].join(''),
-        'End Sub', '</script\\>'].join(#{"\n".to_json}));
-    }
     if(meteorStrike.getFlashVersion() >= 6){
-      document.write(#{@flash_html.to_json});
+      $('#{iframe_id}-flash').innerHTML = #{@flash_html.to_json};
     }
   } %>
 </div>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.4
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 3.2.1
-date: 2007-08-09 00:00:00 +09:00
+  version: 3.2.2
+date: 2007-08-30 00:00:00 +09:00
 summary: Our goal is development of practical comet server which will be achieving over 100,000 simultaneous connections per host. On this purpose, we abandon portability and use system calls depending on particular OS such as epoll and kqueue.
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - Rakefile
 - bin/shooting_star
 - lib/shooting_star.rb
+- lib/shooting_star/version.rb
 - lib/shooting_star/server.rb
 - lib/shooting_star/shooter.rb
 - lib/shooting_star/channel.rb
@@ -58,9 +59,12 @@ files:
 - vendor/plugins/meteor_strike/lib/meteor_strike.rb
 - vendor/plugins/meteor_strike/lib/meteor_strike
 - vendor/plugins/meteor_strike/lib/meteor_strike/helper.rb
+- vendor/plugins/meteor_strike/lib/meteor_strike/controller.rb
 - vendor/plugins/meteor_strike/views
 - vendor/plugins/meteor_strike/views/xhr.rhtml
 - vendor/plugins/meteor_strike/views/flash.rhtml
+- vendor/plugins/meteor_strike/tasks
+- vendor/plugins/meteor_strike/tasks/meteor_strike.rake
 - vendor/plugins/meteor_strike/test
 - vendor/plugins/meteor_strike/test/meteor_strike_test.rb
 - vendor/plugins/meteor_strike/generators
@@ -125,5 +129,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: