1.0.24

.gitlab-ci.yml

@@ -36,6 +36,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "apiglobal",
       "gitrepo": "typedsocket",
-      "shortDescription": "a typedrequest extension supporting websockets",
+      "description": "a typedrequest extension supporting websockets",
       "npmPackagename": "@apiglobal/typedsocket",
       "license": "MIT",
       "projectDomain": "api.global"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiglobal/typedsocket",
-  "version": "1.0.15",
+  "version": "1.0.24",
   "private": false,
   "description": "a typedrequest extension supporting websockets",
   "main": "dist_ts/index.js",
@@ -12,20 +12,19 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.2.10",
-    "@types/node": "^14.14.22",
+    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsbundle": "^1.0.88",
+    "@gitzone/tstest": "^1.0.60",
+    "@pushrocks/tapbundle": "^3.2.15",
+    "@types/node": "^17.0.10",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.56",
+    "@apiglobal/typedrequest": "^1.0.65",
     "@apiglobal/typedrequest-interfaces": "^1.0.15",
     "@pushrocks/isohash": "^1.0.2",
-    "@pushrocks/smartexpress": "^3.0.100",
-    "@pushrocks/smartsocket": "^1.2.8",
+    "@pushrocks/smartsocket": "^1.2.22",
     "@pushrocks/smartstring": "^3.0.24"
   },
   "browserslist": [

test/test.ts

@@ -3,7 +3,6 @@ import * as typedrequest from '@apiglobal/typedrequest';
 import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
 
 import * as typedsocket from '../ts/index';
-import { request } from 'http';
 
 interface IRequest_Client_Server extends typedrequestInterfaces.implementsTR<
   typedrequestInterfaces.ITypedRequest,
@@ -34,6 +33,16 @@ tap.test('should add some handlers', async () => {
 tap.test('should create Server and Client', async (tools) => {
   testTypedSocketServer = await typedsocket.TypedSocket.createServer(testTypedRouter);
   testTypedSocketClient = await typedsocket.TypedSocket.createClient(testTypedRouter, 'http://localhost:3000');
+  console.log('test: waiting 5 seconds');
+  await tools.delayFor(5000);
+  await testTypedSocketServer.stop();
+
+  // lets create another server
+  testTypedSocketServer = await typedsocket.TypedSocket.createServer(testTypedRouter);
+  
+  // lets see if auto reconnect works
+  console.log('test: waiting 21 seconds for reconnect');
+  await tools.delayFor(21000);
 });
 
 tap.test('should process messages from both sides', async () => {
@@ -49,13 +58,10 @@ tap.test('should process messages from both sides', async () => {
   console.log(response2);
 })
 
-tap.test('should run without problems for a little bit', async tools => {
-  await tools.delayFor(5000);
-})
-
-tap.test('should disconnect', async () => {
+tap.test('should disconnect', async (tools) => {
   await testTypedSocketClient.stop();
   await testTypedSocketServer.stop();
+  tools.delayFor(1000).then(() => process.exit(0));
 })
 
 tap.start();

ts/typedsocket.classes.typedsocket.ts

@@ -1,5 +1,4 @@
 import * as plugins from './typedsocket.plugins';
-import type * as smartexpress from '@pushrocks/smartexpress';
 
 const publicRoleName = 'publicRoleName';
 const publicRolePass = 'publicRolePass';
@@ -14,23 +13,19 @@ export class TypedSocket {
    */
   public static async createServer(
     typedrouterArg: plugins.typedrequest.TypedRouter,
-    smartexpressServerArg?: smartexpress.Server
+    smartexpressServerArg?: any
   ): Promise<TypedSocket> {
     const smartsocketServer = new plugins.smartsocket.Smartsocket({
+      alias: 'typedsocketServer',
       port: 3000,
     });
     if (smartexpressServerArg) {
       smartsocketServer.setExternalServer('smartexpress', smartexpressServerArg);
     }
-    const publicRole = new plugins.smartsocket.SocketRole({
-      name: publicRoleName,
-      passwordHash: await plugins.isohash.sha256FromString(publicRolePass),
-    });
-    smartsocketServer.addSocketRoles([publicRole]);
+    
     smartsocketServer.socketFunctions.add(
       new plugins.smartsocket.SocketFunction({
         funcName: 'processMessage',
-        allowedRoles: [publicRole],
         funcDef: async (dataArg, socketConnectionArg) => {
           return typedrouterArg.routeAndAddResponse(dataArg);
         },
@@ -50,7 +45,7 @@ export class TypedSocket {
             );
             targetConnectionArg = smartsocketServer.socketConnections.getArray()[0];
           } else {
-            throw new Error('you need to specify the wanted targetConnection');
+            throw new Error('you need to specify the wanted targetConnection. Currently no target is selectable automatically.');
           }
         }
         const response: T = await smartsocketServer.clientCall(
@@ -74,10 +69,8 @@ export class TypedSocket {
   ): Promise<TypedSocket> {
     const domain = new plugins.smartstring.Domain(serverUrlArg);
 
-    const socketOptions = {
+    const socketOptions: plugins.smartsocket.ISmartsocketClientOptions = {
       alias: aliasArg,
-      role: publicRoleName,
-      password: publicRolePass,
       port: domain.port || 3000,
       url: `${domain.nodeParsedUrl.protocol}//${domain.nodeParsedUrl.hostname}`,
       autoReconnect: true,
@@ -88,7 +81,6 @@ export class TypedSocket {
     smartsocketClient.addSocketFunction(
       new plugins.smartsocket.SocketFunction({
         funcName: 'processMessage',
-        allowedRoles: [],
         funcDef: async (dataArg, socketConnectionArg) => {
           return typedrouterArg.routeAndAddResponse(dataArg);
         },
@@ -157,6 +149,11 @@ export class TypedSocket {
     return typedrequest;
   }
 
+  /**
+   * returns all matching target connection
+   * @param asyncFindFuncArg
+   * @returns 
+   */
   public async findAllTargetConnections(
     asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
   ) {
@@ -173,10 +170,15 @@ export class TypedSocket {
     }
   }
 
+  /**
+   * returns a single target connection by returning the first one of all matching ones
+   * @param asyncFindFuncArg
+   * @returns 
+   */
   public async findTargetConnection(
     asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
   ) {
-    const allMatching = this.findAllTargetConnections(asyncFindFuncArg);
+    const allMatching = await this.findAllTargetConnections(asyncFindFuncArg);
     return allMatching[0];
   }
 
@@ -184,16 +186,16 @@ export class TypedSocket {
     return this.findAllTargetConnections(async socketConnectionArg => {
       let result: boolean;
       if (!payloadArg) {
-        result = !!socketConnectionArg.getTagById('keyArg')
+        result = !!socketConnectionArg.getTagById(keyArg);
       } else {
-        result = !!socketConnectionArg.getTagById('keyArg') === payloadArg;
+        result = !!socketConnectionArg.getTagById(keyArg) === payloadArg;
       }
       return result;
     })
   }
 
   public async findTargetConnectionByTag(keyArg: string, payloadArg?: any) {
-    const allResults = this.findAllTargetConnectionsByTag(keyArg, payloadArg)
+    const allResults = await this.findAllTargetConnectionsByTag(keyArg, payloadArg)
     return allResults[0];
   }