amorphous-cli 0.1.0 → 0.1.1

package/lib/commands.mjs

@@ -167,7 +167,8 @@ async function cmdLogin(rest) {
   if (flags.help) return printHelp('login')
   const email = positional[0]
   if (!email) throw new Error('Pass an email.')
-  await loginWithMagicLink(email.trim())
+  const code = typeof flags.code === 'string' ? flags.code : undefined
+  await loginWithMagicLink(email.trim(), { code })
 }
 
 async function cmdCreate(cwd, rest) {

package/lib/help.mjs

@@ -30,9 +30,10 @@ Run amorphous <command> --help for flags. Pass --json where you need machine out
 `
 
 export const COMMAND_HELP = {
-  login: `login <email>
+  login: `login <email> [--code <code>]
 
-Sign in with a magic link sent to that email.`,
+Send a sign-in code to that email, then type it.
+--code skips the prompt when you already have the code.`,
 
   list: `list [--view recents|all|starred|archive] [--folder <name>] [--tag <name>] [--search <q>] [--json]
 

package/lib/login.mjs

@@ -1,10 +1,19 @@
-import { createServer } from 'node:http'
+import { createInterface } from 'node:readline'
 import { createServer as createNetServer } from 'node:net'
 import { createClient } from '@supabase/supabase-js'
 import { loadDotEnv, supabaseAnonKey, supabaseUrl } from './config.mjs'
 import { mailpitBase, sessionFromVerifyUrl, waitForMagicLinkVerifyUrl } from './mailpit.mjs'
 import { saveSession } from './session.mjs'
 
+function isLocalSupabase() {
+  try {
+    const host = new URL(supabaseUrl()).hostname
+    return host === '127.0.0.1' || host === 'localhost'
+  } catch {
+    return false
+  }
+}
+
 async function freePort(preferred) {
   if (preferred) {
     const ok = await new Promise((resolve) => {
@@ -29,6 +38,7 @@ async function freePort(preferred) {
 
 async function mailpitReachable() {
   if (process.env.AMORPHOUS_AGENT_LOGIN === '0') return false
+  if (!isLocalSupabase()) return false
   try {
     const res = await fetch(`${mailpitBase()}/api/v1/messages`, {
       signal: AbortSignal.timeout(1500),
@@ -54,100 +64,69 @@ async function loginViaMailpit(supabase, email, redirectTo, sinceMs) {
   }
 }
 
-async function loginViaCallbackServer(supabase, email, redirectTo) {
-  const callbackPort = new URL(redirectTo).port || '8765'
-  return new Promise((resolve, reject) => {
-    const server = createServer(async (req, res) => {
-      try {
-        const url = new URL(req.url || '/', redirectTo)
-        if (url.pathname === '/callback' && url.searchParams.get('code')) {
-          const code = url.searchParams.get('code')
-          const { data, error } = await supabase.auth.exchangeCodeForSession(code)
-          if (error) throw error
-          res.writeHead(200, { 'Content-Type': 'text/html' })
-          res.end('<p>Signed in. You can close this tab and return to the terminal.</p>')
-          server.close()
-          resolve(data.session)
-          return
-        }
-        if (url.pathname === '/callback') {
-          res.writeHead(200, { 'Content-Type': 'text/html' })
-          res.end(`<!DOCTYPE html><html><body><p>Completing sign-in…</p><script>
-            const h = new URLSearchParams(location.hash.slice(1));
-            const access_token = h.get('access_token');
-            const refresh_token = h.get('refresh_token');
-            if (access_token) {
-              fetch('/token', { method:'POST', headers:{'Content-Type':'application/json'},
-                body: JSON.stringify({ access_token, refresh_token }) })
-                .then(() => { document.body.innerHTML = '<p>Signed in. Close this tab.</p>'; });
-            }
-          </script></body></html>`)
-          return
-        }
-        if (url.pathname === '/token' && req.method === 'POST') {
-          let body = ''
-          for await (const chunk of req) body += chunk
-          const parsed = JSON.parse(body)
-          res.writeHead(204)
-          res.end()
-          server.close()
-          resolve({
-            access_token: parsed.access_token,
-            refresh_token: parsed.refresh_token,
-          })
-          return
-        }
-        res.writeHead(404)
-        res.end()
-      } catch (e) {
-        reject(e)
-      }
-    })
-    server.listen(callbackPort, '127.0.0.1', async () => {
-      const { error } = await supabase.auth.signInWithOtp({
-        email,
-        options: { emailRedirectTo: redirectTo },
-      })
-      if (error) {
-        server.close()
-        reject(error)
-        return
-      }
-      console.error(`Magic link sent to ${email}. Open it (Mailpit ${mailpitBase()}).`)
-      console.error(`Waiting for callback on ${redirectTo} …`)
+async function readCode() {
+  if (!process.stdin.isTTY) {
+    throw new Error('Pass the code with --code.')
+  }
+  const rl = createInterface({ input: process.stdin, output: process.stderr })
+  try {
+    const answer = await new Promise((resolve) => {
+      rl.question('Code: ', resolve)
     })
-    server.on('error', reject)
-    setTimeout(() => {
-      server.close()
-      reject(new Error('Login timed out after 5 minutes'))
-    }, 5 * 60 * 1000)
+    return String(answer || '').replace(/\s/g, '')
+  } finally {
+    rl.close()
+  }
+}
+
+function finish(tokens) {
+  if (!tokens?.access_token || !tokens?.refresh_token) {
+    throw new Error('Sign-in did not return a session.')
+  }
+  saveSession({
+    access_token: tokens.access_token,
+    refresh_token: tokens.refresh_token,
+  })
+  console.log('Logged in.')
+}
+
+async function verifyEmailCode(supabase, email, code) {
+  const token = String(code || '').replace(/\s/g, '')
+  if (!/^\d{6,10}$/.test(token)) throw new Error('Enter the code from the email.')
+  const { data, error } = await supabase.auth.verifyOtp({
+    email,
+    token,
+    type: 'email',
   })
+  if (error) throw error
+  return data.session
 }
 
-export async function loginWithMagicLink(email) {
+export async function loginWithMagicLink(email, { code } = {}) {
   loadDotEnv()
-  const preferred = Number(process.env.AMORPHOUS_CLI_CALLBACK_PORT || 8765)
-  const port = await freePort(preferred)
-  const redirectTo = `http://127.0.0.1:${port}/callback`
   const supabase = createClient(supabaseUrl(), supabaseAnonKey())
-  const sinceMs = Date.now()
 
-  let tokens
-  if (await mailpitReachable()) {
+  if (!code && (await mailpitReachable())) {
+    const preferred = Number(process.env.AMORPHOUS_CLI_CALLBACK_PORT || 8765)
+    const port = await freePort(preferred)
+    const redirectTo = `http://127.0.0.1:${port}/callback`
+    const sinceMs = Date.now()
     const { error } = await supabase.auth.signInWithOtp({
       email,
       options: { emailRedirectTo: redirectTo },
     })
     if (error) throw error
-    console.error(`Magic link sent to ${email}. Reading Mailpit (${mailpitBase()})…`)
-    tokens = await loginViaMailpit(supabase, email, redirectTo, sinceMs)
-  } else {
-    tokens = await loginViaCallbackServer(supabase, email, redirectTo)
+    console.error(`Code sent to ${email}. Reading the local mail catcher…`)
+    finish(await loginViaMailpit(supabase, email, redirectTo, sinceMs))
+    return
   }
 
-  saveSession({
-    access_token: tokens.access_token,
-    refresh_token: tokens.refresh_token,
-  })
-  console.log('Logged in.')
+  if (!code) {
+    const { error } = await supabase.auth.signInWithOtp({ email })
+    if (error) throw error
+    console.error(`Code sent to ${email}.`)
+    code = await readCode()
+  }
+
+  finish(await verifyEmailCode(supabase, email, code))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amorphous-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Command line for Amorphous",
   "type": "module",
   "bin": {