1.1.52

.gitignore

@@ -1,3 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
-docs/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,36 +1,119 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone ci_default
+image: registry.gitlab.com/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
+  - 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
+
+# ====================
+# 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
+  - docker
-    
+  - notpriv
-testSTABLE:
+
+testBuild:
   stage: test
   script:
-    - npmci test stable
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
 
 release:
   stage: release
-  environment: npmjs-com_registry
   script:
-    - npmci publish
+  - npmci node install lts
+  - npmci npm publish
   only:
-    - tags
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
+  stage: metadata
+  script:
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
   tags:
     - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

.snyk

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

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

README.md

@@ -1,67 +1,111 @@
-# smartsocket
+# @pushrocks/smartsocket
-easy and secure websocket communication, Typescript ready
+easy and secure websocket communication
 
-## Status
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartsocket)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartsocket)
+* [github.com (source mirror)](https://github.com/pushrocks/smartsocket)
+* [docs (typedoc)](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/@pushrocks/smartsocket.svg)](https://www.npmjs.com/package/@pushrocks/smartsocket)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartsocket/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartsocket)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
 
 ## 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";
+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
+  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)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

dist/index.d.ts

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

dist/index.js

@@ -1,10 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-__export(require("./smartsocket.classes.smartsocket"));
-__export(require("./smartsocket.classes.smartsocketclient"));
-__export(require("./smartsocket.classes.socketfunction"));
-__export(require("./smartsocket.classes.socketrole"));
-// need something more exposed? Create an issue on GitLab!
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRUEsaUJBQWMsbUNBQW1DLENBQUMsRUFBQTtBQUNsRCxpQkFBYyx5Q0FBeUMsQ0FBQyxFQUFBO0FBQ3hELGlCQUFjLHNDQUFzQyxDQUFDLEVBQUE7QUFDckQsaUJBQWMsa0NBQWtDLENBQUMsRUFBQTtBQUVqRCwwREFBMEQifQ==

dist/smartsocket.classes.smartsocket.d.ts

@@ -1,22 +0,0 @@
-/// <reference types="socket.io" />
-import { Objectmap } from "lik";
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
-export interface ISmartsocketConstructorOptions {
-    port: number;
-}
-export declare class Smartsocket {
-    options: ISmartsocketConstructorOptions;
-    io: SocketIO.Server;
-    openSockets: Objectmap<SocketConnection>;
-    constructor(optionsArg: ISmartsocketConstructorOptions);
-    /**
-     * 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,57 +0,0 @@
-"use strict";
-const plugins = require("./smartsocket.plugins");
-// classes
-const lik_1 = require("lik");
-const smartsocket_classes_socketconnection_1 = require("./smartsocket.classes.socketconnection");
-;
-class Smartsocket {
-    constructor(optionsArg) {
-        this.openSockets = new lik_1.Objectmap();
-        /**
-         * starts listening to incling sockets:
-         */
-        this.startServer = () => {
-            this.io = plugins.socketIo(this.options.port);
-            this.io.on("connection", (socketArg) => {
-                this._handleSocketConnection(socketArg);
-            });
-        };
-        this.closeServer = () => {
-            this.openSockets.forEach((socketObjectArg) => {
-                plugins.beautylog.log(`disconnect socket with >>alias ${socketObjectArg.alias}`);
-                socketObjectArg.socket.disconnect();
-            });
-            this.openSockets.wipe();
-            this.io.close();
-        };
-        this.options = optionsArg;
-    }
-    ;
-    /**
-     * the standard handler for new socket connections
-     */
-    _handleSocketConnection(socketArg) {
-        let socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({
-            alias: undefined,
-            authenticated: false,
-            role: undefined,
-            socket: socketArg
-        });
-        plugins.beautylog.log("Socket connected. Trying to authenticate...");
-        this.openSockets.add(socketConnection);
-        socketConnection.authenticate()
-            .then(() => {
-            return socketConnection.listenToFunctionRequests();
-        })
-            .catch((err) => {
-            console.log(err);
-        });
-    }
-    ;
-    // communication
-    clientCall() {
-        // TODO: target specific client and initiate response        
-    }
-}
-exports.Smartsocket = Smartsocket;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFHakQsVUFBVTtBQUNWLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQUdoQyx1REFBaUMsd0NBQXdDLENBQUMsQ0FBQTtBQUt6RSxDQUFDO0FBRUY7SUFJSSxZQUFZLFVBQTBDO1FBRHRELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQW9CLENBQUM7UUEwQmhEOztXQUVHO1FBRUgsZ0JBQVcsR0FBRztZQUNWLElBQUksQ0FBQyxFQUFFLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxDQUFDLFNBQVM7Z0JBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1QyxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQTtRQUNELGdCQUFXLEdBQUc7WUFDVixJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLGVBQWlDO2dCQUN2RCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxrQ0FBa0MsZUFBZSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7Z0JBQ2pGLGVBQWUsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDeEMsQ0FBQyxDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDcEIsQ0FBQyxDQUFDO1FBekNFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzlCLENBQUM7O0lBRUQ7O09BRUc7SUFDSyx1QkFBdUIsQ0FBQyxTQUFTO1FBQ3JDLElBQUksZ0JBQWdCLEdBQXNCLElBQUksdURBQWdCLENBQUM7WUFDM0QsS0FBSyxFQUFDLFNBQVM7WUFDZixhQUFhLEVBQUMsS0FBSztZQUNuQixJQUFJLEVBQUMsU0FBUztZQUNkLE1BQU0sRUFBQyxTQUFTO1NBQ25CLENBQUMsQ0FBQztRQUNILE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUE7UUFDcEUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUN2QyxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUU7YUFDMUIsSUFBSSxDQUFDO1lBQ0YsTUFBTSxDQUFDLGdCQUFnQixDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFDdkQsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLENBQUMsR0FBRztZQUNQLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsQ0FBQyxDQUFDLENBQUM7SUFDWCxDQUFDOztJQXFCRCxnQkFBZ0I7SUFDaEIsVUFBVTtRQUVOLDZEQUE2RDtJQUNqRSxDQUFDO0FBQ0wsQ0FBQztBQXJEWSxtQkFBVyxjQXFEdkIsQ0FBQSJ9

dist/smartsocket.classes.smartsocketclient.d.ts

@@ -1,28 +0,0 @@
-/// <reference types="q" />
-import * as plugins from "./smartsocket.plugins";
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
-/**
- * interface for class SmartsocketClient
- */
-export interface ISmartsocketClientOptions {
-    port: number;
-    url: string;
-    alias: string;
-    role: string;
-    password: string;
-}
-export declare class SmartsocketClient {
-    alias: string;
-    role: string;
-    socketConnection: SocketConnection;
-    serverUrl: string;
-    serverPort: number;
-    serverPassword: string;
-    constructor(optionsArg: ISmartsocketClientOptions);
-    /**
-     * connect the client to the server
-     */
-    connect(): plugins.q.Promise<{}>;
-    disconnect(): plugins.q.Promise<{}>;
-    serverCall(functionNameArg: string, dataArg: any): plugins.q.Promise<{}>;
-}

dist/smartsocket.classes.smartsocketclient.js

