From 82fa029d05b1689d37743d9cd76e341cac03c79c Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 29 Sep 2020 08:35:26 +0000 Subject: [PATCH] fix(core): update --- dist_ts/index.d.ts | 5 - dist_ts/index.js | 20 --- dist_ts/interfaces/connection.d.ts | 4 - dist_ts/interfaces/connection.js | 3 - dist_ts/interfaces/index.d.ts | 1 - dist_ts/interfaces/index.js | 14 -- dist_ts/smartsocket.classes.smartsocket.d.ts | 45 ----- dist_ts/smartsocket.classes.smartsocket.js | 119 ------------- ...smartsocket.classes.smartsocketclient.d.ts | 53 ------ .../smartsocket.classes.smartsocketclient.js | 168 ------------------ .../smartsocket.classes.socketconnection.d.ts | 55 ------ .../smartsocket.classes.socketconnection.js | 140 --------------- .../smartsocket.classes.socketfunction.d.ts | 52 ------ dist_ts/smartsocket.classes.socketfunction.js | 49 ----- .../smartsocket.classes.socketrequest.d.ts | 47 ----- dist_ts/smartsocket.classes.socketrequest.js | 90 ---------- dist_ts/smartsocket.classes.socketrole.d.ts | 28 --- dist_ts/smartsocket.classes.socketrole.js | 54 ------ dist_ts/smartsocket.classes.socketserver.d.ts | 33 ---- dist_ts/smartsocket.classes.socketserver.js | 88 --------- dist_ts/smartsocket.logging.d.ts | 2 - dist_ts/smartsocket.logging.js | 25 --- dist_ts/smartsocket.plugins.d.ts | 15 -- dist_ts/smartsocket.plugins.js | 53 ------ package.json | 4 +- 25 files changed, 2 insertions(+), 1165 deletions(-) delete mode 100644 dist_ts/index.d.ts delete mode 100644 dist_ts/index.js delete mode 100644 dist_ts/interfaces/connection.d.ts delete mode 100644 dist_ts/interfaces/connection.js delete mode 100644 dist_ts/interfaces/index.d.ts delete mode 100644 dist_ts/interfaces/index.js delete mode 100644 dist_ts/smartsocket.classes.smartsocket.d.ts delete mode 100644 dist_ts/smartsocket.classes.smartsocket.js delete mode 100644 dist_ts/smartsocket.classes.smartsocketclient.d.ts delete mode 100644 dist_ts/smartsocket.classes.smartsocketclient.js delete mode 100644 dist_ts/smartsocket.classes.socketconnection.d.ts delete mode 100644 dist_ts/smartsocket.classes.socketconnection.js delete mode 100644 dist_ts/smartsocket.classes.socketfunction.d.ts delete mode 100644 dist_ts/smartsocket.classes.socketfunction.js delete mode 100644 dist_ts/smartsocket.classes.socketrequest.d.ts delete mode 100644 dist_ts/smartsocket.classes.socketrequest.js delete mode 100644 dist_ts/smartsocket.classes.socketrole.d.ts delete mode 100644 dist_ts/smartsocket.classes.socketrole.js delete mode 100644 dist_ts/smartsocket.classes.socketserver.d.ts delete mode 100644 dist_ts/smartsocket.classes.socketserver.js delete mode 100644 dist_ts/smartsocket.logging.d.ts delete mode 100644 dist_ts/smartsocket.logging.js delete mode 100644 dist_ts/smartsocket.plugins.d.ts delete mode 100644 dist_ts/smartsocket.plugins.js diff --git a/dist_ts/index.d.ts b/dist_ts/index.d.ts deleted file mode 100644 index bc829f9..0000000 --- a/dist_ts/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_ts/index.js b/dist_ts/index.js deleted file mode 100644 index de27cfd..0000000 --- a/dist_ts/index.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -// export main classes -__exportStar(require("./smartsocket.classes.smartsocket"), exports); -__exportStar(require("./smartsocket.classes.smartsocketclient"), exports); -// export further classes and objects -__exportStar(require("./smartsocket.classes.socketfunction"), exports); -__exportStar(require("./smartsocket.classes.socketrole"), exports); -__exportStar(require("./smartsocket.classes.socketconnection"), exports); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQkFBc0I7QUFDdEIsb0VBQWtEO0FBQ2xELDBFQUF3RDtBQUV4RCxxQ0FBcUM7QUFDckMsdUVBQXFEO0FBQ3JELG1FQUFpRDtBQUNqRCx5RUFBdUQifQ== \ No newline at end of file diff --git a/dist_ts/interfaces/connection.d.ts b/dist_ts/interfaces/connection.d.ts deleted file mode 100644 index c0dfef5..0000000 --- a/dist_ts/interfaces/connection.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IRequestAuthPayload { - serverShortId: string; -} -export declare type TConnectionStatus = 'new' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected'; diff --git a/dist_ts/interfaces/connection.js b/dist_ts/interfaces/connection.js deleted file mode 100644 index 6033f4d..0000000 --- a/dist_ts/interfaces/connection.js +++ /dev/null @@ -1,3 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2ludGVyZmFjZXMvY29ubmVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0= \ No newline at end of file diff --git a/dist_ts/interfaces/index.d.ts b/dist_ts/interfaces/index.d.ts deleted file mode 100644 index 0fb3261..0000000 --- a/dist_ts/interfaces/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './connection'; diff --git a/dist_ts/interfaces/index.js b/dist_ts/interfaces/index.js deleted file mode 100644 index 44e96ec..0000000 --- a/dist_ts/interfaces/index.js +++ /dev/null @@ -1,14 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("./connection"), exports); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbnRlcmZhY2VzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLCtDQUE2QiJ9 \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.smartsocket.d.ts b/dist_ts/smartsocket.classes.smartsocket.d.ts deleted file mode 100644 index 5459fa6..0000000 --- a/dist_ts/smartsocket.classes.smartsocket.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { SocketConnection } from './smartsocket.classes.socketconnection'; -import { SocketFunction } from './smartsocket.classes.socketfunction'; -import { SocketRequest } from './smartsocket.classes.socketrequest'; -import { SocketRole } from './smartsocket.classes.socketrole'; -import * as SocketIO from 'socket.io'; -export interface ISmartsocketConstructorOptions { - port?: number; -} -export declare class Smartsocket { - /** - * a unique id to detect server restarts - */ - shortId: string; - options: ISmartsocketConstructorOptions; - io: SocketIO.Server; - socketConnections: plugins.lik.ObjectMap; - socketRoles: plugins.lik.ObjectMap; - socketFunctions: plugins.lik.ObjectMap>; - socketRequests: plugins.lik.ObjectMap>; - private socketServer; - constructor(optionsArg: ISmartsocketConstructorOptions); - setExternalServer(serverType: 'smartexpress', serverArg: any): Promise; - /** - * starts smartsocket - */ - start(): Promise; - /** - * stops smartsocket - */ - stop(): Promise; - /** - * allows call to specific client. - */ - clientCall(functionNameArg: T['method'], dataArg: T['request'], targetSocketConnectionArg: SocketConnection): Promise; - /** - * adds socketRoles - */ - addSocketRoles(socketRolesArray: SocketRole[]): void; - addSocketFunction(socketFunction: SocketFunction): void; - /** - * the standard handler for new socket connections - */ - private _handleSocketConnection; -} diff --git a/dist_ts/smartsocket.classes.smartsocket.js b/dist_ts/smartsocket.classes.smartsocket.js deleted file mode 100644 index 70e6bef..0000000 --- a/dist_ts/smartsocket.classes.smartsocket.js +++ /dev/null @@ -1,119 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Smartsocket = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -// classes -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"); -const smartsocket_logging_1 = require("./smartsocket.logging"); -class Smartsocket { - constructor(optionsArg) { - /** - * a unique id to detect server restarts - */ - this.shortId = plugins.smartunique.shortId(); - this.socketConnections = new plugins.lik.ObjectMap(); - this.socketRoles = new plugins.lik.ObjectMap(); - this.socketFunctions = new plugins.lik.ObjectMap(); - this.socketRequests = new plugins.lik.ObjectMap(); - this.socketServer = new smartsocket_classes_socketserver_1.SocketServer(this); - this.options = optionsArg; - } - // tslint:disable-next-line:member-ordering - async setExternalServer(serverType, serverArg) { - await this.socketServer.setExternalServer(serverType, serverArg); - } - /** - * starts smartsocket - */ - async start() { - this.io = plugins.socketIo(this.socketServer.getServerForSocketIo()); - await this.socketServer.start(); - this.io.on('connection', socketArg => { - this._handleSocketConnection(socketArg); - }); - } - /** - * stops smartsocket - */ - async stop() { - await plugins.smartdelay.delayFor(1000); - this.socketConnections.forEach((socketObjectArg) => { - smartsocket_logging_1.logger.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. - */ - async clientCall(functionNameArg, dataArg, targetSocketConnectionArg) { - const socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest(this, { - funcCallData: { - funcDataArg: dataArg, - funcName: functionNameArg - }, - originSocketConnection: targetSocketConnectionArg, - shortId: plugins.smartunique.shortId(), - side: 'requesting' - }); - const response = await socketRequest.dispatch(); - const result = response.funcDataArg; - return result; - } - /** - * adds socketRoles - */ - addSocketRoles(socketRolesArray) { - for (const socketRole of socketRolesArray) { - this.socketRoles.add(socketRole); - } - return; - } - addSocketFunction(socketFunction) { - this.socketFunctions.add(socketFunction); - } - /** - * the standard handler for new socket connections - */ - async _handleSocketConnection(socketArg) { - const socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({ - alias: undefined, - authenticated: false, - role: undefined, - side: 'server', - smartsocketHost: this, - socket: socketArg - }); - smartsocket_logging_1.logger.log('info', 'Socket connected. Trying to authenticate...'); - this.socketConnections.add(socketConnection); - await socketConnection.authenticate(); - await socketConnection.listenToFunctionRequests(); - } -} -exports.Smartsocket = Smartsocket; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtEQUFpRDtBQUVqRCxVQUFVO0FBQ1YsaUdBQTBFO0FBRTFFLDJGQUFvRTtBQUVwRSx5RkFBa0U7QUFJbEUsK0RBQStDO0FBTS9DLE1BQWEsV0FBVztJQWN0QixZQUFZLFVBQTBDO1FBYnREOztXQUVHO1FBQ0ksWUFBTyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLENBQUM7UUFHeEMsc0JBQWlCLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBb0IsQ0FBQztRQUNsRSxnQkFBVyxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQWMsQ0FBQztRQUN0RCxvQkFBZSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQXVCLENBQUM7UUFDbkUsbUJBQWMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFzQixDQUFDO1FBRWhFLGlCQUFZLEdBQUcsSUFBSSwrQ0FBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRzVDLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDO0lBQzVCLENBQUM7SUFFRCwyQ0FBMkM7SUFDcEMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLFVBQTBCLEVBQUUsU0FBYztRQUN2RSxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLENBQUMsVUFBVSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLElBQUksQ0FBQyxFQUFFLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFD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 \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.smartsocketclient.d.ts b/dist_ts/smartsocket.classes.smartsocketclient.d.ts deleted file mode 100644 index ce1cf39..0000000 --- a/dist_ts/smartsocket.classes.smartsocketclient.d.ts +++ /dev/null @@ -1,53 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import * as interfaces from './interfaces'; -import { SocketConnection } from './smartsocket.classes.socketconnection'; -import { SocketFunction } from './smartsocket.classes.socketfunction'; -import { SocketRequest } from './smartsocket.classes.socketrequest'; -import { SocketRole } from './smartsocket.classes.socketrole'; -/** - * interface for class SmartsocketClient - */ -export interface ISmartsocketClientOptions { - port: number; - url: string; - alias: string; - role: string; - password: string; - autoReconnect?: boolean; -} -export declare class SmartsocketClient { - shortId: string; - remoteShortId: string; - alias: string; - socketRole: SocketRole; - socketConnection: SocketConnection; - serverUrl: string; - serverPort: number; - autoReconnect: boolean; - eventSubject: plugins.smartrx.rxjs.Subject; - eventStatus: interfaces.TConnectionStatus; - socketFunctions: plugins.lik.ObjectMap>; - socketRequests: plugins.lik.ObjectMap>; - socketRoles: plugins.lik.ObjectMap; - constructor(optionsArg: ISmartsocketClientOptions); - addSocketFunction(socketFunction: SocketFunction): void; - /** - * connect the client to the server - */ - connect(): Promise; - /** - * disconnect from the server - */ - disconnect(): Promise; - /** - * try a reconnection - */ - tryDebouncedReconnect(): Promise; - /** - * dispatches a server call - * @param functionNameArg - * @param dataArg - */ - serverCall(functionNameArg: T['method'], dataArg: T['request']): Promise; - private updateStatus; -} diff --git a/dist_ts/smartsocket.classes.smartsocketclient.js b/dist_ts/smartsocket.classes.smartsocketclient.js deleted file mode 100644 index d0fa80f..0000000 --- a/dist_ts/smartsocket.classes.smartsocketclient.js +++ /dev/null @@ -1,168 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SmartsocketClient = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -const smartsocket_classes_socketconnection_1 = require("./smartsocket.classes.socketconnection"); -const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest"); -const smartsocket_classes_socketrole_1 = require("./smartsocket.classes.socketrole"); -const smartsocket_logging_1 = require("./smartsocket.logging"); -class SmartsocketClient { - constructor(optionsArg) { - // a unique id - this.shortId = plugins.smartunique.shortId(); - // the shortId of the remote we connect to - this.remoteShortId = null; - // status handling - this.eventSubject = new plugins.smartrx.rxjs.Subject(); - this.eventStatus = 'new'; - this.socketFunctions = new plugins.lik.ObjectMap(); - this.socketRequests = new plugins.lik.ObjectMap(); - this.socketRoles = new plugins.lik.ObjectMap(); - this.alias = optionsArg.alias; - this.serverUrl = optionsArg.url; - this.serverPort = optionsArg.port; - this.socketRole = new smartsocket_classes_socketrole_1.SocketRole({ - name: optionsArg.role, - passwordHash: optionsArg.password - }); - this.autoReconnect = optionsArg.autoReconnect; - } - addSocketFunction(socketFunction) { - this.socketFunctions.add(socketFunction); - this.socketRole.allowedFunctions.add(socketFunction); - } - /** - * connect the client to the server - */ - connect() { - const done = plugins.smartpromise.defer(); - smartsocket_logging_1.logger.log('info', 'trying to connect...'); - const socketUrl = `${this.serverUrl}:${this.serverPort}`; - this.socketConnection = new smartsocket_classes_socketconnection_1.SocketConnection({ - alias: this.alias, - authenticated: false, - role: this.socketRole, - side: 'client', - smartsocketHost: this, - socket: plugins.socketIoClient(socketUrl, { - multiplex: false, - reconnectionAttempts: 5, - }) - }); - const timer = new plugins.smarttime.Timer(5000); - timer.start(); - timer.completed.then(() => { - smartsocket_logging_1.logger.log('warn', 'connection to server timed out.'); - this.disconnect(); - }); - // authentication flow - this.socketConnection.socket.on('requestAuth', (requestAuthPayload) => { - timer.reset(); - smartsocket_logging_1.logger.log('info', 'server requested authentication'); - // lets register the authenticated event - this.socketConnection.socket.on('authenticated', () => { - this.remoteShortId = requestAuthPayload.serverShortId; - smartsocket_logging_1.logger.log('info', 'client is authenticated'); - this.socketConnection.authenticated = true; - this.socketConnection.listenToFunctionRequests(); - done.resolve(); - }); - // lets register the forbidden event - this.socketConnection.socket.on('forbidden', async () => { - smartsocket_logging_1.logger.log('warn', `disconnecting due to being forbidden to use the ressource`); - await this.disconnect(); - }); - // lets provide the actual auth data - this.socketConnection.socket.emit('dataAuth', { - role: this.socketRole.name, - password: this.socketRole.passwordHash, - alias: this.alias - }); - }); - // handle connection - this.socketConnection.socket.on('connect', async () => { - this.updateStatus('connected'); - }); - // handle disconnection and errors - this.socketConnection.socket.on('disconnect', async () => { - await this.disconnect(); - }); - this.socketConnection.socket.on('reconnect_failed', async () => { - await this.disconnect(); - }); - this.socketConnection.socket.on('connect_error', async () => { - await this.disconnect(); - }); - return done.promise; - } - /** - * disconnect from the server - */ - async disconnect() { - if (this.socketConnection) { - await this.socketConnection.disconnect(); - this.socketConnection = undefined; - smartsocket_logging_1.logger.log('ok', 'disconnected!'); - } - smartsocket_logging_1.logger.log('warn', `disconnected from server ${this.remoteShortId}`); - this.remoteShortId = null; - this.updateStatus('disconnected'); - if (this.autoReconnect) { - this.tryDebouncedReconnect(); - } - } - /** - * try a reconnection - */ - async tryDebouncedReconnect() { - await plugins.smartdelay.delayForRandom(10000, 60000); - await this.connect(); - } - /** - * dispatches a server call - * @param functionNameArg - * @param dataArg - */ - async serverCall(functionNameArg, dataArg) { - const done = plugins.smartpromise.defer(); - const socketRequest = new smartsocket_classes_socketrequest_1.SocketRequest(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; - } - updateStatus(statusArg) { - if (this.eventStatus !== statusArg) { - this.eventSubject.next(statusArg); - } - this.eventStatus = statusArg; - } -} -exports.SmartsocketClient = SmartsocketClient; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXRjbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtEQUFpRDtBQUdqRCxpR0FBMEU7QUFFMUUsMkZBQThGO0FBQzlGLHFGQUE4RDtBQUM5RCwrREFBK0M7QUFjL0MsTUFBYSxpQkFBaUI7SUFzQjVCLFlBQVksVUFBcUM7UUFyQmpELGNBQWM7UUFDUCxZQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUUvQywwQ0FBMEM7UUFDbkMsa0JBQWEsR0FBVyxJQUFJLENBQUM7UUFTcEMsa0JBQWtCO1FBQ1gsaUJBQVksR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBZ0MsQ0FBQztRQUNoRixnQkFBVyxHQUFpQyxLQUFLLENBQUM7UUFFbEQsb0JBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUF1QixDQUFDO1FBQ25FLG1CQUFjLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBc0IsQ0FBQztRQUNqRSxnQkFBVyxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQWMsQ0FBQztRQUczRCxJQUFJLENBQUMsS0FBSyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDOUIsSUFBSSxDQUFDLFNBQVMsR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUNsQyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksMkNBQVUsQ0FBQztZQUMvQixJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUk7WUFDckIsWUFBWSxFQUFFLFVBQVUs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 \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.socketconnection.d.ts b/dist_ts/smartsocket.classes.socketconnection.d.ts deleted file mode 100644 index a04eb9e..0000000 --- a/dist_ts/smartsocket.classes.socketconnection.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -/// -import * as plugins from './smartsocket.plugins'; -import * as interfaces from './interfaces'; -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SocketRole } from './smartsocket.classes.socketrole'; -import * as SocketIO from 'socket.io'; -import { SmartsocketClient } from './smartsocket.classes.smartsocketclient'; -/** - * 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 | SmartsocketClient; - 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; - smartsocketRef: Smartsocket | SmartsocketClient; - socket: SocketIO.Socket | SocketIOClient.Socket; - eventSubject: plugins.smartrx.rxjs.Subject; - eventStatus: interfaces.TConnectionStatus; - constructor(optionsArg: ISocketConnectionConstructorOptions); - /** - * authenticate the socket - */ - authenticate(): Promise; - /** - * listen to function requests - */ - listenToFunctionRequests(): Promise; - disconnect(): Promise; - private updateStatus; -} diff --git a/dist_ts/smartsocket.classes.socketconnection.js b/dist_ts/smartsocket.classes.socketconnection.js deleted file mode 100644 index aadcce0..0000000 --- a/dist_ts/smartsocket.classes.socketconnection.js +++ /dev/null @@ -1,140 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SocketConnection = exports.allSocketConnections = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -const smartsocket_classes_socketrequest_1 = require("./smartsocket.classes.socketrequest"); -const smartsocket_classes_socketrole_1 = require("./smartsocket.classes.socketrole"); -const smartsocket_logging_1 = require("./smartsocket.logging"); -// export classes -exports.allSocketConnections = new plugins.lik.ObjectMap(); -/** - * class SocketConnection represents a websocket connection - */ -class SocketConnection { - constructor(optionsArg) { - this.authenticated = false; - this.eventSubject = new plugins.smartrx.rxjs.Subject(); - this.eventStatus = 'new'; - this.alias = optionsArg.alias; - this.authenticated = optionsArg.authenticated; - this.role = optionsArg.role; - this.side = optionsArg.side; - this.smartsocketRef = optionsArg.smartsocketHost; - this.socket = optionsArg.socket; - // standard behaviour that is always true - exports.allSocketConnections.add(this); - // handle connection - this.socket.on('connect', async () => { - this.updateStatus('connected'); - }); - this.socket.on('disconnect', async () => { - smartsocket_logging_1.logger.log('info', `SocketConnection with >alias ${this.alias} on >side ${this.side} disconnected`); - await this.disconnect(); - exports.allSocketConnections.remove(this); - }); - } - // authenticating -------------------------- - /** - * authenticate the socket - */ - authenticate() { - const done = plugins.smartpromise.defer(); - this.socket.on('dataAuth', async (dataArg) => { - smartsocket_logging_1.logger.log('info', 'received authentication data. now hashing and comparing...'); - this.socket.removeListener('dataAuth', () => { }); - if (smartsocket_classes_socketrole_1.SocketRole.checkPasswordForRole(dataArg, this.smartsocketRef)) { - // TODO: authenticate password - this.alias = dataArg.alias; - this.authenticated = true; - this.role = smartsocket_classes_socketrole_1.SocketRole.getSocketRoleByName(this.smartsocketRef, dataArg.role); - this.socket.emit('authenticated'); - smartsocket_logging_1.logger.log('ok', `socket with >>alias ${this.alias} >>role ${this.role} is authenticated!`); - done.resolve(this); - } - else { - this.authenticated = false; - await this.disconnect(); - done.reject('not authenticated'); - } - }); - const requestAuthPayload = { - serverShortId: this.smartsocketRef.shortId - }; - this.socket.emit('requestAuth', requestAuthPayload); - return done.promise; - } - // listening ------------------------------- - /** - * listen to function requests - */ - listenToFunctionRequests() { - const done = plugins.smartpromise.defer(); - if (this.authenticated) { - this.socket.on('function', (dataArg) => { - // check if requested function is available to the socket's scope - smartsocket_logging_1.logger.log('info', 'function request received'); - const referencedFunction = this.role.allowedFunctions.find(socketFunctionArg => { - return socketFunctionArg.name === dataArg.funcCallData.funcName; - }); - if (referencedFunction) { - smartsocket_logging_1.logger.log('ok', 'function in access scope'); - const localSocketRequest = new smartsocket_classes_socketrequest_1.SocketRequest(this.smartsocketRef, { - side: 'responding', - originSocketConnection: this, - shortId: dataArg.shortId, - funcCallData: dataArg.funcCallData - }); - localSocketRequest.createResponse(); // takes care of creating response and sending it back - } - else { - smartsocket_logging_1.logger.log('warn', 'function not existent or out of access scope'); - } - }); - this.socket.on('functionResponse', (dataArg) => { - smartsocket_logging_1.logger.log('info', `received response for request with id ${dataArg.shortId}`); - const targetSocketRequest = smartsocket_classes_socketrequest_1.SocketRequest.getSocketRequestById(this.smartsocketRef, dataArg.shortId); - targetSocketRequest.handleResponse(dataArg); - }); - smartsocket_logging_1.logger.log('info', `now listening to function requests for ${this.alias}`); - done.resolve(this); - } - else { - const errMessage = 'socket needs to be authenticated first'; - smartsocket_logging_1.logger.log('error', errMessage); - done.reject(errMessage); - } - return done.promise; - } - // disconnecting ---------------------- - async disconnect() { - this.socket.disconnect(true); - this.updateStatus('disconnected'); - } - updateStatus(statusArg) { - if (this.eventStatus !== statusArg) { - this.eventSubject.next(statusArg); - } - this.eventStatus = statusArg; - } -} -exports.SocketConnection = SocketConnection; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrREFBaUQ7QUFNakQsMkZBQThGO0FBQzlGLHFGQUE4RDtBQUs5RCwrREFBK0M7QUE4Qi9DLGlCQUFpQjtBQUNOLFFBQUEsb0JBQW9CLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBb0IsQ0FBQztBQUVoRjs7R0FFRztBQUNILE1BQWEsZ0JBQWdCO0lBVzNCLFlBQVksVUFBK0M7UUFScEQsa0JBQWEsR0FBWSxLQUFLLENBQUM7UUFLL0IsaUJBQVksR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBZ0MsQ0FBQztRQUNoRixnQkFBVyxHQUFpQyxLQUFLLENBQUM7UUFHdkQsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzlCLElBQUksQ0FBQyxhQUFhLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQztRQUM5QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxjQUFjLEdBQUcsVUFBVSxDQUFDLGVBQWUsQ0FBQztRQUNqRCxJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFFaEMseUNBQXlDO1FBQ3pDLDRCQUFvQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUUvQixvQkFBb0I7UUFDcEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLEtBQUssSUFBSSxFQUFFO1lBQ25DLElBQUksQ0FB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 \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.socketfunction.d.ts b/dist_ts/smartsocket.classes.socketfunction.d.ts deleted file mode 100644 index 7ecb4de..0000000 --- a/dist_ts/smartsocket.classes.socketfunction.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { SocketRole } from './smartsocket.classes.socketrole'; -import { SocketConnection } from './smartsocket.classes.socketconnection'; -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SmartsocketClient } from './smartsocket.classes.smartsocketclient'; -/** - * interface of the contructor options of class SocketFunction - */ -export interface ISocketFunctionConstructorOptions { - funcName: T['method']; - funcDef: TFuncDef; - allowedRoles: SocketRole[]; -} -/** - * interface of the Socket Function call, in other words the object that routes a call to a function - */ -export interface ISocketFunctionCallDataRequest { - funcName: T['method']; - funcDataArg: T['request']; -} -/** - * interface of the Socket Function call, in other words the object that routes a call to a function - */ -export interface ISocketFunctionCallDataResponse { - funcName: T['method']; - funcDataArg: T['response']; -} -/** - * interface for function definition of SocketFunction - */ -export declare type TFuncDef = (dataArg: T['request'], connectionArg: SocketConnection) => PromiseLike; -/** - * class that respresents a function that can be transparently called using a SocketConnection - */ -export declare class SocketFunction { - static getSocketFunctionByName(smartsocketRefArg: Smartsocket | SmartsocketClient, functionNameArg: string): SocketFunction; - name: string; - funcDef: TFuncDef; - roles: SocketRole[]; - /** - * the constructor for SocketFunction - */ - constructor(optionsArg: ISocketFunctionConstructorOptions); - /** - * invokes the function of this SocketFunction - */ - invoke(dataArg: ISocketFunctionCallDataRequest, socketConnectionArg: SocketConnection): Promise>; - /** - * notifies a role about access to this SocketFunction - */ - private _notifyRole; -} diff --git a/dist_ts/smartsocket.classes.socketfunction.js b/dist_ts/smartsocket.classes.socketfunction.js deleted file mode 100644 index b58ab19..0000000 --- a/dist_ts/smartsocket.classes.socketfunction.js +++ /dev/null @@ -1,49 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SocketFunction = void 0; -// 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 (const socketRoleArg of this.roles) { - this._notifyRole(socketRoleArg); - } - } - // STATIC - static getSocketFunctionByName(smartsocketRefArg, functionNameArg) { - return smartsocketRefArg.socketFunctions.find(socketFunctionArg => { - return socketFunctionArg.name === functionNameArg; - }); - } - /** - * invokes the function of this SocketFunction - */ - async invoke(dataArg, socketConnectionArg) { - if (dataArg.funcName === this.name) { - const funcResponseData = { - 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 - */ - _notifyRole(socketRoleArg) { - socketRoleArg.addSocketFunction(this); - } -} -exports.SocketFunction = SocketFunction; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRmdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc29ja2V0ZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0NBLGlCQUFpQjtBQUVqQjs7R0FFRztBQUNILE1BQWEsY0FBYztJQWdCekI7O09BRUc7SUFDSCxZQUFZLFVBQWdEO1FBQzFELElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUM7UUFDbEMsSUFBSSxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQ3JDLEtBQUssTUFBTSxhQUFhLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRTtZQUN0QyxJQUFJLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1NBQ2pDO0lBQ0gsQ0FBQztJQXpCRCxTQUFTO0lBQ0YsTUFBTSxDQUFDLHVCQUF1QixDQUNuQyxpQkFBa0QsRUFDbEQsZUFBdUI7UUFFdkIsT0FBTyxpQkFBaUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUU7WUFDaEUsT0FBTyxpQkFBaUIsQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQW1CRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBMEMsRUFBRSxtQkFBcUM7UUFDbkcsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDbEMsTUFBTSxnQkFBZ0IsR0FBdUM7Z0JBQzNELFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSTtnQkFDbkIsV0FBVyxFQUFFLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLG1CQUFtQixDQUFDO2FBQzFFLENBQUM7WUFDRixPQUFPLGdCQUFnQixDQUFDO1NBQ3pCO2FBQU07WUFDTCxNQUFNLElBQUksS0FBSyxDQUFDLCtEQUErRCxDQUFDLENBQUM7U0FDbEY7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSyxXQUFXLENBQUMsYUFBeUI7UUFDM0MsYUFBYSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDRjtBQWpERCx3Q0FpREMifQ== \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.socketrequest.d.ts b/dist_ts/smartsocket.classes.socketrequest.d.ts deleted file mode 100644 index 9f1f7b5..0000000 --- a/dist_ts/smartsocket.classes.socketrequest.d.ts +++ /dev/null @@ -1,47 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { ISocketFunctionCallDataRequest, ISocketFunctionCallDataResponse } from './smartsocket.classes.socketfunction'; -import { SocketConnection } from './smartsocket.classes.socketconnection'; -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SmartsocketClient } from './smartsocket.classes.smartsocketclient'; -export declare type TSocketRequestStatus = 'new' | 'pending' | 'finished'; -export declare type TSocketRequestSide = 'requesting' | 'responding'; -/** - * interface of constructor of class SocketRequest - */ -export interface ISocketRequestConstructorOptions { - side: TSocketRequestSide; - originSocketConnection: SocketConnection; - shortId: string; - funcCallData?: ISocketFunctionCallDataRequest; -} -/** - * request object that is sent initially and may or may not receive a response - */ -export interface ISocketRequestDataObject { - funcCallData: ISocketFunctionCallDataRequest | ISocketFunctionCallDataResponse; - shortId: string; - responseTimeout?: number; -} -export declare class SocketRequest { - static getSocketRequestById(smartsocketRef: Smartsocket | SmartsocketClient, shortIdArg: string): SocketRequest; - status: TSocketRequestStatus; - side: TSocketRequestSide; - shortid: string; - originSocketConnection: SocketConnection; - funcCallData: ISocketFunctionCallDataRequest; - done: plugins.smartpromise.Deferred>; - smartsocketRef: Smartsocket | SmartsocketClient; - constructor(smartsocketRefArg: Smartsocket | SmartsocketClient, optionsArg: ISocketRequestConstructorOptions); - /** - * 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): Promise; - /** - * creates the response on the responding side - */ - createResponse(): Promise; -} diff --git a/dist_ts/smartsocket.classes.socketrequest.js b/dist_ts/smartsocket.classes.socketrequest.js deleted file mode 100644 index f9032e8..0000000 --- a/dist_ts/smartsocket.classes.socketrequest.js +++ /dev/null @@ -1,90 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SocketRequest = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -// import interfaces -const smartsocket_classes_socketfunction_1 = require("./smartsocket.classes.socketfunction"); -const smartsocket_logging_1 = require("./smartsocket.logging"); -// export classes -class SocketRequest { - constructor(smartsocketRefArg, optionsArg) { - // INSTANCE - this.status = 'new'; - this.done = plugins.smartpromise.defer(); - this.smartsocketRef = smartsocketRefArg; - this.side = optionsArg.side; - this.shortid = optionsArg.shortId; - this.funcCallData = optionsArg.funcCallData; - this.originSocketConnection = optionsArg.originSocketConnection; - this.smartsocketRef.socketRequests.add(this); - } - // STATIC - static getSocketRequestById(smartsocketRef, shortIdArg) { - return smartsocketRef.socketRequests.find(socketRequestArg => { - return socketRequestArg.shortid === shortIdArg; - }); - } - // requesting -------------------------- - /** - * dispatches a socketrequest from the requesting to the receiving side - */ - dispatch() { - const 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 - */ - async handleResponse(responseDataArg) { - smartsocket_logging_1.logger.log('info', 'handling response!'); - this.done.resolve(responseDataArg.funcCallData); - this.smartsocketRef.socketRequests.remove(this); - } - // responding -------------------------- - /** - * creates the response on the responding side - */ - async createResponse() { - const targetSocketFunction = smartsocket_classes_socketfunction_1.SocketFunction.getSocketFunctionByName(this.smartsocketRef, this.funcCallData.funcName); - if (!targetSocketFunction) { - smartsocket_logging_1.logger.log('warn', `There is no SocketFunction defined for ${this.funcCallData.funcName}`); - smartsocket_logging_1.logger.log('warn', `So now response is being sent.`); - return; - } - smartsocket_logging_1.logger.log('info', `invoking ${targetSocketFunction.name}`); - targetSocketFunction.invoke(this.funcCallData, this.originSocketConnection).then(resultData => { - smartsocket_logging_1.logger.log('info', 'got resultData. Sending it to requesting party.'); - const responseData = { - funcCallData: resultData, - shortId: this.shortid - }; - this.originSocketConnection.socket.emit('functionResponse', responseData); - this.smartsocketRef.socketRequests.remove(this); - }); - } -} -exports.SocketRequest = SocketRequest; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrREFBaUQ7QUFFakQsb0JBQW9CO0FBQ3BCLDZGQUF1STtBQUl2SSwrREFBK0M7QUEyQi9DLGlCQUFpQjtBQUNqQixNQUFhLGFBQWE7SUFxQnhCLFlBQ0UsaUJBQWtELEVBQ2xELFVBQStDO1FBWmpELFdBQVc7UUFDSixXQUFNLEdBQXlCLEtBQUssQ0FBQztRQUtyQyxTQUFJLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQXNDLENBQUM7UUFRN0UsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQztRQUN4QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUM1QyxJQUFJLENBQUMsc0JBQXNCLEdBQUcsVUFBVSxDQUFDLHNCQUFzQixDQUFDO1FBQ2hFLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBOUJELFNBQVM7SUFDRixNQUFNLENBQUMsb0JBQW9CLENBQ2hDLGNBQStDLEVBQy9DLFVBQWtCO1FBRWxCLE9BQU8sY0FBYyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsRUFBRTtZQUMzRCxPQUFPLGdCQUFnQixDQUFDLE9BQU8sS0FBSyxVQUFVLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBd0JELHdDQUF3QztJQUV4Qzs7T0FFRztJQUNJLFFBQVE7UUFDYixNQUFNLFdBQVcsR0FBZ0M7WUFDL0MsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDM0IsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGNBQWMsQ0FBQyxlQUE0QztRQUN0RSw0QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCx3Q0FBd0M7SUFFeEM7O09BRUc7SUFDSSxLQUFLLENBQUMsY0FBYztRQUN6QixNQUFNLG9CQUFvQixHQUFzQixtREFBYyxDQUFDLHVCQUF1QixDQUNwRixJQUFJLENBQUMsY0FBYyxFQUNuQixJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsQ0FBQztRQUVGLElBQUksQ0FBQyxvQkFBb0IsRUFBRTtZQUN6Qiw0QkFBTSxDQUFDLEdBQUcsQ0FDUixNQUFNLEVBQ04sMENBQTBDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLENBQ3ZFLENBQUM7WUFDRiw0QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsZ0NBQWdDLENBQUMsQ0FBQztZQUNyRCxPQUFPO1NBQ1I7UUFDRCw0QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsWUFBWSxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzVELG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUM1Riw0QkFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsaURBQWlELENBQUMsQ0FBQztZQUN0RSxNQUFNLFlBQVksR0FBZ0M7Z0JBQ2hELFlBQVksRUFBRSxVQUFVO2dCQUN4QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDdEIsQ0FBQztZQUNGLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLFlBQVksQ0FBQyxDQUFDO1lBQzFFLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsRCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXRGRCxzQ0FzRkMifQ== \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.socketrole.d.ts b/dist_ts/smartsocket.classes.socketrole.d.ts deleted file mode 100644 index b8103cd..0000000 --- a/dist_ts/smartsocket.classes.socketrole.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -import { SocketFunction } from './smartsocket.classes.socketfunction'; -import { Smartsocket } from './smartsocket.classes.smartsocket'; -import { SmartsocketClient } from './smartsocket.classes.smartsocketclient'; -import { ISocketConnectionAuthenticationObject } from './smartsocket.classes.socketconnection'; -/** - * interface for class SocketRole - */ -export interface ISocketRoleOptions { - name: string; - passwordHash: string; -} -/** - * A socketrole defines access to certain routines. - */ -export declare class SocketRole { - static getSocketRoleByName(referenceSmartsocket: Smartsocket | SmartsocketClient, socketRoleNameArg: string): SocketRole; - static checkPasswordForRole(dataArg: ISocketConnectionAuthenticationObject, referenceSmartsocket: Smartsocket | SmartsocketClient): boolean; - name: string; - passwordHash: string; - allowedFunctions: plugins.lik.ObjectMap>; - constructor(optionsArg: ISocketRoleOptions); - /** - * adds the socketfunction to the socketrole - * @param socketFunctionArg - */ - addSocketFunction(socketFunctionArg: SocketFunction): void; -} diff --git a/dist_ts/smartsocket.classes.socketrole.js b/dist_ts/smartsocket.classes.socketrole.js deleted file mode 100644 index ed2dbf1..0000000 --- a/dist_ts/smartsocket.classes.socketrole.js +++ /dev/null @@ -1,54 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SocketRole = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -/** - * A socketrole defines access to certain routines. - */ -class SocketRole { - constructor(optionsArg) { - this.allowedFunctions = new plugins.lik.ObjectMap(); - this.name = optionsArg.name; - this.passwordHash = optionsArg.passwordHash; - } - // STATIC - static getSocketRoleByName(referenceSmartsocket, socketRoleNameArg) { - return referenceSmartsocket.socketRoles.find(socketRoleArg => { - return socketRoleArg.name === socketRoleNameArg; - }); - } - static checkPasswordForRole(dataArg, referenceSmartsocket) { - const targetPasswordHash = SocketRole.getSocketRoleByName(referenceSmartsocket, dataArg.role) - .passwordHash; - const computedCompareHash = plugins.smarthash.sha256FromStringSync(dataArg.password); - return targetPasswordHash === computedCompareHash; - } - /** - * adds the socketfunction to the socketrole - * @param socketFunctionArg - */ - addSocketFunction(socketFunctionArg) { - this.allowedFunctions.add(socketFunctionArg); - } -} -exports.SocketRole = SocketRole; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrREFBaUQ7QUFnQmpEOztHQUVHO0FBQ0gsTUFBYSxVQUFVO0lBeUJyQixZQUFZLFVBQThCO1FBRG5DLHFCQUFnQixHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQXVCLENBQUM7UUFFekUsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFlBQVksQ0FBQztJQUM5QyxDQUFDO0lBM0JELFNBQVM7SUFDRixNQUFNLENBQUMsbUJBQW1CLENBQy9CLG9CQUFxRCxFQUNyRCxpQkFBeUI7UUFFekIsT0FBTyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxFQUFFO1lBQzNELE9BQU8sYUFBYSxDQUFDLElBQUksS0FBSyxpQkFBaUIsQ0FBQztRQUNsRCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSxNQUFNLENBQUMsb0JBQW9CLENBQ2hDLE9BQThDLEVBQzlDLG9CQUFxRDtRQUVyRCxNQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxtQkFBbUIsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDO2FBQzFGLFlBQVksQ0FBQztRQUNoQixNQUFNLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3JGLE9BQU8sa0JBQWtCLEtBQUssbUJBQW1CLENBQUM7SUFDcEQsQ0FBQztJQVdEOzs7T0FHRztJQUNJLGlCQUFpQixDQUFDLGlCQUFzQztRQUM3RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDL0MsQ0FBQztDQUNGO0FBckNELGdDQXFDQyJ9 \ No newline at end of file diff --git a/dist_ts/smartsocket.classes.socketserver.d.ts b/dist_ts/smartsocket.classes.socketserver.d.ts deleted file mode 100644 index 66d4130..0000000 --- a/dist_ts/smartsocket.classes.socketserver.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -/// -import * as plugins from './smartsocket.plugins'; -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 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: 'smartexpress', serverArg: plugins.smartexpress.Server): Promise; - /** - * gets the server for socket.io - */ - getServerForSocketIo(): http.Server | https.Server; - /** - * starts listening to incoming sockets: - */ - start(): Promise; - /** - * closes the server - */ - stop(): Promise; -} diff --git a/dist_ts/smartsocket.classes.socketserver.js b/dist_ts/smartsocket.classes.socketserver.js deleted file mode 100644 index 4c284c8..0000000 --- a/dist_ts/smartsocket.classes.socketserver.js +++ /dev/null @@ -1,88 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.SocketServer = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -// used in case no other server is supplied -const http = __importStar(require("http")); -const smartsocket_logging_1 = require("./smartsocket.logging"); -/** - * 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 - */ - async setExternalServer(serverType, serverArg) { - await serverArg.startedPromise; - this.httpServer = serverArg.httpServer; - } - /** - * gets the server for socket.io - */ - getServerForSocketIo() { - if (this.httpServer) { - return this.httpServer; - } - else { - this.httpServer = new http.Server(); - this.standaloneServer = true; - return this.httpServer; - } - } - /** - * starts listening to incoming sockets: - */ - 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) { - smartsocket_logging_1.logger.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, () => { - smartsocket_logging_1.logger.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 - */ - async stop() { } -} -exports.SocketServer = SocketServer; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0RBQWlEO0FBRWpELDJDQUEyQztBQUMzQywyQ0FBNkI7QUFHN0IsK0RBQStDO0FBRS9DOzs7R0FHRztBQUNILE1BQWEsWUFBWTtJQU92QixZQUFZLG1CQUFnQztRQUo1QyxrQ0FBa0M7UUFDMUIscUJBQWdCLEdBQUcsS0FBSyxDQUFDO1FBSS9CLElBQUksQ0FBQyxXQUFXLEdBQUcsbUJBQW1CLENBQUM7SUFDekMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLEtBQUssQ0FBQyxpQkFBaUIsQ0FDNUIsVUFBMEIsRUFDMUIsU0FBc0M7UUFFdEMsTUFBTSxTQUFTLENBQUMsY0FBYyxDQUFDO1FBQy9CLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLFVBQVUsQ0FBQztJQUN6QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxvQkFBb0I7UUFDekIsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFO1lBQ25CLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztTQUN4QjthQUFNO1lBQ0wsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO1lBQzdCLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztTQUN4QjtJQUNILENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFMUMsc0JBQXNCO1FBQ3RCLGtGQUFrRjtRQUNsRixJQUFJLElBQUksQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFO1lBQzVDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7Z0JBQ2xDLDRCQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxrREFBa0QsQ0FBQyxDQUFDO2dCQUN4RSxNQUFNLElBQUksS0FBSyxDQUFDLGtEQUFrRCxDQUFDLENBQUM7YUFDckU7WUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFO2dCQUN6RCw0QkFBTSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsd0NBQXdDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQy9GLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixDQUFDLENBQUMsQ0FBQztTQUNKO2FBQU07WUFDTCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7U0FDaEI7UUFFRCw4Q0FBOEM7UUFDOUMsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ25CLE9BQU87SUFDVCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSSxLQUFJLENBQUM7Q0FDdkI7QUFsRUQsb0NBa0VDIn0= \ No newline at end of file diff --git a/dist_ts/smartsocket.logging.d.ts b/dist_ts/smartsocket.logging.d.ts deleted file mode 100644 index f495398..0000000 --- a/dist_ts/smartsocket.logging.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import * as plugins from './smartsocket.plugins'; -export declare const logger: plugins.smartlog.ConsoleLog; diff --git a/dist_ts/smartsocket.logging.js b/dist_ts/smartsocket.logging.js deleted file mode 100644 index f635619..0000000 --- a/dist_ts/smartsocket.logging.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.logger = void 0; -const plugins = __importStar(require("./smartsocket.plugins")); -exports.logger = new plugins.smartlog.ConsoleLog(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQubG9nZ2luZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmxvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtEQUFpRDtBQUVwQyxRQUFBLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ== \ No newline at end of file diff --git a/dist_ts/smartsocket.plugins.d.ts b/dist_ts/smartsocket.plugins.d.ts deleted file mode 100644 index 0fbd3da..0000000 --- a/dist_ts/smartsocket.plugins.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces'; -export { typedrequestInterfaces }; -import * as lik from '@pushrocks/lik'; -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 smarttime from '@pushrocks/smarttime'; -import * as smartunique from '@pushrocks/smartunique'; -import * as smartrx from '@pushrocks/smartrx'; -export { lik, smartlog, smarthash, smartdelay, smartexpress, smartpromise, smarttime, smartunique, smartrx }; -import socketIo from 'socket.io'; -import socketIoClient from 'socket.io-client'; -export { socketIo, socketIoClient }; diff --git a/dist_ts/smartsocket.plugins.js b/dist_ts/smartsocket.plugins.js deleted file mode 100644 index b3a9881..0000000 --- a/dist_ts/smartsocket.plugins.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.socketIoClient = exports.socketIo = exports.smartrx = exports.smartunique = exports.smarttime = exports.smartpromise = exports.smartexpress = exports.smartdelay = exports.smarthash = exports.smartlog = exports.lik = exports.typedrequestInterfaces = void 0; -// apiglobal scope -const typedrequestInterfaces = __importStar(require("@apiglobal/typedrequest-interfaces")); -exports.typedrequestInterfaces = typedrequestInterfaces; -// pushrocks scope -const lik = __importStar(require("@pushrocks/lik")); -exports.lik = lik; -const smartlog = __importStar(require("@pushrocks/smartlog")); -exports.smartlog = smartlog; -const smarthash = __importStar(require("@pushrocks/smarthash")); -exports.smarthash = smarthash; -const smartdelay = __importStar(require("@pushrocks/smartdelay")); -exports.smartdelay = smartdelay; -const smartexpress = __importStar(require("@pushrocks/smartexpress")); -exports.smartexpress = smartexpress; -const smartpromise = __importStar(require("@pushrocks/smartpromise")); -exports.smartpromise = smartpromise; -const smarttime = __importStar(require("@pushrocks/smarttime")); -exports.smarttime = smarttime; -const smartunique = __importStar(require("@pushrocks/smartunique")); -exports.smartunique = smartunique; -const smartrx = __importStar(require("@pushrocks/smartrx")); -exports.smartrx = smartrx; -// third party scope -const socket_io_1 = __importDefault(require("socket.io")); -exports.socketIo = socket_io_1.default; -const socket_io_client_1 = __importDefault(require("socket.io-client")); -exports.socketIoClient = socket_io_client_1.default; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGtCQUFrQjtBQUNsQiwyRkFBNkU7QUFFckUsd0RBQXNCO0FBRTlCLGtCQUFrQjtBQUNsQixvREFBc0M7QUFZcEMsa0JBQUc7QUFYTCw4REFBZ0Q7QUFZOUMsNEJBQVE7QUFYVixnRUFBa0Q7QUFZaEQsOEJBQVM7QUFYWCxrRUFBb0Q7QUFZbEQsZ0NBQVU7QUFYWixzRUFBd0Q7QUFZdEQsb0NBQVk7QUFYZCxzRUFBd0Q7QUFZdEQsb0NBQVk7QUFYZCxnRUFBa0Q7QUFZaEQsOEJBQVM7QUFYWCxvRUFBc0Q7QUFZcEQsa0NBQVc7QUFYYiw0REFBOEM7QUFZNUMsMEJBQU87QUFHVCxvQkFBb0I7QUFDcEIsMERBQWlDO0FBSS9CLG1CQUpLLG1CQUFRLENBSUw7QUFIVix3RUFBOEM7QUFJNUMseUJBSkssMEJBQWMsQ0FJTCJ9 \ No newline at end of file diff --git a/package.json b/package.json index 3ab478a..78fd184 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "typings": "dist_ts/index.d.ts", "scripts": { "test": "(tstest test/)", - "build": "(tsbuild --web)" + "build": "(tsbuild --web && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)" }, "repository": { "type": "git", @@ -58,4 +58,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file