mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-13 03:59:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: disconnection reason being too long

Browse Source
This commit is contained in:
Alexis Tyler
2021-02-16 23:06:55 +10:30
parent 54dae0026d
commit f28a931b60
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/mothership/custom-socket.ts
View File

@@ -93,9 +93,7 @@ export class CustomSocket {
customSocket.connectionAttempts = 0;
} catch (error: unknown) {
if (isNodeError(error, AppError)) {
this.close(Number(error.code?.length === 4 ? error.code : `4${error.code ?? 500}`), JSON.stringify({
message: error.message ?? 'Internal Server Error'
}));
this.close(Number(error.code?.length === 4 ? error.code : `4${error.code ?? 500}`), 'INTERNAL_SERVER_ERROR');
}
}
};
@@ -140,7 +138,7 @@ export class CustomSocket {
try {
if (this.connection && (this.connection.readyState !== this.connection.CLOSED)) {
// 4200 === ok
this.connection.close(4200);
this.connection.close(4200, 'OK');
}
} catch (error: unknown) {
this.logger.error('Failed disconnecting reason=%s', (error as Error).message);
@@ -255,9 +253,7 @@ export class CustomSocket {
protected async cleanup() {
// Kill existing socket connection
if (this.connection?.heartbeat) {
this.connection.close(4200, JSON.stringify({
message: 'Reconnecting'
}));
this.connection.close(4408, 'REQUEST_TIMEOUT');
}
}

4
app/mothership/sockets/internal-graphql.ts
View File

@@ -72,9 +72,7 @@ export class InternalGraphql extends CustomSocket {
return async function (this: WebSocketWithHeartBeat) {
// No API key, close internal connection
if (!apiKey) {
this.close(4200, JSON.stringify({
message: 'No API key'
}));
this.close(4403, 'FORBIDDEN');
}
// Authenticate with ourselves

7
app/mothership/sockets/mothership.ts
View File

@@ -6,7 +6,6 @@ import { subscribeToServers } from '../subscribe-to-servers';
import { AppError } from '../../core/errors';
import { readFileIfExists } from '../utils';
import { CustomSocket, WebSocketWithHeartBeat } from '../custom-socket';
import { sockets } from '../../sockets';
export class MothershipSocket extends CustomSocket {
private mothershipServersEndpoint?: {
@@ -36,9 +35,7 @@ export class MothershipSocket extends CustomSocket {
} catch (error: unknown) {
if (isNodeError(error, AppError)) {
const code = (error.code) ?? 500;
this.close(`${code}`.length === 4 ? Number(code) : Number(`4${code}`), JSON.stringify({
message: error.message ?? 'Internal Server Error'
}));
this.close(`${code}`.length === 4 ? Number(code) : Number(`4${code}`), 'INTERNAL_SERVER_ERROR');
}
}
};
@@ -111,7 +108,7 @@ export class MothershipSocket extends CustomSocket {
logger.error('socket error', error);
} finally {
// Kick the connection
this.close(4500, JSON.stringify({ message: error.message }));
this.close(4408, 'REQUEST_TIMEOUT');
}
};
}