fix(core): update

This commit is contained in:
Philipp Kunz 2019-11-07 00:26:47 +01:00
parent 20e7584eb9
commit bcc4ce9a87
6 changed files with 79 additions and 18 deletions

View File

@ -0,0 +1,3 @@
export interface IRequestAuthPayload {
serverShortId: string;
}

1
ts/interfaces/index.ts Normal file
View File

@ -0,0 +1 @@
export * from './connection';

View File

@ -19,7 +19,7 @@ export class Smartsocket {
/** /**
* a unique id to detect server restarts * a unique id to detect server restarts
*/ */
public id = plugins.smartunique.shortId(); public shortId = plugins.smartunique.shortId();
public options: ISmartsocketConstructorOptions; public options: ISmartsocketConstructorOptions;
public io: SocketIO.Server; public io: SocketIO.Server;
public socketConnections = new Objectmap<SocketConnection>(); public socketConnections = new Objectmap<SocketConnection>();

View File

@ -1,9 +1,11 @@
import * as plugins from './smartsocket.plugins'; import * as plugins from './smartsocket.plugins';
import * as interfaces from './interfaces';
import { SocketConnection } from './smartsocket.classes.socketconnection'; import { SocketConnection } from './smartsocket.classes.socketconnection';
import { ISocketFunctionCallDataRequest, SocketFunction } from './smartsocket.classes.socketfunction'; import { ISocketFunctionCallDataRequest, SocketFunction } from './smartsocket.classes.socketfunction';
import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest'; import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
import { SocketRole } from './smartsocket.classes.socketrole'; import { SocketRole } from './smartsocket.classes.socketrole';
import { defaultLogger } from '@pushrocks/smartlog';
/** /**
* interface for class SmartsocketClient * interface for class SmartsocketClient
@ -14,16 +16,24 @@ export interface ISmartsocketClientOptions {
alias: string; // an alias makes it easier to identify this client in a multo client environment alias: string; // an alias makes it easier to identify this client in a multo client environment
role: string; role: string;
password: string; // by setting a password access to functions can be limited password: string; // by setting a password access to functions can be limited
autoReconnect?: boolean;
} }
export class SmartsocketClient { export class SmartsocketClient {
// a unique id
public shortId = plugins.smartunique.shortId();
// the shortId of the remote we connect to
public remoteShortId: string = null;
public alias: string; public alias: string;
public socketRole: SocketRole; public socketRole: SocketRole;
public socketConnection: SocketConnection; public socketConnection: SocketConnection;
public serverUrl: string; public serverUrl: string;
public serverPort: number; public serverPort: number;
public autoReconnect: boolean;
// public eventSubject = new plugins.smart public eventSubject = new plugins.smartrx.rxjs.Subject();
public socketFunctions = new plugins.lik.Objectmap<SocketFunction<any>>(); public socketFunctions = new plugins.lik.Objectmap<SocketFunction<any>>();
public socketRequests = new plugins.lik.Objectmap<SocketRequest<any>>(); public socketRequests = new plugins.lik.Objectmap<SocketRequest<any>>();
@ -37,6 +47,7 @@ export class SmartsocketClient {
name: optionsArg.role, name: optionsArg.role,
passwordHash: optionsArg.password passwordHash: optionsArg.password
}); });
this.autoReconnect = optionsArg.autoReconnect;
} }
public addSocketFunction(socketFunction: SocketFunction<any>) { public addSocketFunction(socketFunction: SocketFunction<any>) {
@ -62,27 +73,53 @@ export class SmartsocketClient {
reconnectionAttempts: 5, reconnectionAttempts: 5,
}) })
}); });
this.socketConnection.socket.on('requestAuth', () => {
plugins.smartlog.defaultLogger.log('info', 'server requested authentication'); const timer = new plugins.smarttime.Timer(5000);
this.socketConnection.socket.emit('dataAuth', { timer.start();
role: this.socketRole.name, timer.completed.then(() => {
password: this.socketRole.passwordHash, defaultLogger.log('warn', 'connection to server timed out.');
alias: this.alias this.disconnect();
}); });
// authentication flow
this.socketConnection.socket.on('requestAuth', (requestAuthPayload: interfaces.IRequestAuthPayload) => {
timer.reset();
plugins.smartlog.defaultLogger.log('info', 'server requested authentication');
// lets register the authenticated event
this.socketConnection.socket.on('authenticated', () => { this.socketConnection.socket.on('authenticated', () => {
this.remoteShortId = requestAuthPayload.serverShortId;
plugins.smartlog.defaultLogger.log('info', 'client is authenticated'); plugins.smartlog.defaultLogger.log('info', 'client is authenticated');
this.socketConnection.authenticated = true; this.socketConnection.authenticated = true;
this.socketConnection.listenToFunctionRequests(); this.socketConnection.listenToFunctionRequests();
done.resolve(); done.resolve();
}); });
// handle errors // lets register the forbidden event
this.socketConnection.socket.on('forbidden', async () => {
defaultLogger.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 disconnection and errors
this.socketConnection.socket.on('disconnect', async () => {
await this.disconnect();
});
this.socketConnection.socket.on('reconnect_failed', async () => { this.socketConnection.socket.on('reconnect_failed', async () => {
this.disconnect(); await this.disconnect();
}); });
this.socketConnection.socket.on('connect_error', async () => { this.socketConnection.socket.on('connect_error', async () => {
this.disconnect(); await this.disconnect();
});
}); });
return done.promise; return done.promise;
} }
@ -92,10 +129,16 @@ export class SmartsocketClient {
*/ */
public async disconnect() { public async disconnect() {
if (this.socketConnection) { if (this.socketConnection) {
this.socketConnection.socket.disconnect(true); this.socketConnection.disconnect();
this.socketConnection = undefined; this.socketConnection = undefined;
plugins.smartlog.defaultLogger.log('ok', 'disconnected!'); plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
} }
defaultLogger.log('warn', `disconnected from server ${this.remoteShortId}`);
this.remoteShortId = null;
if (this.autoReconnect) {
this.tryDebouncedReconnect();
}
} }
/** /**

View File

@ -1,4 +1,5 @@
import * as plugins from './smartsocket.plugins'; import * as plugins from './smartsocket.plugins';
import * as interfaces from './interfaces';
import { Objectmap } from '@pushrocks/lik'; import { Objectmap } from '@pushrocks/lik';
@ -53,6 +54,9 @@ export class SocketConnection {
public role: SocketRole; public role: SocketRole;
public smartsocketRef: Smartsocket | SmartsocketClient; public smartsocketRef: Smartsocket | SmartsocketClient;
public socket: SocketIO.Socket | SocketIOClient.Socket; public socket: SocketIO.Socket | SocketIOClient.Socket;
public eventSubject = new plugins.smartrx.rxjs.Subject();
constructor(optionsArg: ISocketConnectionConstructorOptions) { constructor(optionsArg: ISocketConnectionConstructorOptions) {
this.alias = optionsArg.alias; this.alias = optionsArg.alias;
this.authenticated = optionsArg.authenticated; this.authenticated = optionsArg.authenticated;
@ -80,7 +84,7 @@ export class SocketConnection {
*/ */
public authenticate() { public authenticate() {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
this.socket.on('dataAuth', (dataArg: ISocketConnectionAuthenticationObject) => { this.socket.on('dataAuth', async (dataArg: ISocketConnectionAuthenticationObject) => {
plugins.smartlog.defaultLogger.log( plugins.smartlog.defaultLogger.log(
'info', 'info',
'received authentication data. now hashing and comparing...' 'received authentication data. now hashing and comparing...'
@ -99,11 +103,14 @@ export class SocketConnection {
done.resolve(this); done.resolve(this);
} else { } else {
this.authenticated = false; this.authenticated = false;
this.socket.disconnect(); await this.disconnect();
done.reject('not authenticated'); done.reject('not authenticated');
} }
}); });
this.socket.emit('requestAuth'); const requestAuthPayload: interfaces.IRequestAuthPayload = {
serverShortId: this.smartsocketRef.shortId
};
this.socket.emit('requestAuth', requestAuthPayload);
return done.promise; return done.promise;
} }
@ -163,5 +170,8 @@ export class SocketConnection {
return done.promise; return done.promise;
} }
// sending ---------------------- // disconnecting ----------------------
public async disconnect() {
this.socket.disconnect(true);
}
} }

View File

@ -10,7 +10,9 @@ import * as smarthash from '@pushrocks/smarthash';
import * as smartdelay from '@pushrocks/smartdelay'; import * as smartdelay from '@pushrocks/smartdelay';
import * as smartexpress from '@pushrocks/smartexpress'; import * as smartexpress from '@pushrocks/smartexpress';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
import * as smarttime from '@pushrocks/smarttime';
import * as smartunique from '@pushrocks/smartunique'; import * as smartunique from '@pushrocks/smartunique';
import * as smartrx from '@pushrocks/smartrx';
export { export {
@ -20,7 +22,9 @@ export {
smartdelay, smartdelay,
smartexpress, smartexpress,
smartpromise, smartpromise,
smarttime,
smartunique, smartunique,
smartrx
}; };
// third party scope // third party scope