YUKI Hiroshi
null+****@clear*****
Mon Jan 6 12:07:42 JST 2014
YUKI Hiroshi 2014-01-06 12:07:42 +0900 (Mon, 06 Jan 2014) New Revision: 9119d19e29787a52d07f28b0b73c0274754ec0be https://github.com/droonga/express-droonga/commit/9119d19e29787a52d07f28b0b73c0274754ec0be Message: Define custom event "connected" to send the subscriber ID to the client socket Modified files: lib/adapter/socket.io.js test/test-utils.js Modified: lib/adapter/socket.io.js (+6 -0) =================================================================== --- lib/adapter/socket.io.js 2014-01-06 11:46:39 +0900 (8740e9d) +++ lib/adapter/socket.io.js 2014-01-06 12:07:42 +0900 (2ce684a) @@ -237,6 +237,12 @@ exports.register = function(application, server, params) { connection.removeListener('error', errorHandler); socket.removeAllListeners(); }); + + socket.emit('connected', { + socket: socket, + route: connection.getRouteToSelf({ sessionId: socket.id }), + subscriberId: subscriberId + }); }); return registeredCommands; Modified: test/test-utils.js (+9 -6) =================================================================== --- test/test-utils.js 2014-01-06 11:46:39 +0900 (9c0d759) +++ test/test-utils.js 2014-01-06 12:07:42 +0900 (fdefee1) @@ -135,8 +135,11 @@ function createClientSocket() { var host = 'http://localhost:' + testServerPort; var options = { 'force new connection': true }; var socket = client.connect(host, options); - socket.on('connect', function() { - deferred.call(socket); +// socket.on('connect', function() { +// deferred.call(socket); +// }); + socket.on('connected', function(client) { + deferred.call(client); }); return deferred; } @@ -144,16 +147,16 @@ exports.createClientSocket = createClientSocket; Deferred.register('createClientSocket', createClientSocket); function createClientSockets(count) { - var sockets = []; + var clients = []; return Deferred.next(function loop() { if (sockets.length < count) { return createClientSocket() - .next(function(newSocket) { - sockets.push(newSocket); + .next(function(client) { + clients.push(client); }) .next(loop); } else { - return sockets; + return clients; } }); } -------------- next part -------------- HTML����������������������������...Download