Pass socket to onMessage

Some sort of state mechanism needed to be passed to this method, otherwise its usefulness is limited.
hapijs · Sep 5, 2015 · 02bdd44 · 02bdd44
1 parent 54dbbde
commit 02bdd44
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/listener.js b/lib/listener.js
@@ -69,7 +69,7 @@ internals.Listener.prototype._add = function (ws) {
     socket.authenticate(function () {
 
         if (self._settings.onConnect) {
-            self._settings.onConnect(ws);
+            self._settings.onConnect(socket);
         }
     });
 };

diff --git a/lib/socket.js b/lib/socket.js
@@ -262,7 +262,7 @@ internals.Socket.prototype._processMessage = function (request) {
         id: request.id
     };
 
-    self._listener._settings.onMessage(request.data, function (data) {
+    self._listener._settings.onMessage(self, request.data, function (data) {
 
         if (data instanceof Error) {
             response.error = data.message;

diff --git a/test/socket.js b/test/socket.js
@@ -503,7 +503,7 @@ describe('Socket', function () {
 
         it('calls onMessage callback', function (done) {
 
-            var onMessage = function (message, reply) {
+            var onMessage = function (socket, message, reply) {
 
                 expect(message).to.equal('winning');
                 reply('hello');
@@ -536,7 +536,7 @@ describe('Socket', function () {
 
             var client;
 
-            var onMessage = function (message, reply) {
+            var onMessage = function (socket, message, reply) {
 
                 expect(message).to.equal('winning');
                 reply(new Error('failed'));