YUKI Hiroshi
null+****@clear*****
Thu Feb 7 11:20:56 JST 2013
YUKI Hiroshi 2013-02-07 11:20:56 +0900 (Thu, 07 Feb 2013) New Revision: ad137210cc7f63c14f99794ccb1e4b64634781ce https://github.com/groonga/express-kotoumi/commit/ad137210cc7f63c14f99794ccb1e4b64634781ce Log: Revert changes around session id of sockets Modified files: lib/backend/connection.js lib/frontend/socket.io-adaptor.js test/frontend-socket.io-adaptor.test.js Modified: lib/backend/connection.js (+0 -3) =================================================================== --- lib/backend/connection.js 2013-02-06 19:24:56 +0900 (d0521d0) +++ lib/backend/connection.js 2013-02-07 11:20:56 +0900 (bc53978) @@ -119,9 +119,6 @@ Connection.prototype.emitMessage = function(type, body, callback, options) { type: type, body: body }; - if (options.sessionId) { - envelope.sessionId = options.sessionId; - } if (callback) { var event = 'inReplyTo:' + id; this.once(event, callback); Modified: lib/frontend/socket.io-adaptor.js (+1 -4) =================================================================== --- lib/frontend/socket.io-adaptor.js 2013-02-06 19:24:56 +0900 (fd6f0de) +++ lib/frontend/socket.io-adaptor.js 2013-02-07 11:20:56 +0900 (3568411) @@ -33,15 +33,12 @@ exports.register = function(application, server, params) { return (function(data) { if (requestBuilder) data = requestBuilder(data); - connection.emitMessage(command, data, null, { sessionId: socket.id }); + connection.emitMessage(command, data); }); } function createBackendMessageHandler(socket) { return (function(envelope) { - if (envelope.sessionId && envelope.sessionId != socket.id) - return; - var event = envelope.type; var data; Modified: test/frontend-socket.io-adaptor.test.js (+4 -16) =================================================================== --- test/frontend-socket.io-adaptor.test.js 2013-02-06 19:24:56 +0900 (d37eec3) +++ test/frontend-socket.io-adaptor.test.js 2013-02-07 11:20:56 +0900 (ef40650) @@ -139,10 +139,7 @@ suite('Socket.IO API', function() { connection = connection .mock('emitMessage') - .takes('search', - { requestMessage: true }, - null, - { sessionId: clientSocket.socket.sessionid }); + .takes('search', { requestMessage: true }); clientSocket.emit('search', { requestMessage: true }); }) .wait(0.01) @@ -234,10 +231,7 @@ suite('Socket.IO API', function() { connection = connection .mock('emitMessage') - .takes('foobar', - { requestMessage: true }, - null, - { sessionId: clientSocket.socket.sessionid }); + .takes('foobar', { requestMessage: true }); clientSocket.emit('foobar', { requestMessage: true }); }) .wait(0.01) @@ -274,10 +268,7 @@ suite('Socket.IO API', function() { connection = connection .mock('emitMessage') - .takes('builder', - 'builder request', - null, - { sessionId: clientSocket.socket.sessionid }); + .takes('builder', 'builder request'); clientSocket.on('builder.result', function(data) { mockedReceiver.receive(data); }); @@ -326,10 +317,7 @@ suite('Socket.IO API', function() { connection = connection .mock('emitMessage') - .takes('customevent', - { requestMessage: true }, - null, - { sessionId: clientSocket.socket.sessionid }); + .takes('customevent', { requestMessage: true }); clientSocket.on('custom', function(data) { mockedReceiver.receive(data); }); -------------- next part -------------- HTML����������������������������...Download
