Made Core destroy procedure async

Author: andersevenrud

__tests__/auth.js

@@ -116,7 +116,8 @@ describe('Authentication', () => {
     expect(response.json).toBeCalledWith({username: 'jest'});
   });
 
-  test('#destroy', () => {
-    auth = auth.destroy();
+  test('#destroy', async () => {
+    await auth.destroy();
+    auth = undefined;
   });
 });

__tests__/core.js

@@ -90,11 +90,11 @@ describe('Core', () => {
     expect(core.wss.clients[2].send).not.toBeCalled();
   });
 
-  test('#destroy', () => {
+  test('#destroy', async () => {
     const cb = jest.fn();
     core.on('osjs/core:destroy', cb);
-    core.destroy();
-    core.destroy();
+    await core.destroy();
+    await core.destroy();
     expect(cb).toHaveBeenCalledTimes(1);
   });
 });

__tests__/filesystem.js

@@ -100,12 +100,14 @@ describe('Filesystem', () => {
   });
 
   test('#unmount', () => {
-    expect(filesystem.unmount(mountpoint))
+    return expect(filesystem.unmount(mountpoint))
+      .resolves
       .toBe(true);
   });
 
   test('#unmount - test fail', () => {
-    expect(filesystem.unmount({}))
+    return expect(filesystem.unmount({}))
+      .resolves
       .toBe(false);
   });
 
@@ -132,7 +134,8 @@ describe('Filesystem', () => {
     }));
   });
 
-  test('#destroy', () => {
-    filesystem = filesystem.destroy();
+  test('#destroy', async () => {
+    await filesystem.destroy();
+    filesystem = undefined;
   });
 });

__tests__/package.js

@@ -96,7 +96,7 @@ describe('Package', () => {
       .toBe(path.resolve(core.configuration.public, 'apps/JestTest'));
   });
 
-  test('#destroy', () => {
-    pkg.destroy();
+  test('#destroy', async () => {
+    await pkg.destroy();
   });
 });

__tests__/packages.js

@@ -47,7 +47,8 @@ describe('Packages', () => {
     }));
   });
 
-  test('#destroy', () => {
-    packages = packages.destroy();
+  test('#destroy', async () => {
+    await packages.destroy();
+    packages = undefined;
   });
 });

__tests__/settings.js

@@ -56,7 +56,8 @@ describe('Settings', () => {
     expect(response.json).toBeCalledWith({});
   });
 
-  test('#destroy', () => {
-    settings = settings.destroy();
+  test('#destroy', async () => {
+    await settings.destroy();
+    settings = undefined;
   });
 });

package.json

