@dalehkx/quote-cli 0.3.0 → 0.3.3

package/bin/quote.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { createRequire } from 'node:module';
 import { Command } from 'commander';
 import { registerInquiryCommands } from '../src/commands/inquiry.mjs';
 import { registerReplyCommands } from '../src/commands/reply.mjs';
@@ -8,12 +9,23 @@ import { registerOrderCommands } from '../src/commands/order.mjs';
 import { registerConfigCommands } from '../src/commands/config.mjs';
 import { registerLoginCommands } from '../src/commands/login.mjs';
 
+const { version } = createRequire(import.meta.url)('../package.json');
+
 const program = new Command();
 
 program
   .name('quote')
   .description('通用询报价 CLI 工具')
-  .version('0.1.0');
+  .version(version);
+
+registerInquiryCommands(program);
+registerReplyCommands(program);
+registerCompareCommand(program);
+registerOrderCommands(program);
+registerConfigCommands(program);
+registerLoginCommands(program);
+
+program.parse();
 
 registerInquiryCommands(program);
 registerReplyCommands(program);

package/package.json

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

package/src/commands/inquiry.mjs

@@ -138,26 +138,36 @@ export function registerInquiryCommands(program) {
       }
 
       // 阶段一：记录上一次的状态和报价数，用于判断是否需要进入阶段二
-      let lastRawStatusId  = '';
-      let lastQuoteCount   = 0;
+      // isFirstCheck=true 时只建立基准，不输出报价
+      let lastRawStatusId = '';
+      let lastQuoteCount  = -1;  // -1 表示尚未初始化
 
       /**
        * 阶段二：调 detailV2 拉完整报价，输出给用户
        * 返回本次报价数量
+       *
+       * 状态接口和报价数据存在短暂不一致，最多重试 5 次（间隔 3s）
        */
-      const fetchAndReport = async () => {
-        const record  = await adapter.getInquiry(id);
-        const replies = await adapter.listReplies(id);
+      const fetchAndReport = async (silent = false) => {
+        const record = await adapter.getInquiry(id);
+        let replies = [];
+        for (let attempt = 0; attempt < 5; attempt++) {
+          replies = await adapter.listReplies(id);
+          if (replies.length > 0 || silent) break;
+          await new Promise(r => setTimeout(r, 3000));
+        }
         const count   = replies.length;
         const time    = new Date().toLocaleTimeString();
 
-        if (opts.json) {
-          console.log(JSON.stringify({ inquiryId: id, status: record.status, quotes: replies }));
-        } else {
-          console.log(`\n[${time}] 🔔 有报价！共 ${count} 条`);
-          replies.slice(lastQuoteCount).forEach(r => {
-            console.log(`  ${r.supplier} | ¥${r.price} | ${r.brand || '-'} | ${r.delivery ? r.delivery + '天' : '货期未知'}`);
-          });
+        if (!silent) {
+          if (opts.json) {
+            console.log(JSON.stringify({ inquiryId: id, status: record.status, quotes: replies }));
+          } else {
+            console.log(`\n[${time}] 🔔 新报价！共 ${count} 条`);
+            replies.slice(Math.max(0, lastQuoteCount)).forEach(r => {
+              console.log(`  ${r.supplier} | ¥${r.price} | ${r.brand || '-'} | ${r.delivery ? r.delivery + '天' : '货期未知'}`);
+            });
+          }
         }
         return count;
       };
@@ -169,38 +179,38 @@ export function registerInquiryCommands(program) {
         try {
           // 超时退出
           if (timeout > 0 && Date.now() - startTime >= timeout) {
-            if (!opts.json) console.log(`\n等待超时，共 ${lastQuoteCount} 条报价`);
-            else console.log(JSON.stringify({ inquiryId: id, timedOut: true, quoteCount: lastQuoteCount }));
+            if (!opts.json) console.log(`\n等待超时，共 ${Math.max(0, lastQuoteCount)} 条报价`);
+            else console.log(JSON.stringify({ inquiryId: id, timedOut: true, quoteCount: Math.max(0, lastQuoteCount) }));
             process.exit(0);
           }
 
           const poll = await adapter.pollInquiryStatus(id);
           if (!poll) return;
 
-          const time = new Date().toLocaleTimeString();
+          const time         = new Date().toLocaleTimeString();
+          const isFirstCheck = lastQuoteCount === -1;
           const statusChanged = poll.rawStatusId !== lastRawStatusId;
 
-          // 首次检查，或状态变成"已报价"，或已经处于报价状态（可能有新供应商加入）
-          const shouldFetchDetail =
-            lastRawStatusId === ''                             ||  // 首次
-            (statusChanged && poll.status !== 'pending')      ||  // 状态跳变到有报价
-            poll.status === 'quoted';                              // 持续处于报价状态，可能新增
-
-          if (shouldFetchDetail) {
-            const count = await fetchAndReport();
-
-            if (count > lastQuoteCount && !opts.json) {
-              // 已在 fetchAndReport 里打印了新报价，这里只更新计数
-            }
-
+          if (isFirstCheck) {
+            // 首次：静默拉一次，建立基准值
+            const count = await fetchAndReport(true);
             lastQuoteCount  = count;
             lastRawStatusId = poll.rawStatusId;
-
-            // 达到目标报价数退出
-            if (exitOnQuotes > 0 && count >= exitOnQuotes) {
+            if (!opts.json) {
+              if (count > 0) {
+                console.log(`[${time}] 初始状态: ${poll.rawStatusId}，已有 ${count} 条报价，继续监听新报价...`);
+              } else {
+                console.log(`[${time}] 初始状态: ${poll.rawStatusId}，等待报价中...`);
+              }
+            }
+          } else if ((statusChanged && poll.status !== 'pending') || poll.status === 'quoted') {
+            // 状态跳变到有报价，或持续处于已报价状态（可能新增供应商）
+            const count = await fetchAndReport(false);
+            if (count > 0) {
               if (!opts.json) console.log(`\n已收到 ${count} 条报价，退出监听`);
               process.exit(0);
             }
+            // 重试后仍为 0，继续轮询等数据同步
           } else {
             if (statusChanged) {
               if (!opts.json) console.log(`\n[${time}] 状态变更: ${lastRawStatusId || '-'} → ${poll.rawStatusId}`);