knx.ts 1.0.2 → 1.0.4

package/dist/connection/KNXnetIPServer.js

@@ -12,18 +12,18 @@ const CEMI_1 = require("../core/CEMI");
 const KNXnetIPStructures_1 = require("../core/KNXnetIPStructures");
 const KNXHelper_1 = require("../utils/KNXHelper");
 const localIp_1 = require("../utils/localIp");
-const Router_1 = require("./Router");
 const node_os_1 = __importDefault(require("node:os"));
 const DeviceDescriptorType_1 = require("../core/resources/DeviceDescriptorType");
 const TunnelConnection_1 = require("./TunnelConnection");
 const InvalidKnxAddresExeption_1 = require("../errors/InvalidKnxAddresExeption");
+const GroupAddressCache_1 = require("../core/cache/GroupAddressCache");
 /**
-  * Implements a KNXnet/IP Server (Gateway) that supports Routing and Tunneling protocols.
-  * This class handles device discovery (Search/Description), manages multiple concurrent
-  * tunneling connections, and bridges communication between IP multicast (Routing) and
-  * point-to-point (Tunneling) clients. It includes implementation for flow control
-  * (RoutingBusy), rate limiting, and echo cancellation.
-  */
+ * Implements a KNXnet/IP Server (Gateway) that supports Routing and Tunneling protocols.
+ * This class handles device discovery (Search/Description), manages multiple concurrent
+ * tunneling connections, and bridges communication between IP multicast (Routing) and
+ * point-to-point (Tunneling) clients. It includes implementation for flow control
+ * (RoutingBusy), rate limiting, and echo cancellation.
+ */
 class KNXnetIPServer extends KNXService_1.KNXService {
     isRoutingBusy = false;
     routingBusyTimer = null;
@@ -37,6 +37,8 @@ class KNXnetIPServer extends KNXService_1.KNXService {
     // [MEJORA] Almacenamos la IA en formato entero para el filtro anti-eco rápido
     serverIAInt;
     _tunnelConnections = new Map();
+    isCacheDelegated = false;
+    isEventsDelegated = false;
     MAX_QUEUE_SIZE = 100;
     BUSY_THRESHOLD = 15;
     HEARTBEAT_TIMEOUT = KNXnetIPEnum_1.KNXTimeoutConstants.CONNECTION_ALIVE_TIME * 1000;
@@ -44,7 +46,6 @@ class KNXnetIPServer extends KNXService_1.KNXService {
     MAX_PENDING_REQUESTS_PER_CLIENT = 100; // [MEJORA] Límite de ráfagas
     maxTunnelConnections;
     clientAddrsStartInt;
-    externalManager = null;
     constructor(options) {
         super(options);
         this._transport = "UDP";
@@ -53,6 +54,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         const netInfo = (0, localIp_1.getNetworkInfo)();
         this.options.localIp = options.localIp || netInfo.address;
         routingOptions.individualAddress = options.individualAddress || "15.15.0";
+        this.individualAddress = routingOptions.individualAddress;
         if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(routingOptions.individualAddress)) {
             throw new InvalidKnxAddresExeption_1.InvalidKnxAddressException(`This ${routingOptions.individualAddress} is not individual address`);
         }
@@ -60,6 +62,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         this.logger = this.logger.child({ module: this.constructor.name });
         // Serial must be deterministic and unique per instance (MAC + Port), similar to knxd
         if (!options.serialNumber) {
+            // eslint-disable-next-line no-useless-escape
             const macBuf = Buffer.from(netInfo.mac.replace(/[:\-]/g, ""), "hex");
             const port = options.port || 3671;
             const serial = Buffer.from(macBuf);
@@ -70,7 +73,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         else {
             routingOptions.serialNumber = options.serialNumber;
         }
-        routingOptions.friendlyName = options.friendlyName || "KNX.ts Routing Node";
+        routingOptions.friendlyName = options.friendlyName || "KNX.ts";
         routingOptions.macAddress = options.macAddress || netInfo.mac;
         routingOptions.routingDelay = options.routingDelay ?? 20;
         if (routingOptions.MAX_PENDING_REQUESTS_PER_CLIENT)
@@ -94,14 +97,11 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             this.maxTunnelConnections = 15;
             this.clientAddrsStartInt = serverIA + 1;
         }
-        if (options.externals) {
-            this.externalManager = new Router_1.Router(options.externals);
-        }
-    }
-    get individualAddress() {
-        return KNXHelper_1.KNXHelper.GetAddress(this.serverIAInt, ".", true);
     }
     async connect() {
+        if (this.socket) {
+            return;
+        }
         this.socket = dgram_1.default.createSocket({ type: "udp4", reuseAddr: true });
         this.socket.on("message", (msg, rinfo) => {
             this.handleMessage(msg, rinfo);
@@ -121,11 +121,12 @@ class KNXnetIPServer extends KNXService_1.KNXService {
                     const joinedInterfaces = new Set();
                     const useAllInterfaces = this.options.useAllInterfaces ?? true;
                     // Siempre intenta unirse primero a la localIp especificada
-                    if (this.options.localIp && this.options.localIp !== "0.0.0.0") {
+                    if (this.options.localIp && this.options.localIp !== "0.0.0.0" && this.options.ip) {
                         try {
                             socket.addMembership(this.options.ip, this.options.localIp);
                             joinedInterfaces.add(this.options.localIp);
                             this.logger.info(`Joined multicast on primary interface (${this.options.localIp})`);
+                            // eslint-disable-next-line @typescript-eslint/no-unused-vars
                         }
                         catch (e) {
                             this.logger.debug(`Failed to join multicast on primary interface ${this.options.localIp}`);
@@ -141,6 +142,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
                                             socket.addMembership(this.options.ip, net.address);
                                             joinedInterfaces.add(net.address);
                                             this.logger.info(`Joined multicast on interface ${name} (${net.address})`);
+                                            // eslint-disable-next-line @typescript-eslint/no-unused-vars
                                         }
                                         catch (err) {
                                             // Ignora interfaces virtuales que no soportan IGMP
@@ -153,31 +155,6 @@ class KNXnetIPServer extends KNXService_1.KNXService {
                     else {
                         this.logger.info("Multi-homing disabled. Only primary interface used for multicast.");
                     }
-                    // Central listener for all KNX indications (from IP Multicast, TP, or Tunnels)
-                    this.on("indication", (cemi) => {
-                        const body = cemi.toBuffer();
-                        const srcIAStr = cemi.sourceAddress;
-                        let busmonBody = null;
-                        // Optional: Re-emit by Group Address for specific listening (e.g., server.on("1/1/1", (cemi) => ...))
-                        if (cemi.controlField2 && cemi.controlField2.addressType === 1) {
-                            this.emit(cemi.destinationAddress, cemi);
-                        }
-                        this._tunnelConnections.forEach((conn) => {
-                            // Echo cancellation: Don't forward back to the client that originated this message
-                            if (srcIAStr === conn.knxAddressStr) {
-                                return;
-                            }
-                            if (conn.knxLayer === KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER) {
-                                if (!busmonBody)
-                                    busmonBody = this.convertDataIndToBusmonInd(body);
-                                conn.enqueue(busmonBody, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
-                            }
-                            else {
-                                // Link Layer or Raw Layer
-                                conn.enqueue(body, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
-                            }
-                        });
-                    });
                     this.emit("connected");
                     resolve();
                 }
@@ -188,22 +165,124 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             });
         });
         await connectPromise;
-        if (this.externalManager) {
-            this.externalManager.registerLink(this);
-            await this.externalManager.connect();
-        }
     }
     disconnect() {
-        if (this.externalManager) {
-            this.externalManager.unregisterLink(this);
-            this.externalManager.disconnect();
-        }
         if (this.socket) {
             this.socket.close();
             this.socket = null;
         }
         this.clearTimers();
     }
+    /**
+     * Discovers KNXnet/IP devices on the network by sending SEARCH_REQUEST and SEARCH_REQUEST_EXTENDED
+     * multicasts to 224.0.23.12:3671. Returns an array of discovered devices with their properties.
+     *
+     * @param timeout Wait time in milliseconds for responses
+     * @param useExtended Whether to send SEARCH_REQUEST_EXTENDED alongside SEARCH_REQUEST
+     * @returns Promise resolving to an array of discovered devices
+     */
+    static async discover(ipLocal = "", ipMulticast = "224.0.23.12", port = 3671, timeout = 3000, useExtended = true) {
+        return new Promise((resolve, reject) => {
+            const socket = dgram_1.default.createSocket({ type: "udp4", reuseAddr: true });
+            const discoveredDevices = new Map();
+            socket.on("message", (msg) => {
+                try {
+                    const header = KNXnetIPHeader_1.KNXnetIPHeader.fromBuffer(msg);
+                    if (header.serviceType === KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE ||
+                        header.serviceType === KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE_EXTENDED) {
+                        const body = msg.subarray(KNXnetIPHeader_1.KNXnetIPHeader.HEADER_SIZE_10);
+                        if (body.length < 8)
+                            return;
+                        const hpai = KNXnetIPStructures_1.HPAI.fromBuffer(body);
+                        let offset = 8; // Size of HPAI
+                        let deviceInfo = null;
+                        while (offset < body.length) {
+                            const dibLen = body.readUInt8(offset);
+                            if (dibLen === 0)
+                                break;
+                            if (offset + dibLen > body.length)
+                                break;
+                            const dibBuffer = body.subarray(offset, offset + dibLen);
+                            const dib = KNXnetIPStructures_1.DIB.fromBuffer(dibBuffer);
+                            if (dib instanceof KNXnetIPStructures_1.DeviceInformationDIB) {
+                                deviceInfo = dib;
+                            }
+                            offset += dibLen;
+                        }
+                        if (deviceInfo) {
+                            const deviceKey = `${hpai.ipAddress}:${hpai.port}`; // Unique by IP/Port
+                            if (!discoveredDevices.has(deviceKey)) {
+                                let knxMediumStr = `Unknown (${deviceInfo.knxMedium})`;
+                                if (deviceInfo.knxMedium === KNXnetIPEnum_1.KNXMedium.TP1)
+                                    knxMediumStr = "TP1";
+                                else if (deviceInfo.knxMedium === KNXnetIPEnum_1.KNXMedium.PL110)
+                                    knxMediumStr = "PL110";
+                                else if (deviceInfo.knxMedium === KNXnetIPEnum_1.KNXMedium.RF)
+                                    knxMediumStr = "RF";
+                                else if (deviceInfo.knxMedium === KNXnetIPEnum_1.KNXMedium.KNXIP)
+                                    knxMediumStr = "KNXIP";
+                                const deviceStatusStr = deviceInfo.deviceStatus === 1
+                                    ? "Programmed"
+                                    : deviceInfo.deviceStatus === 0
+                                        ? "Not Programmed"
+                                        : `Unknown (${deviceInfo.deviceStatus})`;
+                                discoveredDevices.set(deviceKey, {
+                                    ip: hpai.ipAddress,
+                                    port: hpai.port,
+                                    knxMediumRaw: deviceInfo.knxMedium,
+                                    knxMedium: knxMediumStr,
+                                    deviceStatusRaw: deviceInfo.deviceStatus,
+                                    deviceStatus: deviceStatusStr,
+                                    individualAddress: deviceInfo.individualAddress,
+                                    projectInstallationId: deviceInfo.projectInstallationId,
+                                    serialNumber: deviceInfo.serialNumber,
+                                    routingMulticastAddress: deviceInfo.routingMulticastAddress,
+                                    macAddress: deviceInfo.macAddress,
+                                    friendlyName: deviceInfo.friendlyName,
+                                });
+                            }
+                        }
+                    }
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                }
+                catch (e) {
+                    // Ignore parsing errors for individual packets
+                }
+            });
+            const timer = setTimeout(() => {
+                socket.close();
+                resolve(Array.from(discoveredDevices.values()));
+            }, timeout);
+            socket.on("error", (err) => {
+                clearTimeout(timer);
+                socket.close();
+                reject(err);
+            });
+            socket.bind(0, () => {
+                const netInfo = (0, localIp_1.getNetworkInfo)();
+                const serverHPAI = new KNXnetIPStructures_1.HPAI(KNXnetIPEnum_1.HostProtocolCode.IPV4_UDP, ipLocal !== "" ? ipLocal : netInfo.address, socket.address().port);
+                const sendRequest = (serviceType) => {
+                    const hpaiBuf = serverHPAI.toBuffer();
+                    const header = new KNXnetIPHeader_1.KNXnetIPHeader(serviceType, KNXnetIPHeader_1.KNXnetIPHeader.HEADER_SIZE_10 + hpaiBuf.length);
+                    const packet = Buffer.concat([header.toBuffer(), hpaiBuf]);
+                    socket.send(packet, port, ipMulticast);
+                };
+                try {
+                    socket.setBroadcast(true);
+                    socket.setMulticastTTL(128);
+                    sendRequest(KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_REQUEST);
+                    if (useExtended) {
+                        sendRequest(KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_REQUEST_EXTENDED);
+                    }
+                }
+                catch (e) {
+                    clearTimeout(timer);
+                    socket.close();
+                    reject(e);
+                }
+            });
+        });
+    }
     // [MEJORA] Validación estricta Route Back (NAT Traversal) según Especificación 8.6.2.2
     resolveRouteBack(hpai, rinfo) {
         const isIpZero = hpai.ipAddress === "0.0.0.0";
@@ -235,22 +314,28 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             conn.close();
         });
         this._tunnelConnections.clear();
-        this.removeAllListeners("indication");
+        this.removeAllListeners();
     }
+    /**
+     * Send a CEMI message or buffer CEMI to the bus.
+     * @param data The CEMI message or buffer to send.
+     */
     async send(data) {
         let cemiBuffer;
-        let cemi;
+        let cemi = undefined;
         if (Buffer.isBuffer(data)) {
             cemiBuffer = data;
             try {
                 cemi = CEMI_1.CEMI.fromBuffer(data);
             }
-            catch (e) { }
+            catch (e) {
+                this.logger.debug("Error parsing CEMI buffer" + e.message);
+            }
         }
         else {
             cemi = data;
-            if (data.controlField2) {
-                const cf2 = data.controlField2;
+            if ("controlField2" in cemi) {
+                const cf2 = cemi.controlField2;
                 const hopCount = cf2.hopCount;
                 if (hopCount === 0)
                     return;
@@ -259,17 +344,71 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             }
             cemiBuffer = data.toBuffer();
         }
-        if (cemi) {
-            this.emit("indication", cemi);
+        if (cemi && "destinationAddress" in cemi && "sourceAddress" in cemi) {
+            this.emit("send", cemi);
+            if (!this.isCacheDelegated) {
+                GroupAddressCache_1.GroupAddressCache.getInstance().processCEMI(cemi);
+            }
+            if (!this.isEventsDelegated && cemi.destinationAddress) {
+                this.emit(cemi.destinationAddress, cemi);
+            }
+            const body = cemiBuffer;
+            const srcIAStr = cemi.sourceAddress;
+            let busmonBody = null;
+            this._tunnelConnections.forEach((conn) => {
+                // Echo cancellation: Don't forward back to the client that originated this message
+                if (srcIAStr === conn.knxAddressStr) {
+                    return;
+                }
+                if (conn.knxLayer === KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER) {
+                    if (!busmonBody)
+                        busmonBody = this.convertDataIndToBusmonInd(body);
+                    conn.enqueue(busmonBody, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+                }
+                else {
+                    // Link Layer or Raw Layer
+                    conn.enqueue(body, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+                }
+            });
         }
         await this.enqueuePacket(cemiBuffer);
     }
+    /**
+     * Send a raw CEMI buffer to the bus.
+     * @param cemiBuffer The CEMI buffer to send.
+     */
     async sendRaw(cemiBuffer) {
+        let cemi = undefined;
         try {
-            const cemi = CEMI_1.CEMI.fromBuffer(cemiBuffer);
-            this.emit("indication", cemi);
+            cemi = CEMI_1.CEMI.fromBuffer(cemiBuffer);
         }
-        catch (e) { }
+        catch (e) {
+            this.logger.debug("Error parsing CEMI buffer" + e.message);
+        }
+        if (!cemi || !("destinationAddress" in cemi) || !("sourceAddress" in cemi))
+            return;
+        this.emit("send", cemi);
+        if (!this.isEventsDelegated && cemi.destinationAddress) {
+            this.emit(cemi.destinationAddress, cemi);
+        }
+        const body = cemiBuffer;
+        const srcIAStr = cemi.sourceAddress;
+        let busmonBody = null;
+        this._tunnelConnections.forEach((conn) => {
+            // Echo cancellation: Don't forward back to the client that originated this message
+            if (srcIAStr === conn.knxAddressStr) {
+                return;
+            }
+            if (conn.knxLayer === KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER) {
+                if (!busmonBody)
+                    busmonBody = this.convertDataIndToBusmonInd(body);
+                conn.enqueue(busmonBody, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+            }
+            else {
+                // Link Layer or Raw Layer
+                conn.enqueue(body, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+            }
+        });
         await this.enqueuePacket(cemiBuffer);
     }
     async enqueuePacket(cemiBuffer) {
@@ -362,7 +501,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             if (rinfo.address === this.options.localIp && rinfo.port === ourAddress.port)
                 return;
             switch (header.serviceType) {
-                case KNXnetIPEnum_1.KNXnetIPServiceType.ROUTING_INDICATION:
+                case KNXnetIPEnum_1.KNXnetIPServiceType.ROUTING_INDICATION: {
                     // [MEJORA] Filtro Anti-Eco Seguro leyendo la Individual Address (IA) origen del CEMI
                     const addInfoLen = body[1];
                     if (body.length >= 6 + addInfoLen) {
@@ -374,10 +513,37 @@ class KNXnetIPServer extends KNXService_1.KNXService {
                     this.emit("raw_indication", body);
                     try {
                         const cemi = CEMI_1.CEMI.fromBuffer(body);
+                        if (!("destinationAddress" in cemi) || !("sourceAddress" in cemi))
+                            return;
                         this.emit("indication", cemi);
+                        if (!this.isCacheDelegated) {
+                            GroupAddressCache_1.GroupAddressCache.getInstance().processCEMI(cemi);
+                        }
+                        this.emit(cemi.destinationAddress, cemi);
+                        const srcIAStr = cemi.sourceAddress;
+                        let busmonBody = null;
+                        this._tunnelConnections.forEach((conn) => {
+                            // Echo cancellation: Don't forward back to the client that originated this message
+                            if (srcIAStr === conn.knxAddressStr) {
+                                return;
+                            }
+                            if (conn.knxLayer === KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER) {
+                                if (!busmonBody)
+                                    busmonBody = this.convertDataIndToBusmonInd(body);
+                                conn.enqueue(busmonBody, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+                            }
+                            else {
+                                // Link Layer or Raw Layer
+                                conn.enqueue(body, KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_REQUEST);
+                            }
+                        });
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    }
+                    catch (e) {
+                        /* empty */
                     }
-                    catch (e) { }
                     break;
+                }
                 case KNXnetIPEnum_1.KNXnetIPServiceType.ROUTING_BUSY:
                     this.handleRoutingBusy(KNXnetIPStructures_1.RoutingBusy.fromBuffer(body));
                     break;
@@ -442,7 +608,9 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         if (!this.resolveRouteBack(clientHPAI, rinfo)) {
             return; // Silently drop invalid HPAI
         }
-        const responseType = isExtended ? KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE_EXTENDED : KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE;
+        const responseType = isExtended
+            ? KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE_EXTENDED
+            : KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE;
         const serverHPAI = this.getHPAI(rinfo);
         const localIp = serverHPAI.ipAddress;
         const localPort = serverHPAI.port;
@@ -477,12 +645,12 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         // Ensure we report the local IP of the interface that can actually route back to the client.
         if (rinfo && rinfo.address) {
             const interfaces = node_os_1.default.networkInterfaces();
-            const rinfoNum = rinfo.address.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
+            const rinfoNum = rinfo.address.split(".").reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
             for (const name of Object.keys(interfaces)) {
                 for (const net of interfaces[name]) {
                     if (net.family === "IPv4" && !net.internal) {
-                        const netNum = net.address.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
-                        const maskNum = net.netmask.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
+                        const netNum = net.address.split(".").reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
+                        const maskNum = net.netmask.split(".").reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0) >>> 0;
                         if ((rinfoNum & maskNum) === (netNum & maskNum)) {
                             localIp = net.address;
                         }
@@ -538,7 +706,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             const body = Buffer.concat([
                 Buffer.from([channelId, status]),
                 serverDataHPAI.toBuffer(),
-                Buffer.from([0x02, KNXnetIPEnum_1.ConnectionType.DEVICE_MGMT_CONNECTION])
+                Buffer.from([0x02, KNXnetIPEnum_1.ConnectionType.DEVICE_MGMT_CONNECTION]),
             ]);
             const responseHeader = new KNXnetIPHeader_1.KNXnetIPHeader(KNXnetIPEnum_1.KNXnetIPServiceType.CONNECT_RESPONSE, KNXnetIPHeader_1.KNXnetIPHeader.HEADER_SIZE_10 + body.length);
             if (this.socket)
@@ -549,7 +717,9 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             if (knxAddress === null || knxAddress === 0) {
                 knxAddress = this.clientAddrsStartInt + channelId - 1;
             }
-            if (cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.LINK_LAYER && cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER && cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.RAW_LAYER) {
+            if (cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.LINK_LAYER &&
+                cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.BUSMONITOR_LAYER &&
+                cri.knxLayer !== KNXnetIPEnum_1.KNXLayer.RAW_LAYER) {
                 this.logger.warn(`Connect Request refused: Invalid layer ${cri.knxLayer}`);
                 status = KNXnetIPEnum_1.KNXnetIPErrorCodes.E_TUNNELLING_LAYER;
             }
@@ -655,11 +825,11 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             return;
         }
         const { action, status } = conn.validateRequest(seq);
-        if (action === 'retransmit_ack') {
+        if (action === "retransmit_ack") {
             this.sendTunnelACK(channelId, seq, status, rinfo);
             return;
         }
-        if (action === 'discard')
+        if (action === "discard")
             return;
         this.sendTunnelACK(channelId, seq, status, rinfo);
         const msgCode = cemiBuffer[0];
@@ -694,8 +864,8 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         const header = new KNXnetIPHeader_1.KNXnetIPHeader(KNXnetIPEnum_1.KNXnetIPServiceType.TUNNELLING_ACK, KNXnetIPHeader_1.KNXnetIPHeader.HEADER_SIZE_10 + body.length);
         const conn = this._tunnelConnections.get(channelId);
         if (this.socket) {
-            const port = conn ? conn.dataHPAI.port : (rinfo ? rinfo.port : 0);
-            const addr = conn ? conn.dataHPAI.ipAddress : (rinfo ? rinfo.address : "");
+            const port = conn ? conn.dataHPAI.port : rinfo ? rinfo.port : 0;
+            const addr = conn ? conn.dataHPAI.ipAddress : rinfo ? rinfo.address : "";
             if (port > 0 && addr !== "") {
                 this.socket.send(Buffer.concat([header.toBuffer(), body]), port, addr);
             }
@@ -712,11 +882,11 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         }
         const { action, status } = conn.validateRequest(seq);
         this.logger.debug(`Feature Get for channel ${channelId}, feat: ${featId}, seq: ${seq}`);
-        if (action === 'retransmit_ack') {
+        if (action === "retransmit_ack") {
             this.sendTunnelACK(channelId, seq, status);
             return;
         }
-        if (action === 'discard')
+        if (action === "discard")
             return;
         this.sendTunnelACK(channelId, seq, KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR);
         let featVal;
@@ -748,16 +918,17 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             return;
         }
         const { action, status } = conn.validateRequest(seq);
-        if (action === 'retransmit_ack') {
+        if (action === "retransmit_ack") {
             this.sendDeviceConfigACK(channelId, seq, status);
             return;
         }
-        if (action === 'discard')
+        if (action === "discard")
             return;
         this.sendDeviceConfigACK(channelId, seq, KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR);
         try {
             const msgCode = cemiBuffer.readUInt8(0);
-            if (msgCode === 0xFC) { // M_PropRead.req
+            if (msgCode === 0xfc) {
+                // M_PropRead.req
                 const req = CEMI_1.CEMI.ManagementCEMI["M_PropRead.req"].fromBuffer(cemiBuffer);
                 this.logger.debug(`Management PropRead: Obj=${req.interfaceObjectType}, Prop=${req.propertyId} on channel ${channelId}`);
                 let data = Buffer.alloc(0);
@@ -809,12 +980,12 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             }
         }
         // Spec says use TP1 (0x02) for gateway reporting
-        const devInfo = new KNXnetIPStructures_1.DeviceInformationDIB(32 /* KNXMedium.KNXIP */, 0, KNXHelper_1.KNXHelper.GetAddress(routingOptions.individualAddress, ".").readUint16BE(), 0, routingOptions.serialNumber, this.options.ip, routingOptions.macAddress, routingOptions.friendlyName);
+        const devInfo = new KNXnetIPStructures_1.DeviceInformationDIB(KNXnetIPEnum_1.KNXMedium.KNXIP, 0, KNXHelper_1.KNXHelper.GetAddress(routingOptions.individualAddress, ".").readUint16BE(), 0, routingOptions.serialNumber, this.options.ip, routingOptions.macAddress, routingOptions.friendlyName);
         const suppSvc = new KNXnetIPStructures_1.SupportedServicesDIB([
-            { family: 2 /* AllowedSupportedServiceFamilies.Core */, version: 1 },
-            { family: 3 /* AllowedSupportedServiceFamilies.DeviceManagement */, version: 1 },
-            { family: 4 /* AllowedSupportedServiceFamilies.Tunnelling */, version: 1 },
-            { family: 5 /* AllowedSupportedServiceFamilies.Routing */, version: 1 },
+            { family: KNXnetIPEnum_1.AllowedSupportedServiceFamilies.Core, version: 1 },
+            { family: KNXnetIPEnum_1.AllowedSupportedServiceFamilies.DeviceManagement, version: 1 },
+            { family: KNXnetIPEnum_1.AllowedSupportedServiceFamilies.Tunnelling, version: 1 },
+            { family: KNXnetIPEnum_1.AllowedSupportedServiceFamilies.Routing, version: 1 },
         ]);
         if (serviceType === KNXnetIPEnum_1.KNXnetIPServiceType.SEARCH_RESPONSE) {
             return [devInfo, suppSvc];
@@ -832,7 +1003,7 @@ class KNXnetIPServer extends KNXService_1.KNXService {
             status.free = !conn;
             slots.push({
                 address: conn ? conn.knxAddress : this.clientAddrsStartInt + i - 1,
-                status: status
+                status: status,
             });
         }
         return [devInfo, suppSvc, extDevInfo, ipConfig, ipCurrent, new KNXnetIPStructures_1.TunnellingInfoDIB(254, slots)];
@@ -889,7 +1060,14 @@ class KNXnetIPServer extends KNXService_1.KNXService {
         const dst = cemiBuffer.subarray(baseOffset + 4, baseOffset + 6);
         const dataLen = cemiBuffer[baseOffset + 6];
         const tpdu = cemiBuffer.subarray(baseOffset + 7);
-        const lpdu = Buffer.concat([Buffer.from([cf1]), src, dst, Buffer.from([(cf2 & 0xf0) | (dataLen + 1)]), tpdu, Buffer.alloc(1)]);
+        const lpdu = Buffer.concat([
+            Buffer.from([cf1]),
+            src,
+            dst,
+            Buffer.from([(cf2 & 0xf0) | (dataLen + 1)]),
+            tpdu,
+            Buffer.alloc(1),
+        ]);
         let xor = 0;
         for (let i = 0; i < lpdu.length - 1; i++)
             xor ^= lpdu[i];