npm - @xdfnet/ispeak - Versions diffs - 1.6.5 → 1.6.7 - Mend

@xdfnet/ispeak 1.6.5 → 1.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/Docs/ARCHITECTURE.md +1 -1
package/Docs/HOOK_TEXT_EXTRACTION.md +241 -0
package/README.md +17 -14
package/clean_text.go +153 -0
package/configs/config.example.json +1 -1
package/configs/hook-speak.sh +173 -96
package/main.go +70 -379
package/npm/postinstall.js +41 -2
package/package.json +4 -2
package/scripts/ispeak +1 -1

package/main.go CHANGED Viewed

@@ -1,5 +1,5 @@
 // ttsd — 独立 TTS 播报守护进程
-// 监听 Unix Socket，收到文本 → 字节跳动 TTS SSE → 流式播放
+// 监听 Unix Socket，收到文本 → 字节跳动 TTS SSE/PCM → 原生流式播放
 package main
 import (
@@ -14,10 +14,8 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"os/exec"
 	"os/signal"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"sync"
 	"syscall"
@@ -43,162 +41,12 @@ var tempDir string
 var errAlreadyRunning = errors.New("iSpeak already running")
-var (
-	markdownLinkRe     = regexp.MustCompile(`\[[^\]]+\]\(([^)]*)\)`)
-	absolutePathRe     = regexp.MustCompile(`/(?:Users|private|tmp|var|opt|usr|bin|sbin|etc|Library|Applications)/\S+`)
-	commitHashRe       = regexp.MustCompile(`\b[0-9a-f]{7,40}\b`)
-	uuidRe             = regexp.MustCompile(`\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b`)
-	urlRe              = regexp.MustCompile(`https?://\S+`)
-	ansiEscapeRe       = regexp.MustCompile(`\x1b\[[0-9;]*[A-Za-z]`)
-	multiSpaceRe       = regexp.MustCompile(`\s+`)
-	markdownListRe     = regexp.MustCompile(`^\s*(?:[-*+]\s+|\d+[.)]\s+)`)
-	htmlTagRe          = regexp.MustCompile(`<[^>]+>`)
-	codeFenceStartRe   = regexp.MustCompile("^```")
-	artifactStartRe    = regexp.MustCompile(`(?i)^<artifact\b`)
-	htmlDocumentLineRe = regexp.MustCompile(`(?i)^<!doctype html|^<html\b|^<head\b|^<body\b|^<style\b|^</`)
-	progressNoiseRe    = regexp.MustCompile(`(?i)(^\s*\d{1,3}%\s*$|\d{1,3}%.*\d+(?:\.\d+)?\s*(?:kb|mb|gb)/s|\bETA\b|^\s*[-=]{3,}\s*$)`)
-	speedNoiseRe       = regexp.MustCompile(`(?i)\d+(?:\.\d+)?\s*(?:kb|mb|gb)/s`)
-	etaNoiseRe         = regexp.MustCompile(`(?i)\bETA\b|预计剩余|剩余时间`)
-	fileListNoiseRe    = regexp.MustCompile(`(?i)\.(?:go|js|ts|tsx|jsx|json|md|yaml|yml|toml|sum|mod|lock|html|css|sh|plist|safetensors|mp3|wav|png|jpg|jpeg|pdf|docx)\b`)
-)
 type StreamPlayer interface {
 	Write(audio []byte) error
 	CloseAndWait() error
 	Abort() error
 }
-type ffplayStreamPlayer struct {
-	path string
-	cmd  *exec.Cmd
-	mu       sync.Mutex
-	stdin    io.WriteCloser
-	waitOnce sync.Once
-	waitErr  error
-}
-func newDefaultStreamPlayer() (StreamPlayer, error) {
-	if path, ok := findExecutable("ffplay", "/opt/homebrew/bin/ffplay", "/usr/local/bin/ffplay"); ok {
-		log.Printf("播放器模式: ffplay 流式 stdin (%s)", path)
-		return newFFplayStreamPlayer(path)
-	}
-	log.Printf("播放器模式: afplay 完整音频 fallback")
-	return &bufferedStreamPlayer{}, nil
-}
-func findExecutable(name string, candidates ...string) (string, bool) {
-	if path, err := exec.LookPath(name); err == nil {
-		return path, true
-	}
-	for _, path := range candidates {
-		if st, err := os.Stat(path); err == nil && !st.IsDir() && st.Mode()&0111 != 0 {
-			return path, true
-		}
-	}
-	return "", false
-}
-func newFFplayStreamPlayer(path string) (*ffplayStreamPlayer, error) {
-	cmd := exec.Command(path, "-nodisp", "-autoexit", "-loglevel", "error", "-i", "pipe:0")
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return nil, err
-	}
-	cmd.Stderr = os.Stderr
-	if err := cmd.Start(); err != nil {
-		_ = stdin.Close()
-		return nil, err
-	}
-	return &ffplayStreamPlayer{path: path, cmd: cmd, stdin: stdin}, nil
-}
-func (p *ffplayStreamPlayer) Write(audio []byte) error {
-	if len(audio) == 0 {
-		return nil
-	}
-	p.mu.Lock()
-	stdin := p.stdin
-	p.mu.Unlock()
-	if stdin == nil {
-		return fmt.Errorf("播放器输入已关闭")
-	}
-	if _, err := stdin.Write(audio); err != nil {
-		return fmt.Errorf("写入播放器失败: %w", err)
-	}
-	return nil
-}
-func (p *ffplayStreamPlayer) CloseAndWait() error {
-	p.mu.Lock()
-	stdin := p.stdin
-	p.stdin = nil
-	p.mu.Unlock()
-	if stdin != nil {
-		if err := stdin.Close(); err != nil {
-			return fmt.Errorf("关闭播放器输入失败: %w", err)
-		}
-	}
-	if err := p.wait(); err != nil {
-		return fmt.Errorf("ffplay failed: %w", err)
-	}
-	return nil
-}
-func (p *ffplayStreamPlayer) Abort() error {
-	p.mu.Lock()
-	stdin := p.stdin
-	p.stdin = nil
-	p.mu.Unlock()
-	if stdin != nil {
-		_ = stdin.Close()
-	}
-	if p.cmd != nil && p.cmd.Process != nil {
-		_ = p.cmd.Process.Kill()
-	}
-	return p.wait()
-}
-func (p *ffplayStreamPlayer) wait() error {
-	p.waitOnce.Do(func() {
-		if p.cmd != nil {
-			p.waitErr = p.cmd.Wait()
-		}
-	})
-	return p.waitErr
-}
-type bufferedStreamPlayer struct {
-	chunks [][]byte
-}
-func (p *bufferedStreamPlayer) Write(audio []byte) error {
-	if len(audio) == 0 {
-		return nil
-	}
-	chunk := append([]byte(nil), audio...)
-	p.chunks = append(p.chunks, chunk)
-	return nil
-}
-func (p *bufferedStreamPlayer) CloseAndWait() error {
-	total := 0
-	for _, chunk := range p.chunks {
-		total += len(chunk)
-	}
-	audio := make([]byte, 0, total)
-	for _, chunk := range p.chunks {
-		audio = append(audio, chunk...)
-	}
-	return playAudio(audio)
-}
-func (p *bufferedStreamPlayer) Abort() error {
-	p.chunks = nil
-	return nil
-}
 // 任务状态
 // 生命周期：pending -> running -> delete
 type TaskStatus int
