1.0.93

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartuniverse",
-  "version": "1.0.85",
+  "version": "1.0.93",
   "private": false,
   "description": "messaging service for your micro services",
   "main": "dist/index.js",
@@ -15,10 +15,10 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.28",
     "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.4",
+    "@types/node": "^12.12.6",
-    "tslint": "^5.20.0",
+    "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0"
   },
   "peerDependencies": {
@@ -27,15 +27,15 @@
   "dependencies": {
     "@apiglobal/typedrequest-interfaces": "^1.0.7",
     "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartexpress": "^3.0.40",
+    "@pushrocks/smartexpress": "^3.0.52",
-    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/smartfile": "^7.0.6",
     "@pushrocks/smarthash": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.27",
+    "@pushrocks/smartrequest": "^1.1.42",
     "@pushrocks/smartrx": "^2.0.5",
-    "@pushrocks/smartsocket": "^1.1.49",
+    "@pushrocks/smartsocket": "^1.1.58",
     "@pushrocks/smarttime": "^3.0.12",
     "@pushrocks/smartunique": "^3.0.1"
   },

test/test.ts

@@ -77,8 +77,10 @@ tap.test('should receive a message correctly', async (tools) => {
   const testChannel = testClientUniverse.getChannel(testChannelData.channelName);
   const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName);
   const subscription = testChannel2.subscribe(messageArg => {
-    console.log('Yay##########');
+    if (messageArg.messageText === 'hellothere') {
-    done.resolve();
+      console.log('Yay##########');
+      done.resolve();
+    }
   });
   await testChannel.sendMessage({
     messageText: 'hellothere'
@@ -98,7 +100,7 @@ interface IDemoReqRes {
 
 tap.test('ReactionRequest and ReactionResponse should work', async () => {
   const reactionResponse = new smartuniverse.ReactionResponse<IDemoReqRes>({
-    channels: [testClientUniverse.getChannel(testChannelData.channelName)],
+    channels: [testUniverse.getChannel(testChannelData.channelName)],
     funcDef: async reqData => {
       console.log(reqData);
       return {
@@ -117,11 +119,12 @@ tap.test('ReactionRequest and ReactionResponse should work', async () => {
   console.log(result);
 });
 
-tap.test('should disconnect the client correctly', async () => {
+tap.test('should disconnect the client correctly', async (tools) => {
   await testClientUniverse.stop();
+  await testClientUniverse2.stop();
 });
 
-tap.test('should end the server correctly', async tools => {
+tap.test('should end the server correctly', async (tools) => {
   await testUniverse.stopServer();
 });
 

ts/smartuniverse.classes.broadcastevent.ts

@@ -0,0 +1,10 @@
+import * as plugins from './smartuniverse.plugins';
+
+/**
+ * broadcasts an event to multiple channels
+ */
+export class BroadcastEvent<T> {
+  fire() {
+    
+  }
+};

ts/smartuniverse.classes.broadcastsubscription.ts

@@ -0,0 +1,5 @@
+import * as plugins from './smartuniverse.plugins';
+
+export class BroadcastSUbscription {
+
+}

ts/smartuniverse.classes.clientuniverse.ts

@@ -19,9 +19,9 @@ export interface IClientOptions {
  * allows connecting to a universe server
  */
 export class ClientUniverse {
-  public options;
+  public options: IClientOptions;
   public smartsocketClient: plugins.smartsocket.SmartsocketClient;
-  public observableIntake: plugins.smartrx.ObservableIntake<ClientUniverseMessage<any>>;
+  public messageRxjsSubject = new plugins.smartrx.rxjs.Subject<ClientUniverseMessage<any>>();
   public clientUniverseCache = new ClientUniverseCache();
 
   constructor(optionsArg: IClientOptions) {
@@ -77,7 +77,7 @@ export class ClientUniverse {
   }
 
   public async stop() {
-    await this.smartsocketClient.disconnect();
+    await this.disconnect('triggered');
   }
 
   /**
@@ -85,7 +85,7 @@ export class ClientUniverse {
    * since password validation is done through other means, a connection should always be possible
    */
   public async checkConnection(): Promise<void> {
-    if (!this.smartsocketClient && !this.observableIntake) {
+    if (!this.smartsocketClient) {
       const parsedURL = url.parse(this.options.serverAddress);
       const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = {
         alias: 'universeclient',
@@ -95,7 +95,13 @@ export class ClientUniverse {
         url: parsedURL.protocol + '//' + parsedURL.hostname
       };
       this.smartsocketClient = new SmartsocketClient(socketConfig);
-      this.observableIntake = new plugins.smartrx.ObservableIntake();
+
+      this.smartsocketClient.eventSubject.subscribe(async eventArg => {
+        switch(eventArg) {
+          case 'disconnected':
+            this.disconnect('upstreamEvent');
+        }
+      });
 
       // lets define some basic actions
 
@@ -105,8 +111,14 @@ export class ClientUniverse {
       const socketFunctionUnsubscribe = new plugins.smartsocket.SocketFunction({
         funcName: 'unsubscribe',
         allowedRoles: [],
-        funcDef: async (data: interfaces.IServerUnsubscribeActionPayload) => {
+        funcDef: async (dataArg: interfaces.IServerUnsubscribeActionPayload) => {
-          throw new Error('TODO');
+          const channel = this.clientUniverseCache.channelMap.find(channelArg => {
+            return channelArg.name === dataArg.name;
+          });
+          if (channel) {
+            channel.unsubscribe();
+          }
+          return {};
         }
       });
 
@@ -123,7 +135,7 @@ export class ClientUniverse {
           const clientUniverseMessage = ClientUniverseMessage.createMessageFromMessageDescriptor(
             messageDescriptorArg
           );
-          this.observableIntake.push(clientUniverseMessage);
+          this.messageRxjsSubject.next(clientUniverseMessage);
 
           // lets find the corresponding channel
           const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName);
@@ -151,4 +163,15 @@ export class ClientUniverse {
       });
     }
   }
+
+  public async disconnect(reason: 'upstreamEvent' | 'triggered' = 'triggered', tryReconnect = false) {
+    if ('triggered') {
+      this.smartsocketClient.disconnect();
+    }
+    this.smartsocketClient = null;
+    if (tryReconnect) {
+      await plugins.smartdelay.delayForRandom(5000, 20000);
+      this.checkConnection();
+    }
+  }
 }

ts/smartuniverse.classes.clientuniversechannel.ts

@@ -63,6 +63,10 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
     );
   }
 
+  public unsubscribe() {
+    // TODO: unsubscribe all users
+  }
+
   public async populateSubscriptionToServer() {
     // lets make sure the channel is connected
     if (this.status === 'unsubscribed') {

ts/smartuniverse.classes.universe.ts

@@ -68,7 +68,7 @@ export class Universe {
   /**
    * returns a channel
    */
-  public getChannelByName(channelNameArg: string) {
+  public getChannel(channelNameArg: string) {
     return this.universeCache.channelMap.find(channelArg => {
       return channelArg.name === channelNameArg;
     });
@@ -112,6 +112,7 @@ export class Universe {
       funcName: 'subscribeChannel',
       funcDef: async (dataArg, socketConnectionArg) => {
         const universeConnection = new UniverseConnection({
+          universe: this,
           socketConnection: socketConnectionArg,
           authenticationRequests: [dataArg]
         });

ts/smartuniverse.classes.universecache.ts

@@ -19,7 +19,7 @@ export class UniverseCache {
   // INSTANCE
   // ========
   public standardMessageExpiry: number;
-  public destructionTime: number = 60000;
+  public destructionTime: number = 10000;
 
   /**
    * stores messages for this instance

ts/smartuniverse.classes.universechannel.ts

@@ -163,6 +163,6 @@ export class UniverseChannel {
       passphrase: this.passphrase,
       timestamp: Date.now()
     });
-    this.push(messageToSend);
+    this.universeRef.universeCache.addMessage(messageToSend);
   }
 }

ts/smartuniverse.classes.universeconnection.ts

@@ -26,7 +26,7 @@ export class UniverseConnection {
       universeConnection
     );
     universeRef.universeCache.connectionMap.add(universeConnection);
-    console.log('hi')
+    console.log('hi');
   }
 
   /**
@@ -93,6 +93,8 @@ export class UniverseConnection {
     return universeConnection;
   }
 
+  // INSTANCE
+  public universeRef: Universe;
   public terminatedDeferred = plugins.smartpromise.defer();
 
   /**
@@ -100,23 +102,33 @@ export class UniverseConnection {
    */
   public socketConnection: plugins.smartsocket.SocketConnection;
   public authenticationRequests: Array<interfaces.ISocketRequest_SubscribeChannel['request']> = [];
-  public subscribedChannels: UniverseChannel[] = [];
   public authenticatedChannels: UniverseChannel[] = [];
   public failedToJoinChannels: UniverseChannel[] = [];
 
   /**
-   * terminates the connection
+   * disconnect the connection
    */
-  public terminateConnection() {
+  public async disconnect(reason: 'upstreamevent' | 'triggered' = 'triggered') {
-    this.socketConnection.socket.disconnect();
+    if (reason === 'triggered') {
+      await this.socketConnection.disconnect();
+    }
+    this.universeRef.universeCache.connectionMap.remove(this);
     this.terminatedDeferred.resolve();
   }
 
   constructor(optionsArg: {
+    universe: Universe;
     socketConnection: plugins.smartsocket.SocketConnection;
     authenticationRequests: Array<interfaces.ISocketRequest_SubscribeChannel['request']>;
   }) {
     this.authenticationRequests = optionsArg.authenticationRequests;
     this.socketConnection = optionsArg.socketConnection;
+    this.socketConnection.eventSubject.subscribe(async eventArg => {
+      switch (eventArg) {
+        case 'disconnected':
+          await this.disconnect('upstreamevent');
+          break;
+      }
+    });
   }
 }

ts/smartuniverse.classes.universemessage.ts

@@ -64,7 +64,7 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
     this.passphrase = messageDescriptor.passphrase;
     this.payload = messageDescriptor.payload;
     // prevent memory issues
-    this.fallBackDestruction();
+    this.setDestructionTimer();
   }
 
   public setUniverseCache(universeCacheArg: UniverseCache) {
@@ -73,17 +73,23 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
 
   public setTargetChannel() {}
 
-  public setDestructionTimer(selfdestructAfterArg: number) {
+  public setDestructionTimer(selfdestructAfterArg?: number) {
     if (selfdestructAfterArg) {
       this.destructionTimer = new Timer(selfdestructAfterArg);
       this.destructionTimer.start();
-
       // set up self destruction by removing this from the parent messageCache
       this.destructionTimer.completed.then(async () => {
         this.universeCache.messageMap.remove(this);
+      }).catch(err => {
+        console.log(err);
+        console.log(this);
       });
     } else {
-      this.fallBackDestruction();
+      plugins.smartdelay.delayFor(1000).then(() => {
+        if (!this.destructionTimer) {
+          this.setDestructionTimer(6000);
+        }
+      });
     }
   }
 
@@ -93,15 +99,4 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
   public handleAsBadMessage() {
     plugins.smartlog.defaultLogger.log('warn', 'received a bad message');
   }
-
-  /**
-   * prevents memory leaks if channels have no default
-   */
-  private fallBackDestruction() {
-    plugins.smartdelay.delayFor(1000).then(() => {
-      if (!this.destructionTimer) {
-        this.setDestructionTimer(6000);
-      }
-    });
-  }
 }