fix: resolve extension host reconnection causing editor file open to fail (#145)

- Disable vscode.git/git-base/github via extensions.experimental.disabled
- Add killProcessOnPort with port-free wait before starting bridge/code-server
- Add EADDRINUSE error handling and already-running guard to bridge server
- Support __ASSETS_PATH__ vite define injection for cross-project asset resolution
- Change extension activationEvents from onStartupFinished to * for earlier activation
- Add error handler for extension bridge socket connection
- Re-throw error in codeServerStarter catch block instead of silently swallowing

Author: iamdin

assets/extensions/neovate-code-extension-0.0.7.vsix

@@ -11,6 +11,8 @@ interface IBridgeRequestParams {
   params: Record<string, any>;
 }
 
+export const BRIDGE_SERVER_PORT = 45000;
+
 class ExtensionBridgeServer extends EventEmitter {
   private server: net.Server | null = null;
   private clients = new Map<string, net.Socket>();
@@ -36,8 +38,16 @@ class ExtensionBridgeServer extends EventEmitter {
     this.webContents = webContents;
   }
 
-  start(port: number = 45000) {
-    return new Promise((resolve) => {
+  start(port: number = BRIDGE_SERVER_PORT) {
+    console.log(`[ExtensionBridgeServer] Starting on port ${port}...`);
+    return new Promise((resolve, reject) => {
+      // If already running on this port, reuse it
+      if (this.server && this.server.listening) {
+        console.log(`[ExtensionBridgeServer] Already running on port ${port}`);
+        resolve('');
+        return;
+      }
+
       this.server = net.createServer((socket) => {
         let currentCwd: string | null = null;
 
@@ -121,9 +131,24 @@ class ExtensionBridgeServer extends EventEmitter {
           }
         });
       });
+
+      // Handle server errors (e.g., EADDRINUSE)
+      this.server.on('error', (error: NodeJS.ErrnoException) => {
+        console.error(`[ExtensionBridgeServer] Server error:`, error);
+        if (error.code === 'EADDRINUSE') {
+          reject(
+            new Error(
+              `Port ${port} is already in use. Please close other instances or restart the application.`,
+            ),
+          );
+        } else {
+          reject(error);
+        }
+      });
+
       this.server.listen(port, () => {
         console.log(
-          `Extension Bridge server started on port ${port}`,
+          `[ExtensionBridgeServer] ✓ Started on port ${port}`,
           Date.now(),
         );
         resolve('');

src/main/code-server/bridge.ts

@@ -1,37 +1,30 @@
 import { app } from 'electron';
 import path from 'path';
 
+declare const __ASSETS_PATH__: string | undefined;
+
 const EXTENSION_DIR = 'extensions';
 const VSIX_FILENAME = 'neovate-code-extension-0.0.7.vsix';
 
 /**
  * 获取扩展目录的统一路径
- * 开发环境：项目根目录/assets/extensions
+ * 开发环境：由各自 vite config 的 define 注入 __ASSETS_PATH__，默认 __dirname/../../assets
  * 打包环境：应用根目录/assets/extensions
  */
 export function getExtensionsBasePath(): string {
-  const isDev = process.env.NODE_ENV === 'development' || !app.isPackaged;
-
-  if (isDev) {
-    // 开发环境：项目根目录/assets/extensions
-    return path.join(
-      __dirname,
-      '..',
-      '..',
-      'assets',
-      EXTENSION_DIR,
-      VSIX_FILENAME,
-    );
-  } else {
-    // 打包环境：应用根目录/assets/extensions（asar 内）
-    // __dirname = app.asar/dist/main/code-server，需要回到 app.asar/dist/
-    return path.join(
-      __dirname,
-      '..',
-      '..',
-      'assets',
-      EXTENSION_DIR,
-      VSIX_FILENAME,
-    );
+  if (!app.isPackaged) {
+    const assetsPath =
+      typeof __ASSETS_PATH__ !== 'undefined'
+        ? __ASSETS_PATH__
+        : path.join(__dirname, '..', '..', 'assets');
+    return path.join(assetsPath, EXTENSION_DIR, VSIX_FILENAME);
   }
+  return path.join(
+    __dirname,
+    '..',
+    '..',
+    'assets',
+    EXTENSION_DIR,
+    VSIX_FILENAME,
+  );
 }

src/main/code-server/extension-path.ts

@@ -1,5 +1,5 @@
 import { execSync } from 'node:child_process';
-import { bridgeServer } from './bridge';
+import { bridgeServer, BRIDGE_SERVER_PORT } from './bridge';
 import { CODE_SERVER_PORT, DATA_DIR, EXTENSIONS_DIR } from './constants';
 import {
   downloadCodeServer,
@@ -27,9 +27,9 @@ export interface CodeServerInstance {
 }
 
 /**
- * Kill any process running on the specified port
+ * Kill any process running on the specified port and wait for it to be freed
  */
-function killProcessOnPort(port: number): void {
+async function killProcessOnPort(port: number): Promise<void> {
   try {
     if (process.platform === 'win32') {
       // Windows
@@ -54,6 +54,19 @@ function killProcessOnPort(port: number): void {
         stdio: 'ignore',
       });
     }
+
+    // Wait for port to be fully released (max 2 seconds)
+    const maxWaitMs = 2000;
+    const startTime = Date.now();
+    while (Date.now() - startTime < maxWaitMs) {
+      try {
+        execSync(`lsof -ti:${port}`, { stdio: 'ignore' });
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      } catch {
+        // Port is free
+        return;
+      }
+    }
   } catch {
     // No process on port, or kill failed - that's fine
   }
@@ -103,32 +116,52 @@ class CodeServerManager {
     if (!installed) {
       await downloadCodeServer(onProgress);
     }
+
     // 2. Override settings for minimal UI
     await overrideCodeServerSettings();
 
-    // 3. Kill any existing process on the port
-    killProcessOnPort(CODE_SERVER_PORT);
+    // 3. Kill any existing process on the ports
+    await killProcessOnPort(CODE_SERVER_PORT);
+    await killProcessOnPort(BRIDGE_SERVER_PORT);
+
+    // 4a. Start bridge server (REQUIRED for editor functionality)
     try {
-      // code server extension bridge server
       await bridgeServer.start();
-      // preset extension
+    } catch (e) {
+      throw new CodeServerStartError(
+        `Bridge server failed to start: ${e instanceof Error ? e.message : String(e)}`,
+        e instanceof Error ? e : new Error(String(e)),
+      );
+    }
+
+    // 4b. Install extensions (non-critical, can fail gracefully)
+    try {
       await installExtension();
-      // overwrite vscode dist style
+    } catch (e) {
+      console.warn(
+        '[CodeServerManager] Extension installation failed (non-critical):',
+        e,
+      );
+    }
+
+    // 4c. Inject styles (non-critical, can fail gracefully)
+    try {
       injectStyle();
     } catch (e) {
-      console.warn(`Extension Service failed`, e);
+      console.warn(
+        '[CodeServerManager] Style injection failed (non-critical):',
+        e,
+      );
     }
 
     try {
-      // start code server
       await codeServerStarter({
         port: CODE_SERVER_PORT,
         extDir: EXTENSIONS_DIR,
         dataDir: DATA_DIR,
       });
 
       const url = `http://127.0.0.1:${CODE_SERVER_PORT}`;
-
       return {
         url,
         stop: () => {

src/main/code-server/index.ts

@@ -28,6 +28,14 @@ const OVERRIDE_SETTINGS = {
   'security.workspace.trust.enabled': false,
   /** 禁用空入口时的欢迎特性 */
   'workbench.startupEditor': 'none',
+  /** 禁用不必要的内置扩展，避免其 activate() 阻塞 Eager extensions activated */
+  'extensions.experimental.disabled': [
+    'vscode.git',
+    'vscode.git-base',
+    'vscode.github',
+    'vscode.github-authentication',
+    'vscode.npm',
+  ],
   /** 行号前面的空间，用于小灯泡 */
   'editor.glyphMargin': false,
   /** 代码折叠功能 */

src/main/code-server/settings.ts

@@ -32,6 +32,7 @@ export async function codeServerStarter(opts: {
     return await delay(1000); // FIXME: 插件关闭侧边栏有延迟，先这样处理，后面可能用魔改产物的方式强制屏蔽
   } catch (e) {
     console.log(`Code Server Starter Failed: ${e}`);
+    throw e;
   }
 }
 

src/main/code-server/starter.ts

@@ -12,7 +12,7 @@
   ],
   "main": "./dist/extension.js",
   "activationEvents": [
-    "onStartupFinished"
+    "*"
   ],
   "contributes": {},
   "scripts": {

vscode-extension/neovate-code-extension-0.0.7.vsix

@@ -54,6 +54,10 @@ export function runServer() {
     send('ping', {});
   });
 
+  client.on('error', (err) => {
+    console.error('Extension bridge connection error:', err.message);
+  });
+
   client.on('data', async (data) => {
     try {
       const request = JSON.parse(data.toString());