@@ -1,73 +0,0 @@
-"use strict";
-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 {
-    constructor(optionsArg) {
-        this.alias = optionsArg.alias;
-        this.role = optionsArg.role;
-        this.serverUrl = optionsArg.url;
-        this.serverPort = optionsArg.port;
-        this.serverPassword = optionsArg.password;
-    }
-    ;
-    /**
-     * connect the client to the server
-     */
-    connect() {
-        let done = plugins.q.defer();
-        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,
-            socket: plugins.socketIoClient(socketUrl, { multiplex: false })
-        });
-        this.socketConnection.socket.on("requestAuth", () => {
-            console.log("server requested authentication");
-            this.socketConnection.socket.emit("dataAuth", {
-                role: this.role,
-                password: this.serverPassword,
-                alias: this.alias
-            });
-            this.socketConnection.socket.on("authenticated", () => {
-                console.log("client is authenticated");
-                this.socketConnection.authenticated = true;
-                this.socketConnection.listenToFunctionRequests();
-                done.resolve();
-            });
-        });
-        return done.promise;
-    }
-    ;
-    disconnect() {
-        let done = plugins.q.defer();
-        this.socketConnection.socket.disconnect();
-        this.socketConnection = undefined;
-        plugins.beautylog.ok("disconnected!");
-        done.resolve();
-        return done.promise;
-    }
-    serverCall(functionNameArg, dataArg) {
-        let done = plugins.q.defer();
-        let socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest({
-            side: "requesting",
-            originSocketConnection: this.socketConnection,
-            shortId: plugins.shortid.generate(),
-            funcCallData: {
-                funcName: functionNameArg,
-                funcDataArg: dataArg
-            }
-        });
-        socketRequest.dispatch()
-            .then((dataArg) => {
-            done.resolve(dataArg.funcDataArg);
-        });
-        return done.promise;
-    }
-    ;
-}
-exports.SmartsocketClient = SmartsocketClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXRjbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUl6QixDQUFDLENBSitDO0FBT2hELGlCQUFpQjtBQUNqQix1REFBaUMsd0NBQXdDLENBQUMsQ0FBQTtBQUUxRSxvREFBOEIscUNBQXFDLENBQUMsQ0FBQTtBQVlwRTtJQU9JLFlBQVksVUFBb0M7UUFDNUMsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUE7UUFDL0IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQTtJQUM3QyxDQUFDOztJQUVEOztPQUVHO0lBQ0gsT0FBTztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUM5QyxJQUFJLFNBQVMsR0FBRyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHVEQUFnQixDQUFDO1lBQ3pDLEtBQUssRUFBQyxJQUFJLENBQUMsS0FBSztZQUNoQixhQUFhLEVBQUMsS0FBSztZQUNuQixJQUFJLEVBQUMsU0FBUztZQUNkLE1BQU0sRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLFNBQVMsRUFBQyxFQUFDLFNBQVMsRUFBQyxLQUFLLEVBQUMsQ0FBQztTQUM5RCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUU7WUFDM0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDMUMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO2dCQUNmLFFBQVEsRUFBRSxJQUFJLENBQUMsY0FBYztnQkFDN0IsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO2FBQ3BCLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGVBQWUsRUFBQztnQkFDNUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQztnQkFDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHdCQUF3QixFQUFFLENBQUM7Z0JBQ2pELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNuQixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7SUFDRCxVQUFVO1FBQ04sSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQzFDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUM7UUFDbEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQztJQUNELFVBQVUsQ0FBQyxlQUFzQixFQUFDLE9BQVc7UUFDekMsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixJQUFJLGFBQWEsR0FBRyxJQUFJLGlEQUFhLENBQUM7WUFDbEMsSUFBSSxFQUFDLFlBQVk7WUFDakIsc0JBQXNCLEVBQUMsSUFBSSxDQUFDLGdCQUFnQjtZQUM1QyxPQUFPLEVBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUU7WUFDbEMsWUFBWSxFQUFDO2dCQUNULFFBQVEsRUFBRSxlQUFlO2dCQUN6QixXQUFXLEVBQUMsT0FBTzthQUN0QjtTQUNKLENBQUMsQ0FBQztRQUNILGFBQWEsQ0FBQyxRQUFRLEVBQUU7YUFDbkIsSUFBSSxDQUFDLENBQUMsT0FBMkI7WUFDOUIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDdEMsQ0FBQyxDQUFDLENBQUM7UUFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDOztBQUVMLENBQUM7QUF0RVkseUJBQWlCLG9CQXNFN0IsQ0FBQSJ9

dist/smartsocket.classes.socketconnection.d.ts

@@ -1,40 +0,0 @@
-/// <reference types="socket.io" />
-/// <reference types="socket.io-client" />
-/// <reference types="q" />
-import * as plugins from "./smartsocket.plugins";
-import { SocketRole } from "./smartsocket.classes.socketrole";
-/**
- * interface for constructor of class SocketConnection
- */
-export interface ISocketConnectionConstructorOptions {
-    alias: string;
-    authenticated: boolean;
-    role: SocketRole;
-    socket: SocketIO.Socket | SocketIOClient.Socket;
-}
-/**
- * interface for authentication data
- */
-export interface ISocketConnectionAuthenticationObject {
-    role: "coreflowContainer";
-    password: "somePassword";
-    alias: "coreflow1";
-}
-/**
- * class SocketConnection represents a websocket connection
- */
-export declare class SocketConnection {
-    alias: string;
-    authenticated: boolean;
-    role: SocketRole;
-    socket: SocketIO.Socket | SocketIOClient.Socket;
-    constructor(optionsArg: ISocketConnectionConstructorOptions);
-    /**
-     * authenticate the socket
-     */
-    authenticate(): plugins.q.Promise<{}>;
-    /**
-     * listen to function requests
-     */
-    listenToFunctionRequests(): plugins.q.Promise<{}>;
-}

dist/smartsocket.classes.socketconnection.js

@@ -1,99 +0,0 @@
-"use strict";
-const plugins = require("./smartsocket.plugins");
-const helpers = require("./smartsocket.helpers");
-const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest");
-;
-// export classes
-/**
- * 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.socket = optionsArg.socket;
-        // standard behaviour that is always true
-        this.socket.on("disconnect", () => {
-            plugins.beautylog.info(`Client ${this.alias} disconnected`);
-        });
-    }
-    ;
-    // authenticating --------------------------
-    /**
-     * authenticate the socket
-     */
-    authenticate() {
-        let done = plugins.q.defer();
-        this.socket.on("dataAuth", dataArg => {
-            plugins.beautylog.log("received authentication data. now hashing and comparing...");
-            this.socket.removeListener("dataAuth", () => { });
-            if ((true)) {
-                this.alias = dataArg.alias;
-                this.authenticated = true;
-                this.role = helpers.getSocketRoleByName(dataArg.role);
-                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");
-            }
-            ;
-        });
-        this.socket.emit("requestAuth");
-        return done.promise;
-    }
-    ;
-    // listening -------------------------------
-    /**
-     * listen to function requests
-     */
-    listenToFunctionRequests() {
-        let done = plugins.q.defer();
-        if (this.authenticated) {
-            this.socket.on("function", (dataArg) => {
-                // check if requested function is available to the socket's scope
-                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",
-                        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");
-                }
-                ;
-            });
-            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 {
-            let errMessage;
-            plugins.beautylog.error(errMessage);
-            done.reject(errMessage);
-        }
-        ;
-        return done.promise;
-    }
-    ;
-}
-exports.SocketConnection = SocketConnection;
-;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSx1QkFBdUIsQ0FBQyxDQUFBO0FBQ2pELE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFJakQsb0RBQTJFLHFDQUFxQyxDQUFDLENBQUE7QUFhaEgsQ0FBQztBQVdGLGlCQUFpQjtBQUVqQjs7R0FFRztBQUNIO0lBS0ksWUFBWSxVQUErQztRQUgzRCxrQkFBYSxHQUFZLEtBQUssQ0FBQztRQUkzQixJQUFJLENBQUMsS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDOUIsSUFBSSxDQUFDLGFBQWEsR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDO1FBQzlDLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFFaEMseUNBQXlDO1FBQ3pDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRTtZQUN6QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxLQUFLLGVBQWUsQ0FBQyxDQUFDO1FBQ2hFLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQzs7SUFFRCw0Q0FBNEM7SUFFNUM7O09BRUc7SUFDSCxZQUFZO1FBQ1IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsT0FBTztZQUM5QixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyw0REFBNEQsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ2xELEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNULElBQUksQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQTtnQkFDMUIsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUM7Z0JBQzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDdEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7Z0JBQ2xDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHVCQUF1QixJQUFJLENBQUMsS0FBSyxXQUFXLElBQUksQ0FBQyxJQUFJLG9CQUFvQixDQUFDLENBQUM7Z0JBQ2hHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDdkIsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDO2dCQUMzQixJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO2dCQUN6QixJQUFJLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDckMsQ0FBQztZQUFBLENBQUM7UUFDTixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2hDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0lBRUQsNENBQTRDO0lBRTVDOztPQUVHO0lBQ0gsd0JBQXdCO1FBQ3BCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsRUFBRSxDQUFBLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBLENBQUM7WUFDbkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUMsT0FBZ0M7Z0JBQ3hELGlFQUFpRTtnQkFDakUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxrQkFBa0IsR0FBa0IsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxpQkFBaUI7b0JBQ3RGLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUM7Z0JBQ3BFLENBQUMsQ0FBQyxDQUFDO2dCQUNILEVBQUUsQ0FBQSxDQUFDLGtCQUFrQixLQUFLLFNBQVMsQ0FBQyxDQUFBLENBQUM7b0JBQ2pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRyxDQUFDLDBCQUEwQixDQUFDLENBQUM7b0JBQ2xELElBQUksa0JBQWtCLEdBQUcsSUFBSSxpREFBYSxDQUFDO3dCQUN2QyxJQUFJLEVBQUMsWUFBWTt3QkFDakIsc0JBQXNCLEVBQUMsSUFBSTt3QkFDM0IsT0FBTyxFQUFDLE9BQU8sQ0FBQyxPQUFPO3dCQUN2QixZQUFZLEVBQUMsT0FBTyxDQUFDLFlBQVk7cUJBQ3BDLENBQUMsQ0FBQztvQkFDSCxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDLHVEQUF1RDtnQkFDaEcsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO2dCQUMzRSxDQUFDO2dCQUFBLENBQUM7WUFDTixDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGtCQUFrQixFQUFFLENBQUMsT0FBZ0M7Z0JBQ2hFLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHlDQUF5QyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztnQkFDbkYsSUFBSSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUN4RSxtQkFBbUIsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDaEQsQ0FBQyxDQUFDLENBQUM7WUFDSCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywwQ0FBMEMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7WUFDOUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2QixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixJQUFJLFVBQW9ELENBQUM7WUFDekQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDcEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM1QixDQUFDO1FBQUEsQ0FBQztRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0FBSUwsQ0FBQztBQXhGWSx3QkFBZ0IsbUJBd0Y1QixDQUFBO0FBQUEsQ0FBQyJ9

