Connection: Add client-side subscription (for WS)

src/client/javascript/core/connection.js

@@ -66,6 +66,7 @@
    *
    * @constructor Connection
    * @memberof OSjs.Core
+   * @mixes OSjs.Helpers.EventHandler
    */
   function Connection() {
     this.index = 0;
@@ -78,6 +79,8 @@
      */
     this.offline    = false;
 
+    this._evHandler = new OSjs.Helpers.EventHandler(name, []);
+
     /*eslint consistent-this: "off"*/
     _connectionInstance = this;
   }
@@ -112,6 +115,10 @@
   Connection.prototype.destroy = function() {
     Utils.$unbind(window, 'offline');
     Utils.$unbind(window, 'online');
+
+    if ( this._evHandler ) {
+      this._evHandler = this._evHandler.destroy();
+    }
   };
 
   /**
@@ -397,6 +404,38 @@
     return true;
   };
 
+  /**
+   * Subscribe to a event
+   *
+   * NOTE: This is only available on WebSocket connections
+   *
+   * @function subscribe
+   * @memberof OSjs.Core.Connection#
+   * @see OSjs.Helpers.EventHandler#on
+   *
+   * @param   {String}    k       Event name
+   * @param   {Function}  func    Callback function
+   *
+   * @return  {Number}
+   */
+  Connection.prototype.subscribe = function(k, func) {
+    return this._evHandler.on(k, func, this);
+  };
+
+  /**
+   * Removes an event subscription
+   *
+   * @function unsubscribe
+   * @memberof OSjs.Core.Connection#
+   * @see OSjs.Helpers.EventHandler#off
+   *
+   * @param   {String}    k       Event name
+   * @param   {Number}    [idx]   The hook index returned from subscribe()
+   */
+  Connection.prototype.unsubscribe = function(k, idx) {
+    return this._evHandler.off(k, idx);
+  };
+
   /////////////////////////////////////////////////////////////////////////////
   // EXPORTS
   /////////////////////////////////////////////////////////////////////////////

src/client/javascript/core/connections/ws.js

@@ -95,6 +95,11 @@
     if ( data.action === 'vfs:watch' ) {
       VFS.Helpers.triggerWatch(data.action.split(':')[1], VFS.file(data.args));
     }
+
+    // Emit a subscription event
+    if ( this._evHandler ) {
+      this._evHandler.emit(data.action, data.args);
+    }
   };
 
   WSConnection.prototype.request = function(method, args, onsuccess, onerror, options) {