feat(core): allow clientPort to be set for proxied environments (e.g.…

… GitHub Codespaces)
fwouts · Dec 2, 2023 · 70a2306 · 70a2306
1 parent 250fa03
commit 70a2306
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/core/src/index.ts b/core/src/index.ts
@@ -93,7 +93,7 @@ export async function createWorkspace({
     typeAnalyzer: frameworkPlugin.typeAnalyzer,
     rootDir,
     reader,
-    startServer: async ({ port, onStop } = {}) => {
+    startServer: async ({ port, clientPort, onStop } = {}) => {
       port ||= await getFreePort(3140);
       const router = new ApiRouter(logger);
       router.registerRPC(RPCs.Analyze, async ({ previewableIds }) => {
@@ -199,6 +199,7 @@ export async function createWorkspace({
         logger,
         middlewares,
         port,
+        clientPort,
       });
       await previewer.start();
       activePreviewers.add(previewer);
@@ -246,6 +247,7 @@ export interface Workspace {
   crawlFiles: Analyzer["crawlFiles"];
   startServer: (options?: {
     port?: number;
+    clientPort?: number;
     onStop?: () => void;
   }) => Promise<PreviewServer>;
   dispose(): Promise<void>;

diff --git a/core/src/previewer.ts b/core/src/previewer.ts
@@ -26,6 +26,7 @@ export class Previewer {
       frameworkPlugin: FrameworkPlugin;
       middlewares: express.RequestHandler[];
       port: number;
+      clientPort?: number;
     }
   ) {
     this.transformingReader = createStackedReader([
@@ -150,6 +151,7 @@ export class Previewer {
           frameworkPlugin: this.options.frameworkPlugin,
           server,
           port: this.options.port,
+          clientPort: this.options.clientPort,
         });
         this.viteManager.start();
         this.options.logger.debug(`Previewer ready`);

diff --git a/core/src/vite/vite-manager.ts b/core/src/vite/vite-manager.ts
@@ -128,6 +128,7 @@ export class ViteManager {
       frameworkPlugin: FrameworkPlugin;
       server: Server;
       port: number;
+      clientPort?: number;
     }
   ) {
     const router = express.Router();
@@ -379,7 +380,7 @@ export class ViteManager {
           hmr: {
             overlay: false,
             server: this.options.server,
-            clientPort: this.options.port,
+            clientPort: this.options.clientPort || this.options.port,
             ...(typeof config.vite?.server?.hmr === "object"
               ? config.vite?.server?.hmr
               : {}),

diff --git a/daemon/src/api.ts b/daemon/src/api.ts
@@ -15,6 +15,8 @@ export type CrawlFileResponse =
 
 export type StartPreviewRequest = {
   rootDir: string;
+  port?: number;
+  clientPort?: number;
 };
 
 export type StartPreviewResponse = {

diff --git a/daemon/src/index.ts b/daemon/src/index.ts
@@ -194,7 +194,7 @@ export async function startDaemon({
 
   endpoint<StartPreviewRequest, StartPreviewResponse>(
     "/previews/start",
-    async ({ rootDir }) =>
+    async ({ rootDir, port, clientPort }) =>
       inWorkspace<StartPreviewResponse>(rootDir, async (workspace) => {
         if (workspace?.rootDir !== rootDir) {
           throw new NotFoundError();
@@ -203,6 +203,8 @@ export async function startDaemon({
         if (!previewServer) {
           previewServer = previewServers[rootDir] = await workspace.startServer(
             {
+              port,
+              clientPort,
               onStop: () => {
                 delete previewServers[rootDir];
               },