refactor: Move token management to lib/token and simplify imports

Author: ericc-ch

src/lib/cli.ts

@@ -1,4 +1,3 @@
-
 // VSCode client ID
 const GITHUB_CLIENT_ID = "01ab8ac9400c4e429b23"
 const GITHUB_OAUTH_SCOPES = [

src/lib/constants.ts

@@ -3,8 +3,8 @@ import fs from "node:fs/promises"
 import { FetchError } from "ofetch"
 
 import { PATHS } from "~/lib/paths"
+import { tokenService } from "~/lib/token"
 import { getGitHubUser } from "~/services/github/get-user/service"
-import { tokenService } from "~/services/token-service"
 
 import { getModels } from "../services/copilot/get-models/service"
 import { getGitHubToken } from "../services/github/get-token/service"
@@ -49,10 +49,10 @@ async function initializeCopilotToken(): Promise<void> {
   await tokenService.initCopilotToken()
 }
 
-async function initializeModelInformation(): Promise<void> {
+async function logModelInformation(): Promise<void> {
   const models = await getModels()
   consola.info(
-    `Available models: \n${models.data.map((model) => `- ${model.id}`).join("\n")}`,
+    `Available models: \n${models.data.map((model) => `- ${model.id}`).join("\n")}\n`,
   )
 }
 
@@ -71,5 +71,5 @@ export async function initializeApp() {
   await initializeAppDirectory()
   await initializeGithubAuthentication()
   await initializeCopilotToken()
-  await initializeModelInformation()
+  await logModelInformation()
 }

src/lib/initialization.ts

@@ -25,7 +25,7 @@ const main = defineCommand({
     await initializeApp()
 
     const serverUrl = `http://localhost:${port}`
-    consola.success(`Server started at ${serverUrl}`)
+    consola.box(`Server started at ${serverUrl}`)
 
     serve({
       fetch: server.fetch as ServerHandler,

src/lib/tokens.ts

@@ -6,7 +6,7 @@ import {
   GITHUB_API_CONFIG,
   GITHUB_WEB_API_CONFIG,
 } from "~/lib/constants"
-import { tokenService } from "~/services/token-service"
+import { tokenService } from "~/lib/token"
 
 export const copilot = ofetch.create({
   baseURL: COPILOT_API_CONFIG.baseURL,

src/main.ts

@@ -1,17 +1,21 @@
 import { stream } from "fetch-event-stream"
 
 import { COPILOT_API_CONFIG } from "~/lib/constants"
+import { tokenService } from "~/lib/token"
 
 import type { ChatCompletionsPayload } from "./types"
 
-import { TOKENS } from "../../../lib/tokens"
+export const chatCompletionsStream = async (
+  payload: ChatCompletionsPayload,
+) => {
+  const copilotToken = tokenService.getCopilotToken()
 
-export const chatCompletionsStream = async (payload: ChatCompletionsPayload) =>
-  stream(`${COPILOT_API_CONFIG.baseURL}/chat/completions`, {
+  return stream(`${COPILOT_API_CONFIG.baseURL}/chat/completions`, {
     method: "POST",
     headers: {
       ...COPILOT_API_CONFIG.headers,
-      authorization: `Bearer ${TOKENS.COPILOT_TOKEN}`,
+      authorization: `Bearer ${copilotToken}`,
     },
     body: JSON.stringify(payload),
   })
+}