Refactor code structure for improved readability and maintainability

PythonSmall-Q · Copilot · PythonSmall-Q · commit d0ac10f3bb42 · 2026-05-03T21:02:29.000+08:00
Co-authored-by: Copilot &lt;copilot@github.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ src-tauri/windows/msix-staging/AppxManifest.xml
 src-tauri/windows/msix-staging/timelens.exe
 browser-extension.zip
 src-tauri/windows/msix-staging/timelens.exe
+vscode-extension/timelens-vscode-extension-0.1.0.vsix
diff --git a/package.json b/package.json
@@ -10,6 +10,9 @@
     "tauri": "tauri",
     "tauri:dev": "tauri dev",
     "tauri:build": "tauri build",
+    "tauri:build:msi": "tauri build --bundles msi",
+    "tauri:build:nsis": "tauri build --bundles nsis",
+    "tauri:build:all": "npm run tauri:build:msi && npm run tauri:build:nsis",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
diff --git a/src-tauri/src/api_server/mod.rs b/src-tauri/src/api_server/mod.rs
@@ -22,7 +22,7 @@ use tower_http::cors::{Any, CorsLayer};
 
 use crate::db;
 use crate::monitor::SharedMonitorStatus;
-use crate::models::{BrowserSession, VsCodeLanguageDuration, VsCodeSession};
+use crate::models::{AppUsageSummary, BrowserSession, VsCodeLanguageDuration, VsCodeSession};
 
 /// Shared state threaded through axum handlers.
 #[derive(Clone)]
