OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

feat: support websocket connections from game client #2735

Merged
Sainan merged 19 commits from client-ws into main 2025-09-10 00:00:10 -07:00
Conversation 0 Commits 19 Files Changed 42 +27 -13
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88f343f39a - Show all commits

40
src/services/wsService.ts
View File

@ -86,6 +86,7 @@ interface IWsMsgToClient {
nonce_updated?: boolean; nonce_updated?: boolean;
update_inventory?: boolean; update_inventory?: boolean;
logged_out?: boolean; logged_out?: boolean;
have_game_ws?: boolean;
// to game // to game
sync_inventory?: boolean; sync_inventory?: boolean;
@ -137,7 +138,8 @@ const wsOnConnect = (ws: WebSocket, req: http.IncomingMessage): void => {
id: account.id, id: account.id,
DisplayName: account.DisplayName, DisplayName: account.DisplayName,
Nonce: account.Nonce Nonce: account.Nonce
} },
have_game_ws: haveGameWs(account.id)
} satisfies IWsMsgToClient) } satisfies IWsMsgToClient)
); );
} else { } else {
@ -160,6 +162,7 @@ const wsOnConnect = (ws: WebSocket, req: http.IncomingMessage): void => {
if (account) { if (account) {
(ws as IWsCustomData).accountId = account.id; (ws as IWsCustomData).accountId = account.id;
logger.debug(`got bootstrapper connection for ${account.id}`); logger.debug(`got bootstrapper connection for ${account.id}`);
sendWsBroadcastToWebui({ have_game_ws: true }, account.id);
} }
} }
} }
@ -184,11 +187,15 @@ const wsOnConnect = (ws: WebSocket, req: http.IncomingMessage): void => {
ws.on("close", async () => { ws.on("close", async () => {
if ((ws as IWsCustomData).isGame && (ws as IWsCustomData).accountId) { if ((ws as IWsCustomData).isGame && (ws as IWsCustomData).accountId) {
logger.debug(`lost bootstrapper connection for ${(ws as IWsCustomData).accountId}`); logger.debug(`lost bootstrapper connection for ${(ws as IWsCustomData).accountId}`);
const account = await Account.findOne({ _id: (ws as IWsCustomData).accountId }); sendWsBroadcastToWebui({ have_game_ws: false }, (ws as IWsCustomData).accountId);
if (account?.Nonce) { await Account.updateOne(
account.Dropped = true; {
await account.save(); _id: (ws as IWsCustomData).accountId
} },
{
Dropped: true
}
);
} }
}); });
}; };
@ -206,6 +213,16 @@ const forEachClient = (cb: (client: IWsCustomData) => void): void => {
} }
}; };
export const haveGameWs = (accountId: string): boolean => {
let ret = false;
forEachClient(client => {
if (client.isGame && client.accountId == accountId) {
ret = true;
}
});
return ret;
};
export const sendWsBroadcast = (data: IWsMsgToClient): void => { export const sendWsBroadcast = (data: IWsMsgToClient): void => {
const msg = JSON.stringify(data); const msg = JSON.stringify(data);
forEachClient(client => { forEachClient(client => {
@ -231,7 +248,7 @@ export const sendWsBroadcastToGame = (accountId: string, data: IWsMsgToClient):
}); });
}; };
export const sendWsBroadcastEx = (data: IWsMsgToClient, accountId: string | undefined, excludeWsid: number): void => { export const sendWsBroadcastEx = (data: IWsMsgToClient, accountId?: string, excludeWsid?: number): void => {
const msg = JSON.stringify(data); const msg = JSON.stringify(data);
forEachClient(client => { forEachClient(client => {
if ((!accountId || client.accountId == accountId) && client.id != excludeWsid) { if ((!accountId || client.accountId == accountId) && client.id != excludeWsid) {
@ -240,11 +257,7 @@ export const sendWsBroadcastEx = (data: IWsMsgToClient, accountId: string | unde
}); });
}; };
export const sendWsBroadcastToWebui = ( export const sendWsBroadcastToWebui = (data: IWsMsgToClient, accountId?: string, excludeWsid?: number): void => {
data: IWsMsgToClient,
accountId: string | undefined,
excludeWsid: number
): void => {
const msg = JSON.stringify(data); const msg = JSON.stringify(data);
forEachClient(client => { forEachClient(client => {
if (!client.isGame && (!accountId || client.accountId == accountId) && client.id != excludeWsid) { if (!client.isGame && (!accountId || client.accountId == accountId) && client.id != excludeWsid) {
@ -272,9 +285,10 @@ export const handleNonceInvalidation = (accountId: string): void => {
forEachClient(client => { forEachClient(client => {
if (client.accountId == accountId) { if (client.accountId == accountId) {
if (client.isGame) { if (client.isGame) {
client.accountId = undefined; // prevent processing of the close event
client.close(); client.close();
} else { } else {
client.send(JSON.stringify({ nonce_updated: true } satisfies IWsMsgToClient)); client.send(JSON.stringify({ nonce_updated: true, have_game_ws: false } satisfies IWsMsgToClient));
} }
} }
}); });