droonga/express-droonga at 5d48e06 [master] Fill route and subscriber by the default watch command itself (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2013-10-17 16:39:47 +0900 (Thu, 17 Oct 2013)

  New Revision: 5d48e06185d2ed68076950d340055d9d347f2b05
  https://github.com/droonga/express-droonga/commit/5d48e06185d2ed68076950d340055d9d347f2b05

  Message:
    Fill route and subscriber by the default watch command itself

  Modified files:
    lib/adapter/api/socket.io.js
    lib/adapter/socket.io.js

  Modified: lib/adapter/api/socket.io.js (+12 -1)
===================================================================

--- lib/adapter/api/socket.io.js    2013-10-17 16:33:57 +0900 (16c2cb9)
+++ lib/adapter/api/socket.io.js    2013-10-17 16:39:47 +0900 (bead7a7)
@@ -4,7 +4,18 @@ module.exports = {
 //  'status': {},
 
   'search': new command.SocketRequestResponse(),
-  'watch': new command.SocketPublishSubscribe({})//,    
+  'watch': new command.SocketPublishSubscribe({
+    onSubscribe: function(data, connection) {
+      data.route = data.route || connection.routeToSelf;
+      data.subscriber = data.subscriber || command.sha1sum(data.route);
+      connection.emit('watch.subscribe', data);
+    },
+    onUnsubscribe: function(data, connection) {
+      data.route = data.route || connection.routeToSelf;
+      data.subscriber = data.subscriber || command.sha1sum(data.route);
+      connection.emit('watch.unsubscribe', data);
+    }
+  })//,    
 
 //  'createtable': {},
 //  'removetable': {},

  Modified: lib/adapter/socket.io.js (+0 -9)
===================================================================
--- lib/adapter/socket.io.js    2013-10-17 16:33:57 +0900 (49c3417)
+++ lib/adapter/socket.io.js    2013-10-17 16:39:47 +0900 (29c5aa8)
@@ -45,10 +45,6 @@ exports.register = function(application, server, params) {
       timeout:   DEFAULT_TIMEOUT,
       sessionId: socket.id
     };
-    if (command.PublishSubscribe.isInstance(commandDefinition)) {
-      defaultParameters.route      = connection.getRouteToSelf(droongaMessageOptions);
-      defaultParameters.subscriber = command.sha1sum(defaultParameters.route);
-    }
 
     var requestHandler  = 'onRequest';
     var responseHandler = 'onResponse';
@@ -65,11 +61,6 @@ exports.register = function(application, server, params) {
     return (function(data, clientOptions) {
       clientOptions = clientOptions || {};
 
-      if (command.PublishSubscribe.isInstance(commandDefinition))  {
-        data.subscriber = data.subscriber || defaultParameters.subscriber;
-        data.route      = data.route || defaultParameters.route;
-      }
-
       var callback = function(error, envelope) {
         if (error) {
           socket.emit('error', error);
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/express-droonga at 5d48e06 [master] Fill route and subscriber by the default watch command itself