@@ -332,13 +180,13 @@ func (e *TaskEngine) runTransaction(task *Task) error {
 	if err := e.synthesizeStreamFn(context.Background(), task.Cfg, task.Text, &task.Voice, onAudio); err != nil {
 		_ = player.Abort()
-		return err
+		return fmt.Errorf("TTS 合成失败: id=%d: %w", task.ID, err)
 	}
 	log.Printf("TTS 流结束: id=%d elapsed=%s", task.ID, time.Since(startedAt).Round(time.Millisecond))
 	if err := player.CloseAndWait(); err != nil {
 		_ = player.Abort()
-		return err
+		return fmt.Errorf("播放器失败: id=%d: %w", task.ID, err)
 	}
 	return nil
 }
@@ -463,7 +311,7 @@ func loadConfig() Config {
 	// 回退到环境变量
 	return Config{
 		APIKey:   envOrDefault("IAGENT_TTS_API_KEY", ""),
-		Endpoint: envOrDefault("IAGENT_TTS_ENDPOINT", "https://openspeech.bytedance.com/api/v3/tts/unidirectional"),
+		Endpoint: envOrDefault("IAGENT_TTS_ENDPOINT", "https://openspeech.bytedance.com/api/v3/tts/unidirectional/sse"),
 	}
 }
