shooting_star 1.0.5 → 2.0.0

data/History.txt

@@ -1,3 +1,13 @@
+*** 2.0.0 / 2007-05-07
++ 2 major enhancements:
+  + Comet server clustering.
+  + Arbitrary subdomain acceptance.
++ 4 minor enhancements:
+  + Unlimited use of tags.
+  + Detailed error reporting.
+  + All exceptions came to be caught.
+  + Cooperated with ruby's threading mechanism.
+
 *** 1.0.5 / 2007-04-18
 + 2 minor enhancements:
   + Added signature to log.

data/ext/asteroid.c

@@ -239,8 +239,11 @@ static VALUE asteroid_server_write_and_close(VALUE Self){
 
 int dispatch(){
   int i, s, len;
-  // We need to wait at least 1 millisecond to avoid busy loop.
-  while((s = asteroid_poll_wait(epoll_fd, events, EVENT_BUF_SIZE, 1)) > 0){
+  while(1){
+    TRAP_BEG;
+    s = asteroid_poll_wait(epoll_fd, events, EVENT_BUF_SIZE, -1);
+    TRAP_END;
+    if(s <= 0) break;
     for(i = 0; i < s; ++i){
       asteroid_poll_event_t event = events[i];
       int fd = AST_POLL_EVENT_SOCK(&event);

data/lib/shooting_star.rb

@@ -7,7 +7,7 @@ require 'shooting_star/config'
 require 'shooting_star/shooter'
 
 module ShootingStar
-  VERSION = '1.0.5'
+  VERSION = '2.0.0'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
     :pid_file => 'log/shooting_star.pid',

data/lib/shooting_star/server.rb

@@ -9,6 +9,8 @@ module ShootingStar
   # The module which will be included by servant who was born in the Asteroid.
   # This idea is from EventMachine.
   module Server
+    class MethodNotAcceptable < StandardError; end
+
     attr_reader :signature
     @@servers = {}
     @@uids = {}
@@ -24,7 +26,54 @@ module ShootingStar
     # receive the data sent from client.
     def receive_data(data)
       @data += data
-      response if @data[-4..-1] == "\r\n\r\n"
+      header, body = @data.split(/\n\n|\r\r|\n\r\n\r|\r\n\r\n/, 2)
+      return unless body
+      data = @data
+      headers = header.split(/[\n\r]+/)
+      head = headers.shift
+      method, path, protocol = head.split(/\s+/)
+      raise MethodNotAcceptable unless method.downcase == 'post'
+      # recognize header
+      hdr = headers.inject({}) do |hash, line|
+        key, value = line.split(/ *?: */, 2)
+        hash[key.downcase] = value if key
+        hash
+      end
+      # check data arrival
+      return if body.length < hdr['content-length'].to_i
+      @data = ''
+      # recognize parameter
+      @params = Hash.new
+      body.split('&').each do |item|
+        key, value = item.split('=', 2)
+        @params[key] = CGI.unescape(value) if value && value.length > 0
+      end
+      # load or create session informations
+      @signature ||= @params['sig']
+      @channel ||= path[1..-1].split('?', 2)[0]
+      @query = "channel=#{@channel}&sig=#{@signature}"
+      # process verb
+      unless @params['__t__']
+        make_connection(path)
+      else
+        unless Channel[@channel]
+          Channel.new(@channel)
+          log "Channel opened: #{@channel}"
+        end
+        unless @@servers[@signature] || @params['__t__'] == 'rc'
+          notify(:event => :enter, :uid => @uid, :tag => @tag)
+          log "Connected: #{@uid}"
+        end
+        @uid = @@uids[@signature] ||= @params['uid']
+        @tag = @@tags[@signature] ||=
+          (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
+        @executing = @@executings[@signature] ||= Hash.new
+        @@servers[@signature] = self
+        wait_for
+      end
+    rescue Exception => e
+      log "ERROR: #{e.message}\n#{e.backtrace.join("\n")}\n#{data}"
+      write_and_close
     end
 
     # detect disconnection from the client and clean it up.
@@ -91,7 +140,7 @@ module ShootingStar
     def uid; @@uids[@signature] end
     def tag; @@tags[@signature] end
 
-    # an accessor which maps signatures to servers.
+    # accessor which maps signatures to servers.
     def self.[](signature)
       @@servers[signature]
     end
@@ -105,7 +154,7 @@ module ShootingStar
       Time.now - @committed_at > ShootingStar::CONFIG.session_timeout
     end
 
-    # broadcast an event to clients.
+    # broadcast event to clients.
     def notify(params = {})
       return unless Channel[@channel]
       event_id = ShootingStar::timestamp
@@ -123,57 +172,6 @@ module ShootingStar
       @waiting = true
     end
 
-    # give a response to the request or keep them waiting.
-    def response
-      headers = @data.split("\n")
-      head = headers.shift
-      method, path, protocol = head.split(/\s+/)
-      # recognize header
-      hdr = headers.inject({}) do |hash, line|
-        key, value = line.chop.split(/ *?: */, 2)
-        hash[key.downcase] = value if key
-        hash
-      end
-      # recognize parameter
-      @params = Hash.new
-      if @query = path.split('?', 2)[1]
-        if @query = @query.split('#', 2)[0]
-          @query.split('&').each do |item|
-            key, value = item.split('=', 2)
-            @params[key] = CGI.unescape(value) if value && value.length > 0
-          end
-        end
-      end
-      # load or create session informations
-      @signature ||= @params['sig']
-      @channel ||= path[1..-1].split('?', 2)[0]
-      @query = "channel=#{@channel}&sig=#{@signature}"
-      # process verb
-      if method == 'GET'
-        make_connection(path)
-      else
-        unless Channel[@channel]
-          Channel.new(@channel)
-          log "Channel opened: #{@channel}"
-        end
-        unless @@servers[@signature] || @params['__t__'] == 'rc'
-          notify(:event => :enter, :uid => @uid, :tag => @tag)
-          log "Connected: #{@uid}"
-        end
-        @uid = @@uids[@signature] ||= @params['uid']
-        @tag = @@tags[@signature] ||=
-          (@params['tag'] || '').split(',').map{|i| CGI.unescape(i)}
-        @executing = @@executings[@signature] ||= Hash.new
-        @@servers[@signature] = self
-        wait_for
-      end
-    rescue
-      log "ERROR: #{$!.pretty_print}\n#{@data}"
-      raise
-    ensure
-      @data = ''
-    end
-
     # add execution line to the buffer.
     def execute(id, params)
       sweep_timeout = ShootingStar::CONFIG.sweep_timeout
@@ -185,33 +183,36 @@ module ShootingStar
         var iframe = document.createElement('iframe');
         var remove = function(){document.body.removeChild(iframe)};
         var timer = setTimeout(remove, #{sweep_timeout});
-        iframe.onload = function(){clearTimeout(timer); setTimeout(remove, 0)};
-        document.body.appendChild(iframe);
+        iframe.onload = function(){
+          clearTimeout(timer);
+          setTimeout(remove, 0);
+        };
         iframe.src = '#{@params['execute']}/#{id}?#{query}';
+        document.body.appendChild(iframe);
       })();
       EOH
     end
 
     # make client connect us.
     def make_connection(path)
-      path.sub!(%r[\&__ts__=.*$], '&__ts__=')
+      #path.sub!(%r[\&__ts__=.*$], '&__ts__=')
       assets = URI.parse(@params['execute'])
       assets.path = '/javascripts/prototype.js'
       assets.query = assets.fragment = nil
+
       send_data "HTTP/1.1 200 OK\nContent-Type: text/html\n\n" +
       <<-"EOH"
       <html><head><script type="text/javascript" src="#{assets}"></script>
       <script type="text/javascript">
       //<![CDATA[
       var connect = function(reconnect)
-      { var request = new Ajax.Request([#{path.to_json},
-            new Number(new Date()).toString(32),
-            reconnect && '&__t__=rc'
-          ].join(''),
+      { var body = $H(#{@params.to_json});
+        body.__t__ = reconnect ? 'rc' : 'c';
+        var request = new Ajax.Request(#{path.to_json},
           {evalScript: true, onComplete: function(xhr){
             setTimeout(function(){connect(true)},
               xhr.getResponseHeader('Content-Type') ? 0 : 1000);
-          }});
+          }, postBody: body.toQueryString()});
         var disconnect = function()
         { request.options.onComplete = function(){};
           request.transport.abort();
@@ -222,7 +223,7 @@ module ShootingStar
       //]]>
       </script></head><body></body></html>
       EOH
-    rescue
+    rescue Exception
     ensure
       write_and_close
     end

data/lib/shooting_star/shooter.rb

@@ -42,7 +42,7 @@ module ShootingStar
 
     def executed(sig, id)
       ::ShootingStar::Server[sig].executed(id)
-    rescue
+    rescue Exception
     end
 
   private

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

@@ -10,7 +10,7 @@ class MeteorController < ApplicationController
       @javascript = meteor.javascript
     else
       @javascript = %Q[setTimeout(function(){
-        meteorStrike.event[#{@channel.to_json}](#{params.to_json});}, 0);]
+        meteorStrike[#{@channel.to_json}].event(#{params.to_json});}, 0);]
     end
   end
 

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

@@ -1,9 +1,43 @@
 require 'drb/drb'
 
 class Meteor < ActiveRecord::Base
+  class Shooter
+    COUNTERS = [:count, :count_with]
+    LISTINGS = [:listeners, :listeners_with, :channels, :signatures]
+
+    def initialize(config)
+      uris = config['shooting_star']['shooter']
+      @shooters = [uris].flatten.map{|uri| DRbObject.new_with_uri(uri)}
+    end
+
+    COUNTERS.each do |m|
+      define_method(m){|*a| call(m, *a).inject(0){|r,c| r += c}}
+    end
+
+    LISTINGS.each do |m|
+      define_method(m){|*a| call(m, *a).inject([]){|r,c| r.concat c}}
+    end
+
+    def method_missing(method, *args, &block)
+      call(method, *args, &block).first
+    end
+
+  private
+    def call(method, *args, &block)
+      @shooters.inject([]) do |result, shooter|
+        begin
+          result << shooter.__send__(method, *args, &block)
+        rescue Exception => e
+          logger.error "#{e.message}\n#{e.backtrace.join("\n")}"
+        ensure
+          result
+        end
+      end
+    end
+  end
+
   def self.shooter
-    @@shooter ||= DRbObject.new_with_uri(
-      configurations[RAILS_ENV]['shooting_star']['shooter'])
+    @@shooter ||= ::Meteor::Shooter.new(configurations[RAILS_ENV])
   end
 
   def self.shoot(channel, javascript, tag = [])

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

@@ -4,7 +4,7 @@
 (function(){
   var channel = #{@channel.to_json};
   var javascript = #{@javascript.to_json};
-  var meteorStrike = parent.parent.meteorStrike;
+  var meteorStrike = parent.parent.meteorStrike[channel];
   if(meteorStrike) meteorStrike.execute(javascript);
   else alert('Connection is not established to the ShootingStar server.');
 })();

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

@@ -16,21 +16,37 @@ module MeteorStrike
         cc += 'no-store, no-cache, must-revalidate, max-age=0, '
         cc += 'post-check=0, pre-check=0'
         controller.headers['Cache-Control'] = cc
-        @meteor_strike = true
+        @meteor_strike = 0
+      end
+      @meteor_strike += 1
+      config = ActiveRecord::Base.configurations[RAILS_ENV]['shooting_star']
+      server = config['server'].kind_of?(Array) ?
+        config['server'][rand(config['server'].length)] : config['server']
+      shooting_star_uri = "#{server}/#{channel}"
+      if config['random_subdomain'] && /[A-z]/ === server
+        subdomain = (1..6).map{(rand(26)+?a).chr}.to_s
+        shooting_star_uri = [subdomain, shooting_star_uri].join('.')
       end
-      config = ActiveRecord::Base.configurations[RAILS_ENV]
-      shooting_star_uri = "#{config['shooting_star']['server']}/#{channel}"
       uri = url_for(:only_path => false).split('/')[0..2].join('/')
       uid = options[:uid] ? CGI.escape(options[:uid].to_s) : ''
       tags = options[:tag] || []
       tag = tags.map{|i| CGI.escape(i.to_s)}.join(',')
-      base_uri = "http://#{shooting_star_uri}?execute=#{uri}/meteor/strike"
       update_uri = "#{uri}/meteor/update"
       sig = Meteor.shooter.signature
+      iframe_id = "meteor-strike-#{@meteor_strike}"
+      iframe_body = <<-"EOH"
+      EOH
       <<-"EOH"
+      <div style="position: absolute; top: -99999px; left: -99999px">
+      <iframe id="#{iframe_id}" name="#{iframe_id}"></iframe>
+      <form id="#{iframe_id}-form" target="#{iframe_id}" method="POST"
+        action="http://#{shooting_star_uri}">
+        <input name="execute" value="#{uri}/meteor/strike" />
+        <input name="tag" /><input name="uid" /><input name="sig" />
+      </form></div>
       <script type="text/javascript">
       //<![CDATA[
-      var meteorStrike;
+      var meteorStrike = meteorStrike || $H();
       Event.observe(window, 'load', function(){
         var channel = #{channel.to_json};
         var UID = #{uid.to_json}, TAGS = #{tags.to_json};
@@ -38,33 +54,29 @@ module MeteorStrike
           var encode = function(i){return encodeURIComponent(i)};
           return $A(tags).uniq().map(encode).join(',');
         };
-        meteorStrike = meteorStrike || new Object;
-        meteorStrike.execute = function(js){eval(js)};
-        meteorStrike.event = meteorStrike.event || $H();
-        meteorStrike.event[channel] = function(params){#{options[:event]}};
-        meteorStrike.update = function(uid, tags){
-          new Ajax.Request([#{update_uri.to_json},
-            '?channel=', channel,
-            '&uid=', uid || UID,
-            '&tag=', encodeTags(tags || TAGS),
-            '&sig=', #{sig.to_json}].join(''));
+        var ms = meteorStrike[channel] = meteorStrike[channel] || new Object;
+        ms.getTags = function(){return TAGS};
+        ms.execute = function(js){eval(js)};
+        ms.event = function(params){#{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: false});
           UID = uid, TAGS = tags;
         };
-        meteorStrike.tuneIn = function(tags){
-          meteorStrike.update(UID, TAGS.concat(tags).uniq());
+        ms.tuneIn = function(tags){
+          ms.update(UID, TAGS.concat(tags || []).uniq());
         };
-        meteorStrike.tuneOut = function(tags){
-          meteorStrike.update(UID, Array.prototype.without.apply(TAGS, tags));
+        ms.tuneOut = function(tags){
+          ms.update(UID, Array.prototype.without.apply(TAGS, tags));
         };
         setTimeout(function(){ 
-          var iframe = document.createElement('iframe');
-          iframe.src = ["#{base_uri}&uid=#{uid}&tag=#{tag}&sig=#{sig}",
-            '&__ts__=', new Number(new Date()).toString(32)].join('');
-          iframe.frameborder = "0";
-          iframe.width = "0";
-          iframe.height = "0";
-          iframe.style.border = '0px';
-          document.body.appendChild(iframe);
+          var form = $("#{iframe_id}-form");
+          form.uid.value = #{uid.to_json};
+          form.tag.value = #{tag.to_json};
+          form.sig.value = #{sig.to_json};
+          form.submit();
           setTimeout(function(){#{options[:connected]}}, 0);
         }, 0);
       });

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2007-04-17 00:00:00 +09:00
+  version: 2.0.0
+date: 2007-05-03 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