Merge branch 'main' into new-branch-farm

farm-fe · Mar 27, 2024 · ec4ff0d · ec4ff0d
2 parents 4099578 + 1d1ae1f
commit ec4ff0d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/.changeset/flat-gorillas-play.md b/.changeset/flat-gorillas-play.md
@@ -0,0 +1,5 @@
+---
+'@farmfe/core': patch
+---
+
+fix: Multiple server startups result in WebSocket connection interruptions.
diff --git a/e2e/vitestSetup.ts b/e2e/vitestSetup.ts
@@ -125,7 +125,8 @@ export const startProjectAndTest = async (
       env: {
         BROWSER: 'none',
         NO_COLOR: 'true',
-        FARM_DEFAULT_SERVER_PORT: String(port)
+        FARM_DEFAULT_SERVER_PORT: String(port),
+        FARM_DEFAULT_HMR_PORT: String(port),
       }
     });
 

diff --git a/examples/react/farm.config.ts b/examples/react/farm.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
     },
   },
   server: {
+    port: 6532,
     hmr: {
       path: "/__farm_hmr",
     }

diff --git a/examples/react/src/components/welcome/index.tsx b/examples/react/src/components/welcome/index.tsx
@@ -30,7 +30,7 @@ export function Welcome() {
       <FarmCard>
         <div className="main-desc">
           <h2 className="main-sub-title">
-            Get started With
+            Get started Withasdasd
             <span className="main-content"> React + Farm</span>
           </h2>
           <span className="main-content">

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -377,13 +377,18 @@ export async function normalizeUserCompilationConfig(
   ) {
     const publicPath = userConfig.compilation?.output?.publicPath ?? '/';
     const hmrPath = userConfig.server.hmr.path;
+    const serverOptions = userConfig.server;
+    const defineHmrPath = normalizeBasePath(path.join(publicPath, hmrPath));
 
     config.runtime.plugins.push(hmrClientPluginPath);
-    config.define.FARM_HMR_PORT = String(userConfig.server.hmr.port);
+    // TODO optimize get hmr logic
+    config.define.FARM_HMR_PORT = String(
+      (serverOptions.hmr.port || undefined) ??
+        serverOptions.port ??
+        DEFAULT_DEV_SERVER_OPTIONS.port
+    );
     config.define.FARM_HMR_HOST = userConfig.server.hmr.host;
     config.define.FARM_HMR_PROTOCOL = userConfig.server.hmr.protocol;
-
-    const defineHmrPath = normalizeBasePath(path.join(publicPath, hmrPath));
     config.define.FARM_HMR_PATH = defineHmrPath;
   }
 
@@ -443,7 +448,7 @@ export async function normalizeUserCompilationConfig(
 export const DEFAULT_HMR_OPTIONS: Required<UserHmrConfig> = {
   ignores: [],
   host: true,
-  port: Number(process.env.FARM_DEFAULT_SERVER_PORT) || 9000,
+  port: Number(process.env.FARM_DEFAULT_HMR_PORT) ?? undefined,
   path: '/__hmr',
   protocol: 'ws',
   watchOptions: {}

diff --git a/packages/core/src/server/index.ts b/packages/core/src/server/index.ts
@@ -299,13 +299,13 @@ export class Server implements ImplDevServer {
     logger: Logger
   ): Promise<void> {
     let devPort = normalizedDevConfig.port;
-    let hmrPort = DEFAULT_HMR_OPTIONS.port;
+    let hmrPort = normalizedDevConfig.hmr.port;
+
     const { strictPort, host } = normalizedDevConfig;
     const httpServer = http.createServer();
     const isPortAvailable = (portToCheck: number) => {
       return new Promise((resolve, reject) => {
         const onError = async (error: { code: string }) => {
-          logger.error(`Error in httpServer: ${error} `);
           if (error.code === 'EADDRINUSE') {
             clearScreen();
             if (strictPort) {
@@ -317,6 +317,7 @@ export class Server implements ImplDevServer {
               resolve(false);
             }
           } else {
+            logger.error(`Error in httpServer: ${error} `);
             reject(true);
           }
         };
@@ -330,6 +331,7 @@ export class Server implements ImplDevServer {
     };
 
     let isPortAvailableResult = await isPortAvailable(devPort);
+
     while (isPortAvailableResult === false) {
       if (typeof normalizedDevConfig.hmr === 'object') {
         normalizedDevConfig.hmr.port = ++hmrPort;

diff --git a/packages/runtime-plugin-hmr/src/hmr-client.ts b/packages/runtime-plugin-hmr/src/hmr-client.ts
@@ -5,7 +5,8 @@ import { logger } from './logger';
 import { ErrorOverlay, overlayId } from './overlay';
 
 // Inject during compile time
-const hmrPort = Number(FARM_HMR_PORT || 9000);
+const hmrPort = Number(FARM_HMR_PORT);
+
 const hmrHost =
   typeof FARM_HMR_HOST === 'boolean'
     ? window.location.hostname || 'localhost'