YUKI Hiroshi
null+****@clear*****
Thu Oct 17 16:15:48 JST 2013
YUKI Hiroshi 2013-10-17 16:15:48 +0900 (Thu, 17 Oct 2013) New Revision: b68f192ec27de04eb9667002faca06cb2f33ad5c https://github.com/droonga/express-droonga/commit/b68f192ec27de04eb9667002faca06cb2f33ad5c Message: Resolve event listener method names when the handler is created Modified files: lib/adapter/socket.io.js Modified: lib/adapter/socket.io.js (+15 -13) =================================================================== --- lib/adapter/socket.io.js 2013-10-17 16:13:17 +0900 (9e046e8) +++ lib/adapter/socket.io.js 2013-10-17 16:15:48 +0900 (518d82d) @@ -47,27 +47,29 @@ exports.register = function(application, server, params) { defaultParameters.subscriber = command.sha1sum(defaultParameters.route); } + var requestHandler = 'onRequest'; + var responseHandler = 'onResponse'; + if (command.PublishSubscribe.isInstance(commandDefinition)) { + if (/\.subscribe$/.test(commandName)) { + requestHandler = 'onSubscribe'; + responseHandler = 'onSubscribed'; + } else if (/\.unsubscribe$/.test(commandName)) { + requestHandler = 'onUnsubscribe'; + responseHandler = 'onUnsubscribed'; + } + } + return (function(data, clientOptions) { if (!commandDefinition) return; clientOptions = clientOptions || {}; - var event = commandName; - var requestHandler = 'onRequest'; - var responseHandler = 'onResponse'; - if (command.PublishSubscribe.isInstance(commandDefinition)) { data.subscriber = data.subscriber || defaultParameters.subscriber; - data.route = data.route || defaultParameters.route; - if (/\.subscribe$/.test(commandName)) { - requestHandler = 'onSubscribe'; - responseHandler = 'onSubscribed'; - } else if (/\.unsubscribe$/.test(commandName)) { - requestHandler = 'onUnsubscribe'; - responseHandler = 'onUnsubscribed'; - } + data.route = data.route || defaultParameters.route; } + var callback = function(error, envelope) { if (error) { socket.emit('error', error); @@ -107,7 +109,7 @@ exports.register = function(application, server, params) { socket.emit('error', error.message || error); } } else { - wrappedConection.emit(event, data); + wrappedConection.emit(commandName, data); } }); } -------------- next part -------------- HTML����������������������������...Download