goat 0.2.3 → 0.2.4

data/lib/goat.rb

@@ -204,9 +204,10 @@ module Goat
   class ChannelPusher
     include EM::Deferrable
 
-    def initialize(channel)
+    def initialize(channel, jsonp)
       @channel = channel
       @finished = false
+      @jsonp = jsonp
       @messages = []
 
       self.errback do
@@ -245,7 +246,7 @@ module Goat
 
     def send_and_finish
       return if @finished # may be called several times
-      @body_callback.call({'messages' => messages_without_duplicates}.to_json)
+      @body_callback.call("#{@jsonp}(#{{'messages' => messages_without_duplicates}.to_json})")
       succeed
     end
 
@@ -587,16 +588,21 @@ module Goat
 
     def handle_channel(req)
       id = req['_id']
+      jsonp = req['jsonp']
       pg = active_pages[id]
       
       active_page_gc # we do GC here since a slight delay in opening channel is better than in loading page
       
+      if !jsonp
+        respond_failed
+      end
+      
       if pg
         pg.mark_alive!
-        body = ChannelPusher.new(pg.channel)
+        body = ChannelPusher.new(pg.channel, jsonp)
 
         EM.next_tick do
-          req.env['async.callback'].call([200, {}, body])
+          req.env['async.callback'].call([200, {'Content-Type' => 'application/javascript'}, body])
         end
         
         body.callback { pg.mark_dead! }

data/lib/goat/goat.js

@@ -70,14 +70,12 @@ $.extend(Goat, {
   },
 
   channelDataReceived: function(data) {
-    if(data == "") {
+    if(!data) {
+      console.log("Null data received in channelDataReceived")
       this.reopenChannel();
       return;
     }
-
-    // console.warn("channel data: " + data);
-    data = $.evalJSON(data);
-
+    
     this.channelOpenFails = 0;
     
     if(this.messageReceivedDelegate)
@@ -85,7 +83,6 @@ $.extend(Goat, {
 
     if(data['messages']) {
       $(data['messages']).each(this.closure(function(i, m) { this.messageReceived(m) }));
-      this.openChannel();
     } else {
       console.error("Bad channel data: " + data)
     }
@@ -94,35 +91,50 @@ $.extend(Goat, {
   reopenChannel: function() {
     console.log("reopenChannel()");
     var fails = this.channelOpenFails;
-    setTimeout(function() { Goat.openChannel(); }, (fails > 20) ? 20000 : (fails * 500));
+    setTimeout(function() { Goat.openChannel(); }, Math.min(30000, Math.pow(1.5, fails)));
     this.channelOpenFails++;
   },
 
   openChannel: function() {
     console.log("opening channel");
-
+    
     if(this.activeChannel) {
       console.error("can't open channel: channel already open");
       return;
     }
-
-    this.activeChannel = $.ajax({
-      url: '/channel',
-      async: true,
-      data: {_id: Goat.page_id},
-      cache: false,
-      timeout: 1000000,
-      success: this.closure(function(data) {
-        this.activeChannel = null;
-        this.channelDataReceived(data);
-      }),
-      error: this.closure(function(req, status, err) {
+    
+    var head = document.getElementsByTagName('head')[0];
+    var scriptTag = document.createElement('script');
+    var jsonp = 'jsonp' + Math.random().toString(16).split(".").pop();
+
+    var cleanup = closure(this, function() {
+      window[jsonp] = null;
+      if(scriptTag && scriptTag.parentNode) {
+        scriptTag.parentNode.removeChild(scriptTag);
         this.activeChannel = null;
-        console.error("ajax channel error");
-        console.error({req: req, status: status, err: err});
-        this.reopenChannel();
-      })
+      }
     });
+            
+    window[jsonp] = closure(this, function(data) { cleanup(); this.channelDataReceived(data); })
+    
+    function injectScriptTag(tag) {
+      
+      var logError = closure(this, function() {
+        console.error("Goat: error loading " + src);
+      });
+      
+      var src = '/channel?_id=' + Goat.page_id + '&jsonp=' + jsonp;
+      
+      scriptTag.addEventListener('load', function() { cleanup(); Goat.reopenChannel(); }, false);
+      scriptTag.addEventListener('error', function() { cleanup(); logError(); Goat.reopenChannel(); }, false);
+      scriptTag.src = src;
+      
+      Goat.activeChannel = scriptTag;
+      
+      head.insertBefore(scriptTag, head.children[0]);
+    }
+    
+    injectScriptTag();
   },
 
   submitForm: function(id) {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Patrick Collison