Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-08-20 01:25:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix getting current user presence with API proxy

Browse Source
This commit is contained in:
Samuel Elliott
2022-04-21 18:05:24 +01:00
parent d07dcabe6f
commit f294daa5bc
1 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/cli/nso/http-server.ts
View File

@@ -2,9 +2,8 @@ import createDebug from 'debug';
import express, { Request, Response } from 'express';
import bodyParser from 'body-parser';
import * as net from 'net';
import persist from 'node-persist';
import { v4 as uuidgen } from 'uuid';
import { ActiveEvent, Announcement, CurrentUser, Friend, GetActiveEventResult, Presence, WebService } from '../../api/znc-types.js';
import { Announcement, CurrentUser, Friend, GetActiveEventResult, Presence, WebService } from '../../api/znc-types.js';
import ZncApi from '../../api/znc.js';
import type { Arguments as ParentArguments } from '../nso.js';
import { ArgumentsCamelCase, Argv, getToken, initStorage, SavedToken, YargsArguments } from '../../util.js';
@@ -75,9 +74,9 @@ export async function handler(argv: ArgumentsCamelCase<Arguments>) {
app.use('/api/znc', (req, res, next) => {
console.log('[%s] %s %s HTTP/%s from %s, port %d%s, %s',
new Date(), req.method, req.url, req.httpVersion,
new Date(), req.method, req.path, req.httpVersion,
req.socket.remoteAddress, req.socket.remotePort,
req.headers['x-forwarded-for'] ? ', ' + req.headers['x-forwarded-for'] : '',
req.headers['x-forwarded-for'] ? ' (' + req.headers['x-forwarded-for'] + ')' : '',
req.headers['user-agent']);
next();
@@ -263,6 +262,59 @@ export async function handler(argv: ArgumentsCamelCase<Arguments>) {
}
});
//
// Nintendo Switch user data
//
const cached_userdata = new Map<string, [CurrentUser, number]>();
const getUserData: express.RequestHandler = async (req, res, next) => {
const cache = cached_userdata.get(req.zncAuth!.user.id);
if (cache && ((cache[1] + updateInterval) > Date.now())) {
debug('Using cached user data for %s', req.zncAuth!.user.id);
next();
return;
}
try {
const user = await req.znc!.getCurrentUser();
cached_userdata.set(req.zncAuth!.user.id, [user.result, Date.now()]);
next();
} catch (err) {
res.statusCode = 500;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify({
error: err,
error_message: (err as Error).message,
}));
}
};
app.get('/api/znc/user', authToken, (req, res, next) => {
if (!req.zncAuthPolicy) return next();
if (!req.zncAuthPolicy.current_user) return tokenUnauthorised(req, res);
next();
}, localAuth, nsoAuth, getUserData, async (req, res) => {
const [user, updated] = cached_userdata.get(req.zncAuth!.user.id)!;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify({user, updated}));
});
app.get('/api/znc/user/presence', authToken, (req, res, next) => {
if (!req.zncAuthPolicy) return next();
if (!req.zncAuthPolicy.current_user_presence) return tokenUnauthorised(req, res);
if (!('current_user_presence' in req.zncAuthPolicy) && !req.zncAuthPolicy.current_user) return tokenUnauthorised(req, res);
next();
}, localAuth, nsoAuth, getUserData, async (req, res) => {
const [user, updated] = cached_userdata.get(req.zncAuth!.user.id)!;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify(user.presence));
});
//
// Nintendo Switch friends, NSO app web services, events
//
@@ -564,6 +616,10 @@ export async function handler(argv: ArgumentsCamelCase<Arguments>) {
app.get('/api/znc/user/:id', nsoAuth, async (req, res) => {
try {
if (!req.params.id.match(/^[0-9a-f]{16}$/)) {
throw new Error('Invalid NSA ID');
}
const response = await req.znc!.getUser(parseInt(req.params.id));
res.setHeader('Content-Type', 'application/json');
@@ -580,59 +636,6 @@ export async function handler(argv: ArgumentsCamelCase<Arguments>) {
}
});
//
// Nintendo Switch user data
//
const cached_userdata = new Map<string, [CurrentUser, number]>();
const getUserData: express.RequestHandler = async (req, res, next) => {
const cache = cached_userdata.get(req.zncAuth!.user.id);
if (cache && ((cache[1] + updateInterval) > Date.now())) {
debug('Using cached user data for %s', req.zncAuth!.user.id);
next();
return;
}
try {
const user = await req.znc!.getCurrentUser();
cached_userdata.set(req.zncAuth!.user.id, [user.result, Date.now()]);
next();
} catch (err) {
res.statusCode = 500;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify({
error: err,
error_message: (err as Error).message,
}));
}
};
app.get('/api/znc/user', authToken, (req, res, next) => {
if (!req.zncAuthPolicy) return next();
if (!req.zncAuthPolicy.current_user) return tokenUnauthorised(req, res);
next();
}, localAuth, nsoAuth, getUserData, async (req, res) => {
const [user, updated] = cached_userdata.get(req.zncAuth!.user.id)!;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify({user, updated}));
});
app.get('/api/znc/user/presence', authToken, (req, res, next) => {
if (!req.zncAuthPolicy) return next();
if (!req.zncAuthPolicy.current_user_presence) return tokenUnauthorised(req, res);
if (!('current_user_presence' in req.zncAuthPolicy) && !req.zncAuthPolicy.current_user) return tokenUnauthorised(req, res);
next();
}, localAuth, nsoAuth, getUserData, async (req, res) => {
const [user, updated] = cached_userdata.get(req.zncAuth!.user.id)!;
res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify(user.presence));
});
//
// Event stream
//