@blod-nm/1kuan-act-01-cli 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blod-nm/1kuan-act-01-cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "description": "Internal operations CLI: invoke preset database functions via a gateway. Zero dependencies, MCP (stdio) support.",
   "license": "MIT",

package/src/main.js

@@ -70,6 +70,9 @@ async function readStdinText() {
   return Buffer.concat(chunks).toString('utf8').trim()
 }
 
+/** 领取入口提示:二维码内容是站内 goto 协议,要在我们小程序里扫 */
+const SCAN_TIP = '打开我们的「1010」小程序 →「我的」→「常用」→「扫码支付」,扫上面二维码即可领取'
+
 /** 网关可能把 jsonb 当字符串回,统一解析一次 */
 function parseJsonResult(value) {
   if (typeof value !== 'string') return value
@@ -557,9 +560,11 @@ async function cmdCreate(argv) {
     console.log('about to deduct from account and create:')
     for (const line of confirmSummary(input)) console.log(`  ${line}`)
     process.stdout.write('确认执行? [y/N] ')
-    const chunks = []
-    for await (const chunk of process.stdin) chunks.push(chunk)
-    const answer = Buffer.concat(chunks).toString('utf8').trim().toLowerCase()
+    // 只读一行:TTY 的 stdin 不会 EOF,for-await 会永远等下一个字节
+    const readline = await import('node:readline')
+    const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
+    const answer = await new Promise((resolve) => rl.question('', (a) => resolve(String(a).trim().toLowerCase())))
+    rl.close()
     if (answer !== 'y' && answer !== 'yes') {
       console.log('已取消')
       return 130
@@ -617,7 +622,7 @@ async function cmdCreate(argv) {
       result,
       balanceBefore: balance,
       balanceAfter,
-      qr: qrContent ? { content: qrContent, format: qrMode, path: qrPath } : null,
+      qr: qrContent ? { content: qrContent, format: qrMode, path: qrPath, tip: SCAN_TIP } : null,
     })
   } else {
     console.log(`红包编号     ${packetNo || '(未返回)'}`)
@@ -634,6 +639,7 @@ async function cmdCreate(argv) {
     process.stderr.write(`${renderAnsi(qr, { color: process.env.NO_COLOR === undefined })}\n`)
   }
   if (qrPath) console.error(`二维码已写入: ${qrPath}`)
+  if (qrContent) console.error(`提示: ${SCAN_TIP}`)
   console.error('hint: deducted; recall is not supported — lifecycle is TTL-driven')
   return 0
 }

package/src/mcp.js

@@ -93,7 +93,9 @@ function withClaimTarget(raw) {
   if (!result || typeof result !== 'object') return result
 
   const packetNo = String(result.packet?.data?.packet_no || result.packet?.packet_no || '').trim()
-  return packetNo ? { ...result, qr: { content: claimTarget(packetNo) } } : result
+  return packetNo
+    ? { ...result, qr: { content: claimTarget(packetNo), tip: '打开我们的「1010」小程序 →「我的」→「常用」→「扫码支付」,扫码即可领取' } }
+    : result
 }
 
 /** 导出仅为测试:mock tcb 后可以直接断言工具返回形状 */

package/src/tcb.js

@@ -39,6 +39,8 @@ export const ACCOUNT_SQL = `
 export async function execPgsql(config, apikey, sql) {
   const base = gatewayBase(config)
   let res
+  const abort = new AbortController()
+  const timer = setTimeout(() => abort.abort(), 45000)
   try {
     res = await fetch(`${base}/v1/rdb/exec-pgsql`, {
       method: 'POST',
@@ -47,9 +49,13 @@ export async function execPgsql(config, apikey, sql) {
         Authorization: `Bearer ${apikey}`,
       },
       body: JSON.stringify({ sql, role: PG_ROLE }),
+      signal: abort.signal,
     })
   } catch (err) {
-    throw new Error(`网关连接失败:${err instanceof Error ? err.message : String(err)}`)
+    const timedOut = err instanceof Error && err.name === 'AbortError'
+    throw new Error(timedOut ? '网关请求超时(45s)' : `网关连接失败:${err instanceof Error ? err.message : String(err)}`)
+  } finally {
+    clearTimeout(timer)
   }
 
   const text = await res.text()

package/src/version.js

@@ -3,4 +3,4 @@
  * (test/version.test.js 会断言两者一致,防止再漏升)。
  */
 
-export const VERSION = '0.2.2'
+export const VERSION = '0.2.4'