1.0.17

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiglobal/typedsocket",
-  "version": "1.0.3",
+  "version": "1.0.17",
   "private": false,
   "description": "a typedrequest extension supporting websockets",
   "main": "dist_ts/index.js",
@@ -13,10 +13,10 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.14.16",
+    "@gitzone/tsbundle": "^1.0.80",
+    "@gitzone/tstest": "^1.0.54",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/node": "^16.3.3",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
@@ -24,7 +24,9 @@
     "@apiglobal/typedrequest": "^1.0.56",
     "@apiglobal/typedrequest-interfaces": "^1.0.15",
     "@pushrocks/isohash": "^1.0.2",
-    "@pushrocks/smartsocket": "^1.2.0"
+    "@pushrocks/smartexpress": "^3.0.102",
+    "@pushrocks/smartsocket": "^1.2.8",
+    "@pushrocks/smartstring": "^3.0.24"
   },
   "browserslist": [
     "last 1 chrome versions"

readme.md

@@ -25,7 +25,11 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W
 
 ## Usage
 
-Use TypeScript for best in class intellisense
+Use TypeScript for best in class intellisense.
+
+TypedSocket is the typedrequest you love, just in a bidirectional way.
+
+See the following examples from our test for reference:
 
 ## Contribution
 

test/test.ts

@@ -31,11 +31,28 @@ tap.test('should add some handlers', async () => {
   }));
 })
 
