push.rocks/smartsocket
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2019-11-08 18:41:08 +01:00
parent c390881a4e
commit a23e7349be
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/interfaces/connection.ts
View File

@ -2,4 +2,4 @@ export interface IRequestAuthPayload {
serverShortId: string; serverShortId: string;
} }
export type TConnectionEvent = 'terminated' | 'error'; export type TConnectionStatus = 'new' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected';

13
ts/smartsocket.classes.smartsocketclient.ts
View File

@ -33,7 +33,9 @@ export class SmartsocketClient {
public serverPort: number; public serverPort: number;
public autoReconnect: boolean; public autoReconnect: boolean;
public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionEvent>(); // status handling
public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
public eventStatus: interfaces.TConnectionStatus = 'new';
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>>();
@ -135,7 +137,7 @@ export class SmartsocketClient {
} }
defaultLogger.log('warn', `disconnected from server ${this.remoteShortId}`); defaultLogger.log('warn', `disconnected from server ${this.remoteShortId}`);
this.remoteShortId = null; this.remoteShortId = null;
this.eventSubject.next('terminated'); this.updateStatus('disconnected');
if (this.autoReconnect) { if (this.autoReconnect) {
this.tryDebouncedReconnect(); this.tryDebouncedReconnect();
@ -170,4 +172,11 @@ export class SmartsocketClient {
const result = response.funcDataArg; const result = response.funcDataArg;
return result; return result;
} }
private updateStatus (statusArg: interfaces.TConnectionStatus) {
if (this.eventStatus !== statusArg) {
this.eventSubject.next(statusArg);
}
this.eventStatus = statusArg;
}
} }

12
ts/smartsocket.classes.socketconnection.ts
View File

@ -55,7 +55,8 @@ export class SocketConnection {
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<interfaces.TConnectionEvent>(); public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
public eventStatus: interfaces.TConnectionStatus = 'new';
constructor(optionsArg: ISocketConnectionConstructorOptions) { constructor(optionsArg: ISocketConnectionConstructorOptions) {
this.alias = optionsArg.alias; this.alias = optionsArg.alias;
@ -173,6 +174,13 @@ export class SocketConnection {
// disconnecting ---------------------- // disconnecting ----------------------
public async disconnect() { public async disconnect() {
this.socket.disconnect(true); this.socket.disconnect(true);
this.eventSubject.next('terminated'); this.updateStatus('disconnected');
}
private updateStatus (statusArg: interfaces.TConnectionStatus) {
if (this.eventStatus !== statusArg) {
this.eventSubject.next(statusArg);
}
this.eventStatus = statusArg;
} }
} }