Merge pull request #15 from hapijs/connect-event

Add onConnect callback option
hapijs · Sep 5, 2015 · 02b9d69 · 02b9d69
2 parents 26a012f + 264a403
commit 02b9d69
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/lib/index.js b/lib/index.js
@@ -24,6 +24,7 @@ var internals = {
 
 
 internals.schema = Joi.object({
+    onConnect: Joi.func(),                                  // function (ws) {}
     onUnknownMessage: Joi.func(),                           // function (message, ws) { ws.send('string'); }
     auth: Joi.object({
         endpoint: Joi.string().required(),

diff --git a/lib/listener.js b/lib/listener.js
@@ -64,7 +64,9 @@ internals.Listener.prototype._add = function (ws) {
 
     socket.authenticate(function () {
 
-
+        if (self._settings.onConnect) {
+            self._settings.onConnect(ws);
+        }
     });
 };
 

diff --git a/test/index.js b/test/index.js
@@ -57,4 +57,38 @@ describe('register()', function () {
             });
         });
     });
+
+    it('calls onConnect callback', function (done) {
+
+        var client;
+
+        var onConnect = function (ws) {
+
+            expect(ws).to.exist();
+            client.disconnect();
+            server.stop(done);
+        };
+
+        var server = new Hapi.Server();
+        server.connection();
+        server.register({ register: Nes, options: { onConnect: onConnect } }, function (err) {
+
+            expect(err).to.not.exist();
+
+            server.route({
+                method: 'GET',
+                path: '/',
+                handler: function (request, reply) {
+
+                    return reply('hello');
+                }
+            });
+
+            server.start(function (err) {
+
+                client = new Nes.Client('http://localhost:' + server.info.port);
+                client.connect(function () { });
+            });
+        });
+    });
 });