1.2.9

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.2.4",
+  "version": "1.2.9",
   "description": "easy and secure websocket communication",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -22,26 +22,26 @@
     "@apiglobal/typedrequest-interfaces": "^1.0.15",
     "@pushrocks/isohash": "^1.0.2",
     "@pushrocks/isounique": "^1.0.4",
-    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^4.0.16",
-    "@pushrocks/smartexpress": "^3.0.100",
-    "@pushrocks/smartjson": "^4.0.5",
-    "@pushrocks/smartlog": "^2.0.39",
-    "@pushrocks/smartpromise": "^3.1.3",
+    "@pushrocks/smartexpress": "^3.0.108",
+    "@pushrocks/smartjson": "^4.0.6",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartpromise": "^3.1.6",
     "@pushrocks/smartrx": "^2.0.19",
-    "@pushrocks/smarttime": "^3.0.38",
-    "@types/socket.io": "^2.1.13",
-    "@types/socket.io-client": "^1.4.35",
+    "@pushrocks/smarttime": "^3.0.43",
+    "@types/socket.io": "^3.0.2",
+    "@types/socket.io-client": "^3.0.0",
     "socket.io": "^3.1.0",
     "socket.io-client": "^3.1.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.10",
-    "@types/node": "^14.14.22",
+    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tstest": "^1.0.60",
+    "@pushrocks/tapbundle": "^3.2.15",
+    "@types/node": "^17.0.9",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

test/test.ts

@@ -90,16 +90,30 @@ tap.test('should react to a new websocket connection from client', async () => {
   await testSmartsocketClient.connect();
 });
 
