1.1.23

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 coverage/
-docs/
+pages/
+

.gitlab-ci.yml

@@ -1,36 +1,150 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
 
 stages:
+- security
 - test
 - release
+- metadata
 
-testLEGACY:
+# ====================
-  stage: test
+# security stage
+# ====================
+mirror:
+  stage: security
   script:
-    - npmci test legacy
+  - npmci git mirror
   tags:
   - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
+# ====================
+# test stage
+# ====================
 
 testLTS:
   stage: test
   script:
-    - npmci test lts
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
     
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
 
 release:
   stage: release
-  environment: npmjs-com_registry
   script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
   only:
   - tags
   tags:
   - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: metadata
+  script:
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+  tags:
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.3
+ignore: {}
+patch: {}

README.md

@@ -1,67 +1,116 @@
 # smartsocket
-easy and secure websocket communication, Typescript ready
 
-## Status
+easy and secure websocket communication, TypeScript ready
-[![build status](https://gitlab.com/pushrocks/smartsocket/badges/master/build.svg)](https://gitlab.com/pushrocks/smartsocket/commits/master)
+
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartsocket)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartsocket)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartsocket)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartsocket/)
+
+## Status for master
+
+[![build status](https://GitLab.com/pushrocks/smartsocket/badges/master/build.svg)](https://GitLab.com/pushrocks/smartsocket/commits/master)
+[![coverage report](https://GitLab.com/pushrocks/smartsocket/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartsocket/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/smartsocket.svg)](https://www.npmjs.com/package/smartsocket)
+[![Dependency Status](https://david-dm.org/pushrocks/smartsocket.svg)](https://david-dm.org/pushrocks/smartsocket)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartsocket/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartsocket/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/smartsocket/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartsocket)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
-We recommend the use of typescript.
+
+Use TypeScript for best in class instellisense.
+
 Under the hood we use socket.io and shortid for managed data exchange.
 
 ### Serverside
-```typescript
-import * as smartsocket from "smartsocket";
 
+```typescript
+import * as smartsocket from 'smartsocket';
+import * as q from q; // q is a promise library
+
+// The "Smartsocket" listens on a port and can receive new "SocketConnection" requests.
 let mySmartsocket = new smartsocket.Smartsocket({
   port: 3000 // the port smartsocket will listen on
 });
 
+// optional:
+// run this with anothoer existing server like express
+declare var someExpressServer; // read the express docs about how express actually works
+mySmartsocket.setServer(someExpressServer);
+
+// A "SocketRole" can be referenced by "SocketFunction"s.
+// All "SocketRequest"s carry authentication data for a specific "SocketRole".
+// "SocketFunction"s know which "SocketRole"s are allowed to execute them
 let mySocketRole = new smartsocket.SocketRole({
-    name: "someRoleName",
+  name: 'someRoleName',
-    passwordHash: "someHashedString"
+  passwordHash: 'someHashedString'
 });
 
-let mySocketFunction = new smartsocket.SocketFunction({
+// A "SocketFunction" executes a referenced function and passes in any data of the corresponding "SocketRequest".
-    name:"newService",
+// The referenced function must return a promise and resolve with data of type any.
-    func:(data) => {
+// Any "SocketRequest" carries a unique identifier. If the referenced function's promise resolved any passed on argument will be returned to the requesting party
-        
+let testSocketFunction1 = new smartsocket.SocketFunction({
-    }, the function to execute
+  funcName: 'testSocketFunction1',
-    roles:[mySocketRole] // all roles that have access to a specific function
+  funcDef: data => {
+    console.log('testSocketFunction1 executed successfully!');
+  },
+  allowedRoles: [mySocketRole] // all roles that have access to a specific function
 });
 
-mySmartsocket.registerRole(mySocketRole);
+// A "Smartsocket" exposes a .clientCall() that gets
-mySmartsocket.clientCall.select("client1","restart",data)
+// 1. the name of the "SocketFunction" on the client side
-    .then((responseData) => {
+// 2. the data to pass in
-
+// 3. And a target "SocketConnection" (there can be multiple connections at once)
-    });
+// any unique id association is done internally
+mySmartsocket.clientCall('restart', data, someTargetConnection).then(responseData => {});
 ```
 
 #### Client side
+
 ```typescript
-import * as smartsocket from "smartsocket";
+import * as smartsocket from 'smartsocket';
 
-let mySmartsocketClient = new smartsocket.SmartsocketClient({
+// A "SmartsocketClient" is different from a "Smartsocket" in that it doesn't expose any public address.
-    url: "somedomain.com", // url, note: will only work over https, no http supported.
+// Thus any new "SocketConnection"s must be innitiated from a "SmartsocketClient".
-    port: 3000
+let testSmartsocketClient = new smartsocket.SmartsocketClient({
-    role:"dockerhost", // some role, in this example a dockerhost vm,
+  port: testConfig.port,
-    password:"somePassword",
+  url: 'http://localhost',
-    alias:"client1"
+  password: 'testPassword',
+  alias: 'testClient1',
+  role: 'testRole1'
 });
 
-let mySocketFunction2 = new smartsocket.SocketFunction({
+// You can .connect() and .disconnect() from a "Smartsocket"
-    name:"restart",
+testSmartsocketClient.connect().then(() => {
-    func:(data) => {}, the function to execute
+  done();
 });
 
-mySmartsocketClient.registerFunction(mySocketFunction2);
+// The client can also specify "SocketFunction"s. It can also specify "SocketRole"s in case a client connects to multiple servers at once
+let testSocketFunction2 = new smartsocket.SocketFunction({
+  funcName: 'testSocketFunction2',
+  funcDef: data => {}, // the function to execute, has to return promise
+  allowedRoles: []
+});
 
-mySmartsocketClient.serverCall("newService",data)
+// A "SmartsocketClient" can call functions on the serverside using .serverCall() analog to the "Smartsocket"'s .clientCall method.
-    .then((responseData) => {
+mySmartsocketClient.serverCall('function', functionCallData).then(functionResponseData => {
-        
+  // the functionResponseData comes from the server... awesome, right?
-    });;
+});
 ```
 
 > **NOTE:**  
-you can easily chain dependent requests on eiter the server or client side with promises.  
+> you can easily chain dependent requests on either the server or client side with promises.  
-`data` is always a js object that you can design for your specific needs.  
+> `data` is always a js object that you can design for your specific needs.  
-It supports buffers for large binary data network exchange.  
+> It supports buffers for large binary data network exchange.
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.d.ts

@@ -1,4 +1,5 @@
-export * from "./smartsocket.classes.smartsocket";
+export * from './smartsocket.classes.smartsocket';
-export * from "./smartsocket.classes.smartsocketclient";
+export * from './smartsocket.classes.smartsocketclient';
-export * from "./smartsocket.classes.socketfunction";
+export * from './smartsocket.classes.socketfunction';
-export * from "./smartsocket.classes.socketrole";
+export * from './smartsocket.classes.socketrole';
+export * from './smartsocket.classes.socketconnection';

dist/index.js

@@ -2,9 +2,12 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
+// export main classes
 __export(require("./smartsocket.classes.smartsocket"));
 __export(require("./smartsocket.classes.smartsocketclient"));
+// export further classes and objects
 __export(require("./smartsocket.classes.socketfunction"));
 __export(require("./smartsocket.classes.socketrole"));
-// need something more exposed? Create an issue on GitLab!
+__export(require("./smartsocket.classes.socketconnection"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRUEsaUJBQWMsbUNBQW1DLENBQUMsRUFBQTtBQUNsRCxpQkFBYyx5Q0FBeUMsQ0FBQyxFQUFBO0FBQ3hELGlCQUFjLHNDQUFzQyxDQUFDLEVBQUE7QUFDckQsaUJBQWMsa0NBQWtDLENBQUMsRUFBQTtBQUVqRCwwREFBMEQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBLHNCQUFzQjtBQUN0Qix1REFBa0Q7QUFDbEQsNkRBQXdEO0FBRXhELHFDQUFxQztBQUNyQywwREFBcUQ7QUFDckQsc0RBQWlEO0FBQ2pELDREQUF1RCJ9

dist/smartsocket.classes.smartsocket.d.ts

@@ -1,22 +1,37 @@
 /// <reference types="socket.io" />
-import { Objectmap } from "lik";
+import * as plugins from './smartsocket.plugins';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketRole } from './smartsocket.classes.socketrole';
+import * as SocketIO from 'socket.io';
 export interface ISmartsocketConstructorOptions {
     port: number;
 }
 export declare class Smartsocket {
     options: ISmartsocketConstructorOptions;
     io: SocketIO.Server;
-    openSockets: Objectmap<SocketConnection>;
+    openSockets: plugins.lik.Objectmap<SocketConnection>;
+    socketRoles: plugins.lik.Objectmap<SocketRole>;
+    private socketServer;
     constructor(optionsArg: ISmartsocketConstructorOptions);
+    setExternalServer: (serverType: "express" | "http", serverArg: any) => Promise<void>;
+    /**
+     * starts smartsocket
+     */
+    start(): Promise<void>;
+    /**
+     * stops smartsocket
+     */
+    stop(): Promise<void>;
+    /**
+     * allows call to specific client.
+     */
+    clientCall(functionNameArg: string, dataArg: any, targetSocketConnectionArg: SocketConnection): Promise<{}>;
+    /**
+     * adds socketRoles
+     */
+    addSocketRoles(socketRolesArray: SocketRole[]): void;
     /**
      * the standard handler for new socket connections
      */
     private _handleSocketConnection(socketArg);
-    /**
-     * starts listening to incling sockets:
-     */
-    startServer: () => void;
-    closeServer: () => void;
-    clientCall(): void;
 }

dist/smartsocket.classes.smartsocket.js

@@ -1,52 +1,111 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartsocket.plugins");
 // classes
 const lik_1 = require("lik");
 const smartsocket_classes_socketconnection_1 = require("./smartsocket.classes.socketconnection");
-;
+const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest");
+const smartsocket_classes_socketserver_1 = require("./smartsocket.classes.socketserver");
 class Smartsocket {
     constructor(optionsArg) {
         this.openSockets = new lik_1.Objectmap();
+        this.socketRoles = new lik_1.Objectmap();
+        this.socketServer = new smartsocket_classes_socketserver_1.SocketServer(this);
+        // tslint:disable-next-line:member-ordering
+        this.setExternalServer = this.socketServer.setExternalServer;
+        this.options = optionsArg;
+    }
     /**
-         * starts listening to incling sockets:
+     * starts smartsocket
      */
-        this.startServer = () => {
+    start() {
-            this.io = plugins.socketIo(this.options.port);
+        return __awaiter(this, void 0, void 0, function* () {
-            this.io.on("connection", (socketArg) => {
+            this.io = plugins.socketIo(this.socketServer.getServerForSocketIo());
+            yield this.socketServer.start();
+            this.io.on('connection', socketArg => {
                 this._handleSocketConnection(socketArg);
             });
-        };
+        });
-        this.closeServer = () => {
+    }
+    /**
+     * stops smartsocket
+     */
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield plugins.smartdelay.delayFor(1000);
             this.openSockets.forEach((socketObjectArg) => {
                 plugins.beautylog.log(`disconnect socket with >>alias ${socketObjectArg.alias}`);
                 socketObjectArg.socket.disconnect();
             });
             this.openSockets.wipe();
             this.io.close();
-        };
+            // stop the corresponging server
-        this.options = optionsArg;
+            this.socketServer.stop();
+        });
+    }
+    // communication
+    /**
+     * allows call to specific client.
+     */
+    clientCall(functionNameArg, dataArg, targetSocketConnectionArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const done = plugins.smartq.defer();
+            const socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest({
+                funcCallData: {
+                    funcDataArg: dataArg,
+                    funcName: functionNameArg
+                },
+                originSocketConnection: targetSocketConnectionArg,
+                shortId: plugins.shortid.generate(),
+                side: 'requesting'
+            });
+            socketRequest.dispatch().then((dataArg) => {
+                done.resolve(dataArg.funcDataArg);
+            });
+            const result = yield done.promise;
+            return result;
+        });
+    }
+    /**
+     * adds socketRoles
+     */
+    addSocketRoles(socketRolesArray) {
+        for (const socketRole of socketRolesArray) {
+            this.socketRoles.add(socketRole);
+        }
+        return;
     }
-    ;
     /**
      * the standard handler for new socket connections
      */
     _handleSocketConnection(socketArg) {
-        let socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({
+        const socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({
             alias: undefined,
             authenticated: false,
             role: undefined,
+            side: 'server',
+            smartsocketHost: this,
             socket: socketArg
         });
-        plugins.beautylog.log("Socket connected. Trying to authenticate...");
+        plugins.beautylog.log('Socket connected. Trying to authenticate...');
         this.openSockets.add(socketConnection);
-        socketConnection.authenticate()
+        socketConnection
-            .then(socketConnection.listenToFunctionRequests);
+            .authenticate()
-    }
+            .then(() => {
-    ;
+            return socketConnection.listenToFunctionRequests();
-    // communication
+        })
-    clientCall() {
+            .catch(err => {
-        // TODO: target specific client and initiate response        
+            console.log(err);
+        });
     }
 }
 exports.Smartsocket = Smartsocket;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFHakQsVUFBVTtBQUNWLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQUdoQyx1REFBaUMsd0NBQXdDLENBQUMsQ0FBQTtBQUt6RSxDQUFDO0FBRUY7SUFJSSxZQUFZLFVBQTBDO1FBRHRELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQW9CLENBQUM7UUFxQmhEOztXQUVHO1FBRUgsZ0JBQVcsR0FBRztZQUNWLElBQUksQ0FBQyxFQUFFLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxDQUFDLFNBQVM7Z0JBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1QyxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQTtRQUNELGdCQUFXLEdBQUc7WUFDVixJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLGVBQWlDO2dCQUN2RCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxrQ0FBa0MsZUFBZSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7Z0JBQ2pGLGVBQWUsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDeEMsQ0FBQyxDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDcEIsQ0FBQyxDQUFDO1FBcENFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzlCLENBQUM7O0lBRUQ7O09BRUc7SUFDSyx1QkFBdUIsQ0FBQyxTQUFTO1FBQ3JDLElBQUksZ0JBQWdCLEdBQXNCLElBQUksdURBQWdCLENBQUM7WUFDM0QsS0FBSyxFQUFDLFNBQVM7WUFDZixhQUFhLEVBQUMsS0FBSztZQUNuQixJQUFJLEVBQUMsU0FBUztZQUNkLE1BQU0sRUFBQyxTQUFTO1NBQ25CLENBQUMsQ0FBQztRQUNILE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUN2QyxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUU7YUFDMUIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDekQsQ0FBQzs7SUFxQkQsZ0JBQWdCO0lBQ2hCLFVBQVU7UUFFTiw2REFBNkQ7SUFDakUsQ0FBQztBQUNMLENBQUM7QUFoRFksbUJBQVcsY0FnRHZCLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLGlEQUFpRDtBQUdqRCxVQUFVO0FBQ1YsNkJBQWdDO0FBQ2hDLGlHQUEwRTtBQUUxRSwyRkFBb0U7QUFFcEUseUZBQWtFO0FBU2xFO0lBUUUsWUFBWSxVQUEwQztRQUwvQyxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFvQixDQUFDO1FBQ2hELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWMsQ0FBQztRQUV6QyxpQkFBWSxHQUFHLElBQUksK0NBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQU05QywyQ0FBMkM7UUFDcEMsc0JBQWlCLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQztRQUo3RCxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUM1QixDQUFDO0lBS0Q7O09BRUc7SUFDVSxLQUFLOztZQUNoQixJQUFJLENBQUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDLENBQUM7WUFDckUsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2hDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxTQUFTLENBQUMsRUFBRTtnQkFDbkMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzFDLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDVSxJQUFJOztZQUNmLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDeEMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMs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

dist/smartsocket.classes.smartsocketclient.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="q" />
+import { SocketConnection } from './smartsocket.classes.socketconnection';
-import * as plugins from "./smartsocket.plugins";
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
 /**
  * interface for class SmartsocketClient
  */
@@ -23,7 +20,7 @@ export declare class SmartsocketClient {
     /**
      * connect the client to the server
      */
-    connect(): plugins.q.Promise<{}>;
+    connect(): Promise<{}>;
-    disconnect(): plugins.q.Promise<{}>;
+    disconnect(): Promise<{}>;
-    serverCall(functionNameArg: string, dataArg: ISocketFunctionCall): plugins.q.Promise<{}>;
+    serverCall(functionNameArg: string, dataArg: any): Promise<{}>;
 }

dist/smartsocket.classes.smartsocketclient.js

@@ -1,6 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartsocket.plugins");
-// import classes
 const smartsocket_classes_socketconnection_1 = require("./smartsocket.classes.socketconnection");
 const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest");
 class SmartsocketClient {
@@ -11,47 +11,49 @@ class SmartsocketClient {
         this.serverPort = optionsArg.port;
         this.serverPassword = optionsArg.password;
     }
-    ;
     /**
      * connect the client to the server
      */
     connect() {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
-        plugins.beautylog.log("trying to connect...");
+        plugins.beautylog.log('trying to connect...');
         let socketUrl = `${this.serverUrl}:${this.serverPort}`;
         this.socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({
             alias: this.alias,
             authenticated: false,
             role: undefined,
+            side: 'client',
+            smartsocketHost: null,
             socket: plugins.socketIoClient(socketUrl, { multiplex: false })
         });
-        this.socketConnection.socket.on("requestAuth", () => {
+        this.socketConnection.socket.on('requestAuth', () => {
-            console.log("server requested authentication");
+            console.log('server requested authentication');
-            this.socketConnection.socket.emit("dataAuth", {
+            this.socketConnection.socket.emit('dataAuth', {
                 role: this.role,
                 password: this.serverPassword,
                 alias: this.alias
             });
-            this.socketConnection.socket.on("authenticated", () => {
+            this.socketConnection.socket.on('authenticated', () => {
-                console.log("client is authenticated");
+                console.log('client is authenticated');
+                this.socketConnection.authenticated = true;
+                this.socketConnection.listenToFunctionRequests();
                 done.resolve();
             });
         });
         return done.promise;
     }
-    ;
     disconnect() {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         this.socketConnection.socket.disconnect();
         this.socketConnection = undefined;
-        plugins.beautylog.ok("disconnected!");
+        plugins.beautylog.ok('disconnected!');
         done.resolve();
         return done.promise;
     }
     serverCall(functionNameArg, dataArg) {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         let socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest({
-            side: "requesting",
+            side: 'requesting',
             originSocketConnection: this.socketConnection,
             shortId: plugins.shortid.generate(),
             funcCallData: {
@@ -59,13 +61,11 @@ class SmartsocketClient {
                 funcDataArg: dataArg
             }
         });
-        socketRequest.dispatch()
+        socketRequest.dispatch().then((dataArg) => {
-            .then(() => {
+            done.resolve(dataArg.funcDataArg);
-            done.resolve();
         });
         return done.promise;
     }
-    ;
 }
 exports.SmartsocketClient = SmartsocketClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXRjbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUl6QixDQUFDLENBSitDO0FBT2hELGlCQUFpQjtBQUNqQix1REFBaUMsd0NBQXdDLENBQUMsQ0FBQTtBQUUxRSxvREFBOEIscUNBQXFDLENBQUMsQ0FBQTtBQVlwRTtJQU9JLFlBQVksVUFBb0M7UUFDNUMsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUE7UUFDL0IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQTtJQUM3QyxDQUFDOztJQUVEOztPQUVHO0lBQ0gsT0FBTztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUM5QyxJQUFJLFNBQVMsR0FBRyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHVEQUFnQixDQUFDO1lBQ3pDLEtBQUssRUFBQyxJQUFJLENBQUMsS0FBSztZQUNoQixhQUFhLEVBQUMsS0FBSztZQUNuQixJQUFJLEVBQUMsU0FBUztZQUNkLE1BQU0sRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLFNBQVMsRUFBQyxFQUFDLFNBQVMsRUFBQyxLQUFLLEVBQUMsQ0FBQztTQUM5RCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUU7WUFDM0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDMUMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO2dCQUNmLFFBQVEsRUFBRSxJQUFJLENBQUMsY0FBYztnQkFDN0IsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO2FBQ3BCLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGVBQWUsRUFBQztnQkFDNUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDbkIsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0lBQ0QsVUFBVTtRQUNOLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3RDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7SUFDRCxVQUFVLENBQUMsZUFBc0IsRUFBQyxPQUEyQjtRQUN6RCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLElBQUksYUFBYSxHQUFHLElBQUksaURBQWEsQ0FBQztZQUNsQyxJQUFJLEVBQUMsWUFBWTtZQUNqQixzQkFBc0IsRUFBQyxJQUFJLENBQUMsZ0JBQWdCO1lBQzVDLE9BQU8sRUFBQyxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRTtZQUNsQyxZQUFZLEVBQUM7Z0JBQ1QsUUFBUSxFQUFFLGVBQWU7Z0JBQ3pCLFdBQVcsRUFBQyxPQUFPO2FBQ3RCO1NBQ0osQ0FBQyxDQUFDO1FBQ0gsYUFBYSxDQUFDLFFBQVEsRUFBRTthQUNuQixJQUFJLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7UUFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDOztBQUVMLENBQUM7QUFwRVkseUJBQWlCLG9CQW9FN0IsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXRjbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFFakQsaUdBQTBFO0FBRTFFLDJGQUE4RjtBQWE5RjtJQU9FLFlBQVksVUFBcUM7UUFDL0MsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztJQUM1QyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxPQUFPO1FBQ0wsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBQzlDLElBQUksU0FBUyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDdkQsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksdURBQWdCLENBQUM7WUFDM0MsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1lBQ2pCLGFBQWEsRUFBRSxLQUFLO1lBQ3BCLElBQUksRUFBRSxTQUFTO1lBQ2YsSUFBSSxFQUFFLFFBQVE7WUFDZCxlQUFlLEVBQUUsSUFBSTtZQUNyQixNQUFNLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7U0FDaEUsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRTtZQUNsRCxPQUFPLENBQUMsR0FBRyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7WUFDL0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFO2dCQUM1QyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQ2YsUUFBUSxFQUFFLElBQUksQ0FBQyxjQUFjO2dCQUM3QixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7YUFDbEIsQ0FBQyxDQUFDO1lBQ0gsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsZUFBZSxFQUFFLEdBQUcsRUFBRTtnQkFDcEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQztnQkFDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHdCQUF3QixFQUFFLENBQUM7Z0JBQ2pELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVELFVBQVU7UUFDUixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQztRQUNsQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN0QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBRUQsVUFBVSxDQUFDLGVBQXVCLEVBQUUsT0FBWTtRQUM5QyxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2xDLElBQUksYUFBYSxHQUFHLElBQUksaURBQWEsQ0FBQztZQUNwQyxJQUFJLEVBQUUsWUFBWTtZQUNsQixzQkFBc0IsRUFBRSxJQUFJLENBQUMsZ0JBQWdCO1lBQzdDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRTtZQUNuQyxZQUFZLEVBQUU7Z0JBQ1osUUFBUSxFQUFFLGVBQWU7Z0JBQ3pCLFdBQVcsRUFBRSxPQUFPO2FBQ3JCO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQTRCLEVBQUUsRUFBRTtZQUM3RCxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7Q0FDRjtBQXhFRCw4Q0F3RUMifQ==

dist/smartsocket.classes.socketconnection.d.ts

@@ -1,8 +1,13 @@
 /// <reference types="socket.io" />
 /// <reference types="socket.io-client" />
-/// <reference types="q" />
+import * as plugins from './smartsocket.plugins';
-import * as plugins from "./smartsocket.plugins";
+import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketRole } from "./smartsocket.classes.socketrole";
+import { SocketRole } from './smartsocket.classes.socketrole';
+import * as SocketIO from 'socket.io';
+/**
+ * defines is a SocketConnection is server or client side. Important for mesh setups.
+ */
+export declare type TSocketConnectionSide = 'server' | 'client';
 /**
  * interface for constructor of class SocketConnection
  */
@@ -10,31 +15,36 @@ export interface ISocketConnectionConstructorOptions {
     alias: string;
     authenticated: boolean;
     role: SocketRole;
+    side: TSocketConnectionSide;
+    smartsocketHost: Smartsocket;
     socket: SocketIO.Socket | SocketIOClient.Socket;
 }
 /**
  * interface for authentication data
  */
 export interface ISocketConnectionAuthenticationObject {
-    role: "coreflowContainer";
+    role: 'coreflowContainer';
-    password: "somePassword";
+    password: 'somePassword';
-    alias: "coreflow1";
+    alias: 'coreflow1';
 }
+export declare let allSocketConnections: plugins.lik.Objectmap<SocketConnection>;
 /**
  * class SocketConnection represents a websocket connection
  */
 export declare class SocketConnection {
     alias: string;
+    side: TSocketConnectionSide;
     authenticated: boolean;
     role: SocketRole;
-    socket: SocketIO.Socket | SocketIOClient.Socket;
+    smartsocketHost: Smartsocket;
+    socket: any;
     constructor(optionsArg: ISocketConnectionConstructorOptions);
     /**
      * authenticate the socket
      */
-    authenticate(): plugins.q.Promise<{}>;
+    authenticate(): Promise<{}>;
     /**
      * listen to function requests
      */
-    listenToFunctionRequests(): plugins.q.Promise<{}>;
+    listenToFunctionRequests(): Promise<{}>;
 }

dist/smartsocket.classes.socketconnection.js

@@ -1,66 +1,75 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartsocket.plugins");
 const helpers = require("./smartsocket.helpers");
+const lik_1 = require("lik");
 const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest");
-;
 // export classes
+exports.allSocketConnections = new lik_1.Objectmap();
 /**
  * class SocketConnection represents a websocket connection
  */
 class SocketConnection {
     constructor(optionsArg) {
+        this.authenticated = false;
         this.alias = optionsArg.alias;
         this.authenticated = optionsArg.authenticated;
         this.role = optionsArg.role;
+        this.side = optionsArg.side;
+        this.smartsocketHost = optionsArg.smartsocketHost;
         this.socket = optionsArg.socket;
         // standard behaviour that is always true
-        this.socket.on("disconnect", () => {
+        exports.allSocketConnections.add(this);
-            plugins.beautylog.info(`Client ${this.alias} disconnected`);
+        this.socket.on('disconnect', () => {
+            plugins.beautylog.info(`SocketConnection with >alias ${this.alias} on >side ${this.side} disconnected`);
+            this.socket.disconnect();
+            exports.allSocketConnections.remove(this);
         });
     }
-    ;
     // authenticating --------------------------
     /**
      * authenticate the socket
      */
     authenticate() {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
-        this.socket.on("dataAuth", dataArg => {
+        this.socket.on('dataAuth', (dataArg) => {
-            plugins.beautylog.log("received authentication data. now hashing and comparing...");
+            plugins.beautylog.log('received authentication data. now hashing and comparing...');
-            this.socket.removeListener("dataAuth", () => { });
+            this.socket.removeListener('dataAuth', () => { });
-            if ((true)) {
+            if (helpers.checkPasswordForRole(dataArg, this.smartsocketHost)) {
+                // TODO: authenticate password
                 this.alias = dataArg.alias;
                 this.authenticated = true;
-                this.role = helpers.getSocketRoleByName(dataArg.role);
+                this.role = helpers.getSocketRoleByName(dataArg.role, this.smartsocketHost);
-                this.socket.emit("authenticated");
+                this.socket.emit('authenticated');
                 plugins.beautylog.ok(`socket with >>alias ${this.alias} >>role ${this.role} is authenticated!`);
                 done.resolve(this);
             }
             else {
+                this.authenticated = false;
                 this.socket.disconnect();
-                done.reject("not authenticated");
+                done.reject('not authenticated');
             }
-            ;
         });
-        this.socket.emit("requestAuth");
+        this.socket.emit('requestAuth');
         return done.promise;
     }
-    ;
     // listening -------------------------------
     /**
      * listen to function requests
      */
     listenToFunctionRequests() {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         if (this.authenticated) {
-            this.socket.on("function", (dataArg) => {
+            this.socket.on('function', (dataArg) => {
                 // check if requested function is available to the socket's scope
-                let referencedFunction = this.role.allowedFunctions.find((socketFunctionArg) => {
+                plugins.beautylog.log('function request received');
+                let referencedFunction = this.role.allowedFunctions.find(socketFunctionArg => {
                     return socketFunctionArg.name === dataArg.funcCallData.funcName;
                 });
                 if (referencedFunction !== undefined) {
+                    plugins.beautylog.ok('function in access scope');
                     let localSocketRequest = new smartsocket_classes_socketrequest_1.SocketRequest({
-                        side: "responding",
+                        side: 'responding',
                         originSocketConnection: this,
                         shortId: dataArg.shortId,
                         funcCallData: dataArg.funcCallData
@@ -68,23 +77,24 @@ class SocketConnection {
                     localSocketRequest.createResponse(); // takes care of creating response and sending it back
                 }
                 else {
-                    plugins.beautylog.warn("function not existent or out of access scope");
+                    plugins.beautylog.warn('function not existent or out of access scope');
                 }
-                ;
             });
-            this.socket.on("functionResponse", (dataArg) => {
+            this.socket.on('functionResponse', (dataArg) => {
+                plugins.beautylog.info(`received response for request with id ${dataArg.shortId}`);
                 let targetSocketRequest = helpers.getSocketRequestById(dataArg.shortId);
                 targetSocketRequest.handleResponse(dataArg);
             });
+            plugins.beautylog.log(`now listening to function requests for ${this.alias}`);
+            done.resolve(this);
         }
         else {
-            done.reject("socket needs to be authenticated first");
+            let errMessage;
+            plugins.beautylog.error(errMessage);
+            done.reject(errMessage);
         }
-        ;
         return done.promise;
     }
-    ;
 }
 exports.SocketConnection = SocketConnection;
-;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsaURBQWlEO0FBQ2pELGlEQUFpRDtBQUVqRCw2QkFBZ0M7QUFLaEMsMkZBSTZDO0FBa0M3QyxpQkFBaUI7QUFDTixRQUFBLG9CQUFvQixHQUFHLElBQUksZUFBUyxFQUFvQixDQUFDO0FBRXBFOztHQUVHO0FBQ0g7SUFPRSxZQUFZLFVBQStDO1FBSjNELGtCQUFhLEdBQVksS0FBSyxDQUFDO1FBSzdCLElBQUksQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQztRQUM5QixJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDOUMsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsZUFBZSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUM7UUFDbEQsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBRWhDLHlDQUF5QztRQUN6Qyw0QkFBb0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxFQUFFLEdBQUcsRUFBRTtZQUNoQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FDcEIsZ0NBQWdDLElBQUksQ0FBQyxLQUFLLGFBQWEsSUFBSSxDQUFDLElBQUksZUFBZSxDQUNoRixDQUFDO1lBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUN6Qiw0QkFBb0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFD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
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSx1QkFBdUIsQ0FBQyxDQUFBO0FBQ2pELE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFJakQsb0RBQTJFLHFDQUFxQyxDQUFDLENBQUE7QUFhaEgsQ0FBQztBQVdGLGlCQUFpQjtBQUVqQjs7R0FFRztBQUNIO0lBS0ksWUFBWSxVQUErQztRQUN2RCxJQUFJLENBQUMsS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDOUIsSUFBSSxDQUFDLGFBQWEsR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDO1FBQzlDLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFFaEMseUNBQXlDO1FBQ3pDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRTtZQUN6QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxLQUFLLGVBQWUsQ0FBQyxDQUFDO1FBQ2hFLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQzs7SUFFRCw0Q0FBNEM7SUFFNUM7O09BRUc7SUFDSCxZQUFZO1FBQ1IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsT0FBTztZQUM5QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyw0REFBNEQsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLFVB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

dist/smartsocket.classes.socketfunction.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="q" />
+import * as plugins from './smartsocket.plugins';
-import * as plugins from "./smartsocket.plugins";
+import { SocketRole } from './smartsocket.classes.socketrole';
-import { Objectmap } from "lik";
-import { SocketRole } from "./smartsocket.classes.socketrole";
 /**
  * interface of the contructor options of class SocketFunction
  */
@@ -23,7 +21,7 @@ export interface ISocketFunctionCall {
 export interface IFuncDef {
     (dataArg: any): PromiseLike<any>;
 }
-export declare let allSocketFunctions: Objectmap<SocketFunction>;
+export declare let allSocketFunctions: plugins.lik.Objectmap<SocketFunction>;
 /**
  * class that respresents a function that can be transparently called using a SocketConnection
  */
@@ -35,12 +33,12 @@ export declare class SocketFunction {
      * the constructor for SocketFunction
      */
     constructor(optionsArg: ISocketFunctionConstructorOptions);
+    /**
+     * invokes the function of this SocketFunction
+     */
+    invoke(dataArg: ISocketFunctionCall): Promise<any>;
     /**
      * notifies a role about access to this SocketFunction
      */
     private _notifyRole(socketRoleArg);
-    /**
-     * invokes the function of this SocketFunction
-     */
-    invoke(dataArg: ISocketFunctionCall): plugins.q.Promise<any>;
 }

dist/smartsocket.classes.socketfunction.js

@@ -1,9 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartsocket.plugins");
 // import classes
 const lik_1 = require("lik");
-;
-;
 // export objects
 exports.allSocketFunctions = new lik_1.Objectmap();
 // export classes
@@ -21,25 +20,20 @@ class SocketFunction {
         for (let socketRoleArg of this.roles) {
             this._notifyRole(socketRoleArg);
         }
-        ;
         exports.allSocketFunctions.add(this); // map instance with Objectmap
     }
-    ;
-    /**
-     * notifies a role about access to this SocketFunction
-     */
-    _notifyRole(socketRoleArg) {
-        socketRoleArg.addSocketFunction(this);
-    }
     /**
      * invokes the function of this SocketFunction
      */
     invoke(dataArg) {
-        let done = plugins.q.defer();
+        let done = plugins.smartq.defer();
         if (dataArg.funcName === this.name) {
-            this.funcDef(dataArg.funcDataArg)
+            this.funcDef(dataArg.funcDataArg).then((resultData) => {
-                .then((resultData) => {
+                let funcResponseData = {
-                done.resolve(resultData);
+                    funcName: this.name,
+                    funcDataArg: resultData
+                };
+                done.resolve(funcResponseData);
             });
         }
         else {
@@ -47,7 +41,12 @@ class SocketFunction {
         }
         return done.promise;
     }
-    ;
+    /**
+     * notifies a role about access to this SocketFunction
+     */
+    _notifyRole(socketRoleArg) {
+        socketRoleArg.addSocketFunction(this);
+    }
 }
 exports.SocketFunction = SocketFunction;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRmdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc29ja2V0ZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFFakQsaUJBQWlCO0FBQ2pCLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQVkvQixDQUFDO0FBUUQsQ0FBQztBQVNGLGlCQUFpQjtBQUNOLDBCQUFrQixHQUFHLElBQUksZUFBUyxFQUFrQixDQUFDO0FBRWhFLGlCQUFpQjtBQUVqQjs7R0FFRztBQUNIO0lBS0k7O09BRUc7SUFDSCxZQUFZLFVBQTZDO1FBQ3JELElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUM7UUFDbEMsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQ3JDLEdBQUcsQ0FBQyxDQUFDLElBQUksYUFBYSxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQSxDQUFDO1lBQ2xDLElBQUksQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUFBLENBQUM7UUFDRiwwQkFBa0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyw4QkFBOEI7SUFDaEUsQ0FBQzs7SUFFRDs7T0FFRztJQUNLLFdBQVcsQ0FBQyxhQUF3QjtRQUN4QyxhQUFhLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLE9BQTJCO1FBQzlCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQztZQUMvQixJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7aUJBQzVCLElBQUksQ0FBQyxDQUFDLFVBQWM7Z0JBQ2pCLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDN0IsQ0FBQyxDQUFDLENBQUM7UUFFWCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixNQUFNLElBQUksS0FBSyxDQUFDLCtEQUErRCxDQUFDLENBQUM7UUFDckYsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0FBRUwsQ0FBQztBQTFDWSxzQkFBYyxpQkEwQzFCLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRmdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc29ja2V0ZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFFakQsaUJBQWlCO0FBQ2pCLDZCQUFnQztBQTZCaEMsaUJBQWlCO0FBQ04sUUFBQSxrQkFBa0IsR0FBRyxJQUFJLGVBQVMsRUFBa0IsQ0FBQztBQUVoRSxpQkFBaUI7QUFFakI7O0dBRUc7QUFDSDtJQUtFOztPQUVHO0lBQ0gsWUFBWSxVQUE2QztRQUN2RCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDaEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUNyQyxHQUFHLENBQUMsQ0FBQyxJQUFJLGFBQWEsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2xDLENBQUM7UUFDRCwwQkFBa0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyw4QkFBOEI7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLE9BQTRCO1FBQ2pDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUNuQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxVQUFlLEVBQUUsRUFBRTtnQkFDekQsSUFBSSxnQkFBZ0IsR0FBd0I7b0JBQzFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSTtvQkFDbkIsV0FBVyxFQUFFLFVBQVU7aUJBQ3hCLENBQUM7Z0JBQ0YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ2pDLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQywrREFBK0QsQ0FBQyxDQUFDO1FBQ25GLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBRUQ7O09BRUc7SUFDSyxXQUFXLENBQUMsYUFBeUI7UUFDM0MsYUFBYSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDRjtBQTNDRCx3Q0EyQ0MifQ==

dist/smartsocket.classes.socketrequest.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="q" />
+import * as plugins from './smartsocket.plugins';
-import * as plugins from "./smartsocket.plugins";
+import { ISocketFunctionCall } from './smartsocket.classes.socketfunction';
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
+import { SocketConnection } from './smartsocket.classes.socketconnection';
-import { Objectmap } from "lik";
+export declare type TSocketRequestStatus = 'new' | 'pending' | 'finished';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+export declare type TSocketRequestSide = 'requesting' | 'responding';
-export declare type TSocketRequestStatus = "new" | "pending" | "finished";
-export declare type TSocketRequestSide = "requesting" | "responding";
 /**
  * interface of constructor of class SocketRequest
  */
@@ -22,19 +20,19 @@ export interface ISocketRequestDataObject {
     shortId: string;
     responseTimeout?: number;
 }
-export declare let allSocketRequests: Objectmap<SocketRequest>;
+export declare let allSocketRequests: plugins.lik.Objectmap<SocketRequest>;
 export declare class SocketRequest {
     status: TSocketRequestStatus;
     side: TSocketRequestSide;
     shortid: string;
     originSocketConnection: SocketConnection;
     funcCallData: ISocketFunctionCall;
-    done: plugins.q.Deferred<{}>;
+    done: plugins.smartq.Deferred<{}>;
     constructor(optionsArg: SocketRequestConstructorOptions);
     /**
      * dispatches a socketrequest from the requesting to the receiving side
      */
-    dispatch(): plugins.q.Promise<{}>;
+    dispatch(): Promise<{}>;
     /**
      * handles the response that is received by the requesting side
      */

dist/smartsocket.classes.socketrequest.js

@@ -1,23 +1,22 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartsocket.plugins");
 const helpers = require("./smartsocket.helpers");
 // import classes
 const lik_1 = require("lik");
-;
-;
 // export objects
 exports.allSocketRequests = new lik_1.Objectmap();
 // export classes
 class SocketRequest {
     constructor(optionsArg) {
-        this.status = "new";
+        this.status = 'new';
-        this.done = plugins.q.defer();
+        this.done = plugins.smartq.defer();
         this.side = optionsArg.side;
         this.shortid = optionsArg.shortId;
         this.funcCallData = optionsArg.funcCallData;
+        this.originSocketConnection = optionsArg.originSocketConnection;
         exports.allSocketRequests.add(this);
     }
-    ;
     // requesting --------------------------
     /**
      * dispatches a socketrequest from the requesting to the receiving side
@@ -27,15 +26,15 @@ class SocketRequest {
             funcCallData: this.funcCallData,
             shortId: this.shortid
         };
-        this.originSocketConnection.socket.emit("function", requestData);
+        this.originSocketConnection.socket.emit('function', requestData);
         return this.done.promise;
     }
-    ;
     /**
      * handles the response that is received by the requesting side
      */
     handleResponse(responseDataArg) {
-        this.done.resolve(responseDataArg);
+        plugins.beautylog.log('handling response!');
+        this.done.resolve(responseDataArg.funcCallData);
         exports.allSocketRequests.remove(this);
     }
     // responding --------------------------
@@ -44,17 +43,17 @@ class SocketRequest {
      */
     createResponse() {
         let targetSocketFunction = helpers.getSocketFunctionByName(this.funcCallData.funcName);
-        targetSocketFunction.invoke(this.funcCallData)
+        plugins.beautylog.info(`invoking ${targetSocketFunction.name}`);
-            .then((resultData) => {
+        targetSocketFunction.invoke(this.funcCallData).then(resultData => {
+            plugins.beautylog.log('got resultData. Sending it to requesting party.');
             let requestData = {
                 funcCallData: resultData,
                 shortId: this.shortid
             };
-            this.originSocketConnection.socket.emit("functionResponse", requestData);
+            this.originSocketConnection.socket.emit('functionResponse', requestData);
             exports.allSocketRequests.remove(this);
         });
     }
 }
 exports.SocketRequest = SocketRequest;
-;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsaURBQWlEO0FBQ2pELGlEQUFpRDtBQUtqRCxpQkFBaUI7QUFDakIsNkJBQWdDO0FBMkJoQyxpQkFBaUI7QUFDTixRQUFBLGlCQUFpQixHQUFHLElBQUksZUFBUyxFQUFpQixDQUFDO0FBRTlELGlCQUFpQjtBQUNqQjtJQU9FLFlBQVksVUFBMkM7UUFOdkQsV0FBTSxHQUF5QixLQUFLLENBQUM7UUFLckMsU0FBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFNUIsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxJQUFJLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxZQUFZLENBQUM7UUFDNUMsSUFBSSxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxzQkFBc0IsQ0FBQztRQUNoRSx5QkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELHdDQUF3QztJQUV4Qzs7T0FFRztJQUNILFFBQVE7UUFDTixJQUFJLFdBQVcsR0FBNkI7WUFDMUMsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxjQUFjLENBQUMsZUFBeUM7UUFDdEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEQseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRCx3Q0FBd0M7SUFFeEM7O09BRUc7SUFDSCxjQUFjO1FBQ1osSUFBSSxvQkFBb0IsR0FBbUIsT0FBTyxDQUFDLHVCQUF1QixDQUN4RSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsQ0FBQztRQUNGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFlBQVksb0JBQW9CLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNoRSxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMvRCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO1lBQ3pFLElBQUksV0FBVyxHQUE2QjtnQkFDMUMsWUFBWSxFQUFFLFVBQVU7Z0JBQ3hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTzthQUN0QixDQUFDO1lBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsV0FBVyxDQUFDLENBQUM7WUFDekUseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBMURELHNDQTBEQyJ9
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSx1QkFBdUIsQ0FBQyxDQUFBO0FBQ2pELE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFLakQsaUJBQWlCO0FBQ2pCLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQWdCL0IsQ0FBQztBQVNELENBQUM7QUFFRixnQkFBZ0I7QUFDTCx5QkFBaUIsR0FBRyxJQUFJLGVBQVMsRUFBaUIsQ0FBQztBQUU5RCxpQkFBaUI7QUFDakI7SUFPSSxZQUFZLFVBQTJDO1FBTnZELFdBQU0sR0FBeUIsS0FBSyxDQUFDO1FBS3JDLFNBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRXJCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUM7UUFDbEMsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzVDLHlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxDQUFDOztJQUVELHdDQUF3QztJQUV4Qzs7T0FFRztJQUNILFFBQVE7UUFDSixJQUFJLFdBQVcsR0FBNkI7WUFDeEMsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN4QixDQUFBO1FBQ0QsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUM3QixDQUFDOztJQUVEOztPQUVHO0lBQ0gsY0FBYyxDQUFDLGVBQXlDO1FBQ3BELElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ25DLHlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuQyxDQUFDO0lBRUQsd0NBQXdDO0lBRXhDOztPQUVHO0lBQ0gsY0FBYztRQUNWLElBQUksb0JBQW9CLEdBQW1CLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZHLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDO2FBQ3pDLElBQUksQ0FBQyxDQUFDLFVBQVU7WUFDYixJQUFJLFdBQVcsR0FBNkI7Z0JBQ3hDLFlBQVksRUFBRSxVQUFVO2dCQUN4QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDeEIsQ0FBQTtZQUNELElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ3hFLHlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxDQUFDLENBQUMsQ0FBQztJQUNYLENBQUM7QUFDTCxDQUFDO0FBckRZLHFCQUFhLGdCQXFEekIsQ0FBQTtBQUFBLENBQUMifQ==

dist/smartsocket.classes.socketrole.d.ts

@@ -1,6 +1,5 @@
-import { Objectmap } from "lik";
+import * as plugins from './smartsocket.plugins';
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { SocketFunction } from './smartsocket.classes.socketfunction';
-export declare let allSocketRoles: Objectmap<SocketRole>;
 /**
  * interface for class SocketRole
  */
@@ -14,7 +13,7 @@ export interface SocketRoleOptions {
 export declare class SocketRole {
     name: string;
     passwordHash: string;
-    allowedFunctions: Objectmap<SocketFunction>;
+    allowedFunctions: plugins.lik.Objectmap<SocketFunction>;
     constructor(optionsArg: SocketRoleOptions);
     addSocketFunction(socketFunctionArg: SocketFunction): void;
 }

dist/smartsocket.classes.socketrole.js

@@ -1,7 +1,7 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // import classes
 const lik_1 = require("lik");
-exports.allSocketRoles = new lik_1.Objectmap();
 /**
  * A socketrole defines access to certain routines.
  */
@@ -10,12 +10,10 @@ class SocketRole {
         this.allowedFunctions = new lik_1.Objectmap();
         this.name = optionsArg.name;
         this.passwordHash = optionsArg.passwordHash;
-        exports.allSocketRoles.add(this);
     }
-    ;
     addSocketFunction(socketFunctionArg) {
         this.allowedFunctions.add(socketFunctionArg);
     }
 }
 exports.SocketRole = SocketRole;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQSxpQkFBaUI7QUFDakIsc0JBQTBCLEtBQUssQ0FBQyxDQUFBO0FBSXJCLHNCQUFjLEdBQUcsSUFBSSxlQUFTLEVBQWMsQ0FBQztBQVd4RDs7R0FFRztBQUNIO0lBSUksWUFBWSxVQUE2QjtRQUR6QyxxQkFBZ0IsR0FBRyxJQUFJLGVBQVMsRUFBa0IsQ0FBQztRQUUvQyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzVDLHNCQUFjLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdCLENBQUM7O0lBQ0QsaUJBQWlCLENBQUMsaUJBQWdDO1FBQzlDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNqRCxDQUFDO0FBQ0wsQ0FBQztBQVpZLGtCQUFVLGFBWXRCLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsaUJBQWlCO0FBQ2pCLDZCQUFnQztBQVdoQzs7R0FFRztBQUNIO0lBSUUsWUFBWSxVQUE2QjtRQUR6QyxxQkFBZ0IsR0FBRyxJQUFJLGVBQVMsRUFBa0IsQ0FBQztRQUVqRCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO0lBQzlDLENBQUM7SUFDRCxpQkFBaUIsQ0FBQyxpQkFBaUM7UUFDakQsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FDRjtBQVhELGdDQVdDIn0=

dist/smartsocket.classes.socketserver.d.ts

@@ -0,0 +1,29 @@
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+/**
+ * class socketServer
+ * handles the attachment of socketIo to whatever server is in play
+ */
+export declare class SocketServer {
+    private smartsocket;
+    private httpServer;
+    private standaloneServer;
+    private expressServer;
+    constructor(smartSocketInstance: Smartsocket);
+    /**
+     * starts the server with another server
+     * also works with an express style server
+     */
+    setExternalServer(serverType: 'express' | 'http', serverArg: any): Promise<void>;
+    /**
+     * gets the server for socket.io
+     */
+    getServerForSocketIo(): any;
+    /**
+     * starts listening to incoming sockets:
+     */
+    start(): Promise<void>;
+    /**
+     * closes the server
+     */
+    stop(): Promise<void>;
+}

dist/smartsocket.classes.socketserver.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./smartsocket.plugins");
+// used in case no other server is supplied
+const http = require("http");
+/**
+ * class socketServer
+ * handles the attachment of socketIo to whatever server is in play
+ */
+class SocketServer {
+    constructor(smartSocketInstance) {
+        // wether httpServer is standalone
+        this.standaloneServer = false;
+        this.smartsocket = smartSocketInstance;
+    }
+    /**
+     * starts the server with another server
+     * also works with an express style server
+     */
+    setExternalServer(serverType, serverArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (serverType === 'http') {
+                this.httpServer = serverArg;
+            }
+            else if (serverType === 'express') {
+                this.expressServer = serverArg;
+            }
+        });
+    }
+    /**
+     * gets the server for socket.io
+     */
+    getServerForSocketIo() {
+        if (this.httpServer) {
+            return this.httpServer;
+        }
+        else if (this.expressServer) {
+            return this.expressServer;
+        }
+        else if (!this.httpServer && !this.expressServer) {
+            this.httpServer = new http.Server();
+            this.standaloneServer = true;
+            return this.httpServer;
+        }
+        else {
+            throw new Error('no server specified!');
+        }
+    }
+    /**
+     * starts listening to incoming sockets:
+     */
+    start() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const done = plugins.smartq.defer();
+            // handle http servers
+            if (this.httpServer && this.standaloneServer) {
+                this.httpServer.listen(this.smartsocket.options.port, () => {
+                    console.log(`Server started in standalone mode on ${this.smartsocket.options.port}`);
+                    done.resolve();
+                });
+            }
+            else {
+                done.resolve();
+            }
+            // nothing else to do if express server is set
+            yield done.promise;
+            return;
+        });
+    }
+    /**
+     * closes the server
+     */
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
+}
+exports.SocketServer = SocketServer;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsaURBQWlEO0FBRWpELDJDQUEyQztBQUMzQyw2QkFBNkI7QUFHN0I7OztHQUdHO0FBQ0g7SUFPRSxZQUFZLG1CQUFnQztRQUo1QyxrQ0FBa0M7UUFDMUIscUJBQWdCLEdBQUcsS0FBSyxDQUFDO1FBSS9CLElBQUksQ0FBQyxXQUFXLEdBQUcsbUJBQW1CLENBQUM7SUFDekMsQ0FBQztJQUVEOzs7T0FHRztJQUNVLGlCQUFpQixDQUFDLFVBQThCLEVBQUUsU0FBYzs7WUFDM0UsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQzFCLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDO1lBQzlCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3BDLElBQUksQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDO1lBQ2pDLENBQUM7UUFDSCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNJLG9CQUFvQjtRQUN6QixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNwQixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQzlCLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO1FBQzVCLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7WUFDbkQsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO1lBQzdCLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ3pCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUMxQyxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ1UsS0FBSzs7WUFDaEIsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUVwQyxzQkFBc0I7WUFDdEIsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO2dCQUM3QyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFO29CQUN6RCxPQUFPLENBQUMsR0FBRyxDQUFDLHdDQUF3QyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO29CQUNyRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ2pCLENBQUMsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixDQUFDO1lBRUQsOENBQThDO1lBQzlDLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNuQixNQUFNLENBQUM7UUFDVCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNVLElBQUk7OERBQUksQ0FBQztLQUFBO0NBQ3ZCO0FBakVELG9DQWlFQyJ9

dist/smartsocket.helpers.d.ts

@@ -1,6 +1,9 @@
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketRequest, TSocketRequestSide } from "./smartsocket.classes.socketrequest";
+import { SocketFunction } from './smartsocket.classes.socketfunction';
-import { SocketRole } from "./smartsocket.classes.socketrole";
+import { ISocketConnectionAuthenticationObject } from './smartsocket.classes.socketconnection';
+import { SocketRequest, TSocketRequestSide } from './smartsocket.classes.socketrequest';
+import { SocketRole } from './smartsocket.classes.socketrole';
+export declare let checkPasswordForRole: (dataArg: ISocketConnectionAuthenticationObject, referenceSmartsocket: Smartsocket) => boolean;
 export declare let getSocketFunctionByName: (functionNameArg: string) => SocketFunction;
 /**
  * get corresponding Socketrequest instance by shortId
@@ -9,4 +12,4 @@ export declare let getSocketRequestById: (shortIdArg: string, requestSide?: TSoc
 /**
  * get corresponding SocketRole instance by name
  */
-export declare let getSocketRoleByName: (socketRoleNameArg: string) => SocketRole;
+export declare let getSocketRoleByName: (socketRoleNameArg: string, referenceSmartsocket: Smartsocket) => SocketRole;

dist/smartsocket.helpers.js

@@ -1,23 +1,36 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./smartsocket.plugins");
 const smartsocket_classes_socketfunction_1 = require("./smartsocket.classes.socketfunction");
 const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest");
-const smartsocket_classes_socketrole_1 = require("./smartsocket.classes.socketrole");
+// SocketConnection helpers
+exports.checkPasswordForRole = (dataArg, referenceSmartsocket) => {
+    let targetPasswordHash = exports.getSocketRoleByName(dataArg.role, referenceSmartsocket).passwordHash;
+    let computedCompareHash = plugins.nodehash.sha256FromStringSync(dataArg.password);
+    return targetPasswordHash === computedCompareHash;
+};
 // SocketFunction helpers
 exports.getSocketFunctionByName = (functionNameArg) => {
-    return smartsocket_classes_socketfunction_1.allSocketFunctions.find((socketFunctionArg) => { return socketFunctionArg.name === functionNameArg; });
+    return smartsocket_classes_socketfunction_1.allSocketFunctions.find(socketFunctionArg => {
+        return socketFunctionArg.name === functionNameArg;
+    });
 };
 // SocketRequest helpers
 /**
  * get corresponding Socketrequest instance by shortId
  */
 exports.getSocketRequestById = (shortIdArg, requestSide) => {
-    return smartsocket_classes_socketrequest_1.allSocketRequests.find((socketRequestArg) => { return socketRequestArg.shortid === shortIdArg; });
+    return smartsocket_classes_socketrequest_1.allSocketRequests.find(socketRequestArg => {
+        return socketRequestArg.shortid === shortIdArg;
+    });
 };
 // SocketRole helpers
 /**
  * get corresponding SocketRole instance by name
  */
-exports.getSocketRoleByName = (socketRoleNameArg) => {
+exports.getSocketRoleByName = (socketRoleNameArg, referenceSmartsocket) => {
-    return smartsocket_classes_socketrole_1.allSocketRoles.find((socketRoleArg) => { return socketRoleArg.name === socketRoleNameArg; });
+    return referenceSmartsocket.socketRoles.find(socketRoleArg => {
+        return socketRoleArg.name === socketRoleNameArg;
+    });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUlBLHFEQUFtRCxzQ0FBc0MsQ0FBQyxDQUFBO0FBRTFGLG9EQUFxRSxxQ0FBcUMsQ0FBQyxDQUFBO0FBQzNHLGlEQUEyQyxrQ0FBa0MsQ0FBQyxDQUFBO0FBRTlFLHlCQUF5QjtBQUNkLCtCQUF1QixHQUFHLENBQUMsZUFBdUI7SUFDekQsTUFBTSxDQUFDLHVEQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDLGlCQUFpQixPQUFPLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakgsQ0FBQyxDQUFBO0FBRUQsd0JBQXdCO0FBRXhCOztHQUVHO0FBQ1EsNEJBQW9CLEdBQUcsQ0FBQyxVQUFpQixFQUFDLFdBQStCO0lBQ2hGLE1BQU0sQ0FBQyxxREFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQyxnQkFBZ0IsT0FBTSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxLQUFLLFVBQVUsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBO0FBQ3pHLENBQUMsQ0FBQTtBQUVELHFCQUFxQjtBQUVyQjs7R0FFRztBQUNRLDJCQUFtQixHQUFHLENBQUMsaUJBQXlCO0lBQ3ZELE1BQU0sQ0FBQywrQ0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLGFBQWEsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksS0FBSyxpQkFBaUIsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3RHLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFJakQsNkZBQTBGO0FBSzFGLDJGQUk2QztBQUc3QywyQkFBMkI7QUFDaEIsUUFBQSxvQkFBb0IsR0FBRyxDQUNoQyxPQUE4QyxFQUM5QyxvQkFBaUMsRUFDeEIsRUFBRTtJQUNYLElBQUksa0JBQWtCLEdBQUcsMkJBQW1CLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxvQkFBb0IsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUM5RixJQUFJLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xGLE1BQU0sQ0FBQyxrQkFBa0IsS0FBSyxtQkFBbUIsQ0FBQztBQUNwRCxDQUFDLENBQUM7QUFFRix5QkFBeUI7QUFDZCxRQUFBLHVCQUF1QixHQUFHLENBQUMsZUFBdUIsRUFBa0IsRUFBRTtJQUMvRSxNQUFNLENBQUMsdURBQWtCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUU7UUFDakQsTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQUksS0FBSyxlQUFlLENBQUM7SUFDcEQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRix3QkFBd0I7QUFFeEI7O0dBRUc7QUFDUSxRQUFBLG9CQUFvQixHQUFHLENBQ2hDLFVBQWtCLEVBQ2xCLFdBQWdDLEVBQ2pCLEVBQUU7SUFDakIsTUFBTSxDQUFDLHFEQUFpQixDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQy9DLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEtBQUssVUFBVSxDQUFDO0lBQ2pELENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYscUJBQXFCO0FBRXJCOztHQUVHO0FBQ1EsUUFBQSxtQkFBbUIsR0FBRyxDQUMvQixpQkFBeUIsRUFDekIsb0JBQWlDLEVBQ3JCLEVBQUU7SUFDZCxNQUFNLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRTtRQUMzRCxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksS0FBSyxpQkFBaUIsQ0FBQztJQUNsRCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyJ9

dist/smartsocket.plugins.d.ts

@@ -1,8 +1,8 @@
-import "typings-global";
+export import beautylog = require('beautylog');
-export import beautylog = require("beautylog");
+export import lik = require('lik');
-export import lik = require("lik");
+export import nodehash = require('nodehash');
-export import q = require("q");
+export import smartdelay = require('smartdelay');
-export import shortid = require("shortid");
+export import smartq = require('smartq');
-export import socketIo = require("socket.io");
+export import shortid = require('shortid');
-export import socketIoClient = require("socket.io-client");
+export import socketIo = require('socket.io');
-export import taskbuffer = require("taskbuffer");
+export import socketIoClient = require('socket.io-client');

dist/smartsocket.plugins.js

@@ -1,10 +1,11 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.beautylog = require("beautylog");
 exports.lik = require("lik");
-exports.q = require("q");
+exports.nodehash = require("nodehash");
+exports.smartdelay = require("smartdelay");
+exports.smartq = require("smartq");
 exports.shortid = require("shortid");
 exports.socketIo = require("socket.io");
 exports.socketIoClient = require("socket.io-client");
-exports.taskbuffer = require("taskbuffer");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBK0M7QUFDL0MsNkJBQW1DO0FBQ25DLHVDQUE2QztBQUM3QywyQ0FBaUQ7QUFDakQsbUNBQXlDO0FBQ3pDLHFDQUEyQztBQUMzQyx3Q0FBOEM7QUFDOUMscURBQTJEIn0=
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsV0FBRyxXQUFZLEtBQUssQ0FBQyxDQUFDO0FBQ3RCLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLFdBQVcsU0FBUyxDQUFDLENBQUM7QUFDN0IsZ0JBQVEsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNoQyxzQkFBYyxXQUFXLGtCQUFrQixDQUFDLENBQUM7QUFDN0Msa0JBQVUsV0FBVyxZQUFZLENBQUMsQ0FBQyJ9

npmextra.json

@@ -1,5 +1,6 @@
 {
-    "npmts":{
+  "gitzone": {},
-        "coverageTreshold":50
+  "npmci": {
+    "npmGlobalTools": []
   }
 }

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "smartsocket",
+  "name": "@pushrocks/smartsocket",
-  "version": "1.0.6",
+  "version": "1.1.23",
-  "description": "easy and secure websocket communication, Typescript ready",
+  "description": "easy and secure websocket communication, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "tstest test/",
+    "build": "echo \"Not needed for now\""
   },
   "repository": {
     "type": "git",
@@ -18,21 +19,24 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartsocket#README",
   "dependencies": {
-    "@types/q": "0.x.x",
+    "@pushrocks/lik": "^3.0.4",
-    "@types/shortid": "0.0.27",
+    "@pushrocks/smartdelay": "^2.0.2",
-    "@types/socket.io": "^1.4.26",
+    "@pushrocks/smarthash": "^2.0.4",
-    "@types/socket.io-client": "^1.4.26",
+    "@pushrocks/smartlog": "^2.0.16",
-    "beautylog": "^5.0.20",
+    "@pushrocks/smartpromise": "^2.0.5",
-    "lik": "^1.0.15",
+    "@types/shortid": "0.0.29",
-    "q": "^1.4.1",
+    "@types/socket.io": "^2.1.2",
-    "shortid": "^2.2.6",
+    "@types/socket.io-client": "^1.4.32",
-    "socket.io": "^1.4.8",
+    "shortid": "^2.2.14",
-    "socket.io-client": "^1.4.8",
+    "socket.io": "^2.2.0",
-    "taskbuffer": "^1.0.7"
+    "socket.io-client": "^2.2.0"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.8",
+    "@gitzone/tsbuild": "^2.1.8",
-    "should": "^11.0.0",
+    "@gitzone/tsrun": "^1.1.17",
-    "typings-test": "^1.0.1"
+    "@gitzone/tstest": "^1.0.18",
-  }
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.19"
+  },
+  "private": false
 }

test/test.d.ts

@@ -1,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,75 +0,0 @@
-"use strict";
-require("typings-test");
-require("should");
-const smartsocket = require("../dist/index");
-const q = require("q");
-let testSmartsocket;
-let testSmartsocketClient;
-let testSocketFunction1;
-let testConfig = {
-    port: 3000
-};
-describe("smartsocket", function () {
-    describe("class Smartsocket", function () {
-        it("should create a new smartsocket", function () {
-            testSmartsocket = new smartsocket.Smartsocket({ port: testConfig.port });
-            testSmartsocket.should.be.instanceOf(smartsocket.Smartsocket);
-        });
-        it("should start listening when .started is called", function () {
-            testSmartsocket.startServer();
-        });
-    });
-    describe("class SocketRole", function () {
-    });
-    describe("class SocketFunction", function () {
-        it("should register a new Function", function () {
-            testSocketFunction1 = new smartsocket.SocketFunction({
-                funcName: "testFunction1",
-                funcDef: () => {
-                    let done = q.defer();
-                    return done.promise;
-                },
-                allowedRoles: []
-            });
-        });
-    });
-    describe("class SmartsocketClient", function () {
-        it("should react to a new websocket connection from client", function (done) {
-            this.timeout(10000);
-            testSmartsocketClient = new smartsocket.SmartsocketClient({
-                port: testConfig.port,
-                url: "http://localhost",
-                password: "testPassword",
-                alias: "testClient1",
-                role: undefined
-            });
-            testSmartsocketClient.connect()
-                .then(() => {
-                done();
-            });
-        });
-        it("client should disconnect and reconnect", function (done) {
-            this.timeout(10000);
-            testSmartsocketClient.disconnect()
-                .then(() => {
-                let done = q.defer();
-                setTimeout(() => {
-                    testSmartsocketClient.connect()
-                        .then(done.resolve);
-                }, 0);
-                return done.promise;
-            })
-                .then(() => {
-                done();
-            });
-        });
-        it("2 clients should connect in parallel", function () {
-        });
-    });
-    describe("terminating smartsocket", function () {
-        it("should close the server", function () {
-            testSmartsocket.closeServer();
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixNQUFPLFdBQVcsV0FBVyxlQUFlLENBQUMsQ0FBQztBQUM5QyxNQUFPLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUV4QixJQUFJLGVBQXdDLENBQUM7QUFDN0MsSUFBSSxxQkFBb0QsQ0FBQztBQUN6RCxJQUFJLG1CQUE4QyxDQUFDO0FBRW5ELElBQUksVUFBVSxHQUFHO0lBQ2IsSUFBSSxFQUFFLElBQUk7Q0FDYixDQUFBO0FBRUQsUUFBUSxDQUFDLGFBQWEsRUFBRTtJQUNwQixRQUFRLENBQUMsbUJBQW1CLEVBQUU7UUFDMUIsRUFBRSxDQUFDLGlDQUFpQyxFQUFFO1lBQ2xDLGVBQWUsR0FBRyxJQUFJLFdBQVcsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7WUFDekUsZUFBZSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNsRSxDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQyxnREFBZ0QsRUFBRTtZQUNqRCxlQUFlLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDbEMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxrQkFBa0IsRUFBRTtJQUU3QixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRTtRQUM3QixFQUFFLENBQUMsZ0NBQWdDLEVBQUU7WUFDakMsbUJBQW1CLEdBQUcsSUFBSSxXQUFXLENBQUMsY0FBYyxDQUFDO2dCQUNqRCxRQUFRLEVBQUMsZUFBZTtnQkFDeEIsT0FBTyxFQUFFO29CQUNMLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztvQkFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7Z0JBQ3hCLENBQUM7Z0JBQ0QsWUFBWSxFQUFDLEVBQUU7YUFDbEIsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyx5QkFBeUIsRUFBRTtRQUNoQyxFQUFFLENBQUMsd0RBQXdELEVBQUUsVUFBVSxJQUFJO1lBQ3ZFLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIscUJBQXFCLEdBQUcsSUFBSSxXQUFXLENBQUMsaUJBQWlCLENBQUM7Z0JBQ3RELElBQUksRUFBRSxVQUFVLENBQUMsSUFBSTtnQkFDckIsR0FBRyxFQUFFLGtCQUFrQjtnQkFDdkIsUUFBUSxFQUFFLGNBQWM7Z0JBQ3hCLEtBQUssRUFBRSxhQUFhO2dCQUNwQixJQUFJLEVBQUUsU0FBUzthQUNsQixDQUFDLENBQUM7WUFDSCxxQkFBcUIsQ0FBQyxPQUFPLEVBQUU7aUJBQzFCLElBQUksQ0FBQztnQkFDRixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsd0NBQXdDLEVBQUUsVUFBVSxJQUFJO1lBQ3ZELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIscUJBQXFCLENBQUMsVUFBVSxFQUFFO2lCQUM3QixJQUFJLENBQUM7Z0JBQ0YsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUNyQixVQUFVLENBQUM7b0JBQ1AscUJBQXFCLENBQUMsT0FBTyxFQUFFO3lCQUMxQixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO2dCQUMzQixDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7Z0JBQ0wsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDeEIsQ0FBQyxDQUFDO2lCQUNELElBQUksQ0FBQztnQkFDRixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsc0NBQXNDLEVBQUU7UUFFM0MsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyx5QkFBeUIsRUFBRTtRQUNoQyxFQUFFLENBQUMseUJBQXlCLEVBQUU7WUFDMUIsZUFBZSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQyJ9

test/test.ts

@@ -1,79 +1,124 @@
-import "typings-test";
+// tslint:disable-next-line:no-implicit-dependencies
-import "should";
+import { expect, tap } from '@pushrocks/tapbundle';
-import socketIoClient = require("socket.io-client");
+
-import smartsocket = require("../dist/index");
+import * as nodehash from '@pushrocks/smarthash';
-import q = require("q");
+import * as smartq from '@pushrocks/smartpromise';
+
+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 testConfig = {
+const testConfig = {
   port: 3000
-}
+};
 
-describe("smartsocket", function () {
+// class smartsocket
-    describe("class Smartsocket", function () {
+tap.test('should create a new smartsocket', async () => {
-        it("should create a new smartsocket", function () {
   testSmartsocket = new smartsocket.Smartsocket({ port: testConfig.port });
-            testSmartsocket.should.be.instanceOf(smartsocket.Smartsocket);
+  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
 });
-        it("should start listening when .started is called", function () {
-            testSmartsocket.startServer();
-        });
-    });
-    describe("class SocketRole", function(){
 
-    })
+tap.test('should start listening when .started is called', async () => {
-    describe("class SocketFunction", function () {
+  await testSmartsocket.start();
-        it("should register a new Function", function () {
+});
+
+// class socketrole
+tap.test('should add a socketrole', async () => {
+  testSocketRole1 = new smartsocket.SocketRole({
+    name: 'testRole1',
+    passwordHash: nodehash.sha256FromStringSync('testPassword')
+  });
+  testSmartsocket.addSocketRoles([testSocketRole1]);
+});
+
+// class SocketFunction
+tap.test('should register a new Function', async () => {
   testSocketFunction1 = new smartsocket.SocketFunction({
-                funcName:"testFunction1",
+    allowedRoles: [testSocketRole1],
-                funcDef: () => {
+    funcDef: async dataArg => {
-                    let done = q.defer();
+      return dataArg;
-                    return done.promise;
     },
-                allowedRoles:[]
+    funcName: 'testFunction1'
   });
 });
-    });
+
-    describe("class SmartsocketClient", function () {
+// class SmartsocketClient
-        it("should react to a new websocket connection from client", function (done) {
+tap.test('should react to a new websocket connection from client', async () => {
-            this.timeout(10000);
+  const done = smartq.defer();
   testSmartsocketClient = new smartsocket.SmartsocketClient({
     port: testConfig.port,
-                url: "http://localhost",
+    url: 'http://localhost',
-                password: "testPassword",
+    password: 'testPassword',
-                alias: "testClient1",
+    alias: 'testClient1',
-                role: undefined
+    role: 'testRole1'
   });
-            testSmartsocketClient.connect()
+  testSmartsocketClient.connect().then(() => {
+    done.resolve();
+  });
+  await done.promise;
+});
+tap.test('client should disconnect and reconnect', async () => {
+  let done = smartq.defer();
+  testSmartsocketClient
+    .disconnect()
     .then(() => {
-                    done();
+      let done = smartq.defer();
-                });
-        });
-        it("client should disconnect and reconnect", function (done) {
-            this.timeout(10000);
-            testSmartsocketClient.disconnect()
-                .then(() => {
-                    let done = q.defer();
       setTimeout(() => {
-                        testSmartsocketClient.connect()
+        testSmartsocketClient.connect().then(done.resolve);
-                            .then(done.resolve)
+      }, 0);
-                    }, 0)
       return done.promise;
     })
     .then(() => {
-                    done();
+      done.resolve();
     });
+  await done.promise;
 });
-        it("2 clients should connect in parallel", function () {
 
+tap.test('2 clients should connect in parallel', async () => {
+  // TODO: implement parallel test
 });
-    });
+
-    describe("terminating smartsocket", function () {
+tap.test('should be able to make a functionCall from client to server', async () => {
-        it("should close the server", function () {
+  let done = smartq.defer();
-            testSmartsocket.closeServer();
+  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 = smartq.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();
+});
+
+tap.start();

ts/index.ts

@@ -1,8 +1,10 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
 
-export * from "./smartsocket.classes.smartsocket";
+// export main classes
-export * from "./smartsocket.classes.smartsocketclient";
+export * from './smartsocket.classes.smartsocket';
-export * from "./smartsocket.classes.socketfunction";
+export * from './smartsocket.classes.smartsocketclient';
-export * from "./smartsocket.classes.socketrole";
 
-// need something more exposed? Create an issue on GitLab!
+// export further classes and objects
+export * from './smartsocket.classes.socketfunction';
+export * from './smartsocket.classes.socketrole';
+export * from './smartsocket.classes.socketconnection';

ts/smartsocket.classes.smartsocket.ts

@@ -1,63 +1,124 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
-import * as helpers from "./smartsocket.helpers";
+import * as helpers from './smartsocket.helpers';
 
 // classes
-import { Objectmap } from "lik";
+import { Objectmap } from '@pushrocks/lik';
-import { SocketRole } from "./smartsocket.classes.socketrole";
+import { SocketConnection } from './smartsocket.classes.socketconnection';
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { ISocketFunctionCall, SocketFunction } from './smartsocket.classes.socketfunction';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+import { SocketRequest } from './smartsocket.classes.socketrequest';
+import { SocketRole } from './smartsocket.classes.socketrole';
+import { SocketServer } from './smartsocket.classes.socketserver';
+
+// socket.io
+import * as SocketIO from 'socket.io';
 
 export interface ISmartsocketConstructorOptions {
   port: number;
-
+}
-};
 
 export class Smartsocket {
-    options: ISmartsocketConstructorOptions
+  public options: ISmartsocketConstructorOptions;
-    io: SocketIO.Server;
+  public io: SocketIO.Server;
-    openSockets = new Objectmap<SocketConnection>();
+  public openSockets = new Objectmap<SocketConnection>();
+  public socketRoles = new Objectmap<SocketRole>();
+
+  private socketServer = new SocketServer(this);
+
   constructor(optionsArg: ISmartsocketConstructorOptions) {
     this.options = optionsArg;
-    };
+  }
+
+  // tslint:disable-next-line:member-ordering
+  public setExternalServer = this.socketServer.setExternalServer;
+
+  /**
+   * starts smartsocket
+   */
+  public async start() {
+    this.io = plugins.socketIo(this.socketServer.getServerForSocketIo());
+    await this.socketServer.start();
+    this.io.on('connection', socketArg => {
+      this._handleSocketConnection(socketArg);
+    });
+  }
+
+  /**
+   * stops smartsocket
+   */
+  public async stop() {
+    await plugins.smartdelay.delayFor(1000);
+    this.openSockets.forEach((socketObjectArg: SocketConnection) => {
+      plugins.smartlog.defaultLogger.log(
+        'info',
+        `disconnect socket with >>alias ${socketObjectArg.alias}`
+      );
+      socketObjectArg.socket.disconnect();
+    });
+    this.openSockets.wipe();
+    this.io.close();
+
+    // stop the corresponging server
+    this.socketServer.stop();
+  }
+
+  // communication
+
+  /**
+   * allows call to specific client.
+   */
+  public async clientCall(
+    functionNameArg: string,
+    dataArg: any,
+    targetSocketConnectionArg: SocketConnection
+  ) {
+    const done = plugins.smartpromise.defer();
+    const socketRequest = new SocketRequest({
+      funcCallData: {
+        funcDataArg: dataArg,
+        funcName: functionNameArg
+      },
+      originSocketConnection: targetSocketConnectionArg,
+      shortId: plugins.shortid.generate(),
+      side: 'requesting'
+    });
+    socketRequest.dispatch().then((dataArg: ISocketFunctionCall) => {
+      done.resolve(dataArg.funcDataArg);
+    });
+    const result = await done.promise;
+    return result;
+  }
+
+  /**
+   * adds socketRoles
+   */
+  public addSocketRoles(socketRolesArray: SocketRole[]): void {
+    for (const socketRole of socketRolesArray) {
+      this.socketRoles.add(socketRole);
+    }
+    return;
+  }
 
   /**
    * the standard handler for new socket connections
    */
   private _handleSocketConnection(socketArg) {
-        let socketConnection: SocketConnection =  new SocketConnection({
+    const socketConnection: SocketConnection = new SocketConnection({
       alias: undefined,
       authenticated: false,
       role: undefined,
+      side: 'server',
+      smartsocketHost: this,
       socket: socketArg
     });
-        plugins.beautylog.log("Socket connected. Trying to authenticate...")
+    plugins.smartlog.defaultLogger.log('info', 'Socket connected. Trying to authenticate...');
     this.openSockets.add(socketConnection);
-        socketConnection.authenticate()
+    socketConnection
-            .then(socketConnection.listenToFunctionRequests);
+      .authenticate()
-    };
+      .then(() => {
-
+        return socketConnection.listenToFunctionRequests();
-    /**
+      })
-     * starts listening to incling sockets:
+      .catch(err => {
-     */
+        console.log(err);
-
-    startServer = () => {
-        this.io = plugins.socketIo(this.options.port);
-        this.io.on("connection", (socketArg) => {
-            this._handleSocketConnection(socketArg);
       });
   }
-    closeServer = () => {
-        this.openSockets.forEach((socketObjectArg: SocketConnection) => {
-            plugins.beautylog.log(`disconnect socket with >>alias ${socketObjectArg.alias}`);
-            socketObjectArg.socket.disconnect();
-        });
-        this.openSockets.wipe();
-        this.io.close();
-    };
-
-    // communication
-    clientCall(){
-        
-        // TODO: target specific client and initiate response        
-    }
 }

ts/smartsocket.classes.smartsocketclient.ts

@@ -1,14 +1,9 @@
-import * as plugins from "./smartsocket.plugins"
+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 interfaces
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
-import { ISocketRequestDataObject } from "./smartsocket.classes.socketrequest"
-
-// import classes
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
-import { SocketRequest } from "./smartsocket.classes.socketrequest";
 /**
  * interface for class SmartsocketClient
  */
@@ -30,50 +25,56 @@ export class SmartsocketClient {
   constructor(optionsArg: ISmartsocketClientOptions) {
     this.alias = optionsArg.alias;
     this.role = optionsArg.role;
-        this.serverUrl = optionsArg.url
+    this.serverUrl = optionsArg.url;
     this.serverPort = optionsArg.port;
-        this.serverPassword = optionsArg.password
+    this.serverPassword = optionsArg.password;
-    };
+  }
 
   /**
    * connect the client to the server
    */
   connect() {
-        let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
-        plugins.beautylog.log("trying to connect...");
+    plugins.smartlog.defaultLogger.log('info', 'trying to connect...');
     let socketUrl = `${this.serverUrl}:${this.serverPort}`;
     this.socketConnection = new SocketConnection({
       alias: this.alias,
       authenticated: false,
       role: undefined,
+      side: 'client',
+      smartsocketHost: null,
       socket: plugins.socketIoClient(socketUrl, { multiplex: false })
     });
-        this.socketConnection.socket.on("requestAuth", () => {
+    this.socketConnection.socket.on('requestAuth', () => {
-            console.log("server requested authentication");
+      console.log('server requested authentication');
-            this.socketConnection.socket.emit("dataAuth", {
+      this.socketConnection.socket.emit('dataAuth', {
         role: this.role,
         password: this.serverPassword,
         alias: this.alias
       });
-            this.socketConnection.socket.on("authenticated",() => {
+      this.socketConnection.socket.on('authenticated', () => {
-                console.log("client is authenticated");
+        console.log('client is authenticated');
+        this.socketConnection.authenticated = true;
+        this.socketConnection.listenToFunctionRequests();
         done.resolve();
       });
     });
     return done.promise;
-    };
+  }
+
   disconnect() {
-        let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
     this.socketConnection.socket.disconnect();
     this.socketConnection = undefined;
-        plugins.beautylog.ok("disconnected!");
+    plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
     done.resolve();
     return done.promise;
   }
-    serverCall(functionNameArg:string,dataArg:ISocketFunctionCall){
+
-        let done = plugins.q.defer();
+  serverCall(functionNameArg: string, dataArg: any) {
+    let done = plugins.smartpromise.defer();
     let socketRequest = new SocketRequest({
-            side:"requesting",
+      side: 'requesting',
       originSocketConnection: this.socketConnection,
       shortId: plugins.shortid.generate(),
       funcCallData: {
@@ -81,11 +82,9 @@ export class SmartsocketClient {
         funcDataArg: dataArg
       }
     });
-        socketRequest.dispatch()
+    socketRequest.dispatch().then((dataArg: ISocketFunctionCall) => {
-            .then(() => {
+      done.resolve(dataArg.funcDataArg);
-                done.resolve();
     });
     return done.promise;
-    };
+  }
-    
 }

ts/smartsocket.classes.socketconnection.ts

@@ -1,13 +1,28 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
-import * as helpers from "./smartsocket.helpers";
+import * as helpers from './smartsocket.helpers';
+
+import { Objectmap } from '@pushrocks/lik';
 
 // import classes
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketRequest, ISocketRequestDataObject, allSocketRequests } from "./smartsocket.classes.socketrequest";
+import { SocketFunction } from './smartsocket.classes.socketfunction';
-import { SocketRole } from "./smartsocket.classes.socketrole";
+import {
+  SocketRequest,
+  ISocketRequestDataObject,
+  allSocketRequests
+} from './smartsocket.classes.socketrequest';
+import { SocketRole } from './smartsocket.classes.socketrole';
+
+// socket.io
+import * as SocketIO from 'socket.io';
 
 // export interfaces
 
+/**
+ * defines is a SocketConnection is server or client side. Important for mesh setups.
+ */
+export type TSocketConnectionSide = 'server' | 'client';
+
 /**
  * interface for constructor of class SocketConnection
  */
@@ -15,39 +30,52 @@ export interface ISocketConnectionConstructorOptions {
   alias: string;
   authenticated: boolean;
   role: SocketRole;
+  side: TSocketConnectionSide;
+  smartsocketHost: Smartsocket;
   socket: SocketIO.Socket | SocketIOClient.Socket;
-};
+}
 
 /**
  * interface for authentication data
  */
 export interface ISocketConnectionAuthenticationObject {
-    role: "coreflowContainer",
+  role: 'coreflowContainer';
-    password: "somePassword",
+  password: 'somePassword';
-    alias: "coreflow1"
+  alias: 'coreflow1';
 }
 
 // export classes
+export let allSocketConnections = new Objectmap<SocketConnection>();
 
 /**
  * class SocketConnection represents a websocket connection
  */
 export class SocketConnection {
   alias: string;
-    authenticated: boolean;
+  side: TSocketConnectionSide;
+  authenticated: boolean = false;
   role: SocketRole;
-    socket: SocketIO.Socket | SocketIOClient.Socket;
+  smartsocketHost: Smartsocket;
+  socket: any; // 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.socket = optionsArg.socket;
 
     // standard behaviour that is always true
-        this.socket.on("disconnect", () => {
+    allSocketConnections.add(this);
-            plugins.beautylog.info(`Client ${this.alias} disconnected`);
+    this.socket.on('disconnect', () => {
+      plugins.smartlog.defaultLogger.log(
+        'info',
+        `SocketConnection with >alias ${this.alias} on >side ${this.side} disconnected`
+      );
+      this.socket.disconnect();
+      allSocketConnections.remove(this);
     });
-    };
+  }
 
   // authenticating --------------------------
 
@@ -55,25 +83,33 @@ export class SocketConnection {
    * authenticate the socket
    */
   authenticate() {
-        let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
-        this.socket.on("dataAuth", dataArg => {
+    this.socket.on('dataAuth', (dataArg: ISocketConnectionAuthenticationObject) => {
-            plugins.beautylog.log("received authentication data. now hashing and comparing...");
+      plugins.smartlog.defaultLogger.log(
-            this.socket.removeListener("dataAuth", () => { });
+        'info',
-            if ((true)) { // TODO: authenticate password
+        'received authentication data. now hashing and comparing...'
-                this.alias = dataArg.alias
+      );
+      this.socket.removeListener('dataAuth', () => {});
+      if (helpers.checkPasswordForRole(dataArg, this.smartsocketHost)) {
+        // TODO: authenticate password
+        this.alias = dataArg.alias;
         this.authenticated = true;
-                this.role = helpers.getSocketRoleByName(dataArg.role);
+        this.role = helpers.getSocketRoleByName(dataArg.role, this.smartsocketHost);
-                this.socket.emit("authenticated");
+        this.socket.emit('authenticated');
-                plugins.beautylog.ok(`socket with >>alias ${this.alias} >>role ${this.role} is authenticated!`);
+        plugins.smartlog.defaultLogger.log(
+          'ok',
+          `socket with >>alias ${this.alias} >>role ${this.role} is authenticated!`
+        );
         done.resolve(this);
       } else {
+        this.authenticated = false;
         this.socket.disconnect();
-                done.reject("not authenticated");
+        done.reject('not authenticated');
-            };
+      }
     });
-        this.socket.emit("requestAuth");
+    this.socket.emit('requestAuth');
     return done.promise;
-    };
+  }
 
   // listening -------------------------------
 
@@ -81,35 +117,52 @@ export class SocketConnection {
    * listen to function requests
    */
   listenToFunctionRequests() {
-        let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
     if (this.authenticated) {
-            this.socket.on("function", (dataArg:ISocketRequestDataObject) => {
+      this.socket.on('function', (dataArg: ISocketRequestDataObject) => {
         // check if requested function is available to the socket's scope
-                let referencedFunction:SocketFunction = this.role.allowedFunctions.find((socketFunctionArg) => {
+        plugins.smartlog.defaultLogger.log('info', 'function request received');
+        let referencedFunction: SocketFunction = this.role.allowedFunctions.find(
+          socketFunctionArg => {
             return socketFunctionArg.name === dataArg.funcCallData.funcName;
-                });
+          }
+        );
         if (referencedFunction !== undefined) {
+          plugins.smartlog.defaultLogger.log('ok', 'function in access scope');
           let localSocketRequest = new SocketRequest({
-                        side:"responding",
+            side: 'responding',
             originSocketConnection: this,
             shortId: dataArg.shortId,
             funcCallData: dataArg.funcCallData
           });
           localSocketRequest.createResponse(); // takes care of creating response and sending it back
         } else {
-                    plugins.beautylog.warn("function not existent or out of access scope");
+          plugins.smartlog.defaultLogger.log(
-                };
+            'warn',
+            'function not existent or out of access scope'
+          );
+        }
       });
-            this.socket.on("functionResponse", (dataArg:ISocketRequestDataObject) => {
+      this.socket.on('functionResponse', (dataArg: ISocketRequestDataObject) => {
+        plugins.smartlog.defaultLogger.log(
+          'info',
+          `received response for request with id ${dataArg.shortId}`
+        );
         let targetSocketRequest = helpers.getSocketRequestById(dataArg.shortId);
         targetSocketRequest.handleResponse(dataArg);
-            })
+      });
+      plugins.smartlog.defaultLogger.log(
+        'info',
+        `now listening to function requests for ${this.alias}`
+      );
+      done.resolve(this);
     } else {
-            done.reject("socket needs to be authenticated first");
+      let errMessage: 'socket needs to be authenticated first';
-        };
+      plugins.smartlog.defaultLogger.log('error', errMessage);
+      done.reject(errMessage);
+    }
     return done.promise;
-    };
+  }
 
   // sending ----------------------
-    
+}
-};

ts/smartsocket.classes.socketfunction.ts

@@ -1,8 +1,8 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
 
 // import classes
-import { Objectmap } from "lik";
+import { Objectmap } from '@pushrocks/lik';
-import { SocketRole } from "./smartsocket.classes.socketrole";
+import { SocketRole } from './smartsocket.classes.socketrole';
 
 // export interfaces
 
@@ -13,7 +13,7 @@ export interface ISocketFunctionConstructorOptions {
   funcName: string;
   funcDef: any;
   allowedRoles: SocketRole[]; // all roles that are allowed to execute a SocketFunction
-};
+}
 
 /**
  * interface of the Socket Function call, in other words the object that routes a call to a function
@@ -21,13 +21,13 @@ export interface ISocketFunctionConstructorOptions {
 export interface ISocketFunctionCall {
   funcName: string;
   funcDataArg: any;
-};
+}
 
 /**
  * interface for function definition of SocketFunction
  */
 export interface IFuncDef {
-    (dataArg:any):PromiseLike<any>
+  (dataArg: any): PromiseLike<any>;
 }
 
 // export objects
@@ -52,9 +52,28 @@ export class SocketFunction {
     this.roles = optionsArg.allowedRoles;
     for (let socketRoleArg of this.roles) {
       this._notifyRole(socketRoleArg);
-        };
+    }
     allSocketFunctions.add(this); // map instance with Objectmap
+  }
+
+  /**
+   * invokes the function of this SocketFunction
+   */
+  invoke(dataArg: ISocketFunctionCall): Promise<any> {
+    let done = plugins.smartpromise.defer();
+    if (dataArg.funcName === this.name) {
+      this.funcDef(dataArg.funcDataArg).then((resultData: any) => {
+        let funcResponseData: ISocketFunctionCall = {
+          funcName: this.name,
+          funcDataArg: resultData
         };
+        done.resolve(funcResponseData);
+      });
+    } else {
+      throw new Error("SocketFunction.name does not match the data argument's .name!");
+    }
+    return done.promise;
+  }
 
   /**
    * notifies a role about access to this SocketFunction
@@ -62,22 +81,4 @@ export class SocketFunction {
   private _notifyRole(socketRoleArg: SocketRole) {
     socketRoleArg.addSocketFunction(this);
   }
-    
-    /**
-     * invokes the function of this SocketFunction
-     */
-    invoke(dataArg:ISocketFunctionCall):plugins.q.Promise<any> {
-        let done = plugins.q.defer();
-        if(dataArg.funcName === this.name){
-            this.funcDef(dataArg.funcDataArg)
-                .then((resultData:any) => {
-                    done.resolve(resultData);
-                });
-                
-        } else {
-            throw new Error("SocketFunction.name does not match the data argument's .name!");
-        }
-        return done.promise;        
-    };
-
 }

ts/smartsocket.classes.socketrequest.ts

@@ -1,17 +1,17 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
-import * as helpers from "./smartsocket.helpers";
+import * as helpers from './smartsocket.helpers';
 
 // import interfaces
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
+import { ISocketFunctionCall } from './smartsocket.classes.socketfunction';
 
 // import classes
-import { Objectmap } from "lik";
+import { Objectmap } from '@pushrocks/lik';
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { SocketFunction } from './smartsocket.classes.socketfunction';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+import { SocketConnection } from './smartsocket.classes.socketconnection';
 
 // export interfaces
-export type TSocketRequestStatus = "new" | "pending" | "finished";
+export type TSocketRequestStatus = 'new' | 'pending' | 'finished';
-export type TSocketRequestSide = "requesting" | "responding";
+export type TSocketRequestSide = 'requesting' | 'responding';
 
 /**
  * interface of constructor of class SocketRequest
@@ -21,7 +21,7 @@ export interface SocketRequestConstructorOptions {
   originSocketConnection: SocketConnection;
   shortId: string;
   funcCallData?: ISocketFunctionCall;
-};
+}
 
 /**
  * request object that is sent initially and may or may not receive a response
@@ -30,25 +30,26 @@ export interface ISocketRequestDataObject {
   funcCallData: ISocketFunctionCall;
   shortId: string;
   responseTimeout?: number;
-};
+}
 
 // export objects
 export let allSocketRequests = new Objectmap<SocketRequest>();
 
 // export classes
 export class SocketRequest {
-    status: TSocketRequestStatus = "new";
+  status: TSocketRequestStatus = 'new';
   side: TSocketRequestSide;
   shortid: string;
   originSocketConnection: SocketConnection;
-    funcCallData: ISocketFunctionCall
+  funcCallData: ISocketFunctionCall;
-    done = plugins.q.defer();
+  done = plugins.smartpromise.defer();
   constructor(optionsArg: SocketRequestConstructorOptions) {
     this.side = optionsArg.side;
     this.shortid = optionsArg.shortId;
     this.funcCallData = optionsArg.funcCallData;
+    this.originSocketConnection = optionsArg.originSocketConnection;
     allSocketRequests.add(this);
-    };
+  }
 
   // requesting --------------------------
 
@@ -59,16 +60,17 @@ export class SocketRequest {
     let requestData: ISocketRequestDataObject = {
       funcCallData: this.funcCallData,
       shortId: this.shortid
-        }
-        this.originSocketConnection.socket.emit("function", requestData);
-        return this.done.promise;
     };
+    this.originSocketConnection.socket.emit('function', requestData);
+    return this.done.promise;
+  }
 
   /**
    * handles the response that is received by the requesting side
    */
   handleResponse(responseDataArg: ISocketRequestDataObject) {
-        this.done.resolve(responseDataArg);
+    plugins.smartlog.defaultLogger.log('info', 'handling response!');
+    this.done.resolve(responseDataArg.funcCallData);
     allSocketRequests.remove(this);
   }
 
@@ -78,15 +80,18 @@ export class SocketRequest {
    * creates the response on the responding side
    */
   createResponse() {
-        let targetSocketFunction: SocketFunction = helpers.getSocketFunctionByName(this.funcCallData.funcName);
+    let targetSocketFunction: SocketFunction = helpers.getSocketFunctionByName(
-        targetSocketFunction.invoke(this.funcCallData)
+      this.funcCallData.funcName
-            .then((resultData) => {
+    );
+    plugins.smartlog.defaultLogger.log('info', `invoking ${targetSocketFunction.name}`);
+    targetSocketFunction.invoke(this.funcCallData).then(resultData => {
+      plugins.smartlog.defaultLogger.log('info', 'got resultData. Sending it to requesting party.');
       let requestData: ISocketRequestDataObject = {
         funcCallData: resultData,
         shortId: this.shortid
-                }
+      };
-                this.originSocketConnection.socket.emit("functionResponse",requestData);
+      this.originSocketConnection.socket.emit('functionResponse', requestData);
       allSocketRequests.remove(this);
     });
   }
-};
+}

ts/smartsocket.classes.socketrole.ts

@@ -1,12 +1,8 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
 
 // import classes
-import { Objectmap } from "lik";
+import { Objectmap } from '@pushrocks/lik';
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { SocketFunction } from './smartsocket.classes.socketfunction';
-
-
-export let allSocketRoles = new Objectmap<SocketRole>();
-
 
 /**
  * interface for class SocketRole
@@ -26,8 +22,7 @@ export class SocketRole {
   constructor(optionsArg: SocketRoleOptions) {
     this.name = optionsArg.name;
     this.passwordHash = optionsArg.passwordHash;
-        allSocketRoles.add(this);
+  }
-    };
   addSocketFunction(socketFunctionArg: SocketFunction) {
     this.allowedFunctions.add(socketFunctionArg);
   }

ts/smartsocket.classes.socketserver.ts

@@ -0,0 +1,76 @@
+import * as plugins from './smartsocket.plugins';
+
+// used in case no other server is supplied
+import * as http from 'http';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+
+/**
+ * class socketServer
+ * handles the attachment of socketIo to whatever server is in play
+ */
+export class SocketServer {
+  private smartsocket: Smartsocket;
+  private httpServer: http.Server;
+  // wether httpServer is standalone
+  private standaloneServer = false;
+  private expressServer: any;
+
+  constructor(smartSocketInstance: Smartsocket) {
+    this.smartsocket = smartSocketInstance;
+  }
+
+  /**
+   * starts the server with another server
+   * also works with an express style server
+   */
+  public async setExternalServer(serverType: 'express' | 'http', serverArg: any) {
+    if (serverType === 'http') {
+      this.httpServer = serverArg;
+    } else if (serverType === 'express') {
+      this.expressServer = serverArg;
+    }
+  }
+
+  /**
+   * gets the server for socket.io
+   */
+  public getServerForSocketIo() {
+    if (this.httpServer) {
+      return this.httpServer;
+    } else if (this.expressServer) {
+      return this.expressServer;
+    } else if (!this.httpServer && !this.expressServer) {
+      this.httpServer = new http.Server();
+      this.standaloneServer = true;
+      return this.httpServer;
+    } else {
+      throw new Error('no server specified!');
+    }
+  }
+
+  /**
+   * starts listening to incoming sockets:
+   */
+  public async start() {
+    const done = plugins.smartpromise.defer();
+
+    // handle http servers
+    if (this.httpServer && this.standaloneServer) {
+      this.httpServer.listen(this.smartsocket.options.port, () => {
+        console.log(`Server started in standalone mode on ${this.smartsocket.options.port}`);
+        done.resolve();
+      });
+    } else {
+      done.resolve();
+    }
+
+    // nothing else to do if express server is set
+    await done.promise;
+    return;
+  }
+
+  /**
+   * closes the server
+   */
+  public async stop() {}
+}

ts/smartsocket.helpers.ts

@@ -1,32 +1,60 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
 
 // classes
-import { Smartsocket } from "./smartsocket.classes.smartsocket";
+import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketFunction, allSocketFunctions } from "./smartsocket.classes.socketfunction";
+import { SocketFunction, allSocketFunctions } from './smartsocket.classes.socketfunction';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+import {
-import { SocketRequest, allSocketRequests, TSocketRequestSide } from "./smartsocket.classes.socketrequest";
+  SocketConnection,
-import { SocketRole, allSocketRoles } from "./smartsocket.classes.socketrole";
+  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 });
+  return allSocketFunctions.find(socketFunctionArg => {
-}
+    return socketFunctionArg.name === functionNameArg;
+  });
+};
 
 // SocketRequest helpers
 
 /**
  * get corresponding Socketrequest instance by shortId
  */
-export let getSocketRequestById = (shortIdArg:string,requestSide?:TSocketRequestSide):SocketRequest => {
+export let getSocketRequestById = (
-    return allSocketRequests.find((socketRequestArg) => {return socketRequestArg.shortid === shortIdArg})
+  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): SocketRole => {
+export let getSocketRoleByName = (
-    return allSocketRoles.find((socketRoleArg) => { return socketRoleArg.name === socketRoleNameArg })
+  socketRoleNameArg: string,
+  referenceSmartsocket: Smartsocket
+): SocketRole => {
+  return referenceSmartsocket.socketRoles.find(socketRoleArg => {
+    return socketRoleArg.name === socketRoleNameArg;
+  });
 };
-

ts/smartsocket.plugins.ts

@@ -1,8 +1,10 @@
-import "typings-global";
+import * as lik from '@pushrocks/lik';
-export import beautylog = require("beautylog");
+import * as smartlog from '@pushrocks/smartlog';
-export import lik  = require("lik");
+import * as smarthash from '@pushrocks/smarthash';
-export import q = require("q");
+import * as smartdelay from '@pushrocks/smartdelay';
-export import shortid = require("shortid");
+import * as smartpromise from '@pushrocks/smartpromise';
-export import socketIo = require("socket.io");
+import * as shortid from 'shortid';
-export import socketIoClient = require("socket.io-client");
+import * as socketIo from 'socket.io';
-export import taskbuffer = require("taskbuffer");
+import * as socketIoClient from 'socket.io-client';
+
+export { lik, smartlog, smarthash, smartdelay, smartpromise, shortid, socketIo, socketIoClient };

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}