@@ -98,8 +98,11 @@ async fn get_today(State(s): State<ApiState>) -> impl IntoResponse {
     let today = chrono::Local::now().format("%Y-%m-%d").to_string();
     match s.db.lock() {
         Ok(conn) => {
-            let rows = db::get_app_totals_in_range(&conn, &today, &today)
-                .unwrap_or_default();
+            let rows: Vec<AppUsageSummary> = db::get_app_totals_in_range(&conn, &today, &today)
+                .unwrap_or_default()
+                .into_iter()
+                .map(|(app_name, exe_path, total_seconds)| AppUsageSummary { app_name, exe_path, total_seconds })
+                .collect();
             Json(rows).into_response()
         }
         Err(_) => axum::http::StatusCode::INTERNAL_SERVER_ERROR.into_response(),
@@ -115,8 +118,11 @@ async fn get_range(
     let end   = p.end.as_deref().unwrap_or(&today).to_string();
     match s.db.lock() {
         Ok(conn) => {
-            let rows = db::get_app_totals_in_range(&conn, &start, &end)
-                .unwrap_or_default();
+            let rows: Vec<AppUsageSummary> = db::get_app_totals_in_range(&conn, &start, &end)
+                .unwrap_or_default()
+                .into_iter()
+                .map(|(app_name, exe_path, total_seconds)| AppUsageSummary { app_name, exe_path, total_seconds })
+                .collect();
             Json(rows).into_response()
         }
         Err(_) => axum::http::StatusCode::INTERNAL_SERVER_ERROR.into_response(),
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -29,7 +29,7 @@
   },
   "bundle": {
     "active": true,
-    "targets": "all",
+    "targets": ["nsis"],
     "publisher": "CN=67203FD7-3571-4CF3-9A8B-DE6BA454CE5B",
     "homepage": "https://github.com/PythonSmall-Q/TimeLens",
     "license": "MIT",
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
@@ -131,6 +131,15 @@ export default function Dashboard() {
     fetchForDate(selectedDate);
   }, [fetchForDate, fetchToday, periodMode, selectedDate]);
 
+  useEffect(() => {
+    if (periodMode !== "day" || selectedDate !== todayString()) return;
+    const id = setInterval(() => {
+      void fetchToday();
+      void fetchVsCodeStatsForRange(selectedDate, selectedDate);
+    }, 10_000);
+    return () => clearInterval(id);
+  }, [periodMode, selectedDate, fetchToday, fetchVsCodeStatsForRange]);
+
   useEffect(() => {
     const end = todayString();
     const startDate = new Date(`${end}T00:00:00`);
diff --git a/src/pages/VsCodeInsights/index.tsx b/src/pages/VsCodeInsights/index.tsx
@@ -64,6 +64,15 @@ export default function VsCodeInsights() {
     fetchVsCodeStatsForRange(range.start, range.end);
   }, [fetchVsCodeStatsForRange, range.start, range.end]);
 
+  useEffect(() => {
+    const today = todayString();
+    if (range.start > today || range.end < today) return;
+    const id = setInterval(() => {
+      void fetchVsCodeStatsForRange(range.start, range.end);
+    }, 10_000);
+    return () => clearInterval(id);
+  }, [fetchVsCodeStatsForRange, range.start, range.end]);
+
   useEffect(() => {
     getVsCodeTrackingEnabled()
       .then((res) => {
diff --git a/vscode-extension/README.md b/vscode-extension/README.md
@@ -34,7 +34,7 @@ npm run build
 ## Package VSIX
 
 ```bash
-npm --prefix vscode-extension run package
+npm run package
 ```
 
 Or from repository root:
diff --git a/vscode-extension/icons/activitybar.svg b/vscode-extension/icons/activitybar.svg
@@ -1,4 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none">
-  <path d="M12 3.5a8.5 8.5 0 1 0 8.5 8.5A8.51 8.51 0 0 0 12 3.5Zm0 15.5a7 7 0 1 1 7-7 7.01 7.01 0 0 1-7 7Z" fill="currentColor"/>
-  <path d="M12.75 7.5h-1.5v5.25l4.5 2.7.75-1.23-3.75-2.22V7.5Z" fill="currentColor"/>
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill="currentColor" d="M12 2.5A9.5 9.5 0 1 0 21.5 12 9.5 9.5 0 0 0 12 2.5Zm0 17.2A7.7 7.7 0 1 1 19.7 12 7.7 7.7 0 0 1 12 19.7Zm.9-11.2h-1.8v4.1l3.9 2.3.9-1.5-3-1.8Z"/>
 </svg>
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -3,7 +3,7 @@
   "displayName": "TimeLens",
   "description": "Track VS Code session time and send local analytics to TimeLens desktop app.",
   "icon": "icons/icon.png",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "publisher": "ShanWenxiao",
   "license": "MIT",
   "repository": {
@@ -50,6 +50,10 @@
       ]
     },
     "commands": [
+      {
+        "command": "timelens.openSidebar",
+        "title": "TimeLens: Open Sidebar"
+      },
       {
         "command": "timelens.enableTracking",
         "title": "TimeLens: Enable Tracking"
diff --git a/vscode-extension/src/dashboardPanel.ts b/vscode-extension/src/dashboardPanel.ts
@@ -1,6 +1,4 @@
 import * as vscode from "vscode";
-import * as path from "node:path";
-import * as fs from "node:fs";
 
 /** Fetch JSON from the TimeLens local API, returns null on any error. */
 async function fetchJson<T>(url: string): Promise<T | null> {
@@ -59,6 +57,8 @@ export class DashboardPanel {
       }
     );
 
+    panel.webview.html = buildLoadingHtml();
+
     try {
       panel.iconPath = iconPath;
     } catch {
@@ -88,48 +88,56 @@ export class DashboardPanel {
     // Auto-refresh every 30 s while panel is visible
     this.refreshTimer = setInterval(() => {
       if (this.panel.visible) {
-        this.refresh();
+        void this.refresh();
       }
     }, 30_000);
 
-    this.refresh();
+    void this.refresh().catch((error) => {
+      this.panel.webview.html = buildErrorHtml(error);
+    });
   }
 
   public async refresh(): Promise<void> {
+    this.panel.webview.html = buildLoadingHtml();
+
     const apiBase = vscode.workspace
       .getConfiguration("timelens")
       .get<string>("apiBaseUrl", "http://127.0.0.1:49152");
 
-    const [todayStats, todayApps, langStats, projectStats, trackingStatus, appStatus] =
-      await Promise.all([
-        fetchJson<{ total_seconds: number; session_count: number }>(
-          `${apiBase}/api/vscode/stats/today`
-        ),
-        fetchJson<{ app_name: string; exe_name: string; total_seconds: number; category: string }[]>(
-          `${apiBase}/api/screen-time/today`
-        ),
-        fetchJson<{ language: string; total_seconds: number }[]>(
-          `${apiBase}/api/vscode/languages/range?start=${today()}&end=${today()}`
-        ),
-        fetchJson<{ project_name: string; project_path: string; total_seconds: number; session_count: number }[]>(
-          `${apiBase}/api/vscode/projects/range?start=${today()}&end=${today()}`
-        ),
-        fetchJson<{ enabled: boolean; tracking_level?: string }>(
-          `${apiBase}/api/vscode/enabled`
-        ),
-        fetchJson<{ version: string; focus_active: boolean }>(
-          `${apiBase}/api/status`
-        ),
-      ]);
-
-    this.panel.webview.html = buildHtml({
-      todayStats,
-      todayApps: todayApps ?? [],
-      langStats: langStats ?? [],
-      projectStats: projectStats ?? [],
-      trackingStatus,
-      appStatus,
-    });
+    try {
+      const [todayStats, todayApps, langStats, projectStats, trackingStatus, appStatus] =
+        await Promise.all([
+          fetchJson<{ total_seconds: number; session_count: number }>(
+            `${apiBase}/api/vscode/stats/today`
+          ),
+          fetchJson<{ app_name: string; exe_path: string; total_seconds: number }[]>(
+            `${apiBase}/api/screen-time/today`
+          ),
+          fetchJson<{ language: string; total_seconds: number }[]>(
+            `${apiBase}/api/vscode/languages/range?start=${today()}&end=${today()}`
+          ),
+          fetchJson<{ project_name: string; project_path: string; total_seconds: number; session_count: number }[]>(
+            `${apiBase}/api/vscode/projects/range?start=${today()}&end=${today()}`
+          ),
+          fetchJson<{ enabled: boolean; tracking_level?: string }>(
+            `${apiBase}/api/vscode/enabled`
+          ),
+          fetchJson<{ version: string; focus_active: boolean }>(
+            `${apiBase}/api/status`
+          ),
+        ]);
+
+      this.panel.webview.html = buildHtml({
+        todayStats,
+        todayApps: todayApps ?? [],
+        langStats: langStats ?? [],
+        projectStats: projectStats ?? [],
+        trackingStatus,
+        appStatus,
+      });
+    } catch (error) {
+      this.panel.webview.html = buildErrorHtml(error);
+    }
   }
 
   private async handleMessage(msg: { command: string; payload?: unknown }): Promise<void> {
@@ -193,7 +201,7 @@ function today(): string {
 
 interface BuildHtmlOptions {
   todayStats: { total_seconds: number; session_count: number } | null;
-  todayApps: { app_name: string; exe_name: string; total_seconds: number; category: string }[];
+  todayApps: { app_name: string; exe_path: string; total_seconds: number }[];
   langStats: { language: string; total_seconds: number }[];
   projectStats: { project_name: string; project_path: string; total_seconds: number; session_count: number }[];
   trackingStatus: { enabled: boolean; tracking_level?: string } | null;
@@ -221,7 +229,7 @@ function buildHtml(opts: BuildHtmlOptions): string {
       const pct = totalAppSeconds > 0 ? Math.round((app.total_seconds / totalAppSeconds) * 100) : 0;
       return `<div class="bar-row">
         <div class="bar-label">
-          <span class="app-name" title="${esc(app.exe_name)}">${esc(app.app_name || app.exe_name)}</span>
+          <span class="app-name" title="${esc(app.exe_path)}">${esc(app.app_name || app.exe_path)}</span>
           <span class="bar-dur">${fmtDuration(app.total_seconds)}</span>
         </div>
         <div class="bar-track"><div class="bar-fill bar-fill-blue" style="width:${pct}%"></div></div>
@@ -419,6 +427,65 @@ ${topApps.length > 0 ? `
 </html>`;
 }
 
-function esc(s: string): string {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+function esc(s: unknown): string {
+  const value = typeof s === "string" ? s : String(s ?? "");
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;");
+}
+
+function buildLoadingHtml(): string {
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline';">
+  <style>
+    body { font-family: var(--vscode-font-family); padding: 16px; color: var(--vscode-foreground); background: var(--vscode-editor-background); }
+    .card { border: 1px solid var(--vscode-panel-border); border-radius: 8px; padding: 12px; background: var(--vscode-sideBar-background); }
+    .title { font-size: 16px; font-weight: 700; margin-bottom: 8px; }
+    .muted { color: var(--vscode-descriptionForeground); font-size: 12px; }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <div class="title">TimeLens Dashboard</div>
+    <div class="muted">Loading...</div>
+  </div>
+</body>
+</html>`;
+}
+
+function buildErrorHtml(error: unknown): string {
+  const message = error instanceof Error ? error.message : "Unknown error";
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'unsafe-inline';">
+  <style>
+    body { font-family: var(--vscode-font-family); padding: 16px; color: var(--vscode-foreground); background: var(--vscode-editor-background); }
+    .card { border: 1px solid var(--vscode-panel-border); border-radius: 8px; padding: 12px; background: var(--vscode-sideBar-background); }
+    .title { font-size: 16px; font-weight: 700; margin-bottom: 8px; }
+    .muted { color: var(--vscode-descriptionForeground); font-size: 12px; }
+    button { margin-top: 12px; border: 1px solid var(--vscode-panel-border); border-radius: 6px; padding: 6px 10px; background: var(--vscode-button-background); color: var(--vscode-button-foreground); cursor: pointer; }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <div class="title">TimeLens Dashboard</div>
+    <div class="muted">页面加载失败，但扩展仍在运行。</div>
+    <div class="muted" style="margin-top:8px;">${esc(message)}</div>
+    <button onclick="refresh()">重试</button>
+  </div>
+  <script>
+    const vscode = acquireVsCodeApi();
+    function refresh() { vscode.postMessage({ command: 'refresh' }); }
+  </script>
+</body>
+</html>`;
 }
diff --git a/vscode-extension/src/dashboardSidebarView.ts b/vscode-extension/src/dashboardSidebarView.ts
diff --git a/vscode-extension/src/extension.ts b/vscode-extension/src/extension.ts
diff --git a/vscode-extension/src/sessionTracker.ts b/vscode-extension/src/sessionTracker.ts
diff --git a/vscode-extension/timelens-vscode-extension-0.1.0.vsix b/vscode-extension/timelens-vscode-extension-0.1.0.vsix
diff --git a/vscode-extension/timelens-vscode-extension-0.2.0.vsix b/vscode-extension/timelens-vscode-extension-0.2.0.vsix
