Skip to content

Converted arrays to objects #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
darrachequesne wants to merge 1 commit into from
Closed

Converted arrays to objects #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ Adapter.prototype.delAll = function(id, fn){
*
* Options:
* - `flags` {Object} flags for this packet
* - `except` {Array} sids that should be excluded
* - `rooms` {Array} list of rooms to broadcast to
* - `except` {Object} sids that should be excluded
* - `rooms` {Object} list of rooms to broadcast to
*
* @param {Object} packet object
* @api public
*/

Adapter.prototype.broadcast = function(packet, opts){
var rooms = opts.rooms || [];
var except = opts.except || [];
var rooms = opts.rooms || {};
var except = opts.except || {};
var flags = opts.flags || {};
var packetOpts = {
preEncoded: true,
Expand All @@ -123,13 +123,13 @@ Adapter.prototype.broadcast = function(packet, opts){

packet.nsp = this.nsp.name;
this.encoder.encode(packet, function(encodedPackets) {
if (rooms.length) {
for (var i = 0; i < rooms.length; i++) {
var room = self.rooms[rooms[i]];
if (Object.keys(rooms).length) {
for (var name in rooms) {
var room = self.rooms[rooms[name]];
if (!room) continue;
for (var id in room) {
if (room.hasOwnProperty(id)) {
if (ids[id] || ~except.indexOf(id)) continue;
if (ids[id] || except[id]) continue;
socket = self.nsp.connected[id];
if (socket) {
socket.packet(encodedPackets, packetOpts);
Expand All @@ -141,7 +141,7 @@ Adapter.prototype.broadcast = function(packet, opts){
} else {
for (var id in self.sids) {
if (self.sids.hasOwnProperty(id)) {
if (~except.indexOf(id)) continue;
if (except[id]) continue;
socket = self.nsp.connected[id];
if (socket) socket.packet(encodedPackets, packetOpts);
}
Expand All @@ -153,7 +153,7 @@ Adapter.prototype.broadcast = function(packet, opts){
/**
* Gets a list of clients by sid.
*
* @param {Array} explicit set of rooms to check.
* @param {Object} explicit set of rooms to check.
* @api public
*/

Expand All @@ -163,16 +163,16 @@ Adapter.prototype.clients = function(rooms, fn){
rooms = null;
}

rooms = rooms || [];
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]];
if (Object.keys(rooms).length) {
for (var name in rooms) {
var room = self.rooms[rooms[name]];
if (!room) continue;
for (var id in room) {
if (room.hasOwnProperty(id)) {
Expand Down