message_bus 2.0.0.beta.8 → 2.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e783040a809c36cf22fa4240a6c563c0b77445
-  data.tar.gz: 4c1912ddfd8af23adcab074d340094e32721528d
+  metadata.gz: 0974fc7ea256d61e7ecd1b72b3f01413e1fc23b5
+  data.tar.gz: e2c501cfdefd50eebdf55e2ac2b2c097e235cbb0
 SHA512:
-  metadata.gz: 7e4343488e590e4eb1270e2ba8c22b02d2e9b282be80fe79d606a8dce375ff90317abaccea16cf6f90350569a5be1e0daa1b9345f21253d522d42660091ff95c
-  data.tar.gz: 821d8f2fe45aef0dd014cc0315761e4b9bbc4eb47a0f8d67f5e323c8ebf302d7b8fc996bb01ad443f6f16ba1c1d5b421c92216eca85e31e8755618b645b889ce
+  metadata.gz: abd739f0d8bb295cc06c953f90bf8e3b0f12e5f493830c2cd1cebbce3e448deff78f65e06bec78b294740703772f81a772196e6f92bcf2b5fd2911b8fb0e358e
+  data.tar.gz: 48eb3572114789e6d8665d8c09987501f593fccbc03cfbd708349b300428aee081ae0effee0d865ec3415f381d15d92808295a6a2ec0e461bdabec48feaa7c2d

data/CHANGELOG

@@ -1,3 +1,8 @@
+11-05-2016
+
+- Version 2.0.0.beta.8
+- Fix: requests without content type were erroring out, breaks CORS
+
 27-04-2016
 
 - Version 2.0.0.beta.7

data/README.md

@@ -71,6 +71,10 @@ MessageBus.publish "/channel", "hello", client_ids: ["XXX","YYY"]
 # message bus determines the user ids and groups based on env
 
 MessageBus.configure(user_id_lookup: proc do |env|
+  # this lookup occurs on JS-client poolings, so that server can retrieve backlog 
+  # for the client considering/matching/filtering user_ids set on published messages
+  # if user_id is not set on publish time, any user_id returned here will receive the message
+  
   # return the user id here
 end)
 

data/lib/message_bus/backends/postgres.rb

@@ -184,7 +184,7 @@ class MessageBus::Postgres::Client
 
     conn.exec 'PREPARE insert_message AS INSERT INTO message_bus (channel, value) VALUES ($1, $2) RETURNING id'
     conn.exec 'PREPARE clear_global_backlog AS DELETE FROM message_bus WHERE (id <= $1)'
-    conn.exec 'PREPARE clear_channel_backlog AS DELETE FROM message_bus WHERE ((channel = $1) AND (id <= (SELECT id FROM message_bus WHERE ((channel = $1) AND (id <= $2)) ORDER BY id DESC OFFSET $3)))'
+    conn.exec 'PREPARE clear_channel_backlog AS DELETE FROM message_bus WHERE ((channel = $1) AND (id <= (SELECT id FROM message_bus WHERE ((channel = $1) AND (id <= $2)) ORDER BY id DESC LIMIT 1 OFFSET $3)))'
     conn.exec 'PREPARE channel_backlog AS SELECT id, value FROM message_bus WHERE ((channel = $1) AND (id > $2)) ORDER BY id'
     conn.exec 'PREPARE global_backlog AS SELECT id, channel, value FROM message_bus WHERE (id > $1) ORDER BY id'
     conn.exec "PREPARE expire AS DELETE FROM message_bus WHERE added_at < CURRENT_TIMESTAMP - ($1::text || ' seconds')::interval"

data/lib/message_bus/rack/middleware.rb

@@ -95,7 +95,8 @@ class MessageBus::Rack::Middleware
       end
     else
       request = Rack::Request.new(env)
-      data = request.content_type.include?('application/json') ? JSON.parse(request.body.read) : request.POST
+      is_json = request.content_type && request.content_type.include?('application/json')
+      data = is_json ? JSON.parse(request.body.read) : request.POST
       data.each do |k,v|
         if k == "__seq".freeze
           client.seq = v.to_i

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "2.0.0.beta.8"
+  VERSION = "2.0.0.beta.9"
 end

data/vendor/assets/javascripts/message-bus-ajax.js

@@ -0,0 +1 @@
+../../../assets/message-bus-ajax.js

data/vendor/assets/javascripts/message-bus.js

