make the module compatible with socket.io-redis 0.2.0

Author: nkzawa

index.js

@@ -6,7 +6,7 @@
 var client = require('redis').createClient;
 var parser = require('socket.io-parser');
 var hasBin = require('has-binary-data');
-var msgpack = require('msgpack-js').encode;
+var msgpack = require('msgpack-js');
 var debug = require('debug')('socket.io-emitter');
 
 /**
@@ -27,6 +27,14 @@ var flags = [
   'broadcast'
 ];
 
+/**
+ * uid for emitter
+ *
+ * @api private
+ */
+
+var uid = 'emitter';
+
 /**
  * Socket.IO redis based emitter.
  *
@@ -57,7 +65,7 @@ function Emitter(redis, opts){
   }
 
   this.redis = redis;
-  this.key = (opts.key || 'socket.io') + '#emitter';
+  this.prefix = (opts.key || 'socket.io');
 
   this._rooms = [];
   this._flags = {};
@@ -105,10 +113,12 @@ Emitter.prototype.of = function(nsp) {
 /**
  * Send the packet.
  *
- * @api private
+ * @api public
  */
 
 Emitter.prototype.emit = function(){
+  var self = this;
+
   // packet
   var args = Array.prototype.slice.call(arguments);
   var packet = {};
@@ -122,11 +132,22 @@ Emitter.prototype.emit = function(){
     packet.nsp = '/';
   }
 
-  // publish
-  this.redis.publish(this.key, msgpack([packet, {
+  var opts = {
     rooms: this._rooms,
     flags: this._flags
-  }]));
+  };
+  var chn = this.prefix + '#' + packet.nsp + '#';
+  var msg = msgpack.encode([uid, packet, opts]);
+
+  // publish
+  if (opts.rooms && opts.rooms.length) {
+    opts.rooms.forEach(function(room) {
+      var chnRoom = chn + room + '#';
+      self.redis.publish(chnRoom, msg);
+    });
+  } else {
+    this.redis.publish(chn, msg);
+  }
 
   // reset state
   this._rooms = [];

package.json

@@ -6,19 +6,21 @@
     "type": "git",
     "url": "https://github.com/Automattic/socket.io-emitter.git"
   },
+  "scripts": {
+    "test": "make test"
+  },
   "dependencies": {
-    "debug": "0.7.4",
-    "redis": "0.10.1",
+    "debug": "2.2.0",
+    "redis": "2.4.2",
     "msgpack-js": "0.3.0",
-    "has-binary-data": "0.1.1",
-    "socket.io-parser": "2.2.0"
+    "has-binary-data": "0.1.5",
+    "socket.io-parser": "2.2.6"
   },
   "devDependencies": {
-    "mocha": "1.18.1",
+    "mocha": "2.3.4",
     "expect.js": "0.3.1",
-    "socket.io": "1.0.4",
-    "socket.io-client": "1.0.4",
-    "socket.io-redis": "0.1.3",
-    "redis": "0.10.1"
+    "socket.io": "1.3.7",
+    "socket.io-client": "1.3.7",
+    "socket.io-redis": "0.2.0"
   }
 }

test/index.js

@@ -13,7 +13,7 @@ function client(srv, nsp, opts){
   }
   var addr = srv.address();
   if (!addr) addr = srv.listen().address();
-  var url = 'ws://' + addr.address + ':' + addr.port + (nsp || '');
+  var url = 'http://localhost:' + addr.port + (nsp || '');
   return ioc(url, opts);
 }
 
@@ -22,7 +22,7 @@ describe('emitter', function() {
   describe('in namespaces', function(){
     beforeEach(function() {
       var pub = redis.createClient();
-      var sub = redis.createClient(null, null, {detect_buffers: true});
+      var sub = redis.createClient(null, null, {return_buffers: true});
       srv = http();
       var sio = io(srv, {adapter: redisAdapter({pubClient: pub, subClient: sub})});
 
@@ -88,7 +88,7 @@ describe('emitter', function() {
   describe('in rooms', function(){
     it('should be able to emit to a room', function(done){
       var pub = redis.createClient();
-      var sub = redis.createClient(null, null, {detect_buffers: true});
+      var sub = redis.createClient(null, null, {return_buffers: true});
       srv = http();
       var sio = io(srv, {adapter: redisAdapter({pubClient: pub, subClient: sub})});
 
@@ -130,7 +130,7 @@ describe('emitter', function() {
 
     it('should be able to emit to a socket by id', function(done){
       var pub = redis.createClient();
-      var sub = redis.createClient(null, null, {detect_buffers: true});
+      var sub = redis.createClient(null, null, {return_buffers: true});
       srv = http();
       var sio = io(srv, {adapter: redisAdapter({pubClient: pub, subClient: sub})});