修复端口没有跟随设置更改的问题

This commit is contained in:
YHH
2025-10-18 20:21:43 +08:00
parent 2be53a04e4
commit 1f7f9d9f84
4 changed files with 142 additions and 21 deletions

View File

@@ -1,6 +1,8 @@
import { useState, useEffect } from 'react';
import { invoke } from '@tauri-apps/api/core';
import { X, Server, WifiOff } from 'lucide-react';
import { X, Server, WifiOff, Wifi } from 'lucide-react';
import { SettingsService } from '../services/SettingsService';
import { ProfilerService } from '../services/ProfilerService';
import '../styles/PortManager.css';
interface PortManagerProps {
@@ -9,9 +11,28 @@ interface PortManagerProps {
export function PortManager({ onClose }: PortManagerProps) {
const [isServerRunning, setIsServerRunning] = useState(false);
const [serverPort] = useState<number>(8080);
const [serverPort, setServerPort] = useState<string>('8080');
const [isChecking, setIsChecking] = useState(false);
const [isStopping, setIsStopping] = useState(false);
const [isStarting, setIsStarting] = useState(false);
useEffect(() => {
const settings = SettingsService.getInstance();
setServerPort(settings.get('profiler.port', '8080'));
const handleSettingsChange = ((event: CustomEvent) => {
const newPort = event.detail['profiler.port'];
if (newPort) {
setServerPort(newPort);
}
}) as EventListener;
window.addEventListener('settings:changed', handleSettingsChange);
return () => {
window.removeEventListener('settings:changed', handleSettingsChange);
};
}, []);
useEffect(() => {
checkServerStatus();
@@ -33,9 +54,11 @@ export function PortManager({ onClose }: PortManagerProps) {
const handleStopServer = async () => {
setIsStopping(true);
try {
const result = await invoke<string>('stop_profiler_server');
console.log('[PortManager]', result);
setIsServerRunning(false);
const profilerService = (window as any).__PROFILER_SERVICE__ as ProfilerService | undefined;
if (profilerService) {
await profilerService.manualStopServer();
setIsServerRunning(false);
}
} catch (error) {
console.error('[PortManager] Failed to stop server:', error);
} finally {
@@ -43,6 +66,22 @@ export function PortManager({ onClose }: PortManagerProps) {
}
};
const handleStartServer = async () => {
setIsStarting(true);
try {
const profilerService = (window as any).__PROFILER_SERVICE__ as ProfilerService | undefined;
if (profilerService) {
await profilerService.manualStartServer();
await new Promise(resolve => setTimeout(resolve, 500));
await checkServerStatus();
}
} catch (error) {
console.error('[PortManager] Failed to start server:', error);
} finally {
setIsStarting(false);
}
};
return (
<div className="port-manager-overlay" onClick={onClose}>
<div className="port-manager" onClick={(e) => e.stopPropagation()}>
@@ -88,10 +127,22 @@ export function PortManager({ onClose }: PortManagerProps) {
)}
{!isServerRunning && (
<div className="port-hint">
<p>No server is currently running.</p>
<p className="hint-text">Open Profiler window to start the server.</p>
</div>
<>
<div className="port-actions">
<button
className="action-btn primary"
onClick={handleStartServer}
disabled={isStarting}
>
<Wifi size={16} />
<span>{isStarting ? 'Starting...' : 'Start Server'}</span>
</button>
</div>
<div className="port-hint">
<p>No server is currently running.</p>
<p className="hint-text">Click "Start Server" to start the profiler server.</p>
</div>
</>
)}
</div>
@@ -100,7 +151,7 @@ export function PortManager({ onClose }: PortManagerProps) {
<ul>
<li>Use this when the Profiler server port is stuck and cannot be restarted</li>
<li>The server will automatically stop when the Profiler window is closed</li>
<li>Default port: 8080</li>
<li>Current configured port: {serverPort}</li>
</ul>
</div>
</div>

View File

@@ -19,6 +19,7 @@ export function SceneHierarchy({ entityStore, messageHub }: SceneHierarchyProps)
const [selectedId, setSelectedId] = useState<number | null>(null);
const [searchQuery, setSearchQuery] = useState('');
const [sceneName, setSceneName] = useState<string>('Untitled');
const [remoteSceneName, setRemoteSceneName] = useState<string | null>(null);
const [sceneFilePath, setSceneFilePath] = useState<string | null>(null);
const [isSceneModified, setIsSceneModified] = useState<boolean>(false);
const { t, locale } = useLocale();
@@ -97,6 +98,9 @@ export function SceneHierarchy({ entityStore, messageHub }: SceneHierarchyProps)
return;
}
const initiallyConnected = profilerService.isConnected();
setIsRemoteConnected(initiallyConnected);
const unsubscribe = profilerService.subscribe((data) => {
const connected = profilerService.isConnected();
setIsRemoteConnected(connected);
@@ -119,12 +123,31 @@ export function SceneHierarchy({ entityStore, messageHub }: SceneHierarchyProps)
return hasChanged ? data.entities! : prev;
});
// 请求第一个实体的详情以获取场景名称
if (!remoteSceneName && data.entities.length > 0) {
profilerService.requestEntityDetails(data.entities[0].id);
}
} else if (!connected) {
setRemoteEntities([]);
setRemoteSceneName(null);
}
});
return () => unsubscribe();
}, [remoteSceneName]);
// Listen for entity details to get remote scene name
useEffect(() => {
const handleEntityDetails = ((event: CustomEvent) => {
const details = event.detail;
if (details && details.sceneName) {
setRemoteSceneName(details.sceneName);
}
}) as EventListener;
window.addEventListener('profiler:entity-details', handleEntityDetails);
return () => window.removeEventListener('profiler:entity-details', handleEntityDetails);
}, []);
const handleEntityClick = (entity: Entity) => {
@@ -243,6 +266,7 @@ export function SceneHierarchy({ entityStore, messageHub }: SceneHierarchyProps)
? filterRemoteEntities(remoteEntities)
: filterLocalEntities(entities);
const showRemoteIndicator = isRemoteConnected && remoteEntities.length > 0;
const displaySceneName = isRemoteConnected && remoteSceneName ? remoteSceneName : sceneName;
return (
<div className="scene-hierarchy">
@@ -250,12 +274,12 @@ export function SceneHierarchy({ entityStore, messageHub }: SceneHierarchyProps)
<Layers size={16} className="hierarchy-header-icon" />
<h3>{t('hierarchy.title')}</h3>
<div
className="scene-name-container clickable"
onClick={handleSceneNameClick}
title={sceneFilePath ? `${sceneName} - 点击跳转到文件` : sceneName}
className={`scene-name-container ${!isRemoteConnected && sceneFilePath ? 'clickable' : ''}`}
onClick={!isRemoteConnected ? handleSceneNameClick : undefined}
title={!isRemoteConnected && sceneFilePath ? `${displaySceneName} - 点击跳转到文件` : displaySceneName}
>
<span className="scene-name">
{sceneName}{isSceneModified ? '*' : ''}
{displaySceneName}{!isRemoteConnected && isSceneModified ? '*' : ''}
</span>
</div>
{showRemoteIndicator && (