Refactor: Use native fetch instead of ofetch for GitHub API calls

Author: ericc-ch

src/lib/constants.ts

@@ -29,6 +29,8 @@ export const GITHUB_WEB_API_CONFIG = {
   baseURL: "https://github.com",
 } as const
 
+export const GITHUB_API_BASE_URL = "https://api.github.com"
+
 export const GITHUB_BASE_URL = "https://github.com"
 export const GITHUB_CLIENT_ID = "01ab8ac9400c4e429b23"
 export const GITHUB_APP_SCOPES = [

src/lib/token.ts

@@ -4,7 +4,7 @@ import fs from "node:fs/promises"
 import { PATHS } from "~/lib/paths"
 import { getCopilotToken } from "~/services/copilot/get-token/copilot-token"
 import { getDeviceCode } from "~/services/github/get-device-code"
-import { getGitHubUser } from "~/services/github/get-user/service"
+import { getGitHubUser } from "~/services/github/get-user"
 import { pollAccessToken } from "~/services/github/poll-access-token"
 
 import { state } from "./state"

src/services/api-instance.ts

@@ -1,11 +1,7 @@
 import consola from "consola"
 import { FetchError, ofetch } from "ofetch"
 
-import {
-  COPILOT_API_CONFIG,
-  GITHUB_API_CONFIG,
-  GITHUB_WEB_API_CONFIG,
-} from "~/lib/constants"
+import { COPILOT_API_CONFIG } from "~/lib/constants"
 import { modelsCache } from "~/lib/models"
 import { tokenService } from "~/lib/token"
 
@@ -41,17 +37,3 @@ export const copilot = ofetch.create({
     }
   },
 })
-
-export const github = ofetch.create({
-  baseURL: GITHUB_API_CONFIG.baseURL,
-
-  async onRequest({ options }) {
-    const token = await tokenService.getGithubToken()
-    options.headers.set("authorization", `token ${token}`)
-  },
-})
-
-// Only used for device flow auth
-export const _github = ofetch.create({
-  baseURL: GITHUB_WEB_API_CONFIG.baseURL,
-})

src/services/copilot/get-token/copilot-token.ts

@@ -1,8 +1,28 @@
-import type { GetCopilotTokenResponse } from "./types"
+import { GITHUB_API_BASE_URL } from "~/lib/constants"
+import { state } from "~/lib/state"
 
-import { github } from "../../api-instance"
+export const getCopilotToken = async () => {
+  const response = await fetch(
+    `${GITHUB_API_BASE_URL}/copilot_internal/v2/token`,
+    {
+      headers: {
+        authorization: `token ${state.githubToken}`,
+      },
+    },
+  )
 
-export const getCopilotToken = async () =>
-  github<GetCopilotTokenResponse>("/copilot_internal/v2/token", {
-    method: "GET",
-  })
+  if (!response.ok) {
+    throw new Error("Failed to get Copilot token", {
+      cause: await response.json(),
+    })
+  }
+
+  return (await response.json()) as GetCopilotTokenResponse
+}
+
+// Trimmed for the sake of simplicity
+interface GetCopilotTokenResponse {
+  expires_at: number
+  refresh_in: number
+  token: string
+}

src/services/github/get-token/service.ts

@@ -0,0 +1,23 @@
+import { GITHUB_API_BASE_URL } from "~/lib/constants"
+import { state } from "~/lib/state"
+
+export async function getGitHubUser() {
+  const response = await fetch(`${GITHUB_API_BASE_URL}/user`, {
+    headers: {
+      authorization: `token ${state.githubToken}`,
+    },
+  })
+
+  if (!response.ok) {
+    throw new Error("Failed to get GitHub user", {
+      cause: await response.json(),
+    })
+  }
+
+  return (await response.json()) as GithubUser
+}
+
+// Trimmed for the sake of simplicity
+interface GithubUser {
+  login: string
+}