StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle errors sent back over the sockt

Browse source
This commit is contained in:
Dane Everitt 2019-09-28 13:09:47 -07:00
parent b78276d23d
commit 326d346f92
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/scripts/components/server/Console.tsx
View file

@ -45,6 +45,10 @@ export default () => {
line.replace(/(?:\r\n|\r|\n)$/im, '') + '\u001b[0m',
);
const handleDaemonErrorOutput = (line: string) => terminal.writeln(
'\u001b[1m\u001b[41m[Internal] ' + line.replace(/(?:\r\n|\r|\n)$/im, '') + '\u001b[0m',
);
const handleCommandKeydown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key !== 'Enter' || (e.key === 'Enter' && e.currentTarget.value.length < 1)) {
return;
@ -69,11 +73,13 @@ export default () => {
terminal.clear();
instance.addListener('console output', handleConsoleOutput);
instance.addListener('daemon error', handleDaemonErrorOutput);
instance.send('send logs');
}
return () => {
instance && instance.removeListener('console output', handleConsoleOutput);
instance && instance.removeListener('console output', handleConsoleOutput)
.removeListener('daemon error', handleDaemonErrorOutput);
};
}, [ connected, instance ]);

25
resources/scripts/components/server/WebsocketHandler.tsx
View file

@ -5,10 +5,16 @@ import getWebsocketToken from '@/api/server/getWebsocketToken';
export default () => {
const server = ServerContext.useStoreState(state => state.server.data);
const { instance, connected } = ServerContext.useStoreState(state => state.socket);
const { instance } = ServerContext.useStoreState(state => state.socket);
const setServerStatus = ServerContext.useStoreActions(actions => actions.status.setServerStatus);
const { setInstance, setConnectionState } = ServerContext.useStoreActions(actions => actions.socket);
const updateToken = (uuid: string, socket: Websocket) => {
getWebsocketToken(uuid)
.then(data => socket.setToken(data.token))
.catch(error => console.error(error));
};
useEffect(() => {
// If there is already an instance or there is no server, just exit out of this process
// since we don't need to make a new connection.
@ -23,6 +29,13 @@ export default () => {
socket.on('SOCKET_ERROR', () => setConnectionState(false));
socket.on('status', (status) => setServerStatus(status));
socket.on('daemon error', message => {
console.warn('Got error message from daemon socket:', message);
});
socket.on('token expiring', () => updateToken(server.uuid, socket));
socket.on('token expired', () => updateToken(server.uuid, socket));
getWebsocketToken(server.uuid)
.then(data => {
socket.setToken(data.token).connect(data.socket);
@ -36,15 +49,5 @@ export default () => {
};
}, [ server ]);
// Prevent issues with HMR in development environments. This might need to also
// exist outside of dev? Will need to see how things go.
if (process.env.NODE_ENV === 'development') {
useEffect(() => {
if (!connected && instance && instance.getToken() && instance.getSocketUrl()) {
instance.connect(instance.getSocketUrl()!);
}
}, [ connected ]);
}
return null;
};