byt-lingxiao-ai 0.3.5 → 0.3.6

package/components/AiMessage.vue

@@ -30,129 +30,6 @@ marked.setOptions({
   breaks: true,
   gfm: true
 });
-function parseMarkdown(text) {
-  if (!text) return '';
-  let html = text;
-  
-  html = html.replace(/```(\w+)?\n([\s\S]*?)```/g, (match, lang, code) => {
-    return `<pre><code class="language-${lang || 'text'}">${escapeHtml(code.trim())}</code></pre>`;
-  });
-  html = html.replace(/`([^`]+)`/g, '<code>$1</code>');
-  html = parseTable(html);
-  
-  html = html.replace(/^#### (.*$)/gm, '<h4>$1</h4>');
-  html = html.replace(/^### (.*$)/gm, '<h3>$1</h3>');
-  html = html.replace(/^## (.*$)/gm, '<h2>$1</h2>');
-  html = html.replace(/^# (.*$)/gm, '<h1>$1</h1>');
-  
-  html = html.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>');
-  
-  html = html.replace(/\*(.*?)\*/g, '<em>$1</em>');
-  
-  html = html.replace(/~~(.*?)~~/g, '<del>$1</del>');
-  
-  html = html.replace(/^\s*[-*+]\s+(.+)$/gm, '<li>$1</li>');
-  html = html.replace(/(<li>.*?<\/li>)/gs, '<ul>$1</ul>');
-  
-  html = html.replace(/^\s*\d+\.\s+(.+)$/gm, '<li>$1</li>');
-  
-  html = html.replace(/^>\s+(.+)$/gm, '<blockquote>$1</blockquote>');
-  // 解析Markdown链接
-  html = html.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" aria-current="page">$1</a>');
-  
-  html = html.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '<img src="$2" alt="$1" />');
-  
-  html = html.replace(/^-{3,}$/gm, '<hr>');
-  // 解析简单URL
-  // const simpleUrlRegex = /(https?:\/\/[^\s<>"']+)/g;
-  // html = html.replace(simpleUrlRegex, (match) => {
-  //   return `<a href="${match}" aria-current="page">${match}</a>`;
-  // });
-  
-  // html = html.replace(/\n/g, '<br>');
-  
-  return html;
-}
-// 解析表格
-function parseTable(text) {
-  const lines = text.split('\n');
-  let result = [];
-  let inTable = false;
-  let tableRows = [];
-  
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
-    
-    // 检测表格行
-    if (line.includes('|') && line.split('|').length >= 3) {
-      if (!inTable) {
-        inTable = true;
-        tableRows = [];
-      }
-      tableRows.push(line);
-      
-      // 检查下一行是否还是表格
-      if (i === lines.length - 1 || !lines[i + 1].includes('|')) {
-        // 表格结束
-        result.push(renderTable(tableRows));
-        inTable = false;
-        tableRows = [];
-      }
-    } else {
-      if (inTable) {
-        // 表格意外结束
-        result.push(renderTable(tableRows));
-        inTable = false;
-        tableRows = [];
-      }
-      result.push(line);
-    }
-  }
-  
-  return result.join('\n');
-}
-// 渲染表格
-function renderTable(rows) {
-  if (rows.length < 2) return rows.join('\n');
-  
-  let html = '<div class="table-wrapper"><table class="markdown-table">';
-  
-  // 表头
-  const headerCells = rows[0].split('|').filter(cell => cell.trim());
-  html += '<thead><tr>';
-  headerCells.forEach(cell => {
-    html += `<th>${cell.trim()}</th>`;
-  });
-  html += '</tr></thead>';
-  
-  // 表体（跳过分隔行）
-  html += '<tbody>';
-  for (let i = 2; i < rows.length; i++) {
-    const cells = rows[i].split('|').filter(cell => cell.trim());
-    if (cells.length > 0) {
-      html += '<tr>';
-      cells.forEach(cell => {
-        html += `<td><div class="table-cell">${cell.trim()}</div></td>`;
-      });
-      html += '</tr>';
-    }
-  }
-  html += '</tbody>';
-  
-  html += '</table></div>';
-  return html;
-}
-// HTML 转义
-function escapeHtml(text) {
-  const map = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#039;'
-  };
-  return text.replace(/[&<>"']/g, m => map[m]);
-}
 
 export default {
   name: 'AiMessage',
@@ -167,7 +44,7 @@ export default {
       return this.message.thinkingExpanded !== false;
     },
     renderedContent() {
-      return parseMarkdown(this.message.content);
+      return marked.parse(this.message.content || '');
     },
     isLoading() {
       return this.message.loading === true;
@@ -335,6 +212,19 @@ export default {
 .markdown-body ::v-deep h4 {
   font-size: 16px;
 }
+.markdown-body ::v-deep ol {
+  list-style-type: decimal; /* 确保显示数字 */
+  padding-left: 24px;
+  margin: 8px 0;
+}
+.markdown-body ::v-deep ul {
+  list-style-type: disc; /* 确保显示圆点 */
+  padding-left: 24px;
+  margin: 8px 0;
+}
+.markdown-body ::v-deep li {
+  display: list-item; /* 确保是列表项显示 */
+}
 
 .markdown-body ::v-deep code {
   background-color: rgba(175, 184, 193, 0.2);
@@ -367,52 +257,44 @@ export default {
   color: #24292e;
   font-size: 14px;
 }
-.markdown-body ::v-deep .table-wrapper{
-  overflow-x: auto;
+.markdown-body ::v-deep table{
   border: 1px solid #dfe2e5;
+  max-height: 500px;
   margin: 12px 0;
-}
-.markdown-body ::v-deep .markdown-table {
   border-collapse: collapse;
   width: 100%;
-  font-size: 14px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  overflow: hidden;
-  margin: -1px 0 0 -1px;
+  display: block;
+  overflow: auto;
 }
 /* 定义table的滚动条 */
-.markdown-body ::v-deep .table-wrapper::-webkit-scrollbar {
+.markdown-body ::v-deep table::-webkit-scrollbar {
   height: 6px;
 }
-.markdown-body ::v-deep .table-wrapper::-webkit-scrollbar-track {
+.markdown-body ::v-deep table::-webkit-scrollbar-track {
   background-color: #f3f4f6;
 }
-.markdown-body ::v-deep .table-wrapper::-webkit-scrollbar-thumb {
+.markdown-body ::v-deep table::-webkit-scrollbar-thumb {
   background-color: #d1d5db;
   border-radius: 3px;
 }
-.markdown-body ::v-deep .table-wrapper::-webkit-scrollbar-thumb:hover {
+.markdown-body ::v-deep table::-webkit-scrollbar-thumb:hover {
   background-color: #9ca3af;
 }
 
-.markdown-body ::v-deep .table-cell {
-  min-width: 100px;
-  text-align: left;
-}
-.markdown-body ::v-deep .markdown-table th,
-.markdown-body ::v-deep .markdown-table td {
+.markdown-body ::v-deep table th,
+.markdown-body ::v-deep table td {
   border: 1px solid #dfe2e5;
   padding: 10px 14px;
   text-align: left;
 }
 
-.markdown-body ::v-deep .markdown-table th {
+.markdown-body ::v-deep table th {
   background-color: #f3f4f6;
   font-weight: 600;
   color: #374151;
 }
 
-.markdown-body ::v-deep .markdown-table tr:nth-child(even) {
+.markdown-body ::v-deep table tr:nth-child(even) {
   background-color: #f9fafb;
 }
 

package/components/ChatWindow.vue

@@ -137,6 +137,7 @@ export default {
   },
   methods: {
     toggleWindow() {
+      if (this.avaterStatus === 'thinking') return;
       this.visible = !this.visible
       
       if (this.visible) {

package/components/config/index.js

@@ -1,8 +1,11 @@
-const baseUrl = window.location.protocol + '//' + window.location.hostname;
+const protocol = window.location.protocol;
+const host = window.location.hostname;
+const baseUrl = `${protocol}//${host}`;
 const chatPort = '3100';
