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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuro_simulator
-Version: 0.5.4
+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
@@ -22,7 +22,6 @@ Requires-Dist: azure-cognitiveservices-speech
 Requires-Dist: fastapi
 Requires-Dist: google-genai
 Requires-Dist: jinja2
-Requires-Dist: letta-client
 Requires-Dist: mutagen
 Requires-Dist: openai
 Requires-Dist: pydantic

{neuro_simulator-0.5.4 → 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.5.4 → 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.5.4 → 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.5.4 → 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.5.4 → neuro_simulator-0.6.1}/dashboard/package-lock.json

@@ -1,16 +1,18 @@
 {
   "name": "neuro-simulator-dashboard",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "neuro-simulator-dashboard",
-      "version": "0.5.4",
+      "version": "0.6.0",
       "dependencies": {
         "@mdi/font": "^7.4.47",
         "pinia": "^3.0.3",
+        "uuid": "^9.0.1",
         "vue": "^3.5.18",
+        "vue-i18n": "^11.1.12",
         "vue-router": "^4.5.1",
         "vuetify": "^3.10.3"
       },
@@ -19,6 +21,7 @@
         "@tsconfig/node22": "^22.0.2",
         "@types/jsdom": "^21.1.7",
         "@types/node": "^22.16.5",
+        "@types/uuid": "^9.0.8",
         "@vitejs/plugin-vue": "^6.0.1",
         "@vitest/eslint-plugin": "^1.3.4",
         "@vue/eslint-config-prettier": "^10.2.0",
@@ -1336,6 +1339,50 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@intlify/core-base": {
+      "version": "11.1.12",
+      "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-11.1.12.tgz",
+      "integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==",
+      "license": "MIT",
+      "dependencies": {
+        "@intlify/message-compiler": "11.1.12",
+        "@intlify/shared": "11.1.12"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
+    "node_modules/@intlify/message-compiler": {
+      "version": "11.1.12",
+      "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-11.1.12.tgz",
+      "integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@intlify/shared": "11.1.12",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
+    "node_modules/@intlify/shared": {
+      "version": "11.1.12",
+      "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-11.1.12.tgz",
+      "integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmmirror.com/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1903,6 +1950,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/uuid": {
+      "version": "9.0.8",
+      "resolved": "https://registry.npmmirror.com/@types/uuid/-/uuid-9.0.8.tgz",
+      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.44.1",
       "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.1.tgz",
@@ -6073,6 +6127,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vite": {
       "version": "7.1.7",
       "resolved": "https://registry.npmmirror.com/vite/-/vite-7.1.7.tgz",
@@ -6520,6 +6587,32 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/vue-i18n": {
+      "version": "11.1.12",
+      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-11.1.12.tgz",
+      "integrity": "sha512-BnstPj3KLHLrsqbVU2UOrPmr0+Mv11bsUZG0PyCOzsawCivk8W00GMXHeVUWIDOgNaScCuZah47CZFE+Wnl8mw==",
+      "license": "MIT",
+      "dependencies": {
+        "@intlify/core-base": "11.1.12",
+        "@intlify/shared": "11.1.12",
+        "@vue/devtools-api": "^6.5.0"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/kazupon"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
+    "node_modules/vue-i18n/node_modules/@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+      "license": "MIT"
+    },
     "node_modules/vue-router": {
       "version": "4.5.1",
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.5.1.tgz",

{neuro_simulator-0.5.4 → neuro_simulator-0.6.1}/dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuro-simulator-dashboard",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "private": true,
   "type": "module",
   "engines": {
@@ -20,7 +20,9 @@
   "dependencies": {
     "@mdi/font": "^7.4.47",
     "pinia": "^3.0.3",
+    "uuid": "^9.0.1",
     "vue": "^3.5.18",
+    "vue-i18n": "^11.1.12",
     "vue-router": "^4.5.1",
     "vuetify": "^3.10.3"
   },
@@ -29,6 +31,7 @@
     "@tsconfig/node22": "^22.0.2",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.16.5",
+    "@types/uuid": "^9.0.8",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vitest/eslint-plugin": "^1.3.4",
     "@vue/eslint-config-prettier": "^10.2.0",

{neuro_simulator-0.5.4 → neuro_simulator-0.6.1}/dashboard/src/App.vue

@@ -1,3 +1,4 @@
+
 <template>
   <v-app>
     <v-app-bar app>
@@ -6,6 +7,11 @@
 
       <v-spacer></v-spacer>
 
+      <v-btn-toggle v-model="locale" rounded="0" variant="outlined" density="compact" mandatory class="mr-4">
+        <v-btn value="en">EN</v-btn>
+        <v-btn value="zh">ZH</v-btn>
+      </v-btn-toggle>
+
       <v-chip
         :color="statusColor"
         text-color="white"
@@ -23,7 +29,7 @@
           <template v-slot:prepend>
             <v-icon>{{ item.icon }}</v-icon>
           </template>
-          <v-list-item-title>{{ item.title }}</v-list-item-title>
+          <v-list-item-title>{{ t(item.title) }}</v-list-item-title>
         </v-list-item>
       </v-list>
 
@@ -45,11 +51,11 @@
   <!-- Disconnection Dialog -->
   <v-dialog v-model="connectionStore.wasUnexpectedlyDisconnected" persistent max-width="400">
     <v-card>
-      <v-card-title class="text-h5">连接已断开</v-card-title>
-      <v-card-text>与后端的连接已意外断开，请重新连接。</v-card-text>
+      <v-card-title class="text-h5">{{ t('Connection Lost') }}</v-card-title>
+      <v-card-text>{{ t('The connection to the backend was unexpectedly lost. Please reconnect.') }}</v-card-text>
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="primary" variant="flat" @click="handleReconnectRedirect">返回连接页面</v-btn>
+        <v-btn color="primary" variant="flat" @click="handleReconnectRedirect">{{ t('Go to Connection Page') }}</v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
@@ -60,18 +66,21 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useConnectionStore } from '@/stores/connection';
 import { useConfigStore } from '@/stores/config';
 import { useRouter } from 'vue-router';
 import ConfirmDialog from '@/components/common/ConfirmDialog.vue';
 
+const { t, locale } = useI18n();
+
 const drawer = ref(true); // Sidebar is open by default
 
 const allNavItems = [
-  { title: '连接', icon: 'mdi-connection', to: '/' },
-  { title: '控制', icon: 'mdi-gamepad-variant', to: '/control' },
-  { title: '配置', icon: 'mdi-cog', to: '/config' },
-  { title: '日志', icon: 'mdi-file-document-outline', to: '/logs' },
+  { title: 'Connection', icon: 'mdi-connection', to: '/' },
+  { title: 'Control', icon: 'mdi-gamepad-variant', to: '/control' },
+  { title: 'Configuration', icon: 'mdi-cog', to: '/config' },
+  { title: 'Logs', icon: 'mdi-file-document-outline', to: '/logs' },
   { title: 'Agent', icon: 'mdi-robot', to: '/agent', name: 'agent' },
   { title: 'ChatBot', icon: 'mdi-forum', to: '/chatbot' },
 ];
@@ -90,8 +99,8 @@ const visibleNavItems = computed(() => {
 
 const statusColor = computed(() => {
   const status = connectionStore.statusText;
-  if (status === '已连接') return 'success';
-  if (status === '连接中...') return 'warning';
+  if (status === '已连接' || status === 'Connected') return 'success';
+  if (status === '连接中...' || status === 'Connecting...') return 'warning';
   return 'error';
 });
 
@@ -123,4 +132,4 @@ onMounted(async () => {
   color: #8A8A8A; /* A light grey color */
   text-align: center;
 }
-</style>
+</style>