@localauth/cli 0.4.1 → 0.4.2

package/cli/ask.ts

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process'
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
-import { answerFields, isAskRequest, isFieldName, isReservedName, MAX_APPROVAL_DESCRIPTION } from '../shared/ask.ts'
+import { answerFields, isApproval, isAskRequest, isFieldName, isReservedName, MAX_APPROVAL_DESCRIPTION } from '../shared/ask.ts'
 import { setTimeout as sleep } from 'node:timers/promises'
 import type { AnswerData, AskRequest, RunData } from '../shared/protocol.ts'
 import { isAnswer } from '../shared/validation.ts'
@@ -201,7 +201,7 @@ export async function approve(connection: Connection, options: ApproveOptions, s
           if (message.kind === 'decline') { decided = false; break }
           if (message.kind !== 'answer' || typeof message.data !== 'string' || !message.data.startsWith('a1.')) continue
           let value = await run.openMessage<AnswerData>('answer', message.data)
-          if (isAnswer(value) && !value.declined && answerFields(value, request)?.APPROVE === 'yes') { decided = true; break }
+          if (isApproval(value)) { decided = true; break }
         }
         if (decided === null) await sleep(Math.min(1500, Math.max(1, expiresAt - Date.now())), undefined, { signal })
       } catch (error) { if (!signal.aborted) throw error }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localauth/cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Finish CLI logins on a headless server from your phone, with optional passkey-based end-to-end encryption",
   "license": "MIT",
   "type": "module",

package/shared/ask.ts

@@ -46,6 +46,11 @@ export function answerFields(answer: unknown, request: AskRequest, legacy = fals
   return Object.fromEntries(request.fields.filter(field => Object.hasOwn(fields, field.name)).map(field => [field.name, fields[field.name]]))
 }
 
+/** Whether an answer approves. Only the answer matters here: an approval's description can be longer than an ask's. */
+export function isApproval(answer: unknown): boolean {
+  return answerFields(answer, { fields: [{ name: 'APPROVE', label: 'Approve', secret: false, required: true }] })?.APPROVE === 'yes'
+}
+
 /** Plain text segments and HTTP(S) URLs only. JSX renders both labels and segments as escaped text. */
 export function descriptionParts(text: string): { text: string; href?: string }[] {
   return text.split(/(https?:\/\/[^\s<>"']+)/g).filter(Boolean).map(text => {