refactor: move new task's oasst api fetching into OasstApiClient

website/src/lib/oasst_api_client.ts

@@ -0,0 +1,63 @@
+import { JWT } from "next-auth/jwt";
+
+class OasstError {
+  message: string;
+  errorCode: number;
+  httpStatusCode: number;
+
+  constructor(message: string, errorCode: number, httpStatusCode: number) {
+    this.message = message;
+    this.errorCode = errorCode;
+    this.httpStatusCode = httpStatusCode;
+  }
+}
+
+export default class OasstApiClient {
+  constructor(private readonly oasstApiUrl: string, private readonly oasstApiKey: string) {}
+
+  private async post(path: string, body: any): Promise<any> {
+    const resp = await fetch(`${this.oasstApiUrl}${path}`, {
+      method: "POST",
+      headers: {
+        "X-API-Key": this.oasstApiKey,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(body),
+    });
+
+    if (resp.status == 204) {
+      return null;
+    }
+
+    if (resp.status >= 300) {
+      try {
+        const error = await resp.clone().json();
+        throw new OasstError(error.message, error.error_code, resp.status);
+      } catch (e) {
+        throw new OasstError(await resp.text(), 0, resp.status);
+      }
+    }
+
+    return await resp.json();
+  }
+
+  // TODO return a strongly typed Task?
+  // This method is used to store a task in RegisteredTask.task.
+  // This is a raw Json type, so we can't use it to strongly type the task.
+  async fetchTask(taskType: string, userToken: JWT): Promise<any> {
+    return this.post("/api/v1/tasks/", {
+      type: taskType,
+      user: {
+        id: userToken.sub,
+        display_name: userToken.name || userToken.email,
+        auth_method: "local",
+      },
+    });
+  }
+
+  async ackTask(taskId: string, messageId: string): Promise<void> {
+    return this.post(`/api/v1/tasks/${taskId}/ack`, {
+      message_id: messageId,
+    });
+  }
+}

website/src/pages/api/new_task/[task_type].ts

@@ -1,4 +1,5 @@
 import { getToken } from "next-auth/jwt";
+import OasstApiClient from "src/lib/oasst_api_client";
 import prisma from "src/lib/prismadb";
 
 /**
@@ -20,25 +21,10 @@ const handler = async (req, res) => {
     return;
   }
 
+  const oasstApiClient = new OasstApiClient(process.env.FASTAPI_URL, process.env.FASTAPI_KEY);
+
   // Fetch the new task.
-  //
-  // This needs to be refactored into an easier to use library.
-  const taskRes = await fetch(`${process.env.FASTAPI_URL}/api/v1/tasks/`, {
-    method: "POST",
-    headers: {
-      "X-API-Key": process.env.FASTAPI_KEY,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      type: task_type,
-      user: {
-        id: token.sub,
-        display_name: token.name || token.email,
-        auth_method: "local",
-      },
-    }),
-  });
-  const task = await taskRes.json();
+  const task = await oasstApiClient.fetchTask(task_type, token);
 
   // Store the task and link it to the user..
   const registeredTask = await prisma.registeredTask.create({
@@ -53,16 +39,7 @@ const handler = async (req, res) => {
   });
 
   // Update the backend with our Task ID
-  await fetch(`${process.env.FASTAPI_URL}/api/v1/tasks/${task.id}/ack`, {
-    method: "POST",
-    headers: {
-      "X-API-Key": process.env.FASTAPI_KEY,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      message_id: registeredTask.id,
-    }),
-  });
+  await oasstApiClient.ackTask(task.id, registeredTask.id);
 
   // Send the results to the client.
   res.status(200).json(registeredTask);