1.0.65

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartuniverse",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartuniverse",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "private": false,
   "description": "messaging service for your micro services",
   "main": "dist/index.js",

test/test.ts

@@ -37,11 +37,11 @@ tap.test('create smartuniverse client', async () => {
 });
 
 tap.test('should add a channel to the universe', async () => {
-  await testUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
+ testUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
 });
 
 tap.test('should add the same channel to the client universe in the same way', async () => {
-  await testClientUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
+  testClientUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
 });
 
 tap.test('should start the ClientUniverse', async () => {

ts/smartuniverse.classes.universe.ts

@@ -10,6 +10,7 @@ import { UniverseConnection } from './smartuniverse.classes.universeconnection';
 
 export interface ISmartUniverseConstructorOptions {
   messageExpiryInMilliseconds: number;
+  externalServer?: plugins.smartexpress.Server;
 }
 
 /**
@@ -59,7 +60,7 @@ export class Universe {
   /**
    * adds a channel to the Universe
    */
-  public async addChannel(nameArg: string, passphraseArg: string) {
+  public addChannel(nameArg: string, passphraseArg: string) {
     const newChannel = UniverseChannel.createChannel(this, nameArg, passphraseArg);
   }
 
@@ -68,6 +69,7 @@ export class Universe {
    */
   public async start(portArg: number) {
     // lets create the base smartexpress server
+    if (!this.options.externalServer) {
       this.smartexpressServer = new plugins.smartexpress.Server({
         cors: true,
         defaultAnswer: async () => {
@@ -76,6 +78,9 @@ export class Universe {
         forceSsl: false,
         port: portArg
       });
+    } else {
+      this.smartexpressServer = this.options.externalServer;
+    }
 
     // add websocket upgrade
     this.smartsocket = new plugins.smartsocket.Smartsocket({});
@@ -148,7 +153,9 @@ export class Universe {
     // add smartsocket to the running smartexpress app
     this.smartsocket.setExternalServer('smartexpress', this.smartexpressServer as any);
     // start everything
+    if (!this.options.externalServer) {
       await this.smartexpressServer.start();
+    }
     await this.smartsocket.start();
     plugins.smartlog.defaultLogger.log('success', 'started universe');
   }
@@ -158,6 +165,8 @@ export class Universe {
    */
   public async stopServer() {
     await this.smartsocket.stop();
+    if (!this.options.externalServer) {
       await this.smartexpressServer.stop();
     }
   }
+}