-tap.test('first test', async (tools) => {
+tap.test('should create Server and Client', async (tools) => {
   testTypedSocketServer = await typedsocket.TypedSocket.createServer(testTypedRouter);
-  testTypedSocketClient = await typedsocket.TypedSocket.createClient(testTypedRouter, 'http://localhost');
+  testTypedSocketClient = await typedsocket.TypedSocket.createClient(testTypedRouter, 'http://localhost:3000');
+  await tools.delayFor(1000);
+  await testTypedSocketServer.stop();
+  testTypedSocketServer = await typedsocket.TypedSocket.createServer(testTypedRouter);
+  await tools.delayFor(60000);
 });
 
+tap.test('should process messages from both sides', async () => {
+  const myServerSideTypedRequest = testTypedSocketServer.createTypedRequest<IRequest_Client_Server>('sayhi');
+  const myClientSideTypedRequest = testTypedSocketClient.createTypedRequest<IRequest_Client_Server>('sayhi');
+  const response = await myClientSideTypedRequest.fire({
+    greeting: 'that is a greeting from the client'
+  });
+  console.log(response);
+  const response2 = await myServerSideTypedRequest.fire({
+    greeting: 'that is a greeting from the server'
+  });
+  console.log(response2);
+})
+
 tap.test('should run without problems for a little bit', async tools => {
   await tools.delayFor(5000);
 })

ts/typedsocket.classes.typedsocket.ts

@@ -1,8 +1,11 @@
 import * as plugins from './typedsocket.plugins';
+import type * as smartexpress from '@pushrocks/smartexpress';
 
 const publicRoleName = 'publicRoleName';
 const publicRolePass = 'publicRolePass';
 
+export type TTypedSocketSide = 'server' | 'client';
+
 export class TypedSocket {
   // STATIC
   /**
@@ -11,7 +14,7 @@ export class TypedSocket {
    */
   public static async createServer(
     typedrouterArg: plugins.typedrequest.TypedRouter,
-    smartexpressServerArg?: any
+    smartexpressServerArg?: smartexpress.Server
   ): Promise<TypedSocket> {
     const smartsocketServer = new plugins.smartsocket.Smartsocket({
       port: 3000,
@@ -34,6 +37,7 @@ export class TypedSocket {
       })
     );
     const typedsocket = new TypedSocket(
+      'server',
       typedrouterArg,
       async <T extends plugins.typedrequestInterfaces.ITypedRequest>(
         dataArg: T,
@@ -49,16 +53,15 @@ export class TypedSocket {
             throw new Error('you need to specify the wanted targetConnection');
           }
         }
-        const response: T = (smartsocketServer.clientCall(
+        const response: T = await smartsocketServer.clientCall(
           'processMessage',
           dataArg,
           targetConnectionArg
-        ) as any) as T;
+        ) as any;
         return response;
       },
       smartsocketServer
     );
-
     await smartsocketServer.start();
 
     return typedsocket;
@@ -66,17 +69,23 @@ export class TypedSocket {
 
   public static async createClient(
     typedrouterArg: plugins.typedrequest.TypedRouter,
-    serverUrl: string
+    serverUrlArg: string,
+    aliasArg = 'clientArg'
   ): Promise<TypedSocket> {
-    const smartsocketClient = new plugins.smartsocket.SmartsocketClient({
-      alias: 'client1',
+    const domain = new plugins.smartstring.Domain(serverUrlArg);
+
+    const socketOptions = {
+      alias: aliasArg,
       role: publicRoleName,
       password: publicRolePass,
-      port: 3000,
-      url: serverUrl,
+      port: domain.port || 3000,
+      url: `${domain.nodeParsedUrl.protocol}//${domain.nodeParsedUrl.hostname}`,
       autoReconnect: true,
-    });
-    smartsocketClient.socketFunctions.add(
+    }
+    console.log(`starting typedsocket with the following settings:`)
+    console.log(socketOptions);
+    const smartsocketClient = new plugins.smartsocket.SmartsocketClient(socketOptions);
+    smartsocketClient.addSocketFunction(
       new plugins.smartsocket.SocketFunction({
         funcName: 'processMessage',
         allowedRoles: [],
@@ -86,6 +95,7 @@ export class TypedSocket {
       })
     );
     const typedsocket = new TypedSocket(
+      'client',
       typedrouterArg,
       async <T extends plugins.typedrequestInterfaces.ITypedRequest>(dataArg: T): Promise<T> => {
         const response: T = (smartsocketClient.serverCall('processMessage', dataArg) as any) as T;
@@ -100,6 +110,7 @@ export class TypedSocket {
   }
 
   // INSTANCE
+  public side: TTypedSocketSide;
   public typedrouter: plugins.typedrequest.TypedRouter;
   private postMethod: plugins.typedrequest.IPostMethod &
     ((
@@ -108,15 +119,28 @@ export class TypedSocket {
     ) => Promise<plugins.typedrequestInterfaces.ITypedRequest>);
   private socketServerOrClient: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient;
   constructor(
+    sideArg: TTypedSocketSide,
     typedrouterArg: plugins.typedrequest.TypedRouter,
     postMethodArg: plugins.typedrequest.IPostMethod,
     socketServerOrClientArg: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient
   ) {
+    this.side = sideArg;
     this.typedrouter = typedrouterArg;
     this.postMethod = postMethodArg;
     this.socketServerOrClient = socketServerOrClientArg;
   }
 
+  public addTag(keyArg: string, payloadArg: any) {
+    if (this.side === 'client' && this.socketServerOrClient instanceof plugins.smartsocket.SmartsocketClient) {
+      this.socketServerOrClient.socketConnection.addTag({
+        id: keyArg,
+        payload: payloadArg
+      })
+    } else {
+      throw new Error('tagging is only supported on clients');
+    }
+  }
+
   public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
     methodName: T['method'],
     targetConnection?: plugins.smartsocket.SocketConnection
@@ -133,20 +157,46 @@ export class TypedSocket {
     return typedrequest;
   }
 
-  public async findTargetConnection(
-    findFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => boolean
+  public async findAllTargetConnections(
+    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
   ) {
     if (this.socketServerOrClient instanceof plugins.smartsocket.Smartsocket) {
+      const matchingSockets: plugins.smartsocket.SocketConnection[] = [];
       for (const socketConnection of this.socketServerOrClient.socketConnections.getArray()) {
-        if (findFuncArg(socketConnection)) {
-          return socketConnection;
+        if (await asyncFindFuncArg(socketConnection)) {
+          matchingSockets.push(socketConnection);
         }
       }
+      return matchingSockets;
     } else {
-      console.warn('this method >>findTargetConnection<< is only available from the server');
+      throw new Error('this method >>findTargetConnection<< is only available from the server');
     }
   }
 
+  public async findTargetConnection(
+    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
+  ) {
+    const allMatching = this.findAllTargetConnections(asyncFindFuncArg);
+    return allMatching[0];
+  }
+
+  public async findAllTargetConnectionsByTag(keyArg: string, payloadArg?: any) {
+    return this.findAllTargetConnections(async socketConnectionArg => {
+      let result: boolean;
+      if (!payloadArg) {
+        result = !!socketConnectionArg.getTagById('keyArg')
+      } else {
+        result = !!socketConnectionArg.getTagById('keyArg') === payloadArg;
+      }
+      return result;
+    })
+  }
+
+  public async findTargetConnectionByTag(keyArg: string, payloadArg?: any) {
+    const allResults = this.findAllTargetConnectionsByTag(keyArg, payloadArg)
+    return allResults[0];
+  }
+
   public async stop() {
     await this.socketServerOrClient.stop()
   }

ts/typedsocket.plugins.ts

@@ -10,8 +10,10 @@ export {
 // @pushrocks scope
 import * as isohash from '@pushrocks/isohash';
 import * as smartsocket from '@pushrocks/smartsocket';
+import * as smartstring from '@pushrocks/smartstring';
 
 export {
   isohash,
-  smartsocket
+  smartsocket,
+  smartstring
 }