-tap.test('should be able to tag a connection', async (tools) => {
+tap.test('should be able to tag a connection from client', async (tools) => {
   await testSmartsocketClient.addTag({
     id: 'awesome',
-    payload: 'yes'
+    payload: 'yes',
   });
-  const tagOnServerSide = await testSmartsocket.socketConnections.find((socketConnection) => {
-    return true;
-  }).getTagById('awesome');
+  const tagOnServerSide = await testSmartsocket.socketConnections
+    .findSync((socketConnection) => {
+      return true;
+    })
+    .getTagById('awesome');
   expect(tagOnServerSide.payload).to.equal('yes');
-})
+});
+
+tap.test('should be able to tag a connection from server', async (tools) => {
+  await testSmartsocket.socketConnections
+  .findSync((socketConnection) => {
+    return true;
+  }).addTag({
+    id: 'awesome2',
+    payload: 'absolutely',
+  });
+  const tagOnClientSide = await testSmartsocketClient.socketConnection.getTagById('awesome2');
+  expect(tagOnClientSide.payload).to.equal('absolutely');
+});
 
 tap.test('2 clients should connect in parallel', async () => {
   // TODO: implement parallel test
@@ -119,7 +133,7 @@ tap.test('should be able to make a functionCall from server to client', async ()
     {
       hi: 'hi there from server',
     },
-    testSmartsocket.socketConnections.find((socketConnection) => {
+    testSmartsocket.socketConnections.findSync((socketConnection) => {
       return true;
     })
   );

ts/interfaces/tag.ts

@@ -1,6 +1,6 @@
-export interface ITag <T = any> {
+export interface ITag<T = any> {
   id: string;
   payload: T;
 }
 
-export type TTagStore = {[key: string]: ITag};
+export type TTagStore = { [key: string]: ITag };

ts/smartsocket.classes.smartsocket.ts

@@ -113,7 +113,7 @@ export class Smartsocket {
   /**
    * the standard handler for new socket connections
    */
-  private async _handleSocketConnection(socketArg: pluginsTyped.socketIo.Socket) {
+  private async _handleSocketConnection(socketArg: SocketIO.Socket) {
     const socketConnection: SocketConnection = new SocketConnection({
       alias: undefined,
       authenticated: false,
@@ -124,6 +124,12 @@ export class Smartsocket {
     });
     logger.log('info', 'Socket connected. Trying to authenticate...');
     this.socketConnections.add(socketConnection);
+    const disconnectSubscription =  socketConnection.eventSubject.subscribe((eventArg) => {
+       if (eventArg === 'disconnected') {
+         this.socketConnections.remove(socketConnection);
+         disconnectSubscription.unsubscribe();
+       } 
+    })
     await socketConnection.authenticate();
     await socketConnection.listenToFunctionRequests();
   }

ts/smartsocket.classes.smartsocketclient.ts

@@ -46,7 +46,7 @@ export class SmartsocketClient {
   public socketRoles = new plugins.lik.ObjectMap<SocketRole>();
 
   // tagStore
-  private tagStore: {[key: string]: interfaces.ITag} = {};
+  private tagStore: { [key: string]: interfaces.ITag } = {};
   private tagStoreSubscription: plugins.smartrx.rxjs.Subscription;
 
   /**
@@ -66,7 +66,7 @@ export class SmartsocketClient {
    */
   public async getTagById(tagIdArg: interfaces.ITag['id']) {
     return this.tagStore[tagIdArg];
-  };
+  }
 
   /**
    * removes a tag from a connection
@@ -164,12 +164,15 @@ export class SmartsocketClient {
     // handle connection
     this.socketConnection.socket.on('connect', async () => {
       this.tagStoreSubscription?.unsubscribe();
-      this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(tagStoreArg => {
-        this.tagStore = tagStoreArg
-      });
       for (const keyArg of Object.keys(this.tagStore)) {
         this.socketConnection.addTag(this.tagStore[keyArg]);
       }
+      this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(
+        (tagStoreArg) => {
+          this.tagStore = tagStoreArg;
+        }
+      );
+      
       this.updateStatus('connected');
     });
 

ts/smartsocket.classes.socketconnection.ts

@@ -8,7 +8,7 @@ import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.s
 import { SocketRole } from './smartsocket.classes.socketrole';
 
 // socket.io
-import * as SocketIO from 'socket.io';
+import * as pluginsTyped from './smartsocket.pluginstyped';
 import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
 import { logger } from './smartsocket.logging';
 
@@ -83,6 +83,7 @@ export class SocketConnection {
       );
       await this.disconnect();
       allSocketConnections.remove(this);
+      this.eventSubject.next('disconnected');
     });
   }
 
@@ -95,12 +96,12 @@ export class SocketConnection {
     this.tagStoreObservable.next(this.tagStore);
     const remoteSubscription = this.remoteTagStoreObservable.subscribe((remoteTagStore) => {
       const localTagString = plugins.smartjson.stringify(tagArg);
-      const remoteTagString = plugins.smartjson.stringify(remoteTagStore[tagArg.id])
+      const remoteTagString = plugins.smartjson.stringify(remoteTagStore[tagArg.id]);
       if (localTagString === remoteTagString) {
         remoteSubscription.unsubscribe();
         done.resolve();
       }
-    })
+    });
     this.socket.emit('updateTagStore', this.tagStore);
     await done.promise;
   }
@@ -111,7 +112,7 @@ export class SocketConnection {
    */
   public async getTagById(tagIdArg: interfaces.ITag['id']) {
     return this.tagStore[tagIdArg];
-  };
+  }
 
   /**
    * removes a tag from a connection
@@ -164,7 +165,7 @@ export class SocketConnection {
       this.socket.on('function', (dataArg: ISocketRequestDataObject<any>) => {
         // check if requested function is available to the socket's scope
         // logger.log('info', 'function request received');
-        const referencedFunction: SocketFunction<any> = this.role.allowedFunctions.find(
+        const referencedFunction: SocketFunction<any> = this.role.allowedFunctions.findSync(
           (socketFunctionArg) => {
             return socketFunctionArg.name === dataArg.funcCallData.funcName;
           }
@@ -192,17 +193,13 @@ export class SocketConnection {
       });
 
       this.socket.on('updateTagStore', async (tagStoreArg: interfaces.TTagStore) => {
-        const exitingStoreString = plugins.smartjson.stringify(this.tagStore);
-        const newStoreString = plugins.smartjson.stringify(tagStoreArg);
-        console.log(exitingStoreString);
-        console.log(newStoreString);
-        if (exitingStoreString !== newStoreString) {
+        if (!plugins.smartjson.deepEqualObjects(this.tagStore, tagStoreArg)) {
           this.tagStore = tagStoreArg;
           this.socket.emit('updateTagStore', this.tagStore);
           this.tagStoreObservable.next(this.tagStore);
         }
         this.remoteTagStoreObservable.next(tagStoreArg);
-      })
+      });
 
       logger.log('info', `now listening to function requests for ${this.alias}`);
       done.resolve(this);

ts/smartsocket.classes.socketfunction.ts

@@ -58,7 +58,7 @@ export class SocketFunction<T extends plugins.typedrequestInterfaces.ITypedReque
     smartsocketRefArg: Smartsocket | SmartsocketClient,
     functionNameArg: string
   ): SocketFunction<Q> {
-    return smartsocketRefArg.socketFunctions.find((socketFunctionArg) => {
+    return smartsocketRefArg.socketFunctions.findSync((socketFunctionArg) => {
       return socketFunctionArg.name === functionNameArg;
     });
   }

ts/smartsocket.classes.socketrequest.ts

@@ -45,7 +45,7 @@ export class SocketRequest<T extends plugins.typedrequestInterfaces.ITypedReques
     smartsocketRef: Smartsocket | SmartsocketClient,
     shortIdArg: string
   ): SocketRequest<any> {
-    return smartsocketRef.socketRequests.find((socketRequestArg) => {
+    return smartsocketRef.socketRequests.findSync((socketRequestArg) => {
       return socketRequestArg.shortid === shortIdArg;
     });
   }

ts/smartsocket.classes.socketrole.ts

@@ -23,7 +23,7 @@ export class SocketRole {
     referenceSmartsocket: Smartsocket | SmartsocketClient,
     socketRoleNameArg: string
   ): SocketRole {
-    return referenceSmartsocket.socketRoles.find((socketRoleArg) => {
+    return referenceSmartsocket.socketRoles.findSync((socketRoleArg) => {
       return socketRoleArg.name === socketRoleNameArg;
     });
   }

ts/smartsocket.pluginstyped.ts

@@ -13,4 +13,4 @@ export { smartexpress };
 import type socketIo from 'socket.io';
 import type socketIoClient from 'socket.io-client';
 
-export { socketIo, socketIoClient };
+export { socketIoClient, socketIo };