@callstack/repack-dev-server 5.0.0-rc.9 → 5.0.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Callstack
+Copyright (c) 2025 Callstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,32 +1,27 @@
-<p align="center">
-  <img src="https://raw.githubusercontent.com/callstack/repack/HEAD/logo.png">
-</p>
-<p align="center">
-A toolkit to build your React Native application with Rspack or Webpack.
-</p>
+<div align="center">
+  <img src="https://raw.githubusercontent.com/callstack/repack/HEAD/logo.png" width="650" alt="Re.Pack logo" />
+  <h3>A toolkit to build your React Native application with Rspack or Webpack.</h3>
+</div>
+<div align="center">
 
----
-
-[![Build Status][build-badge]][build]
-[![Version][version-badge]][version]
-[![MIT License][license-badge]][license]
+[![mit licence][license-badge]][license]
+[![npm downloads][npm-downloads-badge]][npm-downloads]
+[![Chat][chat-badge]][chat]
 [![PRs Welcome][prs-welcome-badge]][prs-welcome]
-[![Code of Conduct][coc-badge]][coc]
 
-`@callstack/repack-dev-sever` is bundler-agnostic development server for React Native applications as part of `@callstack/repack`.
+</div>
+
+`@callstack/repack-dev-server` is a bundler-agnostic development server for React Native applications as part of [`@callstack/repack`](https://github.com/callstack/repack).
 
 Check out our website at https://re-pack.dev for more info and documentation or out GitHub: https://github.com/callstack/repack.
 
 <!-- badges -->
 
-[callstack-readme-with-love]: https://callstack.com/?utm_source=github.com&utm_medium=referral&utm_campaign=react-native-paper&utm_term=readme-with-love
-[build-badge]: https://img.shields.io/github/workflow/status/callstack/repack/CI/main?style=flat-square
-[build]: https://github.com/callstack/repack/actions/workflows/main.yml
-[version-badge]: https://img.shields.io/npm/v/@callstack/repack-dev-server?style=flat-square
-[version]: https://www.npmjs.com/package/@callstack/repack-dev-server
-[license-badge]: https://img.shields.io/npm/l/@callstack/repack-debugger-app?style=flat-square
-[license]: https://github.com/callstack/repack/blob/master/LICENSE
-[prs-welcome-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
+[license-badge]: https://img.shields.io/npm/l/@callstack/repack?style=for-the-badge
+[license]: https://github.com/callstack/repack/blob/main/LICENSE
+[npm-downloads-badge]: https://img.shields.io/npm/dm/@callstack/repack?style=for-the-badge
+[npm-downloads]: https://www.npmjs.com/package/@callstack/repack
+[prs-welcome-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge
 [prs-welcome]: ./CONTRIBUTING.md
-[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
-[coc]: https://github.com/callstack/repack/blob/master/CODE_OF_CONDUCT.md
+[chat-badge]: https://img.shields.io/discord/426714625279524876.svg?style=for-the-badge
+[chat]: https://discord.gg/Q4yr2rTWYF

package/dist/createServer.js

@@ -11,6 +11,7 @@ import multipartPlugin from './plugins/multipart/multipartPlugin.js';
 import symbolicatePlugin from './plugins/symbolicate/sybmolicatePlugin.js';
 import wssPlugin from './plugins/wss/wssPlugin.js';
 import { Internal } from './types.js';
+import { normalizeOptions } from './utils/normalizeOptions.js';
 /**
  * Create instance of development server, powered by Fastify.
  *
@@ -20,9 +21,10 @@ import { Internal } from './types.js';
 export async function createServer(config) {
     // biome-ignore lint/style/useConst: needed in fastify constructor
     let delegate;
+    const options = normalizeOptions(config.options);
     /** Fastify instance powering the development server. */
     const instance = Fastify({
-        disableRequestLogging: !config.options.logRequests,
+        disableRequestLogging: options.disableRequestLogging,
         logger: {
             level: 'trace',
             stream: new Writable({
@@ -34,9 +36,10 @@ export async function createServer(config) {
                 },
             }),
         },
-        ...(config.options.https ? { https: config.options.https } : undefined),
+        ...(options.https ? { https: options.https } : {}),
     });
-    delegate = await config.delegate({
+    delegate = config.delegate({
+        options,
         log: instance.log,
         notifyBuildStart: (platform) => {
             instance.wss.apiServer.send({
@@ -50,16 +53,16 @@ export async function createServer(config) {
                 platform,
             });
         },
-        broadcastToHmrClients: (event, platform, clientIds) => {
-            instance.wss.hmrServer.send(event, platform, clientIds);
+        broadcastToHmrClients: (event) => {
+            instance.wss.hmrServer.send(event);
         },
         broadcastToMessageClients: ({ method, params }) => {
             instance.wss.messageServer.broadcast(method, params);
         },
     });
     const devMiddleware = createDevMiddleware({
-        projectRoot: config.options.rootDir,
-        serverBaseUrl: `http://${config.options.host}:${config.options.port}`,
+        projectRoot: options.rootDir,
+        serverBaseUrl: options.url,
         logger: instance.log,
         unstable_experiments: {
             // @ts-expect-error removed in 0.76, keep this for backkwards compatibility
@@ -70,11 +73,8 @@ export async function createServer(config) {
     await instance.register(fastifySensible);
     await instance.register(middie);
     await instance.register(wssPlugin, {
-        options: {
-            ...config.options,
-            endpoints: devMiddleware.websocketEndpoints,
-        },
         delegate,
+        endpoints: devMiddleware.websocketEndpoints,
     });
     await instance.register(multipartPlugin);
     await instance.register(apiPlugin, {
@@ -85,7 +85,7 @@ export async function createServer(config) {
         delegate,
     });
     await instance.register(devtoolsPlugin, {
-        options: config.options,
+        rootDir: options.rootDir,
     });
     await instance.register(symbolicatePlugin, {
         delegate,
@@ -95,7 +95,7 @@ export async function createServer(config) {
     await instance.register(faviconPlugin);
     instance.addHook('onSend', async (request, reply, payload) => {
         reply.header('X-Content-Type-Options', 'nosniff');
-        reply.header('X-React-Native-Project-Root', config.options.rootDir);
+        reply.header('X-React-Native-Project-Root', options.rootDir);
         const [pathname] = request.url.split('?');
         if (pathname.endsWith('.map')) {
             reply.header('Access-Control-Allow-Origin', 'devtools://devtools');
@@ -110,8 +110,8 @@ export async function createServer(config) {
     /** Start the development server. */
     async function start() {
         await instance.listen({
-            port: config.options.port,
-            host: config.options.host,
+            port: options.port,
+            host: options.host,
         });
     }
     /** Stop the development server. */

package/dist/plugins/compiler/compilerPlugin.js

@@ -18,8 +18,8 @@ async function compilerPlugin(instance, { delegate }) {
             let { platform } = request.query;
             if (!filename) {
                 // This technically should never happen - this route should not be called if file is missing.
-                request.log.error('File was not provided');
-                return reply.notFound();
+                request.log.debug('File was not provided');
+                return reply.notFound('File was not provided');
             }
             // Let consumer infer the platform. If function is not provided fallback
             // to platform query param.
@@ -29,6 +29,7 @@ async function compilerPlugin(instance, { delegate }) {
                 multipart?.writeChunk({ 'Content-Type': 'application/json' }, JSON.stringify({
                     done: completed,
                     total,
+                    status: 'Bundling with Re.Pack',
                 }));
             };
             try {
@@ -45,7 +46,7 @@ async function compilerPlugin(instance, { delegate }) {
                 }
             }
             catch (error) {
-                request.log.error(error);
+                request.log.debug(error);
                 return reply.notFound(error.message);
             }
         },

package/dist/plugins/devtools/devtoolsPlugin.d.ts

@@ -1,7 +1,6 @@
 import type { FastifyInstance } from 'fastify';
-import type { Server } from '../../types.js';
-declare function devtoolsPlugin(instance: FastifyInstance, { options }: {
-    options: Server.Options;
+declare function devtoolsPlugin(instance: FastifyInstance, { rootDir }: {
+    rootDir: string;
 }): Promise<void>;
 declare const _default: typeof devtoolsPlugin;
 export default _default;

package/dist/plugins/devtools/devtoolsPlugin.js

@@ -1,9 +1,9 @@
 import { openStackFrameInEditorMiddleware, openURLMiddleware, } from '@react-native-community/cli-server-api';
 import fastifyPlugin from 'fastify-plugin';
-async function devtoolsPlugin(instance, { options }) {
+async function devtoolsPlugin(instance, { rootDir }) {
     instance.use('/open-url', openURLMiddleware);
     instance.use('/open-stack-frame', openStackFrameInEditorMiddleware({
-        watchFolders: [options.rootDir],
+        watchFolders: [rootDir],
     }));
     instance.route({
         method: ['GET', 'POST', 'PUT'],

package/dist/plugins/favicon/faviconPlugin.js

@@ -2,7 +2,6 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import fastifyFavicon from 'fastify-favicon';
 import fastifyPlugin from 'fastify-plugin';
-// @ts-ignore
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const pathToImgDir = path.join(dirname, '../../../static');
 async function faviconPlugin(instance) {

package/dist/plugins/wss/WebSocketServer.d.ts

@@ -1,35 +1,33 @@
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
 import type { FastifyInstance } from 'fastify';
-import { type ServerOptions, type WebSocket, WebSocketServer as WebSocketServerImpl } from 'ws';
-import type { WebSocketServerInterface } from './types.js';
+import { type WebSocket, WebSocketServer as WebSocketServerImpl } from 'ws';
+import type { WebSocketServerInterface, WebSocketServerOptions } from './types.js';
 /**
  * Abstract class for providing common logic (eg routing) for all WebSocket servers.
  *
  * @category Development server
  */
-export declare abstract class WebSocketServer implements WebSocketServerInterface {
+export declare abstract class WebSocketServer<T extends WebSocket = WebSocket> implements WebSocketServerInterface {
     /** An instance of the underlying WebSocket server. */
     protected server: WebSocketServerImpl;
     /** Fastify instance from which {@link server} will receive upgrade connections. */
     protected fastify: FastifyInstance;
+    protected name: string;
     protected paths: string[];
+    protected clients: Map<string, T>;
+    protected nextClientId: number;
+    private timer;
     /**
      * Create a new instance of the WebSocketServer.
      * Any logging information, will be passed through standard `fastify.log` API.
      *
      * @param fastify Fastify instance to which the WebSocket will be attached to.
      * @param path Path on which this WebSocketServer will be accepting connections.
-     * @param wssOptions WebSocket Server options.
+     * @param options WebSocketServer options.
      */
-    constructor(fastify: FastifyInstance, path: string | string[], wssOptions?: Omit<ServerOptions, 'noServer' | 'server' | 'host' | 'port' | 'path'>);
+    constructor(fastify: FastifyInstance, options: WebSocketServerOptions);
     shouldUpgrade(pathname: string): boolean;
     upgrade(request: IncomingMessage, socket: Socket, head: Buffer): void;
-    /**
-     * Process incoming WebSocket connection.
-     *
-     * @param socket Incoming WebSocket connection.
-     * @param request Upgrade request for the connection.
-     */
-    abstract onConnection(socket: WebSocket, request: IncomingMessage): void;
+    onConnection(socket: T, _request: IncomingMessage): string;
 }

package/dist/plugins/wss/WebSocketServer.js

@@ -1,4 +1,4 @@
-import { WebSocketServer as WebSocketServerImpl, } from 'ws';
+import { WebSocketServer as WebSocketServerImpl } from 'ws';
 /**
  * Abstract class for providing common logic (eg routing) for all WebSocket servers.
  *
@@ -11,13 +11,29 @@ export class WebSocketServer {
      *
      * @param fastify Fastify instance to which the WebSocket will be attached to.
      * @param path Path on which this WebSocketServer will be accepting connections.
-     * @param wssOptions WebSocket Server options.
+     * @param options WebSocketServer options.
      */
-    constructor(fastify, path, wssOptions = {}) {
+    constructor(fastify, options) {
+        this.nextClientId = 0;
+        this.timer = null;
         this.fastify = fastify;
-        this.server = new WebSocketServerImpl({ noServer: true, ...wssOptions });
+        this.name = options.name;
+        this.paths = Array.isArray(options.path) ? options.path : [options.path];
+        this.server = new WebSocketServerImpl({ noServer: true, ...options.wss });
         this.server.on('connection', this.onConnection.bind(this));
-        this.paths = Array.isArray(path) ? path : [path];
+        this.clients = new Map();
+        // setup heartbeat timer
+        this.timer = setInterval(() => {
+            this.clients.forEach((socket) => {
+                if (!socket.isAlive) {
+                    socket.terminate();
+                }
+                else {
+                    socket.isAlive = false;
+                    socket.ping(() => { });
+                }
+            });
+        }, 30000);
     }
     shouldUpgrade(pathname) {
         return this.paths.includes(pathname);
@@ -27,4 +43,25 @@ export class WebSocketServer {
             this.server.emit('connection', webSocket, request);
         });
     }
+    onConnection(socket, _request) {
+        const clientId = `client#${this.nextClientId++}`;
+        this.clients.set(clientId, socket);
+        this.fastify.log.debug({ msg: `${this.name} client connected`, clientId });
+        const errorHandler = () => {
+            this.fastify.log.debug({
+                msg: `${this.name} client disconnected`,
+                clientId,
+            });
+            socket.removeAllListeners(); // should we do this?
+            this.clients.delete(clientId);
+        };
+        socket.addEventListener('error', errorHandler);
+        socket.addEventListener('close', errorHandler);
+        // heartbeat
+        socket.isAlive = true;
+        socket.on('pong', () => {
+            socket.isAlive = true;
+        });
+        return clientId;
+    }
 }

package/dist/plugins/wss/servers/WebSocketApiServer.d.ts

@@ -1,5 +1,4 @@
 import type { FastifyInstance } from 'fastify';
-import type WebSocket from 'ws';
 import { WebSocketServer } from '../WebSocketServer.js';
 /**
  * Class for creating a WebSocket server for API clients.
@@ -8,8 +7,6 @@ import { WebSocketServer } from '../WebSocketServer.js';
  * @category Development server
  */
 export declare class WebSocketApiServer extends WebSocketServer {
-    private clients;
-    private nextClientId;
     /**
      * Create new instance of WebSocketApiServer and attach it to the given Fastify instance.
      * Any logging information, will be passed through standard `fastify.log` API.
@@ -23,10 +20,4 @@ export declare class WebSocketApiServer extends WebSocketServer {
      * @param event Event string or object to send.
      */
     send(event: any): void;
-    /**
-     * Process new WebSocket connection from client application.
-     *
-     * @param socket Incoming client's WebSocket connection.
-     */
-    onConnection(socket: WebSocket): void;
 }

package/dist/plugins/wss/servers/WebSocketApiServer.js

@@ -13,9 +13,7 @@ export class WebSocketApiServer extends WebSocketServer {
      * @param fastify Fastify instance to attach the WebSocket server to.
      */
     constructor(fastify) {
-        super(fastify, '/api');
-        this.clients = new Map();
-        this.nextClientId = 0;
+        super(fastify, { name: 'API', path: '/api' });
     }
     /**
      * Send message to all connected API clients.
@@ -33,24 +31,4 @@ export class WebSocketApiServer extends WebSocketServer {
             }
         }
     }
-    /**
-     * Process new WebSocket connection from client application.
-     *
-     * @param socket Incoming client's WebSocket connection.
-     */
-    onConnection(socket) {
-        const clientId = `client#${this.nextClientId++}`;
-        this.clients.set(clientId, socket);
-        this.fastify.log.debug({ msg: 'API client connected', clientId });
-        this.clients.set(clientId, socket);
-        const onClose = () => {
-            this.fastify.log.debug({
-                msg: 'API client disconnected',
-                clientId,
-            });
-            this.clients.delete(clientId);
-        };
-        socket.addEventListener('error', onClose);
-        socket.addEventListener('close', onClose);
-    }
 }

package/dist/plugins/wss/servers/WebSocketDevClientServer.d.ts

@@ -1,3 +1,4 @@
+import type { IncomingMessage } from 'node:http';
 import type { FastifyInstance } from 'fastify';
 import type WebSocket from 'ws';
 import { WebSocketServer } from '../WebSocketServer.js';
@@ -8,8 +9,6 @@ import { WebSocketServer } from '../WebSocketServer.js';
  * @category Development server
  */
 export declare class WebSocketDevClientServer extends WebSocketServer {
-    private clients;
-    private nextClientId;
     /**
      * Create new instance of WebSocketDevClientServer and attach it to the given Fastify instance.
      * Any logging information, will be passed through standard `fastify.log` API.
@@ -23,10 +22,5 @@ export declare class WebSocketDevClientServer extends WebSocketServer {
      * @param message Stringified client message.
      */
     processMessage(message: string): void;
-    /**
-     * Process new WebSocket connection from client application.
-     *
-     * @param socket Incoming client's WebSocket connection.
-     */
-    onConnection(socket: WebSocket): void;
+    onConnection(socket: WebSocket, request: IncomingMessage): string;
 }

package/dist/plugins/wss/servers/WebSocketDevClientServer.js

@@ -13,9 +13,7 @@ export class WebSocketDevClientServer extends WebSocketServer {
      * @param fastify Fastify instance to attach the WebSocket server to.
      */
     constructor(fastify) {
-        super(fastify, '/__client');
-        this.clients = new Map();
-        this.nextClientId = 0;
+        super(fastify, { name: 'React Native', path: '/__client' });
     }
     /**
      * Process client message.
@@ -44,26 +42,11 @@ export class WebSocketDevClientServer extends WebSocketServer {
                 this.fastify.log.warn({ msg: 'Unknown client message', message });
         }
     }
-    /**
-     * Process new WebSocket connection from client application.
-     *
-     * @param socket Incoming client's WebSocket connection.
-     */
-    onConnection(socket) {
-        const clientId = `client#${this.nextClientId++}`;
-        this.clients.set(clientId, socket);
-        this.fastify.log.debug({ msg: 'React Native client connected', clientId });
-        const onClose = () => {
-            this.fastify.log.debug({
-                msg: 'React Native client disconnected',
-                clientId,
-            });
-            this.clients.delete(clientId);
-        };
-        socket.addEventListener('error', onClose);
-        socket.addEventListener('close', onClose);
+    onConnection(socket, request) {
+        const clientId = super.onConnection(socket, request);
         socket.addEventListener('message', (event) => {
             this.processMessage(event.data.toString());
         });
+        return clientId;
     }
 }

package/dist/plugins/wss/servers/WebSocketEventsServer.d.ts

@@ -1,3 +1,4 @@
+import type { IncomingMessage } from 'node:http';
 import type { FastifyInstance } from 'fastify';
 import type WebSocket from 'ws';
 import { WebSocketServer } from '../WebSocketServer.js';
@@ -36,8 +37,6 @@ export interface EventMessage {
 export declare class WebSocketEventsServer extends WebSocketServer {
     private config;
     static readonly PROTOCOL_VERSION = 2;
-    private clients;
-    private nextClientId;
     /**
      * Create new instance of WebSocketHMRServer and attach it to the given Fastify instance.
      * Any logging information, will be passed through standard `fastify.log` API.
@@ -66,10 +65,5 @@ export declare class WebSocketEventsServer extends WebSocketServer {
      * @param event Event message to broadcast.
      */
     broadcastEvent(event: EventMessage): void;
-    /**
-     * Process new client's WebSocket connection.
-     *
-     * @param socket Incoming WebSocket connection.
-     */
-    onConnection(socket: WebSocket): void;
+    onConnection(socket: WebSocket, request: IncomingMessage): string;
 }

package/dist/plugins/wss/servers/WebSocketEventsServer.js

@@ -16,14 +16,16 @@ export class WebSocketEventsServer extends WebSocketServer {
      * @param config Configuration object.
      */
     constructor(fastify, config) {
-        super(fastify, '/events', {
-            verifyClient: (({ origin }) => {
-                return /^(https?:\/\/localhost|file:\/\/)/.test(origin);
-            }),
+        super(fastify, {
+            name: 'Events',
+            path: '/events',
+            wss: {
+                verifyClient: (({ origin }) => {
+                    return /^(https?:\/\/localhost|file:\/\/)/.test(origin);
+                }),
+            },
         });
         this.config = config;
-        this.clients = new Map();
-        this.nextClientId = 0;
     }
     /**
      * Parse received command message from connected client.
@@ -118,22 +120,8 @@ export class WebSocketEventsServer extends WebSocketServer {
             }
         }
     }
-    /**
-     * Process new client's WebSocket connection.
-     *
-     * @param socket Incoming WebSocket connection.
-     */
-    onConnection(socket) {
-        const clientId = `client#${this.nextClientId++}`;
-        this.clients.set(clientId, socket);
-        this.fastify.log.debug({ msg: 'Events client connected', clientId });
-        const onClose = () => {
-            this.fastify.log.debug({ msg: 'Events client disconnected', clientId });
-            socket.removeAllListeners();
-            this.clients.delete(clientId);
-        };
-        socket.addEventListener('error', onClose);
-        socket.addEventListener('close', onClose);
+    onConnection(socket, request) {
+        const clientId = super.onConnection(socket, request);
         socket.addEventListener('message', (event) => {
             const message = this.parseMessage(event.data.toString());
             if (!message) {
@@ -157,6 +145,7 @@ export class WebSocketEventsServer extends WebSocketServer {
                 });
             }
         });
+        return clientId;
     }
 }
 WebSocketEventsServer.PROTOCOL_VERSION = 2;

package/dist/plugins/wss/servers/WebSocketHMRServer.d.ts

@@ -1,37 +1,22 @@
-import type { IncomingMessage } from 'node:http';
 import type { FastifyInstance } from 'fastify';
-import type WebSocket from 'ws';
 import { WebSocketServer } from '../WebSocketServer.js';
-import type { HmrDelegate } from '../types.js';
 /**
  * Class for creating a WebSocket server for Hot Module Replacement.
  *
  * @category Development server
  */
 export declare class WebSocketHMRServer extends WebSocketServer {
-    private delegate;
-    private clients;
-    private nextClientId;
     /**
      * Create new instance of WebSocketHMRServer and attach it to the given Fastify instance.
      * Any logging information, will be passed through standard `fastify.log` API.
      *
      * @param fastify Fastify instance to attach the WebSocket server to.
-     * @param delegate HMR delegate instance.
      */
-    constructor(fastify: FastifyInstance, delegate: HmrDelegate);
+    constructor(fastify: FastifyInstance);
     /**
      * Send action to all connected HMR clients.
      *
      * @param event Event to send to the clients.
-     * @param platform Platform of clients to send the event to.
-     * @param clientIds Ids of clients who should receive the event.
      */
-    send(event: any, platform: string, clientIds?: string[]): void;
-    /**
-     * Process new WebSocket connection from HMR client.
-     *
-     * @param socket Incoming HMR client's WebSocket connection.
-     */
-    onConnection(socket: WebSocket, request: IncomingMessage): void;
+    send(event: any): void;
 }

package/dist/plugins/wss/servers/WebSocketHMRServer.js

@@ -1,4 +1,3 @@
-import { URL } from 'node:url';
 import { WebSocketServer } from '../WebSocketServer.js';
 /**
  * Class for creating a WebSocket server for Hot Module Replacement.
@@ -11,28 +10,21 @@ export class WebSocketHMRServer extends WebSocketServer {
      * Any logging information, will be passed through standard `fastify.log` API.
      *
      * @param fastify Fastify instance to attach the WebSocket server to.
-     * @param delegate HMR delegate instance.
      */
-    constructor(fastify, delegate) {
-        super(fastify, delegate.getUriPath());
-        this.delegate = delegate;
-        this.clients = new Map();
-        this.nextClientId = 0;
+    constructor(fastify) {
+        super(fastify, {
+            name: 'HMR',
+            path: '/__hmr',
+        });
     }
     /**
      * Send action to all connected HMR clients.
      *
      * @param event Event to send to the clients.
-     * @param platform Platform of clients to send the event to.
-     * @param clientIds Ids of clients who should receive the event.
      */
-    send(event, platform, clientIds) {
+    send(event) {
         const data = typeof event === 'string' ? event : JSON.stringify(event);
-        for (const [key, socket] of this.clients) {
-            if (key.platform !== platform ||
-                !(clientIds ?? [key.clientId]).includes(key.clientId)) {
-                continue;
-            }
+        this.clients.forEach((socket) => {
             try {
                 socket.send(data);
             }
@@ -41,42 +33,8 @@ export class WebSocketHMRServer extends WebSocketServer {
                     msg: 'Cannot send action to client',
                     event,
                     error,
-                    ...key,
                 });
             }
-        }
-    }
-    /**
-     * Process new WebSocket connection from HMR client.
-     *
-     * @param socket Incoming HMR client's WebSocket connection.
-     */
-    onConnection(socket, request) {
-        const { searchParams } = new URL(request.url || '', 'http://localhost');
-        const platform = searchParams.get('platform');
-        if (!platform) {
-            this.fastify.log.debug({
-                msg: 'HMR connection disconnected - missing platform',
-            });
-            socket.close();
-            return;
-        }
-        const clientId = `client#${this.nextClientId++}`;
-        const client = {
-            clientId,
-            platform,
-        };
-        this.clients.set(client, socket);
-        this.fastify.log.debug({ msg: 'HMR client connected', ...client });
-        const onClose = () => {
-            this.fastify.log.debug({
-                msg: 'HMR client disconnected',
-                ...client,
-            });
-            this.clients.delete(client);
-        };
-        socket.addEventListener('error', onClose);
-        socket.addEventListener('close', onClose);
-        this.delegate.onClientConnected(platform, clientId);
+        });
     }
 }

package/dist/plugins/wss/servers/WebSocketMessageServer.d.ts

@@ -21,9 +21,6 @@ export interface ReactNativeMessage {
     error?: Error;
     params?: Record<string, any>;
 }
-type WebSocketWithUpgradeReq = WebSocket & {
-    upgradeReq?: IncomingMessage;
-};
 /**
  * Class for creating a WebSocket server and sending messages between development server
  * and the React Native applications.
@@ -56,8 +53,7 @@ export declare class WebSocketMessageServer extends WebSocketServer {
      * @returns True if message is a response.
      */
     static isResponse(message: Partial<ReactNativeMessage>): boolean;
-    private clients;
-    private nextClientId;
+    private upgradeRequests;
     /**
      * Create new instance of WebSocketMessageServer and attach it to the given Fastify instance.
      * Any logging information, will be passed through standard `fastify.log` API.
@@ -80,7 +76,7 @@ export declare class WebSocketMessageServer extends WebSocketServer {
      * @param clientId Id of the client.
      * @returns WebSocket connection.
      */
-    getClientSocket(clientId: string): WebSocketWithUpgradeReq;
+    getClientSocket(clientId: string): WebSocket.WebSocket;
     /**
      * Process error by sending an error message to the client whose message caused the error
      * to occur.
@@ -128,12 +124,5 @@ export declare class WebSocketMessageServer extends WebSocketServer {
      * @param params Method parameters.
      */
     broadcast(method: string, params?: Record<string, any>): void;
-    /**
-     * Process new client's WebSocket connection.
-     *
-     * @param socket Incoming WebSocket connection.
-     * @param request Upgrade request for the connection.
-     */
-    onConnection(socket: WebSocket, request: IncomingMessage): void;
+    onConnection(socket: WebSocket, request: IncomingMessage): string;
 }
-export {};

package/dist/plugins/wss/servers/WebSocketMessageServer.js

@@ -49,9 +49,8 @@ export class WebSocketMessageServer extends WebSocketServer {
      * @param fastify Fastify instance to attach the WebSocket server to.
      */
     constructor(fastify) {
-        super(fastify, '/message');
-        this.clients = new Map();
-        this.nextClientId = 0;
+        super(fastify, { name: 'Message', path: '/message' });
+        this.upgradeRequests = {};
     }
     /**
      * Parse stringified message into a {@link ReactNativeMessage}.
@@ -202,9 +201,9 @@ export class WebSocketMessageServer extends WebSocketServer {
                 break;
             case 'getpeers': {
                 const output = {};
-                this.clients.forEach((peerSocket, peerId) => {
+                this.clients.forEach((_, peerId) => {
                     if (clientId !== peerId) {
-                        const { searchParams } = new URL(peerSocket.upgradeReq?.url || '');
+                        const { searchParams } = new URL(this.upgradeRequests[peerId]?.url || '');
                         output[peerId] = [...searchParams.entries()].reduce((acc, [key, value]) => {
                             acc[key] = value;
                             return acc;
@@ -271,25 +270,9 @@ export class WebSocketMessageServer extends WebSocketServer {
     broadcast(method, params) {
         this.sendBroadcast(undefined, { method, params });
     }
-    /**
-     * Process new client's WebSocket connection.
-     *
-     * @param socket Incoming WebSocket connection.
-     * @param request Upgrade request for the connection.
-     */
     onConnection(socket, request) {
-        const clientId = `client#${this.nextClientId++}`;
-        const client = socket;
-        client.upgradeReq = request;
-        this.clients.set(clientId, client);
-        this.fastify.log.debug({ msg: 'Message client connected', clientId });
-        const onClose = () => {
-            this.fastify.log.debug({ msg: 'Message client disconnected', clientId });
-            socket.removeAllListeners();
-            this.clients.delete(clientId);
-        };
-        socket.addEventListener('error', onClose);
-        socket.addEventListener('close', onClose);
+        const clientId = super.onConnection(socket, request);
+        this.upgradeRequests[clientId] = request;
         socket.addEventListener('message', (event) => {
             const message = this.parseMessage(event.data.toString(), 
             // @ts-ignore
@@ -328,6 +311,7 @@ export class WebSocketMessageServer extends WebSocketServer {
                 this.handleError(clientId, message, error);
             }
         });
+        return clientId;
     }
 }
 WebSocketMessageServer.PROTOCOL_VERSION = 2;

package/dist/plugins/wss/types.d.ts

@@ -1,22 +1,12 @@
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
-/**
- * Delegate with implementation for HMR-specific functions.
- */
-export interface HmrDelegate {
-    /** Get URI under which HMR server will be running, e.g: `/hmr` */
-    getUriPath: () => string;
-    /**
-     * Callback for when the new HMR client is connected.
-     *
-     * Useful for running initial synchronization or any other side effect.
-     *
-     * @param platform Platform of the connected client.
-     * @param clientId Id of the connected client.
-     */
-    onClientConnected: (platform: string, clientId: string) => void;
-}
+import type { ServerOptions } from 'ws';
 export interface WebSocketServerInterface {
     shouldUpgrade(pathname: string): boolean;
     upgrade(request: IncomingMessage, socket: Socket, head: Buffer): void;
 }
+export type WebSocketServerOptions = {
+    name: string;
+    path: string | string[];
+    wss?: Omit<ServerOptions, 'noServer' | 'server' | 'host' | 'port' | 'path'>;
+};

package/dist/plugins/wss/wssPlugin.d.ts

@@ -1,4 +1,5 @@
 import type { FastifyInstance } from 'fastify';
+import type { WebSocketServer } from 'ws';
 import type { Server } from '../../types.js';
 import { WebSocketRouter } from './WebSocketRouter.js';
 import { WebSocketServerAdapter } from './WebSocketServerAdapter.js';
@@ -21,9 +22,14 @@ declare module 'fastify' {
         };
     }
 }
-declare function wssPlugin(instance: FastifyInstance, { options, delegate, }: {
-    options: Server.Options;
+declare module 'ws' {
+    interface WebSocket {
+        isAlive?: boolean;
+    }
+}
+declare function wssPlugin(instance: FastifyInstance, { endpoints, }: {
     delegate: Server.Delegate;
+    endpoints?: Record<string, WebSocketServer>;
 }): Promise<void>;
 declare const _default: typeof wssPlugin;
 export default _default;

package/dist/plugins/wss/wssPlugin.js

@@ -12,7 +12,7 @@ import { WebSocketMessageServer } from './servers/WebSocketMessageServer.js';
  */
 const WS_DEVICE_URL = '/inspector/device';
 const WS_DEBUGGER_URL = '/inspector/debug';
-async function wssPlugin(instance, { options, delegate, }) {
+async function wssPlugin(instance, { endpoints, }) {
     const router = new WebSocketRouter(instance);
     const devClientServer = new WebSocketDevClientServer(instance);
     const messageServer = new WebSocketMessageServer(instance);
@@ -20,10 +20,10 @@ async function wssPlugin(instance, { options, delegate, }) {
         webSocketMessageServer: messageServer,
     });
     const apiServer = new WebSocketApiServer(instance);
-    const hmrServer = new WebSocketHMRServer(instance, delegate.hmr);
+    const hmrServer = new WebSocketHMRServer(instance);
     // @react-native/dev-middleware servers
-    const deviceConnectionServer = new WebSocketServerAdapter(instance, WS_DEVICE_URL, options.endpoints?.[WS_DEVICE_URL]);
-    const debuggerConnectionServer = new WebSocketServerAdapter(instance, WS_DEBUGGER_URL, options.endpoints?.[WS_DEBUGGER_URL]);
+    const deviceConnectionServer = new WebSocketServerAdapter(instance, WS_DEVICE_URL, endpoints?.[WS_DEVICE_URL]);
+    const debuggerConnectionServer = new WebSocketServerAdapter(instance, WS_DEBUGGER_URL, endpoints?.[WS_DEBUGGER_URL]);
     router.registerServer(devClientServer);
     router.registerServer(messageServer);
     router.registerServer(eventsServer);

package/dist/types.d.ts

@@ -1,11 +1,29 @@
+import type { ServerOptions as HttpsServerOptions } from 'node:https';
 import type { FastifyBaseLogger } from 'fastify';
-import type { WebSocketServer } from 'ws';
 import type { CompilerDelegate } from './plugins/compiler/types.js';
 import type { CodeFrame, InputStackFrame, ReactNativeStackFrame, StackFrame, SymbolicatorDelegate, SymbolicatorResults } from './plugins/symbolicate/types.js';
-import type { HmrDelegate } from './plugins/wss/types.js';
+import type { NormalizedOptions } from './utils/normalizeOptions.js';
 export type { CompilerDelegate };
 export type { CodeFrame, InputStackFrame, ReactNativeStackFrame, StackFrame, SymbolicatorDelegate, SymbolicatorResults, };
-export type { HmrDelegate };
+export interface DevServerOptions {
+    /**
+     * Hostname or IP address under which to run the development server.
+     * Can be 'local-ip', 'local-ipv4', 'local-ipv6' or a custom string.
+     * When left unspecified, it will listen on all available network interfaces.
+     */
+    host?: 'local-ip' | 'local-ipv4' | 'local-ipv6' | string;
+    /** Port under which to run the development server. */
+    port?: number;
+    /** Whether to enable Hot Module Replacement. */
+    hot?: boolean;
+    /** Options for running the server as HTTPS. If `undefined`, the server will run as HTTP. */
+    server?: 'http' | 'https' | {
+        type: 'http';
+    } | {
+        type: 'https';
+        options?: HttpsServerOptions;
+    };
+}
 export declare namespace Server {
     /** Development server configuration. */
     interface Config {
@@ -15,25 +33,9 @@ export declare namespace Server {
         delegate: (context: DelegateContext) => Delegate;
     }
     /** Development server options. */
-    interface Options {
+    interface Options extends DevServerOptions {
         /** Root directory of the project. */
         rootDir: string;
-        /** Port under which to run the development server. */
-        port: number;
-        /**
-         * Hostname or IP address under which to run the development server.
-         * When left unspecified, it will listen on all available network interfaces, similarly to listening on '0.0.0.0'.
-         */
-        host?: string;
-        /** Options for running the server as HTTPS. If `undefined`, the server will run as HTTP. */
-        https?: {
-            /** Path to certificate when running server as HTTPS. */
-            cert?: string;
-            /** Path to certificate key when running server as HTTPS. */
-            key?: string;
-        };
-        /** Additional endpoints with pre-configured servers */
-        endpoints?: Record<string, WebSocketServer>;
         /** Whether to enable logging requests. */
         logRequests?: boolean;
     }
@@ -47,8 +49,6 @@ export declare namespace Server {
         symbolicator: SymbolicatorDelegate;
         /** A logger delegate. */
         logger: LoggerDelegate;
-        /** An HMR delegate. */
-        hmr: HmrDelegate;
         /** An messages delegate. */
         messages: MessagesDelegate;
         /** An API delegate. */
@@ -60,6 +60,8 @@ export declare namespace Server {
      * Allows to emit logs, notify about compilation events and broadcast events to connected clients.
      */
     interface DelegateContext {
+        /** Normalized development server options. */
+        options: NormalizedOptions;
         /** A logger instance, useful for emitting logs from the delegate. */
         log: FastifyBaseLogger;
         /** Send notification about compilation start for given `platform`. */
@@ -70,11 +72,8 @@ export declare namespace Server {
          * Broadcast arbitrary event to all connected HMR clients for given `platform`.
          *
          * @param event Arbitrary event to broadcast.
-         * @param platform Platform of the clients to which broadcast should be sent.
-         * @param clientIds Ids of the client to which broadcast should be sent.
-         * If `undefined` the broadcast will be sent to all connected clients for the given `platform`.
          */
-        broadcastToHmrClients: <E = any>(event: E, platform: string, clientIds?: string[]) => void;
+        broadcastToHmrClients: <E = any>(event: E) => void;
         /**
          * Broadcast arbitrary method-like event to all connected message clients.
          *

package/dist/utils/normalizeOptions.d.ts

@@ -0,0 +1,12 @@
+import type { ServerOptions as HttpsServerOptions } from 'node:https';
+import type { Server } from '../types.js';
+export interface NormalizedOptions {
+    host: string;
+    port: number;
+    https: HttpsServerOptions | undefined;
+    hot: boolean;
+    url: string;
+    disableRequestLogging: boolean;
+    rootDir: string;
+}
+export declare function normalizeOptions(options: Server.Options): NormalizedOptions;

package/dist/utils/normalizeOptions.js

@@ -0,0 +1,28 @@
+function normalizeHttpsOptions(serverOptions) {
+    if (serverOptions &&
+        typeof serverOptions === 'object' &&
+        serverOptions.type === 'https') {
+        return serverOptions.options;
+    }
+    return undefined;
+}
+export function normalizeOptions(options) {
+    const host = options.host ?? 'localhost';
+    const port = options.port ?? 8081;
+    const https = normalizeHttpsOptions(options.server);
+    const hot = options.hot ?? false;
+    const protocol = https ? 'https' : 'http';
+    const url = `${protocol}://${host}:${options.port}`;
+    return {
+        // webpack dev server compatible options
+        host,
+        port,
+        https,
+        hot,
+        url,
+        // fastify options
+        disableRequestLogging: !options.logRequests,
+        // project options
+        rootDir: options.rootDir,
+    };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@callstack/repack-dev-server",
   "description": "A bundler-agnostic development server for React Native applications as part of @callstack/repack.",
   "license": "MIT",
-  "version": "5.0.0-rc.9",
+  "version": "5.0.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -48,7 +48,7 @@
     "@babel/core": "^7.23.9",
     "@react-native-community/cli-server-api": "15.0.1",
     "@types/babel__code-frame": "^7.0.3",
-    "@types/node": "18",
+    "@types/node": "^18",
     "@types/ws": "^8.5.3",
     "babel-plugin-add-import-extension": "^1.6.0",
     "typescript": "^5.7.2"