@dalehkx/quote-cli 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dalehkx/quote-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "通用询报价 CLI 工具",
   "type": "module",
   "bin": {

package/src/commands/inquiry.mjs

@@ -123,11 +123,19 @@ export function registerInquiryCommands(program) {
     .description('监听询价单报价状态（有新报价时提醒）')
     .argument('<id>', '询价单 ID')
     .option('-i, --interval <seconds>', '轮询间隔（秒）', '30')
+    .option('--timeout <seconds>', '最长等待时间（秒），超时后退出，0=不限制', '0')
+    .option('--exit-on-quotes <n>', '收到 n 条报价后自动退出', '0')
+    .option('--json', '以 JSON 格式输出结果（适合脚本/AI 调用）')
     .action(async (id, opts) => {
-      const adapter  = getAdapter();
-      const interval = Math.max(10, parseInt(opts.interval, 10)) * 1000;
-
-      console.log(`监听询价单 ${id}，每 ${interval / 1000} 秒检查一次，Ctrl+C 退出\n`);
+      const adapter       = getAdapter();
+      const interval      = Math.max(10, parseInt(opts.interval, 10)) * 1000;
+      const timeout       = parseInt(opts.timeout, 10) * 1000;
+      const exitOnQuotes  = parseInt(opts.exitOnQuotes, 10);
+      const startTime     = Date.now();
+
+      if (!opts.json) {
+        console.log(`监听询价单 ${id}，每 ${interval / 1000} 秒检查一次，Ctrl+C 退出\n`);
+      }
 
       let lastQuoteCount = 0;
       let lastStatus     = '';
@@ -139,20 +147,43 @@ export function registerInquiryCommands(program) {
           const count   = replies.length;
           const time    = new Date().toLocaleTimeString();
 
+          // 超时退出
+          if (timeout > 0 && Date.now() - startTime >= timeout) {
+            if (opts.json) {
+              console.log(JSON.stringify({ inquiryId: id, status: record.status, quotes: replies, timedOut: true }));
+            } else {
+              console.log(`\n[${time}] 等待超时，共 ${count} 条报价`);
+            }
+            process.exit(0);
+          }
+
+          // 达到目标报价数退出
+          if (exitOnQuotes > 0 && count >= exitOnQuotes) {
+            if (opts.json) {
+              console.log(JSON.stringify({ inquiryId: id, status: record.status, quotes: replies }));
+            } else {
+              console.log(`\n[${time}] 已收到 ${count} 条报价，退出监听`);
+              replies.forEach(r => console.log(`  ${r.supplier} | ¥${r.price} | ${r.brand || '-'} | ${r.delivery ? r.delivery + '天' : '货期未知'}`));
+            }
+            process.exit(0);
+          }
+
           if (count > lastQuoteCount) {
-            console.log(`\n[${time}] 🔔 新报价！共 ${count} 条`);
-            replies.slice(lastQuoteCount).forEach(r => {
-              console.log(`  ${r.supplier} | ¥${r.price} | ${r.brand || '-'} | ${r.delivery ? r.delivery + '天' : '货期未知'}`);
-            });
+            if (!opts.json) {
+              console.log(`\n[${time}] 🔔 新报价！共 ${count} 条`);
+              replies.slice(lastQuoteCount).forEach(r => {
+                console.log(`  ${r.supplier} | ¥${r.price} | ${r.brand || '-'} | ${r.delivery ? r.delivery + '天' : '货期未知'}`);
+              });
+            }
             lastQuoteCount = count;
           } else if (record.status !== lastStatus) {
-            console.log(`[${time}] 状态变更: ${lastStatus || '-'} → ${record.status}  报价: ${count} 条`);
+            if (!opts.json) console.log(`[${time}] 状态变更: ${lastStatus || '-'} → ${record.status}  报价: ${count} 条`);
             lastStatus = record.status;
           } else {
-            process.stdout.write(`\r[${time}] 等待报价... 当前 ${count} 条`);
+            if (!opts.json) process.stdout.write(`\r[${time}] 等待报价... 当前 ${count} 条`);
           }
         } catch (e) {
-          console.error(`\n[错误] ${e.message}`);
+          if (!opts.json) console.error(`\n[错误] ${e.message}`);
         }
       };
 

package/src/commands/login.mjs

@@ -28,7 +28,6 @@ export function registerLoginCommands(program) {
       try {
         let tokenData;
 
-        // --test 强制走短信登录，手机号固定为测试账号
         if (opts.test || opts.sms) {
           const cellphone = opts.test ? TEST_PHONE : (opts.username || await ask('手机号: '));
 
@@ -56,10 +55,8 @@ export function registerLoginCommands(program) {
 
           tokenData = await loginWithCellphone(apiBase, cellphone, verifyCode);
         } else {
-          // 账号密码登录
           const username = opts.username || await ask('账号: ');
 
-          // 检查账号是否存在
           process.stdout.write('正在检查账号...');
           const exists = await checkAccountExists(apiBase, username);
           if (!exists) {
@@ -93,12 +90,32 @@ export function registerLoginCommands(program) {
     .option('-u, --username <name>', '用户名')
     .option('--phone <phone>', '手机号')
     .option('-p, --password <pwd>', '密码')
+    .option('--code <code>', '验证码（非交互：先用 --send-code 发送）')
+    .option('--send-code', '仅发送注册验证码，不完成注册')
+    .option('--company <name>', '公司/门店名称')
+    .option('--province-id <id>', '省级 geoId（如 CN-11）')
+    .option('--province-name <name>', '省名称（如 北京市）')
+    .option('--city-id <id>', '市级 geoId（如 1351）')
+    .option('--city-name <name>', '市名称')
+    .option('--county-id <id>', '区县 geoId（如 9629）')
+    .option('--county-name <name>', '区县名称')
     .option('--api-base <url>', 'API 地址', API_BASE_DEFAULT)
     .action(async (opts) => {
       const store = new Store();
       const config = store.getConfig();
       const apiBase = opts.apiBase || config.apiBase || API_BASE_DEFAULT;
 
+      // 仅发送验证码模式
+      if (opts.sendCode) {
+        if (!opts.phone) { console.error('✗ 请提供 --phone <手机号>'); process.exit(1); }
+        process.stdout.write('正在发送验证码...');
+        await sendRegisterCode(apiBase, opts.phone);
+        console.log(' 已发送，请查收短信后带 --code 完成注册');
+        return;
+      }
+
+      const isNonInteractive = opts.phone && opts.password && opts.username && opts.code;
+
       const rl = createInterface({ input: process.stdin, output: process.stdout });
       const ask = (q) => new Promise((resolve) => rl.question(q, resolve));
       const askHidden = (q) => new Promise((resolve) => {
@@ -112,14 +129,9 @@ export function registerLoginCommands(program) {
             process.stdin.removeListener('data', onData);
             process.stdout.write('\n');
             resolve(input);
-          } else if (ch === '') {
-            process.exit();
-          } else if (ch === '') {
-            input = input.slice(0, -1);
-          } else {
-            input += ch;
-            process.stdout.write('*');
-          }
+          } else if (ch === '') { process.exit(); }
+          else if (ch === '') { input = input.slice(0, -1); }
+          else { input += ch; process.stdout.write('*'); }
         };
         process.stdin.resume();
         process.stdin.setEncoding('utf8');
@@ -129,68 +141,69 @@ export function registerLoginCommands(program) {
       try {
         const cellphone = opts.phone || await ask('手机号: ');
 
-        // 检查是否已注册
         process.stdout.write('正在检查账号...');
         const exists = await checkAccountExists(apiBase, cellphone);
+        console.log(exists ? ' 已注册' : ' 未注册');
         if (exists) {
-          console.log('');
-          console.error('✗ 该手机号已注册，请直接登录: quote login --sms');
-          rl.close();
-          process.exit(1);
+          console.error('✗ 该手机号已注册，请直接登录: quote login');
+          rl.close(); process.exit(1);
         }
-        console.log(' 未注册');
 
-        // 发送注册验证码
-        process.stdout.write('正在发送验证码...');
-        await sendRegisterCode(apiBase, cellphone);
-        console.log(' 已发送');
+        if (!isNonInteractive) {
+          process.stdout.write('正在发送验证码...');
+          await sendRegisterCode(apiBase, cellphone);
+          console.log(' 已发送');
+        }
 
-        const verifyCode  = await ask('验证码: ');
-        const username    = opts.username || await ask('用户名: ');
-        const password    = opts.password || await askHidden('密码: ');
+        const verifyCode = opts.code     || await ask('验证码: ');
+        const username   = opts.username || await ask('用户名: ');
+        const password   = opts.password || await askHidden('密码: ');
 
-        rl.close();
+        if (!isNonInteractive) rl.close();
 
         await registerUser(apiBase, { cellphone, password, username, verificationCode: verifyCode });
-
         console.log('✓ 注册成功，正在自动登录...');
 
         store.setConfig({ apiBase, mode: 'api' });
         const tokenData = await loginWithPassword(apiBase, cellphone, password);
         console.log(`✓ 登录成功  用户: ${tokenData.userLoginId || username}`);
 
-        // 引导完善公司信息
+        // 公司信息 —— 有 flag 则非交互
+        if (opts.company && opts.provinceId && opts.cityId && opts.countyId) {
+          await saveCompanyInfo(apiBase, {
+            companyName:  opts.company,
+            provinceId:   opts.provinceId,   provinceName: opts.provinceName || '',
+            cityId:       opts.cityId,       cityName:     opts.cityName     || '',
+            countyId:     opts.countyId,     countyName:   opts.countyName   || '',
+          });
+          console.log('✓ 公司信息已保存，使用 quote inquiry create 发布询价');
+          rl.close();
+          return;
+        }
+
         console.log('\n完善公司/门店信息（发布询价必须）:');
         const companyName = await ask('公司/门店名称: ');
 
-        // 选省
         const provinces = await fetchAreas(apiBase, 'CHN');
         provinces.forEach((p, i) => process.stdout.write(`  ${String(i + 1).padStart(2)}. ${p.geoName}\n`));
-        const pIdx = parseInt(await ask(`选择省份 (1-${provinces.length}): `), 10) - 1;
-        const province = provinces[pIdx];
+        const province = provinces[parseInt(await ask(`选择省份 (1-${provinces.length}): `), 10) - 1];
 
-        // 选市
         const cities = await fetchAreas(apiBase, province.geoId);
         cities.forEach((c, i) => process.stdout.write(`  ${String(i + 1).padStart(2)}. ${c.geoName}\n`));
-        const cIdx = parseInt(await ask(`选择城市 (1-${cities.length}): `), 10) - 1;
-        const city = cities[cIdx];
+        const city = cities[parseInt(await ask(`选择城市 (1-${cities.length}): `), 10) - 1];
 
-        // 选区县
         const counties = await fetchAreas(apiBase, city.geoId);
         counties.forEach((d, i) => process.stdout.write(`  ${String(i + 1).padStart(2)}. ${d.geoName}\n`));
-        const dIdx = parseInt(await ask(`选择区县 (1-${counties.length}): `), 10) - 1;
-        const county = counties[dIdx];
+        const county = counties[parseInt(await ask(`选择区县 (1-${counties.length}): `), 10) - 1];
 
         rl.close();
-
         await saveCompanyInfo(apiBase, {
           companyName,
-          provinceId:   province.geoId, provinceName: province.geoName,
-          cityId:       city.geoId,     cityName:     city.geoName,
-          countyId:     county.geoId,   countyName:   county.geoName,
+          provinceId: province.geoId, provinceName: province.geoName,
+          cityId:     city.geoId,     cityName:     city.geoName,
+          countyId:   county.geoId,   countyName:   county.geoName,
         });
-        console.log('✓ 公司信息已保存');
-        console.log('账号已准备就绪，使用 quote inquiry create 发布询价');
+        console.log('✓ 公司信息已保存，使用 quote inquiry create 发布询价');
       } catch (err) {
         rl.close();
         console.error(`✗ 注册失败: ${err.message}`);
@@ -202,10 +215,7 @@ export function registerLoginCommands(program) {
     .command('logout')
     .description('登出（清除本地令牌）')
     .action(() => {
-      if (!isLoggedIn()) {
-        console.log('当前未登录');
-        return;
-      }
+      if (!isLoggedIn()) { console.log('当前未登录'); return; }
       logout();
       console.log('✓ 已登出，令牌已清除');
     });