1.1.46

fix(core): update
1.1.45
2019-09-01 18:07:53 +02:00 · 2019-09-01 18:07:52 +02:00 · 2019-08-13 15:58:08 +02:00 · 2019-08-13 15:58:08 +02:00 · 2019-08-13 11:36:32 +02:00 · 2019-08-13 11:36:31 +02:00
15 changed files with 415 additions and 499 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -1,22 +1,12 @@
 {
  "name": "@pushrocks/smartsocket",
-  "version": "1.1.39",
+  "version": "1.1.46",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
-    "@airbnb/node-memwatch": {
-      "version": "1.0.2",
-      "resolved": "https://verdaccio.lossless.one/@airbnb%2fnode-memwatch/-/node-memwatch-1.0.2.tgz",
-      "integrity": "sha512-2R+MEEMSTUdKwQ6NFWkyA/UNoSjL1tMldZqJbZpgXSwNMBzlNlkUWEXKu9RqTTMkDqJRfGJ2VDs8gPlPK2APDQ==",
-      "dev": true,
-      "requires": {
-        "bindings": "^1.3.0",
-        "nan": "^2.9.2"
-      }
-    },
    "@babel/code-frame": {
      "version": "7.5.5",
-      "resolved": "https://verdaccio.lossless.one/@babel%2fcode-frame/-/code-frame-7.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
      "dev": true,
      "requires": {
@ -25,7 +15,7 @@
    },
    "@babel/highlight": {
      "version": "7.5.0",
-      "resolved": "https://verdaccio.lossless.one/@babel%2fhighlight/-/highlight-7.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
      "dev": true,
      "requires": {
@ -35,9 +25,9 @@
      }
    },
    "@gitzone/tsbuild": {
-      "version": "2.1.11",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.11.tgz",
-      "integrity": "sha512-Sa90/S7rkfFaTa2yeASHVAWIl3hNh9DBqVcQbOCaNhqKUGdD+NzPw1MESuMOXqKG7oM5i4Cu6qfcJB0fmAjS8g==",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.1.17.tgz",
+      "integrity": "sha512-Mg2cu7cW3cC6L2tzatB8t6OMVgTGatobb8UkN+y3n7KAWRld4gXcVWmaehch/wSFrbmk6Oe8rPjdWPjhTSIF1Q==",
      "dev": true,
      "requires": {
        "@pushrocks/smartcli": "^3.0.7",
@ -45,7 +35,7 @@
        "@pushrocks/smartlog": "^2.0.19",
        "@pushrocks/smartpath": "^4.0.1",
        "@pushrocks/smartpromise": "^3.0.2",
-        "typescript": "^3.4.5"
+        "typescript": "^3.5.2"
      }
    },
    "@gitzone/tsrun": {
@ -111,7 +101,7 @@
    },
    "@pushrocks/early": {
      "version": "3.0.3",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fearly/-/early-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/early/-/early-3.0.3.tgz",
      "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
      "dev": true,
      "requires": {
@ -121,16 +111,16 @@
      "dependencies": {
        "@pushrocks/smartpromise": {
          "version": "2.0.5",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
          "dev": true
        }
      }
    },
    "@pushrocks/lik": {
-      "version": "3.0.10",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-3.0.10.tgz",
-      "integrity": "sha512-iWG06QsrL6AAnjPRWMVz4bRaRE0jJt/HgEK0YeLqaSBLY8ju4ps1j4lEN8VrUlXGZyPB6UGQfcreesO24buYhQ==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@pushrocks/lik/-/lik-3.0.11.tgz",
+      "integrity": "sha512-SDKRPj9+xBTqozlDPcA7O6BcccM1Tw/sXPVP+OnhNxCubDZ/L2kGNpPpqm43NJUoNxSSo5wdBw4N7MAFYCGdVg==",
      "requires": {
        "@pushrocks/smartdelay": "^2.0.3",
        "@pushrocks/smartpromise": "^3.0.2",
@ -143,7 +133,7 @@
    },
    "@pushrocks/smartcli": {
      "version": "3.0.7",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartcli/-/smartcli-3.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartcli/-/smartcli-3.0.7.tgz",
      "integrity": "sha512-K8jrwLUSbXxaRXiN9CoD3epmWu4xEU0sGhKGNmXEwaxwVWX+vVp6WZED02T0jz1Pz/KD0MHQP9Po6fyVjLbocw==",
      "dev": true,
      "requires": {
@ -158,7 +148,7 @@
      "dependencies": {
        "@pushrocks/smartpromise": {
          "version": "2.0.5",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
          "dev": true
        }
@ -199,9 +189,9 @@
      }
    },
    "@pushrocks/smartexpress": {
-      "version": "3.0.38",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.38.tgz",
-      "integrity": "sha512-di26orVJwgBRGKVpYcPrauc14CVo0piAzXTBWFZZNUCuIsndnXepd9oDzMO+KHVZpNz3W4DxbtRkppZjrh9ejw==",
+      "version": "3.0.40",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartexpress/-/smartexpress-3.0.40.tgz",
+      "integrity": "sha512-biAquO44yvrZ/elC3psUbYYoeZn647HjZXyQ14WL5IcXMgnKBo5+qvkqNgDmcHSKJ9KuVnycuRWa8vg6z77GSg==",
      "requires": {
        "@pushrocks/lik": "^3.0.10",
        "@pushrocks/smartfile": "^7.0.4",
@ -238,9 +228,9 @@
          }
        },
        "@pushrocks/smartrequest": {
-          "version": "1.1.16",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.16.tgz",
-          "integrity": "sha512-3LbtqoqnjfzWSQ10NryhJmgwPpvMlVoYyTzE676+yC4hM2rnGSzxozLZxMr6enV4VeZcloQ0CqHBivKoT/kdvA==",
+          "version": "1.1.23",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.1.23.tgz",
+          "integrity": "sha512-Hws3YfzIE0b/E3aTkSugLskKWBq7e8HDXEN+RlRyTFONxW/XONKJFTw4mp3jk+puWpYGDoOTcP+Ua4jd19z9pA==",
          "requires": {
            "@pushrocks/smartpromise": "^3.0.2",
            "@types/form-data": "^2.2.1",
@ -317,7 +307,7 @@
    },
    "@pushrocks/smartparam": {
      "version": "1.0.4",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartparam/-/smartparam-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartparam/-/smartparam-1.0.4.tgz",
      "integrity": "sha512-UAqhnTQGBaJRptTK3qTd47Yt2ZTrAWByteow4auSNZD+k0xrpY9mTPPgKh0IwsURe0cZhj7zYNpGiekhKkL4rA==",
      "dev": true,
      "requires": {
@ -328,7 +318,7 @@
      "dependencies": {
        "@pushrocks/smartpromise": {
          "version": "2.0.5",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
          "dev": true
        }
@ -399,22 +389,21 @@
      }
    },
    "@pushrocks/tapbundle": {
-      "version": "3.0.11",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.0.11.tgz",
-      "integrity": "sha512-s7epZfJZX+LsBVmIYvoaY4WtgPvRLnHZMVTpQAPJGMBqxJAQxhQ2wvGJjmqMAGhhznAHI6t4g+m0KTp3vFIRVg==",
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.13.tgz",
+      "integrity": "sha512-23O4UMBafCuD+RnUlXNvtT9DGbL1HMD+xZE1Zcr7Ll7WvgxUgRQQfk9kq6qbLLbjaRe1J2Ijsgh1HuZbBaucLQ==",
      "dev": true,
      "requires": {
        "@pushrocks/early": "^3.0.3",
        "@pushrocks/smartdelay": "^2.0.3",
        "@pushrocks/smartpromise": "^3.0.2",
-        "leakage": "^0.4.0",
        "smartchai": "^2.0.1"
      }
    },
    "@types/body-parser": {
-      "version": "1.17.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fbody-parser/-/body-parser-1.17.0.tgz",
-      "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz",
+      "integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==",
      "requires": {
        "@types/connect": "*",
        "@types/node": "*"
@ -422,13 +411,13 @@
    },
    "@types/chai": {
      "version": "4.2.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.0.tgz",
      "integrity": "sha512-zw8UvoBEImn392tLjxoavuonblX/4Yb9ha4KBU10FirCfwgzhKO0dvyJSF9ByxV1xK1r2AgnAi/tvQaLgxQqxA==",
      "dev": true
    },
    "@types/chai-as-promised": {
      "version": "7.1.2",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
      "integrity": "sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==",
      "dev": true,
      "requires": {
@ -437,7 +426,7 @@
    },
    "@types/chai-string": {
      "version": "1.4.2",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.2.tgz",
      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
      "dev": true,
      "requires": {
@ -462,9 +451,9 @@
      }
    },
    "@types/express": {
-      "version": "4.17.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fexpress/-/express-4.17.0.tgz",
-      "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==",
      "requires": {
        "@types/body-parser": "*",
        "@types/express-serve-static-core": "*",
@ -472,9 +461,9 @@
      }
    },
    "@types/express-serve-static-core": {
-      "version": "4.16.7",
-      "resolved": "https://verdaccio.lossless.one/@types%2fexpress-serve-static-core/-/express-serve-static-core-4.16.7.tgz",
-      "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==",
+      "version": "4.16.9",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz",
+      "integrity": "sha512-GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==",
      "requires": {
        "@types/node": "*",
        "@types/range-parser": "*"
@ -542,9 +531,9 @@
      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
    },
    "@types/node": {
-      "version": "12.7.1",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.7.1.tgz",
-      "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw=="
+      "version": "12.7.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.3.tgz",
+      "integrity": "sha512-3SiLAIBkDWDg6vFo0+5YJyHPWU9uwu40Qe+v+0MH8wRKYBimHvvAOyk3EzMrD/TrIlLYfXrqDqrg913PynrMJQ=="
    },
    "@types/range-parser": {
      "version": "1.2.3",
@ -552,9 +541,9 @@
      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
    },
    "@types/serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://verdaccio.lossless.one/@types%2fserve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz",
+      "integrity": "sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==",
      "requires": {
        "@types/express-serve-static-core": "*",
        "@types/mime": "*"
@ -609,7 +598,7 @@
    },
    "@types/yargs": {
      "version": "12.0.12",
-      "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-12.0.12.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
      "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==",
      "dev": true
    },
@ -646,7 +635,7 @@
    },
    "ansi-regex": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
      "dev": true
    },
@ -698,7 +687,7 @@
    },
    "assertion-error": {
      "version": "1.1.0",
-      "resolved": "https://verdaccio.lossless.one/assertion-error/-/assertion-error-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
      "dev": true
    },
@ -758,15 +747,6 @@
        "callsite": "1.0.0"
      }
    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://verdaccio.lossless.one/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
    "blob": {
      "version": "0.0.5",
      "resolved": "https://verdaccio.lossless.one/blob/-/blob-0.0.5.tgz",
@ -804,6 +784,11 @@
        }
      }
    },
+    "bowser": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.5.3.tgz",
+      "integrity": "sha512-aWCA+CKfKNL/WGzNgjmK+Whp57JMzboZMwJ5gy2jDj2bEIjbMCb3ImGX+V++5wsJftyFiDIbOjRXl60ycniVqg=="
+    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://verdaccio.lossless.one/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -821,7 +806,7 @@
    },
    "builtin-modules": {
      "version": "1.1.1",
-      "resolved": "https://verdaccio.lossless.one/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
      "dev": true
    },
@ -837,7 +822,7 @@
    },
    "camelcase": {
      "version": "5.3.1",
-      "resolved": "https://verdaccio.lossless.one/camelcase/-/camelcase-5.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
      "dev": true
    },
@ -853,7 +838,7 @@
    },
    "chai": {
      "version": "4.2.0",
-      "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
      "dev": true,
      "requires": {
@ -867,7 +852,7 @@
    },
    "chai-as-promised": {
      "version": "7.1.1",
-      "resolved": "https://verdaccio.lossless.one/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
      "dev": true,
      "requires": {
@ -876,7 +861,7 @@
    },
    "chai-string": {
      "version": "1.5.0",
-      "resolved": "https://verdaccio.lossless.one/chai-string/-/chai-string-1.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz",
      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
      "dev": true
    },
@ -893,7 +878,7 @@
    },
    "check-error": {
      "version": "1.0.2",
-      "resolved": "https://verdaccio.lossless.one/check-error/-/check-error-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
      "dev": true
    },
@ -914,7 +899,7 @@
    },
    "cliui": {
      "version": "4.1.0",
-      "resolved": "https://verdaccio.lossless.one/cliui/-/cliui-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
      "dev": true,
      "requires": {
@ -979,7 +964,7 @@
    },
    "code-point-at": {
      "version": "1.1.0",
-      "resolved": "https://verdaccio.lossless.one/code-point-at/-/code-point-at-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
      "dev": true
    },
@ -1008,7 +993,7 @@
    },
    "commander": {
      "version": "2.20.0",
-      "resolved": "https://verdaccio.lossless.one/commander/-/commander-2.20.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
      "dev": true
    },
@ -1084,7 +1069,7 @@
    },
    "cross-spawn": {
      "version": "6.0.5",
-      "resolved": "https://verdaccio.lossless.one/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
      "dev": true,
      "requires": {
@ -1118,13 +1103,13 @@
    },
    "decamelize": {
      "version": "1.2.0",
-      "resolved": "https://verdaccio.lossless.one/decamelize/-/decamelize-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
      "dev": true
    },
    "deep-eql": {
      "version": "3.0.1",
-      "resolved": "https://verdaccio.lossless.one/deep-eql/-/deep-eql-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
      "dev": true,
      "requires": {
@ -1200,7 +1185,7 @@
    },
    "end-of-stream": {
      "version": "1.4.1",
-      "resolved": "https://verdaccio.lossless.one/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
      "dev": true,
      "requires": {
@ -1280,12 +1265,6 @@
        "has-binary2": "~1.0.2"
      }
    },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://verdaccio.lossless.one/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://verdaccio.lossless.one/escape-html/-/escape-html-1.0.3.tgz",
@ -1304,7 +1283,7 @@
    },
    "esutils": {
      "version": "2.0.3",
-      "resolved": "https://verdaccio.lossless.one/esutils/-/esutils-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
      "dev": true
    },
@ -1315,7 +1294,7 @@
    },
    "execa": {
      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/execa/-/execa-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
      "dev": true,
      "requires": {
@ -1459,12 +1438,6 @@
        "escape-string-regexp": "^1.0.5"
      }
    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true
-    },
    "finalhandler": {
      "version": "1.1.2",
      "resolved": "https://verdaccio.lossless.one/finalhandler/-/finalhandler-1.1.2.tgz",
@ -1496,7 +1469,7 @@
    },
    "find-up": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/find-up/-/find-up-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
      "dev": true,
      "requires": {
@ -1587,19 +1560,19 @@
    },
    "get-caller-file": {
      "version": "1.0.3",
-      "resolved": "https://verdaccio.lossless.one/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
      "dev": true
    },
    "get-func-name": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/get-func-name/-/get-func-name-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
      "dev": true
    },
    "get-stream": {
      "version": "4.1.0",
-      "resolved": "https://verdaccio.lossless.one/get-stream/-/get-stream-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
      "dev": true,
      "requires": {
@ -1666,9 +1639,9 @@
      "dev": true
    },
    "helmet": {
-      "version": "3.20.0",
-      "resolved": "https://verdaccio.lossless.one/helmet/-/helmet-3.20.0.tgz",
-      "integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==",
+      "version": "3.20.1",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.1.tgz",
+      "integrity": "sha512-em+X5Wz/f0yqoRsBnpnVy3wJHSiIeskX3FQn30szBh1tILaOeSRRLkShuUVFlk/o4qTYjWxdHg4FrRe45iBWHg==",
      "requires": {
        "depd": "2.0.0",
        "dns-prefetch-control": "0.2.0",
@ -1677,7 +1650,7 @@
        "feature-policy": "0.3.0",
        "frameguard": "3.1.0",
        "helmet-crossdomain": "0.4.0",
-        "helmet-csp": "2.8.0",
+        "helmet-csp": "2.9.0",
        "hide-powered-by": "1.1.0",
        "hpkp": "2.0.0",
        "hsts": "2.2.0",
@ -1700,14 +1673,14 @@
      "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="
    },
    "helmet-csp": {
-      "version": "2.8.0",
-      "resolved": "https://verdaccio.lossless.one/helmet-csp/-/helmet-csp-2.8.0.tgz",
-      "integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.0.tgz",
+      "integrity": "sha512-DGGOQtOLM7ZQpjbf/uvUonq1yG/rFgsBuK10ZJt2AtxUJxqfkPvfmP9aLUmgH9IactiRiYoiFY72YYSPl1TLTQ==",
      "requires": {
+        "bowser": "2.5.3",
        "camelize": "1.0.0",
        "content-security-policy-builder": "2.1.0",
-        "dasherize": "2.0.0",
-        "platform": "1.3.5"
+        "dasherize": "2.0.0"
      }
    },
    "hide-powered-by": {
@ -1791,7 +1764,7 @@
    },
    "invert-kv": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/invert-kv/-/invert-kv-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
      "dev": true
    },
@ -1802,19 +1775,19 @@
    },
    "is-fullwidth-code-point": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
      "dev": true
    },
    "is-promise": {
      "version": "2.1.0",
-      "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
      "dev": true
    },
    "is-stream": {
      "version": "1.1.0",
-      "resolved": "https://verdaccio.lossless.one/is-stream/-/is-stream-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
      "dev": true
    },
