[fix] Use the requestid from response when deleting requests (#225)

Request does not have a requestid property so requests were not being
cleaned up and .requests object was leaking memory.

Author: beaucollins

index.js

@@ -315,14 +315,16 @@ function adapter(uri, opts) {
       return;
     }
 
-    if (!response.requestid || !self.requests[response.requestid]) {
+    var requestid = response.requestid;
+
+    if (!requestid || !self.requests[requestid]) {
       debug('ignoring unknown request');
       return;
     }
 
     debug('received response %j', response);
 
-    var request = self.requests[response.requestid];
+    var request = self.requests[requestid];
 
     switch (request.type) {
 
@@ -339,14 +341,14 @@ function adapter(uri, opts) {
         if (request.msgCount === request.numsub) {
           clearTimeout(request.timeout);
           if (request.callback) process.nextTick(request.callback.bind(null, null, Object.keys(request.clients)));
-          delete self.requests[request.requestid];
+          delete self.requests[requestid];
         }
         break;
 
       case requestTypes.clientRooms:
         clearTimeout(request.timeout);
         if (request.callback) process.nextTick(request.callback.bind(null, null, response.rooms));
-        delete self.requests[request.requestid];
+        delete self.requests[requestid];
         break;
 
       case requestTypes.allRooms:
@@ -362,7 +364,7 @@ function adapter(uri, opts) {
         if (request.msgCount === request.numsub) {
           clearTimeout(request.timeout);
           if (request.callback) process.nextTick(request.callback.bind(null, null, Object.keys(request.rooms)));
-          delete self.requests[request.requestid];
+          delete self.requests[requestid];
         }
         break;
 
@@ -371,7 +373,7 @@ function adapter(uri, opts) {
       case requestTypes.remoteDisconnect:
         clearTimeout(request.timeout);
         if (request.callback) process.nextTick(request.callback.bind(null, null));
-        delete self.requests[request.requestid];
+        delete self.requests[requestid];
         break;
 
       case requestTypes.customRequest:
@@ -382,7 +384,7 @@ function adapter(uri, opts) {
         if (request.msgCount === request.numsub) {
           clearTimeout(request.timeout);
           if (request.callback) process.nextTick(request.callback.bind(null, null, request.replies));
-          delete self.requests[request.requestid];
+          delete self.requests[requestid];
         }
         break;
 

test/index.js

@@ -220,6 +220,7 @@ var socket1, socket2, socket3;
             expect(rooms).to.contain(socket2.id);
             expect(rooms).to.contain(socket3.id);
             expect(rooms).to.contain('woot1');
+            expect(namespace1.adapter.requests).to.be.empty();
             done();
           });
         });