fix(core): update
This commit is contained in:
parent
608669ec44
commit
7c98e19988
@ -117,15 +117,16 @@ tap.test('should be able to make a functionCall from server to client', async ()
|
|||||||
expect(response.hi).to.equal('hi there from server');
|
expect(response.hi).to.equal('hi there from server');
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('client should disconnect and reconnect', async (tools) => {
|
tap.test('client should disconnect and reconnect', async (toolsArg) => {
|
||||||
await testSmartsocketClient.disconnect();
|
await testSmartsocketClient.disconnect();
|
||||||
await testSmartsocketClient.connect();
|
await testSmartsocketClient.connect();
|
||||||
|
await toolsArg.delayFor(2000);
|
||||||
|
expect(testSmartsocket.socketConnections.getArray().length).to.equal(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
// class smartsocket
|
// class smartsocket
|
||||||
tap.test('should be able to switch to a new server', async (toolsArg) => {
|
tap.test('should be able to switch to a new server', async (toolsArg) => {
|
||||||
await testSmartsocket.stop();
|
await testSmartsocket.stop();
|
||||||
await toolsArg.delayFor(5000);
|
|
||||||
testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
|
testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
|
||||||
await testSmartsocket.start();
|
await testSmartsocket.start();
|
||||||
await toolsArg.delayFor(30000);
|
await toolsArg.delayFor(30000);
|
||||||
|
@ -47,7 +47,7 @@ export class Smartsocket {
|
|||||||
*/
|
*/
|
||||||
public async start() {
|
public async start() {
|
||||||
const socketIoModule = this.smartenv.getSafeNodeModule('socket.io');
|
const socketIoModule = this.smartenv.getSafeNodeModule('socket.io');
|
||||||
this.io = socketIoModule(this.socketServer.getServerForSocketIo());
|
this.io = socketIoModule(await this.socketServer.getServerForSocketIo());
|
||||||
await this.socketServer.start();
|
await this.socketServer.start();
|
||||||
this.io.on('connection', (socketArg) => {
|
this.io.on('connection', (socketArg) => {
|
||||||
this._handleSocketConnection(socketArg);
|
this._handleSocketConnection(socketArg);
|
||||||
|
@ -105,24 +105,25 @@ export class SmartsocketClient {
|
|||||||
authenticated: false,
|
authenticated: false,
|
||||||
side: 'client',
|
side: 'client',
|
||||||
smartsocketHost: this,
|
smartsocketHost: this,
|
||||||
socket: await socketIoClient.connect(socketUrl, {
|
socket: await socketIoClient
|
||||||
|
.connect(socketUrl, {
|
||||||
multiplex: false,
|
multiplex: false,
|
||||||
reconnectionAttempts: 5,
|
autoConnect: false,
|
||||||
|
reconnectionAttempts: 0,
|
||||||
rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
|
rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
|
||||||
}),
|
})
|
||||||
|
.open(),
|
||||||
});
|
});
|
||||||
|
|
||||||
const timer = new plugins.smarttime.Timer(5000);
|
const timer = new plugins.smarttime.Timer(5000);
|
||||||
timer.start();
|
timer.start();
|
||||||
timer.completed.then(() => {
|
timer.completed.then(() => {
|
||||||
logger.log('warn', 'connection to server timed out.');
|
logger.log('warn', 'connection to server timed out.');
|
||||||
this.disconnect();
|
this.disconnect(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
// authentication flow
|
// authentication flow
|
||||||
this.socketConnection.socket.on(
|
this.socketConnection.socket.on('requestAuth', (dataArg: interfaces.IRequestAuthPayload) => {
|
||||||
'requestAuth',
|
|
||||||
(dataArg: interfaces.IRequestAuthPayload) => {
|
|
||||||
timer.reset();
|
timer.reset();
|
||||||
logger.log('info', `server ${dataArg.serverAlias} requested authentication`);
|
logger.log('info', `server ${dataArg.serverAlias} requested authentication`);
|
||||||
|
|
||||||
@ -150,6 +151,7 @@ export class SmartsocketClient {
|
|||||||
for (const tag of Object.keys(oldTagStore)) {
|
for (const tag of Object.keys(oldTagStore)) {
|
||||||
await this.addTag(oldTagStore[tag]);
|
await this.addTag(oldTagStore[tag]);
|
||||||
}
|
}
|
||||||
|
this.updateStatus('connected');
|
||||||
done.resolve();
|
done.resolve();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -163,24 +165,21 @@ export class SmartsocketClient {
|
|||||||
this.socketConnection.socket.emit('dataAuth', {
|
this.socketConnection.socket.emit('dataAuth', {
|
||||||
alias: this.alias,
|
alias: this.alias,
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
// handle connection
|
// handle connection
|
||||||
this.socketConnection.socket.on('connect', async () => {
|
this.socketConnection.socket.on('connect', async () => {});
|
||||||
this.updateStatus('connected');
|
|
||||||
});
|
|
||||||
|
|
||||||
// handle disconnection and errors
|
// handle disconnection and errors
|
||||||
this.socketConnection.socket.on('disconnect', async () => {
|
this.socketConnection.socket.on('disconnect', async () => {
|
||||||
await this.disconnect();
|
await this.disconnect(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.socketConnection.socket.on('reconnect_failed', async () => {
|
this.socketConnection.socket.on('reconnect_failed', async () => {
|
||||||
await this.disconnect();
|
await this.disconnect(true);
|
||||||
});
|
});
|
||||||
this.socketConnection.socket.on('connect_error', async () => {
|
this.socketConnection.socket.on('connect_error', async () => {
|
||||||
await this.disconnect();
|
await this.disconnect(true);
|
||||||
});
|
});
|
||||||
return done.promise;
|
return done.promise;
|
||||||
}
|
}
|
||||||
@ -188,19 +187,25 @@ export class SmartsocketClient {
|
|||||||
/**
|
/**
|
||||||
* disconnect from the server
|
* disconnect from the server
|
||||||
*/
|
*/
|
||||||
public async disconnect() {
|
public async disconnect(useAutoconnectSetting = false) {
|
||||||
|
if (this.eventStatus === 'disconnecting') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.updateStatus('disconnecting');
|
||||||
this.tagStoreSubscription?.unsubscribe();
|
this.tagStoreSubscription?.unsubscribe();
|
||||||
if (this.socketConnection) {
|
if (this.socketConnection) {
|
||||||
await this.socketConnection.disconnect();
|
await this.socketConnection.disconnect();
|
||||||
this.socketConnection = undefined;
|
this.socketConnection = undefined;
|
||||||
logger.log('ok', 'disconnected!');
|
logger.log('ok', 'disconnected socket!');
|
||||||
}
|
}
|
||||||
logger.log('warn', `disconnected from server ${this.remoteShortId}`);
|
logger.log('warn', `disconnected from server ${this.remoteShortId}`);
|
||||||
this.remoteShortId = null;
|
this.remoteShortId = null;
|
||||||
this.updateStatus('disconnected');
|
|
||||||
|
|
||||||
if (this.autoReconnect) {
|
if (this.autoReconnect && useAutoconnectSetting && this.eventStatus !== 'connecting') {
|
||||||
|
this.updateStatus('connecting');
|
||||||
this.tryDebouncedReconnect();
|
this.tryDebouncedReconnect();
|
||||||
|
} else if (this.eventStatus === 'connected') {
|
||||||
|
this.updateStatus('disconnected');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -216,6 +221,7 @@ export class SmartsocketClient {
|
|||||||
* try a reconnection
|
* try a reconnection
|
||||||
*/
|
*/
|
||||||
public async tryDebouncedReconnect() {
|
public async tryDebouncedReconnect() {
|
||||||
|
console.log('debounced reconnect!');
|
||||||
await plugins.smartdelay.delayForRandom(10000, 20000);
|
await plugins.smartdelay.delayForRandom(10000, 20000);
|
||||||
await this.connect();
|
await this.connect();
|
||||||
}
|
}
|
||||||
|
@ -197,7 +197,7 @@ export class SocketConnection {
|
|||||||
this.remoteTagStoreObservable.next(tagStoreArg);
|
this.remoteTagStoreObservable.next(tagStoreArg);
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log('info', `now listening to function requests for ${this.alias}`);
|
logger.log('info', `now listening to function requests for ${this.alias} on side ${this.side}`);
|
||||||
done.resolve(this);
|
done.resolve(this);
|
||||||
} else {
|
} else {
|
||||||
const errMessage = 'socket needs to be authenticated first';
|
const errMessage = 'socket needs to be authenticated first';
|
||||||
|
@ -11,6 +11,7 @@ import { logger } from './smartsocket.logging';
|
|||||||
*/
|
*/
|
||||||
export class SocketServer {
|
export class SocketServer {
|
||||||
private smartsocket: Smartsocket;
|
private smartsocket: Smartsocket;
|
||||||
|
private httpServerDeferred: plugins.smartpromise.Deferred<any>;
|
||||||
private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server;
|
private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -30,14 +31,19 @@ export class SocketServer {
|
|||||||
serverType: 'smartexpress',
|
serverType: 'smartexpress',
|
||||||
serverArg: pluginsTyped.smartexpress.Server
|
serverArg: pluginsTyped.smartexpress.Server
|
||||||
) {
|
) {
|
||||||
|
this.httpServerDeferred = plugins.smartpromise.defer();
|
||||||
await serverArg.startedPromise;
|
await serverArg.startedPromise;
|
||||||
this.httpServer = serverArg.httpServer;
|
this.httpServer = serverArg.httpServer;
|
||||||
|
this.httpServerDeferred.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the server for socket.io
|
* gets the server for socket.io
|
||||||
*/
|
*/
|
||||||
public getServerForSocketIo() {
|
public async getServerForSocketIo() {
|
||||||
|
if (this.httpServerDeferred) {
|
||||||
|
await this.httpServerDeferred.promise;
|
||||||
|
}
|
||||||
if (this.httpServer) {
|
if (this.httpServer) {
|
||||||
return this.httpServer;
|
return this.httpServer;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user