+const voicePort = '3101';
 
 console.log(baseUrl, chatPort);
 export const API_URL = `${baseUrl}:${chatPort}/lingxiao-byt/api/v1/mcp/ask`;
-export const WS_URL = 'ws://192.168.8.9:9999/ai_model/ws/voice-stream';
+export const WS_URL = `ws://${host}:${voicePort}/ai_model/ws/voice-stream`;
 export const AUDIO_URL = '/minio/lingxiaoai/byt.mp3';
 export const TIME_JUMP_POINTS_URL = '/minio/lingxiaoai/timeJumpPoints.json';

package/components/mixins/audioMixin.js

@@ -6,9 +6,7 @@ export default {
       audioContext: null,
       microphone: null,
       processor: null,
-      audioBuffer: new Float32Array(0),
-      // 优化
-      int16Buffer: null
+      audioBuffer: new Float32Array(0)
     }
   },
   methods: {
@@ -20,21 +18,15 @@ export default {
           audio: {
             sampleRate: this.SAMPLE_RATE,
             channelCount: 1,
-            noiseSuppression: true,
-            echoCancellation: true
+            noiseSuppression: false,
+            echoCancellation: false,
+            autoGainControl: false,
           }
         });
 
         this.audioContext = new AudioContext({ sampleRate: this.SAMPLE_RATE });
