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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuro_simulator
-Version: 0.5.3
+Version: 0.5.4
 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.5.3 → neuro_simulator-0.5.4}/dashboard/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "neuro-simulator-dashboard",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "neuro-simulator-dashboard",
-      "version": "0.5.1",
+      "version": "0.5.4",
       "dependencies": {
         "@mdi/font": "^7.4.47",
         "pinia": "^3.0.3",

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

@@ -1,6 +1,6 @@
 {
   "name": "neuro-simulator-dashboard",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "private": true,
   "type": "module",
   "engines": {

{neuro_simulator-0.5.3 → neuro_simulator-0.5.4}/dashboard/src/stores/connection.ts

@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia';
 import { ref, shallowRef } from 'vue';
+import router from '@/router';
 import { useStreamStore } from './stream';
 import { useLogStore } from './logs';
 import { useAgentStore } from './agent';
@@ -13,6 +14,7 @@ interface PendingRequest {
 
 export const useConnectionStore = defineStore('connection', () => {
   const isConnected = ref(false);
+  const isIntegrated = ref(false);
   const statusText = ref('未连接');
   const backendUrl = ref(localStorage.getItem('backendUrl') || '');
   const password = ref(localStorage.getItem('password') || '');
@@ -22,16 +24,13 @@ export const useConnectionStore = defineStore('connection', () => {
   let requestCounter = 0;
 
   async function connectToBackend(): Promise<boolean> {
-    if (!backendUrl.value) {
-      console.warn('Backend URL is not set.');
-      return false;
-    }
     if (isConnected.value || ws.value) {
       await disconnectFromBackend();
     }
     statusText.value = '连接中...';
     try {
-      const healthUrl = new URL('/api/system/health', backendUrl.value).toString();
+      const url = backendUrl.value || window.location.origin;
+      const healthUrl = new URL('/api/system/health', url).toString();
       const headers: HeadersInit = { 'Content-Type': 'application/json' };
       if (password.value) {
         headers['X-API-Token'] = password.value;
@@ -48,11 +47,14 @@ export const useConnectionStore = defineStore('connection', () => {
       await connectWebSocket();
       isConnected.value = true;
       statusText.value = '已连接';
-      localStorage.setItem('backendUrl', backendUrl.value);
-      localStorage.setItem('password', password.value);
+      if (backendUrl.value) {
+        localStorage.setItem('backendUrl', backendUrl.value);
+        localStorage.setItem('password', password.value);
+      }
       console.log('连接成功！');
       const configStore = useConfigStore();
       await configStore.fetchConfig();
+      await router.push('/control');
       return true;
     } catch (error: any) {
       console.error('连接失败:', error);
@@ -68,7 +70,8 @@ export const useConnectionStore = defineStore('connection', () => {
 
   function connectWebSocket() {
     return new Promise<void>((resolve, reject) => {
-      const wsUrl = new URL('/ws/admin', backendUrl.value).toString().replace(/^http/, 'ws');
+      const url = backendUrl.value || window.location.origin;
+      const wsUrl = new URL('/ws/admin', url).toString().replace(/^http/, 'ws');
       const webSocket = new WebSocket(wsUrl);
       webSocket.onopen = () => {
         console.log('管理WebSocket连接已建立');
@@ -168,8 +171,35 @@ export const useConnectionStore = defineStore('connection', () => {
     }
   }
 
+  async function initializeConnection() {
+    try {
+      const response = await fetch('/api/system/health');
+      if (response.ok) {
+        console.log('Integrated mode detected. Auto-connecting...');
+        isIntegrated.value = true;
+        statusText.value = '检测到集成模式，正在连接...';
+        backendUrl.value = '';
+        password.value = '';
+        localStorage.removeItem('backendUrl');
+        localStorage.removeItem('password');
+        await connectToBackend();
+        return;
+      }
+    } catch (e) {
+      console.log('Probe for integrated mode failed, assuming standalone mode.');
+    }
+
+    if (backendUrl.value) {
+      console.log('Standalone mode: attempting to connect to stored URL.');
+      await connectToBackend();
+    }
+  }
+
+  initializeConnection();
+
   return {
     isConnected,
+    isIntegrated,
     statusText,
     backendUrl,
     password,
@@ -178,4 +208,4 @@ export const useConnectionStore = defineStore('connection', () => {
     disconnectFromBackend,
     sendAdminWsMessage,
   };
-});
+});

{neuro_simulator-0.5.3 → neuro_simulator-0.5.4}/dashboard/src/views/HomeView.vue

@@ -1,6 +1,14 @@
 <template>
-  <v-container>
-    <v-card class="mx-auto" max-width="500">
+  <div class="home-view-wrapper">
+    <div v-if="connectionStore.isIntegrated" class="overlay">
+      <div class="overlay-content">
+        <v-icon size="x-large" class="mb-4">mdi-server-network</v-icon>
+        <h2 class="text-h5">已自动连接服务端</h2>
+        <p class="text-body-1">内置面板无需手动连接</p>
+      </div>
+    </div>
+
+    <v-card class="mx-auto" max-width="500" :disabled="connectionStore.isIntegrated">
       <v-card-title class="text-h6 font-weight-regular justify-space-between">
         <span>连接设置</span>
       </v-card-title>
@@ -49,18 +57,16 @@
         </v-btn>
       </v-card-actions>
     </v-card>
-  </v-container>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useConnectionStore } from '@/stores/connection';
-import { useRouter } from 'vue-router';
 
 const connectionStore = useConnectionStore();
-const router = useRouter();
 const loading = ref(false);
-const step = ref(1); // For the v-window, can be used for multi-step forms later
+const step = ref(1);
 
 async function handleConnect() {
   if (!connectionStore.backendUrl) {
@@ -69,10 +75,7 @@ async function handleConnect() {
   }
   loading.value = true;
   try {
-    const success = await connectionStore.connectToBackend();
-    if (success) {
-      router.push('/control');
-    }
+    await connectionStore.connectToBackend();
   } catch (error) {
     console.error('Failed to connect:', error);
   } finally {
@@ -83,5 +86,32 @@ async function handleConnect() {
 async function handleDisconnect() {
   await connectionStore.disconnectFromBackend();
 }
-
 </script>
+
+<style scoped>
+.home-view-wrapper {
+  position: relative;
+}
+
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(255, 255, 255, 0.7);
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px; /* Match v-card's default border-radius */
+}
+
+.overlay-content {
+  text-align: center;
+  padding: 20px;
+  background-color: rgba(255, 255, 255, 0.95);
+  border-radius: 8px;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+}
+</style>

{neuro_simulator-0.5.3 → neuro_simulator-0.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "neuro_simulator"
-version = "0.5.3"
+version = "0.5.4"
 description = "Neuro Simulator Server"
 readme = "README.md"
 authors = [{ name = "Moha-Master", email = "hongkongreporter@outlook.com" }]