@@ -496,28 +344,6 @@ type ttsAudioParams struct {
 	SampleRate int    `json:"sample_rate"`
 }
-// 调用字节跳动 TTS API，返回完整 MP3 音频数据。保留给测试和 fallback 使用。
-func synthesize(ctx context.Context, cfg Config, text string, voice *VoiceInfo) ([]byte, error) {
-	var chunks [][]byte
-	if err := synthesizeStream(ctx, cfg, text, voice, func(audio []byte) error {
-		chunk := append([]byte(nil), audio...)
-		chunks = append(chunks, chunk)
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-	total := 0
-	for _, c := range chunks {
-		total += len(c)
-	}
-	result := make([]byte, 0, total)
-	for _, c := range chunks {
-		result = append(result, c...)
-	}
-	return result, nil
-}
 // 调用字节跳动 TTS API，边解析 SSE 边回调 MP3 音频块
 func synthesizeStream(ctx context.Context, cfg Config, text string, voice *VoiceInfo, onAudio func([]byte) error) error {
 	speaker := voice.VoiceType
@@ -532,8 +358,8 @@ func synthesizeStream(ctx context.Context, cfg Config, text string, voice *Voice
 			Text:    text,
 			Speaker: speaker,
 			AudioParams: ttsAudioParams{
-				Format:     "mp3",
-				SampleRate: 24000,
+				Format:     "pcm",
+				SampleRate: 48000,
 			},
 		},
 	}
@@ -590,8 +416,7 @@ func parseSSE(r io.Reader) ([]byte, error) {
 func parseSSEStream(r io.Reader, onAudio func([]byte) error) error {
 	audioChunks := 0
-	scanner := bufio.NewScanner(r)
-	scanner.Buffer(make([]byte, 256*1024), 256*1024)
+	reader := bufio.NewReaderSize(r, 64*1024)
 	var dataLines []string
@@ -608,40 +433,49 @@ func parseSSEStream(r io.Reader, onAudio func([]byte) error) error {
 		return err
 	}
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
+	for {
+		rawLine, err := reader.ReadString('\n')
+		if err != nil && len(rawLine) == 0 {
+			if err == io.EOF {
+				break
+			}
+			return fmt.Errorf("read sse: %w", err)
+		}
+		line := strings.TrimSpace(rawLine)
 		if line == "" {
 			if err := flush(); err != nil {
 				return err
 			}
-			continue
-		}
-		if strings.HasPrefix(line, ":") || strings.HasPrefix(line, "event:") ||
+		} else if strings.HasPrefix(line, ":") || strings.HasPrefix(line, "event:") ||
 			strings.HasPrefix(line, "id:") || strings.HasPrefix(line, "retry:") {
-			continue
-		}
-		if strings.HasPrefix(line, "data:") {
+			// SSE metadata, ignored.
+		} else if strings.HasPrefix(line, "data:") {
 			dataLines = append(dataLines, strings.TrimPrefix(line, "data:"))
-			continue
-		}
-		// 非标准 JSON 直出
-		if err := flush(); err != nil {
-			return err
-		}
-		ok, err := processEvent(line, onAudio)
-		if ok {
-			audioChunks++
+		} else {
+			// 非标准 JSON 直出
+			if err := flush(); err != nil {
+				return err
+			}
+			ok, err := processEvent(line, onAudio)
+			if ok {
+				audioChunks++
+			}
+			if err != nil {
+				return err
+			}
 		}
 		if err != nil {
-			return err
+			if err == io.EOF {
+				break
+			}
+			return fmt.Errorf("read sse: %w", err)
 		}
 	}
 	if err := flush(); err != nil {
 		return err
 	}
-	if err := scanner.Err(); err != nil {
-		return fmt.Errorf("scan: %w", err)
-	}
 	if audioChunks == 0 {
 		return fmt.Errorf("no audio data")
@@ -661,6 +495,10 @@ func processEvent(payload string, onAudio func([]byte) error) (bool, error) {
 		return false, nil
 	}
+	if err := sseEventError(event); err != nil {
+		return false, err
+	}
 	if b64 := extractAudioBase64(event); b64 != "" {
 		data, err := base64.StdEncoding.DecodeString(b64)
 		if err != nil {
@@ -675,6 +513,35 @@ func processEvent(payload string, onAudio func([]byte) error) (bool, error) {
 	return false, nil
 }
+func sseEventError(event map[string]any) error {
+	codeValue, ok := event["code"]
+	if !ok {
+		return nil
+	}
+	var code int64
+	switch v := codeValue.(type) {
+	case float64:
+		code = int64(v)
+	case int:
+		code = int64(v)
+	case int64:
+		code = v
+	default:
+		return nil
+	}
+	if code == 0 || code == 20000000 {
+		return nil
+	}
+	message, _ := event["message"].(string)
+	if message == "" {
+		message = "unknown error"
+	}
+	return fmt.Errorf("tts sse error: code=%d message=%s", code, message)
+}
 func extractAudioBase64(event map[string]any) string {
 	for _, key := range []string{"data", "audio", "audio_data"} {
 		if v, ok := event[key].(string); ok && v != "" {
@@ -691,167 +558,6 @@ func extractAudioBase64(event map[string]any) string {
 	return ""
 }
-// 过滤格式符号，保留自然朗读文本。
-// 顺序很重要：先跳过跨行块结构，再跳过整行噪声，最后清理行内符号。
-func cleanText(text string) string {
-	var lines []string
-	rawLines := strings.Split(text, "\n")
-	inCodeBlock := false
-	inArtifact := false
-	inMarkdownTable := false
-	for i := 0; i < len(rawLines); i++ {
-		line := rawLines[i]
-		line = strings.TrimSpace(line)
-		if line == "" {
-			inMarkdownTable = false
-			continue
-		}
-		if codeFenceStartRe.MatchString(line) {
-			inCodeBlock = !inCodeBlock
-			continue
-		}
-		if inCodeBlock {
-			continue
-		}
-		if artifactStartRe.MatchString(line) {
-			inArtifact = !strings.Contains(strings.ToLower(line), "</artifact>")
-			continue
-		}
-		if inArtifact {
-			if strings.Contains(strings.ToLower(line), "</artifact>") {
-				inArtifact = false
-			}
-			continue
-		}
-		if isMarkdownTableSeparator(line) {
-			if len(lines) > 0 && isMarkdownTableRow(strings.TrimSpace(rawLines[i-1])) {
-				lines = lines[:len(lines)-1]
-			}
-			inMarkdownTable = true
-			continue
-		}
-		if inMarkdownTable {
-			if isMarkdownTableRow(line) {
-				continue
-			}
-			inMarkdownTable = false
-		}
-		if shouldSkipSpeechLine(line) {
-			continue
-		}
-		cleaned := cleanSpeechLine(line)
-		if cleaned != "" {
-			lines = append(lines, cleaned)
-		}
-	}
-	return strings.Join(lines, "，")
-}
-func shouldSkipSpeechLine(line string) bool {
-	if isMarkdownTableSeparator(line) {
-		return true
-	}
-	if strings.HasPrefix(line, "---") && strings.Count(line, "-") > 3 {
-		return true
-	}
-	if htmlDocumentLineRe.MatchString(line) {
-		return true
-	}
-	if isProgressNoiseLine(line) {
-		return true
-	}
-	if isMostlyTableRow(line) {
-		return true
-	}
-	if isMostlyFileListLine(line) {
-		return true
-	}
-	return false
-}
-func isMarkdownTableSeparator(line string) bool {
-	line = strings.TrimSpace(line)
-	return strings.Contains(line, "|") && strings.Trim(line, "|-: ") == ""
-}
-func isMarkdownTableRow(line string) bool {
-	line = strings.TrimSpace(line)
-	return strings.Count(line, "|") >= 2
-}
-func cleanSpeechLine(line string) string {
-	// Markdown 链接必须在 URL 删除前处理，否则会丢掉链接标题。
-	line = ansiEscapeRe.ReplaceAllString(line, "")
-	line = markdownListRe.ReplaceAllString(line, "")
-	line = markdownLinkRe.ReplaceAllStringFunc(line, func(match string) string {
-		if end := strings.Index(match, "]"); end > 1 {
-			return match[1:end]
-		}
-		return ""
-	})
-	line = urlRe.ReplaceAllString(line, "")
-	line = absolutePathRe.ReplaceAllString(line, " 路径 ")
-	// UUID 必须在短 hash 前处理，避免先删短片段后破坏 UUID 识别。
-	line = uuidRe.ReplaceAllString(line, "")
-	line = commitHashRe.ReplaceAllString(line, "")
-	line = htmlTagRe.ReplaceAllString(line, "")
-	line = strings.NewReplacer(
-		"**", "",
-		"*", "",
-		"`", "",
-		"#", "",
-		">", "",
-		"✅", "",
-		"❌", "",
-		"✓", "",
-		"✗", "",
-		"→", "到",
-	).Replace(line)
-	line = strings.Trim(line, " \t-:|")
-	line = multiSpaceRe.ReplaceAllString(line, " ")
-	return strings.TrimSpace(line)
-}
-func isMostlyTableRow(line string) bool {
-	if !strings.Contains(line, "|") {
-		return false
-	}
-	return strings.Count(line, "|") >= 2 && len([]rune(line)) > 40
-}
-func isProgressNoiseLine(line string) bool {
-	if !progressNoiseRe.MatchString(line) {
-		return false
-	}
-	if speedNoiseRe.MatchString(line) || etaNoiseRe.MatchString(line) {
-		return true
-	}
-	return !containsCJK(line)
-}
-func isMostlyFileListLine(line string) bool {
-	if !fileListNoiseRe.MatchString(line) {
-		return false
-	}
-	if containsCJK(line) {
-		return false
-	}
-	if strings.Contains(line, ".safetensors") {
-		return true
-	}
-	return strings.Count(line, ".") >= 2 || strings.Contains(line, "/") || strings.Contains(line, " - ")
-}
-func containsCJK(s string) bool {
-	for _, r := range s {
-		if r >= '\u4e00' && r <= '\u9fff' {
-			return true
-		}
-	}
-	return false
-}
 func main() {
 	log.SetFlags(log.Ltime | log.Lshortfile)
@@ -988,21 +694,6 @@ func validateVoiceInfo(name string, voice *VoiceInfo) error {
 	return nil
 }
-func playAudio(data []byte) error {
-	tmpFile := filepath.Join(tempDir, fmt.Sprintf("ttsd-%d.mp3", time.Now().UnixNano()))
-	if err := os.WriteFile(tmpFile, data, 0644); err != nil {
-		return fmt.Errorf("写入临时文件失败: %w", err)
-	}
-	defer os.Remove(tmpFile)
-	cmd := exec.Command("/usr/bin/afplay", tmpFile)
-	log.Printf("播放开始: %s", filepath.Base(tmpFile))
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("播放失败: %w", err)
-	}
-	return nil
-}
 func handleConnection(conn net.Conn, engine *TaskEngine) {
 	defer func() {
 		if r := recover(); r != nil {

package/npm/postinstall.js CHANGED Viewed

@@ -61,6 +61,43 @@ function copyIfMissing(src, dst, mode) {
   console.log(`配置文件已创建: ${dst}`);
 }
+function migrateDefaultEndpoint(configPath) {
+  if (!fs.existsSync(configPath)) {
+    return;
+  }
+  const oldEndpoint = "https://openspeech.bytedance.com/api/v3/tts/unidirectional";
+  const newEndpoint = "https://openspeech.bytedance.com/api/v3/tts/unidirectional/sse";
+  let config;
+  try {
+    config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  } catch (_) {
+    return;
+  }
+  if (config.endpoint !== oldEndpoint) {
+    return;
+  }
+  fs.copyFileSync(configPath, `${configPath}.bak`);
+  config.endpoint = newEndpoint;
+  fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`);
+  console.log(`配置 endpoint 已迁移到 SSE，旧配置备份: ${configPath}.bak`);
+}
+function installHook(src, dst) {
+  if (fs.existsSync(dst)) {
+    try {
+      if (fs.readFileSync(src, "utf8") !== fs.readFileSync(dst, "utf8")) {
+        fs.copyFileSync(dst, `${dst}.bak`);
+        console.log(`旧 Hook 已备份: ${dst}.bak`);
+      }
+    } catch (_) {
+      fs.copyFileSync(dst, `${dst}.bak`);
+      console.log(`旧 Hook 已备份: ${dst}.bak`);
+    }
+  }
+  copyExecutable(src, dst);
+  console.log(`Hook 脚本已安装: ${dst}`);
+}
 function sleep(ms) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
@@ -106,8 +143,10 @@ function main() {
   symlinkForce(cliPath, path.join(binDir, "ispeak-claude"));
   symlinkForce(cliPath, path.join(binDir, "ispeak-codex"));
-  copyIfMissing(path.join(root, "configs", "config.example.json"), path.join(configDir, "config.json"));
-  copyIfMissing(path.join(root, "configs", "hook-speak.sh"), path.join(configDir, "hook-speak.sh"), 0o755);
+  const configPath = path.join(configDir, "config.json");
+  copyIfMissing(path.join(root, "configs", "config.example.json"), configPath);
+  migrateDefaultEndpoint(configPath);
+  installHook(path.join(root, "configs", "hook-speak.sh"), path.join(configDir, "hook-speak.sh"));
   const plist = fs
     .readFileSync(path.join(root, "configs", "com.iSpeak.plist"), "utf8")

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@xdfnet/ispeak",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "Local macOS TTS daemon for AI coding assistants, powered by Volcengine streaming TTS.",
   "license": "MIT",
   "homepage": "https://github.com/xdfnet/iSpeak#readme",
@@ -26,14 +26,16 @@
   "scripts": {
     "build": "go build -ldflags=\"-s -w\" -o build/ispeakd .",
     "test": "go test ./...",
+    "prepublishOnly": "make test",
     "postinstall": "node npm/postinstall.js",
     "pack:dry-run": "npm pack --dry-run"
   },
   "files": [
     "main.go",
+    "clean_text.go",
     "go.mod",
     "go.sum",
-    "scripts/",
+    "scripts/ispeak",
     "configs/",
     "npm/",
     "Docs/",

package/scripts/ispeak CHANGED Viewed

@@ -2,7 +2,7 @@
 # ispeak — iSpeak 控制命令
 set -euo pipefail
-VERSION="1.6.3"
+VERSION="1.6.7"
 SOCK="$HOME/.config/iSpeak/ispeak.sock"
 PLIST="$HOME/Library/LaunchAgents/com.iSpeak.plist"
 CMD_NAME="$(basename "$0")"