knx.ts 1.0.2 → 1.0.4

package/dist/connection/TPUART.js

@@ -4,7 +4,6 @@ exports.TPUARTConnection = void 0;
 const serialport_1 = require("serialport");
 const KNXService_1 = require("./KNXService");
 const CEMIAdapter_1 = require("../utils/CEMIAdapter");
-const EMI_1 = require("../core/EMI");
 const KNXHelper_1 = require("../utils/KNXHelper");
 const CEMI_1 = require("../core/CEMI");
 const UART_SERVICES = {
@@ -33,6 +32,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
     serialPort;
     receiver;
     connectionState = TPUARTState.DISCONNECTED;
+    isOpening = false;
     initPromise = null;
     msgQueue = [];
     isProcessing = false;
@@ -76,8 +76,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
                     const isExtended = (frame[0] & 0x80) === 0;
                     const controlByte = isExtended ? frame[1] : frame[5];
                     const isGroup = (controlByte & 0x80) !== 0;
-                    if ((isGroup && options.ackGroup) ||
-                        (!isGroup && options.ackIndividual)) {
+                    if ((isGroup && options.ackGroup) || (!isGroup && options.ackIndividual)) {
                         ackByte = 0x11; // Send ACK
                     }
                 }
@@ -98,13 +97,17 @@ class TPUARTConnection extends KNXService_1.KNXService {
                         this.emit("raw_indication", cemi.toBuffer());
                     }
                 }
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            }
+            catch (e) {
+                /* empty */
             }
