- 
- 
- 
- 
- 
- The formula is $E = mc^2$ here.
'; - renderMathFormulas(container); - - expect(container.innerHTML).toContain('katex-inline'); - expect(container.innerHTML).toContain('E = mc^2'); - }); - - it('should render display math formulas', () => { - const { renderMathFormulas } = useArticleRendering(); - - container.innerHTML = '$$\\int_{0}^{\\infty} e^{-x} dx$$
'; - renderMathFormulas(container); - - expect(container.innerHTML).toContain('katex-display'); - }); - - it('should not render math inside code blocks', () => { - const { renderMathFormulas } = useArticleRendering(); - - container.innerHTML = '$E = mc^2$This is just plain text.
'; - const originalHTML = container.innerHTML; - renderMathFormulas(container); - - // HTML should remain unchanged - expect(container.innerHTML).toBe(originalHTML); - }); - - it('should handle mixed content with both inline and display math', () => { - const { renderMathFormulas } = useArticleRendering(); - - container.innerHTML = 'Inline $a = b$ and display $$c = d$$
'; - renderMathFormulas(container); - - expect(container.innerHTML).toContain('katex-inline'); - expect(container.innerHTML).toContain('katex-display'); - }); - - it('should not crash on empty container', () => { - const { renderMathFormulas } = useArticleRendering(); - - container.innerHTML = ''; - expect(() => renderMathFormulas(container)).not.toThrow(); - }); - - it('should skip math in script tags', () => { - const { renderMathFormulas } = useArticleRendering(); - - container.innerHTML = 'Normal text
'; - const scriptContent = container.querySelector('script')?.textContent; - - renderMathFormulas(container); - - // Script content should remain unchanged - expect(container.querySelector('script')?.textContent).toBe(scriptContent); - }); - }); - - describe('enhanceRendering', () => { - it('should enhance rendering for the specified container', async () => { - const { enhanceRendering } = useArticleRendering(); - - container.innerHTML = 'The equation is $E = mc^2$.
'; - await enhanceRendering('.prose-content'); - - expect(container.innerHTML).toContain('katex'); - }); - - it('should handle non-existent container gracefully', async () => { - const { enhanceRendering } = useArticleRendering(); - - // Should not throw error - await expect(enhanceRendering('.non-existent')).resolves.not.toThrow(); - }); - }); -}); diff --git a/frontend/src/composables/article/useArticleRendering.ts b/frontend/src/composables/article/useArticleRendering.ts deleted file mode 100644 index 711ddb005..000000000 --- a/frontend/src/composables/article/useArticleRendering.ts +++ /dev/null @@ -1,344 +0,0 @@ -import { nextTick } from 'vue'; -import katex from 'katex'; -import hljs from 'highlight.js/lib/core'; - -// Import commonly used languages -import javascript from 'highlight.js/lib/languages/javascript'; -import typescript from 'highlight.js/lib/languages/typescript'; -import python from 'highlight.js/lib/languages/python'; -import java from 'highlight.js/lib/languages/java'; -import cpp from 'highlight.js/lib/languages/cpp'; -import c from 'highlight.js/lib/languages/c'; -import csharp from 'highlight.js/lib/languages/csharp'; -import go from 'highlight.js/lib/languages/go'; -import rust from 'highlight.js/lib/languages/rust'; -import ruby from 'highlight.js/lib/languages/ruby'; -import php from 'highlight.js/lib/languages/php'; -import swift from 'highlight.js/lib/languages/swift'; -import kotlin from 'highlight.js/lib/languages/kotlin'; -import scala from 'highlight.js/lib/languages/scala'; -import sql from 'highlight.js/lib/languages/sql'; -import bash from 'highlight.js/lib/languages/bash'; -import shell from 'highlight.js/lib/languages/shell'; -import powershell from 'highlight.js/lib/languages/powershell'; -import json from 'highlight.js/lib/languages/json'; -import xml from 'highlight.js/lib/languages/xml'; -import yaml from 'highlight.js/lib/languages/yaml'; -import markdown from 'highlight.js/lib/languages/markdown'; -import css from 'highlight.js/lib/languages/css'; -import scss from 'highlight.js/lib/languages/scss'; -import less from 'highlight.js/lib/languages/less'; -import dockerfile from 'highlight.js/lib/languages/dockerfile'; -import nginx from 'highlight.js/lib/languages/nginx'; -import ini from 'highlight.js/lib/languages/ini'; -import diff from 'highlight.js/lib/languages/diff'; -import plaintext from 'highlight.js/lib/languages/plaintext'; - -// Register languages -hljs.registerLanguage('javascript', javascript); -hljs.registerLanguage('js', javascript); -hljs.registerLanguage('typescript', typescript); -hljs.registerLanguage('ts', typescript); -hljs.registerLanguage('python', python); -hljs.registerLanguage('py', python); -hljs.registerLanguage('java', java); -hljs.registerLanguage('cpp', cpp); -hljs.registerLanguage('c', c); -hljs.registerLanguage('csharp', csharp); -hljs.registerLanguage('cs', csharp); -hljs.registerLanguage('go', go); -hljs.registerLanguage('rust', rust); -hljs.registerLanguage('rs', rust); -hljs.registerLanguage('ruby', ruby); -hljs.registerLanguage('rb', ruby); -hljs.registerLanguage('php', php); -hljs.registerLanguage('swift', swift); -hljs.registerLanguage('kotlin', kotlin); -hljs.registerLanguage('kt', kotlin); -hljs.registerLanguage('scala', scala); -hljs.registerLanguage('sql', sql); -hljs.registerLanguage('bash', bash); -hljs.registerLanguage('sh', bash); -hljs.registerLanguage('shell', shell); -hljs.registerLanguage('powershell', powershell); -hljs.registerLanguage('ps1', powershell); -hljs.registerLanguage('json', json); -hljs.registerLanguage('xml', xml); -hljs.registerLanguage('html', xml); -hljs.registerLanguage('yaml', yaml); -hljs.registerLanguage('yml', yaml); -hljs.registerLanguage('markdown', markdown); -hljs.registerLanguage('md', markdown); -hljs.registerLanguage('css', css); -hljs.registerLanguage('scss', scss); -hljs.registerLanguage('less', less); -hljs.registerLanguage('dockerfile', dockerfile); -hljs.registerLanguage('docker', dockerfile); -hljs.registerLanguage('nginx', nginx); -hljs.registerLanguage('ini', ini); -hljs.registerLanguage('diff', diff); -hljs.registerLanguage('plaintext', plaintext); -hljs.registerLanguage('text', plaintext); - -/** - * Composable for enhanced article content rendering - * Handles math formulas, code syntax highlighting, and other advanced rendering - */ -export function useArticleRendering() { - /** - * Render math formulas in the content - * Supports multiple formats: - * - Display math: $$...$$ or \[...\] - * - Inline math: $...$ or \(...\) - */ - function renderMathFormulas(container: HTMLElement) { - if (!container) return; - - try { - // First, handle pre-existing math elements with class 'math' or 'MathJax' - const existingMathElements = container.querySelectorAll( - '.math, .MathJax, [data-math], script[type*="math"]' - ); - existingMathElements.forEach((el) => { - if (el.classList.contains('katex') || el.querySelector('.katex')) return; - - const mathContent = el.getAttribute('data-math') || el.textContent || ''; - if (!mathContent.trim()) return; - - try { - const isDisplay = - el.classList.contains('math-display') || - el.classList.contains('display') || - el.tagName === 'DIV'; - const mathElement = document.createElement(isDisplay ? 'div' : 'span'); - mathElement.className = isDisplay ? 'katex-display' : 'katex-inline'; - katex.render(mathContent, mathElement, { - displayMode: isDisplay, - throwOnError: false, - strict: false, - }); - el.replaceWith(mathElement); - } catch (e) { - console.error('Error rendering existing math element:', e); - } - }); - - // Find all text nodes that might contain math - const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT, { - acceptNode: (node) => { - // Skip if already inside a math element - const parent = node.parentElement; - if ( - parent?.classList.contains('katex') || - parent?.classList.contains('katex-display') || - parent?.classList.contains('katex-inline') || - parent?.closest('.katex') || - parent?.closest('.katex-display') || - parent?.tagName === 'CODE' || - parent?.tagName === 'PRE' || - parent?.tagName === 'SCRIPT' || - parent?.tagName === 'STYLE' - ) { - return NodeFilter.FILTER_REJECT; - } - // Accept nodes that contain math delimiters - const text = node.textContent || ''; - if (text.includes('$') || text.includes('\\(') || text.includes('\\[')) { - return NodeFilter.FILTER_ACCEPT; - } - return NodeFilter.FILTER_REJECT; - }, - }); - - const nodesToProcess: Text[] = []; - let currentNode: Node | null; - while ((currentNode = walker.nextNode())) { - nodesToProcess.push(currentNode as Text); - } - - // Process each text node - for (const node of nodesToProcess) { - const text = node.textContent || ''; - if (!text) continue; - - const fragments: (string | HTMLElement)[] = []; - let lastIndex = 0; - - // Match all math patterns - // Order matters: longer/more specific patterns first - const mathPatterns = [ - // Display math: $$...$$ (must not be empty) - { regex: /\$\$([^$]+)\$\$/g, isDisplay: true }, - // Display math: \[...\] - { regex: /\\\[([^\]]+)\\\]/g, isDisplay: true }, - // Inline math: \(...\) - { regex: /\\\(([^)]+)\\\)/g, isDisplay: false }, - // Inline math: $...$ (single line, not empty, not starting/ending with space) - { regex: /\$([^\s$][^$\n]*[^\s$]|\S)\$/g, isDisplay: false }, - ]; - - // Collect all matches with their positions - const allMatches: Array<{ - start: number; - end: number; - math: string; - isDisplay: boolean; - }> = []; - - for (const { regex, isDisplay } of mathPatterns) { - let match; - regex.lastIndex = 0; // Reset regex state - while ((match = regex.exec(text)) !== null) { - // Check if this position is already covered by another match - const isOverlapping = allMatches.some( - (m) => - (match!.index >= m.start && match!.index < m.end) || - (match!.index + match![0].length > m.start && - match!.index + match![0].length <= m.end) - ); - if (!isOverlapping) { - allMatches.push({ - start: match.index, - end: match.index + match[0].length, - math: match[1], - isDisplay, - }); - } - } - } - - // Sort matches by position - allMatches.sort((a, b) => a.start - b.start); - - // Build fragments - for (const { start, end, math, isDisplay } of allMatches) { - // Add text before match - if (start > lastIndex) { - fragments.push(text.substring(lastIndex, start)); - } - - // Render math - try { - const mathElement = document.createElement(isDisplay ? 'div' : 'span'); - mathElement.className = isDisplay ? 'katex-display' : 'katex-inline'; - katex.render(math.trim(), mathElement, { - displayMode: isDisplay, - throwOnError: false, - strict: false, - }); - fragments.push(mathElement); - } catch (e) { - console.error('Error rendering math:', e, 'Content:', math); - // On error, keep the original text - fragments.push(text.substring(start, end)); - } - - lastIndex = end; - } - - // Add remaining text - if (lastIndex < text.length) { - fragments.push(text.substring(lastIndex)); - } - - // Only replace if we found any math - if (fragments.length > 0 && allMatches.length > 0) { - const parent = node.parentNode; - if (parent) { - // Insert fragments - for (const fragment of fragments) { - if (typeof fragment === 'string') { - parent.insertBefore(document.createTextNode(fragment), node); - } else { - parent.insertBefore(fragment, node); - } - } - // Remove original text node - parent.removeChild(node); - } - } - } - } catch (e) { - console.error('Error processing math formulas:', e); - } - } - - /** - * Apply syntax highlighting to code blocks - */ - function highlightCodeBlocks(container: HTMLElement) { - if (!container) return; - - try { - // Find all code blocks within pre elements - const codeBlocks = container.querySelectorAll('pre code'); - - codeBlocks.forEach((block) => { - // Skip if already highlighted - if (block.classList.contains('hljs')) return; - - const codeElement = block as HTMLElement; - - // Try to detect language from class - let language = ''; - const classList = Array.from(codeElement.classList); - for (const cls of classList) { - if (cls.startsWith('language-') || cls.startsWith('lang-')) { - language = cls.replace(/^(language-|lang-)/, ''); - break; - } - } - - // Highlight the code - if (language && hljs.getLanguage(language)) { - // Use specific language - const result = hljs.highlight(codeElement.textContent || '', { language }); - codeElement.innerHTML = result.value; - codeElement.classList.add('hljs'); - } else { - // Auto-detect language - const result = hljs.highlightAuto(codeElement.textContent || ''); - codeElement.innerHTML = result.value; - codeElement.classList.add('hljs'); - if (result.language) { - codeElement.dataset.detectedLanguage = result.language; - } - } - }); - - // Also handle standalone pre elements without code tags - const preElements = container.querySelectorAll('pre:not(:has(code))'); - preElements.forEach((pre) => { - if (pre.classList.contains('hljs')) return; - - const preElement = pre as HTMLElement; - const result = hljs.highlightAuto(preElement.textContent || ''); - preElement.innerHTML = result.value; - preElement.classList.add('hljs'); - }); - } catch (e) { - console.error('Error highlighting code blocks:', e); - } - } - - /** - * Apply all rendering enhancements to the container - */ - async function enhanceRendering(containerSelector: string = '.prose-content') { - await nextTick(); - const container = document.querySelector(containerSelector) as HTMLElement; - if (!container) return; - - // Render math formulas - renderMathFormulas(container); - - // Apply syntax highlighting to code blocks - highlightCodeBlocks(container); - } - - return { - renderMathFormulas, - highlightCodeBlocks, - enhanceRendering, - }; -} diff --git a/frontend/src/composables/article/useArticleSummary.ts b/frontend/src/composables/article/useArticleSummary.ts deleted file mode 100644 index 15e68bf76..000000000 --- a/frontend/src/composables/article/useArticleSummary.ts +++ /dev/null @@ -1,227 +0,0 @@ -import { ref, type Ref } from 'vue'; -import { useI18n } from 'vue-i18n'; -import type { Article } from '@/types/models'; - -interface SummarySettings { - enabled: boolean; - length: string; - provider: string; - triggerMode: string; -} - -interface SummaryResult { - summary: string; - html?: string; - sentence_count: number; - is_too_short: boolean; - limit_reached?: boolean; - used_fallback?: boolean; - thinking?: string; - error?: string; -} - -export function useArticleSummary() { - const { t } = useI18n(); - const summarySettings = refUse the console.log function
console.log');
- expect(hyperlinks).toHaveLength(0);
- });
-
- it('should extract text with multiple inline elements', () => {
- container.innerHTML = 'The x equals y
An image 
here
Simple text without special elements
'; - const p = container.querySelector('p') as HTMLElement; - - const { text, preservedElements, hyperlinks } = extractTextWithPlaceholders(p); - - expect(text).toBe('Simple text without special elements'); - expect(preservedElements).toHaveLength(0); - expect(hyperlinks).toHaveLength(0); - }); - - it('should extract text with kbd elements', () => { - container.innerHTML = 'Press Ctrl+C to copy
'; - const p = container.querySelector('p') as HTMLElement; - - const { preservedElements } = extractTextWithPlaceholders(p); - - expect(preservedElements).toHaveLength(2); - expect(preservedElements[0].outerHTML).toBe('Ctrl'); - expect(preservedElements[1].outerHTML).toBe('C'); - }); - - it('should extract text with sub and sup elements', () => { - container.innerHTML = 'H2O and E=mc2
'; - const p = container.querySelector('p') as HTMLElement; - - const { preservedElements } = extractTextWithPlaceholders(p); - - expect(preservedElements).toHaveLength(2); - expect(preservedElements[0].outerHTML).toBe('2'); - expect(preservedElements[1].outerHTML).toBe('2'); - }); - - it('should handle hyperlinks with markers for translation', () => { - container.innerHTML = 'Visit this link for more
'; - const p = container.querySelector('p') as HTMLElement; - - const { text, preservedElements, hyperlinks } = extractTextWithPlaceholders(p); - - // Hyperlinks should be marked with special markers - expect(text).toContain('âŠ0this link0âŦ'); - expect(preservedElements).toHaveLength(0); // Links are not in preserved elements - expect(hyperlinks).toHaveLength(1); - expect(hyperlinks[0].href).toBe('https://example.com'); - }); - - it('should handle multiple hyperlinks', () => { - container.innerHTML = - ''; - const p = container.querySelector('p') as HTMLElement; - - const { text, hyperlinks } = extractTextWithPlaceholders(p); - - expect(text).toContain('âŠ0link10âŦ'); - expect(text).toContain('âŠ1link21âŦ'); - expect(hyperlinks).toHaveLength(2); - expect(hyperlinks[0].href).toBe('https://example.com'); - expect(hyperlinks[1].href).toBe('https://test.com'); - }); - }); - - describe('restorePreservedElements', () => { - it('should restore code elements in translated text', () => { - const translatedText = 'Use the âĶ0⧠function'; - const preservedElements = [ - { - placeholder: 'âĶ0â§', - outerHTML: 'console.log',
- element: document.createElement('code'),
- },
- ];
-
- const result = restorePreservedElements(translatedText, preservedElements);
-
- expect(result).toContain('console.log');
- expect(result).not.toContain('âĶ0â§');
- });
-
- it('should restore multiple preserved elements', () => {
- const translatedText = 'The âĶ0⧠equals âĶ1â§';
- const preservedElements = [
- {
- placeholder: 'âĶ0â§',
- outerHTML: 'x',
- element: document.createElement('code'),
- },
- {
- placeholder: 'âĶ1â§',
- outerHTML: 'y',
- element: document.createElement('code'),
- },
- ];
-
- const result = restorePreservedElements(translatedText, preservedElements);
-
- expect(result).toContain('x');
- expect(result).toContain('y');
- });
-
- it('should escape HTML in translated text but preserve elements', () => {
- const translatedText = 'Use `); err != nil {
+ t.Fatalf("set content: %v", err)
+ }
+
+ results, err := db.SearchArticlesWithTerms(AISearchQuery{
+ Original: "AI safety",
+ Required: []string{"AI", "safety"},
+ Optional: []string{"engineering", "testing"},
+ Patterns: []string{"AI%safety"},
+ Limit: 10,
+ })
+ if err != nil {
+ t.Fatalf("search: %v", err)
+ }
+ if len(results) != 3 {
+ t.Fatalf("expected 3 visible results, got %d: %+v", len(results), results)
+ }
+ if results[0].Article.ID != titleID {
+ t.Fatalf("expected title phrase match first, got article %d", results[0].Article.ID)
+ }
+ seen := map[int64]AISearchResult{}
+ for _, searchResult := range results {
+ seen[searchResult.Article.ID] = searchResult
+ if searchResult.Article.ID == hiddenID {
+ t.Fatal("hidden article must not be returned")
+ }
+ if searchResult.RelevanceScore <= 0 || len(searchResult.MatchedTerms) == 0 || len(searchResult.MatchedFields) == 0 {
+ t.Fatalf("missing relevance explanation: %+v", searchResult)
+ }
+ }
+ if _, ok := seen[summaryID]; !ok {
+ t.Fatal("expected original RSS summary match")
+ }
+ contentResult, ok := seen[contentID]
+ if !ok {
+ t.Fatal("expected article content match")
+ }
+ if strings.Contains(contentResult.Excerpt, "<") || strings.Contains(contentResult.Excerpt, "secret()") {
+ t.Fatalf("excerpt was not sanitized: %q", contentResult.Excerpt)
+ }
+
+ injectionResults, err := db.SearchArticlesWithTerms(AISearchQuery{
+ Original: `' OR 1=1 --`,
+ Required: []string{`%' OR 1=1 --`},
+ Limit: 10,
+ })
+ if err != nil {
+ t.Fatalf("parameterized search rejected input unexpectedly: %v", err)
+ }
+ if len(injectionResults) != 0 {
+ t.Fatalf("SQL-like input must not broaden results: %+v", injectionResults)
+ }
+
+ // A broad expansion can match more rows than the bounded candidate set.
+ // The exact original phrase must be prioritized before LIMIT, even when it
+ // is older and inserted after all broad matches.
+ for i := 0; i < 230; i++ {
+ if _, err := db.Exec(`
+ INSERT INTO articles (feed_id, title, url, published_at, original_summary)
+ VALUES (?, ?, ?, ?, ?)
+ `, feedID, fmt.Sprintf("Broad result %03d", i), fmt.Sprintf("https://example.com/broad/%d", i), time.Now(), "common expansion"); err != nil {
+ t.Fatalf("insert broad search candidate %d: %v", i, err)
+ }
+ }
+ exactResult, err := db.Exec(`
+ INSERT INTO articles (feed_id, title, url, published_at, original_summary)
+ VALUES (?, ?, ?, ?, ?)
+ `, feedID, "rare exact phrase", "https://example.com/exact", time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), "common expansion")
+ if err != nil {
+ t.Fatalf("insert exact search candidate: %v", err)
+ }
+ exactID, _ := exactResult.LastInsertId()
+
+ boundedResults, err := db.SearchArticlesWithTerms(AISearchQuery{
+ Original: "rare exact phrase",
+ Required: []string{"common"},
+ Limit: 10,
+ })
+ if err != nil {
+ t.Fatalf("bounded candidate search: %v", err)
+ }
+ if len(boundedResults) == 0 || boundedResults[0].Article.ID != exactID {
+ t.Fatalf("expected exact phrase result before bounded broad matches, got %+v", boundedResults)
+ }
+
+ wildcardOnlyResults, err := db.SearchArticlesWithTerms(AISearchQuery{
+ Original: "missing literal phrase",
+ Patterns: []string{"%", " % % "},
+ Limit: 10,
+ })
+ if err != nil {
+ t.Fatalf("wildcard-only pattern search: %v", err)
+ }
+ if len(wildcardOnlyResults) != 0 {
+ t.Fatalf("wildcard-only patterns must not broaden results: %+v", wildcardOnlyResults)
+ }
+}
diff --git a/internal/feed/intelligent_refresh_test.go b/internal/feed/intelligent_refresh_test.go
index a7641320b..4e228fece 100644
--- a/internal/feed/intelligent_refresh_test.go
+++ b/internal/feed/intelligent_refresh_test.go
@@ -2,6 +2,7 @@ package feed
import (
"context"
+ "fmt"
"testing"
"time"
@@ -9,6 +10,17 @@ import (
"MrRSS/internal/models"
)
+func addIntelligentRefreshTestFeed(t *testing.T, db *database.DB) models.Feed {
+ t.Helper()
+ feed := models.Feed{Title: "Test Feed", URL: "https://example.com/test-feed", Type: "rss"}
+ feedID, err := db.AddFeed(&feed)
+ if err != nil {
+ t.Fatalf("AddFeed error: %v", err)
+ }
+ feed.ID = feedID
+ return feed
+}
+
func TestIntelligentRefreshCalculator_NoArticles(t *testing.T) {
tmpFile := t.TempDir() + "/test.db"
db, err := database.NewDB(tmpFile)
@@ -21,7 +33,7 @@ func TestIntelligentRefreshCalculator_NoArticles(t *testing.T) {
defer db.Close()
calculator := NewIntelligentRefreshCalculator(db)
- feed := models.Feed{ID: 1, Title: "Test Feed"}
+ feed := addIntelligentRefreshTestFeed(t, db)
// Test with no articles - should return default interval
interval := calculator.CalculateInterval(feed)
@@ -57,17 +69,18 @@ func TestIntelligentRefreshCalculator_Bounds(t *testing.T) {
defer db.Close()
calculator := NewIntelligentRefreshCalculator(db)
- feed := models.Feed{ID: 1, Title: "Test Feed"}
+ feed := addIntelligentRefreshTestFeed(t, db)
// Create articles with very high frequency (every 10 seconds)
now := time.Now()
articles := make([]*models.Article, 10)
for i := 0; i < 10; i++ {
articles[i] = &models.Article{
- FeedID: 1,
- Title: "Article",
- URL: "http://example.com/article",
- PublishedAt: now.Add(time.Duration(-i) * 10 * time.Second),
+ FeedID: feed.ID,
+ Title: fmt.Sprintf("Article %d", i),
+ URL: fmt.Sprintf("http://example.com/article/%d", i),
+ PublishedAt: now.Add(time.Duration(-i) * 10 * time.Second),
+ HasValidPublishedTime: true,
}
}
@@ -100,17 +113,18 @@ func TestIntelligentRefreshCalculator_LowFrequency(t *testing.T) {
defer db.Close()
calculator := NewIntelligentRefreshCalculator(db)
- feed := models.Feed{ID: 1, Title: "Test Feed"}
+ feed := addIntelligentRefreshTestFeed(t, db)
// Create articles with very low frequency (every 48 hours)
now := time.Now()
articles := make([]*models.Article, 10)
for i := 0; i < 10; i++ {
articles[i] = &models.Article{
- FeedID: 1,
- Title: "Article",
- URL: "http://example.com/article",
- PublishedAt: now.Add(time.Duration(-i) * 48 * time.Hour),
+ FeedID: feed.ID,
+ Title: fmt.Sprintf("Article %d", i),
+ URL: fmt.Sprintf("http://example.com/article/%d", i),
+ PublishedAt: now.Add(time.Duration(-i) * 48 * time.Hour),
+ HasValidPublishedTime: true,
}
}
@@ -156,17 +170,18 @@ func TestIntelligentRefreshCalculator_WithArticles(t *testing.T) {
defer db.Close()
calculator := NewIntelligentRefreshCalculator(db)
- feed := models.Feed{ID: 1, Title: "Test Feed"}
+ feed := addIntelligentRefreshTestFeed(t, db)
// Create articles published every 2 hours
now := time.Now()
articles := make([]*models.Article, 20)
for i := 0; i < 20; i++ {
articles[i] = &models.Article{
- FeedID: 1,
- Title: "Article",
- URL: "http://example.com/article",
- PublishedAt: now.Add(time.Duration(-i*2) * time.Hour),
+ FeedID: feed.ID,
+ Title: fmt.Sprintf("Article %d", i),
+ URL: fmt.Sprintf("http://example.com/article/%d", i),
+ PublishedAt: now.Add(time.Duration(-i*2) * time.Hour),
+ HasValidPublishedTime: true,
}
}
diff --git a/internal/handlers/ai/ai_handlers.go b/internal/handlers/ai/ai_handlers.go
index 1d959341e..3d265a07c 100644
--- a/internal/handlers/ai/ai_handlers.go
+++ b/internal/handlers/ai/ai_handlers.go
@@ -21,6 +21,7 @@ type TestResult struct {
ResponseTimeMs int64 `json:"response_time_ms"`
TestTime string `json:"test_time"`
ErrorMessage string `json:"error_message,omitempty"`
+ ErrorCode string `json:"error_code,omitempty"`
}
// HandleTestAIConfig handles POST /api/ai/test to test AI configuration
@@ -71,7 +72,8 @@ func HandleTestAIConfig(h *core.Handler, w http.ResponseWriter, r *http.Request)
}
if !result.ConfigValid {
- result.ErrorMessage = "Configuration incomplete: " + strings.Join(validationErrors, ", ")
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
response.JSON(w, result)
return
}
@@ -80,7 +82,8 @@ func HandleTestAIConfig(h *core.Handler, w http.ResponseWriter, r *http.Request)
parsedURL, err := url.Parse(endpoint)
if err != nil {
result.ConfigValid = false
- result.ErrorMessage = "Invalid endpoint URL: " + err.Error()
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
response.JSON(w, result)
return
}
@@ -88,7 +91,8 @@ func HandleTestAIConfig(h *core.Handler, w http.ResponseWriter, r *http.Request)
// Both HTTP and HTTPS are allowed
if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
result.ConfigValid = false
- result.ErrorMessage = "API endpoint must use HTTP or HTTPS"
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
response.JSON(w, result)
return
}
@@ -99,9 +103,11 @@ func HandleTestAIConfig(h *core.Handler, w http.ResponseWriter, r *http.Request)
// Create HTTP client with proxy support if configured
httpClient, err := createHTTPClientWithProxy(h)
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
result.ConnectionSuccess = false
result.ModelAvailable = false
- result.ErrorMessage = fmt.Sprintf("Failed to create HTTP client: %v", err)
+ result.ErrorMessage = publicErr.Message
+ result.ErrorCode = publicErr.Code
result.ResponseTimeMs = time.Since(startTime).Milliseconds()
response.JSON(w, result)
return
@@ -121,9 +127,11 @@ func HandleTestAIConfig(h *core.Handler, w http.ResponseWriter, r *http.Request)
_, err = client.Request("", "test")
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
result.ConnectionSuccess = false
result.ModelAvailable = false
- result.ErrorMessage = fmt.Sprintf("Connection failed: %v", err)
+ result.ErrorMessage = publicErr.Message
+ result.ErrorCode = publicErr.Code
} else {
result.ConnectionSuccess = true
result.ModelAvailable = true
diff --git a/internal/handlers/ai/ai_profiles_handlers.go b/internal/handlers/ai/ai_profiles_handlers.go
index b71167787..a4384bb23 100644
--- a/internal/handlers/ai/ai_profiles_handlers.go
+++ b/internal/handlers/ai/ai_profiles_handlers.go
@@ -44,6 +44,7 @@ type ProfileTestResult struct {
ModelAvailable bool `json:"model_available"`
ResponseTimeMs int64 `json:"response_time_ms"`
ErrorMessage string `json:"error_message,omitempty"`
+ ErrorCode string `json:"error_code,omitempty"`
}
// HandleListAIProfiles handles GET /api/ai/profiles
@@ -477,7 +478,8 @@ func testAIProfileConnection(h *core.Handler, profile *models.AIProfile) Profile
}
if !result.ConfigValid {
- result.ErrorMessage = "Configuration incomplete: " + strings.Join(validationErrors, ", ")
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
result.ResponseTimeMs = time.Since(startTime).Milliseconds()
return result
}
@@ -486,14 +488,16 @@ func testAIProfileConnection(h *core.Handler, profile *models.AIProfile) Profile
parsedURL, err := url.Parse(profile.Endpoint)
if err != nil {
result.ConfigValid = false
- result.ErrorMessage = "Invalid endpoint URL: " + err.Error()
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
result.ResponseTimeMs = time.Since(startTime).Milliseconds()
return result
}
if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
result.ConfigValid = false
- result.ErrorMessage = "API endpoint must use HTTP or HTTPS"
+ result.ErrorMessage = ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message
+ result.ErrorCode = ai.ErrorCodeConfigurationInvalid
result.ResponseTimeMs = time.Since(startTime).Milliseconds()
return result
}
@@ -501,9 +505,11 @@ func testAIProfileConnection(h *core.Handler, profile *models.AIProfile) Profile
// Create HTTP client with proxy support if configured
httpClient, err := createHTTPClientWithProxyForProfile(h)
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
result.ConnectionSuccess = false
result.ModelAvailable = false
- result.ErrorMessage = fmt.Sprintf("Failed to create HTTP client: %v", err)
+ result.ErrorMessage = publicErr.Message
+ result.ErrorCode = publicErr.Code
result.ResponseTimeMs = time.Since(startTime).Milliseconds()
return result
}
@@ -524,9 +530,11 @@ func testAIProfileConnection(h *core.Handler, profile *models.AIProfile) Profile
_, err = client.Request("", "test")
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
result.ConnectionSuccess = false
result.ModelAvailable = false
- result.ErrorMessage = fmt.Sprintf("Connection failed: %v", err)
+ result.ErrorMessage = publicErr.Message
+ result.ErrorCode = publicErr.Code
} else {
result.ConnectionSuccess = true
result.ModelAvailable = true
diff --git a/internal/handlers/ai/ai_search.go b/internal/handlers/ai/ai_search.go
index e453df5b1..e745605fe 100644
--- a/internal/handlers/ai/ai_search.go
+++ b/internal/handlers/ai/ai_search.go
@@ -11,6 +11,7 @@ import (
"MrRSS/internal/ai"
"MrRSS/internal/config"
+ "MrRSS/internal/database"
"MrRSS/internal/handlers/core"
"MrRSS/internal/handlers/response"
)
@@ -22,11 +23,13 @@ type AISearchRequest struct {
// AISearchResponse represents the response from AI search
type AISearchResponse struct {
- Success bool `json:"success"`
- Articles []map[string]any `json:"articles,omitempty"`
- SearchTerms string `json:"search_terms,omitempty"`
- Error string `json:"error,omitempty"`
- TotalCount int `json:"total_count"`
+ Success bool `json:"success"`
+ Articles []map[string]any `json:"articles,omitempty"`
+ SearchTerms string `json:"search_terms,omitempty"`
+ ExpandedTerms *SearchTerms `json:"expanded_terms,omitempty"`
+ Error string `json:"error,omitempty"`
+ ErrorCode string `json:"error_code,omitempty"`
+ TotalCount int `json:"total_count"`
}
// extractSearchTerms extracts the search terms from AI response
@@ -78,9 +81,45 @@ func parseSearchTermsAdvanced(response string) (*SearchTerms, error) {
return nil, fmt.Errorf("no search terms extracted")
}
+ terms.Required = normalizeTerms(terms.Required, 8)
+ terms.Optional = normalizeTerms(terms.Optional, 12)
+ terms.Patterns = normalizeSearchPatterns(terms.Patterns, 4)
return &terms, nil
}
+func normalizeSearchPatterns(values []string, max int) []string {
+ result := make([]string, 0, len(values))
+ for _, value := range normalizeTerms(values, max) {
+ plain := strings.Join(strings.Fields(strings.ReplaceAll(value, "%", " ")), " ")
+ if plain == "" {
+ continue
+ }
+ result = append(result, value)
+ }
+ return result
+}
+
+func normalizeTerms(values []string, max int) []string {
+ result := make([]string, 0, len(values))
+ seen := make(map[string]struct{})
+ for _, value := range values {
+ value = strings.TrimSpace(value)
+ key := strings.ToLower(value)
+ if value == "" || len([]rune(value)) > 80 {
+ continue
+ }
+ if _, exists := seen[key]; exists {
+ continue
+ }
+ seen[key] = struct{}{}
+ result = append(result, value)
+ if len(result) >= max {
+ break
+ }
+ }
+ return result
+}
+
// buildAISearchPrompt creates a concise system prompt for keyword expansion
func buildAISearchPrompt() string {
return `Expand search query into structured search terms. Output ONLY a JSON object:
@@ -104,95 +143,6 @@ Input: "Python webæĄæķ"
Output: {"required":["Python","webæĄæķ","web framework"],"optional":["Django","Flask","FastAPI","åįŦŊ","backend"],"patterns":["Python%web","Python%æĄæķ"]}`
}
-// buildSearchSQL builds the SQL query from search terms with relevance scoring
-func buildSearchSQL(terms *SearchTerms, limit int) string {
- if terms == nil || (len(terms.Required) == 0 && len(terms.Patterns) == 0) {
- return ""
- }
-
- // Build required conditions (must match at least one)
- var requiredConditions []string
- for _, term := range terms.Required {
- escapedTerm := strings.ReplaceAll(term, "'", "''")
- condition := fmt.Sprintf(
- "(a.title LIKE '%%%s%%' OR c.content LIKE '%%%s%%' OR a.summary LIKE '%%%s%%')",
- escapedTerm, escapedTerm, escapedTerm,
- )
- requiredConditions = append(requiredConditions, condition)
- }
-
- // Build pattern conditions
- for _, pattern := range terms.Patterns {
- escapedPattern := strings.ReplaceAll(pattern, "'", "''")
- condition := fmt.Sprintf(
- "(a.title LIKE '%%%s%%' OR c.content LIKE '%%%s%%' OR a.summary LIKE '%%%s%%')",
- escapedPattern, escapedPattern, escapedPattern,
- )
- requiredConditions = append(requiredConditions, condition)
- }
-
- // Build relevance score with weighted scoring
- var scoreTerms []string
-
- // Required terms get higher base weight
- for _, term := range terms.Required {
- escapedTerm := strings.ReplaceAll(term, "'", "''")
- scoreTerm := fmt.Sprintf(
- "(CASE WHEN a.title LIKE '%%%s%%' THEN 5 ELSE 0 END + "+
- "CASE WHEN c.content LIKE '%%%s%%' THEN 2 ELSE 0 END + "+
- "CASE WHEN a.summary LIKE '%%%s%%' THEN 3 ELSE 0 END)",
- escapedTerm, escapedTerm, escapedTerm,
- )
- scoreTerms = append(scoreTerms, scoreTerm)
- }
-
- // Patterns get highest weight (exact phrase match)
- for _, pattern := range terms.Patterns {
- escapedPattern := strings.ReplaceAll(pattern, "'", "''")
- scoreTerm := fmt.Sprintf(
- "(CASE WHEN a.title LIKE '%%%s%%' THEN 8 ELSE 0 END + "+
- "CASE WHEN c.content LIKE '%%%s%%' THEN 4 ELSE 0 END + "+
- "CASE WHEN a.summary LIKE '%%%s%%' THEN 5 ELSE 0 END)",
- escapedPattern, escapedPattern, escapedPattern,
- )
- scoreTerms = append(scoreTerms, scoreTerm)
- }
-
- // Optional terms get lower weight
- for _, term := range terms.Optional {
- escapedTerm := strings.ReplaceAll(term, "'", "''")
- scoreTerm := fmt.Sprintf(
- "(CASE WHEN a.title LIKE '%%%s%%' THEN 2 ELSE 0 END + "+
- "CASE WHEN c.content LIKE '%%%s%%' THEN 1 ELSE 0 END + "+
- "CASE WHEN a.summary LIKE '%%%s%%' THEN 1 ELSE 0 END)",
- escapedTerm, escapedTerm, escapedTerm,
- )
- scoreTerms = append(scoreTerms, scoreTerm)
- }
-
- relevanceScore := "0"
- if len(scoreTerms) > 0 {
- relevanceScore = strings.Join(scoreTerms, " + ")
- }
-
- // Build full query with LEFT JOIN to article_contents for content search
- whereClause := strings.Join(requiredConditions, " OR ")
- query := fmt.Sprintf(`
- SELECT a.id, a.feed_id, a.title, a.url, a.image_url, a.audio_url, a.video_url,
- a.published_at, a.is_read, a.is_favorite, a.is_hidden, a.is_read_later,
- a.translated_title, a.summary, a.freshrss_item_id, f.title AS feed_title, a.author,
- (%s) AS relevance_score
- FROM articles a
- JOIN feeds f ON a.feed_id = f.id
- LEFT JOIN article_contents c ON a.id = c.article_id
- WHERE a.is_hidden = 0 AND (%s)
- ORDER BY relevance_score DESC, a.published_at DESC
- LIMIT %d
- `, relevanceScore, whereClause, limit)
-
- return query
-}
-
// HandleAISearch handles POST /api/ai/search for AI-powered article search
// @Summary AI-powered article search
// @Description Use AI to expand keywords and search articles with relevance ranking
@@ -214,21 +164,24 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
var req AISearchRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
response.JSON(w, AISearchResponse{
- Success: false,
- Error: "Invalid request format",
+ Success: false,
+ Error: "Invalid search request",
+ ErrorCode: ai.ErrorCodeProviderRejectedRequest,
})
return
}
if strings.TrimSpace(req.Query) == "" {
response.JSON(w, AISearchResponse{
- Success: false,
- Error: "Search query is required",
+ Success: false,
+ Error: "Search query is required",
+ ErrorCode: ai.ErrorCodeProviderRejectedRequest,
})
return
}
- log.Printf("[AI Search] User query: %s", req.Query)
+ query := strings.TrimSpace(req.Query)
+ log.Printf("[AI Search] Starting search (query length: %d)", len([]rune(query)))
// Get AI settings - try ProfileProvider first
var apiKey, endpoint, model string
@@ -238,7 +191,7 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
apiKey = cfg.APIKey
endpoint = cfg.Endpoint
model = cfg.Model
- log.Printf("[AI Search] Using AI profile for search (endpoint: %s, model: %s)", endpoint, model)
+ log.Printf("[AI Search] Using AI profile for search (endpoint: %s, model: %s)", ai.RedactEndpoint(endpoint), model)
}
}
@@ -256,14 +209,15 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
if model == "" {
model = defaults.AIModel
}
- log.Printf("[AI Search] Using global AI settings for search (endpoint: %s, model: %s)", endpoint, model)
+ log.Printf("[AI Search] Using global AI settings for search (endpoint: %s, model: %s)", ai.RedactEndpoint(endpoint), model)
}
// Validate AI configuration
if endpoint == "" || model == "" {
response.JSON(w, AISearchResponse{
- Success: false,
- Error: "AI is not configured. Please configure AI settings first.",
+ Success: false,
+ Error: ai.UserFacingErrorForCode(ai.ErrorCodeConfigurationInvalid).Message,
+ ErrorCode: ai.ErrorCodeConfigurationInvalid,
})
return
}
@@ -271,9 +225,11 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
// Create AI client
httpClient, err := createHTTPClientWithProxy(h)
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
response.JSON(w, AISearchResponse{
- Success: false,
- Error: fmt.Sprintf("Failed to create HTTP client: %v", err),
+ Success: false,
+ Error: publicErr.Message,
+ ErrorCode: publicErr.Code,
})
return
}
@@ -291,21 +247,24 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
systemPrompt := buildAISearchPrompt()
aiResponse, err := client.Request(systemPrompt, req.Query)
if err != nil {
+ publicErr := ai.ClassifyUserFacingError(err)
+ log.Printf("[AI Search] Request failed code=%s status=%d", publicErr.Code, publicErr.HTTPStatus)
response.JSON(w, AISearchResponse{
- Success: false,
- Error: fmt.Sprintf("AI request failed: %v", err),
+ Success: false,
+ Error: publicErr.Message,
+ ErrorCode: publicErr.Code,
})
return
}
- log.Printf("[AI Search] AI response: %s", aiResponse)
-
// Parse search terms from AI response
searchTerms, err := parseSearchTermsAdvanced(aiResponse)
if err != nil {
+ publicErr := ai.UserFacingErrorForCode(ai.ErrorCodeInvalidResponse)
response.JSON(w, AISearchResponse{
- Success: false,
- Error: fmt.Sprintf("Failed to parse search terms: %v", err),
+ Success: false,
+ Error: publicErr.Message,
+ ErrorCode: publicErr.Code,
})
return
}
@@ -315,29 +274,37 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
allTerms = append(allTerms, searchTerms.Required...)
allTerms = append(allTerms, searchTerms.Optional...)
allTerms = append(allTerms, searchTerms.Patterns...)
- log.Printf("[AI Search] Required: %v, Optional: %v, Patterns: %v", searchTerms.Required, searchTerms.Optional, searchTerms.Patterns)
-
- // Build and execute search query
- searchSQL := buildSearchSQL(searchTerms, 100)
- log.Printf("[AI Search] SQL query:\n%s", searchSQL)
-
- // Execute search
- articles, err := h.DB.SearchArticlesWithSQL(searchSQL)
+ log.Printf(
+ "[AI Search] Expanded terms (required=%d optional=%d patterns=%d)",
+ len(searchTerms.Required), len(searchTerms.Optional), len(searchTerms.Patterns),
+ )
+
+ // Execute a parameterized candidate query and deterministic local ranking.
+ // The AI response is never treated as SQL.
+ results, err := h.DB.SearchArticlesWithTerms(database.AISearchQuery{
+ Original: query,
+ Required: searchTerms.Required,
+ Optional: searchTerms.Optional,
+ Patterns: searchTerms.Patterns,
+ Limit: 100,
+ })
if err != nil {
log.Printf("[AI Search] Query error: %v", err)
response.JSON(w, AISearchResponse{
Success: false,
- Error: fmt.Sprintf("Search query failed: %v", err),
+ Error: "The article search could not be completed",
+ ErrorCode: ai.ErrorCodeRequestFailed,
SearchTerms: strings.Join(allTerms, ", "),
})
return
}
- log.Printf("[AI Search] Found %d articles", len(articles))
+ log.Printf("[AI Search] Found %d articles", len(results))
// Convert articles to response format
- articleMaps := make([]map[string]any, len(articles))
- for i, article := range articles {
+ articleMaps := make([]map[string]any, len(results))
+ for i, result := range results {
+ article := result.Article
articleMaps[i] = map[string]any{
"id": article.ID,
"feed_id": article.FeedID,
@@ -355,13 +322,19 @@ func HandleAISearch(h *core.Handler, w http.ResponseWriter, r *http.Request) {
"author": article.Author,
"translated_title": article.TranslatedTitle,
"summary": article.Summary,
+ "original_summary": article.OriginalSummary,
+ "relevance_score": result.RelevanceScore,
+ "matched_terms": result.MatchedTerms,
+ "matched_fields": result.MatchedFields,
+ "excerpt": result.Excerpt,
}
}
response.JSON(w, AISearchResponse{
- Success: true,
- Articles: articleMaps,
- SearchTerms: strings.Join(allTerms, ", "),
- TotalCount: len(articles),
+ Success: true,
+ Articles: articleMaps,
+ SearchTerms: strings.Join(allTerms, ", "),
+ ExpandedTerms: searchTerms,
+ TotalCount: len(results),
})
}
diff --git a/internal/handlers/browser/browser_handlers.go b/internal/handlers/browser/browser_handlers.go
index df4d37026..fc6afd02b 100644
--- a/internal/handlers/browser/browser_handlers.go
+++ b/internal/handlers/browser/browser_handlers.go
@@ -1,6 +1,4 @@
-//go:build !server
-
-// Package browser provides HTTP handlers for browser-related operations using Wails v3 Browser API.
+// Package browser provides HTTP handlers for browser-related operations (server mode).
package browser
import (
@@ -10,65 +8,48 @@ import (
"net/http"
"net/url"
- "github.com/wailsapp/wails/v3/pkg/application"
-
handlers "MrRSS/internal/handlers/core"
"MrRSS/internal/handlers/response"
- "MrRSS/internal/utils/fileutil"
)
-// HandleOpenURL opens a URL in the user's default web browser using Wails v3 Browser API.
-// @Summary Open URL in browser
-// @Description Open a URL in the user's default web browser
+// HandleOpenURL handles URL opening requests .
+// In server mode, this returns a redirect response that instructs the client to open the URL.
+// @Summary Open URL in browser (server mode)
+// @Description Returns redirect response for client-side URL opening
// @Tags browser
// @Accept json
// @Produce json
-// @Param url query string false "URL to open (for GET requests)"
-// @Param request body object true "Open URL request (url) (for POST requests)"
-// @Success 200 {object} map[string]string "Success status (status) or redirect URL (redirect)"
+// @Param request body object true "Open URL request (url)"
+// @Success 200 {object} map[string]string "Redirect URL (redirect)"
// @Failure 400 {object} map[string]string "Bad request (invalid URL)"
-// @Failure 500 {object} map[string]string "Internal server error"
// @Router /browser/open [post]
-// @Router /browser/open [get]
func HandleOpenURL(h *handlers.Handler, w http.ResponseWriter, r *http.Request) {
- var targetURL string
+ if r.Method != http.MethodPost {
+ response.Error(w, nil, http.StatusMethodNotAllowed)
+ return
+ }
- // Handle both GET and POST requests
- switch r.Method {
- case http.MethodGet:
- // Get URL from query parameter (for GET requests from proxied links)
- targetURL = r.URL.Query().Get("url")
- if targetURL == "" {
- response.Error(w, fmt.Errorf("URL is required"), http.StatusBadRequest)
- return
- }
- case http.MethodPost:
- // Parse request body (for POST requests)
- var req struct {
- URL string `json:"url"`
- }
+ // Parse request body
+ var req struct {
+ URL string `json:"url"`
+ }
- if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
- response.Error(w, err, http.StatusBadRequest)
- return
- }
- targetURL = req.URL
- default:
- response.Error(w, nil, http.StatusMethodNotAllowed)
+ if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+ response.Error(w, err, http.StatusBadRequest)
return
}
// Validate URL
- if targetURL == "" {
+ if req.URL == "" {
response.Error(w, fmt.Errorf("URL is required"), http.StatusBadRequest)
return
}
// Parse and validate URL scheme
- parsedURL, err := url.Parse(targetURL)
+ parsedURL, err := url.Parse(req.URL)
if err != nil {
log.Printf("Invalid URL format: %v", err)
- response.Error(w, fmt.Errorf("invalid URL format"), http.StatusBadRequest)
+ response.Error(w, fmt.Errorf("invalid URL format: %w", err), http.StatusBadRequest)
return
}
@@ -79,38 +60,8 @@ func HandleOpenURL(h *handlers.Handler, w http.ResponseWriter, r *http.Request)
return
}
- // Check if app instance is available
- if h.App == nil {
- // specific check for server mode to redirect to client side
- if fileutil.IsServerMode() {
- log.Printf("Server mode detected, instructing client to open URL: %s", targetURL)
- response.JSON(w, map[string]string{"redirect": targetURL})
- return
- }
-
- log.Printf("App instance not available for browser integration")
- response.Error(w, fmt.Errorf("browser integration not available"), http.StatusInternalServerError)
- return
- }
-
- // Open URL using Wails v3 Browser API
- // Note: app.Browser is a field of type *application.BrowserManager
- wailsApp, ok := h.App.(*application.App)
- if !ok {
- log.Printf("Browser integration not available - invalid app type")
- response.Error(w, fmt.Errorf("browser integration not available"), http.StatusInternalServerError)
- return
- }
-
- err = wailsApp.Browser.OpenURL(targetURL)
- if err != nil {
- log.Printf("Failed to open URL in browser: %v", err)
- response.Error(w, fmt.Errorf("failed to open URL in browser"), http.StatusInternalServerError)
- return
- }
-
- log.Printf("Opened URL in browser: %s", targetURL)
-
- // Return success
- response.JSON(w, map[string]string{"status": "success"})
+ // Return redirect response for client-side handling
+ log.Printf("Instructing client to open URL: %s", req.URL)
+ w.WriteHeader(http.StatusOK)
+ response.JSON(w, map[string]string{"redirect": req.URL})
}
diff --git a/internal/handlers/browser/browser_handlers_server.go b/internal/handlers/browser/browser_handlers_server.go
deleted file mode 100644
index 989521937..000000000
--- a/internal/handlers/browser/browser_handlers_server.go
+++ /dev/null
@@ -1,69 +0,0 @@
-//go:build server
-
-// Package browser provides HTTP handlers for browser-related operations (server mode).
-package browser
-
-import (
- "encoding/json"
- "fmt"
- "log"
- "net/http"
- "net/url"
-
- handlers "MrRSS/internal/handlers/core"
- "MrRSS/internal/handlers/response"
-)
-
-// HandleOpenURL handles URL opening requests in server mode.
-// In server mode, this returns a redirect response that instructs the client to open the URL.
-// @Summary Open URL in browser (server mode)
-// @Description Returns redirect response for client-side URL opening
-// @Tags browser
-// @Accept json
-// @Produce json
-// @Param request body object true "Open URL request (url)"
-// @Success 200 {object} map[string]string "Redirect URL (redirect)"
-// @Failure 400 {object} map[string]string "Bad request (invalid URL)"
-// @Router /browser/open [post]
-func HandleOpenURL(h *handlers.Handler, w http.ResponseWriter, r *http.Request) {
- if r.Method != http.MethodPost {
- response.Error(w, nil, http.StatusMethodNotAllowed)
- return
- }
-
- // Parse request body
- var req struct {
- URL string `json:"url"`
- }
-
- if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
- response.Error(w, err, http.StatusBadRequest)
- return
- }
-
- // Validate URL
- if req.URL == "" {
- response.Error(w, fmt.Errorf("URL is required"), http.StatusBadRequest)
- return
- }
-
- // Parse and validate URL scheme
- parsedURL, err := url.Parse(req.URL)
- if err != nil {
- log.Printf("Invalid URL format: %v", err)
- response.Error(w, fmt.Errorf("invalid URL format: %w", err), http.StatusBadRequest)
- return
- }
-
- // Only allow http and https schemes for security
- if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
- log.Printf("Invalid URL scheme: %s", parsedURL.Scheme)
- response.Error(w, fmt.Errorf("only HTTP and HTTPS URLs are allowed"), http.StatusBadRequest)
- return
- }
-
- // Server mode: return redirect response for client-side handling
- log.Printf("Server mode detected, instructing client to open URL: %s", req.URL)
- w.WriteHeader(http.StatusOK)
- response.JSON(w, map[string]string{"redirect": req.URL})
-}
diff --git a/internal/handlers/chat/chat_handlers.go b/internal/handlers/chat/chat_handlers.go
index 9adbf0552..7887f8357 100644
--- a/internal/handlers/chat/chat_handlers.go
+++ b/internal/handlers/chat/chat_handlers.go
@@ -24,6 +24,8 @@ type ChatMessage struct {
// ChatRequest represents the incoming chat request
type ChatRequest struct {
Messages []ChatMessage `json:"messages"`
+ SessionID int64 `json:"session_id,omitempty"`
+ ArticleID int64 `json:"article_id,omitempty"`
ArticleTitle string `json:"article_title,omitempty"`
ArticleURL string `json:"article_url,omitempty"`
ArticleContent string `json:"article_content,omitempty"`
@@ -32,8 +34,16 @@ type ChatRequest struct {
// ChatResponse represents the response from the AI chat
type ChatResponse struct {
- Response string `json:"response"`
- HTML string `json:"html,omitempty"` // Rendered HTML version of markdown response
+ Response string `json:"response"`
+ HTML string `json:"html,omitempty"` // Rendered HTML version of markdown response
+ Thinking string `json:"thinking,omitempty"`
+ SessionID int64 `json:"session_id,omitempty"`
+ HistorySaved bool `json:"history_saved"`
+}
+
+type chatErrorResponse struct {
+ Error string `json:"error"`
+ SessionID int64 `json:"session_id,omitempty"`
}
// HandleAIChat handles chat requests for article discussions
@@ -72,13 +82,17 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
return
}
+ sessionID, historyEnabled, err := persistUserChatMessage(h, &req)
+ if err != nil {
+ log.Printf("AI chat history preparation failed session=%d", req.SessionID)
+ writeChatError(w, "Failed to save chat history", http.StatusInternalServerError, sessionID)
+ return
+ }
+
// Check if AI usage limit is reached
if h.AITracker.IsLimitReached() {
log.Printf("AI usage limit reached for chat")
- w.WriteHeader(http.StatusTooManyRequests)
- response.JSON(w, map[string]string{
- "error": "AI usage limit reached",
- })
+ writeChatError(w, "AI usage limit reached", http.StatusTooManyRequests, sessionID)
return
}
@@ -93,7 +107,7 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
apiKey = cfg.APIKey
endpoint = cfg.Endpoint
model = cfg.Model
- log.Printf("Using AI profile for chat (endpoint: %s, model: %s)", endpoint, model)
+ log.Printf("Using AI profile for chat (model: %s)", model)
}
}
@@ -110,7 +124,7 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
if model == "" {
model = "gpt-4o-mini"
}
- log.Printf("Using global AI settings for chat (endpoint: %s, model: %s)", endpoint, model)
+ log.Printf("Using global AI settings for chat (model: %s)", model)
}
// Optimize context to reduce token usage
@@ -128,7 +142,7 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
// Create HTTP client with proxy support if configured
httpClient, err := createHTTPClientWithProxy(h)
if err != nil {
- log.Printf("Failed to create HTTP client with proxy: %v", err)
+ log.Printf("Failed to create HTTP client with proxy")
httpClient = &http.Client{Timeout: 60 * time.Second}
} else {
httpClient.Timeout = 60 * time.Second
@@ -146,8 +160,8 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
// Send chat request using universal client
result, err := client.RequestWithMessages(messagesMap)
if err != nil {
- log.Printf("AI chat request failed: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
+ log.Printf("AI chat request failed")
+ writeChatError(w, "Failed to get response from AI. Please try again.", http.StatusInternalServerError, sessionID)
return
}
@@ -159,11 +173,6 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
// Convert markdown response to HTML
htmlResponse := textutil.ConvertMarkdownToHTML(respContent)
- // Log thinking if present (for debugging)
- if thinking != "" {
- log.Printf("AI chat thinking: %s", thinking)
- }
-
// Track AI usage (estimate tokens from input and output)
estimatedTokens := estimateChatTokens(optimizedMessages, respContent)
if err := h.AITracker.AddUsage(int64(estimatedTokens)); err != nil {
@@ -173,7 +182,68 @@ func HandleAIChat(h *core.Handler, w http.ResponseWriter, r *http.Request) {
// Track statistics
_ = h.DB.IncrementStat("ai_chat")
- response.JSON(w, ChatResponse{Response: respContent, HTML: htmlResponse})
+ historySaved := historyEnabled
+ if historyEnabled {
+ if _, saveErr := h.DB.CreateChatMessage(sessionID, "assistant", respContent, thinking); saveErr != nil {
+ log.Printf("AI chat assistant history save failed session=%d", sessionID)
+ historySaved = false
+ }
+ }
+
+ response.JSON(w, ChatResponse{
+ Response: respContent, HTML: htmlResponse, Thinking: thinking,
+ SessionID: sessionID, HistorySaved: historySaved,
+ })
+}
+
+func persistUserChatMessage(h *core.Handler, req *ChatRequest) (int64, bool, error) {
+ if req.ArticleID <= 0 {
+ // Backward compatibility for callers that do not send article_id.
+ return req.SessionID, false, nil
+ }
+
+ lastUserMessage := ""
+ for index := len(req.Messages) - 1; index >= 0; index-- {
+ if req.Messages[index].Role == "user" {
+ lastUserMessage = strings.TrimSpace(req.Messages[index].Content)
+ break
+ }
+ }
+ if lastUserMessage == "" {
+ return req.SessionID, false, fmt.Errorf("latest user message is missing")
+ }
+
+ sessionID := req.SessionID
+ if sessionID > 0 {
+ session, err := h.DB.GetChatSession(sessionID)
+ if err != nil {
+ return sessionID, false, err
+ }
+ if session == nil || session.ArticleID != req.ArticleID {
+ return sessionID, false, fmt.Errorf("chat session does not belong to the article")
+ }
+ } else {
+ title := []rune(lastUserMessage)
+ if len(title) > 60 {
+ title = title[:60]
+ }
+ var err error
+ sessionID, err = h.DB.CreateChatSession(req.ArticleID, string(title))
+ if err != nil {
+ return 0, false, err
+ }
+ }
+
+ if _, err := h.DB.CreateChatMessage(sessionID, "user", lastUserMessage, ""); err != nil {
+ return sessionID, false, err
+ }
+ return sessionID, true, nil
+}
+
+func writeChatError(w http.ResponseWriter, message string, status int, sessionID int64) {
+ w.Header().Set("Content-Type", "application/json")
+ w.WriteHeader(status)
+ _ = json.NewEncoder(w).Encode(chatErrorResponse{Error: message, SessionID: sessionID})
}
// optimizeChatContext reduces the chat context to save tokens while preserving important information
diff --git a/internal/handlers/custom_css/custom_css_handlers.go b/internal/handlers/custom_css/custom_css_handlers.go
index 1d13dd49f..f20bebb67 100644
--- a/internal/handlers/custom_css/custom_css_handlers.go
+++ b/internal/handlers/custom_css/custom_css_handlers.go
@@ -1,5 +1,3 @@
-//go:build !server
-
package custom_css
import (
@@ -14,171 +12,23 @@ import (
"MrRSS/internal/handlers/core"
"MrRSS/internal/handlers/response"
"MrRSS/internal/utils/fileutil"
-
- "github.com/wailsapp/wails/v3/pkg/application"
)
const customCSSFileName = "custom_article.css"
-// HandleUploadCSSDialog opens a file dialog to select CSS file for upload.
-// @Summary Upload CSS dialog (desktop mode)
-// @Description Open a file dialog to select a CSS file for upload (desktop mode only)
+// HandleUploadCSSDialog is not available in server mode - returns 501 Not Implemented
+// @Summary Upload CSS dialog (not available)
+// @Description File dialog not available in server mode. Use /api/custom-css/upload endpoint instead
// @Tags custom-css
// @Accept json
// @Produce json
-// @Success 200 {object} map[string]string "Upload success (status, message)"
-// @Success 501 {object} map[string]string "Not implemented in server mode"
-// @Failure 400 {object} map[string]string "Bad request"
-// @Failure 500 {object} map[string]string "Internal server error"
+// @Success 501 {object} map[string]string "Not implemented error"
// @Router /custom-css/dialog [post]
func HandleUploadCSSDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if h.App == nil {
- log.Printf("File dialog not available")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available",
- })
- return
- }
-
- // Type assert to *application.App to access Dialog
- app, ok := h.App.(*application.App)
- if !ok {
- log.Printf("File dialog not available: app is not *application.App type")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available",
- })
- return
- }
-
- filePath, err := app.Dialog.OpenFileWithOptions(&application.OpenFileDialogOptions{
- Title: "Select CSS File",
- Filters: []application.FileFilter{
- {
- DisplayName: "CSS Files (*.css)",
- Pattern: "*.css",
- },
- {
- DisplayName: "All Files (*)",
- Pattern: "*",
- },
- },
- CanChooseFiles: true,
- AllowsOtherFileTypes: true,
- }).PromptForSingleSelection()
-
- // Treat empty filePath as user cancellation (no error should be shown)
- if filePath == "" {
- log.Printf("CSS upload dialog cancelled by user")
- response.JSON(w, map[string]string{"status": "cancelled"})
- return
- }
-
- // Only show error for actual failures, not cancellations
- if err != nil {
- log.Printf("Error opening file dialog: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to open file dialog",
- })
- return
- }
-
- // Read the selected file
- file, err := os.Open(filePath)
- if err != nil {
- log.Printf("Error opening selected file: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to open selected file",
- })
- return
- }
- defer file.Close()
-
- // Get file info for validation
- fileInfo, err := file.Stat()
- if err != nil {
- log.Printf("Error getting file info: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to get file info",
- })
- return
- }
-
- // Validate file extension
- ext := strings.ToLower(filepath.Ext(filePath))
- if ext != ".css" {
- w.WriteHeader(http.StatusBadRequest)
- response.JSON(w, map[string]interface{}{
- "error": "Only CSS files are allowed",
- })
- return
- }
-
- // Validate file size (max 1MB)
- if fileInfo.Size() > 1<<20 {
- w.WriteHeader(http.StatusBadRequest)
- response.JSON(w, map[string]interface{}{
- "error": "CSS file is too large (max 1MB)",
- })
- return
- }
-
- // Get data directory
- dataDir, err := fileutil.GetDataDir()
- if err != nil {
- log.Printf("Error getting data directory: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to get data directory",
- })
- return
- }
-
- // Save CSS file
- cssFilePath := filepath.Join(dataDir, customCSSFileName)
- destFile, err := os.Create(cssFilePath)
- if err != nil {
- log.Printf("Error creating CSS file: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to save CSS file",
- })
- return
- }
- defer destFile.Close()
-
- // Copy file content
- written, err := io.Copy(destFile, file)
- if err != nil {
- log.Printf("Error writing CSS file: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to write CSS file",
- })
- return
- }
-
- log.Printf("CSS file uploaded via dialog: %s (%d bytes)", filePath, written)
-
- // Update setting in database
- if err := h.DB.SetSetting("custom_css_file", customCSSFileName); err != nil {
- log.Printf("Error saving custom_css_file setting: %v", err)
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to update settings",
- })
- return
- }
-
- // Return success response
- w.WriteHeader(http.StatusOK)
- response.JSON(w, map[string]string{
- "status": "success",
- "message": "CSS file uploaded successfully",
+ log.Printf("File dialog not available in server mode")
+ w.WriteHeader(http.StatusNotImplemented)
+ response.JSON(w, map[string]interface{}{
+ "error": "File dialog not available in server mode. Use /api/custom-css/upload endpoint with file upload instead.",
})
}
diff --git a/internal/handlers/custom_css/custom_css_handlers_server.go b/internal/handlers/custom_css/custom_css_handlers_server.go
deleted file mode 100644
index 81ae93a47..000000000
--- a/internal/handlers/custom_css/custom_css_handlers_server.go
+++ /dev/null
@@ -1,228 +0,0 @@
-//go:build server
-
-package custom_css
-
-import (
- "fmt"
- "io"
- "log"
- "net/http"
- "os"
- "path/filepath"
- "strings"
-
- "MrRSS/internal/handlers/core"
- "MrRSS/internal/handlers/response"
- "MrRSS/internal/utils/fileutil"
-)
-
-const customCSSFileName = "custom_article.css"
-
-// HandleUploadCSSDialog is not available in server mode - returns 501 Not Implemented
-// @Summary Upload CSS dialog (not available)
-// @Description File dialog not available in server mode. Use /api/custom-css/upload endpoint instead
-// @Tags custom-css
-// @Accept json
-// @Produce json
-// @Success 501 {object} map[string]string "Not implemented error"
-// @Router /custom-css/dialog [post]
-func HandleUploadCSSDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- log.Printf("File dialog not available in server mode")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available in server mode. Use /api/custom-css/upload endpoint with file upload instead.",
- })
-}
-
-// HandleUploadCSS handles CSS file upload and saves it to the data directory
-// @Summary Upload custom CSS file
-// @Description Upload a custom CSS file to style article content (max 1MB, .css files only)
-// @Tags custom-css
-// @Accept multipart/form-data
-// @Produce json
-// @Param file formData file true "CSS file to upload"
-// @Success 200 {object} map[string]string "Upload success (status, message)"
-// @Failure 400 {object} map[string]string "Bad request (invalid file or size)"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /custom-css/upload [post]
-func HandleUploadCSS(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if r.Method != http.MethodPost {
- response.Error(w, nil, http.StatusMethodNotAllowed)
- return
- }
-
- // Parse multipart form (max 10MB)
- if err := r.ParseMultipartForm(10 << 20); err != nil {
- log.Printf("Error parsing multipart form: %v", err)
- response.Error(w, err, http.StatusBadRequest)
- return
- }
-
- file, header, err := r.FormFile("file")
- if err != nil {
- log.Printf("Error getting form file: %v", err)
- response.Error(w, err, http.StatusBadRequest)
- return
- }
- defer file.Close()
-
- // Validate file extension
- ext := strings.ToLower(filepath.Ext(header.Filename))
- if ext != ".css" {
- response.Error(w, fmt.Errorf("only CSS files are allowed"), http.StatusBadRequest)
- return
- }
-
- // Validate file size (max 1MB)
- if header.Size > 1<<20 {
- response.Error(w, fmt.Errorf("CSS file is too large (max 1MB)"), http.StatusBadRequest)
- return
- }
-
- // Get data directory
- dataDir, err := fileutil.GetDataDir()
- if err != nil {
- log.Printf("Error getting data directory: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Save CSS file
- cssFilePath := filepath.Join(dataDir, customCSSFileName)
- destFile, err := os.Create(cssFilePath)
- if err != nil {
- log.Printf("Error creating CSS file: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
- defer destFile.Close()
-
- // Copy file content
- written, err := io.Copy(destFile, file)
- if err != nil {
- log.Printf("Error writing CSS file: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- log.Printf("CSS file uploaded successfully: %s (%d bytes)", header.Filename, written)
-
- // Update setting in database
- if err := h.DB.SetSetting("custom_css_file", customCSSFileName); err != nil {
- log.Printf("Error saving custom_css_file setting: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Return success response
- w.WriteHeader(http.StatusOK)
- response.JSON(w, map[string]string{
- "status": "success",
- "message": "CSS file uploaded successfully",
- })
-}
-
-// HandleGetCSS returns the custom CSS file content
-// @Summary Get custom CSS
-// @Description Get the content of the uploaded custom CSS file
-// @Tags custom-css
-// @Accept json
-// @Produce text/css
-// @Success 200 {string} string "CSS file content"
-// @Failure 404 {object} map[string]string "No custom CSS file configured"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /custom-css [get]
-func HandleGetCSS(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if r.Method != http.MethodGet {
- response.Error(w, nil, http.StatusMethodNotAllowed)
- return
- }
-
- // Get custom_css_file setting
- cssFileName, err := h.DB.GetSetting("custom_css_file")
- if err != nil || cssFileName == "" {
- response.Error(w, fmt.Errorf("no custom CSS file configured"), http.StatusNotFound)
- return
- }
-
- // Get data directory
- dataDir, err := fileutil.GetDataDir()
- if err != nil {
- log.Printf("Error getting data directory: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Read CSS file
- cssFilePath := filepath.Join(dataDir, cssFileName)
- cssContent, err := os.ReadFile(cssFilePath)
- if err != nil {
- log.Printf("Error reading CSS file: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Set content type and return CSS
- w.Header().Set("Content-Type", "text/css; charset=utf-8")
- w.WriteHeader(http.StatusOK)
- w.Write(cssContent)
-}
-
-// HandleDeleteCSS deletes the custom CSS file and clears the setting
-// @Summary Delete custom CSS
-// @Description Delete the custom CSS file and clear the setting
-// @Tags custom-css
-// @Accept json
-// @Produce json
-// @Success 200 {object} map[string]string "Delete success (status, message)"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /custom-css [delete]
-func HandleDeleteCSS(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if r.Method != http.MethodDelete && r.Method != http.MethodPost {
- response.Error(w, nil, http.StatusMethodNotAllowed)
- return
- }
-
- // Get custom_css_file setting
- cssFileName, err := h.DB.GetSetting("custom_css_file")
- if err != nil || cssFileName == "" {
- w.WriteHeader(http.StatusOK)
- response.JSON(w, map[string]string{
- "status": "success",
- "message": "No custom CSS file to delete",
- })
- return
- }
-
- // Get data directory
- dataDir, err := fileutil.GetDataDir()
- if err != nil {
- log.Printf("Error getting data directory: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Delete CSS file
- cssFilePath := filepath.Join(dataDir, cssFileName)
- if err := os.Remove(cssFilePath); err != nil && !os.IsNotExist(err) {
- log.Printf("Error deleting CSS file: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Clear setting in database
- if err := h.DB.SetSetting("custom_css_file", ""); err != nil {
- log.Printf("Error clearing custom_css_file setting: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- log.Printf("Custom CSS file deleted: %s", cssFileName)
-
- // Return success response
- w.WriteHeader(http.StatusOK)
- response.JSON(w, map[string]string{
- "status": "success",
- "message": "CSS file deleted successfully",
- })
-}
diff --git a/internal/handlers/feed/category_handlers_test.go b/internal/handlers/feed/category_handlers_test.go
new file mode 100644
index 000000000..27ddc4966
--- /dev/null
+++ b/internal/handlers/feed/category_handlers_test.go
@@ -0,0 +1,68 @@
+package feed_test
+
+import (
+ "bytes"
+ "encoding/json"
+ "net/http/httptest"
+ "testing"
+
+ fh "MrRSS/internal/handlers/feed"
+ "MrRSS/internal/models"
+)
+
+// reuse setupHandler from feed_handlers_test.go
+
+func TestHandleUpdateFeedCategory(t *testing.T) {
+ h := setupHandler(t)
+
+ id, err := h.DB.AddFeed(&models.Feed{
+ Title: "example",
+ URL: "http://example.com/feed",
+ Category: "old",
+ ProxyURL: "http://127.0.0.1:8080",
+ })
+ if err != nil {
+ t.Fatalf("AddFeed error: %v", err)
+ }
+
+ body, _ := json.Marshal(map[string]any{"id": id, "category": " Tech "})
+ req := httptest.NewRequest("POST", "/api/feeds/category", bytes.NewReader(body))
+ req.Header.Set("Content-Type", "application/json")
+ w := httptest.NewRecorder()
+
+ fh.HandleUpdateFeedCategory(h, w, req)
+ if w.Result().StatusCode != 200 {
+ t.Fatalf("expected 200 OK, got %d", w.Result().StatusCode)
+ }
+
+ feed, err := h.DB.GetFeedByID(id)
+ if err != nil {
+ t.Fatalf("GetFeedByID error: %v", err)
+ }
+ if feed.Category != "Tech" {
+ t.Fatalf("expected the category to be trimmed to Tech, got %q", feed.Category)
+ }
+ // Moving a feed between categories must not disturb its other settings.
+ if feed.ProxyURL != "http://127.0.0.1:8080" {
+ t.Fatalf("expected the proxy setting to survive, got %q", feed.ProxyURL)
+ }
+}
+
+func TestHandleUpdateFeedCategoryRejectsBadRequests(t *testing.T) {
+ h := setupHandler(t)
+
+ req := httptest.NewRequest("POST", "/api/feeds/category", bytes.NewReader([]byte("notjson")))
+ w := httptest.NewRecorder()
+ fh.HandleUpdateFeedCategory(h, w, req)
+ if w.Result().StatusCode != 400 {
+ t.Fatalf("expected 400 for an invalid payload, got %d", w.Result().StatusCode)
+ }
+
+ body, _ := json.Marshal(map[string]any{"category": "Tech"})
+ missingID := httptest.NewRequest("POST", "/api/feeds/category", bytes.NewReader(body))
+ w2 := httptest.NewRecorder()
+ fh.HandleUpdateFeedCategory(h, w2, missingID)
+ if w2.Result().StatusCode != 400 {
+ t.Fatalf("expected 400 when the feed identifier is missing, got %d", w2.Result().StatusCode)
+ }
+}
diff --git a/internal/handlers/feed/feed_handlers.go b/internal/handlers/feed/feed_handlers.go
index a2dc848bd..232f94021 100644
--- a/internal/handlers/feed/feed_handlers.go
+++ b/internal/handlers/feed/feed_handlers.go
@@ -5,6 +5,7 @@ import (
"encoding/json"
"net/http"
"strconv"
+ "strings"
"time"
"MrRSS/internal/handlers/core"
@@ -198,6 +199,38 @@ func HandleDeleteFeed(h *core.Handler, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}
+// HandleUpdateFeedCategory moves a feed into a category.
+// @Summary Set a feed's category
+// @Description Update only the category of a feed, leaving its other settings untouched
+// @Tags feeds
+// @Accept json
+// @Produce json
+// @Param request body object true "Feed identifier and category name"
+// @Success 200 {string} string "Category updated successfully"
+// @Failure 400 {object} map[string]string "Bad request"
+// @Failure 500 {object} map[string]string "Internal server error"
+// @Router /feeds/category [post]
+func HandleUpdateFeedCategory(h *core.Handler, w http.ResponseWriter, r *http.Request) {
+ var req struct {
+ ID int64 `json:"id"`
+ Category string `json:"category"`
+ }
+ if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+ response.Error(w, err, http.StatusBadRequest)
+ return
+ }
+ if req.ID <= 0 {
+ response.Error(w, nil, http.StatusBadRequest)
+ return
+ }
+
+ if err := h.DB.UpdateFeedCategory(req.ID, strings.TrimSpace(req.Category)); err != nil {
+ response.Error(w, err, http.StatusInternalServerError)
+ return
+ }
+ w.WriteHeader(http.StatusOK)
+}
+
// HandleUpdateFeed updates a feed's properties.
// @Summary Update a feed
// @Description Update properties of an existing feed subscription
@@ -353,7 +386,18 @@ func HandleUpdateFeed(h *core.Handler, w http.ResponseWriter, r *http.Request) {
}
}
- if err := h.DB.UpdateFeed(req.ID, finalTitle, req.URL, req.Category, req.ScriptPath, req.HideFromTimeline, req.ProxyURL, req.ProxyEnabled, req.RefreshInterval, req.IsImageMode, req.Type, req.XPathItem, req.XPathItemTitle, req.XPathItemContent, req.XPathItemUri, req.XPathItemAuthor, req.XPathItemTimestamp, req.XPathItemTimeFormat, req.XPathItemThumbnail, req.XPathItemCategories, req.XPathItemUid, req.ArticleViewMode, req.AutoExpandContent, req.EmailAddress, req.EmailIMAPServer, req.EmailUsername, req.EmailPassword, req.EmailFolder, req.EmailIMAPPort); err != nil {
+ // The feed listing never sends the IMAP password back, so a client editing
+ // a newsletter feed has nothing to put in that field. An empty value
+ // therefore means "leave it as it is" rather than "clear it"; removing a
+ // password is done by removing the subscription.
+ emailPassword := req.EmailPassword
+ if emailPassword == "" {
+ if existing, err := h.DB.GetFeedByID(req.ID); err == nil && existing != nil {
+ emailPassword = existing.EmailPassword
+ }
+ }
+
+ if err := h.DB.UpdateFeed(req.ID, finalTitle, req.URL, req.Category, req.ScriptPath, req.HideFromTimeline, req.ProxyURL, req.ProxyEnabled, req.RefreshInterval, req.IsImageMode, req.Type, req.XPathItem, req.XPathItemTitle, req.XPathItemContent, req.XPathItemUri, req.XPathItemAuthor, req.XPathItemTimestamp, req.XPathItemTimeFormat, req.XPathItemThumbnail, req.XPathItemCategories, req.XPathItemUid, req.ArticleViewMode, req.AutoExpandContent, req.EmailAddress, req.EmailIMAPServer, req.EmailUsername, emailPassword, req.EmailFolder, req.EmailIMAPPort); err != nil {
response.Error(w, err, http.StatusInternalServerError)
return
}
diff --git a/internal/handlers/feed/update_handlers_test.go b/internal/handlers/feed/update_handlers_test.go
index f0117c53f..92fed00b2 100644
--- a/internal/handlers/feed/update_handlers_test.go
+++ b/internal/handlers/feed/update_handlers_test.go
@@ -41,3 +41,92 @@ func TestHandleUpdateFeed_ValidAndInvalid(t *testing.T) {
t.Fatalf("expected 400 for invalid payload, got %d", w2.Result().StatusCode)
}
}
+
+// The feed listing never sends the IMAP password back, so a client editing a
+// newsletter feed has nothing to put in that field. Saving must therefore leave
+// the stored password alone rather than clearing it.
+func TestHandleUpdateFeed_KeepsIMAPPasswordWhenNoneIsSent(t *testing.T) {
+ h := setupHandler(t)
+
+ id, err := h.DB.AddFeed(&models.Feed{
+ Title: "Newsletter",
+ URL: "email://newsletter",
+ EmailIMAPServer: "imap.example.com",
+ EmailIMAPPort: 993,
+ EmailUsername: "reader",
+ EmailPassword: "secret",
+ EmailFolder: "INBOX",
+ })
+ if err != nil {
+ t.Fatalf("AddFeed error: %v", err)
+ }
+
+ payload := map[string]interface{}{
+ "id": id,
+ "title": "Newsletter",
+ "url": "email://newsletter",
+ "email_imap_server": "imap.example.com",
+ "email_imap_port": 993,
+ "email_username": "reader",
+ "email_password": "",
+ "email_folder": "INBOX",
+ }
+ body, _ := json.Marshal(payload)
+ req := httptest.NewRequest("POST", "/api/feeds/update", bytes.NewReader(body))
+ req.Header.Set("Content-Type", "application/json")
+ w := httptest.NewRecorder()
+
+ fh.HandleUpdateFeed(h, w, req)
+ if w.Result().StatusCode != 200 {
+ t.Fatalf("expected 200 OK, got %d", w.Result().StatusCode)
+ }
+
+ updated, err := h.DB.GetFeedByID(id)
+ if err != nil {
+ t.Fatalf("GetFeedByID error: %v", err)
+ }
+ if updated.EmailPassword != "secret" {
+ t.Fatalf("expected the stored password to survive, got %q", updated.EmailPassword)
+ }
+}
+
+func TestHandleUpdateFeed_ReplacesIMAPPasswordWhenOneIsSent(t *testing.T) {
+ h := setupHandler(t)
+
+ id, err := h.DB.AddFeed(&models.Feed{
+ Title: "Newsletter",
+ URL: "email://newsletter",
+ EmailIMAPServer: "imap.example.com",
+ EmailUsername: "reader",
+ EmailPassword: "secret",
+ })
+ if err != nil {
+ t.Fatalf("AddFeed error: %v", err)
+ }
+
+ payload := map[string]interface{}{
+ "id": id,
+ "title": "Newsletter",
+ "url": "email://newsletter",
+ "email_imap_server": "imap.example.com",
+ "email_username": "reader",
+ "email_password": "rotated",
+ }
+ body, _ := json.Marshal(payload)
+ req := httptest.NewRequest("POST", "/api/feeds/update", bytes.NewReader(body))
+ req.Header.Set("Content-Type", "application/json")
+ w := httptest.NewRecorder()
+
+ fh.HandleUpdateFeed(h, w, req)
+ if w.Result().StatusCode != 200 {
+ t.Fatalf("expected 200 OK, got %d", w.Result().StatusCode)
+ }
+
+ updated, err := h.DB.GetFeedByID(id)
+ if err != nil {
+ t.Fatalf("GetFeedByID error: %v", err)
+ }
+ if updated.EmailPassword != "rotated" {
+ t.Fatalf("expected the new password to be stored, got %q", updated.EmailPassword)
+ }
+}
diff --git a/internal/handlers/opml/opml_handlers.go b/internal/handlers/opml/opml_handlers.go
index 505564e27..0c3f1626b 100644
--- a/internal/handlers/opml/opml_handlers.go
+++ b/internal/handlers/opml/opml_handlers.go
@@ -1,5 +1,3 @@
-//go:build !server
-
package opml
import (
@@ -7,7 +5,6 @@ import (
"io"
"log"
"net/http"
- "os"
"path/filepath"
"strings"
@@ -16,8 +13,6 @@ import (
"MrRSS/internal/jsonimport"
"MrRSS/internal/models"
"MrRSS/internal/opml"
-
- "github.com/wailsapp/wails/v3/pkg/application"
)
// saveFeedTags creates or finds tags by name and associates them with the feed
@@ -70,7 +65,7 @@ func saveFeedTags(h *core.Handler, feedID int64, tags []models.Tag) error {
// HandleOPMLImport handles OPML/JSON file import based on file extension.
// @Summary Import subscriptions from OPML/JSON
-// @Description Import RSS feed subscriptions from an OPML or JSON file
+// @Description Import RSS feed subscriptions from an OPML or JSON file. Accepts either a multipart upload or a raw request body.
// @Tags opml
// @Accept multipart/form-data
// @Produce json
@@ -104,7 +99,8 @@ func HandleOPMLImport(h *core.Handler, w http.ResponseWriter, r *http.Request) {
}
file = f
} else {
- // Handle raw body upload
+ // Handle raw body upload. The filename hint lets the client pick JSON parsing.
+ filename = r.URL.Query().Get("filename")
file = r.Body
defer r.Body.Close()
}
@@ -212,303 +208,36 @@ func HandleOPMLExport(h *core.Handler, w http.ResponseWriter, r *http.Request) {
w.Write(data)
}
-// HandleOPMLImportDialog opens a file dialog to select OPML file for import.
-// @Summary Import dialog (desktop mode)
-// @Description Open a file dialog to select an OPML or JSON file for import (desktop mode only)
+// HandleOPMLImportDialog is not available: the native client presents its own
+// file picker and uploads through /api/opml/import.
+// @Summary Import dialog (not available)
+// @Description File dialogs are handled by the native client. Use /api/opml/import with a file upload instead
// @Tags opml
// @Accept json
// @Produce json
-// @Success 200 {object} map[string]interface{} "Import success (status, feedCount, filePath)"
-// @Success 501 {object} map[string]string "Not implemented in server mode"
-// @Failure 500 {object} map[string]string "Internal server error"
+// @Success 501 {object} map[string]string "Not implemented error"
// @Router /opml/import/dialog [post]
func HandleOPMLImportDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if h.App == nil {
- log.Printf("File dialog not available")
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available. Use /api/opml/import endpoint with file upload instead.",
- })
- return
- }
-
- // Type assert to *application.App to access Dialog
- app, ok := h.App.(*application.App)
- if !ok {
- log.Printf("File dialog not available: app is not *application.App type")
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available. Use /api/opml/import endpoint with file upload instead.",
- })
- return
- }
-
- filePath, err := app.Dialog.OpenFileWithOptions(&application.OpenFileDialogOptions{
- Title: "Import Subscriptions",
- Filters: []application.FileFilter{
- {
- DisplayName: "Supported Files (*.opml;*.xml;*.json)",
- Pattern: "*.opml;*.xml;*.json",
- },
- {
- DisplayName: "OPML Files (*.opml;*.xml)",
- Pattern: "*.opml;*.xml",
- },
- {
- DisplayName: "JSON Files (*.json)",
- Pattern: "*.json",
- },
- {
- DisplayName: "All Files (*)",
- Pattern: "*",
- },
- },
- CanChooseFiles: true,
- AllowsOtherFileTypes: true,
- }).PromptForSingleSelection()
-
- // Treat empty filePath as user cancellation (no error should be shown)
- if filePath == "" {
- log.Printf("Import dialog cancelled by user")
- w.Header().Set("Content-Type", "application/json")
- response.JSON(w, map[string]string{"status": "cancelled"})
- return
- }
-
- // Only show error for actual failures, not cancellations
- if err != nil {
- log.Printf("Error opening file dialog: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to open file dialog",
- })
- return
- }
-
- // Read the selected file
- file, err := os.Open(filePath)
- if err != nil {
- log.Printf("Error opening selected file: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to open selected file",
- })
- return
- }
- defer file.Close()
-
- // Determine format based on file extension
- ext := strings.ToLower(filepath.Ext(filePath))
- isJSON := ext == ".json"
-
- var feeds []models.Feed
-
- if isJSON {
- log.Printf("HandleOPMLImportDialog: Detected JSON format from extension %s", ext)
- feeds, err = jsonimport.Parse(file)
- } else {
- log.Printf("HandleOPMLImportDialog: Using OPML format (extension: %s)", ext)
- feeds, err = opml.Parse(file)
- }
-
- if err != nil {
- log.Printf("Error parsing file: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": err.Error(),
- })
- return
- }
-
- // Import feeds synchronously so they appear in the sidebar immediately
- var feedIDs []int64
- for _, f := range feeds {
- var feedID int64
- var err error
-
- // Check if feed has XPath configuration
- if f.Type == "HTML+XPath" || f.Type == "XML+XPath" {
- feedID, err = h.Fetcher.AddXPathSubscription(
- f.URL, f.Category, f.Title, f.Type,
- f.XPathItem, f.XPathItemTitle, f.XPathItemContent, f.XPathItemUri,
- f.XPathItemAuthor, f.XPathItemTimestamp, f.XPathItemTimeFormat,
- f.XPathItemThumbnail, f.XPathItemCategories, f.XPathItemUid,
- )
- } else {
- feedID, err = h.Fetcher.ImportSubscription(f.Title, f.URL, f.Category)
- }
-
- if err != nil {
- log.Printf("Error importing feed %s: %v", f.Title, err)
- continue
- }
-
- // Save tags for the feed
- if len(f.Tags) > 0 {
- if err := saveFeedTags(h, feedID, f.Tags); err != nil {
- log.Printf("Error saving tags for feed %s: %v", f.Title, err)
- // Continue even if tag saving fails
- }
- }
-
- feedIDs = append(feedIDs, feedID)
- }
-
- // Fetch articles for the newly imported feeds asynchronously with progress tracking
- if len(feedIDs) > 0 {
- go func() {
- h.Fetcher.FetchFeedsByIDs(context.Background(), feedIDs)
- }()
- }
-
- w.Header().Set("Content-Type", "application/json")
+ log.Printf("File dialog operations are handled by the native client")
+ w.WriteHeader(http.StatusNotImplemented)
response.JSON(w, map[string]interface{}{
- "status": "success",
- "feedCount": len(feeds),
- "filePath": filePath,
+ "error": "File dialogs are handled by the native client. Use /api/opml/import with a file upload instead.",
})
}
-// HandleOPMLExportDialog opens a save dialog to export OPML file.
-// @Summary Export dialog (desktop mode)
-// @Description Open a save dialog to export subscriptions to OPML or JSON file (desktop mode only)
+// HandleOPMLExportDialog is not available: the native client presents its own
+// save panel and downloads through /api/opml/export.
+// @Summary Export dialog (not available)
+// @Description File dialogs are handled by the native client. Use /api/opml/export for a direct download instead
// @Tags opml
// @Accept json
// @Produce json
-// @Success 200 {object} map[string]interface{} "Export success (status, filePath)"
-// @Success 501 {object} map[string]string "Not implemented in server mode"
-// @Failure 500 {object} map[string]string "Internal server error"
+// @Success 501 {object} map[string]string "Not implemented error"
// @Router /opml/export/dialog [post]
func HandleOPMLExportDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- if h.App == nil {
- log.Printf("File dialog not available")
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available. Use the direct export endpoint instead.",
- })
- return
- }
-
- // Get feeds data
- feeds, err := h.DB.GetFeeds()
- if err != nil {
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": err.Error(),
- })
- return
- }
-
- // Filter out FreshRSS feeds - only export local feeds
- localFeeds := make([]models.Feed, 0)
- for _, feed := range feeds {
- if !feed.IsFreshRSSSource {
- localFeeds = append(localFeeds, feed)
- }
- }
-
- log.Printf("[OPML Export Dialog] Exporting %d local feeds (excluded %d FreshRSS feeds)",
- len(localFeeds), len(feeds)-len(localFeeds))
-
- // Type assert to *application.App to access Dialog
- app, ok := h.App.(*application.App)
- if !ok {
- log.Printf("File dialog not available: app is not *application.App type")
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available. Use /api/opml/export endpoint with direct download instead.",
- })
- return
- }
-
- filePath, err := app.Dialog.SaveFileWithOptions(&application.SaveFileDialogOptions{
- Title: "Export Subscriptions",
- Filename: "subscriptions.opml",
- Filters: []application.FileFilter{
- {
- DisplayName: "OPML Files (*.opml)",
- Pattern: "*.opml",
- },
- {
- DisplayName: "JSON Files (*.json)",
- Pattern: "*.json",
- },
- {
- DisplayName: "XML Files (*.xml)",
- Pattern: "*.xml",
- },
- {
- DisplayName: "All Files (*)",
- Pattern: "*",
- },
- },
- AllowOtherFileTypes: true,
- }).PromptForSingleSelection()
-
- // Treat empty filePath as user cancellation (no error should be shown)
- if filePath == "" {
- log.Printf("Export dialog cancelled by user")
- w.Header().Set("Content-Type", "application/json")
- response.JSON(w, map[string]string{"status": "cancelled"})
- return
- }
-
- // Only show error for actual failures, not cancellations
- if err != nil {
- log.Printf("Error opening save dialog: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to open save dialog",
- })
- return
- }
-
- // Determine format based on file extension
- ext := strings.ToLower(filepath.Ext(filePath))
- isJSON := ext == ".json"
-
- var data []byte
- if isJSON {
- log.Printf("HandleOPMLExportDialog: Generating JSON format")
- data, err = jsonimport.Generate(localFeeds)
- } else {
- log.Printf("HandleOPMLExportDialog: Generating OPML format (extension: %s)", ext)
- data, err = opml.Generate(localFeeds)
- }
-
- if err != nil {
- log.Printf("Error generating export data: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": err.Error(),
- })
- return
- }
-
- // Write content to selected file
- err = os.WriteFile(filePath, data, 0644)
- if err != nil {
- log.Printf("Error writing file: %v", err)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusInternalServerError)
- response.JSON(w, map[string]interface{}{
- "error": "Failed to write file",
- })
- return
- }
-
+ log.Printf("File dialog is handled by the native client")
+ w.WriteHeader(http.StatusNotImplemented)
response.JSON(w, map[string]interface{}{
- "status": "success",
- "filePath": filePath,
+ "error": "File dialogs are handled by the native client. Use /api/opml/export for a direct download instead.",
})
}
diff --git a/internal/handlers/opml/opml_handlers_server.go b/internal/handlers/opml/opml_handlers_server.go
deleted file mode 100644
index a06857717..000000000
--- a/internal/handlers/opml/opml_handlers_server.go
+++ /dev/null
@@ -1,150 +0,0 @@
-//go:build server
-
-package opml
-
-import (
- "io"
- "log"
- "net/http"
- "strings"
-
- "MrRSS/internal/handlers/core"
- "MrRSS/internal/handlers/response"
- "MrRSS/internal/opml"
-)
-
-// HandleOPMLImport handles OPML file import for server mode.
-// @Summary Import OPML file
-// @Description Import feeds from an OPML file (server mode - requires file upload)
-// @Tags opml
-// @Accept multipart/form-data
-// @Produce json
-// @Param file formData file true "OPML file"
-// @Success 200 {object} map[string]interface{} "Import result (success, imported, total)"
-// @Failure 400 {object} map[string]string "Bad request (invalid file or format)"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /opml/import [post]
-func HandleOPMLImport(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- log.Printf("HandleOPMLImport: ContentLength: %d", r.ContentLength)
-
- // Parse multipart form
- err := r.ParseMultipartForm(32 << 20) // 32MB max
- if err != nil {
- log.Printf("Error parsing multipart form: %v", err)
- response.Error(w, err, http.StatusBadRequest)
- return
- }
-
- // Get the file
- file, header, err := r.FormFile("file")
- if err != nil {
- log.Printf("Error getting file: %v", err)
- response.Error(w, err, http.StatusBadRequest)
- return
- }
- defer file.Close()
-
- log.Printf("Received file: %s, size: %d", header.Filename, header.Size)
-
- // Read file content
- content, err := io.ReadAll(file)
- if err != nil {
- log.Printf("Error reading file: %v", err)
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Parse OPML
- feeds, err := opml.Parse(strings.NewReader(string(content)))
- if err != nil {
- log.Printf("Error parsing OPML: %v", err)
- response.Error(w, err, http.StatusBadRequest)
- return
- }
-
- log.Printf("Parsed %d feeds from OPML", len(feeds))
-
- // Import feeds
- imported := 0
- for _, feed := range feeds {
- _, err := h.DB.AddFeed(&feed)
- if err != nil {
- log.Printf("Error importing feed %s: %v", feed.URL, err)
- continue
- }
- imported++
- }
-
- log.Printf("Successfully imported %d feeds", imported)
-
- // Return success response
- response.JSON(w, map[string]interface{}{
- "success": true,
- "imported": imported,
- "total": len(feeds),
- })
-}
-
-// HandleOPMLImportDialog is not available in server mode.
-// @Summary Import dialog (not available in server mode)
-// @Description File dialog operations are not available in server mode. Use /api/opml/import with file upload instead
-// @Tags opml
-// @Accept json
-// @Produce json
-// @Success 501 {object} map[string]string "Not implemented error"
-// @Router /opml/import/dialog [post]
-func HandleOPMLImportDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- log.Printf("File dialog operations are not available in server mode")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog operations are not available in server mode. Use /api/opml/import endpoint with file upload instead.",
- })
-}
-
-// HandleOPMLExport handles OPML export for server mode.
-// @Summary Export OPML file
-// @Description Export all feeds as an OPML file (server mode - direct download)
-// @Tags opml
-// @Accept json
-// @Produce xml
-// @Success 200 {string} string "OPML XML file"
-// @Failure 500 {object} map[string]string "Internal server error"
-// @Router /opml/export [get]
-func HandleOPMLExport(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- // Get feeds data
- feeds, err := h.DB.GetFeeds()
- if err != nil {
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Generate OPML content
- data, err := opml.Generate(feeds)
- if err != nil {
- response.Error(w, err, http.StatusInternalServerError)
- return
- }
-
- // Set headers for file download
- w.Header().Set("Content-Type", "application/xml")
- w.Header().Set("Content-Disposition", "attachment; filename=subscriptions.opml")
-
- // Write OPML content
- w.Write(data)
-}
-
-// HandleOPMLExportDialog is not available in server mode.
-// @Summary Export dialog (not available in server mode)
-// @Description File dialog operations are not available in server mode. Use /api/opml/export with direct download instead
-// @Tags opml
-// @Accept json
-// @Produce json
-// @Success 501 {object} map[string]string "Not implemented error"
-// @Router /opml/export/dialog [post]
-func HandleOPMLExportDialog(h *core.Handler, w http.ResponseWriter, r *http.Request) {
- log.Printf("File dialog not available in server mode")
- w.WriteHeader(http.StatusNotImplemented)
- response.JSON(w, map[string]interface{}{
- "error": "File dialog not available in server mode. Use /api/opml/export endpoint with direct download instead.",
- })
-}
diff --git a/internal/handlers/summary/summary_handlers.go b/internal/handlers/summary/summary_handlers.go
index f3fac4012..cb1f41401 100644
--- a/internal/handlers/summary/summary_handlers.go
+++ b/internal/handlers/summary/summary_handlers.go
@@ -149,7 +149,7 @@ func HandleSummarizeArticle(h *core.Handler, w http.ResponseWriter, r *http.Requ
apiKey = cfg.APIKey
endpoint = cfg.Endpoint
model = cfg.Model
- log.Printf("Using AI profile for summarization (endpoint: %s, model: %s)", endpoint, model)
+ log.Printf("AI summary profile selected endpoint=%s model=%s", ai.RedactEndpoint(endpoint), model)
}
}
@@ -182,7 +182,8 @@ func HandleSummarizeArticle(h *core.Handler, w http.ResponseWriter, r *http.Requ
}
aiResult, err := aiSummarizer.Summarize(content, summaryLength)
if err != nil {
- log.Printf("Error generating AI summary, falling back to local: %v", err)
+ publicErr := ai.ClassifyUserFacingError(err)
+ log.Printf("AI summary failed code=%s status=%d; using local fallback", publicErr.Code, publicErr.HTTPStatus)
// Fallback to local algorithm on any AI error
summarizer := summary.NewSummarizer()
result = summarizer.Summarize(content, summaryLength)
diff --git a/internal/handlers/translation/translation_handlers.go b/internal/handlers/translation/translation_handlers.go
index 7ba9e7be6..b66c23085 100644
--- a/internal/handlers/translation/translation_handlers.go
+++ b/internal/handlers/translation/translation_handlers.go
@@ -21,9 +21,10 @@ type TestCustomTranslationRequest struct {
// TestCustomTranslationResponse represents the response from a custom translation test
type TestCustomTranslationResponse struct {
- Success bool `json:"success"`
- Result string `json:"result,omitempty"`
- Error string `json:"error,omitempty"`
+ Success bool `json:"success"`
+ Result string `json:"result,omitempty"`
+ Error string `json:"error,omitempty"`
+ ErrorCode string `json:"error_code,omitempty"`
}
// HandleTranslateArticle translates an article's title.
@@ -270,7 +271,8 @@ func HandleTranslateText(h *core.Handler, w http.ResponseWriter, r *http.Request
// If AI fails, fallback to Google Translate
if err != nil {
- log.Printf("AI translation failed, falling back to Google Translate: %v", err)
+ publicErr := ai.ClassifyUserFacingError(err)
+ log.Printf("AI translation failed code=%s status=%d; using Google Translate fallback", publicErr.Code, publicErr.HTTPStatus)
googleTranslator := translation.NewGoogleFreeTranslatorWithDB(h.DB)
translatedText, err = translation.TranslateMarkdownPreservingStructure(req.Text, googleTranslator, req.TargetLang)
}
@@ -412,7 +414,9 @@ func HandleTestCustomTranslation(h *core.Handler, w http.ResponseWriter, r *http
}
if err != nil {
- resp["error"] = err.Error()
+ publicErr := ai.ClassifyUserFacingError(err)
+ resp["error"] = publicErr.Message
+ resp["error_code"] = publicErr.Code
w.WriteHeader(http.StatusBadRequest)
} else {
resp["translation"] = result
diff --git a/internal/routes/feed_routes.go b/internal/routes/feed_routes.go
index 17c4cd230..9e78e6a10 100644
--- a/internal/routes/feed_routes.go
+++ b/internal/routes/feed_routes.go
@@ -18,6 +18,9 @@ func registerFeedRoutes(mux *http.ServeMux, h *core.Handler) {
mux.HandleFunc("/api/feeds/add", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleAddFeed(h, w, r) })
mux.HandleFunc("/api/feeds/delete", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleDeleteFeed(h, w, r) })
mux.HandleFunc("/api/feeds/update", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleUpdateFeed(h, w, r) })
+ mux.HandleFunc("/api/feeds/category", func(w http.ResponseWriter, r *http.Request) {
+ feedhandlers.HandleUpdateFeedCategory(h, w, r)
+ })
mux.HandleFunc("/api/feeds/refresh", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleRefreshFeed(h, w, r) })
mux.HandleFunc("/api/feeds/reorder", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleReorderFeed(h, w, r) })
mux.HandleFunc("/api/feeds/test-imap", func(w http.ResponseWriter, r *http.Request) { feedhandlers.HandleTestIMAPConnection(h, w, r) })
diff --git a/internal/translation/google.go b/internal/translation/google.go
index 65b61a969..a5cd6af39 100644
--- a/internal/translation/google.go
+++ b/internal/translation/google.go
@@ -5,7 +5,9 @@ import (
"fmt"
"net/http"
"net/url"
+ "strings"
"time"
+ "unicode"
)
type GoogleFreeTranslator struct {
@@ -39,6 +41,31 @@ func (t *GoogleFreeTranslator) Translate(text, targetLang string) (string, error
if text == "" {
return "", nil
}
+ if textAlreadyMatchesTarget(text, targetLang) {
+ return text, nil
+ }
+
+ translated, err := t.translateWithGoogle(text, targetLang)
+ if err != nil {
+ return "", fmt.Errorf("google translation service is unavailable: %s", sanitizedTranslationError(err))
+ }
+ return translated, nil
+}
+
+func (t *GoogleFreeTranslator) translateWithGoogle(text, targetLang string) (string, error) {
+ chunks := splitTranslationText(text, 1_800)
+ translatedChunks := make([]string, 0, len(chunks))
+ for _, chunk := range chunks {
+ translated, err := t.translateGoogleChunk(chunk, targetLang)
+ if err != nil {
+ return "", err
+ }
+ translatedChunks = append(translatedChunks, translated)
+ }
+ return strings.Join(translatedChunks, ""), nil
+}
+
+func (t *GoogleFreeTranslator) translateGoogleChunk(text, targetLang string) (string, error) {
// Get the configured endpoint, default to translate.googleapis.com
endpoint := "translate.googleapis.com"
@@ -80,7 +107,12 @@ func (t *GoogleFreeTranslator) Translate(text, targetLang string) (string, error
q.Set("q", text)
u.RawQuery = q.Encode()
- resp, err := t.client.Get(u.String())
+ req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+ if err != nil {
+ return "", err
+ }
+ req.Header.Set("User-Agent", "Mozilla/5.0")
+ resp, err := t.client.Do(req)
if err != nil {
return "", err
}
@@ -115,3 +147,69 @@ func (t *GoogleFreeTranslator) Translate(text, targetLang string) (string, error
return "", fmt.Errorf("invalid response format")
}
+
+func textAlreadyMatchesTarget(text, targetLang string) bool {
+ var letters, cjk, latin int
+ for _, r := range text {
+ if unicode.IsLetter(r) {
+ letters++
+ if unicode.In(r, unicode.Han) {
+ cjk++
+ } else if unicode.In(r, unicode.Latin) {
+ latin++
+ }
+ }
+ }
+ if letters == 0 {
+ return true
+ }
+ switch strings.ToLower(targetLang) {
+ case "zh", "zh-cn", "zh-tw", "zh-hans", "zh-hant":
+ return cjk*100/letters >= 70
+ case "en", "en-us", "en-gb":
+ return latin*100/letters >= 95
+ default:
+ return false
+ }
+}
+
+func splitTranslationText(text string, maxBytes int) []string {
+ if len([]byte(text)) <= maxBytes {
+ return []string{text}
+ }
+
+ chunks := make([]string, 0, len(text)/maxBytes+1)
+ var builder strings.Builder
+ currentBytes := 0
+ for _, r := range text {
+ runeBytes := len(string(r))
+ if currentBytes > 0 && currentBytes+runeBytes > maxBytes {
+ chunks = append(chunks, builder.String())
+ builder.Reset()
+ currentBytes = 0
+ }
+ builder.WriteRune(r)
+ currentBytes += runeBytes
+ }
+ if builder.Len() > 0 {
+ chunks = append(chunks, builder.String())
+ }
+ return chunks
+}
+
+func sanitizedTranslationError(err error) string {
+ if err == nil {
+ return "unknown error"
+ }
+ message := err.Error()
+ if strings.Contains(message, "context deadline exceeded") || strings.Contains(message, "Client.Timeout") {
+ return "request timed out; configure the proxy or select another translation provider"
+ }
+ if strings.Contains(message, "no such host") {
+ return "service address could not be resolved; configure the proxy or select another translation provider"
+ }
+ if len(message) > 160 {
+ return message[:160]
+ }
+ return message
+}
diff --git a/internal/translation/translation_providers_test.go b/internal/translation/translation_providers_test.go
index ec3c0bf17..0cbf849b1 100644
--- a/internal/translation/translation_providers_test.go
+++ b/internal/translation/translation_providers_test.go
@@ -1,6 +1,7 @@
package translation
import (
+ "context"
"encoding/json"
"io"
"net/http"
@@ -158,3 +159,38 @@ func TestAITranslate_RemovesThinkingBlocks(t *testing.T) {
t.Fatalf("expected thinking-free translation, got %q", out)
}
}
+
+func TestGoogleTranslateSkipsRequestWhenTextMatchesTargetLanguage(t *testing.T) {
+ translator := NewGoogleFreeTranslator()
+ requestCount := 0
+ translator.client = &http.Client{Transport: rtFunc(func(req *http.Request) (*http.Response, error) {
+ requestCount++
+ return nil, context.DeadlineExceeded
+ })}
+
+ translated, err := translator.Translate("čŋéæŊäļæå
åŪđ", "zh")
+ if err != nil {
+ t.Fatalf("expected same-language translation to succeed: %v", err)
+ }
+ if translated != "čŋéæŊäļæå
åŪđ" {
+ t.Fatalf("expected unchanged text, got %q", translated)
+ }
+ if requestCount != 0 {
+ t.Fatalf("expected no network requests, got %d", requestCount)
+ }
+}
+
+func TestGoogleTranslateReturnsSanitizedTimeout(t *testing.T) {
+ translator := NewGoogleFreeTranslator()
+ translator.client = &http.Client{Transport: rtFunc(func(req *http.Request) (*http.Response, error) {
+ return nil, context.DeadlineExceeded
+ })}
+
+ _, err := translator.Translate("Hello", "zh")
+ if err == nil {
+ t.Fatal("expected translation to fail")
+ }
+ if strings.Contains(err.Error(), "q=Hello") || !strings.Contains(err.Error(), "configure the proxy") {
+ t.Fatalf("expected a concise configuration hint without source text, got %q", err.Error())
+ }
+}
diff --git a/internal/version/version.go b/internal/version/version.go
index c91838ae5..797f57198 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -1,4 +1,4 @@
package version
// Version is the current application version
-const Version = "1.3.27"
+const Version = "1.3.28"
diff --git a/main-core.go b/main-core.go
deleted file mode 100644
index 04a9d9aaa..000000000
--- a/main-core.go
+++ /dev/null
@@ -1,240 +0,0 @@
-//go:build server
-
-package main
-
-import (
- "context"
- "embed"
- "flag"
- "fmt"
- "io"
- "io/fs"
- "log"
- "net/http"
- "os"
- "os/signal"
- "strconv"
- "strings"
- "syscall"
- "time"
-
- "MrRSS/internal/ai"
- "MrRSS/internal/database"
- "MrRSS/internal/feed"
- handlers "MrRSS/internal/handlers/core"
- "MrRSS/internal/network"
- "MrRSS/internal/routes"
- "MrRSS/internal/translation"
- "MrRSS/internal/utils/fileutil"
-
- httpSwagger "github.com/swaggo/http-swagger"
-)
-
-// @title MrRSS API
-// @version 1.3.27
-// @description MrRSS is a modern, cross-platform desktop RSS reader with auto-translation, smart feed discovery, and AI-powered summarization.
-
-// @contact.name API Support
-// @contact.url https://github.com/DevXDojojo/MrRSS
-// @contact.email mail@ch3nyang.top
-
-// @license.name GPL-3.0
-// @license.url https://www.gnu.org/licenses/gpl-3.0.en.html
-
-// @host localhost:1234
-// @BasePath /api
-
-// @securityDefinitions.apikey BearerAuth
-// @in header
-// @name Authorization
-// @description Type "Bearer" followed by a space and JWT token.
-
-var debugLogging = os.Getenv("MRRSS_DEBUG") != ""
-
-func debugLog(format string, args ...interface{}) {
- if debugLogging {
- log.Printf(format, args...)
- }
-}
-
-//go:embed frontend/dist
-var frontendFiles embed.FS
-
-type CombinedHandler struct {
- apiMux *http.ServeMux
- fileServer http.Handler
-}
-
-func (h *CombinedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- if strings.HasPrefix(r.URL.Path, "/api/") {
- h.apiMux.ServeHTTP(w, r)
- return
- }
- h.fileServer.ServeHTTP(w, r)
-}
-
-func main() {
- // Parse flags
- flag.BoolFunc("server", "Run in headless server mode", func(s string) error {
- v, err := strconv.ParseBool(s)
- if err != nil {
- return err
- }
- fileutil.SetServerMode(v)
- return nil
- })
- host := flag.String("host", "0.0.0.0", "Host to listen on in server mode")
- port := flag.String("port", "1234", "Port to listen on in server mode")
- flag.Parse()
-
- // Force server mode for this build
- fileutil.SetServerMode(true)
-
- // Get proper paths for data files
- logPath, err := fileutil.GetLogPath()
- if err != nil {
- log.Printf("Warning: Could not get log path: %v. Using current directory.", err)
- logPath = "debug.log"
- }
-
- // In server mode, log to both stdout and file
- f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
- if err != nil {
- log.SetOutput(os.Stdout) // Fallback
- } else {
- // Note: we don't close f here as it needs to stay open for logging
- // It will be closed by OS on process exit
- log.SetOutput(io.MultiWriter(os.Stdout, f))
- }
-
- log.Println("Starting application in server mode...")
-
- // Log portable mode status
- if fileutil.IsPortableMode() {
- log.Println("Running in PORTABLE mode")
- } else {
- log.Println("Running in NORMAL mode")
- }
-
- log.Printf("Log file: %s", logPath)
-
- // Get database path
- dbPath, err := fileutil.GetDBPath()
- if err != nil {
- log.Printf("Error getting database path: %v", err)
- log.Fatal(err)
- }
- debugLog("Database path: %s", dbPath)
-
- // Initialize database
- log.Println("Initializing Database...")
- db, err := database.NewDB(dbPath)
- if err != nil {
- log.Printf("Error initializing database: %v", err)
- log.Fatal(err)
- }
-
- // Run database schema initialization synchronously to ensure it's ready
- log.Println("Running DB migrations...")
- if err := db.Init(); err != nil {
- log.Printf("Error initializing database schema: %v", err)
- log.Fatal(err)
- }
- log.Println("Database initialized successfully")
-
- // Initialize AI profile provider
- profileProvider := ai.NewProfileProvider(db)
- translator := translation.NewDynamicTranslatorWithCache(db, db)
- translator.SetProfileProvider(profileProvider)
-
- fetcher := feed.NewFetcher(db)
- h := handlers.NewHandler(db, fetcher, translator, profileProvider)
-
- // API Routes
- log.Println("Setting up API routes...")
- apiMux := http.NewServeMux()
- routes.RegisterAPIRoutes(apiMux, h)
-
- // Swagger Documentation - Serve swagger.json file
- apiMux.HandleFunc("/docs/SERVER_MODE/swagger.json", func(w http.ResponseWriter, r *http.Request) {
- http.ServeFile(w, r, "docs/SERVER_MODE/swagger.json")
- })
-
- apiMux.HandleFunc("/swagger/*", httpSwagger.Handler(
- httpSwagger.URL("/docs/SERVER_MODE/swagger.json"),
- ))
-
- // Static Files
- log.Println("Setting up static files...")
- frontendFS, err := fs.Sub(frontendFiles, "frontend/dist")
- if err != nil {
- log.Fatal(err)
- }
-
- fileServer := http.FileServer(http.FS(frontendFS))
-
- combinedHandler := &CombinedHandler{
- apiMux: apiMux,
- fileServer: fileServer,
- }
-
- log.Printf("Starting in headless server mode on http://%s:%s", *host, *port)
-
- // Start background scheduler
- // Use a context that we can cancel on shutdown
- bgCtx, bgCancel := context.WithCancel(context.Background())
-
- log.Println("Starting background scheduler...")
- go h.StartBackgroundScheduler(bgCtx)
-
- // Start Network Speed Detection (optional but good to have)
- go func() {
- log.Println("Detecting network speed...")
- detector := network.NewDetector(&http.Client{Timeout: 10 * time.Second})
- detectCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
- defer cancel()
-
- result := detector.DetectSpeed(detectCtx)
- if result.DetectionSuccess {
- db.SetSetting("network_speed", string(result.SpeedLevel))
- db.SetSetting("network_bandwidth_mbps", fmt.Sprintf("%.2f", result.BandwidthMbps))
- log.Printf("Network detection complete: %s", result.SpeedLevel)
- }
- }()
-
- // Start HTTP Server
- srv := &http.Server{
- Addr: *host + ":" + *port,
- Handler: combinedHandler,
- }
-
- go func() {
- if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
- log.Fatalf("HTTP server failed: %v", err)
- }
- }()
-
- // Wait for interrupt
- quit := make(chan os.Signal, 1)
- signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
- <-quit
-
- log.Println("Shutting down server...")
- bgCancel()
-
- // Shutdown HTTP server
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- defer cancel()
- if err := srv.Shutdown(ctx); err != nil {
- log.Printf("Server forced to shutdown: %v", err)
- }
-
- // Close Database
- if err := db.Close(); err != nil {
- log.Printf("Error closing database: %v", err)
- } else {
- log.Println("Database closed")
- }
-
- log.Println("Server exited")
-}
diff --git a/main.go b/main.go
index befc61197..40d91b079 100644
--- a/main.go
+++ b/main.go
@@ -1,105 +1,89 @@
-//go:build !server
-
package main
import (
"context"
- "embed"
+ "flag"
"fmt"
- "io/fs"
+ "io"
"log"
- "log/slog"
"net/http"
"os"
- "runtime"
+ "os/signal"
"strconv"
- "strings"
- "sync/atomic"
+ "syscall"
"time"
- "github.com/wailsapp/wails/v3/pkg/application"
- "github.com/wailsapp/wails/v3/pkg/events"
-
"MrRSS/internal/ai"
"MrRSS/internal/database"
- "MrRSS/internal/desktopapi"
"MrRSS/internal/feed"
handlers "MrRSS/internal/handlers/core"
- "MrRSS/internal/monitor"
"MrRSS/internal/network"
"MrRSS/internal/routes"
"MrRSS/internal/translation"
"MrRSS/internal/utils/fileutil"
- "MrRSS/internal/utils/httputil"
+
+ httpSwagger "github.com/swaggo/http-swagger"
)
-var debugLogging = os.Getenv("MRRSS_DEBUG") != ""
+// @title MrRSS API
+// @version 1.3.28
+// @description MrRSS is a modern, cross-platform desktop RSS reader with auto-translation, smart feed discovery, and AI-powered summarization.
-func debugLog(format string, args ...interface{}) {
- if debugLogging {
- log.Printf(format, args...)
- }
-}
+// @contact.name API Support
+// @contact.url https://github.com/DevXDojojo/MrRSS
+// @contact.email mail@ch3nyang.top
-//go:embed frontend/dist
-var frontendFiles embed.FS
+// @license.name GPL-3.0
+// @license.url https://www.gnu.org/licenses/gpl-3.0.en.html
-// Platform-specific icon embedding
-// Windows and macOS both use PNG format for system tray
-// Windows .ico is only used for executable icon (via syso)
-//
-//go:embed build/windows/icon.png
-var appIconWindows []byte
+// @host localhost:1234
+// @BasePath /api
-//go:embed build/appicon.png
-var appIconMacOS []byte
+// @securityDefinitions.apikey BearerAuth
+// @in header
+// @name Authorization
+// @description Type "Bearer" followed by a space and JWT token.
-// getAppIcon returns the appropriate icon for the current platform
-func getAppIcon() []byte {
- if runtime.GOOS == "windows" {
- return appIconWindows
- }
- return appIconMacOS
-}
+var debugLogging = os.Getenv("MRRSS_DEBUG") != ""
-type windowState struct {
- width int
- height int
- x int
- y int
- valid atomic.Bool
- maximized atomic.Bool
+func debugLog(format string, args ...interface{}) {
+ if debugLogging {
+ log.Printf(format, args...)
+ }
}
-type CombinedHandler struct {
- apiMux *http.ServeMux
- fileServer http.Handler
+// APIHandler serves the MrRSS HTTP API. The macOS client is a native SwiftUI
+// application, so no web frontend is bundled with this build.
+type APIHandler struct {
+ apiMux *http.ServeMux
}
-func (h *CombinedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- if strings.HasPrefix(r.URL.Path, "/api/") {
- h.apiMux.ServeHTTP(w, r)
+func (h *APIHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ if r.URL.Path == "/" {
+ w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+ _, _ = io.WriteString(w, "MrRSS API server. See /api/ for endpoints.\n")
return
}
- h.fileServer.ServeHTTP(w, r)
-}
-
-// APIMiddleware routes API requests to the API handler, and lets Wails handle the rest
-func APIMiddleware(combinedHandler *CombinedHandler) application.Middleware {
- return func(next http.Handler) http.Handler {
- return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- // Let the /wails route be handled by Wails runtime
- if strings.HasPrefix(r.URL.Path, "/wails") {
- next.ServeHTTP(w, r)
- return
- }
- // Handle API routes and serve static files
- combinedHandler.ServeHTTP(w, r)
- })
- }
+ h.apiMux.ServeHTTP(w, r)
}
func main() {
+ // Parse flags
+ flag.BoolFunc("server", "Run in headless server mode", func(s string) error {
+ v, err := strconv.ParseBool(s)
+ if err != nil {
+ return err
+ }
+ fileutil.SetServerMode(v)
+ return nil
+ })
+ host := flag.String("host", "0.0.0.0", "Host to listen on in server mode")
+ port := flag.String("port", "1234", "Port to listen on in server mode")
+ flag.Parse()
+
+ // Force server mode for this build
+ fileutil.SetServerMode(true)
+
// Get proper paths for data files
logPath, err := fileutil.GetLogPath()
if err != nil {
@@ -107,19 +91,17 @@ func main() {
logPath = "debug.log"
}
- // Clear previous log by opening in truncate mode
- f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
+ // In server mode, log to both stdout and file
+ f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
- log.Printf("Failed to open log file: %v", err)
- // Fallback to stdout
- f = nil
- }
- if f != nil {
- defer f.Close()
- log.SetOutput(f)
+ log.SetOutput(os.Stdout) // Fallback
+ } else {
+ // Note: we don't close f here as it needs to stay open for logging
+ // It will be closed by OS on process exit
+ log.SetOutput(io.MultiWriter(os.Stdout, f))
}
- log.Println("Starting application...")
+ log.Println("Starting application in server mode...")
// Log portable mode status
if fileutil.IsPortableMode() {
@@ -162,465 +144,35 @@ func main() {
fetcher := feed.NewFetcher(db)
h := handlers.NewHandler(db, fetcher, translator, profileProvider)
- var quitRequested atomic.Bool
- var lastWindowState windowState
-
// API Routes
log.Println("Setting up API routes...")
apiMux := http.NewServeMux()
routes.RegisterAPIRoutes(apiMux, h)
- // Static Files
- log.Println("Setting up static files...")
- frontendFS, err := fs.Sub(frontendFiles, "frontend/dist")
- if err != nil {
- log.Fatal(err)
- }
+ // Swagger Documentation - Serve swagger.json file
+ apiMux.HandleFunc("/docs/SERVER_MODE/swagger.json", func(w http.ResponseWriter, r *http.Request) {
+ http.ServeFile(w, r, "docs/SERVER_MODE/swagger.json")
+ })
- fileServer := http.FileServer(http.FS(frontendFS))
+ apiMux.HandleFunc("/swagger/*", httpSwagger.Handler(
+ httpSwagger.URL("/docs/SERVER_MODE/swagger.json"),
+ ))
- combinedHandler := &CombinedHandler{
- apiMux: apiMux,
- fileServer: fileServer,
- }
+ combinedHandler := &APIHandler{apiMux: apiMux}
- shouldCloseToTray := func() bool {
- val, err := db.GetSetting("close_to_tray")
- return err == nil && val == "true"
- }
+ log.Printf("Starting in headless server mode on http://%s:%s", *host, *port)
// Start background scheduler
- log.Println("Starting background scheduler...")
+ // Use a context that we can cancel on shutdown
bgCtx, bgCancel := context.WithCancel(context.Background())
- // Encryption key for single instance communication (IPC between app instances).
- // This key is used to encrypt/decrypt messages between first and subsequent instances.
- // Note: This is not for sensitive data encryption - it only carries launch arguments.
- // The key is hardcoded per Wails v3 examples since the data exchanged is not sensitive
- // (just signals to bring window to front).
- var encryptionKey = [32]byte{
- 0x1e, 0x1f, 0x1c, 0x1d, 0x1a, 0x1b, 0x18, 0x19,
- 0x16, 0x17, 0x14, 0x15, 0x12, 0x13, 0x10, 0x11,
- 0x0e, 0x0f, 0x0c, 0x0d, 0x0a, 0x0b, 0x08, 0x09,
- 0x06, 0x07, 0x04, 0x05, 0x02, 0x03, 0x00, 0x01,
- }
-
- // Variable to store the main window reference
- var mainWindow application.Window
-
- log.Println("Starting Wails v3...")
-
- // Create new Wails v3 application
- app := application.New(application.Options{
- Name: "MrRSS",
- Description: "A modern, privacy-focused RSS reader",
- LogLevel: slog.LevelError,
- Assets: application.AssetOptions{
- Handler: combinedHandler,
- Middleware: APIMiddleware(combinedHandler),
- },
- Mac: application.MacOptions{
- ApplicationShouldTerminateAfterLastWindowClosed: false,
- },
- SingleInstance: func() *application.SingleInstanceOptions {
- // Disable single instance on Linux due to potential D-Bus issues
- if runtime.GOOS == "linux" {
- return nil
- }
- return &application.SingleInstanceOptions{
- UniqueID: "com.mrrss.app",
- EncryptionKey: encryptionKey,
- OnSecondInstanceLaunch: func(data application.SecondInstanceData) {
- log.Printf("Second instance detected, bringing window to front")
- if mainWindow != nil {
- // Restore window state if it was stored (minimized to tray)
- if lastWindowState.valid.Load() {
- width := lastWindowState.width
- height := lastWindowState.height
- x := lastWindowState.x
- y := lastWindowState.y
-
- // Ensure minimum window size
- if width < 400 {
- width = 1024
- }
- if height < 300 {
- height = 768
- }
-
- // Ensure window is at least partially on screen
- if x < -1000 || x > 3000 {
- x = 100
- }
- if y < -1000 || y > 3000 {
- y = 100
- }
-
- mainWindow.SetSize(width, height)
- mainWindow.SetPosition(x, y)
- }
- // Show and unminimize the window
- mainWindow.Show()
- if lastWindowState.maximized.Load() {
- mainWindow.Maximise()
- } else {
- mainWindow.Restore()
- }
- }
- },
- }
- }(),
- })
-
- // Set app instance to handler for browser integration
- h.SetApp(app)
- log.Println("Browser integration enabled")
-
- // Expose the API to local integrations such as the mrrss-assistant skill.
- // The listener is loopback-only and deliberately does not serve frontend assets.
- desktopAPIServer, apiErr := desktopapi.Start(
- desktopapi.DefaultAddress,
- routes.WrapWithMiddleware(apiMux, routes.DefaultConfig()),
- )
- if apiErr != nil {
- log.Printf("Local desktop API unavailable: %v", apiErr)
- } else {
- log.Printf("Local desktop API listening on http://%s/api", desktopAPIServer.Address())
- go func() {
- if serveErr := <-desktopAPIServer.Errors(); serveErr != nil {
- log.Printf("Local desktop API stopped unexpectedly: %v", serveErr)
- }
- }()
- }
-
- // Get window dimensions from stored state or defaults
- windowWidth := 1024
- windowHeight := 768
- windowX := 0
- windowY := 0
- restoredFromDB := false
- restoredMaximized := false
-
- // Try to restore window state from database
- if x, err := db.GetSetting("window_x"); err == nil && x != "" {
- if y, err := db.GetSetting("window_y"); err == nil && y != "" {
- if width, err := db.GetSetting("window_width"); err == nil && width != "" {
- if height, err := db.GetSetting("window_height"); err == nil && height != "" {
- // Parse values
- var xInt, yInt, widthInt, heightInt int
- if _, err := fmt.Sscanf(x, "%d", &xInt); err == nil {
- if _, err := fmt.Sscanf(y, "%d", &yInt); err == nil {
- if _, err := fmt.Sscanf(width, "%d", &widthInt); err == nil {
- if _, err := fmt.Sscanf(height, "%d", &heightInt); err == nil {
- // Validate values
- if widthInt >= 400 && heightInt >= 300 && widthInt <= 4000 && heightInt <= 3000 {
- if xInt > -1000 && xInt < 3000 && yInt > -1000 && yInt < 3000 {
- windowWidth = widthInt
- windowHeight = heightInt
- windowX = xInt
- windowY = yInt
- restoredFromDB = true
- // Store in memory for minimize-restore
- lastWindowState.width = widthInt
- lastWindowState.height = heightInt
- lastWindowState.x = xInt
- lastWindowState.y = yInt
- lastWindowState.valid.Store(true)
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- if maximized, err := db.GetSetting("window_maximized"); err == nil && maximized == "true" {
- restoredMaximized = true
- lastWindowState.maximized.Store(true)
- }
-
- // Determine background color based on theme setting
- // Default to dark gray to prevent white flash on startup/close
- // This matches the CSS dark mode background color (#1e1e1e = rgb(30, 30, 30))
- backgroundColour := application.NewRGB(30, 30, 30)
- if theme, err := db.GetSetting("theme"); err == nil {
- if theme == "light" {
- // Use white for light theme
- backgroundColour = application.NewRGB(255, 255, 255)
- }
- // For "dark" or "auto", use dark background
- }
-
- // Create main window options
- windowOptions := application.WebviewWindowOptions{
- Name: "MrRSS-main-window",
- Title: "MrRSS",
- Width: windowWidth,
- Height: windowHeight,
- URL: "/",
- Mac: application.MacWindow{},
- Windows: application.WindowsWindow{},
- Linux: application.LinuxWindow{},
- BackgroundColour: backgroundColour,
- }
-
- // Set position if restored from DB
- if restoredFromDB {
- windowOptions.X = windowX
- windowOptions.Y = windowY
- }
-
- // Create main window
- mainWindow = app.Window.NewWithOptions(windowOptions)
-
- if !restoredFromDB {
- mainWindow.Center()
- }
- if restoredMaximized {
- mainWindow.Maximise()
- }
-
- // Helper function to store window state
- storeWindowState := func() {
- if mainWindow == nil {
- return
- }
-
- w, h := mainWindow.Size()
- x, y := mainWindow.Position()
- lastWindowState.maximized.Store(mainWindow.IsMaximised())
-
- // Only store state if it's valid (reasonable size and position)
- if w >= 400 && h >= 300 && w <= 4000 && h <= 3000 {
- if x > -1000 && x < 3000 && y > -1000 && y < 3000 {
- lastWindowState.width = w
- lastWindowState.height = h
- lastWindowState.x = x
- lastWindowState.y = y
- lastWindowState.valid.Store(true)
- }
- }
- }
-
- // Create system tray if close_to_tray is enabled
- var systemTray *application.SystemTray
-
- setupSystemTray := func() {
- if systemTray != nil {
- return // Already set up
- }
-
- systemTray = app.SystemTray.New()
- systemTray.SetIcon(getAppIcon())
-
- // Create tray menu
- trayMenu := app.NewMenu()
-
- // Get language for labels
- lang := "en"
- if l, err := db.GetSetting("language"); err == nil && l != "" {
- lang = l
- }
-
- var showLabel, refreshLabel, quitLabel string
- switch lang {
- case "zh-CN", "zh", "zh-cn":
- showLabel = "æūįĪš MrRSS"
- refreshLabel = "įŦåģå·æ°"
- quitLabel = "éåš"
- default:
- showLabel = "Show MrRSS"
- refreshLabel = "Refresh now"
- quitLabel = "Quit"
- }
-
- trayMenu.Add(showLabel).OnClick(func(ctx *application.Context) {
- if mainWindow != nil {
- // Restore window state if it was stored
- if lastWindowState.valid.Load() {
- width := lastWindowState.width
- height := lastWindowState.height
- x := lastWindowState.x
- y := lastWindowState.y
-
- if width < 400 {
- width = 1024
- }
- if height < 300 {
- height = 768
- }
- if x < -1000 || x > 3000 {
- x = 100
- }
- if y < -1000 || y > 3000 {
- y = 100
- }
-
- mainWindow.SetSize(width, height)
- mainWindow.SetPosition(x, y)
- }
- mainWindow.Show()
- if lastWindowState.maximized.Load() {
- mainWindow.Maximise()
- } else {
- mainWindow.Restore()
- }
- }
- })
-
- trayMenu.Add(refreshLabel).OnClick(func(ctx *application.Context) {
- if h.Fetcher != nil {
- go h.Fetcher.FetchAll(bgCtx)
- }
- })
-
- trayMenu.AddSeparator()
-
- trayMenu.Add(quitLabel).OnClick(func(ctx *application.Context) {
- quitRequested.Store(true)
- app.Quit()
- })
-
- systemTray.SetMenu(trayMenu)
-
- // Handle clicks on tray icon to show window
- systemTray.OnClick(func() {
- if mainWindow != nil {
- mainWindow.Show()
- if lastWindowState.maximized.Load() {
- mainWindow.Maximise()
- } else {
- mainWindow.Restore()
- }
- }
- })
- }
-
- // Track last window close attempt to handle macOS fullscreen properly
- var lastCloseAttempt atomic.Int64
-
- // Register hook for window closing event
- mainWindow.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
- if quitRequested.Load() {
- return // Allow close
- }
-
- if shouldCloseToTray() {
- // On macOS, handle fullscreen exit gracefully
- if runtime.GOOS == "darwin" {
- now := time.Now().UnixMilli()
- last := lastCloseAttempt.Load()
-
- // If last close was within 500ms, user clicked close twice quickly
- // This means fullscreen exit completed, proceed with hiding
- if last > 0 && (now-last) < 500 {
- lastCloseAttempt.Store(0) // Reset
- storeWindowState()
- setupSystemTray()
- mainWindow.Hide()
- e.Cancel()
- return
- }
-
- // First close attempt - try to exit fullscreen
- lastCloseAttempt.Store(now)
- mainWindow.Restore()
- // Cancel this close event
- // If window was fullscreen, user needs to click close again
- // If not fullscreen, Restore() does nothing and next close will proceed
- e.Cancel()
- return
- }
-
- // Non-macOS platforms: directly hide to tray
- storeWindowState()
- setupSystemTray()
- mainWindow.Hide()
- e.Cancel()
- }
- })
-
- // Register move and resize handlers to save window state
- mainWindow.RegisterHook(events.Common.WindowDidMove, func(e *application.WindowEvent) {
- storeWindowState()
- })
-
- mainWindow.RegisterHook(events.Common.WindowDidResize, func(e *application.WindowEvent) {
- storeWindowState()
- })
-
- mainWindow.RegisterHook(events.Common.WindowMaximise, func(e *application.WindowEvent) {
- lastWindowState.maximized.Store(true)
- if err := db.SetSetting("window_maximized", "true"); err != nil {
- log.Printf("Failed to save maximized window state: %v", err)
- }
- })
-
- mainWindow.RegisterHook(events.Common.WindowUnMaximise, func(e *application.WindowEvent) {
- lastWindowState.maximized.Store(false)
- if err := db.SetSetting("window_maximized", "false"); err != nil {
- log.Printf("Failed to save unmaximized window state: %v", err)
- }
- storeWindowState()
- })
-
- // Setup tray on startup if close_to_tray is enabled
- if shouldCloseToTray() {
- setupSystemTray()
- }
-
- // On macOS, handle dock icon click to show the window
- if runtime.GOOS == "darwin" {
- app.Event.OnApplicationEvent(events.Mac.ApplicationShouldHandleReopen, func(event *application.ApplicationEvent) {
- log.Println("Dock icon clicked, showing window")
- if mainWindow != nil {
- mainWindow.Show()
- if lastWindowState.maximized.Load() {
- mainWindow.Maximise()
- } else {
- mainWindow.Restore()
- }
- }
- })
- }
+ log.Println("Starting background scheduler...")
+ go h.StartBackgroundScheduler(bgCtx)
- // Detect network speed on startup in background
+ // Start Network Speed Detection (optional but good to have)
go func() {
- time.Sleep(2 * time.Second) // Small delay to allow app to start
log.Println("Detecting network speed...")
-
- // Get proxy settings
- proxyEnabled, _ := db.GetSetting("proxy_enabled")
- proxyType, _ := db.GetSetting("proxy_type")
- proxyHost, _ := db.GetSetting("proxy_host")
- proxyPort, _ := db.GetSetting("proxy_port")
- proxyUsername, _ := db.GetSetting("proxy_username")
- proxyPassword, _ := db.GetSetting("proxy_password")
-
- // Create HTTP client with proxy if enabled
- var httpClient *http.Client
- if proxyEnabled == "true" {
- proxyURL := httputil.BuildProxyURL(proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword)
- if proxyURL != "" {
- client, err := httputil.CreateHTTPClient(proxyURL, 10*time.Second)
- if err != nil {
- log.Printf("Failed to create HTTP client with proxy: %v", err)
- // Fall back to default client
- httpClient = &http.Client{Timeout: 10 * time.Second}
- } else {
- httpClient = client
- }
- } else {
- httpClient = &http.Client{Timeout: 10 * time.Second}
- }
- } else {
- httpClient = &http.Client{Timeout: 10 * time.Second}
- }
-
- detector := network.NewDetector(httpClient)
+ detector := network.NewDetector(&http.Client{Timeout: 10 * time.Second})
detectCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
@@ -628,68 +180,43 @@ func main() {
if result.DetectionSuccess {
db.SetSetting("network_speed", string(result.SpeedLevel))
db.SetSetting("network_bandwidth_mbps", fmt.Sprintf("%.2f", result.BandwidthMbps))
- db.SetSetting("network_latency_ms", strconv.FormatInt(result.LatencyMs, 10))
- db.SetSetting("max_concurrent_refreshes", strconv.Itoa(result.MaxConcurrency))
- db.SetSetting("last_network_test", result.DetectionTime.Format(time.RFC3339))
- log.Printf("Network detection complete: %s (max concurrency: %d)", result.SpeedLevel, result.MaxConcurrency)
- } else {
- log.Printf("Network detection failed: %s", result.ErrorMessage)
+ log.Printf("Network detection complete: %s", result.SpeedLevel)
}
}()
- // Start background scheduler after a delay to allow UI to show first
- go func() {
- time.Sleep(5 * time.Second)
- log.Println("Starting background scheduler...")
- h.StartBackgroundScheduler(bgCtx)
- }()
+ // Start HTTP Server
+ srv := &http.Server{
+ Addr: *host + ":" + *port,
+ Handler: combinedHandler,
+ }
- // Report app startup to analytics (non-blocking)
go func() {
- time.Sleep(2 * time.Second) // Small delay to ensure app starts smoothly
- monitorClient := monitor.NewMonitorClient("https://cf-monitor-api.ch3nyang.workers.dev", "mrrss")
- _ = monitorClient.ReportAppStart(context.Background())
+ if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+ log.Fatalf("HTTP server failed: %v", err)
+ }
}()
- log.Println("Window initialized, running app...")
-
- // Run the application
- err = app.Run()
+ // Wait for interrupt
+ quit := make(chan os.Signal, 1)
+ signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+ <-quit
- // Cleanup when app exits
- log.Println("Shutting down...")
- if desktopAPIServer != nil {
- shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
- if shutdownErr := desktopAPIServer.Shutdown(shutdownCtx); shutdownErr != nil {
- log.Printf("Local desktop API shutdown failed: %v", shutdownErr)
- }
- shutdownCancel()
- }
-
- // Stop background tasks first
+ log.Println("Shutting down server...")
bgCancel()
- // Give some time for tasks to finish
- time.Sleep(500 * time.Millisecond)
- // Close DB with timeout
- done := make(chan struct{})
- go func() {
- if err := db.Close(); err != nil {
- log.Printf("Error closing database: %v", err)
- }
- close(done)
- }()
+ // Shutdown HTTP server
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ if err := srv.Shutdown(ctx); err != nil {
+ log.Printf("Server forced to shutdown: %v", err)
+ }
- select {
- case <-done:
+ // Close Database
+ if err := db.Close(); err != nil {
+ log.Printf("Error closing database: %v", err)
+ } else {
log.Println("Database closed")
- case <-time.After(2 * time.Second):
- log.Println("Database close timed out")
}
- if err != nil {
- log.Printf("Error running Wails: %v", err)
- log.Fatal(err)
- }
- log.Println("Application finished")
+ log.Println("Server exited")
}
diff --git a/scripts/check.ps1 b/scripts/check.ps1
deleted file mode 100644
index ee3e424b7..000000000
--- a/scripts/check.ps1
+++ /dev/null
@@ -1,37 +0,0 @@
-# scripts/check.ps1 - Run all code quality checks
-
-Write-Host "ð Running code quality checks..." -ForegroundColor Green
-
-# Backend checks
-Write-Host "ðĶ Checking Go code..." -ForegroundColor Blue
-go vet ./...
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-Write-Host "â
Go vet passed" -ForegroundColor Green
-
-Write-Host "ðĻ Checking Go formatting..." -ForegroundColor Blue
-$gofmtOutput = gofmt -d .
-if ($gofmtOutput) {
- Write-Host "â Go code is not formatted. Run 'make format-backend' to fix." -ForegroundColor Red
- Write-Host $gofmtOutput
- exit 1
-}
-Write-Host "â
Go formatting OK" -ForegroundColor Green
-
-# Frontend checks
-Write-Host "ðĻ Checking frontend code..." -ForegroundColor Blue
-Push-Location frontend
-npm run lint
-if ($LASTEXITCODE -ne 0) { Pop-Location; exit $LASTEXITCODE }
-
-npm test -- --run --reporter=verbose
-if ($LASTEXITCODE -ne 0) { Pop-Location; exit $LASTEXITCODE }
-Pop-Location
-Write-Host "â
Frontend checks passed" -ForegroundColor Green
-
-# Build check
-Write-Host "ðĻ Checking build..." -ForegroundColor Blue
-go build -v ./...
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-Write-Host "â
Build successful" -ForegroundColor Green
-
-Write-Host "ð All checks passed!" -ForegroundColor Green
diff --git a/scripts/check.sh b/scripts/check.sh
index d5078d6f2..7a64f2d1a 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -26,18 +26,16 @@ if [ "$(goimports -d . | wc -l)" -gt 0 ]; then
fi
echo "â
Go imports OK"
-# Frontend checks
-echo "ðĻ Checking frontend code..."
-cd frontend
-npm run lint
-echo "â
Frontend linting passed"
+# macOS client checks
+echo "ðĻ Checking the macOS client..."
+swift build --package-path frontend
+echo "â
macOS client builds"
-npm test -- --run --reporter=verbose
-echo "â
Frontend tests passed"
+swift test --package-path frontend
+echo "â
macOS client tests passed"
# Build check
echo "ðĻ Checking build..."
-cd ..
go build -v ./...
echo "â
Build successful"
diff --git a/scripts/pre-release.ps1 b/scripts/pre-release.ps1
deleted file mode 100644
index 0c4d09ecf..000000000
--- a/scripts/pre-release.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-# scripts/pre-release.ps1 - Pre-release checks
-
-Write-Host "ð Running pre-release checks..." -ForegroundColor Green
-
-# Run all checks
-& "$PSScriptRoot\check.ps1"
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-# Additional release checks
-Write-Host "ðĶ Checking Go modules..." -ForegroundColor Blue
-go mod tidy
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-$goModStatus = git status --porcelain go.mod go.sum
-if ($goModStatus) {
- Write-Host "â Go modules are not clean. Commit changes first." -ForegroundColor Red
- Write-Host $goModStatus
- exit 1
-}
-Write-Host "â
Go modules clean" -ForegroundColor Green
-
-Write-Host "ðĶ Checking frontend dependencies..." -ForegroundColor Blue
-Push-Location frontend
-npm audit --audit-level=moderate
-if ($LASTEXITCODE -ne 0) { Pop-Location; exit $LASTEXITCODE }
-Pop-Location
-Write-Host "â
Frontend dependencies OK" -ForegroundColor Green
-
-# Check version consistency
-Write-Host "ð·ïļ Checking version consistency..." -ForegroundColor Blue
-$frontendVersion = (Get-Content package.json | ConvertFrom-Json).version
-Write-Host "Frontend version: $frontendVersion" -ForegroundColor Cyan
-
-$goVersion = (Get-Content internal/version/version.go | Select-String 'const Version = "(.+)"').Matches.Groups[1].Value
-Write-Host "Backend version: $goVersion" -ForegroundColor Cyan
-
-if ($frontendVersion -ne $goVersion) {
- Write-Host "â Version mismatch! Frontend: $frontendVersion, Backend: $goVersion" -ForegroundColor Red
- exit 1
-}
-
-$packageVersion = (Get-Content frontend/package.json | ConvertFrom-Json).version
-Write-Host "Wails version: $packageVersion" -ForegroundColor Cyan
-
-if ($frontendVersion -ne $packageVersion) {
- Write-Host "â Version mismatch! Frontend: $frontendVersion, Wails: $packageVersion" -ForegroundColor Red
- exit 1
-}
-
-Write-Host "â
Version consistency OK" -ForegroundColor Green
-Write-Host "ð Ready for release!" -ForegroundColor Green
diff --git a/scripts/pre-release.sh b/scripts/pre-release.sh
index faeb5f304..71efc6241 100755
--- a/scripts/pre-release.sh
+++ b/scripts/pre-release.sh
@@ -17,30 +17,16 @@ if [ -n "$(git status --porcelain go.mod go.sum)" ]; then
fi
echo "â
Go modules clean"
-echo "ðĶ Checking frontend dependencies..."
-cd frontend
-npm audit --audit-level=moderate
-echo "â
Frontend dependencies OK"
-
# Check version consistency
echo "ð·ïļ Checking version consistency..."
-VERSION=$(grep '"version"' package.json | sed 's/.*"version": "\([^"]*\)".*/\1/')
-echo "Frontend version: $VERSION"
-
-cd ..
GO_VERSION=$(grep "const Version" internal/version/version.go | sed 's/.*= "\([^"]*\)".*/\1/')
echo "Backend version: $GO_VERSION"
-if [ "$VERSION" != "$GO_VERSION" ]; then
- echo "â Version mismatch! Frontend: $VERSION, Backend: $GO_VERSION"
- exit 1
-fi
-
-PACKAGE_VERSION=$(grep '"version"' frontend/package.json | sed 's/.*"version": "\([^"]*\)".*/\1/')
-echo "Wails version: $PACKAGE_VERSION"
+PLIST_VERSION=$(grep -A1 'CFBundleShortVersionString' frontend/packaging/Info.plist | grep '