@ -1846,7 +1819,7 @@
    },
    "js-tokens": {
      "version": "4.0.0",
-      "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
      "dev": true
    },
@ -1900,35 +1873,16 @@
    },
    "lcid": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/lcid/-/lcid-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
      "dev": true,
      "requires": {
        "invert-kv": "^2.0.0"
      }
    },
-    "leakage": {
-      "version": "0.4.0",
-      "resolved": "https://verdaccio.lossless.one/leakage/-/leakage-0.4.0.tgz",
-      "integrity": "sha512-x7gYK5n5dPkHDZWJ2Kh8Ag1hZNzUh+HtXn8Bv1aDdN6o6ONPCJ8sOfFq+kxcULJFp3lXaCjXb3iXOLmQRbBLwA==",
-      "dev": true,
-      "requires": {
-        "@airbnb/node-memwatch": "^1.0.2",
-        "es6-error": "^4.0.2",
-        "left-pad": "^1.1.3",
-        "minimist": "^1.2.0",
-        "pretty-bytes": "^4.0.2"
-      }
-    },
-    "left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://verdaccio.lossless.one/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
-      "dev": true
-    },
    "locate-path": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/locate-path/-/locate-path-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
      "dev": true,
      "requires": {
@ -2052,7 +2006,7 @@
    },
    "map-age-cleaner": {
      "version": "0.1.3",
-      "resolved": "https://verdaccio.lossless.one/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
      "dev": true,
      "requires": {
@ -2066,7 +2020,7 @@
    },
    "mem": {
      "version": "4.3.0",
-      "resolved": "https://verdaccio.lossless.one/mem/-/mem-4.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
      "dev": true,
      "requires": {
@ -2105,7 +2059,7 @@
    },
    "mimic-fn": {
      "version": "2.1.0",
-      "resolved": "https://verdaccio.lossless.one/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
      "dev": true
    },
@ -2118,26 +2072,18 @@
      }
    },
    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
      "dev": true
    },
    "mkdirp": {
      "version": "0.5.1",
-      "resolved": "https://verdaccio.lossless.one/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
      "dev": true,
      "requires": {
        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
      }
    },
    "moment": {
@ -2158,12 +2104,6 @@
      "resolved": "https://verdaccio.lossless.one/ms/-/ms-2.1.1.tgz",
      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://verdaccio.lossless.one/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true
-    },
    "nanoid": {
      "version": "2.0.1",
      "resolved": "https://verdaccio.lossless.one/nanoid/-/nanoid-2.0.1.tgz",
@ -2176,7 +2116,7 @@
    },
    "nice-try": {
      "version": "1.0.5",
-      "resolved": "https://verdaccio.lossless.one/nice-try/-/nice-try-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
      "dev": true
    },