@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/os-js/osjs-server#readme",
   "dependencies": {
-    "@osjs/common": "^3.0.6",
+    "@osjs/common": "^3.0.8",
     "body-parser": "^1.19.0",
     "chokidar": "^3.3.1",
     "connect-loki": "^1.1.0",

src/core.js

@@ -94,7 +94,7 @@ class Core extends CoreBase {
    */
   destroy(done = () => {}) {
     if (this.destroyed) {
-      return;
+      return Promise.resolve();
     }
 
     this.emit('osjs/core:destroy');
@@ -105,13 +105,21 @@ class Core extends CoreBase {
       this.wss.close();
     }
 
-    super.destroy();
+    const finish = (error) => {
+      if (error) {
+        logger.error(error);
+      }
 
-    if (this.httpServer) {
-      this.httpServer.close(done);
-    } else {
-      done();
-    }
+      if (this.httpServer) {
+        this.httpServer.close(done);
+      } else {
+        done();
+      }
+    };
+
+    return Promise.resolve(super.destroy())
+      .then(() => finish())
+      .catch(finish);
   }
 
   /**

src/filesystem.js

@@ -34,6 +34,7 @@ const uuid = require('uuid/v1');
 const mime = require('mime');
 const path = require('path');
 const vfs = require('./vfs');
+const {closeWatches} = require('./utils/core.js');
 const consola = require('consola');
 const logger = consola.withTag('Filesystem');
 
@@ -62,12 +63,12 @@ class Filesystem {
   /**
    * Destroys instance
    */
-  destroy() {
-    this.watches.forEach(({watch}) => {
-      if (watch && typeof watch.close === 'function') {
-        watch.close();
-      }
-    });
+  async destroy() {
+    const watches = this.watches.filter(({watch}) => {
+      return watch && typeof watch.close === 'function';
+    }).map(({watch}) => watch);
+
+    await closeWatches(watches);
 
     this.watches = [];
   }
@@ -204,13 +205,13 @@ class Filesystem {
   /**
    * Unmounts given mountpoint
    * @param {object} mount Mountpoint
-   * @return {boolean}
+   * @return {Promise<boolean>}
    */
-  unmount(mountpoint) {
+  async unmount(mountpoint) {
     const found = this.watches.find(w => w.id === mountpoint.id);
 
     if (found && found.watch) {
-      found.watch.close();
+      await found.watch.close();
     }
 
     const index = this.mountpoints.indexOf(mountpoint);

src/package.js

@@ -57,11 +57,11 @@ class Package {
   /**
    * Destroys instance
    */
-  destroy() {
+  async destroy() {
     this.action('destroy');
 
     if (this.watcher) {
-      this.watcher.close();
+      await this.watcher.close();
       this.watcher = null;
     }
   }

src/packages.js

@@ -195,8 +195,9 @@ class Packages {
   /**
    * Destroys packages
    */
-  destroy() {
-    this.packages.forEach(pkg => pkg.destroy());
+  async destroy() {
+    await Promise.all(this.packages.map(pkg => pkg.destroy()));
+
     this.packages = [];
   }
 

src/providers/core.js

@@ -35,7 +35,7 @@ const bodyParser = require('body-parser');
 const proxy = require('express-http-proxy');
 const nocache = require('nocache');
 const {ServiceProvider} = require('@osjs/common');
-const {isAuthenticated} = require('../utils/core.js');
+const {isAuthenticated, closeWatches} = require('../utils/core.js');
 
 /**
  * OS.js Core Service Provider
@@ -50,8 +50,8 @@ class CoreServiceProvider extends ServiceProvider {
     this.watches = [];
   }
 
-  destroy() {
-    this.watches.forEach(w => w.close());
+  async destroy() {
+    await closeWatches(this.watches);
     super.destroy();
   }
 

src/providers/packages.js

@@ -33,6 +33,7 @@ const path = require('path');
 const chokidar = require('chokidar');
 const {ServiceProvider} = require('@osjs/common');
 const Packages = require('../packages');
+const {closeWatches} = require('../utils/core');
 
 /**
  * OS.js Package Service Provider
@@ -74,9 +75,9 @@ class PackageServiceProvider extends ServiceProvider {
     }
   }
 
-  destroy() {
-    this.watches.forEach(w => w.close());
-    this.packages.destroy();
+  async destroy() {
+    await closeWatches(this.watches);
+    await this.packages.destroy();
     super.destroy();
   }
 

src/providers/vfs.js

@@ -44,6 +44,11 @@ class VFSServiceProvider extends ServiceProvider {
     this.filesystem = new Filesystem(core, options);
   }
 
+  async destroy() {
+    await this.filesystem.destroy();
+    super.destroy();
+  }
+
   depends() {
     return [
       'osjs/express'

src/utils/core.js

@@ -109,3 +109,13 @@ module.exports.isAuthenticated = (groups = [], all = false) => (req, res, next)
     .status(403)
     .send('Access denied');
 };
+
+/**
+ * Closes an array of watches
+ */
+module.exports.closeWatches = (watches) => Promise.all(
+  watches.map((w) => {
+    return w.close()
+      .catch(error => console.warn(error));
+  })
+);