Readme.md

@@ -6,7 +6,7 @@ Default socket.io in-memory adapter class.
 ## How to use
 
 This module is not intended for end-user usage, but can be used as an
-interface to inheirt from from other adapters you might want to build.
+interface to inherit from from other adapters you might want to build.
 
 As an example of an adapter that builds on top of this, please take a look
 at [socket.io-redis](https://github.com/learnboost/socket.io-redis).

index.js

@@ -4,7 +4,6 @@
  */
 
 var Emitter = require('events').EventEmitter;
-var parser = require('socket.io-parser');
 
 /**
  * Module exports.
@@ -23,7 +22,7 @@ function Adapter(nsp){
   this.nsp = nsp;
   this.rooms = {};
   this.sids = {};
-  this.encoder = new parser.Encoder();
+  this.encoder = nsp.server.encoder;
 }
 
 /**
@@ -42,10 +41,26 @@ Adapter.prototype.__proto__ = Emitter.prototype;
  */
 
 Adapter.prototype.add = function(id, room, fn){
-  this.sids[id] = this.sids[id] || {};
-  this.sids[id][room] = true;
-  this.rooms[room] = this.rooms[room] || Room();
-  this.rooms[room].add(id);
+  return this.addAll(id, [ room ], fn);
+};
+
+/**
+ * Adds a socket to a list of room.
+ *
+ * @param {String} socket id
+ * @param {String} rooms
+ * @param {Function} callback
+ * @api public
+ */
+
+Adapter.prototype.addAll = function(id, rooms, fn){
+  for (var i = 0; i < rooms.length; i++) {
+    var room = rooms[i];
+    this.sids[id] = this.sids[id] || {};
+    this.sids[id][room] = true;
+    this.rooms[room] = this.rooms[room] || Room();
+    this.rooms[room].add(id);
+  }
   if (fn) process.nextTick(fn.bind(null, null));
 };
 
@@ -151,6 +166,7 @@ Adapter.prototype.broadcast = function(packet, opts){
  * Gets a list of clients by sid.
  *
  * @param {Array} explicit set of rooms to check.
+ * @param {Function} callback
  * @api public
  */
 
@@ -163,19 +179,18 @@ Adapter.prototype.clients = function(rooms, fn){
   rooms = rooms || [];
 
   var ids = {};
-  var self = this;
   var sids = [];
   var socket;
 
   if (rooms.length) {
     for (var i = 0; i < rooms.length; i++) {
-      var room = self.rooms[rooms[i]];
+      var room = this.rooms[rooms[i]];
       if (!room) continue;
       var sockets = room.sockets;
       for (var id in sockets) {
         if (sockets.hasOwnProperty(id)) {
           if (ids[id]) continue;
-          socket = self.nsp.connected[id];
+          socket = this.nsp.connected[id];
           if (socket) {
             sids.push(id);
             ids[id] = true;
@@ -184,9 +199,9 @@ Adapter.prototype.clients = function(rooms, fn){
       }
     }
   } else {
-    for (var id in self.sids) {
-      if (self.sids.hasOwnProperty(id)) {
-        socket = self.nsp.connected[id];
+    for (var id in this.sids) {
+      if (this.sids.hasOwnProperty(id)) {
+        socket = this.nsp.connected[id];
         if (socket) sids.push(id);
       }
     }
@@ -195,6 +210,18 @@ Adapter.prototype.clients = function(rooms, fn){
   if (fn) process.nextTick(fn.bind(null, null, sids));
 };
 
+/**
+ * Gets the list of rooms a given client has joined.
+ *
+ * @param {String} socket id
+ * @param {Function} callback
+ * @api public
+ */
+Adapter.prototype.clientRooms = function(id, fn){
+  var rooms = this.sids[id];
+  if (fn) process.nextTick(fn.bind(null, null, rooms ? Object.keys(rooms) : null));
+};
+
 /**
 * Room constructor.
 *

package.json

@@ -1,14 +1,10 @@
 {
   "name": "socket.io-adapter",
-  "version": "0.4.0",
+  "version": "1.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/Automattic/socket.io-adapter.git"
+    "url": "git://github.com/socketio/socket.io-adapter.git"
   },
-  "description": "",
-  "dependencies": {
-    "debug": "2.2.0",
-    "socket.io-parser": "2.2.2"
-  }
+  "description": "default socket.io in-memory adapter"
 }