@@ -0,0 +1 @@
+../../../assets/message-bus.js

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.8
+  version: 2.0.0.beta.9
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ''

data/vendor/assets/javascripts/message-bus-ajax.js

@@ -1,44 +0,0 @@
-// A bare-bones implementation of $.ajax that MessageBus will use
-// as a fallback if jQuery is not present
-//
-// Only implements methods & options used by MessageBus
-(function(global, undefined) {
-  'use strict';
-  if (!global.MessageBus){
-      throw new Error("MessageBus must be loaded before the ajax adapter");
-  }
-
-  var cacheBuster =  Math.random() * 10000 | 0;
-
-  global.MessageBus.ajax = function(options){
-    var XHRImpl = (global.MessageBus && global.MessageBus.xhrImplementation) || global.XMLHttpRequest;
-    var xhr = new XHRImpl();
-    xhr.dataType = options.dataType;
-    var url = options.url;
-    if (!options.cache){
-      url += ((-1 == url.indexOf('?')) ? '?' : '&') + '_=' + (cacheBuster++)
-    }
-    xhr.open('POST', url);
-    for (var name in options.headers){
-      xhr.setRequestHeader(name, options.headers[name]);
-    }
-    xhr.setRequestHeader('Content-Type', 'application/json');
-    if (options.messageBus.chunked){
-      options.messageBus.onProgressListener(xhr);
-    }
-    xhr.onreadystatechange = function(){
-      if (xhr.readyState === 4){
-        var status = xhr.status;
-        if (status >= 200 && status < 300 || status === 304){
-          options.success(xhr.responseText);
-        } else {
-          options.error(xhr, xhr.statusText);
-        }
-        options.complete();
-      }
-    }
-    xhr.send(JSON.stringify(options.data));
-    return xhr;
-  };
-
-})(window);

data/vendor/assets/javascripts/message-bus.js

