Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-09-07 02:45:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strict GraphQL query error handling

Browse Source
This commit is contained in:
Samuel Elliott
2022-12-14 19:36:07 +00:00
parent bdf72352fb
commit d23a65ba2e
5 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/splatnet3.ts
View File

@@ -37,12 +37,25 @@ const AUTH_ERROR_CODES = {
const REPLAY_CODE_REGEX = /^[A-Z0-9]{16}$/;
export const RequestIdSymbol = Symbol('RequestId');
export const VariablesSymbol = Symbol('Variables');
export type PersistedQueryResult<T> = GraphQLSuccessResponse<T> & PersistedQueryResultData;
export interface PersistedQueryResultData {
[ResponseSymbol]: Response;
[RequestIdSymbol]: KnownRequestId;
[VariablesSymbol]: {};
}
export default class SplatNet3Api {
onTokenShouldRenew: ((remaining: number, res: Response) => Promise<SplatNet3AuthData | void>) | null = null;
onTokenExpired: ((res: Response) => Promise<SplatNet3AuthData | void>) | null = null;
/** @internal */
_renewToken: Promise<void> | null = null;
graphql_strict = process.env.NXAPI_SPLATNET3_STRICT !== '0';
protected constructor(
public bullet_token: string,
public version: string,
@@ -121,7 +134,7 @@ export default class SplatNet3Api {
/** @private */
_Variables extends (V extends object ? V : _Id extends KnownRequestId ? VariablesTypes[_Id] : unknown) =
(V extends object ? V : _Id extends KnownRequestId ? VariablesTypes[_Id] : unknown),
>(id: _Id, variables: _Variables) {
>(id: _Id, variables: _Variables): Promise<PersistedQueryResult<_Result>> {
const req: GraphQLRequest<_Variables> = {
variables,
extensions: {
@@ -135,12 +148,19 @@ export default class SplatNet3Api {
const data = await this.fetch<GraphQLResponse<_Result>>('/graphql', 'POST', JSON.stringify(req), undefined,
'graphql query ' + id);
if (!('data' in data)) {
throw new ErrorResponse('[splatnet3] GraphQL error: ' + data.errors.map(e => e.message).join(', '),
if (!('data' in data) || (this.graphql_strict && data.errors?.length)) {
throw new ErrorResponse('[splatnet3] GraphQL error: ' + data.errors!.map(e => e.message).join(', '),
data[ResponseSymbol], data);
}
return data;
for (const error of data.errors ?? []) {
debugGraphQl('GraphQL error in query %s: %s', id, error.message, error);
}
Object.defineProperty(data, RequestIdSymbol, {value: id});
Object.defineProperty(data, VariablesSymbol, {value: variables});
return data as PersistedQueryResult<_Result>;
}
/** * */