@ -2187,7 +2127,7 @@
    },
    "npm-run-path": {
      "version": "2.0.2",
-      "resolved": "https://verdaccio.lossless.one/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
      "dev": true,
      "requires": {
@ -2196,7 +2136,7 @@
    },
    "number-is-nan": {
      "version": "1.0.1",
-      "resolved": "https://verdaccio.lossless.one/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
      "dev": true
    },
@ -2281,7 +2221,7 @@
    },
    "os-locale": {
      "version": "3.1.0",
-      "resolved": "https://verdaccio.lossless.one/os-locale/-/os-locale-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
      "dev": true,
      "requires": {
@ -2292,26 +2232,26 @@
    },
    "p-defer": {
      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/p-defer/-/p-defer-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
      "dev": true
    },
    "p-finally": {
      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/p-finally/-/p-finally-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
      "dev": true
    },
    "p-is-promise": {
      "version": "2.1.0",
-      "resolved": "https://verdaccio.lossless.one/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
      "dev": true
    },
    "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://verdaccio.lossless.one/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
      "dev": true,
      "requires": {
        "p-try": "^2.0.0"
@ -2319,7 +2259,7 @@
    },
    "p-locate": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/p-locate/-/p-locate-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
      "dev": true,
      "requires": {
@ -2328,7 +2268,7 @@
    },
    "p-try": {
      "version": "2.2.0",
-      "resolved": "https://verdaccio.lossless.one/p-try/-/p-try-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
      "dev": true
    },
@ -2355,7 +2295,7 @@
    },
    "path-exists": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/path-exists/-/path-exists-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
      "dev": true
    },
@ -2366,13 +2306,13 @@
    },
    "path-key": {
      "version": "2.0.1",
-      "resolved": "https://verdaccio.lossless.one/path-key/-/path-key-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
      "dev": true
    },
    "path-parse": {
      "version": "1.0.6",
-      "resolved": "https://verdaccio.lossless.one/path-parse/-/path-parse-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
      "dev": true
    },
@ -2383,7 +2323,7 @@
    },
    "pathval": {
      "version": "1.1.0",
-      "resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
      "dev": true
    },
@ -2397,17 +2337,6 @@
      "resolved": "https://verdaccio.lossless.one/pify/-/pify-2.3.0.tgz",
      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
    },
