From 475911a9689c28eb3b50a4956bf2a5fdc1611801 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Thu, 31 Jan 2019 02:32:52 +0100 Subject: [PATCH] fix(build): now building with tsbuild --- dist/index.d.ts | 5 - dist/index.js | 13 -- dist/smartsocket.classes.smartsocket.d.ts | 37 ------ dist/smartsocket.classes.smartsocket.js | 111 ------------------ ...smartsocket.classes.smartsocketclient.d.ts | 26 ---- dist/smartsocket.classes.smartsocketclient.js | 71 ----------- .../smartsocket.classes.socketconnection.d.ts | 50 -------- dist/smartsocket.classes.socketconnection.js | 100 ---------------- dist/smartsocket.classes.socketfunction.d.ts | 44 ------- dist/smartsocket.classes.socketfunction.js | 52 -------- dist/smartsocket.classes.socketrequest.d.ts | 44 ------- dist/smartsocket.classes.socketrequest.js | 59 ---------- dist/smartsocket.classes.socketrole.d.ts | 19 --- dist/smartsocket.classes.socketrole.js | 19 --- dist/smartsocket.classes.socketserver.d.ts | 29 ----- dist/smartsocket.classes.socketserver.js | 86 -------------- dist/smartsocket.helpers.d.ts | 15 --- dist/smartsocket.helpers.js | 36 ------ dist/smartsocket.plugins.d.ts | 8 -- dist/smartsocket.plugins.js | 11 -- package.json | 2 +- 21 files changed, 1 insertion(+), 836 deletions(-) delete mode 100644 dist/index.d.ts delete mode 100644 dist/index.js delete mode 100644 dist/smartsocket.classes.smartsocket.d.ts delete mode 100644 dist/smartsocket.classes.smartsocket.js delete mode 100644 dist/smartsocket.classes.smartsocketclient.d.ts delete mode 100644 dist/smartsocket.classes.smartsocketclient.js delete mode 100644 dist/smartsocket.classes.socketconnection.d.ts delete mode 100644 dist/smartsocket.classes.socketconnection.js delete mode 100644 dist/smartsocket.classes.socketfunction.d.ts delete mode 100644 dist/smartsocket.classes.socketfunction.js delete mode 100644 dist/smartsocket.classes.socketrequest.d.ts delete mode 100644 dist/smartsocket.classes.socketrequest.js delete mode 100644 dist/smartsocket.classes.socketrole.d.ts delete mode 100644 dist/smartsocket.classes.socketrole.js delete mode 100644 dist/smartsocket.classes.socketserver.d.ts delete mode 100644 dist/smartsocket.classes.socketserver.js delete mode 100644 dist/smartsocket.helpers.d.ts delete mode 100644 dist/smartsocket.helpers.js delete mode 100644 dist/smartsocket.plugins.d.ts delete mode 100644 dist/smartsocket.plugins.js diff --git a/dist/index.d.ts b/dist/index.d.ts deleted file mode 100644 index bc829f9..0000000 --- a/dist/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './smartsocket.classes.smartsocket'; -export * from './smartsocket.classes.smartsocketclient'; -export * from './smartsocket.classes.socketfunction'; -export * from './smartsocket.classes.socketrole'; -export * from './smartsocket.classes.socketconnection'; diff --git a/dist/index.js b/dist/index.js deleted file mode 100644 index ee351ed..0000000 --- a/dist/index.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} -Object.defineProperty(exports, "__esModule", { value: true }); -// export main classes -__export(require("./smartsocket.classes.smartsocket")); -__export(require("./smartsocket.classes.smartsocketclient")); -// export further classes and objects -__export(require("./smartsocket.classes.socketfunction")); -__export(require("./smartsocket.classes.socketrole")); -__export(require("./smartsocket.classes.socketconnection")); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBLHNCQUFzQjtBQUN0Qix1REFBa0Q7QUFDbEQsNkRBQXdEO0FBRXhELHFDQUFxQztBQUNyQywwREFBcUQ7QUFDckQsc0RBQWlEO0FBQ2pELDREQUF1RCJ9 \ No newline at end of file diff --git a/dist/smartsocket.classes.smartsocket.d.ts b/dist/smartsocket.classes.smartsocket.d.ts deleted file mode 100644 index 6ae9cd2..0000000 --- a/dist/smartsocket.classes.smartsocket.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -/// -import * as plugins from './smartsocket.plugins'; -import { SocketConnection } from './smartsocket.classes.socketconnection'; -import { SocketRole } from './smartsocket.classes.socketrole'; -import * as SocketIO from 'socket.io'; -export interface ISmartsocketConstructorOptions { - port: number; -} -export declare class Smartsocket { - options: ISmartsocketConstructorOptions; - io: SocketIO.Server; - openSockets: plugins.lik.Objectmap; - socketRoles: plugins.lik.Objectmap; - private socketServer; - constructor(optionsArg: ISmartsocketConstructorOptions); - setExternalServer: (serverType: "express" | "http", serverArg: any) => Promise; - /** - * starts smartsocket - */ - start(): Promise; - /** - * stops smartsocket - */ - stop(): Promise; - /** - * allows call to specific client. - */ - clientCall(functionNameArg: string, dataArg: any, targetSocketConnectionArg: SocketConnection): Promise<{}>; - /** - * adds socketRoles - */ - addSocketRoles(socketRolesArray: SocketRole[]): void; - /** - * the standard handler for new socket connections - */ - private _handleSocketConnection(socketArg); -} diff --git a/dist/smartsocket.classes.smartsocket.js b/dist/smartsocket.classes.smartsocket.js deleted file mode 100644 index 30af96c..0000000 --- a/dist/smartsocket.classes.smartsocket.js +++ /dev/null @@ -1,111 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -// classes -const lik_1 = require("lik"); -const smartsocket_classes_socketconnection_1 = require("./smartsocket.classes.socketconnection"); -const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest"); -const smartsocket_classes_socketserver_1 = require("./smartsocket.classes.socketserver"); -class Smartsocket { - constructor(optionsArg) { - this.openSockets = new lik_1.Objectmap(); - this.socketRoles = new lik_1.Objectmap(); - this.socketServer = new smartsocket_classes_socketserver_1.SocketServer(this); - // tslint:disable-next-line:member-ordering - this.setExternalServer = this.socketServer.setExternalServer; - this.options = optionsArg; - } - /** - * starts smartsocket - */ - start() { - return __awaiter(this, void 0, void 0, function* () { - this.io = plugins.socketIo(this.socketServer.getServerForSocketIo()); - yield this.socketServer.start(); - this.io.on('connection', socketArg => { - this._handleSocketConnection(socketArg); - }); - }); - } - /** - * stops smartsocket - */ - stop() { - return __awaiter(this, void 0, void 0, function* () { - yield plugins.smartdelay.delayFor(1000); - this.openSockets.forEach((socketObjectArg) => { - plugins.beautylog.log(`disconnect socket with >>alias ${socketObjectArg.alias}`); - socketObjectArg.socket.disconnect(); - }); - this.openSockets.wipe(); - this.io.close(); - // stop the corresponging server - this.socketServer.stop(); - }); - } - // communication - /** - * allows call to specific client. - */ - clientCall(functionNameArg, dataArg, targetSocketConnectionArg) { - return __awaiter(this, void 0, void 0, function* () { - const done = plugins.smartq.defer(); - const socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest({ - funcCallData: { - funcDataArg: dataArg, - funcName: functionNameArg - }, - originSocketConnection: targetSocketConnectionArg, - shortId: plugins.shortid.generate(), - side: 'requesting' - }); - socketRequest.dispatch().then((dataArg) => { - done.resolve(dataArg.funcDataArg); - }); - const result = yield done.promise; - return result; - }); - } - /** - * adds socketRoles - */ - addSocketRoles(socketRolesArray) { - for (const socketRole of socketRolesArray) { - this.socketRoles.add(socketRole); - } - return; - } - /** - * the standard handler for new socket connections - */ - _handleSocketConnection(socketArg) { - const socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({ - alias: undefined, - authenticated: false, - role: undefined, - side: 'server', - smartsocketHost: this, - socket: socketArg - }); - plugins.beautylog.log('Socket connected. Trying to authenticate...'); - this.openSockets.add(socketConnection); - socketConnection - .authenticate() - .then(() => { - return socketConnection.listenToFunctionRequests(); - }) - .catch(err => { - console.log(err); - }); - } -} -exports.Smartsocket = Smartsocket; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLGlEQUFpRDtBQUdqRCxVQUFVO0FBQ1YsNkJBQWdDO0FBQ2hDLGlHQUEwRTtBQUUxRSwyRkFBb0U7QUFFcEUseUZBQWtFO0FBU2xFO0lBUUUsWUFBWSxVQUEwQztRQUwvQyxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFvQixDQUFDO1FBQ2hELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWMsQ0FBQztRQUV6QyxpQkFBWSxHQUFHLElBQUksK0NBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQU05QywyQ0FBMkM7UUFDcEMsc0JBQWlCLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQztRQUo3RCxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUM1QixDQUFDO0lBS0Q7O09BRUc7SUFDVSxLQUFLOztZQUNoQixJQUFJLENBQUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDLENBQUM7WUFDckUsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2hDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxTQUFTLENBQUMsRUFBRTtnQkFDbkMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzFDLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDVSxJQUFJOztZQUNmLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDeEMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMs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 \ No newline at end of file diff --git a/dist/smartsocket.classes.smartsocketclient.d.ts b/dist/smartsocket.classes.smartsocketclient.d.ts deleted file mode 100644 index a9a3dd6..0000000 --- a/dist/smartsocket.classes.smartsocketclient.d.ts +++ /dev/null @@ -1,26 +0,0 @@ -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(): Promise<{}>; - disconnect(): Promise<{}>; - serverCall(functionNameArg: string, dataArg: any): Promise<{}>; -} diff --git a/dist/smartsocket.classes.smartsocketclient.js b/dist/smartsocket.classes.smartsocketclient.js deleted file mode 100644 index cb7808d..0000000 --- a/dist/smartsocket.classes.smartsocketclient.js +++ /dev/null @@ -1,71 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -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.smartq.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, - side: 'client', - smartsocketHost: null, - 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.smartq.defer(); - this.socketConnection.socket.disconnect(); - this.socketConnection = undefined; - plugins.beautylog.ok('disconnected!'); - done.resolve(); - return done.promise; - } - serverCall(functionNameArg, dataArg) { - let done = plugins.smartq.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXRjbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFFakQsaUdBQTBFO0FBRTFFLDJGQUE4RjtBQWE5RjtJQU9FLFlBQVksVUFBcUM7UUFDL0MsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztJQUM1QyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxPQUFPO1FBQ0wsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBQzlDLElBQUksU0FBUyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDdkQsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksdURBQWdCLENBQUM7WUFDM0MsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1lBQ2pCLGFBQWEsRUFBRSxLQUFLO1lBQ3BCLElBQUksRUFBRSxTQUFTO1lBQ2YsSUFBSSxFQUFFLFFBQVE7WUFDZCxlQUFlLEVBQUUsSUFBSTtZQUNyQixNQUFNLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7U0FDaEUsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRTtZQUNsRCxPQUFPLENBQUMsR0FBRyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7WUFDL0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFO2dCQUM1QyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQ2YsUUFBUSxFQUFFLElBQUksQ0FBQyxjQUFjO2dCQUM3QixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7YUFDbEIsQ0FBQyxDQUFDO1lBQ0gsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsZUFBZSxFQUFFLEdBQUcsRUFBRTtnQkFDcEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQztnQkFDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHdCQUF3QixFQUFFLENBQUM7Z0JBQ2pELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVELFVBQVU7UUFDUixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQztRQUNsQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN0QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBRUQsVUFBVSxDQUFDLGVBQXVCLEVBQUUsT0FBWTtRQUM5QyxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2xDLElBQUksYUFBYSxHQUFHLElBQUksaURBQWEsQ0FBQztZQUNwQyxJQUFJLEVBQUUsWUFBWTtZQUNsQixzQkFBc0IsRUFBRSxJQUFJLENBQUMsZ0JBQWdCO1lBQzdDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRTtZQUNuQyxZQUFZLEVBQUU7Z0JBQ1osUUFBUSxFQUFFLGVBQWU7Z0JBQ3pCLFdBQVcsRUFBRSxPQUFPO2FBQ3JCO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQTRCLEVBQUUsRUFBRTtZQUM3RCxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7Q0FDRjtBQXhFRCw4Q0F3RUMifQ== \ No newline at end of file diff --git a/dist/smartsocket.classes.socketconnection.d.ts b/dist/smartsocket.classes.socketconnection.d.ts deleted file mode 100644 index 2820547..0000000 --- a/dist/smartsocket.classes.socketconnection.d.ts +++ /dev/null @@ -1,50 +0,0 @@ -/// -/// -import * as plugins from './smartsocket.plugins'; -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SocketRole } from './smartsocket.classes.socketrole'; -import * as SocketIO from 'socket.io'; -/** - * defines is a SocketConnection is server or client side. Important for mesh setups. - */ -export declare type TSocketConnectionSide = 'server' | 'client'; -/** - * interface for constructor of class SocketConnection - */ -export interface ISocketConnectionConstructorOptions { - alias: string; - authenticated: boolean; - role: SocketRole; - side: TSocketConnectionSide; - smartsocketHost: Smartsocket; - socket: SocketIO.Socket | SocketIOClient.Socket; -} -/** - * interface for authentication data - */ -export interface ISocketConnectionAuthenticationObject { - role: 'coreflowContainer'; - password: 'somePassword'; - alias: 'coreflow1'; -} -export declare let allSocketConnections: plugins.lik.Objectmap; -/** - * class SocketConnection represents a websocket connection - */ -export declare class SocketConnection { - alias: string; - side: TSocketConnectionSide; - authenticated: boolean; - role: SocketRole; - smartsocketHost: Smartsocket; - socket: any; - constructor(optionsArg: ISocketConnectionConstructorOptions); - /** - * authenticate the socket - */ - authenticate(): Promise<{}>; - /** - * listen to function requests - */ - listenToFunctionRequests(): Promise<{}>; -} diff --git a/dist/smartsocket.classes.socketconnection.js b/dist/smartsocket.classes.socketconnection.js deleted file mode 100644 index 8f3ac6b..0000000 --- a/dist/smartsocket.classes.socketconnection.js +++ /dev/null @@ -1,100 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -const helpers = require("./smartsocket.helpers"); -const lik_1 = require("lik"); -const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest"); -// export classes -exports.allSocketConnections = new lik_1.Objectmap(); -/** - * class SocketConnection represents a websocket connection - */ -class SocketConnection { - constructor(optionsArg) { - this.authenticated = false; - this.alias = optionsArg.alias; - this.authenticated = optionsArg.authenticated; - this.role = optionsArg.role; - this.side = optionsArg.side; - this.smartsocketHost = optionsArg.smartsocketHost; - this.socket = optionsArg.socket; - // standard behaviour that is always true - exports.allSocketConnections.add(this); - this.socket.on('disconnect', () => { - plugins.beautylog.info(`SocketConnection with >alias ${this.alias} on >side ${this.side} disconnected`); - this.socket.disconnect(); - exports.allSocketConnections.remove(this); - }); - } - // authenticating -------------------------- - /** - * authenticate the socket - */ - authenticate() { - let done = plugins.smartq.defer(); - this.socket.on('dataAuth', (dataArg) => { - plugins.beautylog.log('received authentication data. now hashing and comparing...'); - this.socket.removeListener('dataAuth', () => { }); - if (helpers.checkPasswordForRole(dataArg, this.smartsocketHost)) { - // TODO: authenticate password - this.alias = dataArg.alias; - this.authenticated = true; - this.role = helpers.getSocketRoleByName(dataArg.role, this.smartsocketHost); - 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.smartq.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsaURBQWlEO0FBQ2pELGlEQUFpRDtBQUVqRCw2QkFBZ0M7QUFLaEMsMkZBSTZDO0FBa0M3QyxpQkFBaUI7QUFDTixRQUFBLG9CQUFvQixHQUFHLElBQUksZUFBUyxFQUFvQixDQUFDO0FBRXBFOztHQUVHO0FBQ0g7SUFPRSxZQUFZLFVBQStDO1FBSjNELGtCQUFhLEdBQVksS0FBSyxDQUFDO1FBSzdCLElBQUksQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQztRQUM5QixJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDOUMsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsZUFBZSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUM7UUFDbEQsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBRWhDLHlDQUF5QztRQUN6Qyw0QkFBb0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxFQUFFLEdBQUcsRUFBRTtZQUNoQyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FDcEIsZ0NBQWdDLElBQUksQ0FBQyxLQUFLLGFBQWEsSUFBSSxDQUFDLElBQUksZUFBZSxDQUNoRixDQUFDO1lBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUN6Qiw0QkFBb0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFD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 \ No newline at end of file diff --git a/dist/smartsocket.classes.socketfunction.d.ts b/dist/smartsocket.classes.socketfunction.d.ts deleted file mode 100644 index 4373e5a..0000000 --- a/dist/smartsocket.classes.socketfunction.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -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; -} -export declare let allSocketFunctions: plugins.lik.Objectmap; -/** - * 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); - /** - * invokes the function of this SocketFunction - */ - invoke(dataArg: ISocketFunctionCall): Promise; - /** - * notifies a role about access to this SocketFunction - */ - private _notifyRole(socketRoleArg); -} diff --git a/dist/smartsocket.classes.socketfunction.js b/dist/smartsocket.classes.socketfunction.js deleted file mode 100644 index 5721808..0000000 --- a/dist/smartsocket.classes.socketfunction.js +++ /dev/null @@ -1,52 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -// import classes -const lik_1 = require("lik"); -// export objects -exports.allSocketFunctions = new lik_1.Objectmap(); -// export classes -/** - * 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 - } - /** - * invokes the function of this SocketFunction - */ - invoke(dataArg) { - let done = plugins.smartq.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; - } - /** - * notifies a role about access to this SocketFunction - */ - _notifyRole(socketRoleArg) { - socketRoleArg.addSocketFunction(this); - } -} -exports.SocketFunction = SocketFunction; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRmdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc29ja2V0ZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFFakQsaUJBQWlCO0FBQ2pCLDZCQUFnQztBQTZCaEMsaUJBQWlCO0FBQ04sUUFBQSxrQkFBa0IsR0FBRyxJQUFJLGVBQVMsRUFBa0IsQ0FBQztBQUVoRSxpQkFBaUI7QUFFakI7O0dBRUc7QUFDSDtJQUtFOztPQUVHO0lBQ0gsWUFBWSxVQUE2QztRQUN2RCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDaEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUNyQyxHQUFHLENBQUMsQ0FBQyxJQUFJLGFBQWEsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2xDLENBQUM7UUFDRCwwQkFBa0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyw4QkFBOEI7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTSxDQUFDLE9BQTRCO1FBQ2pDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUNuQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxVQUFlLEVBQUUsRUFBRTtnQkFDekQsSUFBSSxnQkFBZ0IsR0FBd0I7b0JBQzFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSTtvQkFDbkIsV0FBVyxFQUFFLFVBQVU7aUJBQ3hCLENBQUM7Z0JBQ0YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ2pDLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQywrREFBK0QsQ0FBQyxDQUFDO1FBQ25GLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN0QixDQUFDO0lBRUQ7O09BRUc7SUFDSyxXQUFXLENBQUMsYUFBeUI7UUFDM0MsYUFBYSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDRjtBQTNDRCx3Q0EyQ0MifQ== \ No newline at end of file diff --git a/dist/smartsocket.classes.socketrequest.d.ts b/dist/smartsocket.classes.socketrequest.d.ts deleted file mode 100644 index 26d1be2..0000000 --- a/dist/smartsocket.classes.socketrequest.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { ISocketFunctionCall } from './smartsocket.classes.socketfunction'; -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: plugins.lik.Objectmap; -export declare class SocketRequest { - status: TSocketRequestStatus; - side: TSocketRequestSide; - shortid: string; - originSocketConnection: SocketConnection; - funcCallData: ISocketFunctionCall; - done: plugins.smartq.Deferred<{}>; - constructor(optionsArg: SocketRequestConstructorOptions); - /** - * dispatches a socketrequest from the requesting to the receiving side - */ - dispatch(): Promise<{}>; - /** - * handles the response that is received by the requesting side - */ - handleResponse(responseDataArg: ISocketRequestDataObject): void; - /** - * creates the response on the responding side - */ - createResponse(): void; -} diff --git a/dist/smartsocket.classes.socketrequest.js b/dist/smartsocket.classes.socketrequest.js deleted file mode 100644 index 410e437..0000000 --- a/dist/smartsocket.classes.socketrequest.js +++ /dev/null @@ -1,59 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -const helpers = require("./smartsocket.helpers"); -// import classes -const lik_1 = require("lik"); -// export objects -exports.allSocketRequests = new lik_1.Objectmap(); -// export classes -class SocketRequest { - constructor(optionsArg) { - this.status = 'new'; - this.done = plugins.smartq.defer(); - this.side = optionsArg.side; - this.shortid = optionsArg.shortId; - this.funcCallData = optionsArg.funcCallData; - this.originSocketConnection = optionsArg.originSocketConnection; - exports.allSocketRequests.add(this); - } - // requesting -------------------------- - /** - * dispatches a socketrequest from the requesting to the receiving side - */ - 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsaURBQWlEO0FBQ2pELGlEQUFpRDtBQUtqRCxpQkFBaUI7QUFDakIsNkJBQWdDO0FBMkJoQyxpQkFBaUI7QUFDTixRQUFBLGlCQUFpQixHQUFHLElBQUksZUFBUyxFQUFpQixDQUFDO0FBRTlELGlCQUFpQjtBQUNqQjtJQU9FLFlBQVksVUFBMkM7UUFOdkQsV0FBTSxHQUF5QixLQUFLLENBQUM7UUFLckMsU0FBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFNUIsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxJQUFJLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxZQUFZLENBQUM7UUFDNUMsSUFBSSxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxzQkFBc0IsQ0FBQztRQUNoRSx5QkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELHdDQUF3QztJQUV4Qzs7T0FFRztJQUNILFFBQVE7UUFDTixJQUFJLFdBQVcsR0FBNkI7WUFDMUMsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxjQUFjLENBQUMsZUFBeUM7UUFDdEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEQseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRCx3Q0FBd0M7SUFFeEM7O09BRUc7SUFDSCxjQUFjO1FBQ1osSUFBSSxvQkFBb0IsR0FBbUIsT0FBTyxDQUFDLHVCQUF1QixDQUN4RSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsQ0FBQztRQUNGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFlBQVksb0JBQW9CLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNoRSxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMvRCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO1lBQ3pFLElBQUksV0FBVyxHQUE2QjtnQkFDMUMsWUFBWSxFQUFFLFVBQVU7Z0JBQ3hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTzthQUN0QixDQUFDO1lBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsV0FBVyxDQUFDLENBQUM7WUFDekUseUJBQWlCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBMURELHNDQTBEQyJ9 \ No newline at end of file diff --git a/dist/smartsocket.classes.socketrole.d.ts b/dist/smartsocket.classes.socketrole.d.ts deleted file mode 100644 index d89ca6b..0000000 --- a/dist/smartsocket.classes.socketrole.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { SocketFunction } from './smartsocket.classes.socketfunction'; -/** - * 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: plugins.lik.Objectmap; - constructor(optionsArg: SocketRoleOptions); - addSocketFunction(socketFunctionArg: SocketFunction): void; -} diff --git a/dist/smartsocket.classes.socketrole.js b/dist/smartsocket.classes.socketrole.js deleted file mode 100644 index 044847f..0000000 --- a/dist/smartsocket.classes.socketrole.js +++ /dev/null @@ -1,19 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// import classes -const lik_1 = require("lik"); -/** - * 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; - } - addSocketFunction(socketFunctionArg) { - this.allowedFunctions.add(socketFunctionArg); - } -} -exports.SocketRole = SocketRole; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsaUJBQWlCO0FBQ2pCLDZCQUFnQztBQVdoQzs7R0FFRztBQUNIO0lBSUUsWUFBWSxVQUE2QjtRQUR6QyxxQkFBZ0IsR0FBRyxJQUFJLGVBQVMsRUFBa0IsQ0FBQztRQUVqRCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO0lBQzlDLENBQUM7SUFDRCxpQkFBaUIsQ0FBQyxpQkFBaUM7UUFDakQsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FDRjtBQVhELGdDQVdDIn0= \ No newline at end of file diff --git a/dist/smartsocket.classes.socketserver.d.ts b/dist/smartsocket.classes.socketserver.d.ts deleted file mode 100644 index 98c7eeb..0000000 --- a/dist/smartsocket.classes.socketserver.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Smartsocket } from './smartsocket.classes.smartsocket'; -/** - * class socketServer - * handles the attachment of socketIo to whatever server is in play - */ -export declare class SocketServer { - private smartsocket; - private httpServer; - private standaloneServer; - private expressServer; - constructor(smartSocketInstance: Smartsocket); - /** - * starts the server with another server - * also works with an express style server - */ - setExternalServer(serverType: 'express' | 'http', serverArg: any): Promise; - /** - * gets the server for socket.io - */ - getServerForSocketIo(): any; - /** - * starts listening to incoming sockets: - */ - start(): Promise; - /** - * closes the server - */ - stop(): Promise; -} diff --git a/dist/smartsocket.classes.socketserver.js b/dist/smartsocket.classes.socketserver.js deleted file mode 100644 index 547f9e3..0000000 --- a/dist/smartsocket.classes.socketserver.js +++ /dev/null @@ -1,86 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -// used in case no other server is supplied -const http = require("http"); -/** - * class socketServer - * handles the attachment of socketIo to whatever server is in play - */ -class SocketServer { - constructor(smartSocketInstance) { - // wether httpServer is standalone - this.standaloneServer = false; - this.smartsocket = smartSocketInstance; - } - /** - * starts the server with another server - * also works with an express style server - */ - setExternalServer(serverType, serverArg) { - return __awaiter(this, void 0, void 0, function* () { - if (serverType === 'http') { - this.httpServer = serverArg; - } - else if (serverType === 'express') { - this.expressServer = serverArg; - } - }); - } - /** - * gets the server for socket.io - */ - getServerForSocketIo() { - if (this.httpServer) { - return this.httpServer; - } - else if (this.expressServer) { - return this.expressServer; - } - else if (!this.httpServer && !this.expressServer) { - this.httpServer = new http.Server(); - this.standaloneServer = true; - return this.httpServer; - } - else { - throw new Error('no server specified!'); - } - } - /** - * starts listening to incoming sockets: - */ - start() { - return __awaiter(this, void 0, void 0, function* () { - const done = plugins.smartq.defer(); - // handle http servers - if (this.httpServer && this.standaloneServer) { - this.httpServer.listen(this.smartsocket.options.port, () => { - console.log(`Server started in standalone mode on ${this.smartsocket.options.port}`); - done.resolve(); - }); - } - else { - done.resolve(); - } - // nothing else to do if express server is set - yield done.promise; - return; - }); - } - /** - * closes the server - */ - stop() { - return __awaiter(this, void 0, void 0, function* () { }); - } -} -exports.SocketServer = SocketServer; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsaURBQWlEO0FBRWpELDJDQUEyQztBQUMzQyw2QkFBNkI7QUFHN0I7OztHQUdHO0FBQ0g7SUFPRSxZQUFZLG1CQUFnQztRQUo1QyxrQ0FBa0M7UUFDMUIscUJBQWdCLEdBQUcsS0FBSyxDQUFDO1FBSS9CLElBQUksQ0FBQyxXQUFXLEdBQUcsbUJBQW1CLENBQUM7SUFDekMsQ0FBQztJQUVEOzs7T0FHRztJQUNVLGlCQUFpQixDQUFDLFVBQThCLEVBQUUsU0FBYzs7WUFDM0UsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQzFCLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDO1lBQzlCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsVUFBVSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3BDLElBQUksQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDO1lBQ2pDLENBQUM7UUFDSCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNJLG9CQUFvQjtRQUN6QixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNwQixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQzlCLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO1FBQzVCLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7WUFDbkQsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO1lBQzdCLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ3pCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUMxQyxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ1UsS0FBSzs7WUFDaEIsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUVwQyxzQkFBc0I7WUFDdEIsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO2dCQUM3QyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFO29CQUN6RCxPQUFPLENBQUMsR0FBRyxDQUFDLHdDQUF3QyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO29CQUNyRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ2pCLENBQUMsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixDQUFDO1lBRUQsOENBQThDO1lBQzlDLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNuQixNQUFNLENBQUM7UUFDVCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNVLElBQUk7OERBQUksQ0FBQztLQUFBO0NBQ3ZCO0FBakVELG9DQWlFQyJ9 \ No newline at end of file diff --git a/dist/smartsocket.helpers.d.ts b/dist/smartsocket.helpers.d.ts deleted file mode 100644 index 8bdfe5c..0000000 --- a/dist/smartsocket.helpers.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SocketFunction } from './smartsocket.classes.socketfunction'; -import { ISocketConnectionAuthenticationObject } from './smartsocket.classes.socketconnection'; -import { SocketRequest, TSocketRequestSide } from './smartsocket.classes.socketrequest'; -import { SocketRole } from './smartsocket.classes.socketrole'; -export declare let checkPasswordForRole: (dataArg: ISocketConnectionAuthenticationObject, referenceSmartsocket: Smartsocket) => boolean; -export declare let getSocketFunctionByName: (functionNameArg: string) => SocketFunction; -/** - * get corresponding Socketrequest instance by shortId - */ -export declare let getSocketRequestById: (shortIdArg: string, requestSide?: TSocketRequestSide) => SocketRequest; -/** - * get corresponding SocketRole instance by name - */ -export declare let getSocketRoleByName: (socketRoleNameArg: string, referenceSmartsocket: Smartsocket) => SocketRole; diff --git a/dist/smartsocket.helpers.js b/dist/smartsocket.helpers.js deleted file mode 100644 index f5f8d16..0000000 --- a/dist/smartsocket.helpers.js +++ /dev/null @@ -1,36 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const plugins = require("./smartsocket.plugins"); -const smartsocket_classes_socketfunction_1 = require("./smartsocket.classes.socketfunction"); -const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest"); -// SocketConnection helpers -exports.checkPasswordForRole = (dataArg, referenceSmartsocket) => { - let targetPasswordHash = exports.getSocketRoleByName(dataArg.role, referenceSmartsocket).passwordHash; - let computedCompareHash = plugins.nodehash.sha256FromStringSync(dataArg.password); - return targetPasswordHash === computedCompareHash; -}; -// SocketFunction helpers -exports.getSocketFunctionByName = (functionNameArg) => { - return smartsocket_classes_socketfunction_1.allSocketFunctions.find(socketFunctionArg => { - return socketFunctionArg.name === functionNameArg; - }); -}; -// 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, referenceSmartsocket) => { - return referenceSmartsocket.socketRoles.find(socketRoleArg => { - return socketRoleArg.name === socketRoleNameArg; - }); -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFJakQsNkZBQTBGO0FBSzFGLDJGQUk2QztBQUc3QywyQkFBMkI7QUFDaEIsUUFBQSxvQkFBb0IsR0FBRyxDQUNoQyxPQUE4QyxFQUM5QyxvQkFBaUMsRUFDeEIsRUFBRTtJQUNYLElBQUksa0JBQWtCLEdBQUcsMkJBQW1CLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxvQkFBb0IsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUM5RixJQUFJLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xGLE1BQU0sQ0FBQyxrQkFBa0IsS0FBSyxtQkFBbUIsQ0FBQztBQUNwRCxDQUFDLENBQUM7QUFFRix5QkFBeUI7QUFDZCxRQUFBLHVCQUF1QixHQUFHLENBQUMsZUFBdUIsRUFBa0IsRUFBRTtJQUMvRSxNQUFNLENBQUMsdURBQWtCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUU7UUFDakQsTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQUksS0FBSyxlQUFlLENBQUM7SUFDcEQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRix3QkFBd0I7QUFFeEI7O0dBRUc7QUFDUSxRQUFBLG9CQUFvQixHQUFHLENBQ2hDLFVBQWtCLEVBQ2xCLFdBQWdDLEVBQ2pCLEVBQUU7SUFDakIsTUFBTSxDQUFDLHFEQUFpQixDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQy9DLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEtBQUssVUFBVSxDQUFDO0lBQ2pELENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYscUJBQXFCO0FBRXJCOztHQUVHO0FBQ1EsUUFBQSxtQkFBbUIsR0FBRyxDQUMvQixpQkFBeUIsRUFDekIsb0JBQWlDLEVBQ3JCLEVBQUU7SUFDZCxNQUFNLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRTtRQUMzRCxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksS0FBSyxpQkFBaUIsQ0FBQztJQUNsRCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/dist/smartsocket.plugins.d.ts b/dist/smartsocket.plugins.d.ts deleted file mode 100644 index c381d46..0000000 --- a/dist/smartsocket.plugins.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export import beautylog = require('beautylog'); -export import lik = require('lik'); -export import nodehash = require('nodehash'); -export import smartdelay = require('smartdelay'); -export import smartq = require('smartq'); -export import shortid = require('shortid'); -export import socketIo = require('socket.io'); -export import socketIoClient = require('socket.io-client'); diff --git a/dist/smartsocket.plugins.js b/dist/smartsocket.plugins.js deleted file mode 100644 index a4f199b..0000000 --- a/dist/smartsocket.plugins.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.beautylog = require("beautylog"); -exports.lik = require("lik"); -exports.nodehash = require("nodehash"); -exports.smartdelay = require("smartdelay"); -exports.smartq = require("smartq"); -exports.shortid = require("shortid"); -exports.socketIo = require("socket.io"); -exports.socketIoClient = require("socket.io-client"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBK0M7QUFDL0MsNkJBQW1DO0FBQ25DLHVDQUE2QztBQUM3QywyQ0FBaUQ7QUFDakQsbUNBQXlDO0FBQ3pDLHFDQUEyQztBQUMzQyx3Q0FBOEM7QUFDOUMscURBQTJEIn0= \ No newline at end of file diff --git a/package.json b/package.json index af82449..f93b26b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "typings": "dist/index.d.ts", "scripts": { "test": "tstest test/", - "build": "echo \"Not needed for now\"" + "build": "tsbuild" }, "repository": { "type": "git",