@matter/nodejs 0.16.0-alpha.0-20251006-3fe1e7c57 → 0.16.0-alpha.0-20251013-89bb7099d

package/src/net/NodeJsUdpChannel.ts

@@ -5,10 +5,13 @@
  */
 
 import {
+    AddressInUseError,
+    BindError,
     Bytes,
     ChannelType,
     createPromise,
     Diagnostic,
+    ImplementationError,
     isIPv4,
     isIPv6,
     Logger,
@@ -40,7 +43,22 @@ function createDgramSocket(host: string | undefined, port: number | undefined, o
             try {
                 socket.close();
             } catch (error) {
-                logger.debug("Error closing socket", error);
+                logger.debug("Error closing socket:", error);
+            }
+
+            const code = (error as unknown as { code: string })?.code;
+            let desc = `${host ? host : options.type === "udp4" ? "0.0.0.0" : "{::}"}`;
+            if (port !== undefined) {
+                desc = `${desc}:${port}`;
+            }
+            switch (code) {
+                case "EADDRINUSE":
+                    error = new AddressInUseError(`Cannot bind ${desc} because port is already in use`);
+                    break;
+
+                default:
+                    error = new BindError(`Cannot bind to ${desc} (code ${code})`);
+                    break;
             }
             reject(error);
         };
@@ -56,6 +74,7 @@ function createDgramSocket(host: string | undefined, port: number | undefined, o
             );
             socket.removeListener("error", handleBindError);
             socket.on("error", error => logger.error(error));
+
             resolve(socket);
         });
     });
@@ -66,11 +85,31 @@ export class NodeJsUdpChannel implements UdpChannel {
     readonly #socket: dgram.Socket;
     readonly #netInterface: string | undefined;
 
-    static async create({ listeningPort, type, listeningAddress, netInterface }: UdpChannelOptions) {
-        const socketOptions: dgram.SocketOptions = { type, reuseAddr: true };
+    static async create({ listeningPort, type, listeningAddress, netInterface, reuseAddress }: UdpChannelOptions) {
+        let dgramType: "udp4" | "udp6";
+        switch (type) {
+            case "udp":
+            case "udp6":
+                dgramType = "udp6";
+                break;
+
+            case "udp4":
+                dgramType = "udp4";
+                break;
+
+            default:
+                throw new ImplementationError(`Unrecognized UDP socket type ${type}`);
+        }
+
+        const socketOptions: dgram.SocketOptions = { type: dgramType };
         if (type === "udp6") {
             socketOptions.ipv6Only = true;
         }
+
+        if (reuseAddress) {
+            socketOptions.reuseAddr = true;
+        }
+
         const socket = await createDgramSocket(listeningAddress, listeningPort, socketOptions);
         socket.setBroadcast(true);
         let netInterfaceZone: string | undefined;

package/src/net/WsAdapter.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpEndpoint } from "#general";
+
+import { IncomingMessage } from "node:http";
+import { Duplex } from "node:stream";
+
+/**
+ * This is a pluggable component that handles the upgrade to a WsConnection.
+ *
+ * We do not implement directly here because Node.js does not support WebSocket servers natively, so we must use a
+ * third-party dependency.
+ */
+export interface WsAdapter {
+    handle(req: IncomingMessage, socket: Duplex, head: Buffer): Promise<HttpEndpoint.WsConnection>;
+    close(): Promise<void>;
+}
+
+export namespace WsAdapter {
+    // eslint-disable-next-line prefer-const
+    export let defaultFactory = undefined as undefined | Factory;
+
+    export interface Factory {
+        (): WsAdapter;
+    }
+}

package/src/net/index.ts

@@ -4,5 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+export * from "./NodeJsHttpEndpoint.js";
 export * from "./NodeJsNetwork.js";
 export * from "./NodeJsUdpChannel.js";
+export * from "./WsAdapter.js";