1.2.8

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.2.4",
+  "version": "1.2.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1567,9 +1567,9 @@
       }
     },
     "@pushrocks/smartjson": {
-      "version": "4.0.5",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartjson/-/smartjson-4.0.5.tgz",
-      "integrity": "sha512-i4kBjZSbs1t8swcAPEdPkDJHci2higzvMIkNUKTgXWrcxUFMuOis/B5huUnnIqg/Td8R+mAdf/B/CMfgjABTlg==",
+      "version": "4.0.6",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartjson/-/smartjson-4.0.6.tgz",
+      "integrity": "sha512-lykr068RSDHs0+EXCvIDVxjKnDtRQ2M7EXOo5jVrUU6/OEdfRl9ErM1K/oPafiEi47/PtTrwLlp1KdSgqkRjmg==",
       "requires": {
         "@types/buffer-json": "^2.0.0",
         "@types/fast-json-stable-stringify": "^2.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.2.4",
+  "version": "1.2.8",
   "description": "easy and secure websocket communication",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -26,7 +26,7 @@
     "@pushrocks/smartdelay": "^2.0.10",
     "@pushrocks/smartenv": "^4.0.16",
     "@pushrocks/smartexpress": "^3.0.100",
-    "@pushrocks/smartjson": "^4.0.5",
+    "@pushrocks/smartjson": "^4.0.6",
     "@pushrocks/smartlog": "^2.0.39",
     "@pushrocks/smartpromise": "^3.1.3",
     "@pushrocks/smartrx": "^2.0.19",

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
+    .find((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
+  .find((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

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

@@ -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

@@ -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
@@ -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);