-            catch (e) { }
         });
     }
     handleFatalError(err) {
         this.stopTimers();
         this.connectionState = TPUARTState.ERROR;
+        this.isOpening = false;
         // Reject all pending messages
         while (this.msgQueue.length > 0) {
             this.msgQueue.shift()?.reject(err);
@@ -122,6 +125,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
         this.keepaliveTimer = null;
         this.confirmationTimer = null;
         this.initTimer = null;
+        this.removeAllListeners();
     }
     resetKeepalive() {
         if (this.keepaliveTimer)
@@ -134,14 +138,26 @@ class TPUARTConnection extends KNXService_1.KNXService {
         }, 10000);
     }
     async connect() {
-        if (this.connectionState !== TPUARTState.DISCONNECTED &&
-            this.connectionState !== TPUARTState.ERROR)
+        if (this.connectionState !== TPUARTState.DISCONNECTED && this.connectionState !== TPUARTState.ERROR)
+            return;
+        if (this.isOpening)
             return;
+        this.isOpening = true;
         return new Promise((resolve, reject) => {
-            this.initPromise = { resolve, reject };
+            this.initPromise = {
+                resolve: () => {
+                    this.isOpening = false;
+                    resolve();
+                },
+                reject: (e) => {
+                    this.isOpening = false;
+                    reject(e);
+                },
+            };
             this.serialPort.open(async (err) => {
                 if (err) {
                     this.initPromise = null;
+                    this.isOpening = false;
                     reject(err);
                     return;
                 }
@@ -174,6 +190,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
     async disconnect() {
         this.stopTimers();
         this.connectionState = TPUARTState.DISCONNECTED;
+        this.isOpening = false;
         // Clear queue
         while (this.msgQueue.length > 0) {
             this.msgQueue.shift()?.reject(new Error("Disconnected by user"));
@@ -191,6 +208,10 @@ class TPUARTConnection extends KNXService_1.KNXService {
             }
         });
     }
+    /**
+     * Enable or disable busmonitor mode.
+     * @param enabled
+     */
     async setBusmonitor(enabled) {
         if (this.connectionState < TPUARTState.ONLINE)
             throw new Error("TPUART offline");
@@ -207,11 +228,10 @@ class TPUARTConnection extends KNXService_1.KNXService {
     async send(data) {
         if (this.connectionState < TPUARTState.ONLINE)
             throw new Error("TPUART offline");
-        let frame = Buffer.isBuffer(data)
-            ? tryEmi(data) || data
-            : CEMIAdapter_1.CEMIAdapter.cemiToEmi(data)?.toBuffer().subarray(1);
+        const frame = Buffer.isBuffer(data) ? data : CEMIAdapter_1.CEMIAdapter.cemiToEmi(data)?.toBuffer();
         if (!frame)
             throw new Error("Invalid data");
+        this.emit("send", data);
         return this.enqueueFrame(frame);
     }
     async enqueueFrame(frame) {
@@ -268,9 +288,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
     toUartServices(telegram) {
         const result = Buffer.alloc(telegram.length * 2);
         for (let i = 0; i < telegram.length; i++) {
-            const ctrl = i === telegram.length - 1
-                ? UART_SERVICES.LDATA_END | (i & 0x3f)
-                : UART_SERVICES.LDATA_START | (i & 0x3f);
+            const ctrl = i === telegram.length - 1 ? UART_SERVICES.LDATA_END | (i & 0x3f) : UART_SERVICES.LDATA_START | (i & 0x3f);
             result[i * 2] = ctrl;
             result[i * 2 + 1] = telegram[i];
         }
@@ -290,11 +308,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
         if ((byte & 0x17) === 0x13) {
             const hasError = (byte & 0x07) !== 0;
             if (hasError) {
-                const error = byte & 0x04
-                    ? "Checksum Error"
-                    : byte & 0x02
-                        ? "Timing Error"
-                        : "Bit Error";
+                const error = byte & 0x04 ? "Checksum Error" : byte & 0x02 ? "Timing Error" : "Bit Error";
                 this.emit("warning", `TPUART Frame Error: ${error}`);
             }
             return;
@@ -307,10 +321,7 @@ class TPUARTConnection extends KNXService_1.KNXService {
                 const options = this.options;
                 if (options.individualAddress) {
                     this.connectionState = TPUARTState.SET_ADDR_WAIT;
-                    this.writeRaw(Buffer.concat([
-                        Buffer.from([0x28]),
-                        KNXHelper_1.KNXHelper.GetAddress(options.individualAddress, "."),
-                    ])).catch((e) => this.emit("error", e));
+                    this.writeRaw(Buffer.concat([Buffer.from([0x28]), KNXHelper_1.KNXHelper.GetAddress(options.individualAddress, ".")])).catch((e) => this.emit("error", e));
                     // knxd immediately transitions to get state after setting address
                     this.requestState();
                 }
@@ -344,16 +355,16 @@ class TPUARTConnection extends KNXService_1.KNXService {
             }
             return;
         }
-        if (byte === UART_SERVICES.LDATA_CON_POS ||
-            byte === UART_SERVICES.LDATA_CON_NEG) {
+        if (byte === UART_SERVICES.LDATA_CON_POS || byte === UART_SERVICES.LDATA_CON_NEG) {
             if (this.confirmationTimer)
                 clearTimeout(this.confirmationTimer);
             const item = this.msgQueue.shift();
             this.isProcessing = false;
-            if (item) {
-                byte === UART_SERVICES.LDATA_CON_POS
-                    ? item.resolve()
-                    : item.reject(new Error("NAK"));
+            if (item && byte === UART_SERVICES.LDATA_CON_POS) {
+                item.resolve();
+            }
+            else if (item) {
+                item.reject(new Error("NAK"));
             }
             this.processQueue();
             return;
@@ -416,14 +427,6 @@ class TPUARTConnection extends KNXService_1.KNXService {
     }
 }
 exports.TPUARTConnection = TPUARTConnection;
-function tryEmi(data) {
-    try {
-        return EMI_1.EMI.fromBuffer(data).toBuffer().subarray(1);
-    }
-    catch {
-        return null;
-    }
-}
 class Receiver {
     connection;
     buffer = Buffer.alloc(0);
@@ -433,8 +436,9 @@ class Receiver {
         this.connection = connection;
     }
     handleData(data) {
-        for (const byte of data)
+        for (const byte of data) {
             this.processByte(byte);
+        }
     }
     processByte(byte) {
         // BUG FIX: Only handle control bytes if we are NOT in the middle of a frame

package/dist/connection/TunnelConnection.d.ts

@@ -6,6 +6,8 @@ import { Logger } from "pino";
  * Encapsulates a single KNXnet/IP Tunnelling or Management connection state.
  * Handles sequence numbers, heartbeats, reliable delivery (stop-and-wait),
  * and retransmissions according to KNX Spec Vol 3/8/4.
+ *
+ * ***Don't use this for connect a KNX device. Use KNXTunneling instead.***
  */
 export declare class TunnelConnection {
     readonly channelId: number;
@@ -47,7 +49,7 @@ export declare class TunnelConnection {
      * Validates an incoming request from the client according to sequence number rules.
      */
     validateRequest(seq: number): {
-        action: 'process' | 'discard' | 'retransmit_ack';
+        action: "process" | "discard" | "retransmit_ack";
         status: number;
     };
     /**

package/dist/connection/TunnelConnection.js

@@ -7,6 +7,8 @@ const KNXnetIPEnum_1 = require("../core/enum/KNXnetIPEnum");
  * Encapsulates a single KNXnet/IP Tunnelling or Management connection state.
  * Handles sequence numbers, heartbeats, reliable delivery (stop-and-wait),
  * and retransmissions according to KNX Spec Vol 3/8/4.
+ *
+ * ***Don't use this for connect a KNX device. Use KNXTunneling instead.***
  */
 class TunnelConnection {
     channelId;
@@ -106,7 +108,7 @@ class TunnelConnection {
                     this.logger.error(`Second ACK timeout for seq ${seq}. Terminating connection.`);
                     this.onDisconnect(this.channelId, true);
                 }
-            }, this.retransmitTimeoutMs)
+            }, this.retransmitTimeoutMs),
         };
     }
     /**
@@ -138,16 +140,16 @@ class TunnelConnection {
         if (seq === this.rno) {
             // Expected sequence number
             this.rno = (this.rno + 1) % 256;
-            return { action: 'process', status: KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR };
+            return { action: "process", status: KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR };
         }
         else if (seq === (this.rno - 1 + 256) % 256) {
             // Previous sequence number (retransmit ACK)
-            return { action: 'retransmit_ack', status: KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR };
+            return { action: "retransmit_ack", status: KNXnetIPEnum_1.KNXnetIPErrorCodes.E_NO_ERROR };
         }
         else {
             // Out of sequence - discard without reply (Spec 2.6.1)
             this.logger.warn(`Out of sequence request: got ${seq}, expected ${this.rno}`);
-            return { action: 'discard', status: 0 };
+            return { action: "discard", status: 0 };
         }
     }
     /**

package/dist/core/CEMI.d.ts

@@ -1,4 +1,3 @@
-import { ServiceMessage } from "../@types/interfaces/ServiceMessage";
 import { ControlField } from "./ControlField";
 import { ExtendedControlField } from "./ControlFieldExtended";
 import { AddInfoBase } from "./KNXAddInfoTypes";
@@ -48,7 +47,7 @@ export declare class AdditionalInformationField {
 }
 export declare class CEMI {
     constructor();
-    static fromBuffer(buffer: Buffer): ServiceMessage;
+    static fromBuffer(buffer: Buffer): CEMIInstance;
     static DataLinkLayerCEMI: {
         readonly "L_Data.req": {
             new (additionalInfo: AddInfoBase[] | null | undefined, controlField1: ControlField, controlField2: ExtendedControlField, sourceAddress: string, destinationAddress: string, TPDU: TPDU): {
@@ -1128,3 +1127,9 @@ export declare class CEMI {
         };
     };
 }
+type KeysOfCEMI = "DataLinkLayerCEMI" | "TransportLayerCEMI" | "ManagementCEMI";
+type CEMIClasses = {
+    [K in KeysOfCEMI]: (typeof CEMI)[K][keyof (typeof CEMI)[K]];
+}[KeysOfCEMI];
+export type CEMIInstance = InstanceType<CEMIClasses>;
+export {};

package/dist/core/CEMI.js

@@ -236,7 +236,7 @@ class CEMI {
                     controlField2: this.controlField2.describe(),
                     sourceAddress: this.sourceAddress,
                     destinationAddress: this.destinationAddress,
-                    TPDU: this.TPDU.describe()
+                    TPDU: this.TPDU.describe(),
                 };
             }
         },
@@ -321,7 +321,7 @@ class CEMI {
                     controlField2: this.controlField2.describe(),
                     sourceAddress: this.sourceAddress,
                     destinationAddress: this.destinationAddress,
-                    TPDU: this.TPDU.describe()
+                    TPDU: this.TPDU.describe(),
                 };
             }
         },
@@ -358,7 +358,7 @@ class CEMI {
                 this.controlField1.buffer.copy(buffer, baseOffset);
                 this.controlField2.getBuffer().copy(buffer, baseOffset + 1);
                 KNXHelper_1.KNXHelper.GetAddress_(this.sourceAddress).copy(buffer, baseOffset + 2);
-                KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, baseOffset + 4);
+                KNXHelper_1.KNXHelper.GetAddress(this.destinationAddress, this.controlField2.addressType === 1 ? "/" : ".").copy(buffer, baseOffset + 4);
                 buffer[baseOffset + 6] = this.length;
                 this.TPDU.toBuffer().copy(buffer, baseOffset + 7);
                 return buffer;
@@ -406,7 +406,7 @@ class CEMI {
                     controlField2: this.controlField2.describe(),
                     sourceAddress: this.sourceAddress,
                     destinationAddress: this.destinationAddress,
-                    TPDU: this.TPDU.describe()
+                    TPDU: this.TPDU.describe(),
                 };
             }
         },
@@ -699,10 +699,7 @@ class CEMI {
                     this.additionalInfo = new AdditionalInformationField(additionalInfo);
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Busmon.ind"].CEMI.value;
-            additionalInfo = new AdditionalInformationField([
-                new KNXAddInfoTypes_1.BusmonitorStatusInfo(),
-                new KNXAddInfoTypes_1.TimestampRelative(),
-            ]);
+            additionalInfo = new AdditionalInformationField([new KNXAddInfoTypes_1.BusmonitorStatusInfo(), new KNXAddInfoTypes_1.TimestampRelative()]);
             data = Buffer.alloc(1);
             toBuffer() {
                 const baseOffset = 2 + this.additionalInfo.length;