refactor: extract withSpinner as reusable utility function

Author: jinghaihan

src/git.ts

@@ -9,37 +9,33 @@ import { formatToken, parseRepo } from './utils'
 // https://docs.github.com/en/rest/actions/secrets?apiVersion=2022-11-28#get-a-repository-public-key
 export async function getRepoPublicKey(repoPath: string, config: SyncOptions): Promise<PublicKey> {
   const octokit = createOctokit(config)
-
-  const spinner = Spinner({ text: c.blue(`Fetching public key for ${repoPath}`) }).start()
   const { owner, repo } = parseRepo(repoPath)
   const url = `GET /repos/${owner}/${repo}/actions/secrets/public-key`
 
-  let res: PublicKey = { key: '', key_id: '' }
-  if (!config.dry) {
-    const { status, data } = await octokit.request(
-      url,
-      {
-        owner,
-        repo,
-        headers: {
-          'X-GitHub-Api-Version': config.apiVersion,
+  return withSpinner<PublicKey>(
+    `Fetching public key for ${repoPath}`,
+    `Public key fetched successfully for ${repoPath}`,
+    `Failed to fetch public key for ${repoPath}`,
+    `Fetch Public Key: ${c.yellow(url)}`,
+    { key: '', key_id: '' },
+    config,
+    async () => {
+      const { status, data } = await octokit.request(
+        url,
+        {
+          owner,
+          repo,
+          headers: {
+            'X-GitHub-Api-Version': config.apiVersion,
+          },
         },
-      },
-    )
-    if (status !== 200) {
-      spinner.error(c.red(`Failed to fetch public key for ${repoPath}: ${status}`))
-      console.error(c.red(JSON.stringify(data, null, 2)))
-      process.exit(1)
-    }
-    res = data
-  }
-  else {
-    console.log()
-    console.log(c.yellow(`Get a repository public key: ${repoPath}`))
-  }
-
-  spinner.success(c.green(`Public key fetched successfully for ${repoPath}`))
-  return res
+      )
+      if (status !== 200) {
+        throw new Error(`HTTP ${status}: ${JSON.stringify(data)}`)
+      }
+      return data as PublicKey
+    },
+  )
 }
 
 // https://docs.github.com/en/rest/actions/secrets?apiVersion=2022-11-28#create-or-update-a-repository-secret
@@ -51,78 +47,99 @@ export async function createOrUpdateRepoSecret(
   config: SyncOptions,
 ) {
   const octokit = createOctokit(config)
-
   secretName = `${config.envPrefix}${secretName}`
-
-  const spinner = Spinner({ text: c.blue(`Create or update ${secretName} for ${repoPath}`) }).start()
   const { owner, repo } = parseRepo(repoPath)
   const url = `PUT /repos/${owner}/${repo}/actions/secrets/${secretName}`
 
-  let res
-  let operation = 'create or update'
-
-  if (!config.dry) {
-    const { status, data } = await octokit.request(
-      url,
-      {
-        owner,
-        repo,
-        secret_name: secretName,
-        encrypted_value: await encrypt(secretValue, publicKey),
-        key_id: publicKey.key_id,
-        headers: {
-          'X-GitHub-Api-Version': config.apiVersion,
+  return withSpinner(
+    `Create or update ${secretName} for ${repoPath}`,
+    `${secretName} created/updated successfully for ${repoPath}`,
+    `Failed to create or update ${secretName} for ${repoPath}`,
+    `Create or Update Secret: ${c.yellow(url)}`,
+    undefined,
+    config,
+    async () => {
+      const { status, data } = await octokit.request(
+        url,
+        {
+          owner,
+          repo,
+          secret_name: secretName,
+          encrypted_value: await encrypt(secretValue, publicKey),
+          key_id: publicKey.key_id,
+          headers: {
+            'X-GitHub-Api-Version': config.apiVersion,
+          },
         },
-      },
-    )
-
-    if (status !== 201 && status !== 204) {
-      spinner.error(c.red(`Failed to create or update ${secretName} for ${repoPath}`))
-      console.error(c.red(JSON.stringify(data, null, 2)))
-      process.exit(1)
-    }
+      )
 
-    operation = status === 201 ? 'created' : 'updated'
-    res = data
-  }
-  else {
-    console.log()
-    console.log(c.yellow(`Create or update ${secretName} for ${repoPath}`))
-  }
+      if (status !== 201 && status !== 204) {
+        throw new Error(`HTTP ${status}: ${JSON.stringify(data)}`)
+      }
 
-  spinner.success(c.green(`${secretName} ${operation} successfully for ${repoPath}`))
-  return res
+      return data
+    },
+  )
 }
 
 // https://docs.github.com/rest/repos/repos#list-repositories-for-the-authenticated-user
-export async function getRepos(config: SyncOptions) {
+export async function getRepos(config: SyncOptions): Promise<Repo[]> {
   const octokit = createOctokit(config)
+  const url = 'GET /user/repos'
+
+  return withSpinner<Repo[]>(
+    'Fetching repositories',
+    'Repositories fetched successfully',
+    'Failed to fetch repositories',
+    `Fetch Repositories: ${c.yellow(url)}`,
+    [],
+    config,
+    async () => {
+      const { status, data } = await octokit.request(url, {
+        headers: {
+          'X-GitHub-Api-Version': config.apiVersion,
+        },
+      })
+      if (status !== 200) {
+        throw new Error(`HTTP ${status}: ${JSON.stringify(data)}`)
+      }
+      return data as Repo[]
+    },
+  )
+}
 
-  const spinner = Spinner({ text: c.blue('Fetching repositories') }).start()
+function createOctokit(config: SyncOptions) {
+  return new Octokit({ auth: formatToken(config.token) })
+}
 
-  let res: Repo[] = []
+async function withSpinner<T>(
+  loadingText: string,
+  successText: string,
+  failedText: string,
+  dryText: string,
+  defaultValue: T,
+  config: SyncOptions,
+  request: () => Promise<T>,
+): Promise<T> {
+  const spinner = Spinner({ text: c.blue(loadingText) }).start()
+
+  let result: T
   if (!config.dry) {
-    const { status, data } = await octokit.request('GET /user/repos', {
-      headers: {
-        'X-GitHub-Api-Version': config.apiVersion,
-      },
-    })
-    if (status !== 200) {
-      spinner.error(c.red('Failed to fetch repositories'))
-      console.error(c.red(JSON.stringify(data, null, 2)))
+    try {
+      result = await request()
+      spinner.success(c.green(successText))
+    }
+    catch (error) {
+      spinner.error(c.red(failedText))
+      console.error(c.red(JSON.stringify(error, null, 2)))
       process.exit(1)
     }
-    res = data
   }
   else {
     console.log()
-    console.log(c.yellow('Fetching repositories'))
+    console.log(c.yellow(dryText))
+    result = defaultValue
   }
 
-  spinner.success(c.green('Repositories fetched successfully'))
-  return res
-}
-
-function createOctokit(config: SyncOptions) {
-  return new Octokit({ auth: formatToken(config.token) })
+  return result
 }