feat: improve cli

Author: atinux

cli/commands/deploy.mjs

@@ -0,0 +1,71 @@
+import { consola } from 'consola'
+import { colors } from 'consola/utils'
+import { isCancel, confirm, select, text } from '@clack/prompts'
+import { defineCommand, runCommand } from 'citty'
+import { loadConfig } from '../utils.mjs'
+import { $api } from '../utils.mjs'
+import login from './login.mjs'
+import { homedir } from 'os'
+
+export default defineCommand({
+  meta: {
+    name: 'deploy',
+    description: 'Deploy your project to NuxtHub.',
+  },
+  async setup() {
+    const config = loadConfig()
+    if (!config.token) {
+      consola.info('You need to be logged in to deploy your project.')
+      const res = await runCommand(login, {})
+      console.log('res', res)
+    }
+    const shouldDeploy = await confirm({
+      message: `Deploy ${colors.blue(process.cwd().replace(homedir(), '~'))} to NuxtHub?`
+    })
+    if (!shouldDeploy || isCancel(shouldDeploy)) {
+      return consola.log('Cancelled.')
+    }
+
+    const teams = await $api('/teams')
+    const teamId = await select({
+      message: 'Select a team',
+      options: teams.map((team) => ({
+        value: team.id,
+        label: team.name
+      }))
+    })
+    if (isCancel(teamId)) return
+    const team = teams.find((team) => team.id === teamId)
+
+    const projects = await $api(`/teams/${team.slug}/projects`)
+    const projectId = await select({
+      message: 'Link a project',
+      options: [
+        { value: 'new', label: 'Create a new project' },
+        ...projects.map((project) => ({
+          value: project.id,
+          label: project.slug
+        }))
+      ]
+    })
+    if (isCancel(projectId)) return
+
+    let project
+    if (projectId === 'new') {
+      const projectName = await text({
+        message: 'Project name',
+        placeholder: 'my-nuxt-project'
+      })
+      if (isCancel(projectName)) return
+      project = await $api(`/teams/${team.slug}/projects`, {
+        method: 'POST',
+        body: { name: projectName }
+      })
+      consola.success(`Project \`${project.slug}\` created`)
+    } else {
+      project = projects.find((project) => project.id === projectId)
+    }
+
+    consola.info(`Deploying \`${project.slug}\` to NuxtHub...`)
+  },
+})

cli/commands/login.mjs

@@ -25,43 +25,48 @@ export default defineCommand({
     }
     // Create server for OAuth flow
     let listener
-    const stopListener = () => setTimeout(() => listener.close(), 1000)
     const app = createApp()
     let handled = false
-    app.use('/', eventHandler(async (event) => {
-      if (handled)  return
-      handled = true
-      const token = getQuery(event).token
+    // eslint-disable-next-line no-async-promise-executor
+    await new Promise(async (resolve, reject) => {
+      app.use('/', eventHandler(async (event) => {
+        if (handled)  return
+        handled = true
+        const token = getQuery(event).token
 
-      if (token) {
-        const user = await $api('/user', {
-          headers: {
-            Authorization: `token ${token}`
-          }
-        }).catch(() => null)
-        if (user?.name) {
-          writeConfig({ token })
-          consola.success('Authenticated successfully!')
+        if (token) {
+          const user = await $api('/user', {
+            headers: {
+              Authorization: `token ${token}`
+            }
+          }).catch(() => null)
+          if (user?.name) {
+            writeConfig({ token })
+            consola.success('Authenticated successfully!')
 
-          stopListener()
+            resolve()
 
-          // TODO: redirect to success CLI page: https://hub.nuxt.com/cli/login-success?name=${user.name}
-          return 'Authenticated successfully! You can close this window now.'
+            // TODO: redirect to success CLI page: https://hub.nuxt.com/cli/login-success?name=${user.name}
+            return 'Authenticated successfully! You can close this window now.'
+          }
         }
-      }
-      consola.error('Authentication error, please try again.')
-      stopListener()
-      return 'Authentication error, missing token.'
-    }))
-    const randomPort = await getRandomPort()
-    listener = await listen(toNodeListener(app), {
-      showURL: false,
-      port: randomPort
+        consola.error('Authentication error, please try again.')
+        reject()
+        return 'Authentication error, missing token.'
+      }))
+      const randomPort = await getRandomPort()
+      listener = await listen(toNodeListener(app), {
+        showURL: false,
+        port: randomPort
+      })
+      consola.box(
+        'Please visit the following URL in your web browser:\n\n'+
+        '`'+withQuery(joinURL(NUXT_HUB_URL, '/api/cli/authorize'), { redirect: listener.url })+'`'
+      )
+      consola.info('Waiting for authentication to be completed...')
     })
-    consola.box(
-      'Please visit the following URL in your web browser:\n\n'+
-      withQuery(joinURL(NUXT_HUB_URL, '/api/cli/authorize'), { redirect: listener.url })
-    )
-    consola.info('Waiting for authentication to be completed...')
+    // Close server after 1s to make sure we have time to handle the request
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+    await listener.close()
   },
 })

cli/index.mjs

@@ -5,6 +5,7 @@ import { colors } from 'consola/utils'
 import login from './commands/login.mjs'
 import logout from './commands/logout.mjs'
 import whoami from './commands/whoami.mjs'
+import deploy from './commands/deploy.mjs'
 
 const main = defineCommand({
   meta: {
@@ -17,6 +18,7 @@ const main = defineCommand({
     }
   },
   subCommands: {
+    deploy,
     login,
     logout,
     whoami

package.json

@@ -29,6 +29,7 @@
     "release": "release-it"
   },
   "dependencies": {
+    "@clack/prompts": "^0.7.0",
     "@cloudflare/workers-types": "^4.20240208.0",
     "@sindresorhus/slugify": "^2.2.1",
     "@uploadthing/mime-types": "^0.2.2",