-
-        // 优化 处理 AudioContext 挂起
-        if (this.audioContext.state === 'suspended') {
-          await this.audioContext.resume();
-        }
-
         this.microphone = this.audioContext.createMediaStreamSource(stream);
         this.processor = this.audioContext.createScriptProcessor(this.FRAME_SIZE, 1, 1);
-        this.int16Buffer = new Int16Array(this.FRAME_SIZE);
         this.processor.onaudioprocess = this.processAudio;
         
         this.microphone.connect(this.processor);
@@ -53,20 +45,19 @@ export default {
       if (!this.isRecording) return;
       const inputData = event.inputBuffer.getChannelData(0);
 
-      if (this.ws && this.ws.readyState === this.ws.OPEN) {
-        if (inputData.length !== this.int16Buffer.length) {
-          this.int16Buffer = new Int16Array(inputData.length);
-        }
+      const tempBuffer = new Float32Array(this.audioBuffer.length + inputData.length);
+      tempBuffer.set(this.audioBuffer, 0);
+      tempBuffer.set(inputData, this.audioBuffer.length);
+      this.audioBuffer = tempBuffer;
 
-        for (let i = 0; i < inputData.length; i++) {
-          let s = inputData[i];
-          // 简单的 clamp
-          s = s < -1 ? -1 : s > 1 ? 1 : s;
-          this.int16Buffer[i] = s < 0 ? s * 0x8000 : s * 0x7FFF;
-        }
+      while (this.audioBuffer.length >= this.FRAME_SIZE) {
+        const frame = this.audioBuffer.slice(0, this.FRAME_SIZE);
+        this.audioBuffer = this.audioBuffer.slice(this.FRAME_SIZE);
+        const pcmData = this.floatTo16BitPCM(frame);
 
-        // 4. 发送数据
-        this.ws.send(this.int16Buffer.buffer);
+        if (this.ws && this.ws.readyState === this.ws.OPEN) {
+          this.ws.send(pcmData);
+        }
       }
     },
 
@@ -98,6 +89,7 @@ export default {
     },
 
     pause() {
+      console.log('暂停播放');
       this.robotStatus = 'waiting';
       this.$refs.audioPlayer.pause();
     },
@@ -125,6 +117,7 @@ export default {
         this.pause();
       } else if (command === 'C6') {
         this.robotStatus = 'leaving';
+        this.avaterStatus = 'normal';
         this.stop();
       }
     }

package/components/mixins/messageMixin.js

@@ -64,7 +64,7 @@ export default {
 
       try {
         const startTime = Date.now();
-        const token = getCookie('bonyear-access_token') || `e298f087-85bc-48c2-afb9-7c69ffc911aa`;
+        const token = getCookie('bonyear-access_token') || `44e7f112-63f3-429d-908d-2c97ec380de2`;
         
         const response = await fetch(API_URL, {
           method: 'POST',
@@ -72,7 +72,7 @@ export default {
             'Content-Type': 'application/json',
             'Authorization': `Bearer ${token}`,
           },
-          body: JSON.stringify({ content: message, chatId: this.chatId })
+          body: JSON.stringify({ content: message, chat_id: this.chatId })
         });
 
         if (!response.ok) {
@@ -126,9 +126,10 @@ export default {
           if (done) break;
           
           const chunk = decoder.decode(value, { stream: true });
-          
+          console.log('收到数据块:', chunk);
           // 使用解析器处理数据块，确保this指向正确
           this.streamParser.processChunk(chunk, function(result) {
+            console.log('处理数据块:', result);
             self.handleStreamUpdate(result);
           });
         }
@@ -154,6 +155,7 @@ export default {
       }
 
       // 更新回复内容
+      console.log('更新回复内容:', result.content);
       if (result.content) {
         this.currentMessage.content += result.content;
       }

package/components/mixins/webSocketMixin.js

@@ -75,6 +75,10 @@ export default {
     handleWebSocketMessage(data) {
       if (data.type === 'detection') {
         console.log('检测到唤醒词');
+        console.log('当前状态:', this.avaterStatus);
+        if (this.robotStatus === 'speaking') {
+          this.robotStatus = 'waiting';
+        }
         this.avaterStatus = 'normal';
 
         // 性能检测起点
@@ -97,6 +101,8 @@ export default {
         this.analyzeAudioCommand(data.category);
       } else {
         console.log('状态: 其他');
+        this.avaterStatus = 'normal';
+        this.robotStatus = 'leaving';
       }
     },