Fix web service ID type in token request, handle errors requesting a new token

This commit is contained in:
Samuel Elliott
2022-09-10 16:50:19 +01:00
parent 0b91bf87db
commit c9c91a874d
10 changed files with 57 additions and 27 deletions

View File

@@ -205,7 +205,7 @@ export default class CoralApi {
});
}
async getWebServiceToken(id: string) {
async getWebServiceToken(id: number) {
const data = await f(this.token, HashMethod.WEB_SERVICE, this.useragent ?? getAdditionalUserAgents());
const req = {

View File

@@ -9,7 +9,7 @@ import { timeoutSignal } from '../util/misc.js';
const debug = createDebug('nxapi:api:nooklink');
export const NOOKLINK_WEBSERVICE_ID = '4953919198265344';
export const NOOKLINK_WEBSERVICE_ID = 4953919198265344;
export const NOOKLINK_WEBSERVICE_URL = 'https://web.sd.lp1.acbaa.srv.nintendo.net';
export const NOOKLINK_WEBSERVICE_USERAGENT = 'Mozilla/5.0 (Linux; Android 8.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.125 Mobile Safari/537.36';

View File

@@ -11,7 +11,7 @@ import { toSeasonId, Rule as XPowerRankingRule, Season } from './splatnet2-xrank
const debug = createDebug('nxapi:api:splatnet2');
export const SPLATNET2_WEBSERVICE_ID = '5741031244955648';
export const SPLATNET2_WEBSERVICE_ID = 5741031244955648;
export const SPLATNET2_WEBSERVICE_URL = 'https://app.splatoon2.nintendo.net/';
export const SPLATNET2_WEBSERVICE_USERAGENT = 'Mozilla/5.0 (Linux; Android 8.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.125 Mobile Safari/537.36';

View File

@@ -9,7 +9,7 @@ import { BankaraBattleHistoriesResult, BattleHistoryCurrentPlayerResult, BulletT
const debug = createDebug('nxapi:api:splatnet3');
export const SPLATNET3_WEBSERVICE_ID = '4834290508791808';
export const SPLATNET3_WEBSERVICE_ID = 4834290508791808;
export const SPLATNET3_WEBSERVICE_URL = 'https://api.lp1.av5ja.srv.nintendo.net';
export const SPLATNET3_WEBSERVICE_USERAGENT = 'Mozilla/5.0 (Linux; Android 8.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.125 Mobile Safari/537.36';

View File

@@ -132,7 +132,7 @@ export default class ZncProxyApi implements CoralApi {
throw new Error('Not supported in ZncProxyApi');
}
async getWebServiceToken(id: string) {
async getWebServiceToken(id: number) {
const result = await this.fetch<{token: WebServiceToken}>('/webservice/' + id + '/token');
return createResult(result, result.token);
}