mirror of
https://github.com/SECTL/SecScore.git
synced 2026-07-19 19:04:23 +08:00
fix(frontend): stabilize tauri listeners and logging payloads
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
<title>SecScore</title>
|
<title>SecScore</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<rect width="64" height="64" rx="12" fill="#0052D9" />
|
||||||
|
<path
|
||||||
|
d="M16 22c0-3.314 2.686-6 6-6h20c3.314 0 6 2.686 6 6v20c0 3.314-2.686 6-6 6H22c-3.314 0-6-2.686-6-6V22z"
|
||||||
|
fill="#ffffff"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M24 28h16a2 2 0 110 4H24a2 2 0 110-4zm0 8h10a2 2 0 110 4H24a2 2 0 110-4z"
|
||||||
|
fill="#0052D9"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 379 B |
@@ -9,9 +9,9 @@ fn main() {
|
|||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.plugin(tauri_plugin_shell::init())
|
.plugin(tauri_plugin_shell::init())
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
setup_app(app)?;
|
|
||||||
let state = AppState::new(app.handle().clone());
|
let state = AppState::new(app.handle().clone());
|
||||||
app.manage(Arc::new(RwLock::new(state)));
|
app.manage(Arc::new(RwLock::new(state)));
|
||||||
|
setup_app(app)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
|
|||||||
+27
-9
@@ -15,16 +15,34 @@ function MainContent(): React.JSX.Element {
|
|||||||
const [messageApi, contextHolder] = message.useMessage()
|
const [messageApi, contextHolder] = message.useMessage()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!(window as any).api) return
|
const api = (window as any).api
|
||||||
const unlisten = (window as any).api.onNavigate((route: string) => {
|
if (!api) return
|
||||||
const currentPath = location.pathname === "/" ? "/home" : location.pathname
|
|
||||||
const targetPath = route === "/" ? "/home" : route
|
|
||||||
|
|
||||||
if (currentPath !== targetPath) {
|
let disposed = false
|
||||||
navigate(route)
|
let unlisten: (() => void) | null = null
|
||||||
}
|
|
||||||
})
|
api
|
||||||
return () => unlisten()
|
.onNavigate((route: string) => {
|
||||||
|
const currentPath = location.pathname === "/" ? "/home" : location.pathname
|
||||||
|
const targetPath = route === "/" ? "/home" : route
|
||||||
|
|
||||||
|
if (currentPath !== targetPath) {
|
||||||
|
navigate(route)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
unlisten = fn
|
||||||
|
})
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
disposed = true
|
||||||
|
if (unlisten) unlisten()
|
||||||
|
}
|
||||||
}, [navigate, location.pathname])
|
}, [navigate, location.pathname])
|
||||||
|
|
||||||
const [wizardVisible, setWizardVisible] = useState(false)
|
const [wizardVisible, setWizardVisible] = useState(false)
|
||||||
|
|||||||
+28
-12
@@ -95,20 +95,36 @@ export const Settings: React.FC<{ permission: permissionLevel }> = ({ permission
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadAll()
|
loadAll()
|
||||||
if (!(window as any).api) return
|
const api = (window as any).api
|
||||||
const unsubscribe = (window as any).api.onSettingChanged((change: any) => {
|
if (!api) return
|
||||||
setSettings((prev) => {
|
|
||||||
if (change?.key === "log_level") return { ...prev, log_level: change.value }
|
let disposed = false
|
||||||
if (change?.key === "is_wizard_completed")
|
let unlisten: (() => void) | null = null
|
||||||
return { ...prev, is_wizard_completed: change.value }
|
|
||||||
if (change?.key === "window_zoom") return { ...prev, window_zoom: change.value }
|
api
|
||||||
if (change?.key === "auto_score_enabled")
|
.onSettingChanged((change: any) => {
|
||||||
return { ...prev, auto_score_enabled: change.value }
|
setSettings((prev) => {
|
||||||
return prev
|
if (change?.key === "log_level") return { ...prev, log_level: change.value }
|
||||||
|
if (change?.key === "is_wizard_completed")
|
||||||
|
return { ...prev, is_wizard_completed: change.value }
|
||||||
|
if (change?.key === "window_zoom") return { ...prev, window_zoom: change.value }
|
||||||
|
if (change?.key === "auto_score_enabled")
|
||||||
|
return { ...prev, auto_score_enabled: change.value }
|
||||||
|
return prev
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
unlisten = fn
|
||||||
|
})
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (typeof unsubscribe === "function") unsubscribe()
|
disposed = true
|
||||||
|
if (unlisten) unlisten()
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
|||||||
@@ -39,15 +39,30 @@ export function Sidebar({ activeMenu, permission, onMenuChange }: SidebarProps):
|
|||||||
const handleStatusChange = () => {
|
const handleStatusChange = () => {
|
||||||
loadDbStatus()
|
loadDbStatus()
|
||||||
}
|
}
|
||||||
if ((window as any).api) {
|
const api = (window as any).api
|
||||||
const unsubscribe = (window as any).api.onSettingChanged(
|
if (!api) return
|
||||||
(change: { key: string; value: any }) => {
|
|
||||||
if (change.key === "pg_connection_status") {
|
let disposed = false
|
||||||
handleStatusChange()
|
let unlisten: (() => void) | null = null
|
||||||
}
|
|
||||||
|
api
|
||||||
|
.onSettingChanged((change: { key: string; value: any }) => {
|
||||||
|
if (change.key === "pg_connection_status") {
|
||||||
|
handleStatusChange()
|
||||||
}
|
}
|
||||||
)
|
})
|
||||||
return unsubscribe
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
unlisten = fn
|
||||||
|
})
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
disposed = true
|
||||||
|
if (unlisten) unlisten()
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
|||||||
@@ -16,13 +16,34 @@ export function TitleBar({ children }: TitleBarProps): React.JSX.Element {
|
|||||||
const [isMaximized, setIsMaximized] = useState(false)
|
const [isMaximized, setIsMaximized] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!(window as any).api) return
|
const api = (window as any).api
|
||||||
;(window as any).api.windowIsMaximized().then((v: boolean) => setIsMaximized(v))
|
if (!api) return
|
||||||
|
|
||||||
const cleanup = (window as any).api.onWindowMaximizedChanged((maximized: boolean) => {
|
let disposed = false
|
||||||
setIsMaximized(maximized)
|
let unlisten: (() => void) | null = null
|
||||||
})
|
|
||||||
return cleanup
|
api
|
||||||
|
.windowIsMaximized()
|
||||||
|
.then((v: boolean) => setIsMaximized(v))
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
|
api
|
||||||
|
.onWindowMaximizedChanged((maximized: boolean) => {
|
||||||
|
setIsMaximized(maximized)
|
||||||
|
})
|
||||||
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
unlisten = fn
|
||||||
|
})
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
disposed = true
|
||||||
|
if (unlisten) unlisten()
|
||||||
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const minimize = () => {
|
const minimize = () => {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export function WindowControls(): React.JSX.Element {
|
|||||||
const api = (window as any).api
|
const api = (window as any).api
|
||||||
if (!api) return
|
if (!api) return
|
||||||
|
|
||||||
|
let disposed = false
|
||||||
let unlisten: (() => void) | null = null
|
let unlisten: (() => void) | null = null
|
||||||
|
|
||||||
api
|
api
|
||||||
@@ -26,11 +27,16 @@ export function WindowControls(): React.JSX.Element {
|
|||||||
setIsMaximized(maximized)
|
setIsMaximized(maximized)
|
||||||
})
|
})
|
||||||
.then((fn: () => void) => {
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
unlisten = fn
|
unlisten = fn
|
||||||
})
|
})
|
||||||
.catch(() => void 0)
|
.catch(() => void 0)
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
|
disposed = true
|
||||||
if (unlisten) unlisten()
|
if (unlisten) unlisten()
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|||||||
@@ -120,23 +120,36 @@ export const ThemeProvider: React.FC<{ children: React.ReactNode }> = ({ childre
|
|||||||
}, [applyThemeConfig])
|
}, [applyThemeConfig])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!(window as any).api) return
|
const api = (window as any).api
|
||||||
|
if (!api) return
|
||||||
|
|
||||||
;(async () => {
|
;(async () => {
|
||||||
await loadThemes()
|
await loadThemes()
|
||||||
await loadCurrentTheme()
|
await loadCurrentTheme()
|
||||||
})()
|
})()
|
||||||
|
|
||||||
const unsubscribe = (window as any).api.onThemeChanged((theme: themeConfig) => {
|
let disposed = false
|
||||||
setCurrentTheme(theme)
|
let unlisten: (() => void) | null = null
|
||||||
currentThemeRef.current = theme
|
|
||||||
applyThemeConfig(theme)
|
api
|
||||||
loadThemes()
|
.onThemeChanged((theme: themeConfig) => {
|
||||||
})
|
setCurrentTheme(theme)
|
||||||
|
currentThemeRef.current = theme
|
||||||
|
applyThemeConfig(theme)
|
||||||
|
loadThemes()
|
||||||
|
})
|
||||||
|
.then((fn: () => void) => {
|
||||||
|
if (disposed) {
|
||||||
|
fn()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
unlisten = fn
|
||||||
|
})
|
||||||
|
.catch(() => void 0)
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (typeof unsubscribe === "function") {
|
disposed = true
|
||||||
unsubscribe()
|
if (unlisten) unlisten()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}, [applyThemeConfig, loadCurrentTheme, loadThemes])
|
}, [applyThemeConfig, loadCurrentTheme, loadThemes])
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ const safeWriteLog = (payload: {
|
|||||||
try {
|
try {
|
||||||
const api = (window as any).api
|
const api = (window as any).api
|
||||||
if (!api?.writeLog) return
|
if (!api?.writeLog) return
|
||||||
api.writeLog(payload)
|
Promise.resolve(api.writeLog(payload)).catch(() => void 0)
|
||||||
} catch {
|
} catch {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,15 +188,19 @@ const api = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
// Logger
|
// Logger
|
||||||
queryLogs: (params?: { lines?: number }): Promise<{ success: boolean; data: string[] }> =>
|
queryLogs: (
|
||||||
invoke("log_query", { params }),
|
input?: number | { lines?: number }
|
||||||
|
): Promise<{ success: boolean; data: string[] }> => {
|
||||||
|
const lines = typeof input === "number" ? input : input?.lines
|
||||||
|
return invoke("log_query", { lines })
|
||||||
|
},
|
||||||
clearLogs: (): Promise<{ success: boolean }> => invoke("log_clear"),
|
clearLogs: (): Promise<{ success: boolean }> => invoke("log_clear"),
|
||||||
setLogLevel: (level: string): Promise<{ success: boolean }> => invoke("log_set_level", { level }),
|
setLogLevel: (level: string): Promise<{ success: boolean }> => invoke("log_set_level", { level }),
|
||||||
writeLog: (payload: {
|
writeLog: (payload: {
|
||||||
level: string
|
level: string
|
||||||
message: string
|
message: string
|
||||||
meta?: any
|
meta?: any
|
||||||
}): Promise<{ success: boolean }> => invoke("log_write", payload),
|
}): Promise<{ success: boolean }> => invoke("log_write", { payload }),
|
||||||
|
|
||||||
// Database Connection
|
// Database Connection
|
||||||
dbTestConnection: (
|
dbTestConnection: (
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ export default defineConfig({
|
|||||||
"@": resolve(__dirname, "src"),
|
"@": resolve(__dirname, "src"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
optimizeDeps: {
|
||||||
|
// Avoid scanning legacy `old-ss` entries under project root.
|
||||||
|
entries: ["index.html"],
|
||||||
|
},
|
||||||
build: {
|
build: {
|
||||||
outDir: "dist",
|
outDir: "dist",
|
||||||
emptyOutDir: true,
|
emptyOutDir: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user