dist/smartsocket.classes.socketfunction.d.ts

@@ -1,46 +0,0 @@
-/// <reference types="q" />
-import * as plugins from "./smartsocket.plugins";
-import { Objectmap } from "lik";
-import { SocketRole } from "./smartsocket.classes.socketrole";
-/**
- * interface of the contructor options of class SocketFunction
- */
-export interface ISocketFunctionConstructorOptions {
-    funcName: string;
-    funcDef: any;
-    allowedRoles: SocketRole[];
-}
-/**
- * interface of the Socket Function call, in other words the object that routes a call to a function
- */
-export interface ISocketFunctionCall {
-    funcName: string;
-    funcDataArg: any;
-}
-/**
- * interface for function definition of SocketFunction
- */
-export interface IFuncDef {
-    (dataArg: any): PromiseLike<any>;
-}
-export declare let allSocketFunctions: Objectmap<SocketFunction>;
-/**
- * class that respresents a function that can be transparently called using a SocketConnection
- */
-export declare class SocketFunction {
-    name: string;
-    funcDef: IFuncDef;
-    roles: SocketRole[];
-    /**
-     * the constructor for SocketFunction
-     */
-    constructor(optionsArg: ISocketFunctionConstructorOptions);
-    /**
-     * 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,57 +0,0 @@
-"use strict";
-const plugins = require("./smartsocket.plugins");
-// import classes
-const lik_1 = require("lik");
-;
-;
-// export objects
-exports.allSocketFunctions = new lik_1.Objectmap();
-// export classes
-/**
- * class that respresents a function that can be transparently called using a SocketConnection
- */
-class SocketFunction {
-    /**
-     * the constructor for SocketFunction
-     */
-    constructor(optionsArg) {
-        this.name = optionsArg.funcName;
-        this.funcDef = optionsArg.funcDef;
-        this.roles = optionsArg.allowedRoles;
-        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();
-        if (dataArg.funcName === this.name) {
-            this.funcDef(dataArg.funcDataArg)
-                .then((resultData) => {
-                let funcResponseData = {
-                    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;
-    }
-    ;
-}
-exports.SocketFunction = SocketFunction;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRmdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc29ja2V0ZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFFakQsaUJBQWlCO0FBQ2pCLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQVkvQixDQUFDO0FBUUQsQ0FBQztBQVNGLGlCQUFpQjtBQUNOLDBCQUFrQixHQUFHLElBQUksZUFBUyxFQUFrQixDQUFDO0FBRWhFLGlCQUFpQjtBQUVqQjs7R0FFRztBQUNIO0lBS0k7O09BRUc7SUFDSCxZQUFZLFVBQTZDO1FBQ3JELElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUM7UUFDbEMsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQ3JDLEdBQUcsQ0FBQyxDQUFDLElBQUksYUFBYSxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQSxDQUFDO1lBQ2xDLElBQUksQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUFBLENBQUM7UUFDRiwwQkFBa0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyw4QkFBOEI7SUFDaEUsQ0FBQzs7SUFFRDs7T0FFRztJQUNLLFdBQVcsQ0FBQyxhQUF3QjtRQUN4QyxhQUFhLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLE9BQTJCO1FBQzlCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQztZQUMvQixJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7aUJBQzVCLElBQUksQ0FBQyxDQUFDLFVBQWM7Z0JBQ2pCLElBQUksZ0JBQWdCLEdBQXVCO29CQUN2QyxRQUFRLEVBQUMsSUFBSSxDQUFDLElBQUk7b0JBQ2xCLFdBQVcsRUFBQyxVQUFVO2lCQUN6QixDQUFBO2dCQUNELElBQUksQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUNuQyxDQUFDLENBQUMsQ0FBQztRQUVYLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE1BQU0sSUFBSSxLQUFLLENBQUMsK0RBQStELENBQUMsQ0FBQztRQUNyRixDQUFDO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7QUFFTCxDQUFDO0FBOUNZLHNCQUFjLGlCQThDMUIsQ0FBQSJ9

dist/smartsocket.classes.socketrequest.d.ts

@@ -1,46 +0,0 @@
-/// <reference types="q" />
-import * as plugins from "./smartsocket.plugins";
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
-import { Objectmap } from "lik";
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
-export declare type TSocketRequestStatus = "new" | "pending" | "finished";
-export declare type TSocketRequestSide = "requesting" | "responding";
-/**
- * interface of constructor of class SocketRequest
- */
-export interface SocketRequestConstructorOptions {
-    side: TSocketRequestSide;
-    originSocketConnection: SocketConnection;
-    shortId: string;
-    funcCallData?: ISocketFunctionCall;
-}
-/**
- * request object that is sent initially and may or may not receive a response
- */
-export interface ISocketRequestDataObject {
-    funcCallData: ISocketFunctionCall;
-    shortId: string;
-    responseTimeout?: number;
-}
-export declare let allSocketRequests: Objectmap<SocketRequest>;
-export declare class SocketRequest {
-    status: TSocketRequestStatus;
-    side: TSocketRequestSide;
-    shortid: string;
-    originSocketConnection: SocketConnection;
-    funcCallData: ISocketFunctionCall;
-    done: plugins.q.Deferred<{}>;
-    constructor(optionsArg: SocketRequestConstructorOptions);
-    /**
-     * dispatches a socketrequest from the requesting to the receiving side
-     */
-    dispatch(): plugins.q.Promise<{}>;
-    /**
-     * handles the response that is received by the requesting side
-     */
-    handleResponse(responseDataArg: ISocketRequestDataObject): void;
-    /**
-     * creates the response on the responding side
-     */
-    createResponse(): void;
-}

dist/smartsocket.classes.socketrequest.js

@@ -1,64 +0,0 @@
-"use strict";
-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.done = plugins.q.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
-     */
-    dispatch() {
-        let requestData = {
-            funcCallData: this.funcCallData,
-            shortId: this.shortid
-        };
-        this.originSocketConnection.socket.emit("function", requestData);
-        return this.done.promise;
-    }
-    ;
-    /**
-     * handles the response that is received by the requesting side
-     */
-    handleResponse(responseDataArg) {
-        plugins.beautylog.log("handling response!");
-        this.done.resolve(responseDataArg.funcCallData);
-        exports.allSocketRequests.remove(this);
-    }
-    // responding --------------------------
-    /**
-     * creates the response on the responding side
-     */
-    createResponse() {
-        let targetSocketFunction = helpers.getSocketFunctionByName(this.funcCallData.funcName);
-        plugins.beautylog.info(`invoking ${targetSocketFunction.name}`);
-        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);
-            exports.allSocketRequests.remove(this);
-        });
-    }
-}
-exports.SocketRequest = SocketRequest;
-;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSx1QkFBdUIsQ0FBQyxDQUFBO0FBQ2pELE1BQVksT0FBTyxXQUFNLHVCQUF1QixDQUFDLENBQUE7QUFLakQsaUJBQWlCO0FBQ2pCLHNCQUEwQixLQUFLLENBQUMsQ0FBQTtBQWdCL0IsQ0FBQztBQVNELENBQUM7QUFFRixnQkFBZ0I7QUFDTCx5QkFBaUIsR0FBRyxJQUFJLGVBQVMsRUFBaUIsQ0FBQztBQUU5RCxpQkFBaUI7QUFDakI7SUFPSSxZQUFZLFVBQTJDO1FBTnZELFdBQU0sR0FBeUIsS0FBSyxDQUFDO1FBS3JDLFNBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRXJCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUM7UUFDbEMsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsc0JBQXNCLENBQUM7UUFDaEUseUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hDLENBQUM7O0lBRUQsd0NBQXdDO0lBRXhDOztPQUVHO0lBQ0gsUUFBUTtRQUNKLElBQUksV0FBVyxHQUE2QjtZQUN4QyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDL0IsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1NBQ3hCLENBQUE7UUFDRCxJQUFJLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDakUsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQzdCLENBQUM7O0lBRUQ7O09BRUc7SUFDSCxjQUFjLENBQUMsZUFBeUM7UUFDcEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEQseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCx3Q0FBd0M7SUFFeEM7O09BRUc7SUFDSCxjQUFjO1FBQ1YsSUFBSSxvQkFBb0IsR0FBbUIsT0FBTyxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDdkcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsWUFBWSxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDO2FBQ3pDLElBQUksQ0FBQyxDQUFDLFVBQVU7WUFDYixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpREFBaUQsQ0FBQyxDQUFBO1lBQ3hFLElBQUksV0FBVyxHQUE2QjtnQkFDeEMsWUFBWSxFQUFFLFVBQVU7Z0JBQ3hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTzthQUN4QixDQUFDO1lBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUMsV0FBVyxDQUFDLENBQUM7WUFDeEUseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztBQUNMLENBQUM7QUF6RFkscUJBQWEsZ0JBeUR6QixDQUFBO0FBQUEsQ0FBQyJ9

dist/smartsocket.classes.socketrole.d.ts

@@ -1,20 +0,0 @@
-import { Objectmap } from "lik";
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
-export declare let allSocketRoles: Objectmap<SocketRole>;
-/**
- * interface for class SocketRole
- */
-export interface SocketRoleOptions {
-    name: string;
-    passwordHash: string;
-}
-/**
- * A socketrole defines access to certain routines.
- */
-export declare class SocketRole {
-    name: string;
-    passwordHash: string;
-    allowedFunctions: Objectmap<SocketFunction>;
-    constructor(optionsArg: SocketRoleOptions);
-    addSocketFunction(socketFunctionArg: SocketFunction): void;
-}

dist/smartsocket.classes.socketrole.js

@@ -1,21 +0,0 @@
-"use strict";
-// import classes
-const lik_1 = require("lik");
-exports.allSocketRoles = new lik_1.Objectmap();
-/**
- * A socketrole defines access to certain routines.
- */
-class SocketRole {
-    constructor(optionsArg) {
-        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==

dist/smartsocket.helpers.d.ts

@@ -1,12 +0,0 @@
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
-import { SocketRequest, TSocketRequestSide } from "./smartsocket.classes.socketrequest";
-import { SocketRole } from "./smartsocket.classes.socketrole";
-export declare let getSocketFunctionByName: (functionNameArg: string) => SocketFunction;
-/**
- * get corresponding Socketrequest instance by shortId
- */
-export declare let getSocketRequestById: (shortIdArg: string, requestSide?: TSocketRequestSide) => SocketRequest;
-/**
- * get corresponding SocketRole instance by name
- */
-export declare let getSocketRoleByName: (socketRoleNameArg: string) => SocketRole;

dist/smartsocket.helpers.js

@@ -1,23 +0,0 @@
-"use strict";
-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");
-// SocketFunction helpers
-exports.getSocketFunctionByName = (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; });
-};
-// SocketRole helpers
-/**
- * get corresponding SocketRole instance by name
- */
-exports.getSocketRoleByName = (socketRoleNameArg) => {
-    return smartsocket_classes_socketrole_1.allSocketRoles.find((socketRoleArg) => { return socketRoleArg.name === socketRoleNameArg; });
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUlBLHFEQUFtRCxzQ0FBc0MsQ0FBQyxDQUFBO0FBRTFGLG9EQUFxRSxxQ0FBcUMsQ0FBQyxDQUFBO0FBQzNHLGlEQUEyQyxrQ0FBa0MsQ0FBQyxDQUFBO0FBRTlFLHlCQUF5QjtBQUNkLCtCQUF1QixHQUFHLENBQUMsZUFBdUI7SUFDekQsTUFBTSxDQUFDLHVEQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDLGlCQUFpQixPQUFPLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakgsQ0FBQyxDQUFBO0FBRUQsd0JBQXdCO0FBRXhCOztHQUVHO0FBQ1EsNEJBQW9CLEdBQUcsQ0FBQyxVQUFpQixFQUFDLFdBQStCO0lBQ2hGLE1BQU0sQ0FBQyxxREFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQyxnQkFBZ0IsT0FBTSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxLQUFLLFVBQVUsQ0FBQSxDQUFBLENBQUMsQ0FBQyxDQUFBO0FBQ3pHLENBQUMsQ0FBQTtBQUVELHFCQUFxQjtBQUVyQjs7R0FFRztBQUNRLDJCQUFtQixHQUFHLENBQUMsaUJBQXlCO0lBQ3ZELE1BQU0sQ0FBQywrQ0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLGFBQWEsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksS0FBSyxpQkFBaUIsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3RHLENBQUMsQ0FBQyJ9

dist/smartsocket.plugins.d.ts

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

dist/smartsocket.plugins.js

@@ -1,10 +0,0 @@
-"use strict";
-require("typings-global");
-exports.beautylog = require("beautylog");
-exports.lik = require("lik");
-exports.q = require("q");
-exports.shortid = require("shortid");
-exports.socketIo = require("socket.io");
-exports.socketIoClient = require("socket.io-client");
-exports.taskbuffer = require("taskbuffer");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsV0FBRyxXQUFZLEtBQUssQ0FBQyxDQUFDO0FBQ3RCLFNBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLFdBQVcsU0FBUyxDQUFDLENBQUM7QUFDN0IsZ0JBQVEsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNoQyxzQkFBYyxXQUFXLGtCQUFrQixDQUFDLENBQUM7QUFDN0Msa0JBQVUsV0FBVyxZQUFZLENBQUMsQ0FBQyJ9

npmextra.json

@@ -1,5 +1,17 @@
 {
-    "npmts":{
+  "gitzone": {
-        "coverageTreshold":50
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartsocket",
+      "shortDescription": "easy and secure websocket communication",
+      "npmPackagename": "@pushrocks/smartsocket",
+      "license": "MIT",
+      "projectDomain": "push.rocks"
     }
+  },
+  "npmci": {
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public"
+  }
 }

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "smartsocket",
+  "name": "@pushrocks/smartsocket",
-  "version": "1.0.7",
+  "version": "1.1.52",
-  "description": "easy and secure websocket communication, Typescript ready",
+  "description": "easy and secure websocket communication",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "tstest test/",
+    "build": "tsbuild"
   },
   "repository": {
     "type": "git",
@@ -18,21 +19,38 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartsocket#README",
   "dependencies": {
-    "@types/q": "0.x.x",
+    "@apiglobal/typedrequest-interfaces": "^1.0.7",
-    "@types/shortid": "0.0.27",
+    "@pushrocks/lik": "^3.0.11",
-    "@types/socket.io": "^1.4.26",
+    "@pushrocks/smartdelay": "^2.0.6",
-    "@types/socket.io-client": "^1.4.26",
+    "@pushrocks/smartexpress": "^3.0.52",
-    "beautylog": "^5.0.20",
+    "@pushrocks/smarthash": "^2.0.6",
-    "lik": "^1.0.15",
+    "@pushrocks/smartlog": "^2.0.21",
-    "q": "^1.4.1",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "shortid": "^2.2.6",
+    "@pushrocks/smartunique": "^3.0.1",
-    "socket.io": "^1.4.8",
+    "@types/socket.io": "^2.1.4",
-    "socket.io-client": "^1.4.8",
+    "@types/socket.io-client": "^1.4.32",
-    "taskbuffer": "^1.0.7"
+    "socket.io": "^2.3.0",
+    "socket.io-client": "^2.3.0"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.8",
+    "@gitzone/tsbuild": "^2.1.17",
-    "should": "^11.0.0",
+    "@gitzone/tsrun": "^1.2.8",
-    "typings-test": "^1.0.1"
+    "@gitzone/tstest": "^1.0.28",
-  }
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.12.5",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "private": false,
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/common/test.ts

@@ -0,0 +1 @@
+console.log('TODO');

test/test.d.ts

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

test/test.expressserver.ts

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

test/test.js

@@ -1,90 +0,0 @@
-"use strict";
-require("typings-test");
-require("should");
-const smartsocket = require("../dist/index");
-const q = require("q");
-let testSmartsocket;
-let testSmartsocketClient;
-let testSocketRole1;
-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 () {
-        testSocketRole1 = new smartsocket.SocketRole({
-            name: "testRole1",
-            passwordHash: "somehash"
-        });
-    });
-    describe("class SocketFunction", function () {
-        it("should register a new Function", function () {
-            testSocketFunction1 = new smartsocket.SocketFunction({
-                funcName: "testFunction1",
-                funcDef: (dataArg) => {
-                    let done = q.defer();
-                    done.resolve(dataArg);
-                    return done.promise;
-                },
-                allowedRoles: [testSocketRole1]
-            });
-        });
-    });
-    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: "testRole1"
-            });
-            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 () {
-        });
-        it("should be able to make a functionCall", function (done) {
-            this.timeout(5000);
-            testSmartsocketClient.serverCall("testFunction1", {
-                value1: "hello"
-            }).then((dataArg) => {
-                console.log(dataArg);
-                done();
-            });
-        });
-    });
-    describe("terminating smartsocket", function () {
-        it("should close the server", function () {
-            testSmartsocket.closeServer();
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixNQUFPLFdBQVcsV0FBVyxlQUFlLENBQUMsQ0FBQztBQUM5QyxNQUFPLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztBQUV4QixJQUFJLGVBQXdDLENBQUM7QUFDN0MsSUFBSSxxQkFBb0QsQ0FBQztBQUN6RCxJQUFJLGVBQXVDLENBQUM7QUFDNUMsSUFBSSxtQkFBOEMsQ0FBQztBQUVuRCxJQUFJLFVBQVUsR0FBRztJQUNiLElBQUksRUFBRSxJQUFJO0NBQ2IsQ0FBQTtBQUVELFFBQVEsQ0FBQyxhQUFhLEVBQUU7SUFDcEIsUUFBUSxDQUFDLG1CQUFtQixFQUFFO1FBQzFCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBRTtZQUNsQyxlQUFlLEdBQUcsSUFBSSxXQUFXLENBQUMsV0FBVyxDQUFDLEVBQUUsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3pFLGVBQWUsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbEUsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsZ0RBQWdELEVBQUU7WUFDakQsZUFBZSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDSCxRQUFRLENBQUMsa0JBQWtCLEVBQUU7UUFDekIsZUFBZSxHQUFHLElBQUksV0FBVyxDQUFDLFVBQVUsQ0FBQztZQUN6QyxJQUFJLEVBQUMsV0FBVztZQUNoQixZQUFZLEVBQUMsVUFBVTtTQUMxQixDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRTtRQUM3QixFQUFFLENB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

test/test.ts

@@ -1,93 +1,133 @@
-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 smarthash from '@pushrocks/smarthash';
-import q = require("q");
+import * as smartpromise from '@pushrocks/smartpromise';
+
+import socketIoClient = require('socket.io-client');
+import smartsocket = require('../ts/index');
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
+let testSocketConnection: smartsocket.SocketConnection;
 let testSocketRole1: smartsocket.SocketRole;
-let testSocketFunction1:smartsocket.SocketFunction;
+let testSocketFunctionForServer: smartsocket.SocketFunction<any>;
+let testSocketFunctionClient: smartsocket.SocketFunction<any>;
 
-let testConfig = {
+export interface IReqResClient {
-    port: 3000
+  method: 'testFunction1';
+  request: {
+    value1: string;
+  };
+  response: {
+    value1: string;
+  };
 }
 
-describe("smartsocket", function () {
+export interface IReqResServer {
-    describe("class Smartsocket", function () {
+  method: 'testFunction2';
-        it("should create a new smartsocket", function () {
+  request: {
-            testSmartsocket = new smartsocket.Smartsocket({ port: testConfig.port });
+    hi: string;
-            testSmartsocket.should.be.instanceOf(smartsocket.Smartsocket);
+  };
-        });
+  response: {
-        it("should start listening when .started is called", function () {
+    hi: string
-            testSmartsocket.startServer();
+  }
-        });
+}
-    });
-    describe("class SocketRole", function(){
-        testSocketRole1 = new smartsocket.SocketRole({
-            name:"testRole1",
-            passwordHash:"somehash"
-        })
-    })
-    describe("class SocketFunction", function () {
-        it("should register a new Function", function () {
-            testSocketFunction1 = new smartsocket.SocketFunction({
-                funcName:"testFunction1",
-                funcDef: (dataArg) => {
-                    let done = q.defer();
-                    done.resolve(dataArg);
-                    return done.promise;
-                },
-                allowedRoles:[testSocketRole1]
-            });
-        });
-    });
-    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: "testRole1"
-            });
-            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 () {
 
-        });
+const testConfig = {
-        it("should be able to make a functionCall",function(done){
+  port: 3000
-            this.timeout(5000);
+};
-            testSmartsocketClient.serverCall("testFunction1",{
+
-                value1:"hello"
+// class smartsocket
-            }).then((dataArg) => {
+tap.test('should create a new smartsocket', async () => {
-                console.log(dataArg);
+  testSmartsocket = new smartsocket.Smartsocket({ port: testConfig.port });
-                done();
+  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
-            });
+});
-        })
+
-    });
+// class socketrole
-    describe("terminating smartsocket", function () {
+tap.test('should add a socketrole', async () => {
-        it("should close the server", function () {
+  testSocketRole1 = new smartsocket.SocketRole({
-            testSmartsocket.closeServer();
+    name: 'testRole1',
-        });
+    passwordHash: smarthash.sha256FromStringSync('testPassword')
+  });
+  testSmartsocket.addSocketRoles([testSocketRole1]);
+});
+
+// class SocketFunction
+tap.test('should register a new Function', async () => {
+  testSocketFunctionForServer = new smartsocket.SocketFunction({
+    allowedRoles: [testSocketRole1],
+    funcDef: async (dataArg, socketConnectionArg) => {
+      return dataArg;
+    },
+    funcName: 'testFunction1'
+  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+
+  testSocketFunctionClient = new smartsocket.SocketFunction({
+    allowedRoles: [],
+    funcDef: async (dataArg, socketConnectionArg) => {
+      return dataArg;
+    },
+    funcName: 'testFunction2'
+  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+  console.log(testSmartsocket.socketFunctions);
+});
+
+tap.test('should start listening when .started is called', async () => {
+  await testSmartsocket.start();
+});
+
+// class SmartsocketClient
+tap.test('should react to a new websocket connection from client', async () => {
+  testSmartsocketClient = new smartsocket.SmartsocketClient({
+    port: testConfig.port,
+    url: 'http://localhost',
+    password: 'testPassword',
+    alias: 'testClient1',
+    role: 'testRole1'
+  });
+  testSmartsocketClient.addSocketFunction(testSocketFunctionClient);
+  console.log(testSmartsocketClient.socketFunctions);
+  await testSmartsocketClient.connect();
+});
+
+tap.test('2 clients should connect in parallel', async () => {
+  // TODO: implement parallel test
+});
+
+tap.test('should be able to make a functionCall from client to server', async () => {
+  const response = await testSmartsocketClient.serverCall<IReqResClient>('testFunction1', {
+    value1: 'hello'
+  });
+  console.log(response);
+  expect(response.value1).to.equal('hello');
+});
+
+tap.test('should be able to make a functionCall from server to client', async () => {
+  const response = await testSmartsocket.clientCall<IReqResServer>(
+    'testFunction2',
+    {
+      hi: 'hi there from server'
+    },
+    testSmartsocket.socketConnections.find(socketConnection => {
+      return true;
     })
-});
+  );
+  console.log(response);
+  expect(response.hi).to.equal('hi there from server');
+});
+
+tap.test('client should disconnect and reconnect', async tools => {
+  await testSmartsocketClient.disconnect();
+  await tools.delayFor(100);
+  await testSmartsocketClient.connect();
+});
+
+// terminate
+tap.test('should close the server', async () => {
+  await testSmartsocket.stop();
+});
+
+tap.start();

ts/index.ts

@@ -1,8 +1,8 @@
-import * as plugins from "./smartsocket.plugins";
+// export main classes
+export * from './smartsocket.classes.smartsocket';
+export * from './smartsocket.classes.smartsocketclient';
 
-export * from "./smartsocket.classes.smartsocket";
+// export further classes and objects
-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';
-
-// need something more exposed? Create an issue on GitLab!

ts/smartsocket.classes.smartsocket.ts

@@ -1,68 +1,126 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
-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 { ISocketFunctionCallDataRequest, SocketFunction, ISocketFunctionCallDataResponse } 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;
+  port?: number;
-
+}
-};
 
 export class Smartsocket {
-    options: ISmartsocketConstructorOptions
+  /**
-    io: SocketIO.Server;
+   * a unique id to detect server restarts
-    openSockets = new Objectmap<SocketConnection>();
+   */
-    constructor(optionsArg: ISmartsocketConstructorOptions) {
+  public id = plugins.smartunique.shortId();
-        this.options = optionsArg;
+  public options: ISmartsocketConstructorOptions;
-    };
+  public io: SocketIO.Server;
+  public socketConnections = new Objectmap<SocketConnection>();
+  public socketRoles = new Objectmap<SocketRole>();
+  public socketFunctions = new Objectmap<SocketFunction<any>>();
+  public socketRequests = new Objectmap<SocketRequest<any>>();
 
-    /**
+  private socketServer = new SocketServer(this);
-     * the standard handler for new socket connections
-     */
-    private _handleSocketConnection(socketArg) {
-        let socketConnection: SocketConnection =  new SocketConnection({
-            alias:undefined,
-            authenticated:false,
-            role:undefined,
-            socket:socketArg
-        });
-        plugins.beautylog.log("Socket connected. Trying to authenticate...")
-        this.openSockets.add(socketConnection);
-        socketConnection.authenticate()
-            .then(() => {
-                return socketConnection.listenToFunctionRequests();
-            })
-            .catch((err) => {
-                console.log(err);
-            });
-    };
 
-    /**
+  constructor(optionsArg: ISmartsocketConstructorOptions) {
-     * starts listening to incling sockets:
+    this.options = optionsArg;
-     */
+  }
 
-    startServer = () => {
+  // tslint:disable-next-line:member-ordering
-        this.io = plugins.socketIo(this.options.port);
+  public async setExternalServer(serverType: 'smartexpress', serverArg: any) {
-        this.io.on("connection", (socketArg) => {
+    await this.socketServer.setExternalServer(serverType, serverArg);
-            this._handleSocketConnection(socketArg);
+  }
-        });
+
+  /**
+   * 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.socketConnections.forEach((socketObjectArg: SocketConnection) => {
+      plugins.smartlog.defaultLogger.log(
+        'info',
+        `disconnect socket with >>alias ${socketObjectArg.alias}`
+      );
+      socketObjectArg.socket.disconnect();
+    });
+    this.socketConnections.wipe();
+    this.io.close();
+
+    // stop the corresponging server
+    this.socketServer.stop();
+  }
+
+  // communication
+
+  /**
+   * allows call to specific client.
+   */
+  public async clientCall<T extends plugins.typedrequestInterfaces.ITypedRequest>(
+    functionNameArg: T['method'],
+    dataArg: T['request'],
+    targetSocketConnectionArg: SocketConnection
+  ): Promise<T['response']> {
+    const socketRequest = new SocketRequest<T>(this, {
+      funcCallData: {
+        funcDataArg: dataArg,
+        funcName: functionNameArg
+      },
+      originSocketConnection: targetSocketConnectionArg,
+      shortId: plugins.smartunique.shortId(),
+      side: 'requesting'
+    });
+    const response: ISocketFunctionCallDataResponse<T> = await socketRequest.dispatch();
+    const result = response.funcDataArg;
+    return result;
+  }
+
+  /**
+   * adds socketRoles
+   */
+  public addSocketRoles(socketRolesArray: SocketRole[]): void {
+    for (const socketRole of socketRolesArray) {
+      this.socketRoles.add(socketRole);
     }
-    closeServer = () => {
+    return;
-        this.openSockets.forEach((socketObjectArg: SocketConnection) => {
+  }
-            plugins.beautylog.log(`disconnect socket with >>alias ${socketObjectArg.alias}`);
-            socketObjectArg.socket.disconnect();
-        });
-        this.openSockets.wipe();
-        this.io.close();
-    };
 
-    // communication
+  public addSocketFunction(socketFunction: SocketFunction<any>) {
-    clientCall(){
+    this.socketFunctions.add(socketFunction);
-        
+  }
-        // TODO: target specific client and initiate response        
+
-    }
+  /**
-}
+   * the standard handler for new socket connections
+   */
+  private async _handleSocketConnection(socketArg: plugins.socketIo.Socket) {
+    const socketConnection: SocketConnection = new SocketConnection({
+      alias: undefined,
+      authenticated: false,
+      role: undefined,
+      side: 'server',
+      smartsocketHost: this,
+      socket: socketArg
+    });
+    plugins.smartlog.defaultLogger.log('info', 'Socket connected. Trying to authenticate...');
+    this.socketConnections.add(socketConnection);
+    await socketConnection.authenticate();
+    await socketConnection.listenToFunctionRequests();
+  }
+}

ts/smartsocket.classes.smartsocketclient.ts

@@ -1,93 +1,124 @@
-import * as plugins from "./smartsocket.plugins"
+import * as plugins from './smartsocket.plugins';
 
+import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { ISocketFunctionCallDataRequest, SocketFunction } from './smartsocket.classes.socketfunction';
+import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
+import { SocketRole } from './smartsocket.classes.socketrole';
 
-// 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
  */
 export interface ISmartsocketClientOptions {
-    port: number;
+  port: number;
-    url: string;
+  url: string;
-    alias:string; // an alias makes it easier to identify this client in a multo client environment
+  alias: string; // an alias makes it easier to identify this client in a multo client environment
-    role:string;
+  role: string;
-    password: string; // by setting a password access to functions can be limited
+  password: string; // by setting a password access to functions can be limited
 }
 
 export class SmartsocketClient {
-    alias:string;
+  public alias: string;
-    role:string;
+  public socketRole: SocketRole;
-    socketConnection:SocketConnection;
+  public socketConnection: SocketConnection;
-    serverUrl:string;
+  public serverUrl: string;
-    serverPort:number;
+  public serverPort: number;
-    serverPassword:string;
-    constructor(optionsArg:ISmartsocketClientOptions){
-        this.alias = optionsArg.alias;
-        this.role = optionsArg.role;
-        this.serverUrl = optionsArg.url
-        this.serverPort = optionsArg.port;
-        this.serverPassword = optionsArg.password
-    };
 
-    /**
+  public socketFunctions = new plugins.lik.Objectmap<SocketFunction<any>>();
-     * connect the client to the server
+  public socketRequests = new plugins.lik.Objectmap<SocketRequest<any>>();
-     */
+  public socketRoles = new plugins.lik.Objectmap<SocketRole>();
-    connect(){
+
-        let done = plugins.q.defer();
+  constructor(optionsArg: ISmartsocketClientOptions) {
-        plugins.beautylog.log("trying to connect...");
+    this.alias = optionsArg.alias;
-        let socketUrl = `${this.serverUrl}:${this.serverPort}`;
+    this.serverUrl = optionsArg.url;
-        this.socketConnection = new SocketConnection({
+    this.serverPort = optionsArg.port;
-            alias:this.alias,
+    this.socketRole = new SocketRole({
-            authenticated:false,
+      name: optionsArg.role,
-            role:undefined,
+      passwordHash: optionsArg.password
-            socket: plugins.socketIoClient(socketUrl,{multiplex:false})
+    });
-        });
+  }
-        this.socketConnection.socket.on("requestAuth", () => {
+
-            console.log("server requested authentication");
+  public addSocketFunction(socketFunction: SocketFunction<any>) {
-            this.socketConnection.socket.emit("dataAuth", {
+    this.socketFunctions.add(socketFunction);
-                role: this.role,
+    this.socketRole.allowedFunctions.add(socketFunction);
-                password: this.serverPassword,
+  }
-                alias: this.alias
+
-            });
+  /**
-            this.socketConnection.socket.on("authenticated",() => {
+   * connect the client to the server
-                console.log("client is authenticated");
+   */
-                this.socketConnection.authenticated = true;
+  public connect() {
-                this.socketConnection.listenToFunctionRequests();
+    const done = plugins.smartpromise.defer();
-                done.resolve();
+    plugins.smartlog.defaultLogger.log('info', 'trying to connect...');
-            });
+    const socketUrl = `${this.serverUrl}:${this.serverPort}`;
-        });
+    this.socketConnection = new SocketConnection({
-        return done.promise;
+      alias: this.alias,
-    };
+      authenticated: false,
-    disconnect(){
+      role: this.socketRole,
-        let done = plugins.q.defer();
+      side: 'client',
-        this.socketConnection.socket.disconnect();
+      smartsocketHost: this,
-        this.socketConnection = undefined;
+      socket: plugins.socketIoClient(socketUrl, { multiplex: false })
-        plugins.beautylog.ok("disconnected!");
+    });
+    this.socketConnection.socket.on('requestAuth', () => {
+      plugins.smartlog.defaultLogger.log('info', 'server requested authentication');
+      this.socketConnection.socket.emit('dataAuth', {
+        role: this.socketRole.name,
+        password: this.socketRole.passwordHash,
+        alias: this.alias
+      });
+      this.socketConnection.socket.on('authenticated', () => {
+        plugins.smartlog.defaultLogger.log('info', 'client is authenticated');
+        this.socketConnection.authenticated = true;
+        this.socketConnection.listenToFunctionRequests();
         done.resolve();
-        return done.promise;
+      });
+
+      // handle errors
+      this.socketConnection.socket.on('reconnect_failed', async () => {
+        this.disconnect();
+      });
+      this.socketConnection.socket.on('connect_error', async () => {
+        this.disconnect();
+      });
+    });
+    return done.promise;
+  }
+
+  /**
+   * disconnect from the server
+   */
+  public async disconnect() {
+    if (this.socketConnection) {
+      this.socketConnection.socket.disconnect(true);
+      this.socketConnection = undefined;
+      plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
     }
-    serverCall(functionNameArg:string,dataArg:any){
+  }
-        let done = plugins.q.defer();
+
-        let socketRequest = new SocketRequest({
+  /**
-            side:"requesting",
+   * try a reconnection
-            originSocketConnection:this.socketConnection,
+   */
-            shortId:plugins.shortid.generate(),
+  public async tryDebouncedReconnect() {
-            funcCallData:{
+    await plugins.smartdelay.delayForRandom(10000, 60000);
-                funcName: functionNameArg,
+    await this.connect();
-                funcDataArg:dataArg
+  }
-            }
+
-        });
+  /**
-        socketRequest.dispatch()
+   * dispatches a server call
-            .then((dataArg:ISocketFunctionCall) => {
+   * @param functionNameArg 
-                done.resolve(dataArg.funcDataArg);
+   * @param dataArg 
-            });
+   */
-        return done.promise;
+  public async serverCall<T extends plugins.typedrequestInterfaces.ITypedRequest>(functionNameArg: T['method'], dataArg: T['request']): Promise<T['response']> {
-    };
+    const done = plugins.smartpromise.defer();
-    
+    const socketRequest = new SocketRequest<T>(this, {
-}
+      side: 'requesting',
+      originSocketConnection: this.socketConnection,
+      shortId: plugins.smartunique.shortId(),
+      funcCallData: {
+        funcName: functionNameArg,
+        funcDataArg: dataArg
+      }
+    });
+    const response = await socketRequest.dispatch();
+    const result = response.funcDataArg;
+    return result;
+  }
+}

ts/smartsocket.classes.socketconnection.ts

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

ts/smartsocket.classes.socketfunction.ts

@@ -1,87 +1,96 @@
-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';
+import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
 
 // export interfaces
 
 /**
  * interface of the contructor options of class SocketFunction
  */
-export interface ISocketFunctionConstructorOptions {
+export interface ISocketFunctionConstructorOptions<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    funcName: string;
+  funcName: T['method'];
-    funcDef: any;
+  funcDef: TFuncDef<T>;
-    allowedRoles: SocketRole[]; // all roles that are allowed to execute a SocketFunction
+  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
  */
-export interface ISocketFunctionCall {
+export interface ISocketFunctionCallDataRequest<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    funcName:string;
+  funcName: T['method'];
-    funcDataArg:any;
+  funcDataArg: T['request'];
-};
+}
+
+/**
+ * interface of the Socket Function call, in other words the object that routes a call to a function
+ */
+export interface ISocketFunctionCallDataResponse<T extends plugins.typedrequestInterfaces.ITypedRequest> {
+  funcName: T['method'];
+  funcDataArg: T['response'];
+}
 
 /**
  * interface for function definition of SocketFunction
  */
-export interface IFuncDef {
+export type TFuncDef<T extends plugins.typedrequestInterfaces.ITypedRequest> = (dataArg: T['request'], connectionArg: SocketConnection) => PromiseLike<T['response']>;
-    (dataArg:any):PromiseLike<any>
-}
-
-// export objects
-export let allSocketFunctions = new Objectmap<SocketFunction>();
 
 // export classes
 
 /**
  * class that respresents a function that can be transparently called using a SocketConnection
  */
-export class SocketFunction {
+export class SocketFunction<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    name: string;
+  // STATIC
-    funcDef: IFuncDef;
+  public static getSocketFunctionByName<Q extends plugins.typedrequestInterfaces.ITypedRequest>(
-    roles: SocketRole[];
+    smartsocketRefArg: Smartsocket | SmartsocketClient,
+    functionNameArg: string
+  ): SocketFunction<Q> {
+    return smartsocketRefArg.socketFunctions.find(socketFunctionArg => {
+      return socketFunctionArg.name === functionNameArg;
+    });
+  }
 
-    /**
+  // INSTANCE
-     * the constructor for SocketFunction
+  public name: string;
-     */
+  public funcDef: TFuncDef<T>;
-    constructor(optionsArg: ISocketFunctionConstructorOptions) {
+  public roles: SocketRole[];
-        this.name = optionsArg.funcName;
-        this.funcDef = optionsArg.funcDef;
-        this.roles = optionsArg.allowedRoles;
-        for (let socketRoleArg of this.roles){
-            this._notifyRole(socketRoleArg);
-        };
-        allSocketFunctions.add(this); // map instance with Objectmap
-    };
 
-    /** 
+  /**
-     * notifies a role about access to this SocketFunction
+   * the constructor for SocketFunction
-     */
+   */
-    private _notifyRole(socketRoleArg:SocketRole){
+  constructor(optionsArg: ISocketFunctionConstructorOptions<T>) {
-        socketRoleArg.addSocketFunction(this);
+    this.name = optionsArg.funcName;
+    this.funcDef = optionsArg.funcDef;
+    this.roles = optionsArg.allowedRoles;
+    for (const socketRoleArg of this.roles) {
+      this._notifyRole(socketRoleArg);
     }
-    
+  }
-    /**
-     * 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) => {
-                    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;        
-    };
 
-}
+  /**
+   * invokes the function of this SocketFunction
+   */
+  public async invoke(dataArg: ISocketFunctionCallDataRequest<T>, socketConnectionArg: SocketConnection): Promise<ISocketFunctionCallDataResponse<T>> {
+    if (dataArg.funcName === this.name) {
+      const funcResponseData: ISocketFunctionCallDataResponse<T> = {
+        funcName: this.name,
+        funcDataArg: await this.funcDef(dataArg.funcDataArg, socketConnectionArg)
+      };
+      return funcResponseData;
+    } else {
+      throw new Error("SocketFunction.name does not match the data argument's .name!");
+    }
+  }
+
+  /**
+   * notifies a role about access to this SocketFunction
+   */
+  private _notifyRole(socketRoleArg: SocketRole) {
+    socketRoleArg.addSocketFunction(this);
+  }
+}

ts/smartsocket.classes.socketrequest.ts

@@ -1,96 +1,123 @@
-import * as plugins from "./smartsocket.plugins";
+import * as plugins from './smartsocket.plugins';
-import * as helpers from "./smartsocket.helpers";
 
 // import interfaces
-import { ISocketFunctionCall } from "./smartsocket.classes.socketfunction";
+import { SocketFunction, ISocketFunctionCallDataRequest, ISocketFunctionCallDataResponse } from './smartsocket.classes.socketfunction';
 
 // import classes
-import { Objectmap } from "lik";
+import { Objectmap } from '@pushrocks/lik';
-import { SocketFunction } from "./smartsocket.classes.socketfunction";
+import { SocketConnection } from './smartsocket.classes.socketconnection';
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
+import { defaultLogger } from '@pushrocks/smartlog';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
 
 // export interfaces
-export type TSocketRequestStatus = "new" | "pending" | "finished";
+export type TSocketRequestStatus = 'new' | 'pending' | 'finished';
-export type TSocketRequestSide = "requesting" | "responding";
+export type TSocketRequestSide = 'requesting' | 'responding';
 
 /**
  * interface of constructor of class SocketRequest
  */
-export interface SocketRequestConstructorOptions {
+export interface ISocketRequestConstructorOptions<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    side: TSocketRequestSide;
+  side: TSocketRequestSide;
-    originSocketConnection: SocketConnection;
+  originSocketConnection: SocketConnection;
-    shortId: string;
+  shortId: string;
-    funcCallData?: ISocketFunctionCall;
+  funcCallData?: ISocketFunctionCallDataRequest<T>;
-};
+}
 
 /**
  * request object that is sent initially and may or may not receive a response
  */
-export interface ISocketRequestDataObject {
+export interface ISocketRequestDataObject<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    funcCallData: ISocketFunctionCall;
+  funcCallData: ISocketFunctionCallDataRequest<T> | ISocketFunctionCallDataResponse<T>;
-    shortId: string;
+  shortId: string;
-    responseTimeout?: number;
+  responseTimeout?: number;
-};
+}
-
-//export objects
-export let allSocketRequests = new Objectmap<SocketRequest>();
 
 // export classes
-export class SocketRequest {
+export class SocketRequest<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-    status: TSocketRequestStatus = "new";
+  // STATIC
-    side: TSocketRequestSide;
+  public static getSocketRequestById(
-    shortid: string;
+    smartsocketRef: Smartsocket | SmartsocketClient,
-    originSocketConnection: SocketConnection;
+    shortIdArg: string
-    funcCallData: ISocketFunctionCall
+  ): SocketRequest<any> {
-    done = plugins.q.defer();
+    return smartsocketRef.socketRequests.find(socketRequestArg => {
-    constructor(optionsArg: SocketRequestConstructorOptions) {
+      return socketRequestArg.shortid === shortIdArg;
-        this.side = optionsArg.side;
+    });
-        this.shortid = optionsArg.shortId;
+  }
-        this.funcCallData = optionsArg.funcCallData;
+
-        this.originSocketConnection = optionsArg.originSocketConnection;
+  // INSTANCE
-        allSocketRequests.add(this);
+  public status: TSocketRequestStatus = 'new';
+  public side: TSocketRequestSide;
+  public shortid: string;
+  public originSocketConnection: SocketConnection;
+  public funcCallData: ISocketFunctionCallDataRequest<T>;
+  public done = plugins.smartpromise.defer<ISocketFunctionCallDataResponse<T>>();
+
+  public smartsocketRef: Smartsocket | SmartsocketClient;
+
+  constructor(
+    smartsocketRefArg: Smartsocket | SmartsocketClient,
+    optionsArg: ISocketRequestConstructorOptions<T>
+  ) {
+    this.smartsocketRef = smartsocketRefArg;
+    this.side = optionsArg.side;
+    this.shortid = optionsArg.shortId;
+    this.funcCallData = optionsArg.funcCallData;
+    this.originSocketConnection = optionsArg.originSocketConnection;
+    this.smartsocketRef.socketRequests.add(this);
+  }
+
+  // requesting --------------------------
+
+  /**
+   * dispatches a socketrequest from the requesting to the receiving side
+   */
+  public dispatch(): Promise<ISocketFunctionCallDataResponse<T>> {
+    const requestData: ISocketRequestDataObject<T> = {
+      funcCallData: this.funcCallData,
+      shortId: this.shortid
     };
+    this.originSocketConnection.socket.emit('function', requestData);
+    return this.done.promise;
+  }
 
-    // requesting --------------------------
+  /**
+   * handles the response that is received by the requesting side
+   */
+  public async handleResponse(responseDataArg: ISocketRequestDataObject<T>) {
+    plugins.smartlog.defaultLogger.log('info', 'handling response!');
+    this.done.resolve(responseDataArg.funcCallData);
+    this.smartsocketRef.socketRequests.remove(this);
+  }
 
-    /**
+  // responding --------------------------
-     * dispatches a socketrequest from the requesting to the receiving side
-     */
-    dispatch() {
-        let requestData: ISocketRequestDataObject = {
-            funcCallData: this.funcCallData,
-            shortId: this.shortid
-        }
-        this.originSocketConnection.socket.emit("function", requestData);
-        return this.done.promise;
-    };
 
-    /**
+  /**
-     * handles the response that is received by the requesting side
+   * creates the response on the responding side
-     */
+   */
-    handleResponse(responseDataArg: ISocketRequestDataObject) {
+  public async createResponse(): Promise<void> {
-        plugins.beautylog.log("handling response!");
+    const targetSocketFunction: SocketFunction<T> = SocketFunction.getSocketFunctionByName(
-        this.done.resolve(responseDataArg.funcCallData);
+      this.smartsocketRef,
-        allSocketRequests.remove(this);
+      this.funcCallData.funcName
+    );
+
+    if (!targetSocketFunction) {
+      defaultLogger.log(
+        'warn',
+        `There is no SocketFunction defined for ${this.funcCallData.funcName}`
+      );
+      defaultLogger.log('warn', `So now response is being sent.`);
+      return;
     }
-
+    plugins.smartlog.defaultLogger.log('info', `invoking ${targetSocketFunction.name}`);
-    // responding --------------------------
+    targetSocketFunction.invoke(this.funcCallData, this.originSocketConnection).then(resultData => {
-
+      plugins.smartlog.defaultLogger.log('info', 'got resultData. Sending it to requesting party.');
-    /**
+      const responseData: ISocketRequestDataObject<T> = {
-     * creates the response on the responding side
+        funcCallData: resultData,
-     */
+        shortId: this.shortid
-    createResponse() {
+      };
-        let targetSocketFunction: SocketFunction = helpers.getSocketFunctionByName(this.funcCallData.funcName);
+      this.originSocketConnection.socket.emit('functionResponse', responseData);
-        plugins.beautylog.info(`invoking ${targetSocketFunction.name}`);
+      this.smartsocketRef.socketRequests.remove(this);
-        targetSocketFunction.invoke(this.funcCallData)
+    });
-            .then((resultData) => {
+  }
-                plugins.beautylog.log("got resultData. Sending it to requesting party.")
+}
-                let requestData: ISocketRequestDataObject = {
-                    funcCallData: resultData,
-                    shortId: this.shortid
-                };
-                this.originSocketConnection.socket.emit("functionResponse",requestData);
-                allSocketRequests.remove(this);
-            });
-    }
-};

ts/smartsocket.classes.socketrole.ts

@@ -1,34 +1,58 @@
-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';
-
+import { Smartsocket } from './smartsocket.classes.smartsocket';
-
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
-export let allSocketRoles = new Objectmap<SocketRole>();
+import { ISocketConnectionAuthenticationObject } from './smartsocket.classes.socketconnection';
-
 
 /**
  * interface for class SocketRole
  */
-export interface SocketRoleOptions {
+export interface ISocketRoleOptions {
-    name: string;
+  name: string;
-    passwordHash: string;
+  passwordHash: string;
 }
 
 /**
  * A socketrole defines access to certain routines.
  */
 export class SocketRole {
-    name: string;
+  // STATIC
-    passwordHash: string;
+  public static getSocketRoleByName(
-    allowedFunctions = new Objectmap<SocketFunction>();
+    referenceSmartsocket: Smartsocket | SmartsocketClient,
-    constructor(optionsArg: SocketRoleOptions) {
+    socketRoleNameArg: string
-        this.name = optionsArg.name;
+  ): SocketRole {
-        this.passwordHash = optionsArg.passwordHash;
+    return referenceSmartsocket.socketRoles.find(socketRoleArg => {
-        allSocketRoles.add(this);
+      return socketRoleArg.name === socketRoleNameArg;
-    };
+    });
-    addSocketFunction(socketFunctionArg:SocketFunction){
+  }
-        this.allowedFunctions.add(socketFunctionArg);
+
-    }
+  public static checkPasswordForRole(
-}
+    dataArg: ISocketConnectionAuthenticationObject,
+    referenceSmartsocket: Smartsocket | SmartsocketClient
+  ): boolean {
+    const targetPasswordHash = SocketRole.getSocketRoleByName(referenceSmartsocket, dataArg.role)
+      .passwordHash;
+    const computedCompareHash = plugins.smarthash.sha256FromStringSync(dataArg.password);
+    return targetPasswordHash === computedCompareHash;
+  }
+
+  // INSTANCE
+  public name: string;
+  public passwordHash: string;
+  public allowedFunctions = new Objectmap<SocketFunction<any>>();
+  constructor(optionsArg: ISocketRoleOptions) {
+    this.name = optionsArg.name;
+    this.passwordHash = optionsArg.passwordHash;
+  }
+
+  /**
+   * adds the socketfunction to the socketrole
+   * @param socketFunctionArg
+   */
+  public addSocketFunction(socketFunctionArg: SocketFunction<any>) {
+    this.allowedFunctions.add(socketFunctionArg);
+  }
+}

ts/smartsocket.classes.socketserver.ts

@@ -0,0 +1,78 @@
+import * as plugins from './smartsocket.plugins';
+
+// used in case no other server is supplied
+import * as http from 'http';
+import * as https from 'https';
+import { Smartsocket } from './smartsocket.classes.smartsocket';
+
+/**
+ * class socketServer
+ * handles the attachment of socketIo to whatever server is in play
+ */
+export class SocketServer {
+  private smartsocket: Smartsocket;
+  private httpServer: http.Server | https.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: 'smartexpress',
+    serverArg: plugins.smartexpress.Server
+  ) {
+    await serverArg.startedPromise;
+    this.httpServer = serverArg.httpServer;
+  }
+
+  /**
+   * gets the server for socket.io
+   */
+  public getServerForSocketIo() {
+    if (this.httpServer) {
+      return this.httpServer;
+    } else {
+      this.httpServer = new http.Server();
+      this.standaloneServer = true;
+      return this.httpServer;
+    }
+  }
+
+  /**
+   * starts listening to incoming sockets:
+   */
+  public async start() {
+    const done = plugins.smartpromise.defer();
+
+    // handle http servers
+    // in case an external server has been set "this.standaloneServer" should be false
+    if (this.httpServer && this.standaloneServer) {
+      if (!this.smartsocket.options.port) {
+        plugins.smartlog.defaultLogger.log('error', 'there should be a port specifed for smartsocket!');
+        throw new Error('there should be a port specified for smartsocket');
+      }
+      this.httpServer.listen(this.smartsocket.options.port, () => {
+        plugins.smartlog.defaultLogger.log('success', `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 +0,0 @@
-import * as plugins from "./smartsocket.plugins";
-
-// classes
-import { Smartsocket } from "./smartsocket.classes.smartsocket";
-import { SocketFunction, allSocketFunctions } from "./smartsocket.classes.socketfunction";
-import { SocketConnection } from "./smartsocket.classes.socketconnection";
-import { SocketRequest, allSocketRequests, TSocketRequestSide } from "./smartsocket.classes.socketrequest";
-import { SocketRole, allSocketRoles } from "./smartsocket.classes.socketrole";
-
-// SocketFunction helpers
-export let getSocketFunctionByName = (functionNameArg: string):SocketFunction => {
-    return allSocketFunctions.find((socketFunctionArg) => { return socketFunctionArg.name === functionNameArg });
-}
-
-// SocketRequest helpers
-
-/**
- * get corresponding Socketrequest instance by shortId
- */
-export let getSocketRequestById = (shortIdArg:string,requestSide?:TSocketRequestSide):SocketRequest => {
-    return allSocketRequests.find((socketRequestArg) => {return socketRequestArg.shortid === shortIdArg})
-}
-
-// SocketRole helpers
-
-/**
- * get corresponding SocketRole instance by name
- */
-export let getSocketRoleByName = (socketRoleNameArg: string): SocketRole => {
-    return allSocketRoles.find((socketRoleArg) => { return socketRoleArg.name === socketRoleNameArg })
-};
-

ts/smartsocket.plugins.ts

@@ -1,8 +1,33 @@
-import "typings-global";
+// apiglobal scope
-export import beautylog = require("beautylog");
+import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
-export import lik  = require("lik");
+
-export import q = require("q");
+export {typedrequestInterfaces};
-export import shortid = require("shortid");
+
-export import socketIo = require("socket.io");
+// pushrocks scope
-export import socketIoClient = require("socket.io-client");
+import * as lik from '@pushrocks/lik';
-export import taskbuffer = require("taskbuffer");
+import * as smartlog from '@pushrocks/smartlog';
+import * as smarthash from '@pushrocks/smarthash';
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartexpress from '@pushrocks/smartexpress';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartunique from '@pushrocks/smartunique';
+
+
+export {
+  lik,
+  smartlog,
+  smarthash,
+  smartdelay,
+  smartexpress,
+  smartpromise,
+  smartunique,
+};
+
+// third party scope
+import socketIo from 'socket.io';
+import socketIoClient from 'socket.io-client';
+
+export {
+  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"
+}