tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ws exceptions on socket close event

Browse Source
This commit is contained in:
Calvo 2023-05-04 14:34:50 +02:00
parent c74ed4914b
commit fb7a94ddd4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/setup/setup_websocket_engine.php
View File

@ -181,6 +181,7 @@ $handle_test_js = "var handleTest = function (event) {
changeTestMessage(errorMessage); changeTestMessage(errorMessage);
hideLoadingImage(); hideLoadingImage();
showMessage(); showMessage();
ws.close();
}; };
ws.onopen = () => { ws.onopen = () => {
@ -188,6 +189,7 @@ $handle_test_js = "var handleTest = function (event) {
showSuccessImage(); showSuccessImage();
hideLoadingImage(); hideLoadingImage();
hideMessage(); hideMessage();
ws.close();
}; };
ws.onclose = (event) => { ws.onclose = (event) => {

4
pandora_console/include/lib/Websockets/WSManager.php
View File

@ -301,7 +301,7 @@ class WSManager extends WebSocketServer
\db_pandora_audit( \db_pandora_audit(
AUDIT_LOG_WEB_SOCKETS, AUDIT_LOG_WEB_SOCKETS,
'WebSocket connection started', 'WebSocket connection started',
$user->account->idUser 'N/A'
); );
$this->stderr('ONLINE '.$user->address.'('.$user->account->idUser.')'); $this->stderr('ONLINE '.$user->address.'('.$user->account->idUser.')');
@ -424,7 +424,7 @@ class WSManager extends WebSocketServer
\db_pandora_audit( \db_pandora_audit(
AUDIT_LOG_WEB_SOCKETS, AUDIT_LOG_WEB_SOCKETS,
'WebSocket connection finished', 'WebSocket connection finished',
$user->account->idUser 'N/A'
); );
$this->stderr('OFFLINE '.$user->address.'('.$user->account->idUser.')'); $this->stderr('OFFLINE '.$user->address.'('.$user->account->idUser.')');

3
pandora_console/include/lib/Websockets/WebSocketServer.php
View File

@ -521,7 +521,7 @@ abstract class WebSocketServer
} else if ($numBytes == 0) { } else if ($numBytes == 0) {
$this->disconnect($socket); $this->disconnect($socket);
$this->stderr( $this->stderr(
'Client disconnected. TCP connection lost: '.$socket 'Client disconnected. TCP connection lost.'
); );
} else { } else {
$user = $this->getUserBySocket($socket); $user = $this->getUserBySocket($socket);
@ -581,6 +581,7 @@ abstract class WebSocketServer
$sockErrNo=null $sockErrNo=null
) { ) {
$user = $this->getUserBySocket($socket); $user = $this->getUserBySocket($socket);
if ($user !== null) { if ($user !== null) {
if (array_key_exists($user->id, $this->users)) { if (array_key_exists($user->id, $this->users)) {
unset($this->users[$user->id]); unset($this->users[$user->id]);