socket.io-amqp - npm Package Compare versions

Comparing version 0.2.0 to 0.3.0

index.js

@@ -223,5 +223,3 @@ /*
 
-        var self = this;
-
-        if (self.amqpConsumerID == args.shift())
+        if (this.amqpConsumerID == args.shift())
         {
@@ -238,3 +236,3 @@ return debug('ignore same consumer id');
 
-        if (!packet || packet.nsp != self.nsp.name)
+        if (!packet || packet.nsp != this.nsp.name)
         {
@@ -246,3 +244,3 @@ return debug('ignore different namespace');
 
-        self.broadcast.apply(this, args);
+        Adapter.prototype.broadcast.apply(this, args);
     };
@@ -267,10 +265,4 @@
         {
-            self.sids[id] = self.sids[id] || {};
-            self.sids[id][room] = true;
-
-
-            self.rooms[room] = self.rooms[room] || {};
-            var needToSubscribe = !self.rooms.hasOwnProperty(room) || !Object.keys(self.rooms[room]).length;
-            self.rooms[room][id] = true;
-
+            var needToSubscribe = !self.rooms[room];
+            Adapter.prototype.add.call(self, id, room);
             var channel = prefix + '#' + self.nsp.name + '#' + room + '#';
@@ -280,9 +272,6 @@
             {
-                amqpChannel.bindQueue(self.amqpIncomingQueue, self.amqpExchangeName, channel, {}, function (err)
-                {
-                    if (err)
-                    {
+                amqpChannel.bindQueue(self.amqpIncomingQueue, self.amqpExchangeName, channel, {}, function(err) {
+                    if (err) {
                         self.emit('error', err);
-                        if (fn)
-                        {
+                        if (fn) {
                             fn(err);
@@ -292,4 +281,3 @@ }
                     }
-                    if (fn)
-                    {
+                    if (fn) {
                         fn(null);
@@ -299,6 +287,2 @@ }
             }
-            else
-            {
-                fn(null);
-            }
         });
@@ -316,3 +300,3 @@ };
 
-    AMQPAdapter.prototype.broadcast = function (packet, opts, remote)
+    AMQPAdapter.prototype.broadcast = function (packet, opts)
     {
@@ -324,19 +308,16 @@ Adapter.prototype.broadcast.call(this, packet, opts);
         {
-            if (!remote)
+            if (opts.rooms)
             {
-                if (opts.rooms)
+                opts.rooms.forEach(function (room)
                 {
-                    opts.rooms.forEach(function (room)
-                    {
-                        var chn = prefix + '#' + packet.nsp + '#' + room + '#';
-                        var msg = msgpack.encode([self.amqpConsumerID, packet, opts]);
-                        amqpChannel.publish(self.amqpExchangeName, chn, msg);
-                    });
-                }
-                else
-                {
+                    var chn = prefix + '#' + packet.nsp + '#' + room + '#';
                     var msg = msgpack.encode([self.amqpConsumerID, packet, opts]);
-                    amqpChannel.publish(self.amqpExchangeName, self.globalRoomName, msg);
-                }
+                    amqpChannel.publish(self.amqpExchangeName, chn, msg);
+                });
             }
+            else
+            {
+                var msg = msgpack.encode([self.amqpConsumerID, packet, opts]);
+                amqpChannel.publish(self.amqpExchangeName, self.globalRoomName, msg);
+            }
         });
@@ -362,10 +343,5 @@ };
         {
-            self.sids[id] = self.sids[id] || {};
-            self.rooms[room] = self.rooms[room] || {};
-            delete self.sids[id][room];
-            delete self.rooms[room][id];
-
-            if (self.rooms.hasOwnProperty(room) && !Object.keys(self.rooms[room]).length)
+            Adapter.prototype.del.call(self, id, room);
+            if (!self.rooms[room])
             {
-                delete self.rooms[room];
                 var channel = prefix + '#' + self.nsp.name + '#' + room + '#';
@@ -418,2 +394,4 @@
 
+            Adapter.prototype.delAll.call(self, id);
+
             if (!rooms)
@@ -426,10 +404,4 @@ {
             {
-                if (rooms.hasOwnProperty(room))
+                if (!self.rooms[room])
                 {
-                    delete self.rooms[room][id];
-                }
-
-                if (self.rooms.hasOwnProperty(room) && !Object.keys(self.rooms[room]).length)
-                {
-                    delete self.rooms[room];
                     var channel = prefix + '#' + self.nsp.name + '#' + room + '#';
@@ -476,2 +448,2 @@
 
-}
+}

package.json

 {
   "name": "socket.io-amqp",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A Sockets.IO Adapter for AMQP & RabbitMQ",
@@ -15,4 +15,4 @@ "main": "lib/main.js",
   "dependencies": {
-    "socket.io-adapter": "0.3.x",
-    "amqplib": "0.3.x",
+    "socket.io-adapter": "0.4.x",
+    "amqplib": "0.4.x",
     "debug":"2.1.x",
@@ -19,0 +19,0 @@ "underscore":"1.6.x",

No alert changes

Worsened metrics

Total package byte prevSize

27240

decreased by-3.11%

Lines of code

483

decreased by-4.36%

Dependency changes

• + Addedamqplib@0.4.2(transitive)

• + Addeddebug@2.2.0(transitive)

• + Addedms@0.7.1(transitive)

• + Addedsocket.io-adapter@0.4.0(transitive)

• - Removedamqplib@0.3.2(transitive)

• - Removeddebug@1.0.2(transitive)

• - Removedms@0.6.2(transitive)

• - Removedobject-keys@1.0.1(transitive)

• - Removedsocket.io-adapter@0.3.1(transitive)

• Updatedamqplib@0.4.x

• Updatedsocket.io-adapter@0.4.x