Skip to content

Fix WebSocket message parsing for multiple JSON objects in single frame #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sacenox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix WebSocket message parsing for multiple JSON objects in single frame #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 47 additions & 36 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,43 +171,54 @@ export class SpaceMoltClient {
// Message handling

private handleMessage(data: string): void {
try {
const msg = JSON.parse(data) as Message;
this.log('Received:', msg.type, msg.payload);

switch (msg.type) {
case 'welcome':
this.handleWelcome(msg.payload as WelcomePayload);
break;
case 'registered':
this.handleRegistered(msg.payload as RegisteredPayload);
break;
case 'logged_in':
this.handleLoggedIn(msg.payload as LoggedInPayload);
break;
case 'error':
this.handleError(msg.payload as ErrorPayload);
break;
case 'ok':
this.emit('ok', msg.payload);
break;
case 'state_update':
this.handleStateUpdate(msg.payload as StateUpdatePayload);
break;
case 'scan_result':
this.emit('scan_result', msg.payload as ScanResultPayload);
break;
case 'chat_message':
this.emit('chat_message', msg.payload as ChatMessage);
break;
case 'version_info':
this.emit('version_info', msg.payload);
break;
default:
this.emit(msg.type, msg.payload);
// Handle multiple JSON messages in a single WebSocket frame
// Server can send messages like: {"type":"registered",...} {"type":"logged_in",...}
const messages = data.trim().split(/}\s*{/).map((part, index, arr) => {
if (index === 0 && arr.length > 1) return part + '}';
if (index === arr.length - 1 && arr.length > 1) return '{' + part;
if (arr.length > 1) return '{' + part + '}';
return part;
});

for (const msgStr of messages) {
try {
const msg = JSON.parse(msgStr) as Message;
this.log('Received:', msg.type, msg.payload);

switch (msg.type) {
case 'welcome':
this.handleWelcome(msg.payload as WelcomePayload);
break;
case 'registered':
this.handleRegistered(msg.payload as RegisteredPayload);
break;
case 'logged_in':
this.handleLoggedIn(msg.payload as LoggedInPayload);
break;
case 'error':
this.handleError(msg.payload as ErrorPayload);
break;
case 'ok':
this.emit('ok', msg.payload);
break;
case 'state_update':
this.handleStateUpdate(msg.payload as StateUpdatePayload);
break;
case 'scan_result':
this.emit('scan_result', msg.payload as ScanResultPayload);
break;
case 'chat_message':
this.emit('chat_message', msg.payload as ChatMessage);
break;
case 'version_info':
this.emit('version_info', msg.payload);
break;
default:
this.emit(msg.type, msg.payload);
}
} catch (error) {
this.log('Error parsing message:', error);
}
} catch (error) {
this.log('Error parsing message:', error);
}
}

Expand Down