1.1.34

.snyk

@@ -1,4 +1,13 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.3
-ignore: {}
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-JSYAML-173999:
+    - '@pushrocks/smartexpress > @pushrocks/smartfile > js-yaml':
+        reason: None given
+        expires: '2019-05-24T15:16:11.291Z'
+  SNYK-JS-JSYAML-174129:
+    - '@pushrocks/smartexpress > @pushrocks/smartfile > js-yaml':
+        reason: None given
+        expires: '2019-05-24T15:16:11.291Z'
 patch: {}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.1.31",
+  "version": "1.1.34",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -241,31 +241,69 @@
       }
     },
     "@pushrocks/smartexpress": {
-      "version": "3.0.18",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.18.tgz",
-      "integrity": "sha512-iunVt5aZ+h7gH67Sys+XKFojVXMseOfMNMw9+6Ofvbdkj/S0VEpm4BIafeNsNsbNcWlT0JYBQO9ylWp9Hh6nmQ==",
+      "version": "3.0.19",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.19.tgz",
+      "integrity": "sha512-3dN43yy2wRcj36w0sX0h6z1Xg9cxXiw84Ohn9QulFVWZeiCwHmBC15uSAVBMBCd1e87aDfEL9wzrRii+0PcwAA==",
       "requires": {
-        "@pushrocks/lik": "^3.0.4",
-        "@pushrocks/smartfile": "^6.0.11",
-        "@pushrocks/smartpromise": "^2.0.5",
-        "@pushrocks/smartrequest": "^1.1.14",
-        "@types/express": "^4.16.0",
-        "@types/finalhandler": "0.0.33",
-        "@types/helmet": "0.0.42",
+        "@pushrocks/lik": "^3.0.5",
+        "@pushrocks/smartfile": "^7.0.2",
+        "@pushrocks/smartpromise": "^3.0.2",
+        "@pushrocks/smartrequest": "^1.1.15",
+        "@types/express": "^4.16.1",
+        "@types/finalhandler": "^1.1.0",
+        "@types/helmet": "0.0.43",
         "@types/serve-static": "^1.13.2",
         "body-parser": "^1.18.3",
         "cors": "^2.8.5",
         "express": "^4.16.4",
         "express-force-ssl": "^0.3.2",
-        "helmet": "^3.15.0",
+        "helmet": "^3.16.0",
         "rendertron-middleware": "^0.1.5",
         "sitemap": "^2.1.0"
       },
       "dependencies": {
-        "@pushrocks/smartpromise": {
-          "version": "2.0.5",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
+        "@pushrocks/smartfile": {
+          "version": "7.0.2",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-7.0.2.tgz",
+          "integrity": "sha512-38l9DRalp1McEBFG+qKzBqefVQZZLPNk+uo7Ff1guy8BDxA+tATlZ6O6FuXW7M3wjFDBi245VJs+KWVKcCxBRA==",
+          "requires": {
+            "@pushrocks/smartpath": "^4.0.1",
+            "@pushrocks/smartpromise": "^3.0.2",
+            "@pushrocks/smartrequest": "^1.1.14",
+            "@types/fs-extra": "^5.0.5",
+            "@types/vinyl": "^2.0.2",
+            "fs-extra": "^7.0.1",
+            "glob": "^7.1.3",
+            "js-yaml": "^3.13.1",
+            "vinyl-file": "^3.0.0"
+          }
+        },
+        "@pushrocks/smartrequest": {
+          "version": "1.1.15",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.15.tgz",
+          "integrity": "sha512-MBOOTTdqWy+HvWS4Lt8jzITxF2hYyQ3/OjB28CpTAkPuKsDyLi9HEngvFufKu5EbKwBGwCVdeF7vQSpLRSoDtA==",
+          "requires": {
+            "@pushrocks/smartpromise": "^3.0.2",
+            "@types/form-data": "^2.2.1",
+            "form-data": "^2.3.3"
+          }
+        },
+        "@types/fs-extra": {
+          "version": "5.0.5",
+          "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-5.0.5.tgz",
+          "integrity": "sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A==",
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
         }
       }
     },
@@ -273,6 +311,7 @@
       "version": "6.0.12",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-6.0.12.tgz",
       "integrity": "sha512-89abBQgZ/90YWTjVD2ZMkgO4Em4XM0xLf1wPBG4s1yVCdwBSrVX/Eg1EvHyNEk7lbule0NoBmCAvHcIb95FRXQ==",
+      "dev": true,
       "requires": {
         "@pushrocks/smartpath": "^4.0.1",
         "@pushrocks/smartpromise": "^2.0.5",
@@ -288,7 +327,8 @@
         "@pushrocks/smartpromise": {
           "version": "2.0.5",
           "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
+          "dev": true
         }
       }
     },
