feat: Add global disconnect event (#1355)

packages/authentication-oauth/src/express.ts

@@ -19,12 +19,12 @@ export default (options: OauthSetupSettings) => {
     const { authService, linkStrategy } = options;
     const app = feathersApp as ExpressApplication;
     const config = app.get('grant');
-    
+
     if (!config) {
       debug('No grant configuration found, skipping Express oAuth setup');
       return;
     }
-    
+
     const { path } = config.defaults;
     const grantApp = grant(config);
     const authApp = express();

packages/authentication-oauth/test/strategy.test.ts

@@ -13,9 +13,9 @@ describe('@feathersjs/authentication-oauth/strategy', () => {
   });
 
   it('reads configuration from the oauth key', () => {
-    const testConfigValue = Math.random()
-    app.get('authentication').oauth.test.hello = testConfigValue
-    assert.strictEqual(strategy.configuration.hello, testConfigValue)
+    const testConfigValue = Math.random();
+    app.get('authentication').oauth.test.hello = testConfigValue;
+    assert.strictEqual(strategy.configuration.hello, testConfigValue);
   });
 
   it('getRedirect', async () => {

packages/primus/lib/index.js

@@ -43,13 +43,14 @@ function configurePrimus (config, configurer) {
 
             primus.use('feathers', function (req, res, next) {
               req.feathers = {
-                headers: Object.keys(req.headers).reduce((key, result) => {
+                headers: Object.keys(req.headers).reduce((result, key) => {
                   const value = req.headers[key];
 
-                  return typeof value === 'object' ? result : {
-                    ...result,
-                    [key]: value
-                  };
+                  if (typeof value !== 'object') {
+                    result[key] = value;
+                  }
+
+                  return result;
                 }, {}),
                 provider: 'primus'
               };
@@ -63,13 +64,7 @@ function configurePrimus (config, configurer) {
               })
             );
 
-            primus.on('disconnection', spark => {
-              const { channels } = app;
-
-              if (channels.length) {
-                app.channel(app.channels).leave(getParams(spark));
-              }
-            });
+            primus.on('disconnection', spark => app.emit('disconnect', getParams(spark)));
           }
 
           if (typeof configurer === 'function') {

packages/primus/test/index.test.js

@@ -190,6 +190,24 @@ describe('@feathersjs/primus', () => {
     });
   });
 
+  it('connection and disconnect events (#1243, #1238)', (done) => {
+    const { app, primus } = options;
+    const mySocket = new primus.Socket('http://localhost:7888?channel=dctest');
+
+    app.on('connection', connection => {
+      if (connection.channel === 'dctest') {
+        assert.strictEqual(connection.channel, 'dctest');
+        app.once('disconnect', disconnection => {
+          assert.strictEqual(disconnection.channel, 'dctest');
+          done();
+        });
+        setTimeout(() => mySocket.end(), 100);
+      }
+    });
+
+    assert.ok(mySocket);
+  });
+
   describe('Service method calls', () => {
     describe('(\'method\', \'service\')  event format', () => {
       describe('Service', () => methodTests('todo', options));

packages/socketio/lib/index.js

@@ -65,13 +65,7 @@ function configureSocketio (port, options, config) {
             });
 
             io.use((socket, next) => {
-              socket.once('disconnect', () => {
-                const { channels } = app;
-
-                if (channels.length) {
-                  app.channel(app.channels).leave(getParams(socket));
-                }
-              });
+              socket.once('disconnect', () => app.emit('disconnect', getParams(socket)));
               next();
             });
 

packages/socketio/test/index.test.js

@@ -189,6 +189,21 @@ describe.only('@feathersjs/socketio', () => {
     });
   });
 
+  it('connection and disconnect events (#1243, #1238)', (done) => {
+    const mySocket = io('http://localhost:7886?channel=dctest');
+
+    app.once('connection', connection => {
+      assert.strictEqual(connection.channel, 'dctest');
+      app.once('disconnect', disconnection => {
+        assert.strictEqual(disconnection.channel, 'dctest');
+        done();
+      });
+      setTimeout(() => mySocket.close(), 100);
+    });
+
+    assert.ok(mySocket);
+  });
+
   it('missing parameters in socket call works (#88)', done => {
     let service = app.service('todo');
     let old = { find: service.find };

packages/transport-commons/src/socket/index.ts

@@ -20,6 +20,13 @@ export function socket ({ done, emit, socketKey, getParams }: SocketOptions) {
     app.configure(routing());
 
     app.on('publish', getDispatcher(emit, socketKey));
+    app.on('disconnect', connection => {
+      const { channels } = app;
+
+      if (channels.length) {
+        app.channel(app.channels).leave(connection);
+      }
+    });
 
     // `connection` event
     done.then(provider => provider.on('connection', (connection: any) =>