Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 273af6a429 | |||
| 18a9f53062 | |||
| 7b290d9300 | |||
| f90612976f | |||
| a15f5b2b78 | |||
| cd3d045ef5 | |||
| 3aad93e7e8 | |||
| 85d5fcc722 | |||
| 778055cd1d | |||
| 87874e64cf | |||
| 7c53c0f184 | |||
| 5ce3eba455 | |||
| 71ca67c0ee | |||
| 777d5cb6c3 | |||
| 712a2cbb6a | |||
| 39f0aaae02 | |||
| 3cd92945ac | |||
| 4576653b4e |
@@ -0,0 +1,67 @@
|
||||
# AGENTS.md
|
||||
|
||||
## 项目概述
|
||||
|
||||
SnapGo 是一个常驻菜单栏的轻量截图工具:全局快捷键唤起选区截图,确认后自动上传到 S3 兼容对象存储(或通过 SSH/SCP 保存到远端),并把可分享链接复制到剪贴板。目前主要打磨 macOS 体验。
|
||||
|
||||
技术栈:**Wails v2**(Go 后端 + WebView 前端)+ **Vue 3 / TypeScript / Vite** 前端。Go 后端遵循分层架构(domain → application → infrastructure),macOS 上截图选区使用原生 AppKit overlay,其它平台回退到 Wails 透明窗口 overlay。
|
||||
|
||||
### 分层架构(`internal/`)
|
||||
|
||||
- `domain/`:核心业务类型与接口,**不依赖任何第三方 SDK 或 OS API**(仅标准库)。如 `OSSProvider` 接口、`AppConfig`/`S3Config`/`SSHConfig`、`Screenshot`/`UploadResult`。
|
||||
- `application/`:用例编排(capture → upload/save → clipboard → notify)。**只依赖 domain 接口**,具体适配器从 `main.go`/`app.go` 注入,便于单测。如 `CaptureAndUploadService`、`CaptureActionsService`、`CaptureAndSSHService`、`ApplyAnnotations`。
|
||||
- `infrastructure/`:对接外部世界的适配器实现 —— `oss/`(S3)、`ssh/`(内置 Go client + Kerberos 委托系统 ssh)、`clipboard/`、`config/`(JSON 文件存储)、`screencapture/`、`display/`、`cursor/`、`hotkey/`、`tray/`(菜单栏)、`logging/`。
|
||||
|
||||
### 顶层文件(`main` 包,根目录)
|
||||
|
||||
- `main.go`:Wails 启动入口,embed `frontend/dist`,装配 tray 与 `App`。
|
||||
- `app.go`:`App` 结构体,通过 Wails `Bind` 暴露给前端的方法(RPC),编排截图/上传/保存流程与 overlay 窗口生命周期。
|
||||
- `*_darwin.go` / `*_other.go`:平台分离的 overlay、dock 图标、激活策略、帧刷新等实现。`native_overlay_darwin.go` 使用 cgo + AppKit。
|
||||
|
||||
### 关键约定
|
||||
|
||||
- 前端通过 Wails 自动生成的 `frontend/wailsjs/go/main/App.js` 调用后端 `App` 的导出方法;后端通过 `wruntime.EventsEmit` 向前端推事件(如 `upload:success`、`upload:failure`、`hotkey:ready`、`capture:overlay`)。
|
||||
- 新增 OSS provider 只需在 `infrastructure/oss/` 加适配器并实现 `domain.OSSProvider`,无需改 application 层。
|
||||
- S3 与 SSH 走独立 pipeline(`runUploadPipeline` vs `runSaveRemotePipeline`),避免 provider 分支泄漏进彼此。
|
||||
|
||||
## 构建与命令
|
||||
|
||||
依赖前置:Go 1.23+、Node/npm、`wails` CLI(`go install github.com/wailsapp/wails/v2/cmd/wails@latest`)。
|
||||
|
||||
- `go mod tidy`:同步 Go 依赖。
|
||||
- `wails dev`:开发模式(热重载前端 + 后端),日志可直接在终端看到。
|
||||
- `wails build -platform darwin/arm64 -clean`:构建 `.app`(产物在 `build/bin/`)。
|
||||
- `./scripts/create-dev-cert.sh`:首次创建本地自签开发证书(保证 macOS TCC 权限不被反复重置)。
|
||||
- `./scripts/dev-build.sh`:本地迭代用 —— 构建 + 稳定证书重签名 + 同步到 `/Applications` + 打开。优先用它而非裸 `wails build`。
|
||||
- `./scripts/release.sh`:一键 build → sign → DMG → notarize(notarize 需 `NOTARIZE=1` 与凭证,默认跳过)。`ARCH=universal` 可出 fat binary。
|
||||
- 前端单独命令(`frontend/`):`npm run dev` / `npm run build`(`vue-tsc --noEmit && vite build`)/ `npm run preview`。
|
||||
|
||||
## 代码风格
|
||||
|
||||
- **Go**:标准 `gofmt`(tab 缩进)。包级 doc 注释说明“设计动机/rationale”是本仓库的强约定,注释解释“为什么”而非“是什么”。导出标识符必须有注释。错误用 `fmt.Errorf("...: %w", err)` 包装。日志统一用 `log/slog`(结构化 kv,如 `slog.Info("...", "host", h)`)。
|
||||
- **平台分离**:用 `_darwin.go` / `_other.go` 文件名后缀或 `//go:build` 标签隔离平台代码,保持跨平台编译通过。
|
||||
- **TypeScript/Vue**:Vue 3 `<script setup>` + Composition API;2 空格缩进。视图在 `frontend/src/views/`,组件在 `components/`。
|
||||
- 注释中可使用中文(部分 infra 包如 logging 已用中文 rationale),与现有文件保持一致即可。
|
||||
- 不要手改 `frontend/wailsjs/` 下文件,它们由 Wails 生成。
|
||||
|
||||
## 测试
|
||||
|
||||
- 框架:Go 标准 `testing` 包(无第三方断言库)。运行:`go test ./...`。
|
||||
- 现有测试集中在 `internal/application/`(如 `capture_actions_test.go`、`annotation_test.go`)。
|
||||
- 约定:application 层依赖 domain 接口,测试用手写 fake 实现(如 `fakeClipboard`、`fakeNotifier`)注入,不触碰真实 OS/网络。文件 IO 测试使用 `t.TempDir()`。
|
||||
- infrastructure 适配器(S3/SSH/screencapture 等)依赖真实环境,通常不写单测;SSH 连通性可借助 `cmd/sshdiag/` 诊断工具与设置页的 “Test connection” 按钮验证。
|
||||
|
||||
## 安全
|
||||
|
||||
- **凭证落盘**:配置(含 S3 access key、SSH 密码)以 JSON 存于 `os.UserConfigDir()/SnapGo/config.json`,文件权限 `0600`、目录 `0700`。尚未接入 OS keychain(后续计划),改动配置存储时务必保持严格权限并避免把密钥写入日志。
|
||||
- **日志**:写入 `~/Library/Logs/SnapGo/snapgo.log`(大小滚动,5MiB×2 备份)。记录连接信息时只记 host/user/port 等非敏感字段,**切勿记录密码/密钥**(参考 `app.go` 中的 `slog` 用法)。
|
||||
- **SSH**:`StrictHostKey=false` 时使用 `InsecureIgnoreHostKey()`(牺牲安全换首启可用性,仅限个人 LAN);Kerberos 模式委托系统 `/usr/bin/ssh` 复用 `kinit` 凭证缓存。`PathPrefix` 相对远端 `$HOME`,会剥离前导 `/` 和 `~` 防止逃逸。
|
||||
- **上传兜底**:上传失败时把 PNG 落地到 `~/Pictures/SnapGo` 并复制本地路径,保证不丢截图。
|
||||
- macOS 需 Screen Recording / Accessibility(TCC)权限;稳定的代码签名身份与安装路径是权限保持的关键(见 `dev-build.sh` 注释)。
|
||||
|
||||
## 配置
|
||||
|
||||
- Wails 项目配置:`wails.json`(产物名、frontend install/build/dev 命令、应用元信息)。
|
||||
- 运行时配置:首启写入默认值(`domain.DefaultAppConfig()`:快捷键 `cmd+shift+a`、S3 `pathPrefix=snapgo/`、SSH port 22 / timeout 10s)。原子写入(temp + rename)。
|
||||
- 环境变量:`SNAPGO_LOG_LEVEL=debug|info|warn|error`(默认 debug)。Release 相关:`ARCH`、`NOTARIZE`、`SIGN_MODE`、`DEVELOPER_ID_APPLICATION`、`KEYCHAIN_PROFILE`、`APPLE_ID`/`APPLE_TEAM_ID`/`APPLE_APP_SPECIFIC_PASSWORD`。
|
||||
- S3 兼容性:`UsePathStyle` 默认 true(适配 MinIO/R2);`PublicURLBase` 可选用于 CDN/自定义域名,否则回退 `{Endpoint}/{Bucket}/{Key}`。
|
||||
@@ -5,6 +5,12 @@ package main
|
||||
/*
|
||||
#cgo CFLAGS: -x objective-c -fobjc-arc
|
||||
#cgo LDFLAGS: -framework AppKit
|
||||
// Silence the "ignoring duplicate libraries: '-lobjc'" note emitted by the
|
||||
// Xcode 15+ linker (ld-prime): cgo links -lobjc for our Objective-C code and
|
||||
// the Go darwin runtime pulls it in as well, which the new linker flags as a
|
||||
// duplicate. Suppressing it here keeps the build output clean; the flag is a
|
||||
// no-op on the legacy ld64 path.
|
||||
#cgo LDFLAGS: -Wl,-no_warn_duplicate_libraries
|
||||
#include <dispatch/dispatch.h>
|
||||
#import <AppKit/AppKit.h>
|
||||
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"image"
|
||||
"image/png"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -22,6 +24,8 @@ import (
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/config"
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/display"
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/hotkey"
|
||||
llmpkg "github.com/mmmy/snapgo/internal/infrastructure/llm"
|
||||
ocrpkg "github.com/mmmy/snapgo/internal/infrastructure/ocr"
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/oss"
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/screencapture"
|
||||
sshpkg "github.com/mmmy/snapgo/internal/infrastructure/ssh"
|
||||
@@ -96,6 +100,15 @@ type CaptureActionResult struct {
|
||||
Path string `json:"path,omitempty"`
|
||||
}
|
||||
|
||||
// OperationStatusPayload drives the frontend status HUD and mirrors the
|
||||
// native macOS HUD state.
|
||||
type OperationStatusPayload struct {
|
||||
Operation string `json:"operation"`
|
||||
Phase string `json:"phase"`
|
||||
Message string `json:"message"`
|
||||
State string `json:"state"`
|
||||
}
|
||||
|
||||
// NewApp creates a new App with collaborators already initialised.
|
||||
func NewApp() *App {
|
||||
store, err := config.NewFileStore()
|
||||
@@ -110,6 +123,7 @@ func NewApp() *App {
|
||||
slog.Warn("config load failed, using defaults", "err", lerr)
|
||||
}
|
||||
}
|
||||
cfg.Normalize()
|
||||
return &App{
|
||||
cfg: cfg,
|
||||
configFile: store,
|
||||
@@ -227,8 +241,8 @@ func (a *App) runInteractiveCapture() {
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
const (
|
||||
settingsWidth = 1080
|
||||
settingsHeight = 720
|
||||
settingsWidth = 1000
|
||||
settingsHeight = 820
|
||||
)
|
||||
|
||||
// showOverlayWindow prepares the hidden main window as a borderless,
|
||||
@@ -297,23 +311,44 @@ func (a *App) runUploadPipeline(provider domain.OSSProvider, pngBytes []byte) er
|
||||
FallbackDir: filepath.Join(userPicturesDir(), "SnapGo"),
|
||||
PathPrefix: cfg.S3.PathPrefix,
|
||||
}
|
||||
return svc.ExecuteWithBytes(a.ctx, pngBytes)
|
||||
a.emitOperationStatus("upload", "上传中", "正在上传截图到 S3", "running")
|
||||
if err := svc.ExecuteWithBytes(a.ctx, pngBytes); err != nil {
|
||||
a.emitOperationStatus("upload", "上传失败", err.Error(), "error")
|
||||
return err
|
||||
}
|
||||
a.emitOperationStatus("upload", "上传完成", "链接已复制到剪贴板", "success")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) runCopyImagePipeline(pngBytes []byte) error {
|
||||
svc := &application.CaptureActionsService{
|
||||
Clipboard: a.clip,
|
||||
Notifier: &runtimeNotifier{ctx: a.ctx},
|
||||
}
|
||||
return svc.CopyImage(a.ctx, pngBytes)
|
||||
a.emitOperationStatus("copy", "复制中", "正在把截图复制到剪贴板", "running")
|
||||
if err := svc.CopyImage(a.ctx, pngBytes); err != nil {
|
||||
a.emitOperationStatus("copy", "复制失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
a.emitOperationStatus("copy", "复制完成", "截图已复制到剪贴板", "success")
|
||||
wruntime.EventsEmit(a.ctx, "upload:success", "image copied to clipboard")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) runSaveImagePipeline(pngBytes []byte, dir string) (string, error) {
|
||||
svc := &application.CaptureActionsService{
|
||||
Clipboard: a.clip,
|
||||
Notifier: &runtimeNotifier{ctx: a.ctx},
|
||||
}
|
||||
return svc.SaveImage(a.ctx, pngBytes, dir)
|
||||
a.emitOperationStatus("save", "保存中", "正在保存截图到本地", "running")
|
||||
path, err := svc.SaveImage(a.ctx, pngBytes, dir)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("save", "保存失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return "", err
|
||||
}
|
||||
a.emitOperationStatus("save", "保存完成", "文件路径已复制到剪贴板:"+path, "success")
|
||||
wruntime.EventsEmit(a.ctx, "upload:success", path)
|
||||
return path, nil
|
||||
}
|
||||
|
||||
// runSaveRemotePipeline uploads the captured PNG to the configured SSH host
|
||||
@@ -332,20 +367,181 @@ func (a *App) runSaveRemotePipeline(pngBytes []byte) error {
|
||||
err := fmt.Errorf("SSH host/user is not configured")
|
||||
slog.Warn("save-remote rejected: ssh not configured",
|
||||
"host", cfg.SSH.Host, "user", cfg.SSH.User)
|
||||
a.emitOperationStatus("save-remote", "需要配置 SSH", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
slog.Info("save-remote dispatch",
|
||||
"host", cfg.SSH.Host, "user", cfg.SSH.User, "port", cfg.SSH.Port,
|
||||
"png_size", len(pngBytes))
|
||||
"auth_method", cfg.SSH.AuthMethod, "png_size", len(pngBytes))
|
||||
|
||||
// Select the uploader by auth method: Kerberos delegates to the system
|
||||
// ssh/scp binaries (reusing the kinit credential cache), while builtin
|
||||
// uses the in-process Go SSH client.
|
||||
var uploader application.SSHUploader
|
||||
if cfg.SSH.IsKerberos() {
|
||||
uploader = sshpkg.NewKerberosUploader(cfg.SSH)
|
||||
} else {
|
||||
uploader = sshpkg.NewUploader(cfg.SSH)
|
||||
}
|
||||
|
||||
svc := &application.CaptureAndSSHService{
|
||||
Uploader: sshpkg.NewUploader(cfg.SSH),
|
||||
Uploader: uploader,
|
||||
Clipboard: a.clip,
|
||||
Notifier: &runtimeNotifier{ctx: a.ctx},
|
||||
Cfg: cfg.SSH,
|
||||
}
|
||||
return svc.ExecuteWithBytes(a.ctx, pngBytes)
|
||||
a.emitOperationStatus("save-remote", "保存中", "正在保存截图到远端 SSH", "running")
|
||||
if err := svc.ExecuteWithBytes(a.ctx, pngBytes); err != nil {
|
||||
a.emitOperationStatus("save-remote", "保存失败", err.Error(), "error")
|
||||
return err
|
||||
}
|
||||
a.emitOperationStatus("save-remote", "保存完成", "远端路径已复制到剪贴板", "success")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) runSummaryPipeline(pngBytes []byte) error {
|
||||
a.mu.RLock()
|
||||
cfg := a.cfg
|
||||
a.mu.RUnlock()
|
||||
|
||||
if !cfg.IsLLMConfigured() {
|
||||
err := fmt.Errorf("请先在 LLM 配置页填写 API Key 和模型")
|
||||
a.emitOperationStatus("summary", "需要配置 LLM", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
providerID, llmCfg, _ := cfg.ActiveLLMProvider()
|
||||
visionClient, err := llmpkg.NewVisionClient(providerID, llmCfg)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("summary", "LLM 配置错误", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
svc := &application.CaptureSummaryService{
|
||||
Summarizer: visionClient,
|
||||
Clipboard: a.clip,
|
||||
Prompt: cfg.LLM.Prompt,
|
||||
PathPrefix: cfg.S3.PathPrefix,
|
||||
MaxInlineBytes: llmCfg.MaxInlineBytes,
|
||||
}
|
||||
|
||||
// Preferred path: send the screenshot inline as a base64 data URL so the
|
||||
// summary never depends on S3 being configured or publicly reachable.
|
||||
if svc.CanInline(pngBytes) {
|
||||
a.emitOperationStatus("summary", "识别中", "正在请求多模态模型(本地内联图片)", "running")
|
||||
summary, err := svc.Summarize(a.ctx, svc.InlineDataURL(pngBytes))
|
||||
if err != nil {
|
||||
a.emitOperationStatus("summary", "识别失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.finishSummary(svc, summary)
|
||||
}
|
||||
|
||||
// Oversized image: fall back to uploading to S3 and passing a public URL.
|
||||
if !cfg.IsS3Configured() {
|
||||
err := fmt.Errorf("截图尺寸超过内联上限(%d 字节),请缩小截图区域,或在 S3 配置页填写公网可达的对象存储后重试", llmCfg.MaxInlineBytes)
|
||||
a.emitOperationStatus("summary", "尺寸超限", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
s3Provider, err := oss.NewS3Provider(cfg.S3)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("summary", "S3 配置错误", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
svc.Provider = s3Provider
|
||||
|
||||
a.emitOperationStatus("summary", "上传中", "截图较大,正在上传供模型读取", "running")
|
||||
uploaded, err := svc.UploadImage(a.ctx, pngBytes)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("summary", "上传失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
// The remote model fetches the URL itself, so verify it is reachable and
|
||||
// clean up the temporary object once we are done with it either way.
|
||||
defer func() {
|
||||
if derr := svc.DeleteUploaded(a.ctx, uploaded.Key); derr != nil {
|
||||
slog.Warn("summary: failed to delete temporary object", "key", uploaded.Key, "err", derr)
|
||||
}
|
||||
}()
|
||||
|
||||
if err := svc.EnsureReachable(a.ctx, uploaded.URL); err != nil {
|
||||
a.emitOperationStatus("summary", "链接不可达", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
a.emitOperationStatus("summary", "识别中", "图片已上传,正在请求多模态模型", "running")
|
||||
summary, err := svc.Summarize(a.ctx, uploaded.URL)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("summary", "识别失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.finishSummary(svc, summary)
|
||||
}
|
||||
|
||||
// finishSummary copies the summary to the clipboard and emits the terminal
|
||||
// success/failure UI state shared by the inline and S3 paths.
|
||||
func (a *App) finishSummary(svc *application.CaptureSummaryService, summary string) error {
|
||||
if err := svc.CopySummary(a.ctx, summary); err != nil {
|
||||
a.emitOperationStatus("summary", "复制失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
a.emitOperationStatus("summary", "识别完成", "总结已复制到剪贴板", "success")
|
||||
wruntime.EventsEmit(a.ctx, "upload:success", "summary copied to clipboard")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) runOCRPipeline(pngBytes []byte) error {
|
||||
a.mu.RLock()
|
||||
cfg := a.cfg
|
||||
a.mu.RUnlock()
|
||||
|
||||
if !cfg.IsOCRConfigured() {
|
||||
err := fmt.Errorf("请先在文字提取配置页填写 OCR Provider 的 AccessKey ID 和 AccessKey Secret")
|
||||
a.emitOperationStatus("ocr", "需要配置 OCR", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
providerID, ocrCfg, _ := cfg.ActiveOCRProvider()
|
||||
recognizer, err := ocrpkg.NewClient(providerID, ocrCfg)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("ocr", "OCR 配置错误", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
svc := &application.CaptureOCRService{
|
||||
Recognizer: recognizer,
|
||||
Clipboard: a.clip,
|
||||
}
|
||||
|
||||
a.emitOperationStatus("ocr", "识别中", "正在提取截图文字", "running")
|
||||
text, err := svc.Recognize(a.ctx, pngBytes)
|
||||
if err != nil {
|
||||
a.emitOperationStatus("ocr", "识别失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
if err := svc.CopyText(a.ctx, text); err != nil {
|
||||
a.emitOperationStatus("ocr", "复制失败", err.Error(), "error")
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
a.emitOperationStatus("ocr", "提取完成", "文字已复制到剪贴板", "success")
|
||||
wruntime.EventsEmit(a.ctx, "upload:success", "ocr text copied to clipboard")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) consumePendingCapture() (*pendingCapture, error) {
|
||||
@@ -368,7 +564,8 @@ func (a *App) captureSelectedPNG(result CaptureResult, pc *pendingCapture) ([]by
|
||||
return nil, err
|
||||
}
|
||||
if len(result.Annotations) > 0 {
|
||||
cropped, err = application.ApplyAnnotations(cropped, result.Annotations, pc.Display.Scale)
|
||||
scaleX, scaleY := annotationScalesForCapture(cropped, rect, pc.Display.Scale)
|
||||
cropped, err = application.ApplyAnnotationsWithScale(cropped, result.Annotations, scaleX, scaleY)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -376,6 +573,33 @@ func (a *App) captureSelectedPNG(result CaptureResult, pc *pendingCapture) ([]by
|
||||
return cropped, nil
|
||||
}
|
||||
|
||||
func annotationScalesForCapture(pngBytes []byte, rect RegionRect, fallback float64) (float64, float64) {
|
||||
if fallback <= 0 {
|
||||
fallback = 1
|
||||
}
|
||||
scaleX := fallback
|
||||
scaleY := fallback
|
||||
|
||||
cfg, err := png.DecodeConfig(bytes.NewReader(pngBytes))
|
||||
if err != nil {
|
||||
return scaleX, scaleY
|
||||
}
|
||||
if rect.W > 0 && cfg.Width > 0 {
|
||||
scaleX = saneAnnotationScale(float64(cfg.Width)/float64(rect.W), fallback)
|
||||
}
|
||||
if rect.H > 0 && cfg.Height > 0 {
|
||||
scaleY = saneAnnotationScale(float64(cfg.Height)/float64(rect.H), fallback)
|
||||
}
|
||||
return scaleX, scaleY
|
||||
}
|
||||
|
||||
func saneAnnotationScale(scale, fallback float64) float64 {
|
||||
if scale >= 0.25 && scale <= 8 {
|
||||
return scale
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func (a *App) chooseSaveDirectory() (string, error) {
|
||||
return wruntime.OpenDirectoryDialog(a.ctx, wruntime.OpenDialogOptions{
|
||||
Title: "Save screenshot to folder",
|
||||
@@ -398,6 +622,7 @@ func (a *App) GetConfig() domain.AppConfig {
|
||||
// SaveConfig persists the supplied configuration and re-registers the hotkey
|
||||
// if it changed.
|
||||
func (a *App) SaveConfig(cfg domain.AppConfig) error {
|
||||
cfg.Normalize()
|
||||
a.mu.Lock()
|
||||
prev := a.cfg
|
||||
a.cfg = cfg
|
||||
@@ -446,7 +671,17 @@ func (a *App) TestConnection(cfg domain.S3Config) error {
|
||||
func (a *App) TestSSHConnection(cfg domain.SSHConfig) error {
|
||||
slog.Info("RPC TestSSHConnection",
|
||||
"host", cfg.Host, "user", cfg.User, "port", cfg.Port,
|
||||
"auth_method", cfg.AuthMethod,
|
||||
"strict_host_key", cfg.StrictHostKey, "has_password", cfg.Password != "")
|
||||
// Kerberos auth delegates to the system ssh binary (see KerberosUploader)
|
||||
// so its probe path differs from the in-process client.
|
||||
if cfg.IsKerberos() {
|
||||
if err := sshpkg.TestKerberosConnection(a.ctx, cfg); err != nil {
|
||||
slog.Error("RPC TestSSHConnection (kerberos) failed", "err", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err := sshpkg.TestConnection(a.ctx, cfg); err != nil {
|
||||
slog.Error("RPC TestSSHConnection failed", "err", err)
|
||||
return err
|
||||
@@ -685,6 +920,64 @@ func (a *App) SaveRegionToRemote(result CaptureResult) error {
|
||||
return a.runSaveRemotePipeline(cropped)
|
||||
}
|
||||
|
||||
// SummarizeRegion uploads the selected screenshot to S3, sends the public URL
|
||||
// to the configured multimodal LLM, and copies the resulting summary.
|
||||
func (a *App) SummarizeRegion(result CaptureResult) error {
|
||||
pc, err := a.consumePendingCapture()
|
||||
if err != nil {
|
||||
slog.Warn("SummarizeRegion: no pending capture", "err", err)
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
a.capturing.Store(false)
|
||||
a.dismissOverlay()
|
||||
}()
|
||||
|
||||
a.dismissOverlay()
|
||||
flushFrame()
|
||||
|
||||
slog.Info("SummarizeRegion: capturing region",
|
||||
"x", result.Rect.X, "y", result.Rect.Y,
|
||||
"w", result.Rect.W, "h", result.Rect.H,
|
||||
"annotations", len(result.Annotations))
|
||||
cropped, err := a.captureSelectedPNG(result, pc)
|
||||
if err != nil {
|
||||
slog.Error("SummarizeRegion: capture failed", "err", err)
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.runSummaryPipeline(cropped)
|
||||
}
|
||||
|
||||
// ExtractTextRegion sends the selected screenshot to the configured OCR
|
||||
// provider and copies the extracted text to the clipboard.
|
||||
func (a *App) ExtractTextRegion(result CaptureResult) error {
|
||||
pc, err := a.consumePendingCapture()
|
||||
if err != nil {
|
||||
slog.Warn("ExtractTextRegion: no pending capture", "err", err)
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
a.capturing.Store(false)
|
||||
a.dismissOverlay()
|
||||
}()
|
||||
|
||||
a.dismissOverlay()
|
||||
flushFrame()
|
||||
|
||||
slog.Info("ExtractTextRegion: capturing region",
|
||||
"x", result.Rect.X, "y", result.Rect.Y,
|
||||
"w", result.Rect.W, "h", result.Rect.H,
|
||||
"annotations", len(result.Annotations))
|
||||
cropped, err := a.captureSelectedPNG(result, pc)
|
||||
if err != nil {
|
||||
slog.Error("ExtractTextRegion: capture failed", "err", err)
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.runOCRPipeline(cropped)
|
||||
}
|
||||
|
||||
// SaveNativeRegionToRemote is the macOS-native overlay equivalent of
|
||||
// SaveRegionToRemote. The AppKit panel is already closed by the time this
|
||||
// runs (see saveRemoteSelection in native_overlay_darwin.go), so we only
|
||||
@@ -715,6 +1008,60 @@ func (a *App) SaveNativeRegionToRemote(result CaptureResult) error {
|
||||
return a.runSaveRemotePipeline(cropped)
|
||||
}
|
||||
|
||||
// SummarizeNativeRegion is the macOS-native overlay equivalent of
|
||||
// SummarizeRegion. The AppKit panel is already closed before this runs.
|
||||
func (a *App) SummarizeNativeRegion(result CaptureResult) error {
|
||||
pc, err := a.consumePendingCapture()
|
||||
if err != nil {
|
||||
slog.Warn("SummarizeNativeRegion: no pending capture", "err", err)
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
a.capturing.Store(false)
|
||||
hideDockIcon()
|
||||
}()
|
||||
|
||||
flushFrame()
|
||||
slog.Info("SummarizeNativeRegion: capturing region",
|
||||
"x", result.Rect.X, "y", result.Rect.Y,
|
||||
"w", result.Rect.W, "h", result.Rect.H,
|
||||
"annotations", len(result.Annotations))
|
||||
cropped, err := a.captureSelectedPNG(result, pc)
|
||||
if err != nil {
|
||||
slog.Error("SummarizeNativeRegion: capture failed", "err", err)
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.runSummaryPipeline(cropped)
|
||||
}
|
||||
|
||||
// ExtractTextNativeRegion is the macOS-native overlay equivalent of
|
||||
// ExtractTextRegion. The AppKit panel is already closed before this runs.
|
||||
func (a *App) ExtractTextNativeRegion(result CaptureResult) error {
|
||||
pc, err := a.consumePendingCapture()
|
||||
if err != nil {
|
||||
slog.Warn("ExtractTextNativeRegion: no pending capture", "err", err)
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
a.capturing.Store(false)
|
||||
hideDockIcon()
|
||||
}()
|
||||
|
||||
flushFrame()
|
||||
slog.Info("ExtractTextNativeRegion: capturing region",
|
||||
"x", result.Rect.X, "y", result.Rect.Y,
|
||||
"w", result.Rect.W, "h", result.Rect.H,
|
||||
"annotations", len(result.Annotations))
|
||||
cropped, err := a.captureSelectedPNG(result, pc)
|
||||
if err != nil {
|
||||
slog.Error("ExtractTextNativeRegion: capture failed", "err", err)
|
||||
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
|
||||
return err
|
||||
}
|
||||
return a.runOCRPipeline(cropped)
|
||||
}
|
||||
|
||||
func parseNativeAnnotations(raw string) []application.Annotation {
|
||||
if raw == "" {
|
||||
return nil
|
||||
@@ -736,6 +1083,7 @@ func (a *App) CancelRegion() {
|
||||
a.pendingMu.Unlock()
|
||||
a.capturing.Store(false)
|
||||
a.dismissOverlay()
|
||||
a.emitOperationStatus("capture", "已取消", "本次截图已取消", "success")
|
||||
}
|
||||
|
||||
// CancelNativeRegion releases native-overlay state without touching the
|
||||
@@ -746,6 +1094,7 @@ func (a *App) CancelNativeRegion() {
|
||||
a.pendingMu.Unlock()
|
||||
a.capturing.Store(false)
|
||||
hideDockIcon()
|
||||
a.emitOperationStatus("capture", "已取消", "本次截图已取消", "success")
|
||||
}
|
||||
|
||||
// ShowWindow brings the main window back to the foreground in its normal
|
||||
@@ -764,6 +1113,27 @@ func (a *App) QuitApp() {
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
func (a *App) emitOperationStatus(operation, phase, message, state string) {
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "operation:status", OperationStatusPayload{
|
||||
Operation: operation,
|
||||
Phase: phase,
|
||||
Message: message,
|
||||
State: state,
|
||||
})
|
||||
}
|
||||
switch state {
|
||||
case "success":
|
||||
showOperationStatus(phase, message, operationStatusSuccess)
|
||||
hideOperationStatusAfter(1400 * time.Millisecond)
|
||||
case "error":
|
||||
showOperationStatus(phase, message, operationStatusError)
|
||||
hideOperationStatusAfter(2600 * time.Millisecond)
|
||||
default:
|
||||
showOperationStatus(phase, message, operationStatusRunning)
|
||||
}
|
||||
}
|
||||
|
||||
// runtimeNotifier emits success / failure events via the Wails runtime.
|
||||
type runtimeNotifier struct{ ctx context.Context }
|
||||
|
||||
|
||||
+237
-71
@@ -3,9 +3,7 @@
|
||||
* App shell — switches between two distinct UI modes that share the same
|
||||
* Wails window:
|
||||
*
|
||||
* • "settings" : full settings UI (self-drawn title bar + sidebar + form).
|
||||
* Self-drawn because the window is now Frameless to make
|
||||
* the overlay paint edge-to-edge.
|
||||
* • "settings" : full settings UI (native title bar + sidebar + form).
|
||||
* • "overlay" : Snipaste-style region picker that fills the whole
|
||||
* primary display.
|
||||
*
|
||||
@@ -13,7 +11,7 @@
|
||||
* emits a `capture:overlay` event with the screenshot payload so the
|
||||
* frontend knows when (and what) to render.
|
||||
*/
|
||||
import { onMounted, onUnmounted, ref } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, ref } from 'vue'
|
||||
import SettingsView from './views/SettingsView.vue'
|
||||
import Toast from './components/Toast.vue'
|
||||
import CaptureOverlay from './views/CaptureOverlay.vue'
|
||||
@@ -24,7 +22,10 @@ import {
|
||||
CopyRegionImage,
|
||||
SaveRegionImage,
|
||||
SaveRegionToRemote,
|
||||
SummarizeRegion,
|
||||
ExtractTextRegion,
|
||||
CancelRegion,
|
||||
GetConfig,
|
||||
} from '../wailsjs/go/main/App'
|
||||
|
||||
type HotkeyStatus =
|
||||
@@ -36,18 +37,39 @@ const hotkeyStatus = ref<HotkeyStatus>({ state: 'unknown' })
|
||||
type Mode = 'settings' | 'overlay'
|
||||
const mode = ref<Mode>('settings')
|
||||
|
||||
type ThemeMode = 'auto' | 'light' | 'dark'
|
||||
const themeMode = ref<ThemeMode>('auto')
|
||||
const appThemeClass = computed(() => `theme-${themeMode.value}`)
|
||||
|
||||
function normalizeTheme(theme: unknown): ThemeMode {
|
||||
return theme === 'light' || theme === 'dark' || theme === 'auto'
|
||||
? theme
|
||||
: 'auto'
|
||||
}
|
||||
|
||||
async function loadThemePreference() {
|
||||
try {
|
||||
const cfg = await GetConfig()
|
||||
themeMode.value = normalizeTheme((cfg as any)?.theme)
|
||||
} catch {
|
||||
themeMode.value = 'auto'
|
||||
}
|
||||
}
|
||||
|
||||
// `SettingsTab` is hoisted to the App shell so the sidebar (which lives
|
||||
// here) and the inner SettingsView (which renders the matching card) can
|
||||
// share a single source of truth without an event bus.
|
||||
type SettingsTab = 'general' | 's3' | 'ssh'
|
||||
type SettingsTab = 'general' | 's3' | 'ssh' | 'llm' | 'ocr'
|
||||
const activeTab = ref<SettingsTab>('general')
|
||||
|
||||
// Sidebar entries are declarative so adding a destination type later is
|
||||
// a one-line change. The label values match the user-facing tab names.
|
||||
const sidebarItems: Array<{ id: SettingsTab; label: string }> = [
|
||||
{ id: 'general', label: 'General' },
|
||||
{ id: 's3', label: 'S3-Conf' },
|
||||
{ id: 'ssh', label: 'SSH-Conf' },
|
||||
{ id: 'general', label: '通用设置' },
|
||||
{ id: 's3', label: '对象存储' },
|
||||
{ id: 'ssh', label: '远程主机' },
|
||||
{ id: 'llm', label: '智能识图' },
|
||||
{ id: 'ocr', label: '文字提取' },
|
||||
]
|
||||
|
||||
interface OverlayPayload {
|
||||
@@ -57,11 +79,38 @@ interface OverlayPayload {
|
||||
}
|
||||
const overlayPayload = ref<OverlayPayload | null>(null)
|
||||
|
||||
interface OverlayAnnotation {
|
||||
tool: string
|
||||
color: string
|
||||
points: Array<{ x: number; y: number }>
|
||||
text?: string
|
||||
strokeWidth?: number
|
||||
fontSize?: number
|
||||
}
|
||||
|
||||
interface OverlayResult {
|
||||
rect: {
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
}
|
||||
annotations: OverlayAnnotation[]
|
||||
}
|
||||
|
||||
const capturing = ref(false)
|
||||
|
||||
const toast = ref<{ kind: 'success' | 'error'; text: string } | null>(null)
|
||||
let toastTimer: number | undefined
|
||||
|
||||
const operationStatus = ref<{
|
||||
operation: string
|
||||
phase: string
|
||||
message: string
|
||||
state: 'running' | 'success' | 'error'
|
||||
} | null>(null)
|
||||
let operationTimer: number | undefined
|
||||
|
||||
function showToast(kind: 'success' | 'error', text: string) {
|
||||
toast.value = { kind, text }
|
||||
window.clearTimeout(toastTimer)
|
||||
@@ -70,6 +119,21 @@ function showToast(kind: 'success' | 'error', text: string) {
|
||||
}, 3000)
|
||||
}
|
||||
|
||||
function updateOperationStatus(payload: {
|
||||
operation: string
|
||||
phase: string
|
||||
message: string
|
||||
state: 'running' | 'success' | 'error'
|
||||
}) {
|
||||
operationStatus.value = payload
|
||||
window.clearTimeout(operationTimer)
|
||||
if (payload.state !== 'running') {
|
||||
operationTimer = window.setTimeout(() => {
|
||||
operationStatus.value = null
|
||||
}, payload.state === 'success' ? 1600 : 3200)
|
||||
}
|
||||
}
|
||||
|
||||
async function retryHotkey() {
|
||||
try {
|
||||
await RetryRegisterHotkey()
|
||||
@@ -78,19 +142,7 @@ async function retryHotkey() {
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlayConfirm(rect: {
|
||||
rect: {
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
}
|
||||
annotations: Array<{
|
||||
tool: string
|
||||
color: string
|
||||
points: Array<{ x: number; y: number }>
|
||||
}>
|
||||
}) {
|
||||
async function onOverlayConfirm(rect: OverlayResult) {
|
||||
// Optimistically swap back so the window does not visually lag the
|
||||
// Go-side hide. If upload fails, the toast surfaces the reason.
|
||||
mode.value = 'settings'
|
||||
@@ -102,19 +154,7 @@ async function onOverlayConfirm(rect: {
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlayCopy(rect: {
|
||||
rect: {
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
}
|
||||
annotations: Array<{
|
||||
tool: string
|
||||
color: string
|
||||
points: Array<{ x: number; y: number }>
|
||||
}>
|
||||
}) {
|
||||
async function onOverlayCopy(rect: OverlayResult) {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
try {
|
||||
@@ -124,19 +164,7 @@ async function onOverlayCopy(rect: {
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlaySave(rect: {
|
||||
rect: {
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
}
|
||||
annotations: Array<{
|
||||
tool: string
|
||||
color: string
|
||||
points: Array<{ x: number; y: number }>
|
||||
}>
|
||||
}) {
|
||||
async function onOverlaySave(rect: OverlayResult) {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
try {
|
||||
@@ -146,19 +174,7 @@ async function onOverlaySave(rect: {
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlaySaveRemote(rect: {
|
||||
rect: {
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
}
|
||||
annotations: Array<{
|
||||
tool: string
|
||||
color: string
|
||||
points: Array<{ x: number; y: number }>
|
||||
}>
|
||||
}) {
|
||||
async function onOverlaySaveRemote(rect: OverlayResult) {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
try {
|
||||
@@ -168,6 +184,26 @@ async function onOverlaySaveRemote(rect: {
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlaySummarize(rect: OverlayResult) {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
try {
|
||||
await SummarizeRegion(rect as any)
|
||||
} catch {
|
||||
/* Surfaced via upload:failure */
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlayOCR(rect: OverlayResult) {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
try {
|
||||
await ExtractTextRegion(rect as any)
|
||||
} catch {
|
||||
/* Surfaced via upload:failure */
|
||||
}
|
||||
}
|
||||
|
||||
async function onOverlayCancel() {
|
||||
mode.value = 'settings'
|
||||
overlayPayload.value = null
|
||||
@@ -179,6 +215,7 @@ async function onOverlayCancel() {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
void loadThemePreference()
|
||||
EventsOn('capture:start', () => {
|
||||
capturing.value = true
|
||||
})
|
||||
@@ -194,7 +231,14 @@ onMounted(() => {
|
||||
capturing.value = false
|
||||
})
|
||||
EventsOn('upload:success', (url: string) => {
|
||||
showToast('success', `Copied: ${url}`)
|
||||
showToast(
|
||||
'success',
|
||||
url === 'summary copied to clipboard'
|
||||
? 'Summary copied to clipboard'
|
||||
: url === 'ocr text copied to clipboard'
|
||||
? 'OCR text copied to clipboard'
|
||||
: `Copied: ${url}`
|
||||
)
|
||||
})
|
||||
EventsOn('upload:failure', (reason: string) => {
|
||||
showToast('error', reason)
|
||||
@@ -205,6 +249,7 @@ onMounted(() => {
|
||||
EventsOn('hotkey:error', (reason: string) => {
|
||||
hotkeyStatus.value = { state: 'error', reason }
|
||||
})
|
||||
EventsOn('operation:status', updateOperationStatus)
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -216,6 +261,7 @@ onUnmounted(() => {
|
||||
EventsOff('upload:failure')
|
||||
EventsOff('hotkey:ready')
|
||||
EventsOff('hotkey:error')
|
||||
EventsOff('operation:status')
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -229,11 +275,13 @@ onUnmounted(() => {
|
||||
@copy="onOverlayCopy"
|
||||
@save="onOverlaySave"
|
||||
@save-remote="onOverlaySaveRemote"
|
||||
@summarize="onOverlaySummarize"
|
||||
@ocr="onOverlayOCR"
|
||||
@cancel="onOverlayCancel"
|
||||
/>
|
||||
|
||||
<!-- Settings mode: standard desktop window; macOS title bar is native. -->
|
||||
<div v-else class="app-root">
|
||||
<div v-else class="app-root" :class="appThemeClass">
|
||||
<div v-if="hotkeyStatus.state === 'error'" class="permission-banner">
|
||||
<div>
|
||||
<strong>Global hotkey is not active.</strong>
|
||||
@@ -259,11 +307,29 @@ onUnmounted(() => {
|
||||
</div>
|
||||
</aside>
|
||||
<section class="content">
|
||||
<SettingsView :tab="activeTab" />
|
||||
<SettingsView
|
||||
:tab="activeTab"
|
||||
:theme="themeMode"
|
||||
@theme-change="themeMode = normalizeTheme($event)"
|
||||
/>
|
||||
</section>
|
||||
</main>
|
||||
|
||||
<Toast v-if="toast" :kind="toast.kind" :text="toast.text" />
|
||||
<div
|
||||
v-if="operationStatus"
|
||||
class="operation-hud"
|
||||
:class="operationStatus.state"
|
||||
>
|
||||
<span v-if="operationStatus.state === 'running'" class="spinner" />
|
||||
<span v-else class="status-mark">
|
||||
{{ operationStatus.state === 'success' ? 'OK' : '!' }}
|
||||
</span>
|
||||
<div>
|
||||
<strong>{{ operationStatus.phase }}</strong>
|
||||
<p>{{ operationStatus.message }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -277,6 +343,15 @@ onUnmounted(() => {
|
||||
color: #111827;
|
||||
font-size: 13px;
|
||||
}
|
||||
.app-root.theme-light {
|
||||
color-scheme: light;
|
||||
}
|
||||
.app-root.theme-dark {
|
||||
color-scheme: dark;
|
||||
}
|
||||
.app-root.theme-auto {
|
||||
color-scheme: light dark;
|
||||
}
|
||||
|
||||
.status-pill {
|
||||
font-size: 11px;
|
||||
@@ -371,33 +446,124 @@ onUnmounted(() => {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.operation-hud {
|
||||
position: fixed;
|
||||
right: 18px;
|
||||
bottom: 18px;
|
||||
z-index: 20;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
min-width: 260px;
|
||||
max-width: 360px;
|
||||
padding: 12px 14px;
|
||||
color: #f9fafb;
|
||||
background: rgba(17, 24, 39, 0.94);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 12px 34px rgba(15, 23, 42, 0.28);
|
||||
}
|
||||
.operation-hud strong {
|
||||
display: block;
|
||||
margin-bottom: 2px;
|
||||
font-size: 13px;
|
||||
}
|
||||
.operation-hud p {
|
||||
margin: 0;
|
||||
color: #d1d5db;
|
||||
font-size: 12px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
.spinner {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border: 2px solid rgba(255, 255, 255, 0.25);
|
||||
border-top-color: #60a5fa;
|
||||
border-radius: 50%;
|
||||
animation: spin 0.75s linear infinite;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.status-mark {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
border-radius: 50%;
|
||||
font-size: 11px;
|
||||
font-weight: 700;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.operation-hud.success .status-mark {
|
||||
color: #052e16;
|
||||
background: #86efac;
|
||||
}
|
||||
.operation-hud.error .status-mark {
|
||||
color: #450a0a;
|
||||
background: #fca5a5;
|
||||
}
|
||||
@keyframes spin {
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
.app-root.theme-dark {
|
||||
background: #1c1d22;
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.app-root.theme-dark .titlebar {
|
||||
background: rgba(28, 29, 34, 0.7);
|
||||
border-bottom-color: #2c2f36;
|
||||
}
|
||||
.app-root.theme-dark .titlebar-title {
|
||||
color: #f3f4f6;
|
||||
}
|
||||
.app-root.theme-dark .sidebar {
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
border-right-color: #2c2f36;
|
||||
}
|
||||
.app-root.theme-dark .sidebar-item {
|
||||
color: #d1d5db;
|
||||
}
|
||||
.app-root.theme-dark .sidebar-item:hover:not(.active) {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
.app-root.theme-dark .sidebar-item.active {
|
||||
background: rgba(59, 130, 246, 0.18);
|
||||
color: #93c5fd;
|
||||
}
|
||||
.app-root.theme-dark .permission-banner {
|
||||
background: rgba(120, 53, 15, 0.3);
|
||||
border-color: rgba(253, 186, 116, 0.4);
|
||||
color: #fed7aa;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
.app-root {
|
||||
.app-root.theme-auto {
|
||||
background: #1c1d22;
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.titlebar {
|
||||
.app-root.theme-auto .titlebar {
|
||||
background: rgba(28, 29, 34, 0.7);
|
||||
border-bottom-color: #2c2f36;
|
||||
}
|
||||
.titlebar-title {
|
||||
.app-root.theme-auto .titlebar-title {
|
||||
color: #f3f4f6;
|
||||
}
|
||||
.sidebar {
|
||||
.app-root.theme-auto .sidebar {
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
border-right-color: #2c2f36;
|
||||
}
|
||||
.sidebar-item {
|
||||
.app-root.theme-auto .sidebar-item {
|
||||
color: #d1d5db;
|
||||
}
|
||||
.sidebar-item:hover:not(.active) {
|
||||
.app-root.theme-auto .sidebar-item:hover:not(.active) {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
.sidebar-item.active {
|
||||
.app-root.theme-auto .sidebar-item.active {
|
||||
background: rgba(59, 130, 246, 0.18);
|
||||
color: #93c5fd;
|
||||
}
|
||||
.permission-banner {
|
||||
.app-root.theme-auto .permission-banner {
|
||||
background: rgba(120, 53, 15, 0.3);
|
||||
border-color: rgba(253, 186, 116, 0.4);
|
||||
color: #fed7aa;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, onUnmounted, ref } from 'vue'
|
||||
import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
|
||||
// Inline SVG markup imported as raw strings via Vite's `?raw` suffix.
|
||||
// Rationale: rendering through v-html lets the icon inherit `currentColor`
|
||||
// from the toolbar button, so styling stays in CSS without bundling extra
|
||||
@@ -23,7 +23,7 @@ interface Rect {
|
||||
h: number
|
||||
}
|
||||
|
||||
type Tool = 'pen' | 'rect' | 'ellipse'
|
||||
type Tool = 'pen' | 'rect' | 'ellipse' | 'text'
|
||||
interface Point {
|
||||
x: number
|
||||
y: number
|
||||
@@ -32,6 +32,9 @@ interface Annotation {
|
||||
tool: Tool
|
||||
color: string
|
||||
points: Point[]
|
||||
text?: string
|
||||
strokeWidth?: number
|
||||
fontSize?: number
|
||||
}
|
||||
|
||||
const emit = defineEmits<{
|
||||
@@ -51,6 +54,14 @@ const emit = defineEmits<{
|
||||
e: 'save-remote',
|
||||
payload: { rect: Rect; annotations: Annotation[] }
|
||||
): void
|
||||
(
|
||||
e: 'summarize',
|
||||
payload: { rect: Rect; annotations: Annotation[] }
|
||||
): void
|
||||
(
|
||||
e: 'ocr',
|
||||
payload: { rect: Rect; annotations: Annotation[] }
|
||||
): void
|
||||
(e: 'cancel'): void
|
||||
}>()
|
||||
|
||||
@@ -59,26 +70,45 @@ const annotations = ref<Annotation[]>([])
|
||||
const draftAnnotation = ref<Annotation | null>(null)
|
||||
const activeTool = ref<Tool>('pen')
|
||||
const activeColor = ref('#ef4444')
|
||||
const paletteOpen = ref(false)
|
||||
const activeStrokeWidth = ref(3)
|
||||
const activeFontSize = ref(20)
|
||||
const textDraft = ref<{
|
||||
point: Point
|
||||
value: string
|
||||
color: string
|
||||
fontSize: number
|
||||
index: number | null
|
||||
} | null>(null)
|
||||
const textInputRef = ref<HTMLInputElement | null>(null)
|
||||
const selectedTextIndex = ref<number | null>(null)
|
||||
|
||||
type ResizeHandle = 'n' | 's' | 'e' | 'w' | 'nw' | 'ne' | 'sw' | 'se'
|
||||
type DragMode = 'idle' | 'creating' | 'moving' | 'resizing' | 'annotating'
|
||||
type DragMode =
|
||||
| 'idle'
|
||||
| 'creating'
|
||||
| 'moving'
|
||||
| 'resizing'
|
||||
| 'annotating'
|
||||
| 'moving-text'
|
||||
const dragMode = ref<DragMode>('idle')
|
||||
const resizeHandle = ref<ResizeHandle | null>(null)
|
||||
const dragAnchor = ref({ x: 0, y: 0 })
|
||||
const startRect = ref<Rect | null>(null)
|
||||
const textDragStartPoint = ref<Point | null>(null)
|
||||
const textDragOriginalPoint = ref<Point | null>(null)
|
||||
|
||||
const DEFAULT_TEXT_FONT_SIZE = 20
|
||||
const STROKE_WIDTHS = [2, 4, 6]
|
||||
const FONT_SIZES = [16, 20, 28, 36]
|
||||
|
||||
const colors = [
|
||||
'#ef4444',
|
||||
'#f97316',
|
||||
'#facc15',
|
||||
'#22c55e',
|
||||
'#06b6d4',
|
||||
'#3b82f6',
|
||||
'#8b5cf6',
|
||||
'#ec4899',
|
||||
'#ffffff',
|
||||
'#111827',
|
||||
'#9ca3af',
|
||||
'#ffffff',
|
||||
]
|
||||
|
||||
const maskPath = computed(() => {
|
||||
@@ -111,14 +141,46 @@ const sizeLabel = computed(() => {
|
||||
return `${Math.round(rect.value.w)} × ${Math.round(rect.value.h)}`
|
||||
})
|
||||
|
||||
const MARK_TOOLBAR_W = 178
|
||||
const ACTION_TOOLBAR_W = 252
|
||||
const TOOLBAR_GROUP_GAP = 8
|
||||
|
||||
const toolOrder: Tool[] = ['pen', 'rect', 'ellipse', 'text']
|
||||
|
||||
const toolSettingsPos = computed(() => {
|
||||
if (!leftToolbarPos.value || !rect.value || !activeTool.value) return null
|
||||
const menuW = activeTool.value === 'text' ? 462 : 398
|
||||
const menuH = 58
|
||||
const buttonIndex = toolOrder.indexOf(activeTool.value)
|
||||
const buttonCenter = 4 + buttonIndex * 34 + 14
|
||||
let x = leftToolbarPos.value.x
|
||||
let y = leftToolbarPos.value.y + 44
|
||||
if (y + menuH > props.height) {
|
||||
y = leftToolbarPos.value.y - menuH - 8
|
||||
}
|
||||
x = clamp(x, 8, Math.max(8, props.width - menuW - 8))
|
||||
return {
|
||||
x,
|
||||
y,
|
||||
w: menuW,
|
||||
arrowX: clamp(leftToolbarPos.value.x + buttonCenter - x, 18, menuW - 18),
|
||||
}
|
||||
})
|
||||
|
||||
const rightToolbarPos = computed(() => {
|
||||
if (!rect.value) return null
|
||||
return placeToolbar(rect.value, 180, 40, 'right')
|
||||
return placeToolbar(rect.value, ACTION_TOOLBAR_W, 40, 'right')
|
||||
})
|
||||
|
||||
const leftToolbarPos = computed(() => {
|
||||
if (!rect.value) return null
|
||||
return placeToolbar(rect.value, 190, 40, 'left')
|
||||
if (!rect.value || !rightToolbarPos.value) return null
|
||||
// 标记组与操作组合并到右侧,紧贴在操作组左侧,中间保留间隔
|
||||
const x = clamp(
|
||||
rightToolbarPos.value.x - TOOLBAR_GROUP_GAP - MARK_TOOLBAR_W,
|
||||
0,
|
||||
props.width - MARK_TOOLBAR_W
|
||||
)
|
||||
return { x, y: rightToolbarPos.value.y }
|
||||
})
|
||||
|
||||
const handles = computed(() => {
|
||||
@@ -190,6 +252,89 @@ function insideRect(p: Point, r: Rect | null) {
|
||||
return p.x >= r.x && p.x <= r.x + r.w && p.y >= r.y && p.y <= r.y + r.h
|
||||
}
|
||||
|
||||
let measureCanvas: HTMLCanvasElement | null = null
|
||||
|
||||
function textFont(fontSize = DEFAULT_TEXT_FONT_SIZE) {
|
||||
return `600 ${fontSize}px -apple-system, BlinkMacSystemFont, "SF Pro Text", sans-serif`
|
||||
}
|
||||
|
||||
function textSize(annotation: Pick<Annotation, 'text' | 'fontSize'>) {
|
||||
const fontSize = annotation.fontSize || DEFAULT_TEXT_FONT_SIZE
|
||||
const lines = (annotation.text || ' ').split('\n')
|
||||
if (typeof document === 'undefined') {
|
||||
return {
|
||||
w: Math.max(1, ...lines.map((line) => line.length * fontSize)),
|
||||
h: Math.max(fontSize * 1.2, lines.length * fontSize * 1.2),
|
||||
}
|
||||
}
|
||||
measureCanvas ||= document.createElement('canvas')
|
||||
const ctx = measureCanvas.getContext('2d')
|
||||
if (!ctx) {
|
||||
return {
|
||||
w: Math.max(1, ...lines.map((line) => line.length * fontSize)),
|
||||
h: Math.max(fontSize * 1.2, lines.length * fontSize * 1.2),
|
||||
}
|
||||
}
|
||||
ctx.font = textFont(fontSize)
|
||||
return {
|
||||
w: Math.ceil(Math.max(1, ...lines.map((line) => ctx.measureText(line || ' ').width))),
|
||||
h: Math.ceil(Math.max(fontSize * 1.2, lines.length * fontSize * 1.2)),
|
||||
}
|
||||
}
|
||||
|
||||
function textEditorSize(draft: { value: string; fontSize: number }) {
|
||||
const size = textSize({
|
||||
text: draft.value || ' ',
|
||||
fontSize: draft.fontSize,
|
||||
})
|
||||
return {
|
||||
width: Math.max(180, Math.min(420, size.w + 28)),
|
||||
height: Math.max(30, Math.ceil(draft.fontSize * 1.6)),
|
||||
lineHeight: Math.ceil(draft.fontSize * 1.25),
|
||||
}
|
||||
}
|
||||
|
||||
function textRenderBox(annotation: Annotation) {
|
||||
const point = annotation.points[0] || { x: 0, y: 0 }
|
||||
const size = textSize(annotation)
|
||||
return {
|
||||
x: point.x - 4,
|
||||
y: point.y - 3,
|
||||
w: size.w + 8,
|
||||
h: size.h + 6,
|
||||
}
|
||||
}
|
||||
|
||||
function textAnnotationIndexAtPoint(p: Point) {
|
||||
if (!rect.value) return null
|
||||
for (let i = annotations.value.length - 1; i >= 0; i--) {
|
||||
const annotation = annotations.value[i]
|
||||
if (annotation.tool !== 'text' || annotation.points.length === 0) continue
|
||||
const point = annotation.points[0]
|
||||
const size = textSize(annotation)
|
||||
const x = rect.value.x + point.x
|
||||
const y = rect.value.y + point.y
|
||||
if (
|
||||
p.x >= x - 6 &&
|
||||
p.x <= x + size.w + 6 &&
|
||||
p.y >= y - 6 &&
|
||||
p.y <= y + size.h + 6
|
||||
) {
|
||||
return i
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function clampTextLocalPoint(point: Point, annotation: Pick<Annotation, 'text' | 'fontSize'>) {
|
||||
if (!rect.value) return point
|
||||
const size = textSize(annotation)
|
||||
return {
|
||||
x: clamp(point.x, 0, Math.max(0, rect.value.w - size.w)),
|
||||
y: clamp(point.y, 0, Math.max(0, rect.value.h - size.h)),
|
||||
}
|
||||
}
|
||||
|
||||
function hitHandle(p: Point): ResizeHandle | null {
|
||||
if (!rect.value) return null
|
||||
const tolerance = 9
|
||||
@@ -213,7 +358,9 @@ function hitHandle(p: Point): ResizeHandle | null {
|
||||
|
||||
function onMouseDown(e: MouseEvent) {
|
||||
if (e.button !== 0) return
|
||||
paletteOpen.value = false
|
||||
commitTextDraft()
|
||||
textDragStartPoint.value = null
|
||||
textDragOriginalPoint.value = null
|
||||
const p = pointFromEvent(e)
|
||||
const handle = hitHandle(p)
|
||||
if (handle && rect.value) {
|
||||
@@ -232,19 +379,41 @@ function onMouseDown(e: MouseEvent) {
|
||||
dragAnchor.value = p
|
||||
rect.value = { x: p.x, y: p.y, w: 0, h: 0 }
|
||||
annotations.value = []
|
||||
selectedTextIndex.value = null
|
||||
draftAnnotation.value = null
|
||||
}
|
||||
|
||||
function onSelectionMouseDown(e: MouseEvent) {
|
||||
if (e.button !== 0 || !rect.value) return
|
||||
e.stopPropagation()
|
||||
paletteOpen.value = false
|
||||
commitTextDraft()
|
||||
const p = pointFromEvent(e)
|
||||
const hitTextIndex = textAnnotationIndexAtPoint(p)
|
||||
if (hitTextIndex !== null) {
|
||||
selectedTextIndex.value = hitTextIndex
|
||||
const annotation = annotations.value[hitTextIndex]
|
||||
activeTool.value = 'text'
|
||||
activeColor.value = annotation.color
|
||||
activeFontSize.value = annotation.fontSize || DEFAULT_TEXT_FONT_SIZE
|
||||
if (e.detail >= 2) {
|
||||
beginTextAnnotation(annotation.points[0], hitTextIndex)
|
||||
return
|
||||
}
|
||||
dragMode.value = 'moving-text'
|
||||
textDragStartPoint.value = localPoint(p)
|
||||
textDragOriginalPoint.value = { ...annotation.points[0] }
|
||||
return
|
||||
}
|
||||
selectedTextIndex.value = null
|
||||
if (activeTool.value === 'text') {
|
||||
beginTextAnnotation(localPoint(p))
|
||||
return
|
||||
}
|
||||
if (e.detail >= 2) {
|
||||
removeSinglePointAnnotation()
|
||||
onCopy()
|
||||
return
|
||||
}
|
||||
const p = pointFromEvent(e)
|
||||
const handle = hitHandle(p)
|
||||
if (handle) {
|
||||
dragMode.value = 'resizing'
|
||||
@@ -258,6 +427,7 @@ function onSelectionMouseDown(e: MouseEvent) {
|
||||
draftAnnotation.value = {
|
||||
tool: activeTool.value,
|
||||
color: activeColor.value,
|
||||
strokeWidth: activeStrokeWidth.value,
|
||||
points: [local],
|
||||
}
|
||||
}
|
||||
@@ -275,6 +445,21 @@ function onMouseMove(e: MouseEvent) {
|
||||
}
|
||||
} else if (dragMode.value === 'resizing') {
|
||||
resizeSelection(p)
|
||||
} else if (
|
||||
dragMode.value === 'moving-text' &&
|
||||
selectedTextIndex.value !== null &&
|
||||
textDragStartPoint.value &&
|
||||
textDragOriginalPoint.value
|
||||
) {
|
||||
const annotation = annotations.value[selectedTextIndex.value]
|
||||
if (annotation?.tool === 'text') {
|
||||
const local = localPoint(p)
|
||||
const next = {
|
||||
x: textDragOriginalPoint.value.x + local.x - textDragStartPoint.value.x,
|
||||
y: textDragOriginalPoint.value.y + local.y - textDragStartPoint.value.y,
|
||||
}
|
||||
annotation.points[0] = clampTextLocalPoint(next, annotation)
|
||||
}
|
||||
} else if (dragMode.value === 'annotating' && draftAnnotation.value) {
|
||||
if (activeTool.value === 'pen') {
|
||||
draftAnnotation.value.points.push(localPoint(p))
|
||||
@@ -302,6 +487,8 @@ function onMouseUp() {
|
||||
dragMode.value = 'idle'
|
||||
resizeHandle.value = null
|
||||
startRect.value = null
|
||||
textDragStartPoint.value = null
|
||||
textDragOriginalPoint.value = null
|
||||
}
|
||||
|
||||
function resizeSelection(p: Point) {
|
||||
@@ -334,7 +521,38 @@ function selectTool(tool: Tool) {
|
||||
|
||||
function chooseColor(color: string) {
|
||||
activeColor.value = color
|
||||
paletteOpen.value = false
|
||||
if (textDraft.value) {
|
||||
textDraft.value.color = color
|
||||
} else if (
|
||||
activeTool.value === 'text' &&
|
||||
selectedTextIndex.value !== null &&
|
||||
annotations.value[selectedTextIndex.value]?.tool === 'text'
|
||||
) {
|
||||
annotations.value[selectedTextIndex.value].color = color
|
||||
}
|
||||
}
|
||||
|
||||
function chooseStrokeWidth(width: number) {
|
||||
activeStrokeWidth.value = width
|
||||
}
|
||||
|
||||
function chooseFontSize(size: number) {
|
||||
activeFontSize.value = size
|
||||
if (textDraft.value) {
|
||||
textDraft.value.fontSize = size
|
||||
textDraft.value.point = clampTextLocalPoint(textDraft.value.point, {
|
||||
text: textDraft.value.value,
|
||||
fontSize: size,
|
||||
})
|
||||
} else if (
|
||||
activeTool.value === 'text' &&
|
||||
selectedTextIndex.value !== null &&
|
||||
annotations.value[selectedTextIndex.value]?.tool === 'text'
|
||||
) {
|
||||
const annotation = annotations.value[selectedTextIndex.value]
|
||||
annotation.fontSize = size
|
||||
annotation.points[0] = clampTextLocalPoint(annotation.points[0], annotation)
|
||||
}
|
||||
}
|
||||
|
||||
function onConfirm() {
|
||||
@@ -353,8 +571,17 @@ function onSaveRemote() {
|
||||
emitAction('save-remote')
|
||||
}
|
||||
|
||||
function emitAction(action: 'confirm' | 'copy' | 'save' | 'save-remote') {
|
||||
function onSummarize() {
|
||||
emitAction('summarize')
|
||||
}
|
||||
|
||||
function onOCR() {
|
||||
emitAction('ocr')
|
||||
}
|
||||
|
||||
function emitAction(action: 'confirm' | 'copy' | 'save' | 'save-remote' | 'summarize' | 'ocr') {
|
||||
if (!rect.value) return
|
||||
commitTextDraft()
|
||||
const payload = {
|
||||
rect: { ...rect.value },
|
||||
annotations: annotations.value,
|
||||
@@ -363,6 +590,8 @@ function emitAction(action: 'confirm' | 'copy' | 'save' | 'save-remote') {
|
||||
if (action === 'copy') emit('copy', payload)
|
||||
if (action === 'save') emit('save', payload)
|
||||
if (action === 'save-remote') emit('save-remote', payload)
|
||||
if (action === 'summarize') emit('summarize', payload)
|
||||
if (action === 'ocr') emit('ocr', payload)
|
||||
}
|
||||
|
||||
function onCancel() {
|
||||
@@ -370,6 +599,13 @@ function onCancel() {
|
||||
}
|
||||
|
||||
function onKeydown(e: KeyboardEvent) {
|
||||
if (textDraft.value) {
|
||||
if (e.key === 'Escape') {
|
||||
e.preventDefault()
|
||||
cancelTextDraft()
|
||||
}
|
||||
return
|
||||
}
|
||||
if (e.key === 'Escape') {
|
||||
e.preventDefault()
|
||||
onCancel()
|
||||
@@ -380,7 +616,16 @@ function onKeydown(e: KeyboardEvent) {
|
||||
}
|
||||
|
||||
function undoAnnotation() {
|
||||
if (!textDraft.value && annotations.value.length === 0) return
|
||||
cancelTextDraft()
|
||||
if (annotations.value.length === 0) return
|
||||
annotations.value.pop()
|
||||
if (
|
||||
selectedTextIndex.value !== null &&
|
||||
selectedTextIndex.value >= annotations.value.length
|
||||
) {
|
||||
selectedTextIndex.value = null
|
||||
}
|
||||
}
|
||||
|
||||
function removeSinglePointAnnotation() {
|
||||
@@ -390,6 +635,76 @@ function removeSinglePointAnnotation() {
|
||||
}
|
||||
}
|
||||
|
||||
function beginTextAnnotation(point: Point, index: number | null = null) {
|
||||
commitTextDraft()
|
||||
dragMode.value = 'idle'
|
||||
draftAnnotation.value = null
|
||||
const existing = index !== null ? annotations.value[index] : null
|
||||
const color = existing?.color || activeColor.value
|
||||
const fontSize = existing?.fontSize || activeFontSize.value
|
||||
if (existing) {
|
||||
activeColor.value = color
|
||||
activeFontSize.value = fontSize
|
||||
}
|
||||
textDraft.value = {
|
||||
point: clampTextLocalPoint(point, existing || { text: '', fontSize }),
|
||||
value: existing?.text || '',
|
||||
color,
|
||||
fontSize,
|
||||
index,
|
||||
}
|
||||
void nextTick(() => {
|
||||
textInputRef.value?.focus()
|
||||
textInputRef.value?.select()
|
||||
})
|
||||
}
|
||||
|
||||
function commitTextDraft() {
|
||||
if (!textDraft.value) return
|
||||
const text = textDraft.value.value.trim()
|
||||
const draft = textDraft.value
|
||||
if (draft.index !== null) {
|
||||
const target = annotations.value[draft.index]
|
||||
if (target?.tool === 'text') {
|
||||
if (text !== '') {
|
||||
target.points = [clampTextLocalPoint(draft.point, { text, fontSize: draft.fontSize })]
|
||||
target.text = text
|
||||
target.color = draft.color
|
||||
target.fontSize = draft.fontSize
|
||||
selectedTextIndex.value = draft.index
|
||||
} else {
|
||||
annotations.value.splice(draft.index, 1)
|
||||
selectedTextIndex.value = null
|
||||
}
|
||||
}
|
||||
} else if (text !== '') {
|
||||
const point = clampTextLocalPoint(draft.point, { text, fontSize: draft.fontSize })
|
||||
annotations.value.push({
|
||||
tool: 'text',
|
||||
color: draft.color,
|
||||
points: [point],
|
||||
text,
|
||||
fontSize: draft.fontSize,
|
||||
})
|
||||
selectedTextIndex.value = annotations.value.length - 1
|
||||
}
|
||||
textDraft.value = null
|
||||
}
|
||||
|
||||
function cancelTextDraft() {
|
||||
textDraft.value = null
|
||||
}
|
||||
|
||||
function onTextDraftKeydown(e: KeyboardEvent) {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault()
|
||||
commitTextDraft()
|
||||
} else if (e.key === 'Escape') {
|
||||
e.preventDefault()
|
||||
cancelTextDraft()
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('keydown', onKeydown)
|
||||
})
|
||||
@@ -431,7 +746,7 @@ onUnmounted(() => {
|
||||
v-if="annotation.tool === 'pen'"
|
||||
:points="annotation.points.map((p) => `${p.x},${p.y}`).join(' ')"
|
||||
:stroke="annotation.color"
|
||||
stroke-width="3"
|
||||
:stroke-width="annotation.strokeWidth || 3"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
fill="none"
|
||||
@@ -443,7 +758,7 @@ onUnmounted(() => {
|
||||
:width="Math.abs(annotation.points[1].x - annotation.points[0].x)"
|
||||
:height="Math.abs(annotation.points[1].y - annotation.points[0].y)"
|
||||
:stroke="annotation.color"
|
||||
stroke-width="3"
|
||||
:stroke-width="annotation.strokeWidth || 3"
|
||||
fill="none"
|
||||
/>
|
||||
<ellipse
|
||||
@@ -453,9 +768,30 @@ onUnmounted(() => {
|
||||
:rx="Math.abs(annotation.points[1].x - annotation.points[0].x) / 2"
|
||||
:ry="Math.abs(annotation.points[1].y - annotation.points[0].y) / 2"
|
||||
:stroke="annotation.color"
|
||||
stroke-width="3"
|
||||
:stroke-width="annotation.strokeWidth || 3"
|
||||
fill="none"
|
||||
/>
|
||||
<template v-else-if="annotation.tool === 'text' && annotation.points.length >= 1">
|
||||
<rect
|
||||
v-if="selectedTextIndex === index && index < annotations.length"
|
||||
class="text-selection-box"
|
||||
:x="textRenderBox(annotation).x"
|
||||
:y="textRenderBox(annotation).y"
|
||||
:width="textRenderBox(annotation).w"
|
||||
:height="textRenderBox(annotation).h"
|
||||
/>
|
||||
<text
|
||||
class="annotation-text"
|
||||
:x="annotation.points[0].x"
|
||||
:y="annotation.points[0].y"
|
||||
:fill="annotation.color"
|
||||
:font-size="annotation.fontSize || DEFAULT_TEXT_FONT_SIZE"
|
||||
font-weight="600"
|
||||
dominant-baseline="hanging"
|
||||
>
|
||||
{{ annotation.text }}
|
||||
</text>
|
||||
</template>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
@@ -471,6 +807,26 @@ onUnmounted(() => {
|
||||
@mousedown="onSelectionMouseDown"
|
||||
/>
|
||||
|
||||
<input
|
||||
v-if="rect && textDraft"
|
||||
ref="textInputRef"
|
||||
v-model="textDraft.value"
|
||||
class="text-editor"
|
||||
:style="{
|
||||
left: rect.x + textDraft.point.x + 'px',
|
||||
top: rect.y + textDraft.point.y + 'px',
|
||||
color: textDraft.color,
|
||||
fontSize: textDraft.fontSize + 'px',
|
||||
width: textEditorSize(textDraft).width + 'px',
|
||||
height: textEditorSize(textDraft).height + 'px',
|
||||
lineHeight: textEditorSize(textDraft).lineHeight + 'px',
|
||||
}"
|
||||
spellcheck="false"
|
||||
@mousedown.stop
|
||||
@keydown.stop="onTextDraftKeydown"
|
||||
@blur="commitTextDraft"
|
||||
/>
|
||||
|
||||
<div
|
||||
v-for="handle in handles"
|
||||
:key="handle.name"
|
||||
@@ -535,29 +891,22 @@ onUnmounted(() => {
|
||||
<circle cx="12" cy="12" r="7" />
|
||||
</svg>
|
||||
</button>
|
||||
<div class="color-wrap">
|
||||
<button
|
||||
class="icon-btn color-btn"
|
||||
title="选择标记颜色"
|
||||
@click="paletteOpen = !paletteOpen"
|
||||
>
|
||||
<span :style="{ background: activeColor }" />
|
||||
</button>
|
||||
<div v-if="paletteOpen" class="palette">
|
||||
<button
|
||||
v-for="color in colors"
|
||||
:key="color"
|
||||
class="swatch"
|
||||
:class="{ selected: color === activeColor }"
|
||||
:style="{ background: color }"
|
||||
:title="color"
|
||||
@click="chooseColor(color)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
class="icon-btn"
|
||||
:disabled="annotations.length === 0"
|
||||
:class="{ active: activeTool === 'text' }"
|
||||
title="文字标记"
|
||||
@click="selectTool('text')"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true">
|
||||
<path d="M5 5h14" />
|
||||
<path d="M12 5v14" />
|
||||
<path d="M9 19h6" />
|
||||
</svg>
|
||||
</button>
|
||||
<button
|
||||
class="icon-btn"
|
||||
:class="{ muted: annotations.length === 0 }"
|
||||
:aria-disabled="annotations.length === 0"
|
||||
title="撤销上一处标记"
|
||||
@click="undoAnnotation"
|
||||
>
|
||||
@@ -568,6 +917,55 @@ onUnmounted(() => {
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="toolSettingsPos && rect && rect.w >= 4 && rect.h >= 4"
|
||||
class="tool-settings-menu"
|
||||
:style="{
|
||||
left: toolSettingsPos.x + 'px',
|
||||
top: toolSettingsPos.y + 'px',
|
||||
width: toolSettingsPos.w + 'px',
|
||||
'--arrow-x': toolSettingsPos.arrowX + 'px',
|
||||
}"
|
||||
@mousedown.stop
|
||||
>
|
||||
<div v-if="activeTool !== 'text'" class="setting-group stroke-group">
|
||||
<button
|
||||
v-for="widthValue in STROKE_WIDTHS"
|
||||
:key="widthValue"
|
||||
class="stroke-choice"
|
||||
:class="{ active: activeStrokeWidth === widthValue }"
|
||||
:title="`${widthValue}px`"
|
||||
@click="chooseStrokeWidth(widthValue)"
|
||||
>
|
||||
<span :style="{ width: widthValue * 4 + 'px', height: widthValue * 4 + 'px' }" />
|
||||
</button>
|
||||
</div>
|
||||
<div v-else class="setting-group font-group">
|
||||
<button
|
||||
v-for="size in FONT_SIZES"
|
||||
:key="size"
|
||||
class="font-choice"
|
||||
:class="{ active: activeFontSize === size }"
|
||||
:title="`${size}px`"
|
||||
@click="chooseFontSize(size)"
|
||||
>
|
||||
{{ size }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="settings-divider" />
|
||||
<div class="setting-group color-group">
|
||||
<button
|
||||
v-for="color in colors"
|
||||
:key="color"
|
||||
class="swatch"
|
||||
:class="{ selected: color === activeColor }"
|
||||
:style="{ background: color }"
|
||||
:title="color"
|
||||
@click="chooseColor(color)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="rightToolbarPos && rect && rect.w >= 4 && rect.h >= 4"
|
||||
class="toolbar action-toolbar"
|
||||
@@ -583,8 +981,8 @@ onUnmounted(() => {
|
||||
/>
|
||||
<button
|
||||
class="action-btn"
|
||||
data-tip="复制图标"
|
||||
aria-label="复制图标"
|
||||
data-tip="复制图片"
|
||||
aria-label="复制图片"
|
||||
@click="onCopy"
|
||||
v-html="copyIcon"
|
||||
/>
|
||||
@@ -602,6 +1000,34 @@ onUnmounted(() => {
|
||||
@click="onSaveRemote"
|
||||
v-html="saveRemoteIcon"
|
||||
/>
|
||||
<button
|
||||
class="action-btn"
|
||||
data-tip="提取文字"
|
||||
aria-label="提取文字"
|
||||
@click="onOCR"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true">
|
||||
<path d="M5 8V5h3" />
|
||||
<path d="M16 5h3v3" />
|
||||
<path d="M19 16v3h-3" />
|
||||
<path d="M8 19H5v-3" />
|
||||
<path d="M9 15l3-7 3 7" />
|
||||
<path d="M10 13h4" />
|
||||
</svg>
|
||||
</button>
|
||||
<button
|
||||
class="action-btn"
|
||||
data-tip="复制总结"
|
||||
aria-label="复制总结"
|
||||
@click="onSummarize"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true">
|
||||
<path d="M6 3h8l4 4v14H6z" />
|
||||
<path d="M14 3v5h4" />
|
||||
<path d="M9 12h6" />
|
||||
<path d="M9 16h5" />
|
||||
</svg>
|
||||
</button>
|
||||
<button
|
||||
class="action-btn primary"
|
||||
data-tip="上传云端"
|
||||
@@ -634,11 +1060,37 @@ onUnmounted(() => {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.annotation-text {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "SF Pro Text", sans-serif;
|
||||
}
|
||||
|
||||
.text-selection-box {
|
||||
fill: transparent;
|
||||
stroke: #3b82f6;
|
||||
stroke-width: 1.5;
|
||||
stroke-dasharray: 4 3;
|
||||
}
|
||||
|
||||
.selection-hit-area {
|
||||
position: absolute;
|
||||
cursor: crosshair;
|
||||
}
|
||||
|
||||
.text-editor {
|
||||
position: absolute;
|
||||
z-index: 6;
|
||||
box-sizing: border-box;
|
||||
min-width: 120px;
|
||||
max-width: 420px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid currentColor;
|
||||
border-radius: 4px;
|
||||
outline: none;
|
||||
background: rgba(15, 23, 42, 0.72);
|
||||
box-shadow: 0 4px 18px rgba(0, 0, 0, 0.35);
|
||||
font: 600 20px/1.2 -apple-system, BlinkMacSystemFont, "SF Pro Text", sans-serif;
|
||||
}
|
||||
|
||||
.resize-handle {
|
||||
position: absolute;
|
||||
width: 10px;
|
||||
@@ -693,15 +1145,17 @@ onUnmounted(() => {
|
||||
}
|
||||
|
||||
.mark-toolbar {
|
||||
width: 190px;
|
||||
width: 178px;
|
||||
}
|
||||
.action-toolbar {
|
||||
width: 180px;
|
||||
width: 252px;
|
||||
}
|
||||
|
||||
.icon-btn,
|
||||
.action-btn,
|
||||
.swatch {
|
||||
.swatch,
|
||||
.stroke-choice,
|
||||
.font-choice {
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
@@ -752,6 +1206,16 @@ onUnmounted(() => {
|
||||
fill: currentColor;
|
||||
pointer-events: none;
|
||||
}
|
||||
.action-btn > svg {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
fill: none;
|
||||
stroke: currentColor;
|
||||
stroke-width: 2;
|
||||
stroke-linecap: round;
|
||||
stroke-linejoin: round;
|
||||
pointer-events: none;
|
||||
}
|
||||
.action-btn::after {
|
||||
content: attr(data-tip);
|
||||
position: absolute;
|
||||
@@ -784,14 +1248,14 @@ onUnmounted(() => {
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
}
|
||||
.icon-btn:hover:not(:disabled),
|
||||
.icon-btn:hover:not(.muted),
|
||||
.icon-btn.active {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.12);
|
||||
}
|
||||
.icon-btn:disabled {
|
||||
.icon-btn.muted {
|
||||
opacity: 0.35;
|
||||
cursor: not-allowed;
|
||||
cursor: default;
|
||||
}
|
||||
.icon-btn svg {
|
||||
width: 18px;
|
||||
@@ -803,36 +1267,88 @@ onUnmounted(() => {
|
||||
stroke-linejoin: round;
|
||||
}
|
||||
|
||||
.color-wrap {
|
||||
position: relative;
|
||||
.tool-settings-menu {
|
||||
position: absolute;
|
||||
z-index: 5;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
min-height: 42px;
|
||||
padding: 8px 14px;
|
||||
color: #1f2937;
|
||||
background: rgba(255, 255, 255, 0.96);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 12px 30px rgba(0, 0, 0, 0.26);
|
||||
cursor: default;
|
||||
}
|
||||
.color-btn span {
|
||||
.tool-settings-menu::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: var(--arrow-x);
|
||||
top: -8px;
|
||||
transform: translateX(-50%) rotate(45deg);
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border: 1px solid rgba(255, 255, 255, 0.7);
|
||||
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.18);
|
||||
background: rgba(255, 255, 255, 0.96);
|
||||
border-radius: 3px;
|
||||
}
|
||||
.palette {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 36px;
|
||||
.setting-group {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
.stroke-choice,
|
||||
.font-choice {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, 22px);
|
||||
gap: 6px;
|
||||
padding: 8px;
|
||||
background: rgba(28, 28, 32, 0.96);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 8px 26px rgba(0, 0, 0, 0.45);
|
||||
place-items: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
border-radius: 6px;
|
||||
color: #1f2937;
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
}
|
||||
.stroke-choice:hover,
|
||||
.stroke-choice.active,
|
||||
.font-choice:hover,
|
||||
.font-choice.active {
|
||||
color: #2563eb;
|
||||
background: #eaf1ff;
|
||||
}
|
||||
.stroke-choice span {
|
||||
display: block;
|
||||
border-radius: 999px;
|
||||
background: currentColor;
|
||||
}
|
||||
.font-choice {
|
||||
min-width: 40px;
|
||||
width: auto;
|
||||
padding: 0 8px;
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
}
|
||||
.settings-divider {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: 1px;
|
||||
height: 26px;
|
||||
background: #d1d5db;
|
||||
}
|
||||
.swatch {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: 1px solid rgba(255, 255, 255, 0.55);
|
||||
padding: 0;
|
||||
border: 1px solid rgba(17, 24, 39, 0.18);
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.swatch.selected {
|
||||
outline: 2px solid #fff;
|
||||
outline: 2px solid #2563eb;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,10 +8,12 @@
|
||||
* • "general" — the global hotkey / capture parameters.
|
||||
* • "s3" — S3-compatible object-storage credentials.
|
||||
* • "ssh" — SSH/SCP destination for the "save remote" button.
|
||||
* • "llm" — multimodal screenshot summary provider settings.
|
||||
* • "ocr" — cloud OCR provider settings for text extraction.
|
||||
*
|
||||
* State flow: load() pulls config from Go on mount, save() pushes back.
|
||||
*/
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import {
|
||||
GetConfig,
|
||||
SaveConfig,
|
||||
@@ -22,10 +24,16 @@ import {
|
||||
|
||||
// Tab discriminator shared with the App shell. Kept as a string union so
|
||||
// the parent can pass the value without importing a type from this view.
|
||||
type TabId = 'general' | 's3' | 'ssh'
|
||||
type TabId = 'general' | 's3' | 'ssh' | 'llm' | 'ocr'
|
||||
type ThemeMode = 'auto' | 'light' | 'dark'
|
||||
|
||||
const props = defineProps<{
|
||||
tab: TabId
|
||||
theme: ThemeMode
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(event: 'theme-change', theme: ThemeMode): void
|
||||
}>()
|
||||
|
||||
interface S3Config {
|
||||
@@ -43,6 +51,7 @@ interface SSHConfig {
|
||||
host: string
|
||||
port: number
|
||||
user: string
|
||||
authMethod: string
|
||||
password: string
|
||||
pathPrefix: string
|
||||
strictHostKey: boolean
|
||||
@@ -50,12 +59,74 @@ interface SSHConfig {
|
||||
connectTimeoutSecs: number
|
||||
}
|
||||
|
||||
interface LLMProviderConfig {
|
||||
label: string
|
||||
baseUrl: string
|
||||
apiKey: string
|
||||
model: string
|
||||
maxTokens: number
|
||||
temperature: number
|
||||
timeoutSecs: number
|
||||
}
|
||||
|
||||
interface LLMConfig {
|
||||
activeProvider: string
|
||||
prompt: string
|
||||
providers: Record<string, LLMProviderConfig>
|
||||
}
|
||||
|
||||
interface OCRProviderConfig {
|
||||
label: string
|
||||
endpoint: string
|
||||
accessKeyId: string
|
||||
accessKeySecret: string
|
||||
region: string
|
||||
service: string
|
||||
action: string
|
||||
version: string
|
||||
timeoutSecs: number
|
||||
}
|
||||
|
||||
interface OCRConfig {
|
||||
activeProvider: string
|
||||
providers: Record<string, OCRProviderConfig>
|
||||
}
|
||||
|
||||
interface AppConfig {
|
||||
hotkey: string
|
||||
theme: ThemeMode
|
||||
s3: S3Config
|
||||
ssh: SSHConfig
|
||||
llm: LLMConfig
|
||||
ocr: OCRConfig
|
||||
}
|
||||
|
||||
const llmProviderOptions = [
|
||||
{ id: 'qwen', label: '阿里千问多模态' },
|
||||
{ id: 'doubao', label: '火山方舟豆包多模态' },
|
||||
{ id: 'openai', label: 'ChatGPT / OpenAI-compatible' },
|
||||
]
|
||||
|
||||
const ocrProviderOptions = [
|
||||
{ id: 'aliyun', label: '阿里云文字识别' },
|
||||
{ id: 'volcengine', label: '火山引擎文字识别' },
|
||||
]
|
||||
|
||||
const themeOptions: Array<{ id: ThemeMode; label: string }> = [
|
||||
{ id: 'light', label: '浅色' },
|
||||
{ id: 'dark', label: '深色' },
|
||||
{ id: 'auto', label: '自动' },
|
||||
]
|
||||
|
||||
const DEFAULT_SUMMARY_PROMPT = `你是一个截图内容总结助手。请阅读截图,并用中文输出一段适合直接粘贴到聊天、工单、Issue 或 PR 中的说明。
|
||||
|
||||
要求:
|
||||
- 先说明截图中最重要的信息和用户可能想表达的意图。
|
||||
- 如果截图包含报错、异常状态、表格、代码、界面控件或关键数字,请准确提取。
|
||||
- 如果截图内容不足以判断,不要编造;直接说明不确定点。
|
||||
- 输出尽量简洁,默认 3 到 6 条要点。
|
||||
- 不要输出 Markdown 标题,不要寒暄。`
|
||||
|
||||
// `defaultConfig` keeps the initial render in sync with the Go-side
|
||||
// DefaultAppConfig so the UI never flashes empty fields before load()
|
||||
// completes. Centralising the defaults also avoids subtle drift between
|
||||
@@ -63,6 +134,7 @@ interface AppConfig {
|
||||
function defaultConfig(): AppConfig {
|
||||
return {
|
||||
hotkey: 'cmd+shift+a',
|
||||
theme: 'auto',
|
||||
s3: {
|
||||
endpoint: '',
|
||||
region: 'us-east-1',
|
||||
@@ -77,12 +149,73 @@ function defaultConfig(): AppConfig {
|
||||
host: '',
|
||||
port: 22,
|
||||
user: '',
|
||||
authMethod: 'password',
|
||||
password: '',
|
||||
pathPrefix: 'snapgo/',
|
||||
strictHostKey: false,
|
||||
knownHostsPath: '',
|
||||
connectTimeoutSecs: 10,
|
||||
},
|
||||
llm: {
|
||||
activeProvider: 'openai',
|
||||
prompt: DEFAULT_SUMMARY_PROMPT,
|
||||
providers: {
|
||||
qwen: {
|
||||
label: '阿里千问多模态',
|
||||
baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
|
||||
apiKey: '',
|
||||
model: 'qwen-vl-plus',
|
||||
maxTokens: 600,
|
||||
temperature: 0.2,
|
||||
timeoutSecs: 60,
|
||||
},
|
||||
doubao: {
|
||||
label: '火山方舟豆包多模态',
|
||||
baseUrl: 'https://ark.cn-beijing.volces.com/api/v3',
|
||||
apiKey: '',
|
||||
model: '',
|
||||
maxTokens: 600,
|
||||
temperature: 0.2,
|
||||
timeoutSecs: 60,
|
||||
},
|
||||
openai: {
|
||||
label: 'ChatGPT / OpenAI-compatible',
|
||||
baseUrl: 'https://api.openai.com/v1',
|
||||
apiKey: '',
|
||||
model: 'gpt-5.5',
|
||||
maxTokens: 600,
|
||||
temperature: 0.2,
|
||||
timeoutSecs: 60,
|
||||
},
|
||||
},
|
||||
},
|
||||
ocr: {
|
||||
activeProvider: 'aliyun',
|
||||
providers: {
|
||||
aliyun: {
|
||||
label: '阿里云文字识别',
|
||||
endpoint: 'https://ocr-api.cn-hangzhou.aliyuncs.com',
|
||||
accessKeyId: '',
|
||||
accessKeySecret: '',
|
||||
region: '',
|
||||
service: '',
|
||||
action: 'RecognizeGeneral',
|
||||
version: '2021-07-07',
|
||||
timeoutSecs: 30,
|
||||
},
|
||||
volcengine: {
|
||||
label: '火山引擎文字识别',
|
||||
endpoint: 'https://visual.volcengineapi.com',
|
||||
accessKeyId: '',
|
||||
accessKeySecret: '',
|
||||
region: 'cn-north-1',
|
||||
service: 'cv',
|
||||
action: 'OCRNormal',
|
||||
version: '2020-08-26',
|
||||
timeoutSecs: 30,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,6 +240,30 @@ const sshPathDisplay = computed({
|
||||
},
|
||||
})
|
||||
|
||||
const activeLLMProvider = computed(() => {
|
||||
const id = config.value.llm.activeProvider || 'openai'
|
||||
if (!config.value.llm.providers[id]) {
|
||||
config.value.llm.activeProvider = 'openai'
|
||||
return config.value.llm.providers.openai
|
||||
}
|
||||
return config.value.llm.providers[id]
|
||||
})
|
||||
|
||||
const activeOCRProvider = computed(() => {
|
||||
const id = config.value.ocr.activeProvider || 'aliyun'
|
||||
if (!config.value.ocr.providers[id]) {
|
||||
config.value.ocr.activeProvider = 'aliyun'
|
||||
return config.value.ocr.providers.aliyun
|
||||
}
|
||||
return config.value.ocr.providers[id]
|
||||
})
|
||||
|
||||
function normalizeTheme(theme: unknown): ThemeMode {
|
||||
return theme === 'light' || theme === 'dark' || theme === 'auto'
|
||||
? theme
|
||||
: 'auto'
|
||||
}
|
||||
|
||||
function flash(kind: 'ok' | 'err', text: string) {
|
||||
message.value = { kind, text }
|
||||
window.setTimeout(() => {
|
||||
@@ -123,7 +280,19 @@ async function load() {
|
||||
Object.assign(merged, cfg)
|
||||
merged.s3 = { ...merged.s3, ...(cfg as any).s3 }
|
||||
merged.ssh = { ...merged.ssh, ...(cfg as any).ssh }
|
||||
merged.llm = { ...merged.llm, ...(cfg as any).llm }
|
||||
merged.llm.providers = {
|
||||
...defaultConfig().llm.providers,
|
||||
...((cfg as any).llm?.providers ?? {}),
|
||||
}
|
||||
merged.ocr = { ...merged.ocr, ...(cfg as any).ocr }
|
||||
merged.ocr.providers = {
|
||||
...defaultConfig().ocr.providers,
|
||||
...((cfg as any).ocr?.providers ?? {}),
|
||||
}
|
||||
merged.theme = normalizeTheme((cfg as any).theme)
|
||||
config.value = merged
|
||||
emit('theme-change', config.value.theme)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,11 +336,16 @@ async function manualCapture() {
|
||||
await CaptureNow()
|
||||
}
|
||||
|
||||
watch(
|
||||
() => config.value.theme,
|
||||
(theme) => emit('theme-change', normalizeTheme(theme))
|
||||
)
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="settings">
|
||||
<div class="settings" :class="`theme-${props.theme}`">
|
||||
<header class="hero">
|
||||
<div>
|
||||
<h1>SnapGo</h1>
|
||||
@@ -183,17 +357,31 @@ onMounted(load)
|
||||
<button class="btn primary" @click="manualCapture">Capture now</button>
|
||||
</header>
|
||||
|
||||
<!-- General tab — only the shortcut configuration lives here. -->
|
||||
<!-- General tab — shortcut and appearance configuration. -->
|
||||
<section v-if="props.tab === 'general'" class="card">
|
||||
<h2>Shortcut</h2>
|
||||
<label class="field">
|
||||
<span>Global hotkey</span>
|
||||
<input
|
||||
v-model="config.hotkey"
|
||||
placeholder="cmd+shift+a"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<h2>General</h2>
|
||||
<div class="grid">
|
||||
<label class="field">
|
||||
<span>Global hotkey</span>
|
||||
<input
|
||||
v-model="config.hotkey"
|
||||
placeholder="cmd+shift+a"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>主题选择</span>
|
||||
<select v-model="config.theme">
|
||||
<option
|
||||
v-for="themeOption in themeOptions"
|
||||
:key="themeOption.id"
|
||||
:value="themeOption.id"
|
||||
>
|
||||
{{ themeOption.label }}
|
||||
</option>
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<p class="hint">
|
||||
Tokens (case-insensitive, "+"-separated): cmd / ctrl / option / shift +
|
||||
a–z or 0–9. Example: <code>cmd+shift+a</code>.
|
||||
@@ -280,14 +468,27 @@ onMounted(load)
|
||||
placeholder="22"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>User *</span>
|
||||
<input v-model="config.ssh.user" placeholder="ubuntu" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Password (optional)</span>
|
||||
<input v-model="config.ssh.password" type="password" />
|
||||
</label>
|
||||
<div class="field-row auth-row">
|
||||
<label class="field">
|
||||
<span>Auth method</span>
|
||||
<select v-model="config.ssh.authMethod">
|
||||
<option value="password">Password</option>
|
||||
<option value="key">SSH-Key</option>
|
||||
<option value="kerberos">Kerberos</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>User *</span>
|
||||
<input v-model="config.ssh.user" placeholder="ubuntu" />
|
||||
</label>
|
||||
<label
|
||||
v-if="config.ssh.authMethod === 'password'"
|
||||
class="field"
|
||||
>
|
||||
<span>Password</span>
|
||||
<input v-model="config.ssh.password" type="password" />
|
||||
</label>
|
||||
</div>
|
||||
<label class="field full">
|
||||
<span>Remote path (under home)</span>
|
||||
<div class="prefixed-input">
|
||||
@@ -324,9 +525,23 @@ onMounted(load)
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<p v-if="!config.ssh.password" class="hint warn">
|
||||
Password is empty — please make sure password-less SSH is configured on
|
||||
this machine (e.g. via <code>ssh-copy-id</code> or your <code>ssh-agent</code>).
|
||||
<p v-if="config.ssh.authMethod === 'kerberos'" class="hint">
|
||||
Kerberos mode delegates to the system <code>ssh</code>/<code>scp</code>.
|
||||
Run <code>kinit your.name@BYTEDANCE.COM</code> in a terminal first; tickets
|
||||
expire (typically every 10–24h), so re-run <code>kinit</code> if uploads
|
||||
start failing. Verify with <code>klist</code>.
|
||||
</p>
|
||||
<p v-else-if="config.ssh.authMethod === 'key'" class="hint">
|
||||
SSH-Key mode uses your <code>ssh-agent</code> and <code>~/.ssh/id_*</code>
|
||||
keys. Make sure password-less login already works (e.g. via
|
||||
<code>ssh-copy-id</code>).
|
||||
</p>
|
||||
<p
|
||||
v-else-if="config.ssh.authMethod === 'password' && !config.ssh.password"
|
||||
class="hint warn"
|
||||
>
|
||||
Password is empty — enter the remote login password, or switch the auth
|
||||
method to SSH-Key.
|
||||
</p>
|
||||
|
||||
<div class="actions">
|
||||
@@ -339,6 +554,200 @@ onMounted(load)
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- LLM tab — multimodal screenshot summary provider settings. -->
|
||||
<section v-if="props.tab === 'llm'" class="card">
|
||||
<h2>LLM screenshot summary</h2>
|
||||
<div class="grid">
|
||||
<label class="field full">
|
||||
<span>Provider</span>
|
||||
<select v-model="config.llm.activeProvider">
|
||||
<option
|
||||
v-for="provider in llmProviderOptions"
|
||||
:key="provider.id"
|
||||
:value="provider.id"
|
||||
>
|
||||
{{ provider.label }}
|
||||
</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="field full">
|
||||
<span>Base URL *</span>
|
||||
<input
|
||||
v-model="activeLLMProvider.baseUrl"
|
||||
placeholder="https://api.openai.com/v1"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>API Key *</span>
|
||||
<input v-model="activeLLMProvider.apiKey" type="password" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Model *</span>
|
||||
<input
|
||||
v-model="activeLLMProvider.model"
|
||||
placeholder="gpt-5.5 / qwen-vl-plus / Ark endpoint ID"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Max tokens</span>
|
||||
<input
|
||||
v-model.number="activeLLMProvider.maxTokens"
|
||||
type="number"
|
||||
min="64"
|
||||
max="4096"
|
||||
placeholder="600"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Temperature</span>
|
||||
<input
|
||||
v-model.number="activeLLMProvider.temperature"
|
||||
type="number"
|
||||
min="0"
|
||||
max="2"
|
||||
step="0.1"
|
||||
placeholder="0.2"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Timeout (sec)</span>
|
||||
<input
|
||||
v-model.number="activeLLMProvider.timeoutSecs"
|
||||
type="number"
|
||||
min="10"
|
||||
max="300"
|
||||
placeholder="60"
|
||||
/>
|
||||
</label>
|
||||
<label class="field full">
|
||||
<span>Prompt</span>
|
||||
<textarea
|
||||
v-model="config.llm.prompt"
|
||||
class="prompt-textarea"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<p class="hint">
|
||||
The "copy summary" screenshot action first uploads the image through the
|
||||
S3 configuration, then sends the public image URL to this multimodal
|
||||
provider. Keep S3 configured before using it.
|
||||
</p>
|
||||
<p v-if="config.llm.activeProvider === 'doubao'" class="hint">
|
||||
Volcengine Ark usually uses the inference endpoint ID as the model
|
||||
value; paste the endpoint/model identifier from your Ark console.
|
||||
</p>
|
||||
<p v-else-if="config.llm.activeProvider === 'qwen'" class="hint">
|
||||
DashScope OpenAI-compatible mode is used here. If your workspace uses a
|
||||
regional endpoint, replace Base URL with that compatible-mode URL.
|
||||
</p>
|
||||
|
||||
<div class="actions">
|
||||
<button class="btn primary" :disabled="saving" @click="save">
|
||||
{{ saving ? 'Saving…' : 'Save' }}
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- OCR tab — cloud OCR provider settings for screenshot text extraction. -->
|
||||
<section v-if="props.tab === 'ocr'" class="card">
|
||||
<h2>文字提取</h2>
|
||||
<div class="grid">
|
||||
<label class="field full">
|
||||
<span>Provider</span>
|
||||
<select v-model="config.ocr.activeProvider">
|
||||
<option
|
||||
v-for="provider in ocrProviderOptions"
|
||||
:key="provider.id"
|
||||
:value="provider.id"
|
||||
>
|
||||
{{ provider.label }}
|
||||
</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class="field full">
|
||||
<span>Endpoint *</span>
|
||||
<input
|
||||
v-model="activeOCRProvider.endpoint"
|
||||
placeholder="https://ocr-api.cn-hangzhou.aliyuncs.com"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>AccessKey ID *</span>
|
||||
<input v-model="activeOCRProvider.accessKeyId" spellcheck="false" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>AccessKey Secret *</span>
|
||||
<input v-model="activeOCRProvider.accessKeySecret" type="password" />
|
||||
</label>
|
||||
<label
|
||||
v-if="config.ocr.activeProvider === 'volcengine'"
|
||||
class="field"
|
||||
>
|
||||
<span>Region *</span>
|
||||
<input
|
||||
v-model="activeOCRProvider.region"
|
||||
placeholder="cn-north-1"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label
|
||||
v-if="config.ocr.activeProvider === 'volcengine'"
|
||||
class="field"
|
||||
>
|
||||
<span>Service *</span>
|
||||
<input
|
||||
v-model="activeOCRProvider.service"
|
||||
placeholder="cv"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Action *</span>
|
||||
<input
|
||||
v-model="activeOCRProvider.action"
|
||||
placeholder="RecognizeGeneral / OCRNormal"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Version *</span>
|
||||
<input
|
||||
v-model="activeOCRProvider.version"
|
||||
placeholder="2021-07-07 / 2020-08-26"
|
||||
spellcheck="false"
|
||||
/>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>Timeout (sec)</span>
|
||||
<input
|
||||
v-model.number="activeOCRProvider.timeoutSecs"
|
||||
type="number"
|
||||
min="5"
|
||||
max="120"
|
||||
placeholder="30"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<p v-if="config.ocr.activeProvider === 'aliyun'" class="hint">
|
||||
阿里云默认使用 OCR API 的 <code>RecognizeGeneral</code>,请求体为截图
|
||||
PNG 原始数据,并使用 ACS3-HMAC-SHA256 签名。
|
||||
</p>
|
||||
<p v-else class="hint">
|
||||
火山引擎默认使用视觉智能的 <code>OCRNormal</code>,截图以
|
||||
<code>image_base64</code> 发送,并使用 Region/Service 参与签名。
|
||||
</p>
|
||||
|
||||
<div class="actions">
|
||||
<button class="btn primary" :disabled="saving" @click="save">
|
||||
{{ saving ? 'Saving…' : 'Save' }}
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<transition name="fade">
|
||||
<div
|
||||
v-if="message"
|
||||
@@ -358,6 +767,15 @@ onMounted(load)
|
||||
padding: 28px 32px 60px;
|
||||
color: #1f2937;
|
||||
}
|
||||
.settings.theme-light {
|
||||
color-scheme: light;
|
||||
}
|
||||
.settings.theme-dark {
|
||||
color-scheme: dark;
|
||||
}
|
||||
.settings.theme-auto {
|
||||
color-scheme: light dark;
|
||||
}
|
||||
.hero {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -414,17 +832,30 @@ kbd {
|
||||
.field.full {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
/* field-row groups several fields onto a single full-width row. auth-row
|
||||
splits Auth method / User / Password roughly 1:2:2. */
|
||||
.field-row {
|
||||
grid-column: 1 / -1;
|
||||
display: grid;
|
||||
gap: 12px 16px;
|
||||
}
|
||||
.auth-row {
|
||||
grid-template-columns: 1fr 2fr 2fr;
|
||||
}
|
||||
.field span {
|
||||
color: #374151;
|
||||
font-weight: 500;
|
||||
}
|
||||
.field input[type='text'],
|
||||
.field input[type='number'],
|
||||
.field input:not([type='checkbox']) {
|
||||
.field input:not([type='checkbox']),
|
||||
.field select,
|
||||
.field textarea {
|
||||
border: 1px solid #d1d5db;
|
||||
border-radius: 6px;
|
||||
padding: 7px 10px;
|
||||
font-size: 13px;
|
||||
line-height: 1.4;
|
||||
background: #fff;
|
||||
color: inherit;
|
||||
outline: none;
|
||||
@@ -432,7 +863,20 @@ kbd {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.field input:focus {
|
||||
.field input[type='text'],
|
||||
.field input[type='number'],
|
||||
.field input:not([type='checkbox']),
|
||||
.field select {
|
||||
height: 36px;
|
||||
}
|
||||
.field textarea {
|
||||
min-height: 168px;
|
||||
resize: vertical;
|
||||
font-family: inherit;
|
||||
}
|
||||
.field input:focus,
|
||||
.field select:focus,
|
||||
.field textarea:focus {
|
||||
border-color: #3b82f6;
|
||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.18);
|
||||
}
|
||||
@@ -547,41 +991,100 @@ kbd {
|
||||
.fade-leave-to {
|
||||
opacity: 0;
|
||||
}
|
||||
.settings.theme-dark {
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.settings.theme-dark .card {
|
||||
background: #1f2937;
|
||||
border-color: #374151;
|
||||
}
|
||||
.settings.theme-dark .field span {
|
||||
color: #d1d5db;
|
||||
}
|
||||
.settings.theme-dark .field input[type='text'],
|
||||
.settings.theme-dark .field input[type='number'],
|
||||
.settings.theme-dark .field input:not([type='checkbox']),
|
||||
.settings.theme-dark .field select,
|
||||
.settings.theme-dark .field textarea {
|
||||
background: #111827;
|
||||
border-color: #374151;
|
||||
color: #fff;
|
||||
}
|
||||
.settings.theme-dark .field input::placeholder,
|
||||
.settings.theme-dark .field textarea::placeholder {
|
||||
color: #9ca3af;
|
||||
}
|
||||
.settings.theme-dark .field input:disabled {
|
||||
background: #1f2937;
|
||||
color: #6b7280;
|
||||
}
|
||||
.settings.theme-dark .prefixed-input {
|
||||
background: #111827;
|
||||
border-color: #374151;
|
||||
}
|
||||
.settings.theme-dark .input-prefix {
|
||||
background: #1f2937;
|
||||
border-right-color: #374151;
|
||||
color: #d1d5db;
|
||||
}
|
||||
.settings.theme-dark .btn:not(.primary) {
|
||||
background: #1f2937;
|
||||
border-color: #374151;
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.settings.theme-dark .btn:not(.primary):hover:not(:disabled) {
|
||||
background: #374151;
|
||||
}
|
||||
.settings.theme-dark .subtitle {
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
.settings {
|
||||
.settings.theme-auto {
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.card {
|
||||
.settings.theme-auto .card {
|
||||
background: #1f2937;
|
||||
border-color: #374151;
|
||||
}
|
||||
.field input {
|
||||
.settings.theme-auto .field span {
|
||||
color: #d1d5db;
|
||||
}
|
||||
.settings.theme-auto .field input[type='text'],
|
||||
.settings.theme-auto .field input[type='number'],
|
||||
.settings.theme-auto .field input:not([type='checkbox']),
|
||||
.settings.theme-auto .field select,
|
||||
.settings.theme-auto .field textarea {
|
||||
background: #111827;
|
||||
border-color: #374151;
|
||||
color: #e5e7eb;
|
||||
color: #fff;
|
||||
}
|
||||
.field input:disabled {
|
||||
.settings.theme-auto .field input::placeholder,
|
||||
.settings.theme-auto .field textarea::placeholder {
|
||||
color: #9ca3af;
|
||||
}
|
||||
.settings.theme-auto .field input:disabled {
|
||||
background: #1f2937;
|
||||
color: #6b7280;
|
||||
}
|
||||
.prefixed-input {
|
||||
.settings.theme-auto .prefixed-input {
|
||||
background: #111827;
|
||||
border-color: #374151;
|
||||
}
|
||||
.input-prefix {
|
||||
.settings.theme-auto .input-prefix {
|
||||
background: #1f2937;
|
||||
border-right-color: #374151;
|
||||
color: #d1d5db;
|
||||
}
|
||||
.btn {
|
||||
.settings.theme-auto .btn:not(.primary) {
|
||||
background: #1f2937;
|
||||
border-color: #374151;
|
||||
color: #e5e7eb;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
.settings.theme-auto .btn:not(.primary):hover:not(:disabled) {
|
||||
background: #374151;
|
||||
}
|
||||
.subtitle {
|
||||
.settings.theme-auto .subtitle {
|
||||
color: #9ca3af;
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
+8
@@ -17,6 +17,10 @@ export function CopyNativeRegionImage(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function CopyRegionImage(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function ExtractTextNativeRegion(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function ExtractTextRegion(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function GetConfig():Promise<domain.AppConfig>;
|
||||
|
||||
export function QuitApp():Promise<void>;
|
||||
@@ -37,6 +41,10 @@ export function SaveRegionToRemote(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function ShowWindow():Promise<void>;
|
||||
|
||||
export function SummarizeNativeRegion(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function SummarizeRegion(arg1:main.CaptureResult):Promise<void>;
|
||||
|
||||
export function TestConnection(arg1:domain.S3Config):Promise<void>;
|
||||
|
||||
export function TestSSHConnection(arg1:domain.SSHConfig):Promise<void>;
|
||||
|
||||
@@ -30,6 +30,14 @@ export function CopyRegionImage(arg1) {
|
||||
return window['go']['main']['App']['CopyRegionImage'](arg1);
|
||||
}
|
||||
|
||||
export function ExtractTextNativeRegion(arg1) {
|
||||
return window['go']['main']['App']['ExtractTextNativeRegion'](arg1);
|
||||
}
|
||||
|
||||
export function ExtractTextRegion(arg1) {
|
||||
return window['go']['main']['App']['ExtractTextRegion'](arg1);
|
||||
}
|
||||
|
||||
export function GetConfig() {
|
||||
return window['go']['main']['App']['GetConfig']();
|
||||
}
|
||||
@@ -70,6 +78,14 @@ export function ShowWindow() {
|
||||
return window['go']['main']['App']['ShowWindow']();
|
||||
}
|
||||
|
||||
export function SummarizeNativeRegion(arg1) {
|
||||
return window['go']['main']['App']['SummarizeNativeRegion'](arg1);
|
||||
}
|
||||
|
||||
export function SummarizeRegion(arg1) {
|
||||
return window['go']['main']['App']['SummarizeRegion'](arg1);
|
||||
}
|
||||
|
||||
export function TestConnection(arg1) {
|
||||
return window['go']['main']['App']['TestConnection'](arg1);
|
||||
}
|
||||
|
||||
+160
-23
@@ -1,13 +1,13 @@
|
||||
export namespace application {
|
||||
|
||||
|
||||
export class Point {
|
||||
x: number;
|
||||
y: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Point(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.x = source["x"];
|
||||
@@ -18,18 +18,24 @@ export namespace application {
|
||||
tool: string;
|
||||
color: string;
|
||||
points: Point[];
|
||||
text?: string;
|
||||
strokeWidth?: number;
|
||||
fontSize?: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Annotation(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.tool = source["tool"];
|
||||
this.color = source["color"];
|
||||
this.points = this.convertValues(source["points"], Point);
|
||||
this.text = source["text"];
|
||||
this.strokeWidth = source["strokeWidth"];
|
||||
this.fontSize = source["fontSize"];
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
@@ -52,26 +58,148 @@ export namespace application {
|
||||
}
|
||||
|
||||
export namespace domain {
|
||||
|
||||
|
||||
export class OCRProviderConfig {
|
||||
label: string;
|
||||
endpoint: string;
|
||||
accessKeyId: string;
|
||||
accessKeySecret: string;
|
||||
region: string;
|
||||
service: string;
|
||||
action: string;
|
||||
version: string;
|
||||
timeoutSecs: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OCRProviderConfig(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.label = source["label"];
|
||||
this.endpoint = source["endpoint"];
|
||||
this.accessKeyId = source["accessKeyId"];
|
||||
this.accessKeySecret = source["accessKeySecret"];
|
||||
this.region = source["region"];
|
||||
this.service = source["service"];
|
||||
this.action = source["action"];
|
||||
this.version = source["version"];
|
||||
this.timeoutSecs = source["timeoutSecs"];
|
||||
}
|
||||
}
|
||||
export class OCRConfig {
|
||||
activeProvider: string;
|
||||
providers: Record<string, OCRProviderConfig>;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OCRConfig(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.activeProvider = source["activeProvider"];
|
||||
this.providers = this.convertValues(source["providers"], OCRProviderConfig, true);
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class LLMProviderConfig {
|
||||
label: string;
|
||||
baseUrl: string;
|
||||
apiKey: string;
|
||||
model: string;
|
||||
maxTokens: number;
|
||||
temperature: number;
|
||||
timeoutSecs: number;
|
||||
maxInlineBytes: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new LLMProviderConfig(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.label = source["label"];
|
||||
this.baseUrl = source["baseUrl"];
|
||||
this.apiKey = source["apiKey"];
|
||||
this.model = source["model"];
|
||||
this.maxTokens = source["maxTokens"];
|
||||
this.temperature = source["temperature"];
|
||||
this.timeoutSecs = source["timeoutSecs"];
|
||||
this.maxInlineBytes = source["maxInlineBytes"];
|
||||
}
|
||||
}
|
||||
export class LLMConfig {
|
||||
activeProvider: string;
|
||||
prompt: string;
|
||||
providers: Record<string, LLMProviderConfig>;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new LLMConfig(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.activeProvider = source["activeProvider"];
|
||||
this.prompt = source["prompt"];
|
||||
this.providers = this.convertValues(source["providers"], LLMProviderConfig, true);
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class SSHConfig {
|
||||
host: string;
|
||||
port: number;
|
||||
user: string;
|
||||
authMethod: string;
|
||||
password: string;
|
||||
pathPrefix: string;
|
||||
strictHostKey: boolean;
|
||||
knownHostsPath: string;
|
||||
connectTimeoutSecs: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SSHConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.host = source["host"];
|
||||
this.port = source["port"];
|
||||
this.user = source["user"];
|
||||
this.authMethod = source["authMethod"];
|
||||
this.password = source["password"];
|
||||
this.pathPrefix = source["pathPrefix"];
|
||||
this.strictHostKey = source["strictHostKey"];
|
||||
@@ -88,11 +216,11 @@ export namespace domain {
|
||||
pathPrefix: string;
|
||||
publicUrlBase: string;
|
||||
usePathStyle: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new S3Config(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.endpoint = source["endpoint"];
|
||||
@@ -107,20 +235,26 @@ export namespace domain {
|
||||
}
|
||||
export class AppConfig {
|
||||
hotkey: string;
|
||||
theme: string;
|
||||
s3: S3Config;
|
||||
ssh: SSHConfig;
|
||||
|
||||
llm: LLMConfig;
|
||||
ocr: OCRConfig;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new AppConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.hotkey = source["hotkey"];
|
||||
this.theme = source["theme"];
|
||||
this.s3 = this.convertValues(source["s3"], S3Config);
|
||||
this.ssh = this.convertValues(source["ssh"], SSHConfig);
|
||||
this.llm = this.convertValues(source["llm"], LLMConfig);
|
||||
this.ocr = this.convertValues(source["ocr"], OCRConfig);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
@@ -139,20 +273,24 @@ export namespace domain {
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
export namespace main {
|
||||
|
||||
|
||||
export class CaptureActionResult {
|
||||
completed: boolean;
|
||||
path?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new CaptureActionResult(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.completed = source["completed"];
|
||||
@@ -164,11 +302,11 @@ export namespace main {
|
||||
y: number;
|
||||
w: number;
|
||||
h: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RegionRect(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.x = source["x"];
|
||||
@@ -180,17 +318,17 @@ export namespace main {
|
||||
export class CaptureResult {
|
||||
rect: RegionRect;
|
||||
annotations: application.Annotation[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new CaptureResult(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.rect = this.convertValues(source["rect"], RegionRect);
|
||||
this.annotations = this.convertValues(source["annotations"], application.Annotation);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
@@ -211,4 +349,3 @@ export namespace main {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ require (
|
||||
golang.design/x/clipboard v0.7.0
|
||||
golang.design/x/hotkey v0.4.1
|
||||
golang.org/x/crypto v0.33.0
|
||||
golang.org/x/image v0.12.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -52,7 +53,6 @@ require (
|
||||
github.com/wailsapp/go-webview2 v1.0.22 // indirect
|
||||
github.com/wailsapp/mimetype v1.4.1 // indirect
|
||||
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
|
||||
golang.org/x/image v0.12.0 // indirect
|
||||
golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect
|
||||
golang.org/x/net v0.35.0 // indirect
|
||||
golang.org/x/sys v0.30.0 // indirect
|
||||
|
||||
@@ -8,16 +8,26 @@ import (
|
||||
"image/draw"
|
||||
"image/png"
|
||||
"math"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
xfont "golang.org/x/image/font"
|
||||
"golang.org/x/image/font/basicfont"
|
||||
"golang.org/x/image/font/opentype"
|
||||
"golang.org/x/image/math/fixed"
|
||||
)
|
||||
|
||||
// Annotation describes a user-drawn mark relative to the selected screenshot.
|
||||
// Coordinates are logical pixels in the same coordinate system as the overlay.
|
||||
type Annotation struct {
|
||||
Tool string `json:"tool"`
|
||||
Color string `json:"color"`
|
||||
Points []Point `json:"points"`
|
||||
Tool string `json:"tool"`
|
||||
Color string `json:"color"`
|
||||
Points []Point `json:"points"`
|
||||
Text string `json:"text,omitempty"`
|
||||
StrokeWidth float64 `json:"strokeWidth,omitempty"`
|
||||
FontSize float64 `json:"fontSize,omitempty"`
|
||||
}
|
||||
|
||||
type Point struct {
|
||||
@@ -27,12 +37,22 @@ type Point struct {
|
||||
|
||||
// ApplyAnnotations decodes a PNG, draws all annotations, and re-encodes it.
|
||||
func ApplyAnnotations(pngBytes []byte, annotations []Annotation, scale float64) ([]byte, error) {
|
||||
return ApplyAnnotationsWithScale(pngBytes, annotations, scale, scale)
|
||||
}
|
||||
|
||||
// ApplyAnnotationsWithScale decodes a PNG, draws all annotations using the
|
||||
// actual device-pixel scale of the captured image, and re-encodes it.
|
||||
func ApplyAnnotationsWithScale(pngBytes []byte, annotations []Annotation, scaleX, scaleY float64) ([]byte, error) {
|
||||
if len(annotations) == 0 {
|
||||
return pngBytes, nil
|
||||
}
|
||||
if scale <= 0 {
|
||||
scale = 1
|
||||
if scaleX <= 0 {
|
||||
scaleX = 1
|
||||
}
|
||||
if scaleY <= 0 {
|
||||
scaleY = scaleX
|
||||
}
|
||||
strokeScale := math.Max(scaleX, scaleY)
|
||||
|
||||
src, err := png.Decode(bytes.NewReader(pngBytes))
|
||||
if err != nil {
|
||||
@@ -47,14 +67,20 @@ func ApplyAnnotations(pngBytes []byte, annotations []Annotation, scale float64)
|
||||
if err != nil {
|
||||
c = color.RGBA{R: 59, G: 130, B: 246, A: 255}
|
||||
}
|
||||
width := int(math.Max(2, math.Round(3*scale)))
|
||||
strokeWidth := ann.StrokeWidth
|
||||
if strokeWidth <= 0 {
|
||||
strokeWidth = 3
|
||||
}
|
||||
width := int(math.Max(1, math.Round(strokeWidth*strokeScale)))
|
||||
switch ann.Tool {
|
||||
case "pen":
|
||||
drawPolyline(dst, ann.Points, scale, width, c)
|
||||
drawPolyline(dst, ann.Points, scaleX, scaleY, width, c)
|
||||
case "rect":
|
||||
drawRectOutline(dst, ann.Points, scale, width, c)
|
||||
drawRectOutline(dst, ann.Points, scaleX, scaleY, width, c)
|
||||
case "ellipse":
|
||||
drawEllipseOutline(dst, ann.Points, scale, width, c)
|
||||
drawEllipseOutline(dst, ann.Points, scaleX, scaleY, width, c)
|
||||
case "text":
|
||||
drawTextAnnotation(dst, ann, scaleX, scaleY, c)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,22 +108,22 @@ func parseHexColor(hex string) (color.RGBA, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func drawPolyline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
|
||||
func drawPolyline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
|
||||
if len(points) == 1 {
|
||||
drawDot(img, scalePoint(points[0], scale), width, c)
|
||||
drawDot(img, scalePoint(points[0], scaleX, scaleY), width, c)
|
||||
return
|
||||
}
|
||||
for i := 1; i < len(points); i++ {
|
||||
drawLine(img, scalePoint(points[i-1], scale), scalePoint(points[i], scale), width, c)
|
||||
drawLine(img, scalePoint(points[i-1], scaleX, scaleY), scalePoint(points[i], scaleX, scaleY), width, c)
|
||||
}
|
||||
}
|
||||
|
||||
func drawRectOutline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
|
||||
func drawRectOutline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
|
||||
if len(points) < 2 {
|
||||
return
|
||||
}
|
||||
a := scalePoint(points[0], scale)
|
||||
b := scalePoint(points[len(points)-1], scale)
|
||||
a := scalePoint(points[0], scaleX, scaleY)
|
||||
b := scalePoint(points[len(points)-1], scaleX, scaleY)
|
||||
x1, x2 := ordered(a.X, b.X)
|
||||
y1, y2 := ordered(a.Y, b.Y)
|
||||
drawLine(img, Point{X: x1, Y: y1}, Point{X: x2, Y: y1}, width, c)
|
||||
@@ -106,12 +132,12 @@ func drawRectOutline(img *image.RGBA, points []Point, scale float64, width int,
|
||||
drawLine(img, Point{X: x1, Y: y2}, Point{X: x1, Y: y1}, width, c)
|
||||
}
|
||||
|
||||
func drawEllipseOutline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
|
||||
func drawEllipseOutline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
|
||||
if len(points) < 2 {
|
||||
return
|
||||
}
|
||||
a := scalePoint(points[0], scale)
|
||||
b := scalePoint(points[len(points)-1], scale)
|
||||
a := scalePoint(points[0], scaleX, scaleY)
|
||||
b := scalePoint(points[len(points)-1], scaleX, scaleY)
|
||||
x1, x2 := ordered(a.X, b.X)
|
||||
y1, y2 := ordered(a.Y, b.Y)
|
||||
rx := (x2 - x1) / 2
|
||||
@@ -170,8 +196,8 @@ func drawDot(img *image.RGBA, p Point, width int, c color.RGBA) {
|
||||
}
|
||||
}
|
||||
|
||||
func scalePoint(p Point, scale float64) Point {
|
||||
return Point{X: p.X * scale, Y: p.Y * scale}
|
||||
func scalePoint(p Point, scaleX, scaleY float64) Point {
|
||||
return Point{X: p.X * scaleX, Y: p.Y * scaleY}
|
||||
}
|
||||
|
||||
func ordered(a, b float64) (float64, float64) {
|
||||
@@ -180,3 +206,94 @@ func ordered(a, b float64) (float64, float64) {
|
||||
}
|
||||
return b, a
|
||||
}
|
||||
|
||||
func drawTextAnnotation(img *image.RGBA, ann Annotation, scaleX, scaleY float64, c color.RGBA) {
|
||||
if len(ann.Points) == 0 {
|
||||
return
|
||||
}
|
||||
text := strings.TrimSpace(ann.Text)
|
||||
if text == "" {
|
||||
return
|
||||
}
|
||||
fontSize := ann.FontSize
|
||||
if fontSize <= 0 {
|
||||
fontSize = 20
|
||||
}
|
||||
face := annotationFontFace(fontSize * scaleY)
|
||||
if face == nil {
|
||||
face = basicfont.Face7x13
|
||||
}
|
||||
|
||||
origin := scalePoint(ann.Points[0], scaleX, scaleY)
|
||||
metrics := face.Metrics()
|
||||
lineHeight := metrics.Height
|
||||
if lineHeight <= 0 {
|
||||
lineHeight = fixed.I(int(math.Ceil(fontSize * 1.2 * scaleY)))
|
||||
}
|
||||
d := &xfont.Drawer{
|
||||
Dst: img,
|
||||
Src: image.NewUniform(c),
|
||||
Face: face,
|
||||
}
|
||||
baselineY := fixed.I(int(math.Round(origin.Y))) + metrics.Ascent
|
||||
x := fixed.I(int(math.Round(origin.X)))
|
||||
for _, line := range strings.Split(text, "\n") {
|
||||
line = strings.TrimRight(line, "\r")
|
||||
if line != "" {
|
||||
d.Dot = fixed.Point26_6{X: x, Y: baselineY}
|
||||
d.DrawString(line)
|
||||
}
|
||||
baselineY += lineHeight
|
||||
}
|
||||
}
|
||||
|
||||
var (
|
||||
annotationFontOnce sync.Once
|
||||
annotationFont *opentype.Font
|
||||
)
|
||||
|
||||
func annotationFontFace(size float64) xfont.Face {
|
||||
if size <= 0 {
|
||||
size = 20
|
||||
}
|
||||
annotationFontOnce.Do(func() {
|
||||
annotationFont = loadAnnotationFont()
|
||||
})
|
||||
if annotationFont == nil {
|
||||
return basicfont.Face7x13
|
||||
}
|
||||
face, err := opentype.NewFace(annotationFont, &opentype.FaceOptions{
|
||||
Size: size,
|
||||
DPI: 72,
|
||||
Hinting: xfont.HintingFull,
|
||||
})
|
||||
if err != nil {
|
||||
return basicfont.Face7x13
|
||||
}
|
||||
return face
|
||||
}
|
||||
|
||||
func loadAnnotationFont() *opentype.Font {
|
||||
paths := []string{
|
||||
"/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
|
||||
"/Library/Fonts/Arial Unicode.ttf",
|
||||
"/System/Library/Fonts/Hiragino Sans GB.ttc",
|
||||
"/System/Library/Fonts/PingFang.ttc",
|
||||
"/System/Library/Fonts/Helvetica.ttc",
|
||||
}
|
||||
for _, path := range paths {
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
if collection, err := opentype.ParseCollection(data); err == nil && collection.NumFonts() > 0 {
|
||||
if font, err := collection.Font(0); err == nil {
|
||||
return font
|
||||
}
|
||||
}
|
||||
if font, err := opentype.Parse(data); err == nil {
|
||||
return font
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -51,3 +51,123 @@ func TestApplyAnnotationsNoAnnotationsReturnsOriginalBytes(t *testing.T) {
|
||||
t.Fatalf("expected original bytes")
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyAnnotationsDrawsTextIntoPNG(t *testing.T) {
|
||||
src := image.NewRGBA(image.Rect(0, 0, 120, 80))
|
||||
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
|
||||
|
||||
var buf bytes.Buffer
|
||||
if err := png.Encode(&buf, src); err != nil {
|
||||
t.Fatalf("encode source: %v", err)
|
||||
}
|
||||
|
||||
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{
|
||||
{
|
||||
Tool: "text",
|
||||
Color: "#ef4444",
|
||||
Points: []Point{
|
||||
{X: 10, Y: 10},
|
||||
},
|
||||
Text: "T",
|
||||
},
|
||||
}, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("apply annotations: %v", err)
|
||||
}
|
||||
|
||||
img, err := png.Decode(bytes.NewReader(out))
|
||||
if err != nil {
|
||||
t.Fatalf("decode output: %v", err)
|
||||
}
|
||||
found := false
|
||||
for y := 8; y < 40 && !found; y++ {
|
||||
for x := 8; x < 40; x++ {
|
||||
got := color.RGBAModel.Convert(img.At(x, y)).(color.RGBA)
|
||||
if got.R > 180 && got.G < 180 && got.B < 180 {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatalf("expected red text pixels near annotation point")
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyAnnotationsWithScaleDrawsTextAtDevicePosition(t *testing.T) {
|
||||
src := image.NewRGBA(image.Rect(0, 0, 220, 120))
|
||||
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
|
||||
|
||||
var buf bytes.Buffer
|
||||
if err := png.Encode(&buf, src); err != nil {
|
||||
t.Fatalf("encode source: %v", err)
|
||||
}
|
||||
|
||||
out, err := ApplyAnnotationsWithScale(buf.Bytes(), []Annotation{
|
||||
{
|
||||
Tool: "text",
|
||||
Color: "#ef4444",
|
||||
Points: []Point{{X: 50, Y: 20}},
|
||||
Text: "T",
|
||||
FontSize: 20,
|
||||
},
|
||||
}, 2, 2)
|
||||
if err != nil {
|
||||
t.Fatalf("apply annotations: %v", err)
|
||||
}
|
||||
|
||||
img, err := png.Decode(bytes.NewReader(out))
|
||||
if err != nil {
|
||||
t.Fatalf("decode output: %v", err)
|
||||
}
|
||||
minX := 999
|
||||
found := false
|
||||
for y := 0; y < img.Bounds().Dy(); y++ {
|
||||
for x := 0; x < img.Bounds().Dx(); x++ {
|
||||
got := color.RGBAModel.Convert(img.At(x, y)).(color.RGBA)
|
||||
if got.R > 180 && got.G < 180 && got.B < 180 {
|
||||
found = true
|
||||
if x < minX {
|
||||
minX = x
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatalf("expected red text pixels")
|
||||
}
|
||||
if minX < 90 {
|
||||
t.Fatalf("expected text to be drawn near scaled x=100, min red x=%d", minX)
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyAnnotationsUsesStrokeWidth(t *testing.T) {
|
||||
src := image.NewRGBA(image.Rect(0, 0, 80, 80))
|
||||
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
|
||||
|
||||
var buf bytes.Buffer
|
||||
if err := png.Encode(&buf, src); err != nil {
|
||||
t.Fatalf("encode source: %v", err)
|
||||
}
|
||||
|
||||
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{
|
||||
{
|
||||
Tool: "rect",
|
||||
Color: "#ef4444",
|
||||
Points: []Point{{X: 20, Y: 20}, {X: 60, Y: 60}},
|
||||
StrokeWidth: 8,
|
||||
},
|
||||
}, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("apply annotations: %v", err)
|
||||
}
|
||||
|
||||
img, err := png.Decode(bytes.NewReader(out))
|
||||
if err != nil {
|
||||
t.Fatalf("decode output: %v", err)
|
||||
}
|
||||
got := color.RGBAModel.Convert(img.At(20, 24)).(color.RGBA)
|
||||
if got.R < 180 || got.G > 180 || got.B > 180 {
|
||||
t.Fatalf("expected thick rectangle stroke to cover y=24, got %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,6 +61,14 @@ func (s *CaptureActionsService) SaveImage(_ context.Context, pngBytes []byte, di
|
||||
s.notifyFailure("save failed: " + err.Error())
|
||||
return "", err
|
||||
}
|
||||
// Copy the saved path to the clipboard so the user can paste it right
|
||||
// away, mirroring how the upload/summary flows copy their result. A
|
||||
// clipboard failure must not fail the save itself.
|
||||
if s.Clipboard != nil {
|
||||
if err := s.Clipboard.WriteText(path); err != nil {
|
||||
s.notifyFailure("clipboard write failed: " + err.Error())
|
||||
}
|
||||
}
|
||||
if s.Notifier != nil {
|
||||
s.Notifier.NotifySuccess(path)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package application
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/clipboard"
|
||||
)
|
||||
|
||||
// OCRRecognizer describes a provider capable of extracting text from a PNG
|
||||
// screenshot.
|
||||
type OCRRecognizer interface {
|
||||
RecognizeText(ctx context.Context, pngBytes []byte) (string, error)
|
||||
}
|
||||
|
||||
// CaptureOCRService wires screenshot bytes -> OCR provider -> clipboard. It
|
||||
// leaves progress reporting to the caller so native and web overlays can share
|
||||
// the same status HUD.
|
||||
type CaptureOCRService struct {
|
||||
Recognizer OCRRecognizer
|
||||
Clipboard clipboard.Writer
|
||||
}
|
||||
|
||||
// Recognize asks the configured OCR provider to extract text from the PNG.
|
||||
func (s *CaptureOCRService) Recognize(ctx context.Context, pngBytes []byte) (string, error) {
|
||||
if s.Recognizer == nil {
|
||||
return "", fmt.Errorf("ocr is not configured")
|
||||
}
|
||||
if len(pngBytes) == 0 {
|
||||
return "", fmt.Errorf("empty screenshot")
|
||||
}
|
||||
text, err := s.Recognizer.RecognizeText(ctx, pngBytes)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
text = strings.TrimSpace(text)
|
||||
if text == "" {
|
||||
return "", fmt.Errorf("ocr result is empty")
|
||||
}
|
||||
return text, nil
|
||||
}
|
||||
|
||||
// CopyText writes the extracted text to the clipboard.
|
||||
func (s *CaptureOCRService) CopyText(_ context.Context, text string) error {
|
||||
text = strings.TrimSpace(text)
|
||||
if text == "" {
|
||||
return fmt.Errorf("empty ocr text")
|
||||
}
|
||||
if s.Clipboard == nil {
|
||||
return fmt.Errorf("clipboard is not configured")
|
||||
}
|
||||
if err := s.Clipboard.WriteText(text); err != nil {
|
||||
return fmt.Errorf("clipboard write failed: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package application
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type fakeOCRRecognizer struct {
|
||||
image []byte
|
||||
text string
|
||||
}
|
||||
|
||||
func (f *fakeOCRRecognizer) RecognizeText(_ context.Context, pngBytes []byte) (string, error) {
|
||||
f.image = append([]byte(nil), pngBytes...)
|
||||
if f.text == "" {
|
||||
return "extracted text", nil
|
||||
}
|
||||
return f.text, nil
|
||||
}
|
||||
|
||||
func TestCaptureOCRServiceRecognizesAndCopies(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
recognizer := &fakeOCRRecognizer{}
|
||||
clip := &fakeClipboard{}
|
||||
svc := &CaptureOCRService{Recognizer: recognizer, Clipboard: clip}
|
||||
|
||||
text, err := svc.Recognize(ctx, []byte("png"))
|
||||
if err != nil {
|
||||
t.Fatalf("recognize: %v", err)
|
||||
}
|
||||
if string(recognizer.image) != "png" {
|
||||
t.Fatalf("expected screenshot bytes forwarded, got %q", string(recognizer.image))
|
||||
}
|
||||
if text != "extracted text" {
|
||||
t.Fatalf("expected extracted text, got %q", text)
|
||||
}
|
||||
if err := svc.CopyText(ctx, text); err != nil {
|
||||
t.Fatalf("copy text: %v", err)
|
||||
}
|
||||
if clip.text != "extracted text" {
|
||||
t.Fatalf("expected ocr text copied, got %q", clip.text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureOCRServiceRejectsEmptyResult(t *testing.T) {
|
||||
svc := &CaptureOCRService{Recognizer: &fakeOCRRecognizer{text: " \n "}}
|
||||
if _, err := svc.Recognize(context.Background(), []byte("png")); err == nil {
|
||||
t.Fatalf("expected empty OCR result to fail")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,158 @@
|
||||
package application
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
"github.com/mmmy/snapgo/internal/infrastructure/clipboard"
|
||||
)
|
||||
|
||||
// VisionSummarizer describes a multimodal model capable of reading an image
|
||||
// reference (either a public https URL or an inline base64 data URL) and
|
||||
// returning a textual summary.
|
||||
type VisionSummarizer interface {
|
||||
SummarizeImage(ctx context.Context, prompt string, imageURL string) (string, error)
|
||||
}
|
||||
|
||||
// ObjectDeleter is an optional capability an OSSProvider may implement so the
|
||||
// summary pipeline can delete the temporary screenshot it uploaded purely so a
|
||||
// remote model could fetch it. It is kept separate from domain.OSSProvider to
|
||||
// avoid forcing every provider (or test fake) to implement deletion.
|
||||
type ObjectDeleter interface {
|
||||
Delete(ctx context.Context, key string) error
|
||||
}
|
||||
|
||||
// CaptureSummaryService wires screenshot bytes -> multimodal LLM summary ->
|
||||
// clipboard. It prefers sending the image inline as a base64 data URL and only
|
||||
// falls back to an S3 upload (public URL) when the payload exceeds the
|
||||
// provider's inline size limit. It intentionally does not notify UI state
|
||||
// itself: the caller emits fine-grained "uploading / recognizing / done"
|
||||
// progress.
|
||||
type CaptureSummaryService struct {
|
||||
Provider domain.OSSProvider
|
||||
Summarizer VisionSummarizer
|
||||
Clipboard clipboard.Writer
|
||||
Prompt string
|
||||
PathPrefix string
|
||||
// MaxInlineBytes caps the PNG size eligible for inline base64. Payloads
|
||||
// larger than this must go through S3. A value <= 0 disables the inline
|
||||
// path entirely (always upload).
|
||||
MaxInlineBytes int
|
||||
// HTTPClient is used for the public-URL reachability probe. Defaults to a
|
||||
// short-timeout client when nil.
|
||||
HTTPClient *http.Client
|
||||
}
|
||||
|
||||
// CanInline reports whether the screenshot is small enough to be embedded
|
||||
// directly in the request as a base64 data URL.
|
||||
func (s *CaptureSummaryService) CanInline(pngBytes []byte) bool {
|
||||
return s.MaxInlineBytes > 0 && len(pngBytes) <= s.MaxInlineBytes
|
||||
}
|
||||
|
||||
// InlineDataURL encodes the PNG as an RFC 2397 data URL suitable for the
|
||||
// image_url field of an OpenAI-compatible request.
|
||||
func (s *CaptureSummaryService) InlineDataURL(pngBytes []byte) string {
|
||||
return "data:image/png;base64," + base64.StdEncoding.EncodeToString(pngBytes)
|
||||
}
|
||||
|
||||
// UploadImage uploads the screenshot and returns the public URL visible to
|
||||
// the multimodal provider. Used only when the image is too large to inline.
|
||||
func (s *CaptureSummaryService) UploadImage(ctx context.Context, pngBytes []byte) (*domain.UploadResult, error) {
|
||||
if s.Provider == nil {
|
||||
return nil, fmt.Errorf("s3 is not configured")
|
||||
}
|
||||
if len(pngBytes) == 0 {
|
||||
return nil, fmt.Errorf("empty screenshot")
|
||||
}
|
||||
key := buildObjectKey(s.PathPrefix)
|
||||
start := time.Now()
|
||||
url, err := s.Provider.Upload(ctx, key, pngBytes, "image/png")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("s3 put object: %w", err)
|
||||
}
|
||||
return &domain.UploadResult{
|
||||
URL: url,
|
||||
Key: key,
|
||||
Provider: s.Provider.Name(),
|
||||
Elapsed: time.Since(start),
|
||||
}, nil
|
||||
}
|
||||
|
||||
// EnsureReachable verifies the public URL can actually be fetched, so we can
|
||||
// surface a clear "link not reachable" message instead of an opaque provider
|
||||
// error when the bucket is private or fronted by an inaccessible CDN.
|
||||
func (s *CaptureSummaryService) EnsureReachable(ctx context.Context, imageURL string) error {
|
||||
client := s.HTTPClient
|
||||
if client == nil {
|
||||
client = &http.Client{Timeout: 10 * time.Second}
|
||||
}
|
||||
probe := func(method string) (int, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, method, imageURL, nil)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
resp.Body.Close()
|
||||
return resp.StatusCode, nil
|
||||
}
|
||||
status, err := probe(http.MethodHead)
|
||||
// Some S3-compatible endpoints reject HEAD; retry with GET before failing.
|
||||
if err != nil || status == http.StatusMethodNotAllowed || status == http.StatusForbidden {
|
||||
if s, gerr := probe(http.MethodGet); gerr == nil {
|
||||
status, err = s, nil
|
||||
} else if err == nil {
|
||||
err = gerr
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("图片链接不可达(模型无法读取上传的截图):%w", err)
|
||||
}
|
||||
if status < 200 || status >= 300 {
|
||||
return fmt.Errorf("图片链接不可达:HTTP %d,请确认对象存储 bucket 公网可读或已正确配置 PublicURLBase", status)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeleteUploaded removes the temporary object from S3 if the provider supports
|
||||
// deletion. It is best-effort: a nil return means either success or that the
|
||||
// provider cannot delete.
|
||||
func (s *CaptureSummaryService) DeleteUploaded(ctx context.Context, key string) error {
|
||||
if key == "" {
|
||||
return nil
|
||||
}
|
||||
deleter, ok := s.Provider.(ObjectDeleter)
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
return deleter.Delete(ctx, key)
|
||||
}
|
||||
|
||||
// Summarize asks the configured model to summarize the image reference, which
|
||||
// may be a public URL or an inline base64 data URL.
|
||||
func (s *CaptureSummaryService) Summarize(ctx context.Context, imageURL string) (string, error) {
|
||||
if s.Summarizer == nil {
|
||||
return "", fmt.Errorf("llm is not configured")
|
||||
}
|
||||
return s.Summarizer.SummarizeImage(ctx, s.Prompt, imageURL)
|
||||
}
|
||||
|
||||
// CopySummary writes the final summary text to the clipboard.
|
||||
func (s *CaptureSummaryService) CopySummary(_ context.Context, summary string) error {
|
||||
if summary == "" {
|
||||
return fmt.Errorf("empty summary")
|
||||
}
|
||||
if s.Clipboard == nil {
|
||||
return fmt.Errorf("clipboard is not configured")
|
||||
}
|
||||
if err := s.Clipboard.WriteText(summary); err != nil {
|
||||
return fmt.Errorf("clipboard write failed: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
package application
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type fakeOSSProvider struct {
|
||||
key string
|
||||
data []byte
|
||||
contentType string
|
||||
url string
|
||||
deletedKey string
|
||||
}
|
||||
|
||||
func (f *fakeOSSProvider) Upload(_ context.Context, key string, data []byte, contentType string) (string, error) {
|
||||
f.key = key
|
||||
f.data = append([]byte(nil), data...)
|
||||
f.contentType = contentType
|
||||
if f.url == "" {
|
||||
return "https://cdn.example.com/" + key, nil
|
||||
}
|
||||
return f.url, nil
|
||||
}
|
||||
|
||||
func (f *fakeOSSProvider) Name() string { return "fake" }
|
||||
|
||||
func (f *fakeOSSProvider) Delete(_ context.Context, key string) error {
|
||||
f.deletedKey = key
|
||||
return nil
|
||||
}
|
||||
|
||||
type fakeSummarizer struct {
|
||||
prompt string
|
||||
url string
|
||||
text string
|
||||
}
|
||||
|
||||
func (f *fakeSummarizer) SummarizeImage(_ context.Context, prompt string, imageURL string) (string, error) {
|
||||
f.prompt = prompt
|
||||
f.url = imageURL
|
||||
if f.text == "" {
|
||||
return "summary text", nil
|
||||
}
|
||||
return f.text, nil
|
||||
}
|
||||
|
||||
func TestCaptureSummaryServiceUploadsSummarizesAndCopies(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
provider := &fakeOSSProvider{}
|
||||
summarizer := &fakeSummarizer{}
|
||||
clip := &fakeClipboard{}
|
||||
svc := &CaptureSummaryService{
|
||||
Provider: provider,
|
||||
Summarizer: summarizer,
|
||||
Clipboard: clip,
|
||||
Prompt: "describe screenshot",
|
||||
PathPrefix: "snapgo/",
|
||||
}
|
||||
|
||||
uploaded, err := svc.UploadImage(ctx, []byte("png"))
|
||||
if err != nil {
|
||||
t.Fatalf("upload image: %v", err)
|
||||
}
|
||||
if provider.contentType != "image/png" {
|
||||
t.Fatalf("expected image/png content type, got %q", provider.contentType)
|
||||
}
|
||||
if string(provider.data) != "png" {
|
||||
t.Fatalf("expected uploaded png bytes, got %q", string(provider.data))
|
||||
}
|
||||
|
||||
summary, err := svc.Summarize(ctx, uploaded.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("summarize: %v", err)
|
||||
}
|
||||
if summarizer.prompt != "describe screenshot" {
|
||||
t.Fatalf("expected prompt forwarded, got %q", summarizer.prompt)
|
||||
}
|
||||
if summarizer.url != uploaded.URL {
|
||||
t.Fatalf("expected uploaded url forwarded, got %q", summarizer.url)
|
||||
}
|
||||
if summary != "summary text" {
|
||||
t.Fatalf("expected summary text, got %q", summary)
|
||||
}
|
||||
|
||||
if err := svc.CopySummary(ctx, summary); err != nil {
|
||||
t.Fatalf("copy summary: %v", err)
|
||||
}
|
||||
if clip.text != "summary text" {
|
||||
t.Fatalf("expected summary copied, got %q", clip.text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureSummaryServiceInlineDataURL(t *testing.T) {
|
||||
svc := &CaptureSummaryService{MaxInlineBytes: 10}
|
||||
|
||||
if !svc.CanInline([]byte("small")) {
|
||||
t.Fatalf("expected 5-byte payload to be inlinable under 10-byte cap")
|
||||
}
|
||||
if svc.CanInline([]byte("this is definitely too big")) {
|
||||
t.Fatalf("expected oversized payload to be rejected for inlining")
|
||||
}
|
||||
|
||||
url := svc.InlineDataURL([]byte("png"))
|
||||
if !strings.HasPrefix(url, "data:image/png;base64,") {
|
||||
t.Fatalf("expected base64 data URL prefix, got %q", url)
|
||||
}
|
||||
if strings.Contains(url, "https://") {
|
||||
t.Fatalf("inline URL must not be a remote URL, got %q", url)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureSummaryServiceDeleteUploadedUsesDeleter(t *testing.T) {
|
||||
provider := &fakeOSSProvider{}
|
||||
svc := &CaptureSummaryService{Provider: provider}
|
||||
|
||||
if err := svc.DeleteUploaded(context.Background(), "snapgo/a.png"); err != nil {
|
||||
t.Fatalf("delete uploaded: %v", err)
|
||||
}
|
||||
if provider.deletedKey != "snapgo/a.png" {
|
||||
t.Fatalf("expected object deleted, got %q", provider.deletedKey)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureSummaryServiceDeleteUploadedNoDeleterIsNoop(t *testing.T) {
|
||||
// A provider without Delete must not error when cleanup is requested.
|
||||
svc := &CaptureSummaryService{Provider: nonDeletingProvider{}}
|
||||
if err := svc.DeleteUploaded(context.Background(), "snapgo/a.png"); err != nil {
|
||||
t.Fatalf("expected no-op delete, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
type nonDeletingProvider struct{}
|
||||
|
||||
func (nonDeletingProvider) Upload(_ context.Context, _ string, _ []byte, _ string) (string, error) {
|
||||
return "https://cdn.example.com/x.png", nil
|
||||
}
|
||||
|
||||
func (nonDeletingProvider) Name() string { return "no-delete" }
|
||||
+355
-7
@@ -10,12 +10,12 @@ package domain
|
||||
// endpoint, etc.).
|
||||
//
|
||||
// Field design notes:
|
||||
// - PathPrefix supports object name templating so users can group screenshots
|
||||
// by date.
|
||||
// - PublicURLBase is optional to support CDN-fronted buckets; otherwise the
|
||||
// adapter falls back to "{Endpoint}/{Bucket}/{Key}" (path-style).
|
||||
// - UsePathStyle defaults to true because many self-hosted MinIO / R2
|
||||
// deployments do not support virtual-hosted-style addressing.
|
||||
// - PathPrefix supports object name templating so users can group screenshots
|
||||
// by date.
|
||||
// - PublicURLBase is optional to support CDN-fronted buckets; otherwise the
|
||||
// adapter falls back to "{Endpoint}/{Bucket}/{Key}" (path-style).
|
||||
// - UsePathStyle defaults to true because many self-hosted MinIO / R2
|
||||
// deployments do not support virtual-hosted-style addressing.
|
||||
type S3Config struct {
|
||||
Endpoint string `json:"endpoint"`
|
||||
Region string `json:"region"`
|
||||
@@ -33,9 +33,22 @@ type S3Config struct {
|
||||
// Field design notes:
|
||||
// - Host / Port form the destination endpoint. Port defaults to 22 when 0.
|
||||
// - User is the SSH login name.
|
||||
// - AuthMethod selects how the connection authenticates:
|
||||
// "password" → password only, via the in-process Go SSH client.
|
||||
// "key" → ssh-agent + ~/.ssh/id_* key files (no password),
|
||||
// via the in-process Go SSH client.
|
||||
// "kerberos" → delegate to the system /usr/bin/ssh binary so the
|
||||
// existing Kerberos (GSSAPI) credential cache from
|
||||
// `kinit` is reused. Native GSSAPI is required here
|
||||
// because macOS stores tickets in an API: ccache
|
||||
// that pure-Go SSH libraries cannot read.
|
||||
// "" / "builtin" → legacy combined behaviour (password → agent → key
|
||||
// files) kept only for backward compatibility with
|
||||
// configs written before the method was split.
|
||||
// - Password is optional; when empty the implementation falls back to the
|
||||
// local SSH agent or ~/.ssh/id_* keys (i.e. the user is responsible for
|
||||
// having password-less access already configured on this machine).
|
||||
// It is ignored entirely when AuthMethod is "kerberos".
|
||||
// - PathPrefix is interpreted *relative to the remote user's $HOME*. The
|
||||
// UI presents it as "~/<PathPrefix>" so the user cannot escape the home
|
||||
// directory by writing absolute paths. Leading "/" or "~" markers are
|
||||
@@ -51,6 +64,7 @@ type SSHConfig struct {
|
||||
Host string `json:"host"`
|
||||
Port int `json:"port"`
|
||||
User string `json:"user"`
|
||||
AuthMethod string `json:"authMethod"`
|
||||
Password string `json:"password"`
|
||||
PathPrefix string `json:"pathPrefix"`
|
||||
StrictHostKey bool `json:"strictHostKey"`
|
||||
@@ -58,6 +72,113 @@ type SSHConfig struct {
|
||||
ConnectTimeoutSecs int `json:"connectTimeoutSecs"`
|
||||
}
|
||||
|
||||
// LLMProviderConfig stores one OpenAI-compatible multimodal chat endpoint.
|
||||
//
|
||||
// The three built-in providers (Qwen, Doubao/Ark, OpenAI-compatible) all use
|
||||
// the same request shape: chat/completions with a user content array that
|
||||
// contains text plus an image_url item. Keeping them as provider records lets
|
||||
// users switch between credentials/models without retyping every field.
|
||||
type LLMProviderConfig struct {
|
||||
Label string `json:"label"`
|
||||
BaseURL string `json:"baseUrl"`
|
||||
APIKey string `json:"apiKey"`
|
||||
Model string `json:"model"`
|
||||
MaxTokens int `json:"maxTokens"`
|
||||
Temperature float64 `json:"temperature"`
|
||||
TimeoutSecs int `json:"timeoutSecs"`
|
||||
// MaxInlineBytes caps the screenshot size (in bytes of the PNG payload)
|
||||
// that may be sent inline as a base64 data URL. Above this threshold the
|
||||
// summary pipeline falls back to uploading the image to S3 and passing a
|
||||
// public URL instead, because most providers reject oversized inline
|
||||
// images. A value <= 0 means "use the built-in default".
|
||||
MaxInlineBytes int `json:"maxInlineBytes"`
|
||||
}
|
||||
|
||||
// DefaultMaxInlineBytes is the fallback inline-image cap (~4 MiB) used when a
|
||||
// provider config does not specify MaxInlineBytes. It is a conservative bound
|
||||
// that keeps a single base64 data URL within the request-size limits accepted
|
||||
// by the common OpenAI-compatible multimodal endpoints.
|
||||
const DefaultMaxInlineBytes = 4 << 20
|
||||
|
||||
// LLMConfig controls screenshot summarisation.
|
||||
type LLMConfig struct {
|
||||
ActiveProvider string `json:"activeProvider"`
|
||||
Prompt string `json:"prompt"`
|
||||
Providers map[string]LLMProviderConfig `json:"providers"`
|
||||
}
|
||||
|
||||
// OCRProviderConfig stores one cloud OCR endpoint that accepts a screenshot
|
||||
// image and returns extracted text. Aliyun and Volcengine both authenticate
|
||||
// with an AccessKey pair, but their signing schemes use slightly different
|
||||
// endpoint metadata; keeping Region/Service/Action/Version configurable lets
|
||||
// the presets track official API changes without a schema rewrite.
|
||||
type OCRProviderConfig struct {
|
||||
Label string `json:"label"`
|
||||
Endpoint string `json:"endpoint"`
|
||||
AccessKeyID string `json:"accessKeyId"`
|
||||
AccessKeySecret string `json:"accessKeySecret"`
|
||||
Region string `json:"region"`
|
||||
Service string `json:"service"`
|
||||
Action string `json:"action"`
|
||||
Version string `json:"version"`
|
||||
TimeoutSecs int `json:"timeoutSecs"`
|
||||
}
|
||||
|
||||
// OCRConfig controls screenshot text extraction.
|
||||
type OCRConfig struct {
|
||||
ActiveProvider string `json:"activeProvider"`
|
||||
Providers map[string]OCRProviderConfig `json:"providers"`
|
||||
}
|
||||
|
||||
// SSH authentication method identifiers stored in SSHConfig.AuthMethod.
|
||||
const (
|
||||
// SSHAuthBuiltin is the legacy combined method (password → agent → key
|
||||
// files). Retained for backward compatibility with older config files;
|
||||
// new configs use the explicit methods below.
|
||||
SSHAuthBuiltin = "builtin"
|
||||
// SSHAuthPassword authenticates with the password field only.
|
||||
SSHAuthPassword = "password"
|
||||
// SSHAuthKey authenticates with ssh-agent / ~/.ssh/id_* key files only.
|
||||
SSHAuthKey = "key"
|
||||
// SSHAuthKerberos delegates to the system ssh binary so an existing
|
||||
// Kerberos credential cache (populated by `kinit`) is reused via GSSAPI.
|
||||
SSHAuthKerberos = "kerberos"
|
||||
)
|
||||
|
||||
// Built-in LLM provider identifiers.
|
||||
const (
|
||||
LLMProviderQwen = "qwen"
|
||||
LLMProviderDoubao = "doubao"
|
||||
LLMProviderOpenAI = "openai"
|
||||
)
|
||||
|
||||
// Built-in OCR provider identifiers.
|
||||
const (
|
||||
OCRProviderAliyun = "aliyun"
|
||||
OCRProviderVolcengine = "volcengine"
|
||||
)
|
||||
|
||||
// Theme preference identifiers stored in AppConfig.Theme.
|
||||
const (
|
||||
ThemeAuto = "auto"
|
||||
ThemeLight = "light"
|
||||
ThemeDark = "dark"
|
||||
)
|
||||
|
||||
const DefaultSummaryPrompt = `你是一个截图内容总结助手。请阅读截图,并用中文输出一段适合直接粘贴到聊天、工单、Issue 或 PR 中的说明。
|
||||
|
||||
要求:
|
||||
- 先说明截图中最重要的信息和用户可能想表达的意图。
|
||||
- 如果截图包含报错、异常状态、表格、代码、界面控件或关键数字,请准确提取。
|
||||
- 如果截图内容不足以判断,不要编造;直接说明不确定点。
|
||||
- 输出尽量简洁,默认 3 到 6 条要点。
|
||||
- 不要输出 Markdown 标题,不要寒暄。`
|
||||
|
||||
// IsKerberos reports whether this config requests Kerberos/GSSAPI auth.
|
||||
func (c SSHConfig) IsKerberos() bool {
|
||||
return c.AuthMethod == SSHAuthKerberos
|
||||
}
|
||||
|
||||
// AppConfig is the top-level on-disk configuration document.
|
||||
//
|
||||
// We keep S3 / SSH nested so that adding more providers later (e.g. AliyunOSS,
|
||||
@@ -68,18 +189,28 @@ type AppConfig struct {
|
||||
// in the infrastructure hotkey adapter.
|
||||
Hotkey string `json:"hotkey"`
|
||||
|
||||
// Theme controls the settings UI appearance: "auto", "light", or "dark".
|
||||
Theme string `json:"theme"`
|
||||
|
||||
// S3 holds the active S3-compatible storage configuration.
|
||||
S3 S3Config `json:"s3"`
|
||||
|
||||
// SSH holds the configuration for the optional "save to remote via scp"
|
||||
// destination triggered by the save-remote toolbar button.
|
||||
SSH SSHConfig `json:"ssh"`
|
||||
|
||||
// LLM holds provider settings for the "copy summary" screenshot action.
|
||||
LLM LLMConfig `json:"llm"`
|
||||
|
||||
// OCR holds provider settings for the "extract text" screenshot action.
|
||||
OCR OCRConfig `json:"ocr"`
|
||||
}
|
||||
|
||||
// DefaultAppConfig returns sane zero-value defaults used on first launch.
|
||||
func DefaultAppConfig() AppConfig {
|
||||
return AppConfig{
|
||||
cfg := AppConfig{
|
||||
Hotkey: "cmd+shift+a",
|
||||
Theme: ThemeAuto,
|
||||
S3: S3Config{
|
||||
PathPrefix: "snapgo/",
|
||||
UsePathStyle: true,
|
||||
@@ -90,6 +221,176 @@ func DefaultAppConfig() AppConfig {
|
||||
ConnectTimeoutSecs: 10,
|
||||
StrictHostKey: false,
|
||||
},
|
||||
LLM: DefaultLLMConfig(),
|
||||
OCR: DefaultOCRConfig(),
|
||||
}
|
||||
cfg.Normalize()
|
||||
return cfg
|
||||
}
|
||||
|
||||
// DefaultLLMConfig returns the built-in provider presets. API keys and exact
|
||||
// models remain user-editable because each provider account may expose
|
||||
// different model names / endpoint IDs.
|
||||
func DefaultLLMConfig() LLMConfig {
|
||||
return LLMConfig{
|
||||
ActiveProvider: LLMProviderOpenAI,
|
||||
Prompt: DefaultSummaryPrompt,
|
||||
Providers: map[string]LLMProviderConfig{
|
||||
LLMProviderQwen: {
|
||||
Label: "阿里千问多模态",
|
||||
BaseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
||||
Model: "qwen-vl-plus",
|
||||
MaxTokens: 600,
|
||||
Temperature: 0.2,
|
||||
TimeoutSecs: 60,
|
||||
MaxInlineBytes: DefaultMaxInlineBytes,
|
||||
},
|
||||
LLMProviderDoubao: {
|
||||
Label: "火山方舟豆包多模态",
|
||||
BaseURL: "https://ark.cn-beijing.volces.com/api/v3",
|
||||
Model: "",
|
||||
MaxTokens: 600,
|
||||
Temperature: 0.2,
|
||||
TimeoutSecs: 60,
|
||||
MaxInlineBytes: DefaultMaxInlineBytes,
|
||||
},
|
||||
LLMProviderOpenAI: {
|
||||
Label: "ChatGPT / OpenAI-compatible",
|
||||
BaseURL: "https://api.openai.com/v1",
|
||||
Model: "gpt-5.5",
|
||||
MaxTokens: 600,
|
||||
Temperature: 0.2,
|
||||
TimeoutSecs: 60,
|
||||
MaxInlineBytes: DefaultMaxInlineBytes,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// DefaultOCRConfig returns the built-in OCR provider presets. Users only need
|
||||
// to fill AccessKey credentials for the common regions/actions, while advanced
|
||||
// accounts can still override endpoint metadata from the settings UI.
|
||||
func DefaultOCRConfig() OCRConfig {
|
||||
return OCRConfig{
|
||||
ActiveProvider: OCRProviderAliyun,
|
||||
Providers: map[string]OCRProviderConfig{
|
||||
OCRProviderAliyun: {
|
||||
Label: "阿里云文字识别",
|
||||
Endpoint: "https://ocr-api.cn-hangzhou.aliyuncs.com",
|
||||
Action: "RecognizeGeneral",
|
||||
Version: "2021-07-07",
|
||||
TimeoutSecs: 30,
|
||||
},
|
||||
OCRProviderVolcengine: {
|
||||
Label: "火山引擎文字识别",
|
||||
Endpoint: "https://visual.volcengineapi.com",
|
||||
Region: "cn-north-1",
|
||||
Service: "cv",
|
||||
Action: "OCRNormal",
|
||||
Version: "2020-08-26",
|
||||
TimeoutSecs: 30,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// Normalize fills defaults into configs written by older app versions while
|
||||
// preserving any user-provided provider fields.
|
||||
func (c *AppConfig) Normalize() {
|
||||
if c.Hotkey == "" {
|
||||
c.Hotkey = "cmd+shift+a"
|
||||
}
|
||||
if c.Theme != ThemeLight && c.Theme != ThemeDark && c.Theme != ThemeAuto {
|
||||
c.Theme = ThemeAuto
|
||||
}
|
||||
if c.S3.PathPrefix == "" {
|
||||
c.S3.PathPrefix = "snapgo/"
|
||||
}
|
||||
if c.SSH.Port == 0 {
|
||||
c.SSH.Port = 22
|
||||
}
|
||||
if c.SSH.PathPrefix == "" {
|
||||
c.SSH.PathPrefix = "snapgo/"
|
||||
}
|
||||
if c.SSH.ConnectTimeoutSecs == 0 {
|
||||
c.SSH.ConnectTimeoutSecs = 10
|
||||
}
|
||||
|
||||
defaultLLM := DefaultLLMConfig()
|
||||
if c.LLM.ActiveProvider == "" {
|
||||
c.LLM.ActiveProvider = defaultLLM.ActiveProvider
|
||||
}
|
||||
if c.LLM.Prompt == "" {
|
||||
c.LLM.Prompt = defaultLLM.Prompt
|
||||
}
|
||||
if c.LLM.Providers == nil {
|
||||
c.LLM.Providers = map[string]LLMProviderConfig{}
|
||||
}
|
||||
for id, def := range defaultLLM.Providers {
|
||||
current, ok := c.LLM.Providers[id]
|
||||
if !ok {
|
||||
c.LLM.Providers[id] = def
|
||||
continue
|
||||
}
|
||||
if current.Label == "" {
|
||||
current.Label = def.Label
|
||||
}
|
||||
if current.BaseURL == "" {
|
||||
current.BaseURL = def.BaseURL
|
||||
}
|
||||
if current.Model == "" && id != LLMProviderDoubao {
|
||||
current.Model = def.Model
|
||||
}
|
||||
if current.MaxTokens == 0 {
|
||||
current.MaxTokens = def.MaxTokens
|
||||
}
|
||||
if current.Temperature < 0 {
|
||||
current.Temperature = def.Temperature
|
||||
}
|
||||
if current.TimeoutSecs == 0 {
|
||||
current.TimeoutSecs = def.TimeoutSecs
|
||||
}
|
||||
if current.MaxInlineBytes <= 0 {
|
||||
current.MaxInlineBytes = DefaultMaxInlineBytes
|
||||
}
|
||||
c.LLM.Providers[id] = current
|
||||
}
|
||||
|
||||
defaultOCR := DefaultOCRConfig()
|
||||
if c.OCR.ActiveProvider == "" {
|
||||
c.OCR.ActiveProvider = defaultOCR.ActiveProvider
|
||||
}
|
||||
if c.OCR.Providers == nil {
|
||||
c.OCR.Providers = map[string]OCRProviderConfig{}
|
||||
}
|
||||
for id, def := range defaultOCR.Providers {
|
||||
current, ok := c.OCR.Providers[id]
|
||||
if !ok {
|
||||
c.OCR.Providers[id] = def
|
||||
continue
|
||||
}
|
||||
if current.Label == "" {
|
||||
current.Label = def.Label
|
||||
}
|
||||
if current.Endpoint == "" {
|
||||
current.Endpoint = def.Endpoint
|
||||
}
|
||||
if current.Region == "" {
|
||||
current.Region = def.Region
|
||||
}
|
||||
if current.Service == "" {
|
||||
current.Service = def.Service
|
||||
}
|
||||
if current.Action == "" {
|
||||
current.Action = def.Action
|
||||
}
|
||||
if current.Version == "" {
|
||||
current.Version = def.Version
|
||||
}
|
||||
if current.TimeoutSecs == 0 {
|
||||
current.TimeoutSecs = def.TimeoutSecs
|
||||
}
|
||||
c.OCR.Providers[id] = current
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,3 +408,50 @@ func (c AppConfig) IsS3Configured() bool {
|
||||
func (c AppConfig) IsSSHConfigured() bool {
|
||||
return c.SSH.Host != "" && c.SSH.User != ""
|
||||
}
|
||||
|
||||
// ActiveLLMProvider returns the selected provider config plus a boolean
|
||||
// indicating whether the selection exists.
|
||||
func (c AppConfig) ActiveLLMProvider() (string, LLMProviderConfig, bool) {
|
||||
id := c.LLM.ActiveProvider
|
||||
if id == "" {
|
||||
id = LLMProviderOpenAI
|
||||
}
|
||||
provider, ok := c.LLM.Providers[id]
|
||||
return id, provider, ok
|
||||
}
|
||||
|
||||
// IsLLMConfigured reports whether the selected multimodal provider has the
|
||||
// fields required to make a request.
|
||||
func (c AppConfig) IsLLMConfigured() bool {
|
||||
_, provider, ok := c.ActiveLLMProvider()
|
||||
return ok && provider.BaseURL != "" && provider.APIKey != "" && provider.Model != ""
|
||||
}
|
||||
|
||||
// ActiveOCRProvider returns the selected OCR provider config plus a boolean
|
||||
// indicating whether the selection exists.
|
||||
func (c AppConfig) ActiveOCRProvider() (string, OCRProviderConfig, bool) {
|
||||
id := c.OCR.ActiveProvider
|
||||
if id == "" {
|
||||
id = OCRProviderAliyun
|
||||
}
|
||||
provider, ok := c.OCR.Providers[id]
|
||||
return id, provider, ok
|
||||
}
|
||||
|
||||
// IsOCRConfigured reports whether the selected OCR provider has the fields
|
||||
// required to sign and send a request.
|
||||
func (c AppConfig) IsOCRConfigured() bool {
|
||||
id, provider, ok := c.ActiveOCRProvider()
|
||||
if !ok ||
|
||||
provider.Endpoint == "" ||
|
||||
provider.AccessKeyID == "" ||
|
||||
provider.AccessKeySecret == "" ||
|
||||
provider.Action == "" ||
|
||||
provider.Version == "" {
|
||||
return false
|
||||
}
|
||||
if id == OCRProviderVolcengine && (provider.Region == "" || provider.Service == "") {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
// Package config provides JSON-file backed persistence for AppConfig.
|
||||
//
|
||||
// Design rationale:
|
||||
// - JSON keeps the file human-readable, which is useful while the MVP has
|
||||
// no settings UI for every option.
|
||||
// - Storage location follows os.UserConfigDir() so each platform places it
|
||||
// in the canonical spot (macOS: ~/Library/Application Support/SnapGo).
|
||||
// - File mode 0600 / dir mode 0700 mitigate accidental leakage of access
|
||||
// keys before we wire up the OS keychain (deferred to a later spec).
|
||||
// - JSON keeps the file human-readable, which is useful while the MVP has
|
||||
// no settings UI for every option.
|
||||
// - Storage location follows os.UserConfigDir() so each platform places it
|
||||
// in the canonical spot (macOS: ~/Library/Application Support/SnapGo).
|
||||
// - File mode 0600 / dir mode 0700 mitigate accidental leakage of access
|
||||
// keys before we wire up the OS keychain (deferred to a later spec).
|
||||
package config
|
||||
|
||||
import (
|
||||
@@ -65,6 +65,7 @@ func (s *FileStore) Load() (domain.AppConfig, error) {
|
||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
||||
return domain.DefaultAppConfig(), fmt.Errorf("parse config: %w", err)
|
||||
}
|
||||
cfg.Normalize()
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
@@ -74,6 +75,7 @@ func (s *FileStore) Save(cfg domain.AppConfig) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
|
||||
cfg.Normalize()
|
||||
data, err := json.MarshalIndent(cfg, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshal config: %w", err)
|
||||
|
||||
@@ -104,7 +104,7 @@ func parseSpec(spec string) ([]hk.Modifier, hk.Key, error) {
|
||||
case "option", "alt":
|
||||
mods = append(mods, modOption())
|
||||
case "shift":
|
||||
mods = append(mods, hk.ModShift)
|
||||
mods = append(mods, modShift())
|
||||
default:
|
||||
k, ok := lookupKey(p)
|
||||
if !ok {
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
//go:build darwin
|
||||
//go:build darwin && cgo
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// macOS uses ⌘ as the primary modifier; Option corresponds to Alt.
|
||||
//
|
||||
// This file is gated on cgo because golang.design/x/hotkey only exposes the
|
||||
// Mod* constants from its cgo-backed darwin implementation; with CGO_ENABLED=0
|
||||
// the package falls back to a stub that defines no constants.
|
||||
func modCmd() hk.Modifier { return hk.ModCmd }
|
||||
func modCtrl() hk.Modifier { return hk.ModCtrl }
|
||||
func modOption() hk.Modifier { return hk.ModOption }
|
||||
func modShift() hk.Modifier { return hk.ModShift }
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
//go:build linux && cgo
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// On Linux we map "cmd" to Ctrl so the same config string ("cmd+shift+a")
|
||||
// stays meaningful across platforms.
|
||||
//
|
||||
// The X11 backend exposes modifiers as Mod1..Mod5 rather than named Alt/Option
|
||||
// constants; Mod1 is the conventional Alt mask under X11, so "option"/"alt"
|
||||
// resolve to hk.Mod1. This file is gated on cgo because the constants only
|
||||
// exist in the cgo-backed linux implementation (CGO_ENABLED=0 falls back to a
|
||||
// stub with no constants).
|
||||
func modCmd() hk.Modifier { return hk.ModCtrl }
|
||||
func modCtrl() hk.Modifier { return hk.ModCtrl }
|
||||
func modOption() hk.Modifier { return hk.Mod1 }
|
||||
func modShift() hk.Modifier { return hk.ModShift }
|
||||
@@ -1,11 +0,0 @@
|
||||
//go:build !darwin
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// On Windows / Linux we map "cmd" to Ctrl so the same config string works
|
||||
// across platforms; "option" is treated as Alt.
|
||||
func modCmd() hk.Modifier { return hk.ModCtrl }
|
||||
func modCtrl() hk.Modifier { return hk.ModCtrl }
|
||||
func modOption() hk.Modifier { return hk.ModAlt }
|
||||
@@ -0,0 +1,25 @@
|
||||
//go:build !windows && !cgo
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// This file covers the configuration where golang.design/x/hotkey compiles its
|
||||
// cgo-less stub (any non-Windows platform built with CGO_ENABLED=0). In that
|
||||
// stub the package defines the Modifier/Key types but no Mod*/Key* constants,
|
||||
// and Register panics at runtime. We still provide the package-internal
|
||||
// helpers so that snapgo keeps cross-compiling (e.g. `go vet`, editor analysis,
|
||||
// or CI cross-builds) without pulling in a C toolchain.
|
||||
//
|
||||
// The returned values are inert zero modifiers and lookupKey always reports
|
||||
// "unsupported": callers on this build cannot register a real global hotkey,
|
||||
// so surfacing an "unsupported token" parse error is preferable to reaching
|
||||
// the upstream panic.
|
||||
func modCmd() hk.Modifier { return 0 }
|
||||
func modCtrl() hk.Modifier { return 0 }
|
||||
func modOption() hk.Modifier { return 0 }
|
||||
func modShift() hk.Modifier { return 0 }
|
||||
|
||||
// lookupKey has no key constants to map against in the cgo-less stub, so it
|
||||
// always reports the token as unsupported.
|
||||
func lookupKey(string) (hk.Key, bool) { return 0, false }
|
||||
@@ -0,0 +1,13 @@
|
||||
//go:build windows
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// On Windows we map "cmd" to Ctrl so the same config string ("cmd+shift+a")
|
||||
// stays meaningful across platforms; "option" is treated as Alt. The Windows
|
||||
// backend does not require cgo, hence the single-tag guard.
|
||||
func modCmd() hk.Modifier { return hk.ModCtrl }
|
||||
func modCtrl() hk.Modifier { return hk.ModCtrl }
|
||||
func modOption() hk.Modifier { return hk.ModAlt }
|
||||
func modShift() hk.Modifier { return hk.ModShift }
|
||||
@@ -1,9 +1,15 @@
|
||||
//go:build windows || cgo
|
||||
|
||||
package hotkey
|
||||
|
||||
import hk "golang.design/x/hotkey"
|
||||
|
||||
// lookupKey maps a token from the user-supplied hotkey spec to a hk.Key.
|
||||
//
|
||||
// The Key* constants only exist in the platform backends that ship them
|
||||
// (windows, or the cgo-backed darwin/linux implementations); the cgo-less stub
|
||||
// in hotkey_unsupported.go provides a fallback lookupKey for the complement.
|
||||
//
|
||||
// The map is intentionally exhaustive over the alphanumeric set so we never
|
||||
// rely on an assumption that hk.KeyA..hk.KeyZ are contiguous values — the
|
||||
// upstream package gives no such guarantee.
|
||||
|
||||
@@ -0,0 +1,174 @@
|
||||
// Package llm contains multimodal LLM adapters.
|
||||
//
|
||||
// The built-in providers are intentionally implemented through the
|
||||
// OpenAI-compatible chat/completions shape. Qwen DashScope, Volcengine Ark,
|
||||
// and OpenAI-compatible gateways all accept the same "text + image_url"
|
||||
// message content pattern, so one small HTTP adapter is enough here.
|
||||
package llm
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
)
|
||||
|
||||
// VisionClient calls one configured multimodal chat endpoint.
|
||||
type VisionClient struct {
|
||||
providerID string
|
||||
cfg domain.LLMProviderConfig
|
||||
httpClient *http.Client
|
||||
}
|
||||
|
||||
// NewVisionClient validates cfg and returns a reusable client.
|
||||
func NewVisionClient(providerID string, cfg domain.LLMProviderConfig) (*VisionClient, error) {
|
||||
if strings.TrimSpace(cfg.BaseURL) == "" {
|
||||
return nil, fmt.Errorf("llm base url is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.APIKey) == "" {
|
||||
return nil, fmt.Errorf("llm api key is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.Model) == "" {
|
||||
return nil, fmt.Errorf("llm model is required")
|
||||
}
|
||||
timeout := cfg.TimeoutSecs
|
||||
if timeout <= 0 {
|
||||
timeout = 60
|
||||
}
|
||||
return &VisionClient{
|
||||
providerID: providerID,
|
||||
cfg: cfg,
|
||||
httpClient: &http.Client{Timeout: time.Duration(timeout) * time.Second},
|
||||
}, nil
|
||||
}
|
||||
|
||||
// SummarizeImage asks the model to summarise an image available at imageURL.
|
||||
func (c *VisionClient) SummarizeImage(ctx context.Context, prompt string, imageURL string) (string, error) {
|
||||
prompt = strings.TrimSpace(prompt)
|
||||
if prompt == "" {
|
||||
return "", fmt.Errorf("llm prompt is empty")
|
||||
}
|
||||
imageURL = strings.TrimSpace(imageURL)
|
||||
if imageURL == "" {
|
||||
return "", fmt.Errorf("image url is empty")
|
||||
}
|
||||
|
||||
body := map[string]any{
|
||||
"model": c.cfg.Model,
|
||||
"messages": []map[string]any{
|
||||
{
|
||||
"role": "user",
|
||||
"content": []map[string]any{
|
||||
{"type": "text", "text": prompt},
|
||||
{"type": "image_url", "image_url": map[string]any{"url": imageURL}},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
if c.cfg.MaxTokens > 0 {
|
||||
if c.providerID == domain.LLMProviderOpenAI {
|
||||
body["max_completion_tokens"] = c.cfg.MaxTokens
|
||||
} else {
|
||||
body["max_tokens"] = c.cfg.MaxTokens
|
||||
}
|
||||
}
|
||||
if c.cfg.Temperature >= 0 {
|
||||
body["temperature"] = c.cfg.Temperature
|
||||
}
|
||||
|
||||
payload, err := json.Marshal(body)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("marshal llm request: %w", err)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, chatCompletionsURL(c.cfg.BaseURL), bytes.NewReader(payload))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("build llm request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+c.cfg.APIKey)
|
||||
|
||||
resp, err := c.httpClient.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("llm request: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
data, _ := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
|
||||
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||||
return "", fmt.Errorf("llm status %d: %s", resp.StatusCode, compactBody(data))
|
||||
}
|
||||
|
||||
var decoded chatCompletionResponse
|
||||
if err := json.Unmarshal(data, &decoded); err != nil {
|
||||
return "", fmt.Errorf("decode llm response: %w", err)
|
||||
}
|
||||
if decoded.Error != nil && decoded.Error.Message != "" {
|
||||
return "", fmt.Errorf("llm error: %s", decoded.Error.Message)
|
||||
}
|
||||
if len(decoded.Choices) == 0 {
|
||||
return "", fmt.Errorf("llm response has no choices")
|
||||
}
|
||||
text := strings.TrimSpace(contentText(decoded.Choices[0].Message.Content))
|
||||
if text == "" {
|
||||
return "", fmt.Errorf("llm response is empty")
|
||||
}
|
||||
return text, nil
|
||||
}
|
||||
|
||||
func chatCompletionsURL(baseURL string) string {
|
||||
base := strings.TrimRight(strings.TrimSpace(baseURL), "/")
|
||||
if strings.HasSuffix(base, "/chat/completions") {
|
||||
return base
|
||||
}
|
||||
return base + "/chat/completions"
|
||||
}
|
||||
|
||||
type chatCompletionResponse struct {
|
||||
Choices []struct {
|
||||
Message struct {
|
||||
Content any `json:"content"`
|
||||
} `json:"message"`
|
||||
} `json:"choices"`
|
||||
Error *struct {
|
||||
Message string `json:"message"`
|
||||
Type string `json:"type"`
|
||||
Code any `json:"code"`
|
||||
} `json:"error"`
|
||||
}
|
||||
|
||||
func contentText(content any) string {
|
||||
switch v := content.(type) {
|
||||
case string:
|
||||
return v
|
||||
case []any:
|
||||
parts := make([]string, 0, len(v))
|
||||
for _, item := range v {
|
||||
obj, ok := item.(map[string]any)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if text, ok := obj["text"].(string); ok {
|
||||
parts = append(parts, text)
|
||||
}
|
||||
}
|
||||
return strings.Join(parts, "\n")
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func compactBody(data []byte) string {
|
||||
text := strings.TrimSpace(string(data))
|
||||
if text == "" {
|
||||
return "<empty body>"
|
||||
}
|
||||
if len(text) > 800 {
|
||||
return text[:800] + "..."
|
||||
}
|
||||
return text
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
package llm
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
)
|
||||
|
||||
type roundTripFunc func(*http.Request) (*http.Response, error)
|
||||
|
||||
func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
return f(req)
|
||||
}
|
||||
|
||||
func TestVisionClientSummarizeImageUsesChatCompletionImageURL(t *testing.T) {
|
||||
var requestBody map[string]any
|
||||
transport := roundTripFunc(func(r *http.Request) (*http.Response, error) {
|
||||
if r.URL.Path != "/v1/chat/completions" {
|
||||
t.Fatalf("expected /v1/chat/completions, got %s", r.URL.Path)
|
||||
}
|
||||
if got := r.Header.Get("Authorization"); got != "Bearer test-key" {
|
||||
t.Fatalf("unexpected auth header %q", got)
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
|
||||
t.Fatalf("decode request: %v", err)
|
||||
}
|
||||
return &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Header: http.Header{"Content-Type": []string{"application/json"}},
|
||||
Body: io.NopCloser(bytes.NewBufferString(`{"choices":[{"message":{"content":"summary ok"}}]}`)),
|
||||
}, nil
|
||||
})
|
||||
|
||||
client, err := NewVisionClient(domain.LLMProviderQwen, domain.LLMProviderConfig{
|
||||
BaseURL: "https://example.test/v1",
|
||||
APIKey: "test-key",
|
||||
Model: "qwen-vl-plus",
|
||||
MaxTokens: 321,
|
||||
Temperature: 0.2,
|
||||
TimeoutSecs: 5,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("new client: %v", err)
|
||||
}
|
||||
client.httpClient.Transport = transport
|
||||
|
||||
text, err := client.SummarizeImage(context.Background(), "describe", "https://cdn.example.com/a.png")
|
||||
if err != nil {
|
||||
t.Fatalf("summarize image: %v", err)
|
||||
}
|
||||
if text != "summary ok" {
|
||||
t.Fatalf("expected response text, got %q", text)
|
||||
}
|
||||
if requestBody["model"] != "qwen-vl-plus" {
|
||||
t.Fatalf("expected model forwarded, got %#v", requestBody["model"])
|
||||
}
|
||||
if requestBody["max_tokens"] != float64(321) {
|
||||
t.Fatalf("expected max_tokens forwarded, got %#v", requestBody["max_tokens"])
|
||||
}
|
||||
|
||||
messages := requestBody["messages"].([]any)
|
||||
content := messages[0].(map[string]any)["content"].([]any)
|
||||
if content[0].(map[string]any)["text"] != "describe" {
|
||||
t.Fatalf("expected prompt content, got %#v", content[0])
|
||||
}
|
||||
image := content[1].(map[string]any)
|
||||
if image["type"] != "image_url" {
|
||||
t.Fatalf("expected image_url item, got %#v", image)
|
||||
}
|
||||
url := image["image_url"].(map[string]any)["url"]
|
||||
if url != "https://cdn.example.com/a.png" {
|
||||
t.Fatalf("expected image url forwarded, got %#v", url)
|
||||
}
|
||||
}
|
||||
|
||||
func TestChatCompletionsURLAcceptsFullEndpoint(t *testing.T) {
|
||||
full := "https://example.com/v1/chat/completions"
|
||||
if got := chatCompletionsURL(full); got != full {
|
||||
t.Fatalf("expected full endpoint unchanged, got %q", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,568 @@
|
||||
// Package ocr contains cloud OCR adapters.
|
||||
package ocr
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/hmac"
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/application"
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
)
|
||||
|
||||
// Client calls one configured OCR provider.
|
||||
type Client struct {
|
||||
providerID string
|
||||
cfg domain.OCRProviderConfig
|
||||
httpClient *http.Client
|
||||
now func() time.Time
|
||||
nonce func() string
|
||||
}
|
||||
|
||||
var _ application.OCRRecognizer = (*Client)(nil)
|
||||
|
||||
// NewClient validates cfg and returns a reusable OCR client.
|
||||
func NewClient(providerID string, cfg domain.OCRProviderConfig) (*Client, error) {
|
||||
if strings.TrimSpace(cfg.Endpoint) == "" {
|
||||
return nil, fmt.Errorf("ocr endpoint is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.AccessKeyID) == "" {
|
||||
return nil, fmt.Errorf("ocr access key id is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.AccessKeySecret) == "" {
|
||||
return nil, fmt.Errorf("ocr access key secret is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.Action) == "" {
|
||||
return nil, fmt.Errorf("ocr action is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.Version) == "" {
|
||||
return nil, fmt.Errorf("ocr version is required")
|
||||
}
|
||||
switch providerID {
|
||||
case domain.OCRProviderAliyun:
|
||||
case domain.OCRProviderVolcengine:
|
||||
if strings.TrimSpace(cfg.Region) == "" {
|
||||
return nil, fmt.Errorf("volcengine ocr region is required")
|
||||
}
|
||||
if strings.TrimSpace(cfg.Service) == "" {
|
||||
return nil, fmt.Errorf("volcengine ocr service is required")
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported ocr provider %q", providerID)
|
||||
}
|
||||
timeout := cfg.TimeoutSecs
|
||||
if timeout <= 0 {
|
||||
timeout = 30
|
||||
}
|
||||
return &Client{
|
||||
providerID: providerID,
|
||||
cfg: cfg,
|
||||
httpClient: &http.Client{Timeout: time.Duration(timeout) * time.Second},
|
||||
now: time.Now,
|
||||
nonce: randomNonce,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// RecognizeText extracts visible text from a PNG screenshot.
|
||||
func (c *Client) RecognizeText(ctx context.Context, pngBytes []byte) (string, error) {
|
||||
if len(pngBytes) == 0 {
|
||||
return "", fmt.Errorf("empty screenshot")
|
||||
}
|
||||
switch c.providerID {
|
||||
case domain.OCRProviderAliyun:
|
||||
return c.recognizeAliyun(ctx, pngBytes)
|
||||
case domain.OCRProviderVolcengine:
|
||||
return c.recognizeVolcengine(ctx, pngBytes)
|
||||
default:
|
||||
return "", fmt.Errorf("unsupported ocr provider %q", c.providerID)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) recognizeAliyun(ctx context.Context, pngBytes []byte) (string, error) {
|
||||
endpoint, err := parseEndpoint(c.cfg.Endpoint)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint.String(), bytes.NewReader(pngBytes))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("build aliyun ocr request: %w", err)
|
||||
}
|
||||
req.Header.Set("Accept", "application/json")
|
||||
req.Header.Set("Content-Type", "application/octet-stream")
|
||||
c.signAliyun(req, pngBytes)
|
||||
return c.doOCRRequest(req, "aliyun ocr")
|
||||
}
|
||||
|
||||
func (c *Client) recognizeVolcengine(ctx context.Context, pngBytes []byte) (string, error) {
|
||||
endpoint, err := parseEndpoint(c.cfg.Endpoint)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
query := endpoint.Query()
|
||||
query.Set("Action", c.cfg.Action)
|
||||
query.Set("Version", c.cfg.Version)
|
||||
endpoint.RawQuery = query.Encode()
|
||||
|
||||
body := map[string]string{
|
||||
"image_base64": base64.StdEncoding.EncodeToString(pngBytes),
|
||||
}
|
||||
payload, err := json.Marshal(body)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("marshal volcengine ocr request: %w", err)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint.String(), bytes.NewReader(payload))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("build volcengine ocr request: %w", err)
|
||||
}
|
||||
req.Header.Set("Accept", "application/json")
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
c.signVolcengine(req, payload)
|
||||
return c.doOCRRequest(req, "volcengine ocr")
|
||||
}
|
||||
|
||||
func (c *Client) doOCRRequest(req *http.Request, label string) (string, error) {
|
||||
resp, err := c.httpClient.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("%s request: %w", label, err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
data, _ := io.ReadAll(io.LimitReader(resp.Body, 8<<20))
|
||||
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||||
return "", fmt.Errorf("%s status %d: %s", label, resp.StatusCode, compactBody(data))
|
||||
}
|
||||
text, err := parseOCRText(data)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("%s response: %w", label, err)
|
||||
}
|
||||
return text, nil
|
||||
}
|
||||
|
||||
func (c *Client) signAliyun(req *http.Request, payload []byte) {
|
||||
now := c.now().UTC()
|
||||
payloadHash := sha256Hex(payload)
|
||||
nonce := c.nonce()
|
||||
|
||||
req.Header.Set("x-acs-action", c.cfg.Action)
|
||||
req.Header.Set("x-acs-version", c.cfg.Version)
|
||||
req.Header.Set("x-acs-date", now.Format("2006-01-02T15:04:05Z"))
|
||||
req.Header.Set("x-acs-signature-nonce", nonce)
|
||||
req.Header.Set("x-acs-content-sha256", payloadHash)
|
||||
|
||||
signedHeaders := []string{
|
||||
"content-type",
|
||||
"host",
|
||||
"x-acs-action",
|
||||
"x-acs-content-sha256",
|
||||
"x-acs-date",
|
||||
"x-acs-signature-nonce",
|
||||
"x-acs-version",
|
||||
}
|
||||
canonicalHeaders := canonicalHeaders(req, signedHeaders)
|
||||
canonicalRequest := strings.Join([]string{
|
||||
req.Method,
|
||||
canonicalURI(req.URL),
|
||||
canonicalQuery(req.URL),
|
||||
canonicalHeaders,
|
||||
strings.Join(signedHeaders, ";"),
|
||||
payloadHash,
|
||||
}, "\n")
|
||||
stringToSign := "ACS3-HMAC-SHA256\n" + sha256Hex([]byte(canonicalRequest))
|
||||
signature := hmacSHA256Hex([]byte(c.cfg.AccessKeySecret), []byte(stringToSign))
|
||||
req.Header.Set(
|
||||
"Authorization",
|
||||
fmt.Sprintf("ACS3-HMAC-SHA256 Credential=%s,SignedHeaders=%s,Signature=%s",
|
||||
c.cfg.AccessKeyID,
|
||||
strings.Join(signedHeaders, ";"),
|
||||
signature,
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func (c *Client) signVolcengine(req *http.Request, payload []byte) {
|
||||
now := c.now().UTC()
|
||||
xDate := now.Format("20060102T150405Z")
|
||||
shortDate := now.Format("20060102")
|
||||
payloadHash := sha256Hex(payload)
|
||||
|
||||
req.Header.Set("X-Date", xDate)
|
||||
req.Header.Set("X-Content-Sha256", payloadHash)
|
||||
|
||||
signedHeaders := []string{
|
||||
"content-type",
|
||||
"host",
|
||||
"x-content-sha256",
|
||||
"x-date",
|
||||
}
|
||||
canonicalHeaders := canonicalHeaders(req, signedHeaders)
|
||||
canonicalRequest := strings.Join([]string{
|
||||
req.Method,
|
||||
canonicalURI(req.URL),
|
||||
canonicalQuery(req.URL),
|
||||
canonicalHeaders,
|
||||
strings.Join(signedHeaders, ";"),
|
||||
payloadHash,
|
||||
}, "\n")
|
||||
scope := strings.Join([]string{shortDate, c.cfg.Region, c.cfg.Service, "request"}, "/")
|
||||
stringToSign := strings.Join([]string{
|
||||
"HMAC-SHA256",
|
||||
xDate,
|
||||
scope,
|
||||
sha256Hex([]byte(canonicalRequest)),
|
||||
}, "\n")
|
||||
signingKey := volcengineSigningKey(c.cfg.AccessKeySecret, shortDate, c.cfg.Region, c.cfg.Service)
|
||||
signature := hmacSHA256Hex(signingKey, []byte(stringToSign))
|
||||
req.Header.Set(
|
||||
"Authorization",
|
||||
fmt.Sprintf("HMAC-SHA256 Credential=%s/%s, SignedHeaders=%s, Signature=%s",
|
||||
c.cfg.AccessKeyID,
|
||||
scope,
|
||||
strings.Join(signedHeaders, ";"),
|
||||
signature,
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func parseEndpoint(raw string) (*url.URL, error) {
|
||||
endpoint := strings.TrimSpace(raw)
|
||||
if endpoint == "" {
|
||||
return nil, fmt.Errorf("ocr endpoint is required")
|
||||
}
|
||||
if !strings.Contains(endpoint, "://") {
|
||||
endpoint = "https://" + endpoint
|
||||
}
|
||||
parsed, err := url.Parse(endpoint)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parse ocr endpoint: %w", err)
|
||||
}
|
||||
if parsed.Scheme == "" || parsed.Host == "" {
|
||||
return nil, fmt.Errorf("invalid ocr endpoint %q", raw)
|
||||
}
|
||||
if parsed.Path == "" {
|
||||
parsed.Path = "/"
|
||||
}
|
||||
return parsed, nil
|
||||
}
|
||||
|
||||
func parseOCRText(data []byte) (string, error) {
|
||||
var root any
|
||||
if err := json.Unmarshal(data, &root); err != nil {
|
||||
return "", fmt.Errorf("decode json: %w", err)
|
||||
}
|
||||
if msg := responseError(root); msg != "" {
|
||||
return "", errors.New(msg)
|
||||
}
|
||||
parts := collectOCRParts(root, "")
|
||||
if len(parts) == 0 {
|
||||
return "", fmt.Errorf("no text found")
|
||||
}
|
||||
return strings.Join(dedupeNonEmpty(parts), "\n"), nil
|
||||
}
|
||||
|
||||
func responseError(v any) string {
|
||||
obj, ok := v.(map[string]any)
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
if meta, ok := obj["ResponseMetadata"].(map[string]any); ok {
|
||||
if errObj, ok := meta["Error"].(map[string]any); ok {
|
||||
if msg := stringValue(errObj["Message"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
if code := stringValue(errObj["Code"]); code != "" {
|
||||
return code
|
||||
}
|
||||
}
|
||||
}
|
||||
if errObj, ok := obj["Error"].(map[string]any); ok {
|
||||
if msg := stringValue(errObj["Message"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
if msg := stringValue(errObj["message"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
}
|
||||
if code, ok := numericCode(obj["code"]); ok && code != 0 && code != 10000 {
|
||||
if msg := stringValue(obj["message"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
if msg := stringValue(obj["msg"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
return fmt.Sprintf("provider code %.0f", code)
|
||||
}
|
||||
if code := stringValue(obj["Code"]); code != "" && !isSuccessCode(code) {
|
||||
if msg := stringValue(obj["Message"]); msg != "" {
|
||||
return msg
|
||||
}
|
||||
return code
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func collectOCRParts(v any, parentKey string) []string {
|
||||
switch value := v.(type) {
|
||||
case string:
|
||||
text := strings.TrimSpace(value)
|
||||
if text == "" {
|
||||
return nil
|
||||
}
|
||||
if looksLikeJSON(text) {
|
||||
var nested any
|
||||
if err := json.Unmarshal([]byte(text), &nested); err == nil {
|
||||
return collectOCRParts(nested, parentKey)
|
||||
}
|
||||
}
|
||||
if isTextKey(parentKey) || isContainerTextKey(parentKey) {
|
||||
return []string{text}
|
||||
}
|
||||
return nil
|
||||
case []any:
|
||||
parts := make([]string, 0, len(value))
|
||||
for _, item := range value {
|
||||
parts = append(parts, collectOCRParts(item, parentKey)...)
|
||||
}
|
||||
return parts
|
||||
case map[string]any:
|
||||
parts := make([]string, 0)
|
||||
for _, key := range priorityOCRKeys() {
|
||||
if child, ok := value[key]; ok {
|
||||
parts = append(parts, collectOCRParts(child, key)...)
|
||||
}
|
||||
}
|
||||
keys := make([]string, 0, len(value))
|
||||
for key := range value {
|
||||
keys = append(keys, key)
|
||||
}
|
||||
sort.Strings(keys)
|
||||
for _, key := range keys {
|
||||
if isPriorityOCRKey(key) || isMetadataKey(key) {
|
||||
continue
|
||||
}
|
||||
parts = append(parts, collectOCRParts(value[key], key)...)
|
||||
}
|
||||
return parts
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func priorityOCRKeys() []string {
|
||||
return []string{
|
||||
"Data",
|
||||
"data",
|
||||
"Result",
|
||||
"result",
|
||||
"content",
|
||||
"Content",
|
||||
"text",
|
||||
"Text",
|
||||
"DetectedText",
|
||||
"detected_text",
|
||||
"line_text",
|
||||
"LineText",
|
||||
"line_texts",
|
||||
"LineTexts",
|
||||
"word",
|
||||
"Word",
|
||||
"words",
|
||||
"Words",
|
||||
"words_result",
|
||||
"WordsResult",
|
||||
"prism_wordsInfo",
|
||||
"prism_words_info",
|
||||
"ocr_infos",
|
||||
"OCRInfos",
|
||||
"items",
|
||||
"Items",
|
||||
"blocks",
|
||||
"Blocks",
|
||||
"regions",
|
||||
"Regions",
|
||||
}
|
||||
}
|
||||
|
||||
func isPriorityOCRKey(key string) bool {
|
||||
for _, item := range priorityOCRKeys() {
|
||||
if item == key {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func isTextKey(key string) bool {
|
||||
switch normalizeKey(key) {
|
||||
case "content", "text", "detectedtext", "linetext", "word", "words", "value":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func isContainerTextKey(key string) bool {
|
||||
switch normalizeKey(key) {
|
||||
case "data", "result", "linetexts", "texts":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func isMetadataKey(key string) bool {
|
||||
switch normalizeKey(key) {
|
||||
case "requestid", "request", "code", "status", "statuscode", "success",
|
||||
"error", "errors", "message", "msg", "cost", "angle", "probability",
|
||||
"confidence", "height", "width", "left", "top", "right", "bottom",
|
||||
"x", "y", "responsemetadata":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeKey(key string) string {
|
||||
key = strings.ToLower(key)
|
||||
key = strings.ReplaceAll(key, "_", "")
|
||||
key = strings.ReplaceAll(key, "-", "")
|
||||
return key
|
||||
}
|
||||
|
||||
func dedupeNonEmpty(parts []string) []string {
|
||||
seen := map[string]struct{}{}
|
||||
out := make([]string, 0, len(parts))
|
||||
for _, part := range parts {
|
||||
for _, line := range strings.Split(part, "\n") {
|
||||
line = strings.TrimSpace(line)
|
||||
if line == "" {
|
||||
continue
|
||||
}
|
||||
if _, ok := seen[line]; ok {
|
||||
continue
|
||||
}
|
||||
seen[line] = struct{}{}
|
||||
out = append(out, line)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func looksLikeJSON(text string) bool {
|
||||
return strings.HasPrefix(text, "{") || strings.HasPrefix(text, "[")
|
||||
}
|
||||
|
||||
func stringValue(v any) string {
|
||||
if s, ok := v.(string); ok {
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func numericCode(v any) (float64, bool) {
|
||||
switch n := v.(type) {
|
||||
case float64:
|
||||
return n, true
|
||||
case int:
|
||||
return float64(n), true
|
||||
case json.Number:
|
||||
f, err := n.Float64()
|
||||
return f, err == nil
|
||||
default:
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
func isSuccessCode(code string) bool {
|
||||
switch strings.ToLower(strings.TrimSpace(code)) {
|
||||
case "", "ok", "success", "200", "10000":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func canonicalURI(u *url.URL) string {
|
||||
if u == nil || u.EscapedPath() == "" {
|
||||
return "/"
|
||||
}
|
||||
return u.EscapedPath()
|
||||
}
|
||||
|
||||
func canonicalQuery(u *url.URL) string {
|
||||
if u == nil || u.RawQuery == "" {
|
||||
return ""
|
||||
}
|
||||
values, _ := url.ParseQuery(u.RawQuery)
|
||||
return values.Encode()
|
||||
}
|
||||
|
||||
func canonicalHeaders(req *http.Request, signedHeaders []string) string {
|
||||
lines := make([]string, 0, len(signedHeaders))
|
||||
for _, key := range signedHeaders {
|
||||
var value string
|
||||
if key == "host" {
|
||||
value = req.URL.Host
|
||||
} else {
|
||||
value = req.Header.Get(key)
|
||||
}
|
||||
lines = append(lines, key+":"+normalizeHeaderValue(value)+"\n")
|
||||
}
|
||||
return strings.Join(lines, "")
|
||||
}
|
||||
|
||||
func normalizeHeaderValue(value string) string {
|
||||
return strings.Join(strings.Fields(strings.TrimSpace(value)), " ")
|
||||
}
|
||||
|
||||
func volcengineSigningKey(secret, date, region, service string) []byte {
|
||||
kDate := hmacSHA256([]byte(secret), []byte(date))
|
||||
kRegion := hmacSHA256(kDate, []byte(region))
|
||||
kService := hmacSHA256(kRegion, []byte(service))
|
||||
return hmacSHA256(kService, []byte("request"))
|
||||
}
|
||||
|
||||
func hmacSHA256(key, data []byte) []byte {
|
||||
mac := hmac.New(sha256.New, key)
|
||||
mac.Write(data)
|
||||
return mac.Sum(nil)
|
||||
}
|
||||
|
||||
func hmacSHA256Hex(key, data []byte) string {
|
||||
return hex.EncodeToString(hmacSHA256(key, data))
|
||||
}
|
||||
|
||||
func sha256Hex(data []byte) string {
|
||||
sum := sha256.Sum256(data)
|
||||
return hex.EncodeToString(sum[:])
|
||||
}
|
||||
|
||||
func randomNonce() string {
|
||||
buf := make([]byte, 16)
|
||||
if _, err := rand.Read(buf); err != nil {
|
||||
return fmt.Sprintf("%d", time.Now().UnixNano())
|
||||
}
|
||||
return hex.EncodeToString(buf)
|
||||
}
|
||||
|
||||
func compactBody(data []byte) string {
|
||||
text := strings.TrimSpace(string(data))
|
||||
if text == "" {
|
||||
return "<empty body>"
|
||||
}
|
||||
if len(text) > 800 {
|
||||
return text[:800] + "..."
|
||||
}
|
||||
return text
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
package ocr
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
)
|
||||
|
||||
type roundTripFunc func(*http.Request) (*http.Response, error)
|
||||
|
||||
func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||
return f(req)
|
||||
}
|
||||
|
||||
func TestAliyunRecognizeTextSignsRawPNGRequest(t *testing.T) {
|
||||
var requestBody []byte
|
||||
transport := roundTripFunc(func(r *http.Request) (*http.Response, error) {
|
||||
if r.URL.Host != "ocr-api.cn-hangzhou.aliyuncs.com" {
|
||||
t.Fatalf("unexpected host %s", r.URL.Host)
|
||||
}
|
||||
if got := r.Header.Get("x-acs-action"); got != "RecognizeGeneral" {
|
||||
t.Fatalf("unexpected action %q", got)
|
||||
}
|
||||
if got := r.Header.Get("x-acs-version"); got != "2021-07-07" {
|
||||
t.Fatalf("unexpected version %q", got)
|
||||
}
|
||||
if got := r.Header.Get("x-acs-date"); got != "2026-07-08T01:02:03Z" {
|
||||
t.Fatalf("unexpected date %q", got)
|
||||
}
|
||||
if got := r.Header.Get("Authorization"); !strings.Contains(got, "ACS3-HMAC-SHA256 Credential=ak") {
|
||||
t.Fatalf("unexpected auth header %q", got)
|
||||
}
|
||||
var err error
|
||||
requestBody, err = io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
t.Fatalf("read body: %v", err)
|
||||
}
|
||||
return &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Header: http.Header{"Content-Type": []string{"application/json"}},
|
||||
Body: io.NopCloser(bytes.NewBufferString(
|
||||
`{"Data":"{\"content\":\"第一行\\n第二行\"}"}`,
|
||||
)),
|
||||
}, nil
|
||||
})
|
||||
|
||||
client, err := NewClient(domain.OCRProviderAliyun, domain.OCRProviderConfig{
|
||||
Endpoint: "https://ocr-api.cn-hangzhou.aliyuncs.com",
|
||||
AccessKeyID: "ak",
|
||||
AccessKeySecret: "sk",
|
||||
Action: "RecognizeGeneral",
|
||||
Version: "2021-07-07",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("new client: %v", err)
|
||||
}
|
||||
client.httpClient.Transport = transport
|
||||
client.now = func() time.Time { return time.Date(2026, 7, 8, 1, 2, 3, 0, time.UTC) }
|
||||
client.nonce = func() string { return "nonce" }
|
||||
|
||||
text, err := client.RecognizeText(context.Background(), []byte("png"))
|
||||
if err != nil {
|
||||
t.Fatalf("recognize text: %v", err)
|
||||
}
|
||||
if string(requestBody) != "png" {
|
||||
t.Fatalf("expected raw png body, got %q", string(requestBody))
|
||||
}
|
||||
if text != "第一行\n第二行" {
|
||||
t.Fatalf("unexpected OCR text %q", text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestVolcengineRecognizeTextSignsBase64JSONRequest(t *testing.T) {
|
||||
var requestBody map[string]string
|
||||
transport := roundTripFunc(func(r *http.Request) (*http.Response, error) {
|
||||
if got := r.URL.Query().Get("Action"); got != "OCRNormal" {
|
||||
t.Fatalf("unexpected action %q", got)
|
||||
}
|
||||
if got := r.URL.Query().Get("Version"); got != "2020-08-26" {
|
||||
t.Fatalf("unexpected version %q", got)
|
||||
}
|
||||
if got := r.Header.Get("X-Date"); got != "20260708T010203Z" {
|
||||
t.Fatalf("unexpected x-date %q", got)
|
||||
}
|
||||
if got := r.Header.Get("Authorization"); !strings.Contains(got, "HMAC-SHA256 Credential=ak/20260708/cn-north-1/cv/request") {
|
||||
t.Fatalf("unexpected auth header %q", got)
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
|
||||
t.Fatalf("decode request: %v", err)
|
||||
}
|
||||
return &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Header: http.Header{"Content-Type": []string{"application/json"}},
|
||||
Body: io.NopCloser(bytes.NewBufferString(
|
||||
`{"ResponseMetadata":{"RequestId":"r"},"Result":{"LineTexts":["你好","世界"]}}`,
|
||||
)),
|
||||
}, nil
|
||||
})
|
||||
|
||||
client, err := NewClient(domain.OCRProviderVolcengine, domain.OCRProviderConfig{
|
||||
Endpoint: "https://visual.volcengineapi.com",
|
||||
AccessKeyID: "ak",
|
||||
AccessKeySecret: "sk",
|
||||
Region: "cn-north-1",
|
||||
Service: "cv",
|
||||
Action: "OCRNormal",
|
||||
Version: "2020-08-26",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("new client: %v", err)
|
||||
}
|
||||
client.httpClient.Transport = transport
|
||||
client.now = func() time.Time { return time.Date(2026, 7, 8, 1, 2, 3, 0, time.UTC) }
|
||||
|
||||
text, err := client.RecognizeText(context.Background(), []byte("png"))
|
||||
if err != nil {
|
||||
t.Fatalf("recognize text: %v", err)
|
||||
}
|
||||
if requestBody["image_base64"] != base64.StdEncoding.EncodeToString([]byte("png")) {
|
||||
t.Fatalf("expected base64 image body, got %#v", requestBody)
|
||||
}
|
||||
if text != "你好\n世界" {
|
||||
t.Fatalf("unexpected OCR text %q", text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseOCRTextSupportsWordsResult(t *testing.T) {
|
||||
text, err := parseOCRText([]byte(`{"data":{"words_result":[{"words":"foo"},{"words":"bar"}]}}`))
|
||||
if err != nil {
|
||||
t.Fatalf("parse ocr text: %v", err)
|
||||
}
|
||||
if text != "foo\nbar" {
|
||||
t.Fatalf("unexpected OCR text %q", text)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseOCRTextReturnsProviderError(t *testing.T) {
|
||||
_, err := parseOCRText([]byte(`{"ResponseMetadata":{"Error":{"Code":"BadRequest","Message":"bad image"}}}`))
|
||||
if err == nil || !strings.Contains(err.Error(), "bad image") {
|
||||
t.Fatalf("expected provider error, got %v", err)
|
||||
}
|
||||
}
|
||||
@@ -101,6 +101,20 @@ func (p *S3Provider) BuildPublicURL(key string) string {
|
||||
return endpoint + "/" + p.cfg.Bucket + "/" + key
|
||||
}
|
||||
|
||||
// Delete removes a previously uploaded object by key.
|
||||
//
|
||||
// The summary pipeline uses this to clean up the temporary screenshot it had
|
||||
// to upload only so a remote multimodal model could fetch it via public URL.
|
||||
func (p *S3Provider) Delete(ctx context.Context, key string) error {
|
||||
if _, err := p.client.DeleteObject(ctx, &s3.DeleteObjectInput{
|
||||
Bucket: awsv2.String(p.cfg.Bucket),
|
||||
Key: awsv2.String(key),
|
||||
}); err != nil {
|
||||
return fmt.Errorf("s3 delete object: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// TestConnection performs a small put + delete to verify credentials and
|
||||
// bucket reachability. Used by the "Test connection" button in settings.
|
||||
func (p *S3Provider) TestConnection(ctx context.Context) error {
|
||||
|
||||
@@ -385,7 +385,14 @@ func shellQuote(s string) string {
|
||||
}
|
||||
|
||||
// buildAuthMethods chooses authentication methods given the supplied
|
||||
// configuration. See Dial's docstring for the priority order.
|
||||
// configuration.
|
||||
//
|
||||
// The method set is gated by cfg.AuthMethod:
|
||||
// - SSHAuthPassword → password only.
|
||||
// - SSHAuthKey → ssh-agent + ~/.ssh/id_* key files only.
|
||||
// - "" / SSHAuthBuiltin (legacy) → password (if set) + agent + key files.
|
||||
//
|
||||
// (Kerberos never reaches here; it uses the system ssh binary instead.)
|
||||
//
|
||||
// Returns a human-readable summary alongside the method slice so the
|
||||
// caller can include "password+agent+ed25519" (and similar) in its dial
|
||||
@@ -393,47 +400,58 @@ func shellQuote(s string) string {
|
||||
func buildAuthMethods(cfg domain.SSHConfig) ([]ssh.AuthMethod, string, error) {
|
||||
var methods []ssh.AuthMethod
|
||||
var sources []string
|
||||
if cfg.Password != "" {
|
||||
|
||||
// Decide which families are allowed for the selected method. An empty /
|
||||
// "builtin" value preserves the original combined behaviour so configs
|
||||
// written before the split keep working.
|
||||
allowPassword := cfg.AuthMethod == domain.SSHAuthPassword ||
|
||||
cfg.AuthMethod == domain.SSHAuthBuiltin || cfg.AuthMethod == ""
|
||||
allowKey := cfg.AuthMethod == domain.SSHAuthKey ||
|
||||
cfg.AuthMethod == domain.SSHAuthBuiltin || cfg.AuthMethod == ""
|
||||
|
||||
if allowPassword && cfg.Password != "" {
|
||||
methods = append(methods, ssh.Password(cfg.Password))
|
||||
sources = append(sources, "password")
|
||||
}
|
||||
if sock := os.Getenv("SSH_AUTH_SOCK"); sock != "" {
|
||||
if conn, err := net.Dial("unix", sock); err == nil {
|
||||
// 关键: 仅在 agent 真正持有 key 时才把它加入 auth methods.
|
||||
//
|
||||
// macOS 的 launchd ssh-agent 即便没有任何 identity 也会响应,
|
||||
// 此时若仍注册 PublicKeysCallback, x/crypto 会把它当作一次空的
|
||||
// publickey 尝试. 配合服务器的 MaxAuthTries 计数, 这次"空尝试"
|
||||
// 会挤占后续基于磁盘私钥的认证机会, 最终导致
|
||||
// "[none publickey] no supported methods remain" —— 即便磁盘上
|
||||
// 的 key 本身完全可用. 因此空 agent 必须跳过.
|
||||
ag := agent.NewClient(conn)
|
||||
if keys, lerr := ag.List(); lerr == nil && len(keys) > 0 {
|
||||
methods = append(methods, ssh.PublicKeysCallback(ag.Signers))
|
||||
sources = append(sources, fmt.Sprintf("agent(%d)", len(keys)))
|
||||
if allowKey {
|
||||
if sock := os.Getenv("SSH_AUTH_SOCK"); sock != "" {
|
||||
if conn, err := net.Dial("unix", sock); err == nil {
|
||||
// 关键: 仅在 agent 真正持有 key 时才把它加入 auth methods.
|
||||
//
|
||||
// macOS 的 launchd ssh-agent 即便没有任何 identity 也会响应,
|
||||
// 此时若仍注册 PublicKeysCallback, x/crypto 会把它当作一次空的
|
||||
// publickey 尝试. 配合服务器的 MaxAuthTries 计数, 这次"空尝试"
|
||||
// 会挤占后续基于磁盘私钥的认证机会, 最终导致
|
||||
// "[none publickey] no supported methods remain" —— 即便磁盘上
|
||||
// 的 key 本身完全可用. 因此空 agent 必须跳过.
|
||||
ag := agent.NewClient(conn)
|
||||
if keys, lerr := ag.List(); lerr == nil && len(keys) > 0 {
|
||||
methods = append(methods, ssh.PublicKeysCallback(ag.Signers))
|
||||
sources = append(sources, fmt.Sprintf("agent(%d)", len(keys)))
|
||||
} else {
|
||||
sshLog().Debug("ssh-agent has no identities; skipping",
|
||||
"sock", sock, "list_err", lerr)
|
||||
}
|
||||
} else {
|
||||
sshLog().Debug("ssh-agent has no identities; skipping",
|
||||
"sock", sock, "list_err", lerr)
|
||||
sshLog().Debug("ssh-agent dial failed", "sock", sock, "err", err)
|
||||
}
|
||||
}
|
||||
home, err := os.UserHomeDir()
|
||||
if err == nil {
|
||||
// Probe the common default keys; any unreadable / missing file is
|
||||
// silently skipped so the user never sees noise about keys they did
|
||||
// not set up.
|
||||
for _, name := range []string{"id_ed25519", "id_rsa", "id_ecdsa"} {
|
||||
signer, err := loadPrivateKey(path.Join(home, ".ssh", name))
|
||||
if err == nil && signer != nil {
|
||||
methods = append(methods, ssh.PublicKeys(signer))
|
||||
sources = append(sources, name)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sshLog().Debug("ssh-agent dial failed", "sock", sock, "err", err)
|
||||
sshLog().Debug("home dir unavailable for ssh keys", "err", err)
|
||||
}
|
||||
}
|
||||
home, err := os.UserHomeDir()
|
||||
if err == nil {
|
||||
// Probe the common default keys; any unreadable / missing file is
|
||||
// silently skipped so the user never sees noise about keys they did
|
||||
// not set up.
|
||||
for _, name := range []string{"id_ed25519", "id_rsa", "id_ecdsa"} {
|
||||
signer, err := loadPrivateKey(path.Join(home, ".ssh", name))
|
||||
if err == nil && signer != nil {
|
||||
methods = append(methods, ssh.PublicKeys(signer))
|
||||
sources = append(sources, name)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sshLog().Debug("home dir unavailable for ssh keys", "err", err)
|
||||
}
|
||||
if len(sources) == 0 {
|
||||
return methods, "none", nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
// kerberos_uploader.go — an SSHUploader implementation that delegates to
|
||||
// the system /usr/bin/ssh + /usr/bin/scp binaries so an existing Kerberos
|
||||
// (GSSAPI) credential cache populated by `kinit` is reused transparently.
|
||||
//
|
||||
// 设计理由 (为什么不用 golang.org/x/crypto/ssh 做 Kerberos):
|
||||
// - macOS 的 Kerberos 票据默认存放在 API: 类型的 credential cache 中,
|
||||
// 由系统 GSSD (Heimdal) 守护进程托管. Go 生态的 gokrb5 只能读取
|
||||
// FILE: 类型 ccache 与 keytab, 无法访问 API: ccache, 因此在 macOS 上
|
||||
// 用纯 Go 实现 GSSAPI 认证基本不可行.
|
||||
// - 系统自带的 /usr/bin/ssh 原生集成 Heimdal GSSAPI, 用户 `kinit` 之后
|
||||
// 的票据可被直接复用. 把上传委托给系统 ssh/scp 是最稳妥的方案, 也与
|
||||
// 用户"命令行能免密登录即可"的预期完全一致.
|
||||
// - 仅在 AuthMethod == kerberos 时启用此实现; builtin 路径不受影响.
|
||||
package ssh
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/mmmy/snapgo/internal/domain"
|
||||
)
|
||||
|
||||
// systemSSHPath / systemSCPPath are the absolute paths to the macOS system
|
||||
// binaries. We use absolute paths rather than relying on $PATH so a hijacked
|
||||
// PATH cannot redirect us to an arbitrary binary, and because GUI apps on
|
||||
// macOS often launch with a minimal PATH that omits /usr/bin entirely.
|
||||
const (
|
||||
systemSSHPath = "/usr/bin/ssh"
|
||||
systemSCPPath = "/usr/bin/scp"
|
||||
)
|
||||
|
||||
// KerberosUploader satisfies application.SSHUploader by shelling out to the
|
||||
// system scp binary with GSSAPI authentication enabled.
|
||||
type KerberosUploader struct {
|
||||
cfg domain.SSHConfig
|
||||
}
|
||||
|
||||
// NewKerberosUploader returns an uploader that delegates to system scp.
|
||||
func NewKerberosUploader(cfg domain.SSHConfig) *KerberosUploader {
|
||||
return &KerberosUploader{cfg: cfg}
|
||||
}
|
||||
|
||||
// Upload writes data to remoteRelPath (relative to the remote $HOME) by
|
||||
// staging it in a local temp file and invoking system scp once.
|
||||
//
|
||||
// We stage to a temp file because scp transfers files, not stdin; piping a
|
||||
// stream would require the more fragile `scp -t` sink protocol that we only
|
||||
// use for the in-process client. A temp file is simpler and robust.
|
||||
func (u *KerberosUploader) Upload(ctx context.Context, remoteRelPath string, data []byte, mode os.FileMode) error {
|
||||
start := time.Now()
|
||||
cleaned := normaliseRemotePath(remoteRelPath)
|
||||
if cleaned == "" {
|
||||
return fmt.Errorf("ssh(kerberos): remote path is empty")
|
||||
}
|
||||
sshLog().Info("kerberos uploader start",
|
||||
"host", u.cfg.Host, "user", u.cfg.User, "port", u.cfg.Port,
|
||||
"remote_path", cleaned, "size", len(data))
|
||||
|
||||
// 1. Ensure the remote directory tree exists. scp itself will not create
|
||||
// intermediate directories, so we run a remote `mkdir -p` first.
|
||||
dir, _ := path.Split(cleaned)
|
||||
dir = strings.Trim(dir, "/")
|
||||
if dir != "" {
|
||||
if err := u.runRemoteMkdir(ctx, dir); err != nil {
|
||||
sshLog().Error("kerberos uploader mkdir failed",
|
||||
"dir", dir, "elapsed", time.Since(start), "err", err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Stage the payload to a local temp file for scp to read.
|
||||
tmp, err := os.CreateTemp("", "snapgo-scp-*.png")
|
||||
if err != nil {
|
||||
return fmt.Errorf("ssh(kerberos): create temp: %w", err)
|
||||
}
|
||||
tmpPath := tmp.Name()
|
||||
defer os.Remove(tmpPath)
|
||||
if _, err := tmp.Write(data); err != nil {
|
||||
_ = tmp.Close()
|
||||
return fmt.Errorf("ssh(kerberos): write temp: %w", err)
|
||||
}
|
||||
if err := tmp.Close(); err != nil {
|
||||
return fmt.Errorf("ssh(kerberos): close temp: %w", err)
|
||||
}
|
||||
if err := os.Chmod(tmpPath, mode.Perm()); err != nil {
|
||||
sshLog().Debug("kerberos uploader chmod temp failed", "err", err)
|
||||
}
|
||||
|
||||
// 3. scp the temp file to "user@host:cleaned" (cleaned is relative to
|
||||
// $HOME, which scp interprets correctly for a remote login shell).
|
||||
remoteTarget := fmt.Sprintf("%s@%s:%s", u.cfg.User, u.cfg.Host, cleaned)
|
||||
args := append(u.commonSCPArgs(), tmpPath, remoteTarget)
|
||||
if err := u.runCommand(ctx, systemSCPPath, args); err != nil {
|
||||
sshLog().Error("kerberos uploader scp failed",
|
||||
"remote_path", cleaned, "elapsed", time.Since(start), "err", err)
|
||||
return err
|
||||
}
|
||||
sshLog().Info("kerberos uploader done",
|
||||
"remote_path", cleaned, "size", len(data), "total_elapsed", time.Since(start))
|
||||
return nil
|
||||
}
|
||||
|
||||
// runRemoteMkdir runs `mkdir -p ~/<dir>` on the remote host via system ssh.
|
||||
func (u *KerberosUploader) runRemoteMkdir(ctx context.Context, dir string) error {
|
||||
remote := fmt.Sprintf("%s@%s", u.cfg.User, u.cfg.Host)
|
||||
// Quote the directory so spaces / metacharacters cannot break the shell
|
||||
// command. dir is already normalised (no leading ~ or /).
|
||||
cmd := "mkdir -p " + shellQuote("./"+dir)
|
||||
args := append(u.commonSSHArgs(), remote, cmd)
|
||||
return u.runCommand(ctx, systemSSHPath, args)
|
||||
}
|
||||
|
||||
// commonSSHArgs builds the shared option set that enables GSSAPI auth and
|
||||
// disables interactive prompts (we want a hard failure, never a hang waiting
|
||||
// for a password the GUI cannot answer).
|
||||
func (u *KerberosUploader) commonSSHArgs() []string {
|
||||
port := u.cfg.Port
|
||||
if port <= 0 {
|
||||
port = 22
|
||||
}
|
||||
timeout := u.cfg.ConnectTimeoutSecs
|
||||
if timeout <= 0 {
|
||||
timeout = 10
|
||||
}
|
||||
args := []string{
|
||||
"-p", strconv.Itoa(port),
|
||||
"-o", "GSSAPIAuthentication=yes",
|
||||
"-o", "GSSAPIDelegateCredentials=no",
|
||||
"-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex",
|
||||
"-o", "PubkeyAuthentication=no",
|
||||
"-o", "PasswordAuthentication=no",
|
||||
"-o", "KbdInteractiveAuthentication=no",
|
||||
"-o", "BatchMode=yes",
|
||||
"-o", "ConnectTimeout=" + strconv.Itoa(timeout),
|
||||
}
|
||||
args = append(args, u.hostKeyArgs()...)
|
||||
return args
|
||||
}
|
||||
|
||||
// commonSCPArgs mirrors commonSSHArgs but uses scp's uppercase -P port flag.
|
||||
func (u *KerberosUploader) commonSCPArgs() []string {
|
||||
port := u.cfg.Port
|
||||
if port <= 0 {
|
||||
port = 22
|
||||
}
|
||||
timeout := u.cfg.ConnectTimeoutSecs
|
||||
if timeout <= 0 {
|
||||
timeout = 10
|
||||
}
|
||||
args := []string{
|
||||
"-P", strconv.Itoa(port),
|
||||
"-o", "GSSAPIAuthentication=yes",
|
||||
"-o", "GSSAPIDelegateCredentials=no",
|
||||
"-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex",
|
||||
"-o", "PubkeyAuthentication=no",
|
||||
"-o", "PasswordAuthentication=no",
|
||||
"-o", "KbdInteractiveAuthentication=no",
|
||||
"-o", "BatchMode=yes",
|
||||
"-o", "ConnectTimeout=" + strconv.Itoa(timeout),
|
||||
}
|
||||
args = append(args, u.hostKeyArgs()...)
|
||||
return args
|
||||
}
|
||||
|
||||
// hostKeyArgs maps StrictHostKey onto OpenSSH's StrictHostKeyChecking option,
|
||||
// keeping behaviour consistent with the in-process client.
|
||||
func (u *KerberosUploader) hostKeyArgs() []string {
|
||||
if u.cfg.StrictHostKey {
|
||||
if u.cfg.KnownHostsPath != "" {
|
||||
return []string{
|
||||
"-o", "StrictHostKeyChecking=yes",
|
||||
"-o", "UserKnownHostsFile=" + u.cfg.KnownHostsPath,
|
||||
}
|
||||
}
|
||||
return []string{"-o", "StrictHostKeyChecking=yes"}
|
||||
}
|
||||
// Non-strict: accept new keys automatically but still record them. This
|
||||
// mirrors the in-process InsecureIgnoreHostKey trade-off the UI warns of.
|
||||
return []string{"-o", "StrictHostKeyChecking=accept-new"}
|
||||
}
|
||||
|
||||
// runCommand executes the given binary, capturing combined stderr so a
|
||||
// failure surfaces the remote/OpenSSH diagnostic instead of a bare exit code.
|
||||
func (u *KerberosUploader) runCommand(ctx context.Context, bin string, args []string) error {
|
||||
cmd := exec.CommandContext(ctx, bin, args...)
|
||||
var stderr bytes.Buffer
|
||||
cmd.Stderr = &stderr
|
||||
sshLog().Debug("kerberos exec", "bin", bin, "args", strings.Join(args, " "))
|
||||
if err := cmd.Run(); err != nil {
|
||||
msg := strings.TrimSpace(stderr.String())
|
||||
if msg == "" {
|
||||
msg = err.Error()
|
||||
}
|
||||
return fmt.Errorf("%s failed: %s", path.Base(bin), msg)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// TestKerberosConnection probes the remote host with system ssh, surfacing a
|
||||
// clear hint when no valid ticket is present.
|
||||
func TestKerberosConnection(ctx context.Context, cfg domain.SSHConfig) error {
|
||||
sshLog().Info("kerberos test connection start",
|
||||
"host", cfg.Host, "user", cfg.User, "port", cfg.Port)
|
||||
u := &KerberosUploader{cfg: cfg}
|
||||
remote := fmt.Sprintf("%s@%s", cfg.User, cfg.Host)
|
||||
args := append(u.commonSSHArgs(), remote, "true")
|
||||
if err := u.runCommand(ctx, systemSSHPath, args); err != nil {
|
||||
// Detect the most common cause: no/expired Kerberos ticket.
|
||||
if !hasKerberosTicket(ctx) {
|
||||
return fmt.Errorf("no valid Kerberos ticket found — run `kinit %s@BYTEDANCE.COM` first (%w)", cfg.User, err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
sshLog().Info("kerberos test connection ok")
|
||||
return nil
|
||||
}
|
||||
|
||||
// hasKerberosTicket reports whether `klist -s` indicates a valid ticket.
|
||||
// `klist -s` exits 0 when a valid TGT exists, non-zero otherwise.
|
||||
func hasKerberosTicket(ctx context.Context) bool {
|
||||
cmd := exec.CommandContext(ctx, "/usr/bin/klist", "-s")
|
||||
return cmd.Run() == nil
|
||||
}
|
||||
@@ -33,10 +33,10 @@ func Start(cbs Callbacks) (start, stop func()) {
|
||||
systray.SetTemplateIcon(templateIconBytes, regularIconBytes)
|
||||
systray.SetTooltip("SnapGo")
|
||||
|
||||
mCapture := systray.AddMenuItem("Capture screenshot", "Take a region screenshot")
|
||||
mSettings := systray.AddMenuItem("Settings…", "Open settings window")
|
||||
mCapture := systray.AddMenuItem("截图", "Take a region screenshot")
|
||||
mSettings := systray.AddMenuItem("设置", "Open settings window")
|
||||
systray.AddSeparator()
|
||||
mQuit := systray.AddMenuItem("Quit SnapGo", "Quit the application")
|
||||
mQuit := systray.AddMenuItem("退出", "Quit the application")
|
||||
|
||||
// Pump menu clicks on a dedicated goroutine. Channel sends from
|
||||
// systray are non-blocking, so a slow user callback does not back
|
||||
|
||||
@@ -36,8 +36,8 @@ func main() {
|
||||
|
||||
err := wails.Run(&options.App{
|
||||
Title: "SnapGo",
|
||||
Width: 1080,
|
||||
Height: 720,
|
||||
Width: 1000,
|
||||
Height: 820,
|
||||
MinWidth: 720,
|
||||
MinHeight: 520,
|
||||
AssetServer: &assetserver.Options{
|
||||
|
||||
@@ -74,6 +74,30 @@ func nativeOverlaySaveRemote(x, y, w, h C.int, annotationsJSON *C.char) {
|
||||
}()
|
||||
}
|
||||
|
||||
//export nativeOverlaySummarize
|
||||
func nativeOverlaySummarize(x, y, w, h C.int, annotationsJSON *C.char) {
|
||||
app := consumeNativeOverlayApp()
|
||||
if app == nil {
|
||||
return
|
||||
}
|
||||
result := nativeCaptureResult(x, y, w, h, annotationsJSON)
|
||||
go func() {
|
||||
_ = app.SummarizeNativeRegion(result)
|
||||
}()
|
||||
}
|
||||
|
||||
//export nativeOverlayOCR
|
||||
func nativeOverlayOCR(x, y, w, h C.int, annotationsJSON *C.char) {
|
||||
app := consumeNativeOverlayApp()
|
||||
if app == nil {
|
||||
return
|
||||
}
|
||||
result := nativeCaptureResult(x, y, w, h, annotationsJSON)
|
||||
go func() {
|
||||
_ = app.ExtractTextNativeRegion(result)
|
||||
}()
|
||||
}
|
||||
|
||||
//export nativeOverlayCancel
|
||||
func nativeOverlayCancel() {
|
||||
app := consumeNativeOverlayApp()
|
||||
|
||||
+664
-78
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,163 @@
|
||||
//go:build darwin
|
||||
|
||||
package main
|
||||
|
||||
/*
|
||||
#cgo CFLAGS: -x objective-c -fobjc-arc -fblocks
|
||||
#cgo LDFLAGS: -framework AppKit -framework QuartzCore
|
||||
#include <stdlib.h>
|
||||
#include <dispatch/dispatch.h>
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
|
||||
static NSPanel *operationPanel = nil;
|
||||
static NSTextField *operationTitleLabel = nil;
|
||||
static NSTextField *operationDetailLabel = nil;
|
||||
static NSTextField *operationIconLabel = nil;
|
||||
static NSProgressIndicator *operationSpinner = nil;
|
||||
|
||||
static NSString *statusString(const char *value) {
|
||||
if (value == NULL) {
|
||||
return @"";
|
||||
}
|
||||
NSString *text = [NSString stringWithUTF8String:value];
|
||||
return text ?: @"";
|
||||
}
|
||||
|
||||
static void ensureOperationPanel(void) {
|
||||
if (operationPanel != nil) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSRect frame = NSMakeRect(0, 0, 360, 118);
|
||||
operationPanel = [[NSPanel alloc]
|
||||
initWithContentRect:frame
|
||||
styleMask:NSWindowStyleMaskBorderless
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:NO];
|
||||
[operationPanel setOpaque:NO];
|
||||
[operationPanel setBackgroundColor:[NSColor clearColor]];
|
||||
[operationPanel setLevel:NSFloatingWindowLevel];
|
||||
[operationPanel setHidesOnDeactivate:NO];
|
||||
[operationPanel setCollectionBehavior:
|
||||
NSWindowCollectionBehaviorCanJoinAllSpaces |
|
||||
NSWindowCollectionBehaviorFullScreenAuxiliary |
|
||||
NSWindowCollectionBehaviorStationary];
|
||||
|
||||
NSView *root = [[NSView alloc] initWithFrame:frame];
|
||||
[root setWantsLayer:YES];
|
||||
[[root layer] setCornerRadius:14];
|
||||
[[root layer] setBackgroundColor:[[NSColor colorWithCalibratedWhite:0.08 alpha:0.92] CGColor]];
|
||||
[[root layer] setShadowColor:[[NSColor blackColor] CGColor]];
|
||||
[[root layer] setShadowOpacity:0.28];
|
||||
[[root layer] setShadowRadius:18];
|
||||
[[root layer] setShadowOffset:CGSizeMake(0, -8)];
|
||||
|
||||
operationSpinner = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(24, 42, 34, 34)];
|
||||
[operationSpinner setStyle:NSProgressIndicatorStyleSpinning];
|
||||
[operationSpinner setIndeterminate:YES];
|
||||
|
||||
operationIconLabel = [NSTextField labelWithString:@"OK"];
|
||||
[operationIconLabel setFrame:NSMakeRect(21, 43, 42, 30)];
|
||||
[operationIconLabel setAlignment:NSTextAlignmentCenter];
|
||||
[operationIconLabel setFont:[NSFont systemFontOfSize:17 weight:NSFontWeightSemibold]];
|
||||
[operationIconLabel setTextColor:[NSColor colorWithCalibratedRed:74.0/255.0 green:222.0/255.0 blue:128.0/255.0 alpha:1.0]];
|
||||
[operationIconLabel setHidden:YES];
|
||||
|
||||
operationTitleLabel = [NSTextField labelWithString:@""];
|
||||
[operationTitleLabel setFrame:NSMakeRect(76, 61, 260, 24)];
|
||||
[operationTitleLabel setFont:[NSFont systemFontOfSize:15 weight:NSFontWeightSemibold]];
|
||||
[operationTitleLabel setTextColor:[NSColor whiteColor]];
|
||||
|
||||
operationDetailLabel = [NSTextField labelWithString:@""];
|
||||
[operationDetailLabel setFrame:NSMakeRect(76, 34, 260, 22)];
|
||||
[operationDetailLabel setFont:[NSFont systemFontOfSize:12 weight:NSFontWeightRegular]];
|
||||
[operationDetailLabel setTextColor:[NSColor colorWithCalibratedWhite:0.82 alpha:1.0]];
|
||||
[operationDetailLabel setLineBreakMode:NSLineBreakByTruncatingTail];
|
||||
|
||||
[root addSubview:operationSpinner];
|
||||
[root addSubview:operationIconLabel];
|
||||
[root addSubview:operationTitleLabel];
|
||||
[root addSubview:operationDetailLabel];
|
||||
[operationPanel setContentView:root];
|
||||
}
|
||||
|
||||
static void snipShowOperationStatus(const char *titleC, const char *detailC, int state) {
|
||||
NSString *title = statusString(titleC);
|
||||
NSString *detail = statusString(detailC);
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
ensureOperationPanel();
|
||||
[operationTitleLabel setStringValue:title];
|
||||
[operationDetailLabel setStringValue:detail];
|
||||
|
||||
if (state == 0) {
|
||||
[operationIconLabel setHidden:YES];
|
||||
[operationSpinner setHidden:NO];
|
||||
[operationSpinner startAnimation:nil];
|
||||
} else {
|
||||
[operationSpinner stopAnimation:nil];
|
||||
[operationSpinner setHidden:YES];
|
||||
[operationIconLabel setHidden:NO];
|
||||
if (state == 2) {
|
||||
[operationIconLabel setStringValue:@"!"];
|
||||
[operationIconLabel setTextColor:[NSColor colorWithCalibratedRed:248.0/255.0 green:113.0/255.0 blue:113.0/255.0 alpha:1.0]];
|
||||
} else {
|
||||
[operationIconLabel setStringValue:@"OK"];
|
||||
[operationIconLabel setTextColor:[NSColor colorWithCalibratedRed:74.0/255.0 green:222.0/255.0 blue:128.0/255.0 alpha:1.0]];
|
||||
}
|
||||
}
|
||||
|
||||
NSScreen *screen = [NSScreen mainScreen];
|
||||
if (screen != nil) {
|
||||
NSRect visible = [screen visibleFrame];
|
||||
NSRect panelFrame = [operationPanel frame];
|
||||
panelFrame.origin.x = NSMidX(visible) - panelFrame.size.width / 2;
|
||||
panelFrame.origin.y = NSMaxY(visible) - panelFrame.size.height - 48;
|
||||
[operationPanel setFrame:panelFrame display:YES];
|
||||
}
|
||||
[operationPanel orderFrontRegardless];
|
||||
});
|
||||
}
|
||||
|
||||
static void snipHideOperationStatus(void) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (operationPanel != nil) {
|
||||
[operationSpinner stopAnimation:nil];
|
||||
[operationPanel orderOut:nil];
|
||||
}
|
||||
});
|
||||
}
|
||||
*/
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
const (
|
||||
operationStatusRunning = iota
|
||||
operationStatusSuccess
|
||||
operationStatusError
|
||||
)
|
||||
|
||||
var operationStatusSeq atomic.Uint64
|
||||
|
||||
func showOperationStatus(title, detail string, state int) {
|
||||
operationStatusSeq.Add(1)
|
||||
ctitle := C.CString(title)
|
||||
cdetail := C.CString(detail)
|
||||
defer C.free(unsafe.Pointer(ctitle))
|
||||
defer C.free(unsafe.Pointer(cdetail))
|
||||
C.snipShowOperationStatus(ctitle, cdetail, C.int(state))
|
||||
}
|
||||
|
||||
func hideOperationStatusAfter(delay time.Duration) {
|
||||
seq := operationStatusSeq.Load()
|
||||
time.AfterFunc(delay, func() {
|
||||
if operationStatusSeq.Load() == seq {
|
||||
C.snipHideOperationStatus()
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
//go:build !darwin
|
||||
|
||||
package main
|
||||
|
||||
import "time"
|
||||
|
||||
const (
|
||||
operationStatusRunning = iota
|
||||
operationStatusSuccess
|
||||
operationStatusError
|
||||
)
|
||||
|
||||
func showOperationStatus(_ string, _ string, _ int) {}
|
||||
|
||||
func hideOperationStatusAfter(_ time.Duration) {}
|
||||
@@ -43,6 +43,9 @@ sleep 0.4
|
||||
# --identity flag in v2.
|
||||
ARCH="${ARCH:-arm64}"
|
||||
echo "[dev-build.sh] building darwin/${ARCH}..."
|
||||
# Allow the -Wl,-no_warn_duplicate_libraries flag declared in the darwin cgo
|
||||
# files past Go's cgo LDFLAGS allowlist (see activation_policy_darwin.go).
|
||||
export CGO_LDFLAGS_ALLOW='-Wl,-no_warn_duplicate_libraries'
|
||||
wails build -platform "darwin/${ARCH}" -clean
|
||||
|
||||
# 5. Re-sign with the stable dev cert. We invoke sign.sh through env var
|
||||
|
||||
+3
-1
@@ -35,7 +35,9 @@ echo "================================================================"
|
||||
# ---- 1. Build ----
|
||||
echo ""
|
||||
echo "[release.sh] (1/4) wails build"
|
||||
( cd "${ROOT_DIR}" && wails build -platform "${WAILS_PLATFORM}" -clean )
|
||||
# Allow the -Wl,-no_warn_duplicate_libraries flag declared in the darwin cgo
|
||||
# files past Go's cgo LDFLAGS allowlist (see activation_policy_darwin.go).
|
||||
( cd "${ROOT_DIR}" && CGO_LDFLAGS_ALLOW='-Wl,-no_warn_duplicate_libraries' wails build -platform "${WAILS_PLATFORM}" -clean )
|
||||
|
||||
# ---- 2. Sign .app ----
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user