@@ -355,6 +395,7 @@
       "version": "1.1.14",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.14.tgz",
       "integrity": "sha512-+sDQB4Mxvpn8BIMPUQ7TPSCKUVMln3tHC4rp4pmfEHmBQK+g1XwtNr59aMA9kEoBDMt7li1hu+1cs+SNsWt6Gw==",
+      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5",
         "@types/form-data": "^2.2.1",
@@ -364,7 +405,8 @@
         "@pushrocks/smartpromise": {
           "version": "2.0.5",
           "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
+          "dev": true
         }
       }
     },
@@ -506,9 +548,9 @@
       "dev": true
     },
     "@types/finalhandler": {
-      "version": "0.0.33",
-      "resolved": "https://verdaccio.lossless.one/@types%2ffinalhandler/-/finalhandler-0.0.33.tgz",
-      "integrity": "sha512-nV2BixeE7zsjupfRymHLzmBaiXVKVtLELNJhD+MA3EWxSc9Gm68NhpY+quigOlkOpUoDTu8hZWs58yRFgUM5gw==",
+      "version": "1.1.0",
+      "resolved": "https://verdaccio.lossless.one/@types%2ffinalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha512-iMD07b+UPNuqA6cm3yjbTJUfFfZNZpDc6MGQGK60jy5sdqX1W4wUC5RAi3FhaW72+RmVnzYxba8byPP9FWL8/w==",
       "requires": {
         "@types/node": "*"
       }
@@ -525,14 +567,15 @@
       "version": "5.0.4",
       "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-5.0.4.tgz",
       "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==",
+      "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/helmet": {
-      "version": "0.0.42",
-      "resolved": "https://verdaccio.lossless.one/@types%2fhelmet/-/helmet-0.0.42.tgz",
-      "integrity": "sha512-xQjlolRfr7LVa55sGnjtJGcV6/Hf7cfD1IuZo1Do+o3UobOoJJSLIbwkhd9tW18F1Kp4uB77T8TsJ2XKUDwp7g==",
+      "version": "0.0.43",
+      "resolved": "https://verdaccio.lossless.one/@types%2fhelmet/-/helmet-0.0.43.tgz",
+      "integrity": "sha512-45cU1ZW3L6ZxPQzAB597nl7OfUr14ceUWaQRoiByGFAjZlCQRvaEFC4Vv84lLWsFCYVWLU+raz+bIHrVBNTdRw==",
       "requires": {
         "@types/express": "*"
       }
@@ -1749,6 +1792,7 @@
       "version": "3.12.1",
       "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.12.1.tgz",
       "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.1.31",
+  "version": "1.1.34",
   "description": "easy and secure websocket communication",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@pushrocks/lik": "^3.0.5",
     "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartexpress": "^3.0.18",
+    "@pushrocks/smartexpress": "^3.0.19",
     "@pushrocks/smarthash": "^2.0.4",
     "@pushrocks/smartlog": "^2.0.19",
     "@pushrocks/smartpromise": "^3.0.2",

test/test.expressserver.ts

@@ -0,0 +1,139 @@
+// tslint:disable-next-line:no-implicit-dependencies
+import { expect, tap } from '@pushrocks/tapbundle';
+
+import * as smarthash from '@pushrocks/smarthash';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartexpress from '@pushrocks/smartexpress';
+
+import socketIoClient = require('socket.io-client');
+import smartsocket = require('../ts/index');
+
+let testSmartsocket: smartsocket.Smartsocket;
+let testSmartsocketClient: smartsocket.SmartsocketClient;
+let testSocketRole1: smartsocket.SocketRole;
+let testSocketFunction1: smartsocket.SocketFunction;
+let myseServer: smartexpress.Server;
+
+const testConfig = {
+  port: 3000
+};
+
+// class smartsocket
+tap.test('should create a new smartsocket', async () => {
+  testSmartsocket = new smartsocket.Smartsocket({ port: testConfig.port });
+  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
+});
+
+tap.test('Should accept an smartExpressServer as server', async () => {
+  myseServer = new smartexpress.Server({
+    cors: true,
+    forceSsl: false,
+    port: testConfig.port
+  });
+
+  testSmartsocket.setExternalServer('smartexpress', myseServer);
+
+  await myseServer.start();
+});
+
+tap.test('should start listening when .started is called', async () => {
+  await testSmartsocket.start();
+});
+
+// class socketrole
+tap.test('should add a socketrole', async () => {
+  testSocketRole1 = new smartsocket.SocketRole({
+    name: 'testRole1',
+    passwordHash: smarthash.sha256FromStringSync('testPassword')
+  });
+  testSmartsocket.addSocketRoles([testSocketRole1]);
+});
+
+// class SocketFunction
+tap.test('should register a new Function', async () => {
+  testSocketFunction1 = new smartsocket.SocketFunction({
+    allowedRoles: [testSocketRole1],
+    funcDef: async dataArg => {
+      return dataArg;
+    },
+    funcName: 'testFunction1'
+  });
+});
+
+// class SmartsocketClient
+tap.test('should react to a new websocket connection from client', async () => {
+  const done = smartpromise.defer();
+  testSmartsocketClient = new smartsocket.SmartsocketClient({
+    port: testConfig.port,
+    url: 'http://localhost',
+    password: 'testPassword',
+    alias: 'testClient1',
+    role: 'testRole1'
+  });
+  testSmartsocketClient.connect().then(() => {
+    done.resolve();
+  });
+  await done.promise;
+});
+tap.test('client should disconnect and reconnect', async () => {
+  let done = smartpromise.defer();
+  testSmartsocketClient
+    .disconnect()
+    .then(() => {
+      let done = smartpromise.defer();
+      setTimeout(() => {
+        testSmartsocketClient.connect().then(done.resolve);
+      }, 0);
+      return done.promise;
+    })
+    .then(() => {
+      done.resolve();
+    });
+  await done.promise;
+});
+
+tap.test('2 clients should connect in parallel', async () => {
+  // TODO: implement parallel test
+});
+
+tap.test('should be able to make a functionCall from client to server', async () => {
+  let done = smartpromise.defer();
+  testSmartsocketClient
+    .serverCall('testFunction1', {
+      value1: 'hello'
+    })
+    .then(dataArg => {
+      console.log(dataArg);
+      done.resolve();
+    });
+  await done.promise;
+});
+
+tap.test('should be able to make a functionCall from server to client', async () => {
+  let done = smartpromise.defer();
+  let targetSocket = (() => {
+    return smartsocket.allSocketConnections.find(socketConnectionArg => {
+      return socketConnectionArg.alias === 'testClient1';
+    });
+  })();
+  testSmartsocket
+    .clientCall(
+      'testFunction1',
+      {
+        value1: 'helloFromServer'
+      },
+      targetSocket
+    )
+    .then(dataArg => {
+      console.log(dataArg);
+      done.resolve();
+    });
+});
+
+// terminate
+tap.test('should close the server', async () => {
+  await testSmartsocket.stop();
+  await myseServer.stop();
+});
+
+tap.start();

test/test.ts

@@ -1,8 +1,8 @@
 // tslint:disable-next-line:no-implicit-dependencies
 import { expect, tap } from '@pushrocks/tapbundle';
 
-import * as nodehash from '@pushrocks/smarthash';
-import * as smartq from '@pushrocks/smartpromise';
+import * as smarthash from '@pushrocks/smarthash';
+import * as smartpromise from '@pushrocks/smartpromise';
 
 import socketIoClient = require('socket.io-client');
 import smartsocket = require('../ts/index');
@@ -30,7 +30,7 @@ tap.test('should start listening when .started is called', async () => {
 tap.test('should add a socketrole', async () => {
   testSocketRole1 = new smartsocket.SocketRole({
     name: 'testRole1',
-    passwordHash: nodehash.sha256FromStringSync('testPassword')
+    passwordHash: smarthash.sha256FromStringSync('testPassword')
   });
   testSmartsocket.addSocketRoles([testSocketRole1]);
 });
@@ -48,7 +48,7 @@ tap.test('should register a new Function', async () => {
 
 // class SmartsocketClient
 tap.test('should react to a new websocket connection from client', async () => {
-  const done = smartq.defer();
+  const done = smartpromise.defer();
   testSmartsocketClient = new smartsocket.SmartsocketClient({
     port: testConfig.port,
     url: 'http://localhost',
@@ -62,11 +62,11 @@ tap.test('should react to a new websocket connection from client', async () => {
   await done.promise;
 });
 tap.test('client should disconnect and reconnect', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   testSmartsocketClient
     .disconnect()
     .then(() => {
-      let done = smartq.defer();
+      let done = smartpromise.defer();
       setTimeout(() => {
         testSmartsocketClient.connect().then(done.resolve);
       }, 0);
@@ -83,7 +83,7 @@ tap.test('2 clients should connect in parallel', async () => {
 });
 
 tap.test('should be able to make a functionCall from client to server', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   testSmartsocketClient
     .serverCall('testFunction1', {
       value1: 'hello'
@@ -96,7 +96,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
 });
 
 tap.test('should be able to make a functionCall from server to client', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   let targetSocket = (() => {
     return smartsocket.allSocketConnections.find(socketConnectionArg => {
       return socketConnectionArg.alias === 'testClient1';