Improve error handling for GraphQL errors in GraphQLRequest (#68)

* feat: write custom paginator also updated packages * feat: show gql error in yuukoerror
YuuCorp · Feb 15, 2025 · 34e96a5 · 34e96a5
1 parent 57a674b
commit 34e96a5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/src/api/controllers/*.ts → src/api/controllers/global.controller.ts b/src/api/controllers/*.ts → src/api/controllers/global.controller.ts
diff --git a/src/api/controllers/public.controller.ts b/src/api/controllers/public.controller.ts
@@ -32,11 +32,11 @@ export const publicController = new Elysia({
             const decryptedToken = await rsaEncryption(encryptedToken, false);
             const { Viewer: data } = (await graphQLRequest("Viewer", {}, decryptedToken)).data;
             if (!data) return { message: "Invalid token" };
-            console.log(data);
             const existingUser = (await db.select().from(anilistUser).where(eq(anilistUser.discordId, discordId)).limit(1))[0];
             if (existingUser) return { message: "User already registered" };
             await db.insert(anilistUser).values({ discordId, anilistToken: encryptedToken, anilistId: data.id });
 
+            console.log(`Registered ${discordId} as ${data.name}`);
             set.status = 201;
             return { message: `Registered as ${data.name}!` };
         },

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -1,4 +1,4 @@
-import { api } from '#api/controllers/*'
+import { api } from '#api/controllers/global.controller'
 import { cors } from '@elysiajs/cors'
 import { Elysia } from 'elysia'
 

diff --git a/src/database/sqlite/README.md b/src/database/sqlite/README.md
diff --git a/src/utils/graphQLRequest.ts b/src/utils/graphQLRequest.ts
@@ -81,9 +81,13 @@ export async function graphQLRequest<QueryKey extends Query>(queryKey: QueryKey,
 
   try {
     const res = await fetch(url, reqOptions)
-    if (!res.ok) throw new YuukoError(res.statusText, vars);
+    const resJson = await res.json() as GraphQLResponse;
+    if (!res.ok) {
+      const errorMessage = resJson.errors[0].message;
+      throw new YuukoError(`${res.status} ${errorMessage.length > 0 ? errorMessage : ""} ${res.statusText}`, vars);
+    }
 
-    const data = await res.json() as GraphQLResponse<QueryVariables[QueryKey][0]>
+    const data = resJson as GraphQLResponse<QueryVariables[QueryKey][0]>
     return data;
   } catch (e: any) {
     console.error(e)

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -44,6 +44,7 @@ export interface Headers {
 
 export interface GraphQLResponse<TData = any> {
   data: TData
+  errors: any[]
   headers: any
 }