Better handling of sub-apps and sockets (#18)

* adding some commments and debug statements

* Make socket provider property configurable

Author: daffl

src/events.js

@@ -41,10 +41,10 @@ export function getDispatcher(service, ev, data, hook) {
   return function(connection) {
     let promise = promisify(originalDispatcher, service, data, connection);
 
-    if(eventFilters.length) {
+    if (eventFilters.length) {
       debug(`Dispatching ${eventFilters.length} event filters for '${ev}' event`);
       eventFilters.forEach(filterFn => {
-        if(filterFn.length === 4) { // function(data, connection, hook, callback)
+        if (filterFn.length === 4) { // function(data, connection, hook, callback)
           promise = promise.then(data =>
             promisify(filterFn, service, data, connection, hook)
           );
@@ -82,6 +82,7 @@ export function setupEventHandlers(info, path, service) {
         dispatcher(info.params(socket))
           .then(data => {
             if(data) {
+              debug(`Dispatching ${eventName} with data`, data);
               send(eventName, data);
             } else {
               debug(`Not sending any data for ${eventName}`);

src/index.js

@@ -11,10 +11,10 @@ function socketMixin(service) {
 
   service.mixin({
     setup(app, path) {
-      if(!this._socketSetup) {
+      if (!this._socketSetup) {
         const info = app._socketInfo;
-        const mountpath = (app.mountpath !== '/' && typeof app.mountpath === 'string') ?
-            app.mountpath : '';
+        const isSubApp = app.mountpath !== '/' && typeof app.mountpath === 'string';
+        const mountpath =  isSubApp ? app.mountpath : '';
         const fullPath = stripSlashes(`${mountpath}/${path}`);
         const setupSocket = socket => {
           setupMethodHandlers.call(app, info, socket, fullPath, this);
@@ -41,22 +41,26 @@ function socketMixin(service) {
   });
 }
 
-export default function mixin() {
-  const app = this;
+export default function createMixin(property) {
+  return function mixin() {
+    const app = this;
 
-  app.mixins.push(socketMixin);
-  app.mixins.push(filterMixin);
+    app.mixins.push(socketMixin);
+    app.mixins.push(filterMixin);
 
-  // When mounted as a sub-app, override the parent setup so you don't have to call it
-  app.on('mount', parent => {
-    const oldSetup = parent.setup;
+    // When mounted as a sub-app, override the parent setup to call our
+    // own setup so the developer doesn't need to call it explicitly.
+    app.on('mount', parent => {
+      const oldSetup = parent.setup;
 
-    parent.setup = function(... args) {
-      const result = oldSetup.apply(this, args);
-      app.setup(... args);
-      return result;
-    };
-  });
+      parent.setup = function(... args) {
+        const result = oldSetup.apply(this, args);
+        app[property] = parent[property];
+        app.setup(... args);
+        return result;
+      };
+    });
+  };
 }
 
-mixin.socketMixin = socketMixin;
+createMixin.socketMixin = socketMixin;

src/methods.js

@@ -23,6 +23,8 @@ export function setupMethodHandlers(info, socket, path, service) {
     let position = typeof paramsPositions[method] !== 'undefined' ?
       paramsPositions[method] : 1;
 
+    debug(`Setting up socket listener for event '${name}'`);
+
     socket.on(name, function () {
       debug(`Got '${name}' event with connection`, connection);