-    "platform": {
-      "version": "1.3.5",
-      "resolved": "https://verdaccio.lossless.one/platform/-/platform-1.3.5.tgz",
-      "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q=="
-    },
-    "pretty-bytes": {
-      "version": "4.0.2",
-      "resolved": "https://verdaccio.lossless.one/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-      "dev": true
-    },
    "process-nextick-args": {
      "version": "2.0.0",
      "resolved": "https://verdaccio.lossless.one/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@ -2429,7 +2358,7 @@
    },
    "pump": {
      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/pump/-/pump-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
      "dev": true,
      "requires": {
@ -2533,19 +2462,19 @@
    },
    "require-directory": {
      "version": "2.1.1",
-      "resolved": "https://verdaccio.lossless.one/require-directory/-/require-directory-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
      "dev": true
    },
    "require-main-filename": {
      "version": "1.0.1",
-      "resolved": "https://verdaccio.lossless.one/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
      "dev": true
    },
    "resolve": {
      "version": "1.12.0",
-      "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
      "dev": true,
      "requires": {
@ -2581,9 +2510,9 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "semver": {
-      "version": "5.7.0",
-      "resolved": "https://verdaccio.lossless.one/semver/-/semver-5.7.0.tgz",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
      "dev": true
    },
    "send": {
@ -2636,7 +2565,7 @@
    },
    "set-blocking": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/set-blocking/-/set-blocking-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
      "dev": true
    },
@ -2647,7 +2576,7 @@
    },
    "shebang-command": {
      "version": "1.2.0",
-      "resolved": "https://verdaccio.lossless.one/shebang-command/-/shebang-command-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
      "dev": true,
      "requires": {
@ -2656,7 +2585,7 @@
    },
    "shebang-regex": {
      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
      "dev": true
    },
@ -2687,7 +2616,7 @@
    },
    "smartchai": {
      "version": "2.0.1",
-      "resolved": "https://verdaccio.lossless.one/smartchai/-/smartchai-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/smartchai/-/smartchai-2.0.1.tgz",
      "integrity": "sha512-9M+R56OhAHXScxgr2vzQqxGx0XMS0QXriNZuP7hjlbVbo2FUT+l60iEzbwPt9Ga+5u2cEEjSSoZEQVqlROaddA==",
      "dev": true,
      "requires": {
@ -2822,7 +2751,7 @@
    },
    "string-width": {
      "version": "2.1.1",
-      "resolved": "https://verdaccio.lossless.one/string-width/-/string-width-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
      "dev": true,
      "requires": {
@ -2847,7 +2776,7 @@
    },
    "strip-ansi": {
      "version": "4.0.0",
-      "resolved": "https://verdaccio.lossless.one/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
      "dev": true,
      "requires": {
@ -2881,7 +2810,7 @@
    },
    "strip-eof": {
      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
      "dev": true
    },
@ -2960,9 +2889,9 @@
      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
    },
    "tslint": {
-      "version": "5.18.0",
-      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.18.0.tgz",
-      "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.19.0.tgz",
+      "integrity": "sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@ -2982,7 +2911,7 @@
      "dependencies": {
        "diff": {
          "version": "3.5.0",
-          "resolved": "https://verdaccio.lossless.one/diff/-/diff-3.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
          "dev": true
        }
@ -2996,7 +2925,7 @@
    },
    "tsutils": {
      "version": "2.29.0",
-      "resolved": "https://verdaccio.lossless.one/tsutils/-/tsutils-2.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
      "dev": true,
      "requires": {
@ -3018,7 +2947,7 @@
    },
    "type-detect": {
      "version": "4.0.8",
-      "resolved": "https://verdaccio.lossless.one/type-detect/-/type-detect-4.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
      "dev": true
    },
@ -3047,9 +2976,9 @@
      }
    },
    "typescript": {
-      "version": "3.5.1",
-      "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-3.5.1.tgz",
-      "integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz",
+      "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==",
      "dev": true
    },
    "universalify": {
@ -3081,9 +3010,9 @@
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
    },
    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://verdaccio.lossless.one/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
    },
    "vary": {
      "version": "1.1.2",
@ -3160,13 +3089,13 @@
    },
    "which-module": {
      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/which-module/-/which-module-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
      "dev": true
    },
    "wrap-ansi": {
      "version": "2.1.0",
-      "resolved": "https://verdaccio.lossless.one/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "dev": true,
      "requires": {
@ -3176,13 +3105,13 @@
      "dependencies": {
        "ansi-regex": {
          "version": "2.1.1",
-          "resolved": "https://verdaccio.lossless.one/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
          "dev": true
        },
        "is-fullwidth-code-point": {
          "version": "1.0.0",
-          "resolved": "https://verdaccio.lossless.one/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "dev": true,
          "requires": {
@ -3191,7 +3120,7 @@
        },
        "string-width": {
          "version": "1.0.2",
-          "resolved": "https://verdaccio.lossless.one/string-width/-/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
          "dev": true,
          "requires": {
@ -3202,7 +3131,7 @@
        },
        "strip-ansi": {
          "version": "3.0.1",
-          "resolved": "https://verdaccio.lossless.one/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
          "dev": true,
          "requires": {
@ -3241,13 +3170,13 @@
    },
    "y18n": {
      "version": "4.0.0",
-      "resolved": "https://verdaccio.lossless.one/y18n/-/y18n-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
      "dev": true
    },
    "yargs": {
      "version": "12.0.5",
-      "resolved": "https://verdaccio.lossless.one/yargs/-/yargs-12.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
      "dev": true,
      "requires": {
@ -3267,7 +3196,7 @@
    },
    "yargs-parser": {
      "version": "11.1.1",
-      "resolved": "https://verdaccio.lossless.one/yargs-parser/-/yargs-parser-11.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
      "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
      "dev": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartsocket",
-  "version": "1.1.39",
+  "version": "1.1.46",
  "description": "easy and secure websocket communication",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
@ -19,9 +19,9 @@
  },
  "homepage": "https://gitlab.com/pushrocks/smartsocket#README",
  "dependencies": {
-    "@pushrocks/lik": "^3.0.10",
+    "@pushrocks/lik": "^3.0.11",
    "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartexpress": "^3.0.38",
+    "@pushrocks/smartexpress": "^3.0.40",
    "@pushrocks/smarthash": "^2.0.6",
    "@pushrocks/smartlog": "^2.0.19",
    "@pushrocks/smartpromise": "^3.0.2",
@ -33,12 +33,12 @@
    "socket.io-client": "^2.2.0"
  },
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.17",
    "@gitzone/tsrun": "^1.2.8",
    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.11",
-    "@types/node": "^12.7.1",
-    "tslint": "^5.18.0",
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.7.3",
+    "tslint": "^5.19.0",
    "tslint-config-prettier": "^1.18.0"
  },
  "private": false,
--- a/test/common/test.ts
+++ b/test/common/test.ts
@ -0,0 +1 @@
+console.log('TODO');
--- a/test/test.expressserver.ts
+++ b/test/test.expressserver.ts
@ -36,10 +36,6 @@ tap.test('Should accept an smartExpressServer as server', async () => {
  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({
@ -53,16 +49,21 @@ tap.test('should add a socketrole', async () => {
 tap.test('should register a new Function', async () => {
  testSocketFunction1 = new smartsocket.SocketFunction({
    allowedRoles: [testSocketRole1],
-    funcDef: async dataArg => {
+    funcDef: async (dataArg, socketConnectionArg) => {
      return dataArg;
    },
    funcName: 'testFunction1'
  });
+  testSmartsocket.addSocketFunction(testSocketFunction1);
+  console.log(testSmartsocket.socketFunctions);
+});
+
+tap.test('should start listening when .started is called', async () => {
+  await testSmartsocket.start();
 });

 // 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',
@ -70,26 +71,15 @@ tap.test('should react to a new websocket connection from client', async () => {
    alias: 'testClient1',
    role: 'testRole1'
  });
-  testSmartsocketClient.connect().then(() => {
-    done.resolve();
-  });
-  await done.promise;
+  testSmartsocketClient.addSocketFunction(testSocketFunction1);
+  console.log(testSmartsocketClient.socketFunctions);
+  await testSmartsocketClient.connect();
 });
-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('client should disconnect and reconnect', async tools => {
+  await testSmartsocketClient.disconnect();
+  await tools.delayFor(100);
+  await testSmartsocketClient.connect();
 });

 tap.test('2 clients should connect in parallel', async () => {
@ -97,38 +87,13 @@ 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 = smartpromise.defer();
-  testSmartsocketClient
-    .serverCall('testFunction1', {
-      value1: 'hello'
-    })
-    .then(dataArg => {
-      console.log(dataArg);
-      done.resolve();
-    });
-  await done.promise;
+  const response = await testSmartsocketClient.serverCall('testFunction1', {
+    value1: 'hello'
+  });
+  console.log(response);
 });

-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();
-    });
-});
+tap.test('should be able to make a functionCall from server to client', async () => {});

 // terminate
 tap.test('should close the server', async () => {
--- a/test/test.ts
+++ b/test/test.ts
@ -9,8 +9,10 @@ import smartsocket = require('../ts/index');

 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
+let testSocketConnection: smartsocket.SocketConnection;
 let testSocketRole1: smartsocket.SocketRole;
-let testSocketFunction1: smartsocket.SocketFunction;
+let testSocketFunctionForServer: smartsocket.SocketFunction;
+let testSocketFunctionClient: smartsocket.SocketFunction;

 const testConfig = {
  port: 3000
@ -22,10 +24,6 @@ tap.test('should create a new smartsocket', async () => {
  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
 });

-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({
@ -37,18 +35,32 @@ tap.test('should add a socketrole', async () => {

 // class SocketFunction
 tap.test('should register a new Function', async () => {
-  testSocketFunction1 = new smartsocket.SocketFunction({
+  testSocketFunctionForServer = new smartsocket.SocketFunction({
    allowedRoles: [testSocketRole1],
    funcDef: async (dataArg, socketConnectionArg) => {
      return dataArg;
    },
    funcName: 'testFunction1'
  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+
+  testSocketFunctionClient = new smartsocket.SocketFunction({
+    allowedRoles: [],
+    funcDef: async (dataArg, socketConnectionArg) => {
+      return dataArg;
+    },
+    funcName: 'testFunction1'
+  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+  console.log(testSmartsocket.socketFunctions);
+});
+
+tap.test('should start listening when .started is called', async () => {
+  await testSmartsocket.start();
 });

 // 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',
@ -56,26 +68,9 @@ tap.test('should react to a new websocket connection from client', async () => {
    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;
+  testSmartsocketClient.addSocketFunction(testSocketFunctionClient);
+  console.log(testSmartsocketClient.socketFunctions);
+  await testSmartsocketClient.connect();
 });

 tap.test('2 clients should connect in parallel', async () => {
@ -83,37 +78,29 @@ 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 = smartpromise.defer();
-  testSmartsocketClient
-    .serverCall('testFunction1', {
-      value1: 'hello'
-    })
-    .then(dataArg => {
-      console.log(dataArg);
-      done.resolve();
-    });
-  await done.promise;
+  const response = await testSmartsocketClient.serverCall('testFunction1', {
+    value1: 'hello'
+  });
+  console.log(response);
 });

 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();
-    });
+  const response = await testSmartsocket.clientCall(
+    'testFunction1',
+    {
+      hi: 'hi there from server'
+    },
+    testSmartsocket.socketConnections.find(socketConnection => {
+      return true;
+    })
+  );
+  console.log(response);
+});
+
+tap.test('client should disconnect and reconnect', async tools => {
+  await testSmartsocketClient.disconnect();
+  await tools.delayFor(100);
+  await testSmartsocketClient.connect();
 });

 // terminate
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,5 +1,3 @@
-import * as plugins from './smartsocket.plugins';
-
 // export main classes
 export * from './smartsocket.classes.smartsocket';
 export * from './smartsocket.classes.smartsocketclient';
--- a/ts/smartsocket.classes.smartsocket.ts
+++ b/ts/smartsocket.classes.smartsocket.ts
@ -1,5 +1,4 @@
 import * as plugins from './smartsocket.plugins';
-import * as helpers from './smartsocket.helpers';

 // classes
 import { Objectmap } from '@pushrocks/lik';
@ -19,8 +18,10 @@ export interface ISmartsocketConstructorOptions {
 export class Smartsocket {
  public options: ISmartsocketConstructorOptions;
  public io: SocketIO.Server;
-  public openSockets = new Objectmap<SocketConnection>();
+  public socketConnections = new Objectmap<SocketConnection>();
  public socketRoles = new Objectmap<SocketRole>();
+  public socketFunctions = new Objectmap<SocketFunction>();
+  public socketRequests = new Objectmap<SocketRequest>();

  private socketServer = new SocketServer(this);

@ -49,14 +50,14 @@ export class Smartsocket {
   */
  public async stop() {
    await plugins.smartdelay.delayFor(1000);
-    this.openSockets.forEach((socketObjectArg: SocketConnection) => {
+    this.socketConnections.forEach((socketObjectArg: SocketConnection) => {
      plugins.smartlog.defaultLogger.log(
        'info',
        `disconnect socket with >>alias ${socketObjectArg.alias}`
      );
      socketObjectArg.socket.disconnect();
    });
-    this.openSockets.wipe();
+    this.socketConnections.wipe();
    this.io.close();

    // stop the corresponging server
@ -73,8 +74,7 @@ export class Smartsocket {
    dataArg: any,
    targetSocketConnectionArg: SocketConnection
  ) {
-    const done = plugins.smartpromise.defer();
-    const socketRequest = new SocketRequest({
+    const socketRequest = new SocketRequest(this, {
      funcCallData: {
        funcDataArg: dataArg,
        funcName: functionNameArg
@ -83,10 +83,8 @@ export class Smartsocket {
      shortId: plugins.shortid.generate(),
      side: 'requesting'
    });
-    socketRequest.dispatch().then((dataArg2: ISocketFunctionCall) => {
-      done.resolve(dataArg2.funcDataArg);
-    });
-    const result = await done.promise;
+    const response: ISocketFunctionCall = await socketRequest.dispatch();
+    const result = response.funcDataArg;
    return result;
  }

@ -100,10 +98,14 @@ export class Smartsocket {
    return;
  }

+  public addSocketFunction(socketFunction: SocketFunction) {
+    this.socketFunctions.add(socketFunction);
+  }
+
  /**
   * the standard handler for new socket connections
   */
-  private _handleSocketConnection(socketArg) {
+  private async _handleSocketConnection(socketArg: plugins.socketIo.Socket) {
    const socketConnection: SocketConnection = new SocketConnection({
      alias: undefined,
      authenticated: false,
@ -113,14 +115,8 @@ export class Smartsocket {
      socket: socketArg
    });
    plugins.smartlog.defaultLogger.log('info', 'Socket connected. Trying to authenticate...');
-    this.openSockets.add(socketConnection);
-    socketConnection
-      .authenticate()
-      .then(() => {
-        return socketConnection.listenToFunctionRequests();
-      })
-      .catch(err => {
-        console.log(err);
-      });
+    this.socketConnections.add(socketConnection);
+    await socketConnection.authenticate();
+    await socketConnection.listenToFunctionRequests();
  }
 }
--- a/ts/smartsocket.classes.smartsocketclient.ts
+++ b/ts/smartsocket.classes.smartsocketclient.ts
@ -3,6 +3,7 @@ import * as plugins from './smartsocket.plugins';
 import { SocketConnection } from './smartsocket.classes.socketconnection';
 import { ISocketFunctionCall, SocketFunction } from './smartsocket.classes.socketfunction';
 import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
+import { SocketRole } from './smartsocket.classes.socketrole';

 /**
 * interface for class SmartsocketClient
@ -16,44 +17,55 @@ export interface ISmartsocketClientOptions {
 }

 export class SmartsocketClient {
-  alias: string;
-  role: string;
-  socketConnection: SocketConnection;
-  serverUrl: string;
-  serverPort: number;
-  serverPassword: string;
+  public alias: string;
+  public socketRole: SocketRole;
+  public socketConnection: SocketConnection;
+  public serverUrl: string;
+  public serverPort: number;
+
+  public socketFunctions = new plugins.lik.Objectmap<SocketFunction>();
+  public socketRequests = new plugins.lik.Objectmap<SocketRequest>();
+  public socketRoles = new plugins.lik.Objectmap<SocketRole>();
+
  constructor(optionsArg: ISmartsocketClientOptions) {
    this.alias = optionsArg.alias;
-    this.role = optionsArg.role;
    this.serverUrl = optionsArg.url;
    this.serverPort = optionsArg.port;
-    this.serverPassword = optionsArg.password;
+    this.socketRole = new SocketRole({
+      name: optionsArg.role,
+      passwordHash: optionsArg.password
+    });
+  }
+
+  public addSocketFunction(socketFunction: SocketFunction) {
+    this.socketFunctions.add(socketFunction);
+    this.socketRole.allowedFunctions.add(socketFunction);
  }

  /**
   * connect the client to the server
   */
-  connect() {
-    let done = plugins.smartpromise.defer();
+  public connect() {
+    const done = plugins.smartpromise.defer();
    plugins.smartlog.defaultLogger.log('info', 'trying to connect...');
-    let socketUrl = `${this.serverUrl}:${this.serverPort}`;
+    const socketUrl = `${this.serverUrl}:${this.serverPort}`;
    this.socketConnection = new SocketConnection({
      alias: this.alias,
      authenticated: false,
-      role: undefined,
+      role: this.socketRole,
      side: 'client',
-      smartsocketHost: null,
+      smartsocketHost: this,
      socket: plugins.socketIoClient(socketUrl, { multiplex: false })
    });
    this.socketConnection.socket.on('requestAuth', () => {
-      console.log('server requested authentication');
+      plugins.smartlog.defaultLogger.log('info', 'server requested authentication');
      this.socketConnection.socket.emit('dataAuth', {
-        role: this.role,
-        password: this.serverPassword,
+        role: this.socketRole.name,
+        password: this.socketRole.passwordHash,
        alias: this.alias
      });
      this.socketConnection.socket.on('authenticated', () => {
-        console.log('client is authenticated');
+        plugins.smartlog.defaultLogger.log('info', 'client is authenticated');
        this.socketConnection.authenticated = true;
        this.socketConnection.listenToFunctionRequests();
        done.resolve();
@ -62,18 +74,23 @@ export class SmartsocketClient {
    return done.promise;
  }

-  disconnect() {
-    let done = plugins.smartpromise.defer();
-    this.socketConnection.socket.disconnect();
+  /**
+   * disconnect from the server
+   */
+  public async disconnect() {
+    this.socketConnection.socket.disconnect(true);
    this.socketConnection = undefined;
    plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
-    done.resolve();
-    return done.promise;
  }

-  serverCall(functionNameArg: string, dataArg: any) {
-    let done = plugins.smartpromise.defer();
-    let socketRequest = new SocketRequest({
+  /**
+   * dispatches a server call
+   * @param functionNameArg 
+   * @param dataArg 
+   */
+  public async serverCall(functionNameArg: string, dataArg: any): Promise<any> {
+    const done = plugins.smartpromise.defer();
+    const socketRequest = new SocketRequest(this, {
      side: 'requesting',
      originSocketConnection: this.socketConnection,
      shortId: plugins.shortid.generate(),
@ -82,9 +99,8 @@ export class SmartsocketClient {
        funcDataArg: dataArg
      }
    });
-    socketRequest.dispatch().then((dataArg: ISocketFunctionCall) => {
-      done.resolve(dataArg.funcDataArg);
-    });
-    return done.promise;
+    const response = await socketRequest.dispatch();
+    const result = response.funcDataArg;
+    return result;
  }
 }
--- a/ts/smartsocket.classes.socketconnection.ts
+++ b/ts/smartsocket.classes.socketconnection.ts
@ -1,20 +1,16 @@
 import * as plugins from './smartsocket.plugins';
-import * as helpers from './smartsocket.helpers';

 import { Objectmap } from '@pushrocks/lik';

 // import classes
 import { Smartsocket } from './smartsocket.classes.smartsocket';
 import { SocketFunction } from './smartsocket.classes.socketfunction';
-import {
-  SocketRequest,
-  ISocketRequestDataObject,
-  allSocketRequests
-} from './smartsocket.classes.socketrequest';
+import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest';
 import { SocketRole } from './smartsocket.classes.socketrole';

 // socket.io
 import * as SocketIO from 'socket.io';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';

 // export interfaces

@ -31,7 +27,7 @@ export interface ISocketConnectionConstructorOptions {
  authenticated: boolean;
  role: SocketRole;
  side: TSocketConnectionSide;
-  smartsocketHost: Smartsocket;
+  smartsocketHost: Smartsocket | SmartsocketClient;
  socket: SocketIO.Socket | SocketIOClient.Socket;
 }

@ -55,14 +51,14 @@ export class SocketConnection {
  public side: TSocketConnectionSide;
  public authenticated: boolean = false;
  public role: SocketRole;
-  public smartsocketHost: Smartsocket;
+  public smartsocketRef: Smartsocket | SmartsocketClient;
  public socket: SocketIO.Socket | SocketIOClient.Socket;
  constructor(optionsArg: ISocketConnectionConstructorOptions) {
    this.alias = optionsArg.alias;
    this.authenticated = optionsArg.authenticated;
    this.role = optionsArg.role;
    this.side = optionsArg.side;
-    this.smartsocketHost = optionsArg.smartsocketHost;
+    this.smartsocketRef = optionsArg.smartsocketHost;
    this.socket = optionsArg.socket;

    // standard behaviour that is always true
@ -82,19 +78,19 @@ export class SocketConnection {
  /**
   * authenticate the socket
   */
-  authenticate() {
-    let done = plugins.smartpromise.defer();
+  public authenticate() {
+    const done = plugins.smartpromise.defer();
    this.socket.on('dataAuth', (dataArg: ISocketConnectionAuthenticationObject) => {
      plugins.smartlog.defaultLogger.log(
        'info',
        'received authentication data. now hashing and comparing...'
      );
      this.socket.removeListener('dataAuth', () => {});
-      if (helpers.checkPasswordForRole(dataArg, this.smartsocketHost)) {
+      if (SocketRole.checkPasswordForRole(dataArg, this.smartsocketRef)) {
        // TODO: authenticate password
        this.alias = dataArg.alias;
        this.authenticated = true;
-        this.role = helpers.getSocketRoleByName(dataArg.role, this.smartsocketHost);
+        this.role = SocketRole.getSocketRoleByName(this.smartsocketRef, dataArg.role);
        this.socket.emit('authenticated');
        plugins.smartlog.defaultLogger.log(
          'ok',
@ -116,20 +112,20 @@ export class SocketConnection {
  /**
   * listen to function requests
   */
-  listenToFunctionRequests() {
-    let done = plugins.smartpromise.defer();
+  public listenToFunctionRequests() {
+    const done = plugins.smartpromise.defer();
    if (this.authenticated) {
      this.socket.on('function', (dataArg: ISocketRequestDataObject) => {
        // check if requested function is available to the socket's scope
        plugins.smartlog.defaultLogger.log('info', 'function request received');
-        let referencedFunction: SocketFunction = this.role.allowedFunctions.find(
+        const referencedFunction: SocketFunction = this.role.allowedFunctions.find(
          socketFunctionArg => {
            return socketFunctionArg.name === dataArg.funcCallData.funcName;
          }
        );
-        if (referencedFunction !== undefined) {
+        if (referencedFunction) {
          plugins.smartlog.defaultLogger.log('ok', 'function in access scope');
-          let localSocketRequest = new SocketRequest({
+          const localSocketRequest = new SocketRequest(this.smartsocketRef, {
            side: 'responding',
            originSocketConnection: this,
            shortId: dataArg.shortId,
@ -148,7 +144,10 @@ export class SocketConnection {
          'info',
          `received response for request with id ${dataArg.shortId}`
        );
-        let targetSocketRequest = helpers.getSocketRequestById(dataArg.shortId);
+        const targetSocketRequest = SocketRequest.getSocketRequestById(
+          this.smartsocketRef,
+          dataArg.shortId
+        );
        targetSocketRequest.handleResponse(dataArg);
      });
      plugins.smartlog.defaultLogger.log(
@ -157,7 +156,7 @@ export class SocketConnection {
      );
      done.resolve(this);
    } else {
-      let errMessage: 'socket needs to be authenticated first';
+      const errMessage = 'socket needs to be authenticated first';
      plugins.smartlog.defaultLogger.log('error', errMessage);
      done.reject(errMessage);
    }
--- a/ts/smartsocket.classes.socketfunction.ts
+++ b/ts/smartsocket.classes.socketfunction.ts
@ -4,6 +4,8 @@ import * as plugins from './smartsocket.plugins';
 import { Objectmap } from '@pushrocks/lik';
 import { SocketRole } from './smartsocket.classes.socketrole';
 import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';

 // export interfaces

@ -29,18 +31,26 @@ export interface ISocketFunctionCall {
 */
 export type TFuncDef = (dataArg: any, connectionArg: SocketConnection) => PromiseLike<any>;

-// export objects
-export let allSocketFunctions = new Objectmap<SocketFunction>();
-
 // export classes

 /**
 * class that respresents a function that can be transparently called using a SocketConnection
 */
 export class SocketFunction {
-  name: string;
-  funcDef: TFuncDef;
-  roles: SocketRole[];
+  // STATIC
+  public static getSocketFunctionByName(
+    smartsocketRefArg: Smartsocket | SmartsocketClient,
+    functionNameArg: string
+  ): SocketFunction {
+    return smartsocketRefArg.socketFunctions.find(socketFunctionArg => {
+      return socketFunctionArg.name === functionNameArg;
+    });
+  }
+
+  // INSTANCE
+  public name: string;
+  public funcDef: TFuncDef;
+  public roles: SocketRole[];

  /**
   * the constructor for SocketFunction
@ -49,20 +59,19 @@ export class SocketFunction {
    this.name = optionsArg.funcName;
    this.funcDef = optionsArg.funcDef;
    this.roles = optionsArg.allowedRoles;
-    for (let socketRoleArg of this.roles) {
+    for (const socketRoleArg of this.roles) {
      this._notifyRole(socketRoleArg);
    }
-    allSocketFunctions.add(this); // map instance with Objectmap
  }

  /**
   * invokes the function of this SocketFunction
   */
-  invoke(dataArg: ISocketFunctionCall, socketConnectionArg: SocketConnection): Promise<any> {
-    let done = plugins.smartpromise.defer();
+  public invoke(dataArg: ISocketFunctionCall, socketConnectionArg: SocketConnection): Promise<any> {
+    const done = plugins.smartpromise.defer();
    if (dataArg.funcName === this.name) {
      this.funcDef(dataArg.funcDataArg, socketConnectionArg).then((resultData: any) => {
-        let funcResponseData: ISocketFunctionCall = {
+        const funcResponseData: ISocketFunctionCall = {
          funcName: this.name,
          funcDataArg: resultData
        };
--- a/ts/smartsocket.classes.socketrequest.ts
+++ b/ts/smartsocket.classes.socketrequest.ts
@ -1,14 +1,14 @@
 import * as plugins from './smartsocket.plugins';
-import * as helpers from './smartsocket.helpers';

 // import interfaces
-import { ISocketFunctionCall } from './smartsocket.classes.socketfunction';
+import { SocketFunction, ISocketFunctionCall } from './smartsocket.classes.socketfunction';

 // import classes
 import { Objectmap } from '@pushrocks/lik';
-import { SocketFunction } from './smartsocket.classes.socketfunction';
 import { SocketConnection } from './smartsocket.classes.socketconnection';
 import { defaultLogger } from '@pushrocks/smartlog';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';

 // export interfaces
 export type TSocketRequestStatus = 'new' | 'pending' | 'finished';
@ -17,7 +17,7 @@ export type TSocketRequestSide = 'requesting' | 'responding';
 /**
 * interface of constructor of class SocketRequest
 */
-export interface SocketRequestConstructorOptions {
+export interface ISocketRequestConstructorOptions {
  side: TSocketRequestSide;
  originSocketConnection: SocketConnection;
  shortId: string;
@ -33,23 +33,38 @@ export interface ISocketRequestDataObject {
  responseTimeout?: number;
 }

-// export objects
-export let allSocketRequests = new Objectmap<SocketRequest>();
-
 // export classes
 export class SocketRequest {
+  // STATIC
+  public static getSocketRequestById(
+    smartsocketRef: Smartsocket | SmartsocketClient,
+    shortIdArg: string
+  ): SocketRequest {
+    return smartsocketRef.socketRequests.find(socketRequestArg => {
+      return socketRequestArg.shortid === shortIdArg;
+    });
+  }
+
+  // INSTANCE
  public status: TSocketRequestStatus = 'new';
  public side: TSocketRequestSide;
  public shortid: string;
  public originSocketConnection: SocketConnection;
  public funcCallData: ISocketFunctionCall;
-  public done = plugins.smartpromise.defer();
-  constructor(optionsArg: SocketRequestConstructorOptions) {
+  public done = plugins.smartpromise.defer<ISocketFunctionCall>();
+
+  public smartsocketRef: Smartsocket | SmartsocketClient;
+
+  constructor(
+    smartsocketRefArg: Smartsocket | SmartsocketClient,
+    optionsArg: ISocketRequestConstructorOptions
+  ) {
+    this.smartsocketRef = smartsocketRefArg;
    this.side = optionsArg.side;
    this.shortid = optionsArg.shortId;
    this.funcCallData = optionsArg.funcCallData;
    this.originSocketConnection = optionsArg.originSocketConnection;
-    allSocketRequests.add(this);
+    this.smartsocketRef.socketRequests.add(this);
  }

  // requesting --------------------------
@ -57,8 +72,8 @@ export class SocketRequest {
  /**
   * dispatches a socketrequest from the requesting to the receiving side
   */
-  public dispatch() {
-    let requestData: ISocketRequestDataObject = {
+  public dispatch(): Promise<ISocketFunctionCall> {
+    const requestData: ISocketRequestDataObject = {
      funcCallData: this.funcCallData,
      shortId: this.shortid
    };
@ -72,7 +87,7 @@ export class SocketRequest {
  public handleResponse(responseDataArg: ISocketRequestDataObject) {
    plugins.smartlog.defaultLogger.log('info', 'handling response!');
    this.done.resolve(responseDataArg.funcCallData);
-    allSocketRequests.remove(this);
+    this.smartsocketRef.socketRequests.remove(this);
  }

  // responding --------------------------
@ -81,9 +96,11 @@ export class SocketRequest {
   * creates the response on the responding side
   */
  public async createResponse(): Promise<void> {
-    const targetSocketFunction: SocketFunction = helpers.getSocketFunctionByName(
+    const targetSocketFunction: SocketFunction = SocketFunction.getSocketFunctionByName(
+      this.smartsocketRef,
      this.funcCallData.funcName
    );
+
    if (!targetSocketFunction) {
      defaultLogger.log(
        'warn',
@ -95,12 +112,12 @@ export class SocketRequest {
    plugins.smartlog.defaultLogger.log('info', `invoking ${targetSocketFunction.name}`);
    targetSocketFunction.invoke(this.funcCallData, this.originSocketConnection).then(resultData => {
      plugins.smartlog.defaultLogger.log('info', 'got resultData. Sending it to requesting party.');
-      let requestData: ISocketRequestDataObject = {
+      const requestData: ISocketRequestDataObject = {
        funcCallData: resultData,
        shortId: this.shortid
      };
      this.originSocketConnection.socket.emit('functionResponse', requestData);
-      allSocketRequests.remove(this);
+      this.smartsocketRef.socketRequests.remove(this);
    });
  }
 }
--- a/ts/smartsocket.classes.socketrole.ts
+++ b/ts/smartsocket.classes.socketrole.ts
@ -3,11 +3,14 @@ import * as plugins from './smartsocket.plugins';
 // import classes
 import { Objectmap } from '@pushrocks/lik';
 import { SocketFunction } from './smartsocket.classes.socketfunction';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { ISocketConnectionAuthenticationObject } from './smartsocket.classes.socketconnection';

 /**
 * interface for class SocketRole
 */
-export interface SocketRoleOptions {
+export interface ISocketRoleOptions {
  name: string;
  passwordHash: string;
 }
@ -16,14 +19,40 @@ export interface SocketRoleOptions {
 * A socketrole defines access to certain routines.
 */
 export class SocketRole {
-  name: string;
-  passwordHash: string;
-  allowedFunctions = new Objectmap<SocketFunction>();
-  constructor(optionsArg: SocketRoleOptions) {
+  // STATIC
+  public static getSocketRoleByName(
+    referenceSmartsocket: Smartsocket | SmartsocketClient,
+    socketRoleNameArg: string
+  ): SocketRole {
+    return referenceSmartsocket.socketRoles.find(socketRoleArg => {
+      return socketRoleArg.name === socketRoleNameArg;
+    });
+  }
+
+  public static checkPasswordForRole(
+    dataArg: ISocketConnectionAuthenticationObject,
+    referenceSmartsocket: Smartsocket | SmartsocketClient
+  ): boolean {
+    const targetPasswordHash = SocketRole.getSocketRoleByName(referenceSmartsocket, dataArg.role)
+      .passwordHash;
+    const computedCompareHash = plugins.smarthash.sha256FromStringSync(dataArg.password);
+    return targetPasswordHash === computedCompareHash;
+  }
+
+  // INSTANCE
+  public name: string;
+  public passwordHash: string;
+  public allowedFunctions = new Objectmap<SocketFunction>();
+  constructor(optionsArg: ISocketRoleOptions) {
    this.name = optionsArg.name;
    this.passwordHash = optionsArg.passwordHash;
  }
-  addSocketFunction(socketFunctionArg: SocketFunction) {
+
+  /**
+   * adds the socketfunction to the socketrole
+   * @param socketFunctionArg
+   */
+  public addSocketFunction(socketFunctionArg: SocketFunction) {
    this.allowedFunctions.add(socketFunctionArg);
  }
 }
--- a/ts/smartsocket.classes.socketserver.ts
+++ b/ts/smartsocket.classes.socketserver.ts
@ -2,6 +2,7 @@ import * as plugins from './smartsocket.plugins';

 // used in case no other server is supplied
 import * as http from 'http';
+import * as https from 'https';
 import { Smartsocket } from './smartsocket.classes.smartsocket';

 /**
@ -10,7 +11,7 @@ import { Smartsocket } from './smartsocket.classes.smartsocket';
 */
 export class SocketServer {
  private smartsocket: Smartsocket;
-  private httpServer: http.Server;
+  private httpServer: http.Server | https.Server;
  // wether httpServer is standalone
  private standaloneServer = false;
  private expressServer: any;
@ -54,11 +55,11 @@ export class SocketServer {
    // in case an external server has been set "this.standaloneServer" should be false
    if (this.httpServer && this.standaloneServer) {
      if (!this.smartsocket.options.port) {
-        console.log('there should be a port specifed for smartsocket!');
+        plugins.smartlog.defaultLogger.log('error', 'there should be a port specifed for smartsocket!');
        throw new Error('there should be a port specified for smartsocket');
      }
      this.httpServer.listen(this.smartsocket.options.port, () => {
-        console.log(`Server started in standalone mode on ${this.smartsocket.options.port}`);
+        plugins.smartlog.defaultLogger.log('success', `Server started in standalone mode on ${this.smartsocket.options.port}`);
        done.resolve();
      });
    } else {
--- a/ts/smartsocket.helpers.ts
+++ b/ts/smartsocket.helpers.ts
@ -1,60 +0,0 @@
-import * as plugins from './smartsocket.plugins';
-
-// classes
-import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketFunction, allSocketFunctions } from './smartsocket.classes.socketfunction';
-import {
-  SocketConnection,
-  ISocketConnectionAuthenticationObject
-} from './smartsocket.classes.socketconnection';
-import {
-  SocketRequest,
-  allSocketRequests,
-  TSocketRequestSide
-} from './smartsocket.classes.socketrequest';
-import { SocketRole } from './smartsocket.classes.socketrole';
-
-// SocketConnection helpers
-export let checkPasswordForRole = (
-  dataArg: ISocketConnectionAuthenticationObject,
-  referenceSmartsocket: Smartsocket
-): boolean => {
-  let targetPasswordHash = getSocketRoleByName(dataArg.role, referenceSmartsocket).passwordHash;
-  let computedCompareHash = plugins.smarthash.sha256FromStringSync(dataArg.password);
-  return targetPasswordHash === computedCompareHash;
-};
-
-// SocketFunction helpers
-export let getSocketFunctionByName = (functionNameArg: string): SocketFunction => {
-  return allSocketFunctions.find(socketFunctionArg => {
-    return socketFunctionArg.name === functionNameArg;
-  });
-};
-
-// SocketRequest helpers
-
-/**
- * get corresponding Socketrequest instance by shortId
- */
-export let getSocketRequestById = (
-  shortIdArg: string,
-  requestSide?: TSocketRequestSide
-): SocketRequest => {
-  return allSocketRequests.find(socketRequestArg => {
-    return socketRequestArg.shortid === shortIdArg;
-  });
-};
-
-// SocketRole helpers
-
-/**
- * get corresponding SocketRole instance by name
- */
-export let getSocketRoleByName = (
-  socketRoleNameArg: string,
-  referenceSmartsocket: Smartsocket
-): SocketRole => {
-  return referenceSmartsocket.socketRoles.find(socketRoleArg => {
-    return socketRoleArg.name === socketRoleNameArg;
-  });
-};
Author	SHA1	Message	Date
Phil Kunz	2d4695de22	1.1.46	2019-09-01 18:07:53 +02:00
Phil Kunz	a3f4dcbc2a	fix(core): update	2019-09-01 18:07:52 +02:00
Phil Kunz	d6e81288b4	1.1.45	2019-08-13 15:58:08 +02:00
Phil Kunz	c441d89596	fix(core): update	2019-08-13 15:58:08 +02:00
Phil Kunz	85b69e487a	1.1.44	2019-08-13 11:36:32 +02:00
Phil Kunz	0d94ed9345	fix(core): update	2019-08-13 11:36:31 +02:00
Phil Kunz	e188b18016	1.1.43	2019-08-13 09:37:23 +02:00
Phil Kunz	33c0fa3746	fix(core): update	2019-08-13 09:37:23 +02:00
Phil Kunz	52be1415ee	1.1.42	2019-08-12 22:46:57 +02:00
Phil Kunz	e75d5eabdb	fix(core): update	2019-08-12 22:46:57 +02:00
Phil Kunz	fb99848df1	1.1.41	2019-08-12 22:45:58 +02:00
Phil Kunz	1bd39d0755	fix(core): update	2019-08-12 22:45:58 +02:00
Phil Kunz	d24c5f628c	1.1.40	2019-08-12 22:31:41 +02:00
Phil Kunz	33fbabdd72	fix(core): update	2019-08-12 22:31:40 +02:00