Adding send method

thoov · Jun 9, 2015 · b25aeb0 · b25aeb0
1 parent 6bd10a8
commit b25aeb0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/addon/helpers/socketio-proxy.js b/addon/helpers/socketio-proxy.js
@@ -17,7 +17,14 @@ export default Ember.ObjectProxy.extend({
       this.socket.emit(channel, data, Ember.run.bind(context, acknowledgementFn));
     }
     else {
-      this.socket.emit(channel, data);
+      this.socket.emit.apply(null, arguments);
     }
+  },
+
+  /*
+  * A pass through method for the underlining send method.
+  */
+  send() {
+    this.socket.apply(null, arguments);
   }
 });
diff --git a/app/services/socketio.js b/app/services/socketio.js
@@ -4,13 +4,12 @@ import SocketIOProxy from 'ember-websockets/helpers/socketio-proxy';
 var filter = Ember.EnumerableUtils.filter;
 
 export default Ember.Service.extend({
-
   /*
-  * Each element in the array is of form:
+  * Each element in the array is of the form:
   *
   * {
   *    url: 'string'
-  *    socket: WebSocket Proxy object
+  *    socket: SocketIO Proxy object
   * }
   */
   sockets: null,
@@ -21,18 +20,18 @@ export default Ember.Service.extend({
   },
 
   /*
-  * socketFor returns a websocket proxy object. On this object there is a property `socket`
-  * which contains the actual websocket object. This websocket object is cached based off of the url meaning
-  * multiple requests for the same socket will return the same object.
+  * socketFor returns a socketio proxy object. On this object there is a property `socket`
+  * which contains the actual socketio object. This socketio object is cached based off of the
+  * url meaning multiple requests for the same socket will return the same object.
   */
-  socketFor(url) {
+  socketFor(url, options = {}) {
     var proxy = this.findSocketInCache(this.get('sockets'), url);
 
-    if (proxy && this.websocketIsNotClosed(proxy.socket)) { return proxy.socket; }
+    if (proxy && this.socketIsNotClosed(proxy.socket)) { return proxy.socket; }
 
     proxy = SocketIOProxy.create({
       content: this,
-      socket: io(this.normalizeURL(url))
+      socket: io(this.normalizeURL(url), options)
     });
 
     this.get('sockets').pushObject({
@@ -59,8 +58,8 @@ export default Ember.Service.extend({
     return url;
   },
 
-  websocketIsNotClosed(websocket) {
-    return websocket.socket.readyState !== window.WebSocket.CLOSED;
+  socketIsNotClosed(socket) {
+    return socket.socket.io.readyState !== 'closed';
   },
 
   /*

diff --git a/app/services/websockets.js b/app/services/websockets.js
@@ -5,9 +5,8 @@ var forEach = Ember.EnumerableUtils.forEach;
 var filter = Ember.EnumerableUtils.filter;
 
 export default Ember.Service.extend({
-
   /*
-  * Each element in the array is of form:
+  * Each element in the array is of the form:
   *
   * {
   *    url: 'string'
@@ -27,7 +26,6 @@ export default Ember.Service.extend({
   * multiple requests for the same socket will return the same object.
   */
   socketFor(url) {
-    var sockets;
     var proxy = this.findSocketInCache(this.get('sockets'), url);
 
     if (proxy && this.websocketIsNotClosed(proxy.socket)) { return proxy.socket; }