@@ -1,418 +0,0 @@
-/*jshint bitwise: false*/
-(function(global, document, undefined) {
-  'use strict';
-  var previousMessageBus = global.MessageBus;
-
-  // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
-  var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
-  var me, started, stopped, longPoller, pollTimeout, paused, later, jQuery, interval, chunkedBackoff;
-
-  uniqueId = function() {
-    return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r, v;
-      r = Math.random() * 16 | 0;
-      v = c === 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
-  };
-
-  clientId = uniqueId();
-  responseCallbacks = {};
-  callbacks = [];
-  queue = [];
-  interval = null;
-  failCount = 0;
-  baseUrl = "/";
-  paused = false;
-  later = [];
-  chunkedBackoff = 0;
-  jQuery = global.jQuery;
-  var hiddenProperty;
-
-  (function(){
-    var prefixes = ["","webkit","ms","moz"];
-    for(var i=0; i<prefixes.length; i++) {
-      var prefix = prefixes[i];
-      var check = prefix + (prefix === "" ? "hidden" : "Hidden");
-      if(document[check] !== undefined ){
-        hiddenProperty = check;
-      }
-    }
-  })();
-
-  var isHidden = function() {
-    if (hiddenProperty !== undefined){
-      return document[hiddenProperty];
-    } else {
-      return !document.hasFocus;
-    }
-  };
-
-  var hasonprogress = (new XMLHttpRequest()).onprogress === null;
-  var allowChunked = function(){
-    return me.enableChunkedEncoding && hasonprogress;
-  };
-
-  shouldLongPoll = function() {
-    return me.alwaysLongPoll || !isHidden();
-  };
-
-  var totalAjaxFailures = 0;
-  var totalAjaxCalls = 0;
-  var lastAjax;
-
-  var processMessages = function(messages) {
-    var gotData = false;
-    if (!messages) return false; // server unexpectedly closed connection
-
-    for (var i=0; i<messages.length; i++) {
-      var message = messages[i];
-      gotData = true;
-      for (var j=0; j<callbacks.length; j++) {
-        var callback = callbacks[j];
-        if (callback.channel === message.channel) {
-          callback.last_id = message.message_id;
-          try {
-            callback.func(message.data);
-          }
-          catch(e){
-            if(console.log) {
-              console.log("MESSAGE BUS FAIL: callback " + callback.channel +  " caused exception " + e.message);
-            }
-          }
-        }
-        if (message.channel === "/__status") {
-          if (message.data[callback.channel] !== undefined) {
-            callback.last_id = message.data[callback.channel];
-          }
-        }
-      }
-    }
-
-    return gotData;
-  };
-
-  var reqSuccess = function(messages) {
-    failCount = 0;
-    if (paused) {
-      if (messages) {
-        for (var i=0; i<messages.length; i++) {
-          later.push(messages[i]);
-        }
-      }
-    } else {
-      return processMessages(messages);
-    }
-    return false;
-  };
-
-  longPoller = function(poll,data){
-    var gotData = false;
-    var aborted = false;
-    lastAjax = new Date();
-    totalAjaxCalls += 1;
-    data.__seq = totalAjaxCalls;
-
-    var longPoll = shouldLongPoll() && me.enableLongPolling;
-    var chunked = longPoll && allowChunked();
-    if (chunkedBackoff > 0) {
-      chunkedBackoff--;
-      chunked = false;
-    }
-
-    var headers = {
-      'X-SILENCE-LOGGER': 'true'
-    };
-    for (var name in me.headers){
-      headers[name] = me.headers[name];
-    }
-
-    if (!chunked){
-      headers["Dont-Chunk"] = 'true';
-    }
-
-    var dataType = chunked ? "text" : "json";
-
-    var handle_progress = function(payload, position) {
-
-      var separator = "\r\n|\r\n";
-      var endChunk = payload.indexOf(separator, position);
-
-      if (endChunk === -1) {
-        return position;
-      }
-
-      var chunk = payload.substring(position, endChunk);
-      chunk = chunk.replace(/\r\n\|\|\r\n/g, separator);
-
-      try {
-        reqSuccess(JSON.parse(chunk));
-      } catch(e) {
-        if (console.log) {
-          console.log("FAILED TO PARSE CHUNKED REPLY");
-          console.log(data);
-        }
-      }
-
-      return handle_progress(payload, endChunk + separator.length);
-    }
-
-    var disableChunked = function(){
-      if (me.longPoll) {
-        me.longPoll.abort();
-        chunkedBackoff = 30;
-      }
-    };
-
-    var setOnProgressListener = function(xhr) {
-      var position = 0;
-      // if it takes longer than 3000 ms to get first chunk, we have some proxy
-      // this is messing with us, so just backoff from using chunked for now
-      var chunkedTimeout = setTimeout(disableChunked,3000);
-      xhr.onprogress = function () {
-        clearTimeout(chunkedTimeout);
-        if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
-          // not chunked we are sending json back
-          chunked = false;
-          return;
-        }
-        position = handle_progress(xhr.responseText, position);
-      }
-    };
-    if (!me.ajax){
-      throw new Error("Either jQuery or the ajax adapter must be loaded");
-    }
-    var req = me.ajax({
-      url: me.baseUrl + "message-bus/" + me.clientId + "/poll" + (!longPoll ? "?dlp=t" : ""),
-      data: data,
-      cache: false,
-      dataType: dataType,
-      type: 'POST',
-      headers: headers,
-      messageBus: {
-        chunked: chunked,
-        onProgressListener: function(xhr) {
-          var position = 0;
-          // if it takes longer than 3000 ms to get first chunk, we have some proxy
-          // this is messing with us, so just backoff from using chunked for now
-          var chunkedTimeout = setTimeout(disableChunked,3000);
-          return xhr.onprogress = function () {
-            clearTimeout(chunkedTimeout);
-            if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
-              chunked = false; // not chunked, we are sending json back
-            } else {
-              position = handle_progress(xhr.responseText, position);
-            }
-          }
-        }
-      },
-      xhr: function() {
-        var xhr = jQuery.ajaxSettings.xhr();
-        if (!chunked) {
-          return xhr;
-        }
-        this.messageBus.onProgressListener(xhr);
-        return xhr;
-      },
-      success: function(messages) {
-         if (!chunked) {
-           // we may have requested text so jQuery will not parse
-           if (typeof(messages) === "string") {
-             messages = JSON.parse(messages);
-           }
-           gotData = reqSuccess(messages);
-         }
-       },
-      error: function(xhr, textStatus, err) {
-        if(textStatus === "abort") {
-          aborted = true;
-        } else {
-          failCount += 1;
-          totalAjaxFailures += 1;
-        }
-      },
-      complete: function() {
-        var interval;
-        try {
-          if (gotData || aborted) {
-            interval = 100;
-          } else {
-            interval = me.callbackInterval;
-            if (failCount > 2) {
-              interval = interval * failCount;
-            } else if (!shouldLongPoll()) {
-              interval = me.backgroundCallbackInterval;
-            }
-            if (interval > me.maxPollInterval) {
-              interval = me.maxPollInterval;
-            }
-
-            interval -= (new Date() - lastAjax);
-
-            if (interval < 100) {
-              interval = 100;
-            }
-          }
-        } catch(e) {
-          if(console.log && e.message) {
-            console.log("MESSAGE BUS FAIL: " + e.message);
-          }
-        }
-
-        pollTimeout = setTimeout(function(){pollTimeout=null; poll();}, interval);
-        me.longPoll = null;
-      }
-    });
-
-    return req;
-  };
-
-  me = {
-    enableChunkedEncoding: true,
-    enableLongPolling: true,
-    callbackInterval: 15000,
-    backgroundCallbackInterval: 60000,
-    maxPollInterval: 3 * 60 * 1000,
-    callbacks: callbacks,
-    clientId: clientId,
-    alwaysLongPoll: false,
-    baseUrl: baseUrl,
-    headers: {},
-    ajax: (jQuery && jQuery.ajax),
-    noConflict: function(){
-      global.MessageBus = global.MessageBus.previousMessageBus;
-      return this;
-    },
-    diagnostics: function(){
-      console.log("Stopped: " + stopped + " Started: " + started);
-      console.log("Current callbacks");
-      console.log(callbacks);
-      console.log("Total ajax calls: " + totalAjaxCalls + " Recent failure count: " + failCount + " Total failures: " + totalAjaxFailures);
-      console.log("Last ajax call: " + (new Date() - lastAjax) / 1000  + " seconds ago") ;
-    },
-
-    pause: function() {
-      paused = true;
-    },
-
-    resume: function() {
-      paused = false;
-      processMessages(later);
-      later = [];
-    },
-
-    stop: function() {
-      stopped = true;
-      started = false;
-    },
-
-    // Start polling
-    start: function() {
-      var poll, delayPollTimeout;
-
-      if (started) return;
-      started = true;
-      stopped = false;
-
-      poll = function() {
-        var data;
-
-        if(stopped) {
-          return;
-        }
-
-        if (callbacks.length === 0) {
-          if(!delayPollTimeout) {
-            delayPollTimeout = setTimeout(function(){ delayPollTimeout = null; poll();}, 500);
-          }
-          return;
-        }
-
-        data = {};
-        for (var i=0;i<callbacks.length;i++) {
-          data[callbacks[i].channel] = callbacks[i].last_id;
-        }
-
-        me.longPoll = longPoller(poll,data);
-      };
-
-
-      // monitor visibility, issue a new long poll when the page shows
-      if(document.addEventListener && 'hidden' in document){
-        me.visibilityEvent = global.document.addEventListener('visibilitychange', function(){
-          if(!document.hidden && !me.longPoll && pollTimeout){
-            clearTimeout(pollTimeout);
-            pollTimeout = null;
-            poll();
-          }
-        });
-      }
-
-      poll();
-    },
-
-    // Subscribe to a channel
-    subscribe: function(channel, func, lastId) {
-
-      if(!started && !stopped){
-        me.start();
-      }
-
-      if (typeof(lastId) !== "number" || lastId < -1){
-        lastId = -1;
-      }
-      callbacks.push({
-        channel: channel,
-        func: func,
-        last_id: lastId
-      });
-      if (me.longPoll) {
-        me.longPoll.abort();
-      }
-
-      return func;
-    },
-
-    // Unsubscribe from a channel
-    unsubscribe: function(channel, func) {
-      // TODO allow for globbing in the middle of a channel name
-      // like /something/*/something
-      // at the moment we only support globbing /something/*
-      var glob;
-      if (channel.indexOf("*", channel.length - 1) !== -1) {
-        channel = channel.substr(0, channel.length - 1);
-        glob = true;
-      }
-
-      var removed = false;
-
-      for (var i=callbacks.length-1; i>=0; i--) {
-
-        var callback = callbacks[i];
-        var keep;
-
-        if (glob) {
-          keep = callback.channel.substr(0, channel.length) !== channel;
-        } else {
-          keep = callback.channel !== channel;
-        }
-
-        if(!keep && func && callback.func !== func){
-          keep = true;
-        }
-
-        if (!keep) {
-          callbacks.splice(i,1);
-          removed = true;
-        }
-      }
-
-      if (removed && me.longPoll) {
-        me.longPoll.abort();
-      }
-
-      return removed;
-    }
-  };
-  global.MessageBus = me;
-})(window, document);