Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-03-21 18:04:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Receive supported events from server

Browse Source
This commit is contained in:
Samuel Elliott 2022-11-20 20:36:22 +00:00
parent 3493ed09c0
commit 2dbee8bb35
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cli/presence-server.ts
View File

@ -494,6 +494,8 @@ class Server extends HttpServer {
return null;
}
presence_streams = new Set<EventStreamResponse>();
async handlePresenceStreamRequest(req: Request, res: Response, presence_user_nsaid: string) {
const req_url = new URL(req.url, 'http://localhost');
const presence_url = new URL('/api/presence/' + encodeURIComponent(presence_user_nsaid), req_url);
@ -505,8 +507,22 @@ class Server extends HttpServer {
const stream = new EventStreamResponse(req, res);
stream.json_replacer = replacer;
this.presence_streams.add(stream);
res.on('close', () => this.presence_streams.delete(stream));
stream.sendEvent(null, 'debug: timestamp ' + new Date().toISOString());
stream.sendEvent('supported_events', [
'friend',
...(this.splatnet3_users && req.query['include-splatoon3'] === '1' ? [
'splatoon3',
'splatoon3_fest_team',
'splatoon3_vs_setting',
'splatoon3_coop_setting',
'splatoon3_fest',
] : []),
]);
for (const [key, value] of Object.entries(result) as
[keyof typeof result, typeof result[keyof typeof result]][]
) {

85
src/common/presence.ts
View File

@ -615,30 +615,6 @@ export class ZncProxyDiscordPresence extends Loop {
},
});
// Fix emitting "message" event for all messages
// @ts-ignore
const _emit = events.emit;
// @ts-ignore
events.emit = (type: string, event: MessageEvent, ...args: any[]) => {
if (event.data && type !== 'message') {
_emit.call(events, 'message', event, ...args);
}
return _emit.call(events, type, event, ...args);
};
// @ts-ignore
const _listeners = events.listeners;
// @ts-ignore
events.listeners = (type: string, ...args: any[]) => {
let a = null;
if (type !== 'message' && type !== 'open' && type !== 'error') {
a = _listeners.call(events, 'message', ...args);
}
return a ? [...a, ..._listeners.call(events, type, ...args)] : _listeners.call(events, type, ...args);
};
this.events = events;
events.onopen = event => {
@ -647,34 +623,61 @@ export class ZncProxyDiscordPresence extends Loop {
let user: CurrentUser | Friend | undefined = undefined;
let presence: Presence | null = null;
let supported_events: readonly string[] = ['friend'];
this.last_data = {};
events.onmessage = event => {
const onmessage = (event: MessageEvent) => {
if (event.type === 'message') {
debugEventStream('Received debug message', event.data);
} else if (event.type === 'update') {
return;
}
if (event.type === 'update') {
debugEventStream('Received presence updated message', event.data);
} else {
const data = JSON.parse(event.data);
debugEventStream('Received updated %s data', event.type, data);
return;
}
if (event.type === 'supported_events') {
const new_supported_events: readonly string[] = (JSON.parse(event.data) as readonly string[])
.filter(e => e !== 'open' && e !== 'error' &&
e !== 'message' && e !== 'update' &&
e !== 'supported_events');
debugEventStream('Received supported events message', new_supported_events);
Object.assign(this.last_data!, {[event.type]: data});
for (const type of supported_events) {
events.removeEventListener(type, onmessage);
}
for (const type of new_supported_events) {
events.addEventListener(type, onmessage);
}
supported_events = new_supported_events;
if (event.type === 'user' || event.type === 'friend') {
user = data;
presence = data.presence;
}
if (event.type === 'presence') {
presence = data;
}
return;
}
if (presence) {
this.discord.updatePresenceForDiscord(presence, user);
this.updatePresenceForSplatNet2Monitor(presence, this.presence_url);
}
const data = JSON.parse(event.data);
debugEventStream('Received updated %s data', event.type, data);
Object.assign(this.last_data!, {[event.type]: data});
if (event.type === 'user' || event.type === 'friend') {
user = data;
presence = data.presence;
}
if (event.type === 'presence') {
presence = data;
}
if (presence) {
this.discord.updatePresenceForDiscord(presence, user);
this.updatePresenceForSplatNet2Monitor(presence, this.presence_url);
}
};
events.onmessage = onmessage;
events.addEventListener('supported_events', onmessage);
events.addEventListener('update', onmessage);
events.addEventListener('friend', onmessage);
return new Promise<void>((rs, rj) => {
this.timeout_resolve = () => {
debugEventStream('Update interval cancelled, closing event stream');