knx.ts 1.0.2 → 1.0.4

package/dist/utils/CEMIAdapter.js

@@ -4,11 +4,11 @@ exports.CEMIAdapter = void 0;
 const CEMI_1 = require("../core/CEMI");
 const ControlField_1 = require("../core/ControlField");
 const ControlFieldExtended_1 = require("../core/ControlFieldExtended");
-const TPDU_1 = require("../core/layers/data/TPDU");
 const KNXHelper_1 = require("./KNXHelper");
 const EnumControlFieldExtended_1 = require("../core/enum/EnumControlFieldExtended");
 const MessageCodeTranslator_1 = require("./MessageCodeTranslator");
 const EMI_1 = require("../core/EMI");
+const NPDU_1 = require("../core/layers/data/NPDU");
 /**
  * Adapter utility to convert between EMI (External Message Interface) and cEMI (Common External Message Interface).
  * EMI is typically used by physical interfaces like TPUART, while cEMI is standard for KNXnet/IP.
@@ -21,31 +21,28 @@ class CEMIAdapter {
     static emiToCemi(emiBuffer) {
         if (emiBuffer.length < 7)
             throw new Error("EMI buffer too short");
-        let offset = 0;
-        const messageCode = emiBuffer.readUInt8(offset++);
-        const ctrlByte = emiBuffer.readUInt8(offset++);
+        const messageCode = emiBuffer.readUInt8(0);
+        const ctrlByte = emiBuffer.readUInt8(1);
         // Addresses (2 bytes each)
-        const srcAddr = KNXHelper_1.KNXHelper.GetAddress(emiBuffer.subarray(offset, offset + 2), ".");
-        offset += 2;
-        const dstAddr = KNXHelper_1.KNXHelper.GetAddress(emiBuffer.subarray(offset, offset + 2), "/");
-        offset += 2;
-        const dataLength = emiBuffer.readUInt8(offset++); // NPDU Length
-        const npciByte = emiBuffer.readUInt8(offset++); // NPCI
+        const srcAddr = KNXHelper_1.KNXHelper.GetAddress(emiBuffer.subarray(2, 4), ".");
+        let dstAddr = "";
+        // const oct6 = emiBuffer.readUInt8(6); // AT,NPCI,LG
+        // const addressType = (oct6 >> 7) & 0x01;
+        // const hopCount = (oct6 >> 4) & 0x07;
+        // const octNum = oct6 & 0x0f; // NPDU Length
         // --- Control Fields Transformation ---
         // 1. cEMI Control Field 1 is identical to EMI Control
         const controlField1 = new ControlField_1.ControlField(ctrlByte);
         // 2. cEMI Control Field 2 (Extended) is extracted from EMI NPCI
         // NPCI: [Res/AddrType] [Hop3] [Hop2] [Hop1] [Len3] [Len2] [Len1] [Len0]
-        const hopCount = (npciByte >> 4) & 0x07;
-        const addressType = npciByte & 0x80 ? EnumControlFieldExtended_1.AddressType.GROUP : EnumControlFieldExtended_1.AddressType.INDIVIDUAL;
         const controlField2 = new ControlFieldExtended_1.ExtendedControlField();
-        controlField2.hopCount = hopCount;
-        controlField2.addressType = addressType;
-        // --- TPDU Extraction ---
-        // In cEMI, the payload is pure TPDU (without NPCI byte)
-        // dataLength in EMI includes NPCI byte, so TPDU length is dataLength - 1
-        const tpduBuffer = emiBuffer.subarray(offset, offset + dataLength - 1);
-        const tpdu = TPDU_1.TPDU.fromBuffer(tpduBuffer);
+        // --- NPDU Extraction ---
+        const npduBuff = emiBuffer.subarray(6);
+        // The implementation of NPDU have NPCI
+        const npdu = NPDU_1.NPDU.fromBuffer(npduBuff);
+        controlField2.hopCount = npdu.hopCount;
+        controlField2.addressType = npdu.addressType;
+        dstAddr = KNXHelper_1.KNXHelper.GetAddress(emiBuffer.subarray(4, 6), npdu.addressType === 1 ? "/" : ".");
         // Translate Message Code (EMI 0x11 -> cEMI 0x11, etc.)
         const cemiCode = MessageCodeTranslator_1.MessageCodeTranslator.translate(messageCode, "EMI2/IMI2", "CEMI");
         if (cemiCode === null)
@@ -53,19 +50,18 @@ class CEMIAdapter {
         // Construct the appropriate cEMI class using CEMI.fromBuffer or directly
         // Since we already parsed components, we might want to find the class
         // But CEMI.fromBuffer takes a buffer. Let's use it for simplicity if we can re-construct a cEMI buffer
-        // Or just instantiate the specific class. 
+        // Or just instantiate the specific class.
         // Given the structure of CEMI.ts, it's better to use the constructors if possible or fromBuffer with a temporary buffer.
-        const tempCemi = new CEMI_1.CEMI.DataLinkLayerCEMI["L_Data.ind"](null, controlField1, controlField2, srcAddr, dstAddr, tpdu);
-        // Adjust message code if it's not L_Data.ind
-        tempCemi.messageCode = cemiCode;
+        const tempCemi = new CEMI_1.CEMI.DataLinkLayerCEMI["L_Data.ind"](null, controlField1, controlField2, srcAddr, dstAddr, npdu.TPDU);
         return tempCemi;
     }
     /**
      * Converts a cEMI instance to an EMI2 compatible Buffer or ServiceMessage.
      */
     static cemiToEmi(cemi) {
-        if (!cemi.TPDU || !cemi.controlField1 || !cemi.controlField2)
+        if (!("TPDU" in cemi) || !("controlField1" in cemi) || !("controlField2" in cemi)) {
             return null;
+        }
         const tpduBuffer = cemi.TPDU.toBuffer();
         // In EMI, NPDU includes NPCI byte at start
         // NPCI = (AddressType << 7) | (HopCount << 4) | (TPDU Length)
@@ -74,17 +70,17 @@ class CEMIAdapter {
         const emiCode = MessageCodeTranslator_1.MessageCodeTranslator.translate(cemi.messageCode, "CEMI", "EMI2/IMI2");
         if (emiCode === null)
             return null;
-        // Buffer [MC] [Ctrl] [Src] [Dst] [NPDU_Len] [NPCI] [TPDU]
-        const buffer = Buffer.alloc(7 + 1 + tpduBuffer.length);
+        // Buffer [MC] [Ctrl] [Src] [Dst] [NPCI] [TPDU]
+        const buffer = Buffer.alloc(7 + tpduBuffer.length);
         let offset = 0;
         buffer.writeUInt8(emiCode, offset++);
         cemi.controlField1.buffer.copy(buffer, offset++);
-        KNXHelper_1.KNXHelper.GetAddress_(cemi.sourceAddress).copy(buffer, offset);
+        KNXHelper_1.KNXHelper.GetAddress(cemi.sourceAddress, ".").copy(buffer, offset);
         offset += 2;
-        KNXHelper_1.KNXHelper.GetAddress_(cemi.destinationAddress).copy(buffer, offset);
+        KNXHelper_1.KNXHelper.GetAddress(cemi.destinationAddress, cemi.controlField2.addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".").copy(buffer, offset);
         offset += 2;
-        // NPDU Length (NPCI + TPDU)
-        buffer.writeUInt8(tpduBuffer.length + 1, offset++);
+        // // NPDU Length (NPCI + TPDU)
+        // buffer.writeUInt8(tpduBuffer.length + 1, offset++);
         // Write NPCI then TPDU
         buffer.writeUInt8(npciByte, offset++);
         tpduBuffer.copy(buffer, offset);

package/dist/utils/Logger.d.ts

@@ -1,17 +1,17 @@
-import { Logger } from "pino";
+import pino from "pino";
 import { KNXLoggerOptions } from "../@types/interfaces/connection";
 /**
  * Creates a configured pino logger instance.
  * Completely configurable via options, no environment variable dependencies.
  * Production mode (JSON) is only active if NOT in a test environment.
  */
-export declare const createKNXLogger: (options?: KNXLoggerOptions) => Logger;
+export declare const createKNXLogger: (options?: KNXLoggerOptions) => pino.Logger;
 /**
  * Global default logger instance.
  */
-export declare let knxLogger: Logger;
+export declare let knxLogger: pino.Logger;
 /**
  * Configures the global knxLogger instance.
  * Call this at the beginning of your application to apply custom settings.
  */
-export declare const setupLogger: (options: KNXLoggerOptions) => Logger;
+export declare const setupLogger: (options: KNXLoggerOptions) => pino.Logger;

package/dist/utils/Logger.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupLogger = exports.knxLogger = exports.createKNXLogger = void 0;
 const pino_1 = __importDefault(require("pino"));
-const colorette_1 = require("colorette");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 /**
@@ -14,14 +13,13 @@ const fs_1 = __importDefault(require("fs"));
  * Production mode (JSON) is only active if NOT in a test environment.
  */
 const createKNXLogger = (options) => {
-    const isProduction = process.env.NODE_ENV === "production";
     const targets = [];
     // 1. Console Transport
-    if (!isProduction) {
+    if (!options?.pretty) {
         targets.push({
             target: "pino-pretty",
             options: {
-                colorize: colorette_1.isColorSupported,
+                colorize: true,
                 messageFormat: "[{module}] {msg}",
                 translateTime: "SYS:HH:MM:ss.l",
                 ignore: "pid,hostname,module",
@@ -61,9 +59,7 @@ const createKNXLogger = (options) => {
             },
         });
     }
-    const transportConfig = targets.length > 0
-        ? { targets }
-        : undefined;
+    const transportConfig = targets.length > 0 ? { targets } : undefined;
     const defaultOptions = {
         level: options?.level || "info",
         timestamp: () => `,"time":"${new Date(Date.now()).toISOString()}"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knx.ts",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A high-performance KNXnet/IP server and client library in TypeScript, focused on ETS stability.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,9 +14,15 @@
     "prepublishOnly": "npm run build",
     "start": "tsc && node dist/index.js",
     "watch": "tsc -w",
-    "test:connection": "tsx src/test/knxd_manual.test.ts",
+    "test": "jest",
+    "test:router": "tsx src/test/router.test.ts",
+    "test:tunneling": "tsx src/test/tunneling_manual.test.ts",
     "test:routing": "tsx src/test/routing_manual.test.ts",
+    "test:usb": "tsx src/test/test_usb_manual.test.ts",
+    "test:routingUsb": "tsx src/test/usb_routing_manual.test.ts",
+    "test:tpuart": "tsx src/test/tpuart_manual.test.ts",
     "test:controlField": "tsx src/test/controlField.test.ts",
+    "test:emi": "tsx src/test/test_emi.test.ts",
     "pack:test": "npm pack",
     "release:patch": "npm version patch && npm publish",
     "release:minor": "npm version minor && npm publish",
@@ -38,18 +44,32 @@
     "typescript"
   ],
   "author": "Arnold Steven Beleño Zuletta (Wesxt)",
-  "license": "MIT",
+  "license": "Apache-2.0",
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.19.13",
-    "@types/pino": "^7.0.4",
+    "@types/node-hid": "^1.3.4",
+    "@types/ws": "^8.18.1",
+    "eslint": "^10.1.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+    "globals": "^17.4.0",
+    "jest": "^30.3.0",
+    "ts-jest": "^29.4.6",
     "tsx": "^4.19.3",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.58.0"
   },
   "dependencies": {
-    "colorette": "^2.0.20",
+    "aedes": "^1.0.2",
+    "aedes-server-factory": "^0.2.1",
+    "mqtt": "^5.15.1",
+    "node-hid": "^3.3.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "pino-roll": "^4.0.0",
-    "serialport": "^13.0.0"
+    "serialport": "^13.0.0",
+    "ws": "^8.20.0"
   }
 }