beta 0.9 添加手動重啟 RPC 伺服器的功能

Author: ADT109119

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "llamacpp-distributed-inference",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "分佈式 LLM 推理桌面應用程式",
   "main": "src/main/index.js",
   "type": "module",

package.json

@@ -50,6 +50,16 @@ function createWindow() {
 
 // 啟動 RPC 伺服器
 function startRpcServer() {
+  // 檢查是否已有 RPC server 在運行
+  if (rpcServerProcess) {
+    console.log('RPC server is already running');
+    // 通知前端 RPC 伺服器狀態
+    setTimeout(() => {
+      mainWindow?.webContents.send('rpc-server-status', true);
+    }, 100);
+    return;
+  }
+  
   const platform = process.platform;
   const osMap = {
     'win32': 'windows',
@@ -81,6 +91,7 @@ function startRpcServer() {
 
     rpcServerProcess.on('close', (code) => {
       console.log(`rpc-server process exited with code ${code}`);
+      rpcServerProcess = null; // 清除進程引用
       mainWindow?.webContents.send('rpc-server-status', false);
     });
 
@@ -91,6 +102,7 @@ function startRpcServer() {
 
   } catch (error) {
     console.error('Failed to start rpc-server:', error);
+    rpcServerProcess = null; // 清除進程引用
     mainWindow?.webContents.send('rpc-server-error', error.message);
   }
 }
@@ -701,6 +713,26 @@ ipcMain.handle('remove-node', async (event, nodeIp) => {
   }
 });
 
+// 重啟 RPC server
+ipcMain.handle('restart-rpc-server', async () => {
+  try {
+    // 停止現有的 RPC server
+    if (rpcServerProcess) {
+      rpcServerProcess.kill();
+      rpcServerProcess = null;
+      console.log('RPC server stopped for restart');
+    }
+    
+    // 重新啟動 RPC server
+    startRpcServer();
+    
+    return { success: true, message: 'RPC server 重啟中...' };
+  } catch (error) {
+    console.error('Failed to restart RPC server:', error);
+    return { success: false, message: `重啟 RPC server 失敗: ${error.message}` };
+  }
+});
+
 // 應用程式事件
 app.whenReady().then(() => {
   createWindow();

src/main/index.js

@@ -20,6 +20,9 @@ contextBridge.exposeInMainWorld('electronAPI', {
   browseModelsFolder: () => ipcRenderer.invoke('browse-models-folder'),
   openModelsFolder: () => ipcRenderer.invoke('open-models-folder'),
 
+  // RPC server 控制
+  restartRpcServer: () => ipcRenderer.invoke('restart-rpc-server'),
+  
   // 節點發現
   getDiscoveredNodes: () => ipcRenderer.invoke('get-discovered-nodes'),
   getLocalIps: () => ipcRenderer.invoke('get-local-ips'),

src/preload/index.js

@@ -29,6 +29,7 @@ const elements = {
     modelsPathBtn: document.getElementById('models-path-btn'),
     settingsBtn: document.getElementById('settings-btn'),
     addNodeBtn: document.getElementById('add-node-btn'),
+    restartRpcBtn: document.getElementById('restart-rpc-btn'),
     apiKeyModal: document.getElementById('api-key-modal'),
     apiKeyInput: document.getElementById('api-key-input'),
     saveApiKeyBtn: document.getElementById('save-api-key'),
@@ -753,6 +754,29 @@ async function saveApiKey() {
     }
 }
 
+// 重啟 RPC server
+async function restartRpcServer() {
+    try {
+        // 顯示正在重啟狀態
+        elements.restartRpcBtn.disabled = true;
+        elements.restartRpcBtn.innerHTML = '<i class="fas fa-spinner fa-spin"></i> 重啟中...';
+        
+        const result = await window.electronAPI.restartRpcServer();
+        
+        if (result.success) {
+            logMessage('系統', result.message, 'success');
+        } else {
+            logMessage('系統', result.message, 'error');
+        }
+    } catch (error) {
+        logMessage('系統', `重啟 RPC server 失敗: ${error.message}`, 'error');
+    } finally {
+        // 恢復按鈕狀態
+        elements.restartRpcBtn.disabled = false;
+        elements.restartRpcBtn.innerHTML = '<i class="fas fa-redo"></i> 重啟 RPC 伺服器';
+    }
+}
+
 // 記錄訊息
 function logMessage(category, message, type = 'info') {
     const timestamp = new Date().toLocaleTimeString();
@@ -807,6 +831,9 @@ function setupEventListeners() {
         elements.apiKeyModal.style.display = 'block';
     });
 
+    // 重啟 RPC server 按鈕
+    elements.restartRpcBtn.addEventListener('click', restartRpcServer);
+    
     // 手動添加節點按鈕 (移除重複的事件監聽器)
 
     // GPU 控制同步

src/renderer/app.js

@@ -58,6 +58,11 @@ <h2><i class="fas fa-chart-line"></i> 全局狀態</h2>
                         <span class="status-label">連接節點數</span>
                         <span id="node-count" class="node-count">0/0</span>
                     </div>
+                    <div class="status-item">
+                        <button id="restart-rpc-btn" class="btn btn-secondary" style="width: 100%; margin-top: 10px;">
+                            <i class="fas fa-redo"></i> 重啟 RPC 伺服器
+                        </button>
+                    </div>
                 </div>
             </div>