neuro-simulator 0.6.0__tar.gz → 0.6.1__tar.gz

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuro_simulator
-Version: 0.6.0
+Version: 0.6.1
 Summary: Neuro Simulator Server
 Project-URL: Homepage, https://github.com/Moha-Master/neuro-simulator
 Project-URL: Repository, https://github.com/Moha-Master/neuro-simulator

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/client/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "Neuro Simulator Client",
-  "version": "0.1.0",
+  "version": "0.2.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "Neuro Simulator Client",
-      "version": "0.1.0",
+      "version": "0.2.11",
       "dependencies": {
         "@fontsource/inter": "^5.2.6",
         "@tauri-apps/api": "^2.6.0",

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Neuro Simulator Client",
   "private": true,
-  "version": "0.2.10",
+  "version": "0.2.11",
   "type": "module",
   "scripts": {
     "dev": "vite",

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/client/src/core/appInitializer.ts

@@ -19,7 +19,7 @@ import { MuteButton } from '../ui/muteButton';
 import { getLatestReplayVideo, buildBilibiliIframeUrl } from '../services/bilibiliService';
 
 export class AppInitializer {
-    private wsClient: WebSocketClient;
+    private wsClient: WebSocketClient | null;
     private audioPlayer: AudioPlayer;
     private videoPlayer: VideoPlayer;
     private neuroAvatar: NeuroAvatar;
@@ -48,21 +48,9 @@ export class AppInitializer {
         
         this.currentSettings = SettingsModal.getSettings();
         this.settingsModal = new SettingsModal((newSettings) => this.handleSettingsUpdate(newSettings));
-        
-        const backendWsUrl = this.currentSettings.backendUrl 
-            ? `${this.currentSettings.backendUrl}/ws/stream`
-            : '';
 
-        const universalMessageHandler = (message: WebSocketMessage) => this.handleWebSocketMessage(message);
-        
-        this.wsClient = new WebSocketClient({
-            url: backendWsUrl,
-            autoReconnect: true,
-            maxReconnectAttempts: this.currentSettings.reconnectAttempts,
-            onMessage: universalMessageHandler,
-            onOpen: () => this.goOnline(),
-            onDisconnect: () => this.goOffline(),
-        });
+        // 初始化 wsClient 为 null，等待 start 方法中的探测逻辑
+        this.wsClient = null;
 
         this.audioPlayer = new AudioPlayer();
         this.videoPlayer = new VideoPlayer();
@@ -90,17 +78,14 @@ export class AppInitializer {
         if (this.isStarted) return;
         this.isStarted = true;
 
+        // First, probe for an integrated server
+        this.probeForIntegratedServer();
+
+        // Then start the layout manager and go offline
         this.layoutManager.start();
-        this.goOffline(); // Start in offline state
-        
+        this.goOffline(); // Start in offline state, connection status will update UI via goOnline
         this.updateUiWithSettings();
-        
-        if (this.wsClient.getUrl()) {
-            this.wsClient.connect();
-        } else {
-            console.warn("Backend URL is not configured. Opening settings modal.");
-            this.settingsModal.open();
-        }
+        // Connection logic is handled by probeForIntegratedServer
     }
 
     private setupSettingsModalTrigger(): void {
@@ -142,21 +127,106 @@ export class AppInitializer {
         
         this.updateUiWithSettings();
 
-        const newUrl = newSettings.backendUrl ? `${newSettings.backendUrl}/ws/stream` : '';
-        this.wsClient.updateOptions({
-            url: newUrl,
-            maxReconnectAttempts: newSettings.reconnectAttempts,
-        });
+        if (this.wsClient) {
+            const newUrl = newSettings.backendUrl ? `${newSettings.backendUrl}/ws/stream` : '';
+            this.wsClient.updateOptions({
+                url: newUrl,
+                maxReconnectAttempts: newSettings.reconnectAttempts,
+            });
 
-        this.wsClient.disconnect();
-        
-        setTimeout(() => {
-            if(this.wsClient.getUrl()) {
-                this.wsClient.connect();
+            this.wsClient.disconnect();
+            
+            setTimeout(() => {
+                if(this.wsClient && this.wsClient.getUrl()) {
+                    this.wsClient.connect();
+                } else {
+                    console.warn("Cannot connect: Backend URL is empty after update or WebSocket client not ready.");
+                }
+            }, 500);
+        } else {
+            console.warn("WebSocket client not initialized, cannot update settings.");
+        }
+    }
+
+    private initWebSocketClient(backendUrl: string): void {
+        const url = backendUrl ? `${backendUrl}/ws/stream` : '';
+        const universalMessageHandler = (message: WebSocketMessage) => this.handleWebSocketMessage(message);
+
+        // If wsClient already exists, update its configuration; otherwise, create a new instance
+        if (this.wsClient) {
+            this.wsClient.updateOptions({
+                url: url,
+                autoReconnect: true,
+                maxReconnectAttempts: this.currentSettings.reconnectAttempts,
+                onMessage: universalMessageHandler,
+                onOpen: () => this.goOnline(),
+                onDisconnect: () => this.goOffline(),
+            });
+            // If the new URL is valid, disconnect the old connection and try the new one
+            if (url) {
+                this.wsClient.disconnect();
+                setTimeout(() => {
+                    this.wsClient!.connect();
+                }, 500);
+            }
+        } else {
+            this.wsClient = new WebSocketClient({
+                url: url,
+                autoReconnect: true,
+                maxReconnectAttempts: this.currentSettings.reconnectAttempts,
+                onMessage: universalMessageHandler,
+                onOpen: () => this.goOnline(),
+                onDisconnect: () => this.goOffline(),
+            });
+        }
+    }
+
+    private async probeForIntegratedServer(): Promise<void> {
+        // First, load the currently stored settings
+        const storedSettings = SettingsModal.getSettings();
+        console.log("Probing for integrated server. Stored settings:", storedSettings);
+
+        // Try to connect to the local Server's health check endpoint
+        try {
+            // Construct the health check URL using the current page's origin
+            const healthUrl = new URL('/api/system/health', window.location.origin).toString();
+            console.log("Probing integrated server at:", healthUrl);
+
+            const response = await fetch(healthUrl);
+
+            if (response.ok) {
+                console.log("Integrated server detected via health check. Auto-connecting...");
+                // 1. Set to integrated mode, using the current origin
+                const integratedBackendUrl = window.location.origin;
+                // 2. Update the current settings' backendUrl
+                this.currentSettings = { ...this.currentSettings, backendUrl: integratedBackendUrl };
+                // 3. Save to localStorage for future use
+                localStorage.setItem('neuro_settings', JSON.stringify(this.currentSettings));
+                // 4. Initialize or update the WebSocket client
+                this.initWebSocketClient(integratedBackendUrl);
+                // 5. Try to connect if the client and URL are valid
+                if (this.wsClient && integratedBackendUrl) {
+                    this.wsClient.connect();
+                }
+                return; // Success, exit
             } else {
-                console.warn("Cannot connect: Backend URL is empty after update.");
+                console.log("Health check failed, not an integrated server. Status:", response.status);
             }
-        }, 500);
+        } catch (error) {
+            console.log("Failed to probe for integrated server, assuming standalone mode.", error);
+        }
+
+        // If probing fails, fall back to using the stored settings
+        console.log("Falling back to stored backend URL:", storedSettings.backendUrl);
+        this.initWebSocketClient(storedSettings.backendUrl);
+
+        // Attempt to connect if the client and URL are valid
+        if (this.wsClient && storedSettings.backendUrl) {
+            this.wsClient.connect();
+        } else if (!storedSettings.backendUrl) {
+            console.warn("Backend URL is not configured via probe or stored settings. Opening settings modal.");
+            this.settingsModal.open();
+        }
     }
 
     private updateUiWithSettings(): void {
@@ -366,7 +436,11 @@ export class AppInitializer {
             username: this.currentSettings.username,
             ...payload
         };
-        this.wsClient.send(message);
+        if (this.wsClient) {
+            this.wsClient.send(message);
+        } else {
+            console.warn("Cannot send message: WebSocket client is not initialized.");
+        }
     }
 
     private showStreamContent(): void {

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/client/vite.config.ts

@@ -14,6 +14,8 @@ export default defineConfig({
     // 为调试构建生成 sourcemap
     sourcemap: !!process.env.TAURI_DEBUG,
   },
+  // 设置基础路径，使构建后的资源引用正确（当应用部署在子路径如 /client 时）
+  base: './', // 使用相对路径基础，这样在任何子路径下都能正确引用资源
   // Tauri 需要一个固定的端口来连接前端开发服务器
   server: {
     port: 5173,

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/hatch_build.py

@@ -35,3 +35,17 @@ class CustomBuildHook(BuildHookInterface):
         stderr.write("\n### npm run build\n")
         subprocess.run([npm, "run", "build"], check=True, cwd=dashboard_dir)
 
+        stderr.write("\n>>> Building client frontend\n")
+        
+        client_dir = os.path.join(self.root, 'client')
+        if not os.path.isdir(client_dir):
+            stderr.write(f">>> Client directory not found at {client_dir}\n")
+            # Note: This does not raise an error to allow building server-only in some scenarios
+            return
+
+        stderr.write("### npm install\n")
+        subprocess.run([npm, "install"], check=True, cwd=client_dir)
+
+        stderr.write("\n### npm run build\n")
+        subprocess.run([npm, "run", "build"], check=True, cwd=client_dir)
+

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "neuro_simulator"
-version = "0.6.0"
+version = "0.6.1"
 description = "Neuro Simulator Server"
 readme = "README.md"
 authors = [{ name = "Moha-Master", email = "hongkongreporter@outlook.com" }]
@@ -55,4 +55,4 @@ path = "hatch_build.py"
 
 [tool.hatch.build.targets.wheel]
 sources = ["server"]
-force-include = { "dashboard/dist" = "neuro_simulator/dashboard" }
+force-include = { "dashboard/dist" = "neuro_simulator/dashboard", "client/dist" = "neuro_simulator/client" }

{neuro_simulator-0.6.0 → neuro_simulator-0.6.1}/server/neuro_simulator/core/application.py

@@ -258,8 +258,35 @@ async def startup_event():
         else:
             frontend_dir = None
 
+    # --- Mount Client Frontend ---
+    # Mount the client frontend at /client path (more specific) - MOUNT THIS FIRST
+    try:
+        # Production/Standard install: find client frontend in the package
+        client_frontend_dir_traversable = files('neuro_simulator').joinpath('client')
+        if not client_frontend_dir_traversable.is_dir(): raise FileNotFoundError
+        client_frontend_dir = str(client_frontend_dir_traversable)
+        logger.info(f"Found client frontend via package resources (production mode): '{client_frontend_dir}'")
+    except (ModuleNotFoundError, FileNotFoundError):
+        # Editable/Development install: fall back to relative path from source
+        logger.info("Could not find client frontend via package resources, falling back to development mode path.")
+        dev_client_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'client', 'dist'))
+        if os.path.isdir(dev_client_path):
+            client_frontend_dir = dev_client_path
+            logger.info(f"Found client frontend via relative path (development mode): '{client_frontend_dir}'")
+        else:
+            client_frontend_dir = None
+
+    if client_frontend_dir:
+        app.mount("/client", SPAStaticFiles(directory=client_frontend_dir, html=True), name="client")
+        logger.info("Client frontend mounted at /client")
+    else:
+        logger.error("Client frontend directory not found in either production or development locations.")
+
+    # --- Mount Dashboard Frontend ---
+    # Mount the dashboard frontend at / path (more general) - MOUNT THIS AFTER
     if frontend_dir:
         app.mount("/", SPAStaticFiles(directory=frontend_dir, html=True), name="dashboard")
+        logger.info("Dashboard frontend mounted at /")
     else:
         logger.error("Frontend directory not found in either production or development locations.")