1.0.79

package-lock.json

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

package.json

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

test/test.ts

@@ -69,9 +69,22 @@ tap.test('a second client should be able to subscibe', async () => {
   });
 
   testClientUniverse2.addChannel(testChannelData.channelName, testChannelData.channelPass);
+  await testClientUniverse2.start();
 });
 
-tap.test('should receive a message correctly', async () => {});
+tap.test('should receive a message correctly', async (tools) => {
+  const done = tools.defer();
+  const testChannel = testClientUniverse.getChannel(testChannelData.channelName);
+  const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName);
+  const subscription = await testChannel2.subscribe(messageArg => {
+    console.log('Yay##########');
+    done.resolve();
+  });
+  await testChannel.sendMessage({
+    messageText: 'hellothere'
+  });
+  await done.promise;
+});
 
 tap.test('should disconnect the client correctly', async () => {
   await testClientUniverse.stop();

ts/interfaces/socketfunctionrequests.ts

@@ -7,7 +7,7 @@ export interface ISocketRequest_SubscribeChannel {
     passphrase: string;
   };
   response: {
-    subscriptionStatus: 'subscribed' | 'unsubscribed'
+    subscriptionStatus: 'subscribed' | 'unsubscribed';
   };
 }
 
@@ -15,6 +15,6 @@ export interface ISocketRequest_ProcessMessage {
   method: 'processMessage';
   request: interfaces.IUniverseMessage;
   response: {
-    messageStatus: 'ok' | 'channel not found'
+    messageStatus: 'ok' | 'channel not found';
   };
-}
+}

ts/interfaces/universeactions.interfaces.ts

@@ -1,10 +1,3 @@
-export type IServerCallActions =
-  | 'channelSubscription'
-  | 'processMessage'
-  | 'channelUnsubscribe'
-  | 'terminateConnection';
-
-
 export interface IServerUnsubscribeActionPayload {
   name: string;
 }

ts/smartuniverse.classes.clientuniversechannel.ts

@@ -53,23 +53,23 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
    * subscribes to a channel
    * tells the universe about this instances interest into a channel
    */
-  public async subscribe(observerArg?: plugins.smartrx.rxjs.Observer<any>) {
+  public async subscribe(observingFunctionArg?: (messageArg: ClientUniverseMessage) => void) {
     // lets make sure the channel is connected
     if (this.status === 'unsubscribed') {
-      const response = await this.clientUniverseRef.smartsocketClient.serverCall<interfaces.ISocketRequest_SubscribeChannel>(
-        'subscribeChannel',
-        {
-          name: this.name,
-          passphrase: this.passphrase
-        }
-      );
+      const response = await this.clientUniverseRef.smartsocketClient.serverCall<
+        interfaces.ISocketRequest_SubscribeChannel
+      >('subscribeChannel', {
+        name: this.name,
+        passphrase: this.passphrase
+      });
       this.status = response.subscriptionStatus;
     }
 
-    if (observerArg) {
-      return this.subject.subscribe(observerArg);
+    if (observingFunctionArg) {
+      return this.subject.subscribe(messageArg => {
+        observingFunctionArg(messageArg);
+      },error => console.log);
     }
-
   }
 
   public async emitMessageLocally(messageArg: ClientUniverseMessage) {

ts/smartuniverse.classes.reactionrequest.ts

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

ts/smartuniverse.classes.reactionresponse.ts

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

ts/smartuniverse.classes.universe.ts

@@ -62,6 +62,16 @@ export class Universe {
    */
   public addChannel(nameArg: string, passphraseArg: string) {
     const newChannel = UniverseChannel.createChannel(this, nameArg, passphraseArg);
+    return newChannel;
+  }
+
+  /**
+   * returns a channel
+   */
+  public getChannelByName(channelNameArg: string) {
+    return this.universeCache.channelMap.find(channelArg => {
+      return channelArg.name === channelNameArg;
+    });
   }
 
   /**
@@ -95,13 +105,12 @@ export class Universe {
     // add the role to smartsocket
     this.smartsocket.addSocketRoles([ClientRole]);
 
-    const socketFunctionSubscription = new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_SubscribeChannel>({
+    const socketFunctionSubscription = new plugins.smartsocket.SocketFunction<
+      interfaces.ISocketRequest_SubscribeChannel
+    >({
       allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
       funcName: 'subscribeChannel',
-      funcDef: async (
-        dataArg,
-        socketConnectionArg
-      ) => {
+      funcDef: async (dataArg, socketConnectionArg) => {
         const universeConnection = new UniverseConnection({
           socketConnection: socketConnectionArg,
           authenticationRequests: [dataArg]

ts/smartuniverse.classes.universechannel.ts

@@ -117,7 +117,7 @@ export class UniverseChannel {
   public async push(messageArg: UniverseMessage) {
     this.subject.next(messageArg);
     const universeConnectionsWithChannelAccess: UniverseConnection[] = [];
-    this.universeRef.universeCache.connectionMap.forEach(async socketConnection => {
+    await this.universeRef.universeCache.connectionMap.forEach(async socketConnection => {
       if (socketConnection.authenticatedChannels.includes(this)) {
         universeConnectionsWithChannelAccess.push(socketConnection);
       }

ts/smartuniverse.classes.universeconnection.ts

@@ -26,6 +26,7 @@ export class UniverseConnection {
       universeConnection
     );
     universeRef.universeCache.connectionMap.add(universeConnection);
+    console.log('hi')
   }
 
   /**