fix: resolve Metro websocket type errors

Align Metro endpoint typing and test fixtures with the merged startup APIs so package typecheck passes again.

Author: V3RON

packages/bundler-metro/src/__tests__/startup.test.ts

@@ -27,6 +27,8 @@ const createMetroInstance = (
   overrides: Partial<MetroInstance> = {}
 ): MetroInstance => ({
   events: getEmitter<ReportableEvent>(),
+  httpServer: {} as never,
+  websocketEndpoints: {},
   waitUntilHealthy: vi.fn(async () => 'HTTP 200: packager-status:running'),
   prewarm: vi.fn(async () => false),
   dispose: vi.fn(async () => undefined),

packages/bundler-metro/src/types.ts

@@ -1,23 +1,18 @@
-import type { Server as HttpServer, IncomingMessage } from 'node:http';
+import type { Server as HttpServer } from 'node:http';
 import type { Server as HttpsServer } from 'node:https';
-import type { Duplex } from 'node:stream';
+import type { RunServerOptions } from 'metro';
 import type { Reporter } from './reporter.js';
 import type { Config as HarnessConfig } from '@react-native-harness/config';
 
-export type MetroWebSocketEndpoint = {
-  handleUpgrade: (
-    request: IncomingMessage,
-    socket: Duplex,
-    upgradeHead: Buffer,
-    callback: (client: unknown, request: IncomingMessage) => void
-  ) => void;
-  emit: (event: 'connection', client: unknown, request: IncomingMessage) => void;
-};
+export type MetroWebSocketEndpoints = NonNullable<
+  RunServerOptions['websocketEndpoints']
+>;
+export type MetroWebSocketEndpoint = MetroWebSocketEndpoints[string];
 
 export type MetroOptions = {
   projectRoot: string;
   harnessConfig: HarnessConfig;
-  websocketEndpoints?: Record<string, MetroWebSocketEndpoint>;
+  websocketEndpoints?: MetroWebSocketEndpoints;
 };
 
 export type WaitForMetroHealthOptions = {
@@ -33,7 +28,7 @@ export type PrewarmMetroBundleOptions = {
 export type MetroInstance = {
   events: Reporter;
   httpServer: HttpServer | HttpsServer;
-  websocketEndpoints: Record<string, MetroWebSocketEndpoint>;
+  websocketEndpoints: MetroWebSocketEndpoints;
   waitUntilHealthy: (options: WaitForMetroHealthOptions) => Promise<string>;
   prewarm: (options: PrewarmMetroBundleOptions) => Promise<boolean>;
   dispose: () => Promise<void>;

packages/bundler-metro/tsconfig.json

@@ -12,6 +12,9 @@
     {
       "path": "../tools"
     },
+    {
+      "path": "../bridge"
+    },
     {
       "path": "../babel-preset"
     },

packages/bundler-metro/tsconfig.lib.json

@@ -13,16 +13,19 @@
   "include": ["src/**/*.ts"],
   "references": [
     {
-      "path": "../babel-preset/tsconfig.lib.json"
+      "path": "../runtime/tsconfig.lib.json"
     },
     {
       "path": "../config/tsconfig.lib.json"
     },
     {
-      "path": "../runtime/tsconfig.lib.json"
+      "path": "../tools/tsconfig.lib.json"
     },
     {
-      "path": "../tools/tsconfig.lib.json"
+      "path": "../bridge/tsconfig.lib.json"
+    },
+    {
+      "path": "../babel-preset/tsconfig.lib.json"
     }
   ]
 }

packages/jest/src/__tests__/harness.test.ts

@@ -119,6 +119,8 @@ const createMetroInstance = (
   overrides: Partial<MetroInstance> = {}
 ): MetroInstance => ({
   events: createReporter(),
+  httpServer: {} as never,
+  websocketEndpoints: {},
   waitUntilHealthy: vi.fn(async () => 'HTTP 200: packager-status:running'),
   prewarm: vi.fn(async () => false),
   dispose: vi.fn(async () => undefined),

packages/jest/src/harness.ts

@@ -21,6 +21,7 @@ import {
   isMetroCacheReusable,
   waitForMetroBackedAppReady,
   type MetroInstance,
+  type MetroWebSocketEndpoint,
   type ReportableEvent,
 } from '@react-native-harness/bundler-metro';
 import {
@@ -293,7 +294,8 @@ const getHarnessInternal = async (
             projectRoot,
             harnessConfig: config,
             websocketEndpoints: {
-              [HARNESS_BRIDGE_PATH]: serverBridge.ws,
+              [HARNESS_BRIDGE_PATH]:
+                serverBridge.ws as unknown as MetroWebSocketEndpoint,
             },
           },
           signal