zigbee-herdsman-converters 25.71.0 → 25.73.0

package/dist/lib/lumi.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toZigbee = exports.fromZigbee = exports.modernExtend = exports.lumiModernExtend = exports.manufacturerCode = exports.trv = exports.presence = exports.numericAttributes2Payload = exports.buffer2DataObject = void 0;
+exports.w100EnsureDefaults = w100EnsureDefaults;
 const node_buffer_1 = require("node:buffer");
 const fz = __importStar(require("../converters/fromZigbee"));
 const exposes = __importStar(require("./exposes"));
@@ -425,6 +426,9 @@ msg, meta, model, options, dataObject) => {
                 if (["QBKG25LM", "QBKG33LM", "QBKG34LM"].includes(model.model)) {
                     payload.state_right = value === 1 ? "ON" : "OFF";
                 }
+                else if (["TH-S04D"].includes(model.model)) {
+                    payload.battery = value;
+                }
                 else if (["WSDCGQ01LM", "WSDCGQ11LM"].includes(model.model)) {
                     (0, utils_1.assertNumber)(value);
                     payload.pressure = value / 100.0;
@@ -2744,6 +2748,79 @@ const feederDaysLookup = {
     85: "mon-wed-fri-sun",
     42: "tue-thu-sat",
 };
+const w100Defaults = {
+    system_mode: "off",
+    occupied_heating_setpoint: 15,
+    fan_mode: "auto",
+    unused: "0",
+    thermostat_mode: "OFF",
+    min_target_temp: 5,
+    max_target_temp: 30,
+};
+function w100EnsureDefaults(meta) {
+    const state = meta.state || {};
+    const normalized = {
+        system_mode: state.system_mode ?? w100Defaults.system_mode,
+        occupied_heating_setpoint: state.occupied_heating_setpoint ?? w100Defaults.occupied_heating_setpoint,
+        fan_mode: state.fan_mode ?? w100Defaults.fan_mode,
+        unused: state.unused ?? w100Defaults.unused,
+        thermostat_mode: state.thermostat_mode ?? w100Defaults.thermostat_mode,
+    };
+    meta.state = {
+        ...state,
+        ...normalized,
+    };
+    if (meta.device) {
+        if (!meta.device.meta)
+            meta.device.meta = {};
+        if (!meta.device.meta.initialized) {
+            meta.device.meta.initialized = true;
+        }
+    }
+    return normalized;
+}
+async function w100SendPMTSD(entity, pmtsd, meta) {
+    const { p, m, t, s, d } = pmtsd;
+    const pmtsdStr = `P${p}_M${m}_T${t}_S${s}_D${d}`;
+    const pmtsdBytes = Array.from(pmtsdStr).map((c) => c.charCodeAt(0));
+    const pmtsdLen = pmtsdBytes.length;
+    const fixedHeader = [
+        0xaa,
+        0x71,
+        0x1f,
+        0x44,
+        0x00,
+        0x00,
+        0x05,
+        0x41,
+        0x1c,
+        0x00,
+        0x00,
+        0x54,
+        0xef,
+        0x44,
+        0x80,
+        0x71,
+        0x1a,
+        0x08,
+        0x00,
+        0x08,
+        0x44,
+        pmtsdLen,
+    ];
+    const counter = Math.floor(Math.random() * 256);
+    fixedHeader[4] = counter;
+    const fullPayload = [...fixedHeader, ...pmtsdBytes];
+    const checksum = fullPayload.reduce((sum, b) => sum + b, 0) & 0xff;
+    fixedHeader[5] = checksum;
+    await entity.write(64704, { 65522: { value: node_buffer_1.Buffer.from(fullPayload), type: 65 } }, { manufacturerCode: 4447, disableDefaultResponse: true });
+    logger_1.logger.info(`Aqara W100: PMTSD frame sent: ${pmtsdStr}`, NS);
+    if (meta.device) {
+        if (!meta.device.meta)
+            meta.device.meta = {};
+        meta.device.meta.lastPMTSDSend = Date.now();
+    }
+}
 exports.fromZigbee = {
     // lumi generic
     lumi_basic: {
@@ -4039,82 +4116,179 @@ exports.fromZigbee = {
             return result;
         },
     },
-    w100_0844_req: {
+    w100_specific: {
         cluster: "manuSpecificLumi",
         type: ["attributeReport", "readResponse"],
-        convert: (model, msg, publish, options, meta) => {
-            const attr = msg.data[65522];
-            if (!attr || !node_buffer_1.Buffer.isBuffer(attr))
-                return;
-            const endsWith = node_buffer_1.Buffer.from([0x08, 0x00, 0x08, 0x44]);
-            if (attr.slice(-4).equals(endsWith)) {
-                logger_1.logger.info(`Detected PMTSD request from device ${meta.device.ieeeAddr}`, NS);
-                return { action: "data_request" };
+        convert: async (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data[65522]) {
+                const base = w100EnsureDefaults(meta);
+                Object.assign(result, base);
+                const attr = msg.data[65522];
+                if (!attr || !node_buffer_1.Buffer.isBuffer(attr)) {
+                    // defaults assigned
+                }
+                else {
+                    const endsWith = node_buffer_1.Buffer.from([0x08, 0x00, 0x08, 0x44]);
+                    const endsWithData = node_buffer_1.Buffer.from([0x08, 0x44]);
+                    if (attr.length >= 4 && attr.slice(-4).equals(endsWith)) {
+                        logger_1.logger.info(`Aqara W100: PMTSD request detected from device ${meta.device.ieeeAddr}`, NS);
+                        let modeValue = 0;
+                        if (base.system_mode === "off") {
+                            modeValue = meta.device.meta.lastActiveMode ?? 0;
+                        }
+                        else {
+                            const modeMap = { cool: 0, heat: 1, auto: 2 };
+                            modeValue = modeMap[base.system_mode] ?? 0;
+                        }
+                        const convertToNumber = (key, value) => {
+                            if (typeof value !== "string")
+                                return value;
+                            if (key === "fan_mode") {
+                                const speedMap = { auto: 0, low: 1, medium: 2, high: 3 };
+                                return speedMap[value.toLowerCase()] ?? 0;
+                            }
+                            if (key === "unused")
+                                return Number.parseInt(value, 10);
+                            return value;
+                        };
+                        const pmtsdValues = {
+                            p: base.system_mode === "off" ? 1 : 0,
+                            m: modeValue,
+                            t: typeof base.occupied_heating_setpoint === "string"
+                                ? Number.parseFloat(base.occupied_heating_setpoint)
+                                : base.occupied_heating_setpoint,
+                            s: convertToNumber("fan_mode", base.fan_mode) ?? 0,
+                            d: convertToNumber("unused", base.unused) ?? 0,
+                        };
+                        try {
+                            const endpoint = meta.device.getEndpoint(1);
+                            await w100SendPMTSD(endpoint, pmtsdValues, meta);
+                        }
+                        catch (error) {
+                            logger_1.logger.error(`Aqara W100: Failed to send PMTSD frame: ${error.message}`, NS);
+                        }
+                        result.action = "W100_PMTSD_request";
+                    }
+                    else {
+                        const idx = attr.indexOf(endsWithData);
+                        if (idx !== -1 && idx + 2 < attr.length) {
+                            const payloadLen = attr[idx + 2];
+                            const payloadStart = idx + 3;
+                            const payloadEnd = payloadStart + payloadLen;
+                            if (payloadEnd <= attr.length) {
+                                const payloadBytes = attr.slice(payloadStart, payloadEnd);
+                                let payloadAscii;
+                                try {
+                                    payloadAscii = payloadBytes.toString("ascii");
+                                }
+                                catch {
+                                    return;
+                                }
+                                const stateUpdate = {};
+                                const partsForCombined = [];
+                                const pairs = payloadAscii.split("_");
+                                const pmtsd = {
+                                    p: base.system_mode === "off" ? 1 : 0,
+                                    // biome-ignore lint/suspicious/noExplicitAny: ignored using `--suppress`
+                                    m: meta.device.meta?.lastActiveMode ?? 0,
+                                    t: 15,
+                                    s: 0,
+                                    d: 0,
+                                };
+                                if (base.system_mode !== "off") {
+                                    const modeMap = { cool: 0, heat: 1, auto: 2 };
+                                    pmtsd.m = modeMap[base.system_mode] ?? 0;
+                                }
+                                pairs.forEach((pair) => {
+                                    if (pair.length >= 2) {
+                                        const key = pair[0].toLowerCase();
+                                        const value = pair.slice(1);
+                                        let newKey;
+                                        let stateKey;
+                                        let displayValue = value;
+                                        let processedValue = value;
+                                        switch (key) {
+                                            case "p":
+                                                newKey = "PW";
+                                                processedValue = Number.parseInt(value, 10);
+                                                pmtsd.p = processedValue;
+                                                break;
+                                            case "m":
+                                                newKey = "MW";
+                                                processedValue = Number.parseInt(value, 10);
+                                                pmtsd.m = processedValue;
+                                                break;
+                                            case "t":
+                                                newKey = "TW";
+                                                stateKey = "occupied_heating_setpoint";
+                                                processedValue = Number.parseFloat(value);
+                                                pmtsd.t = processedValue;
+                                                displayValue = processedValue;
+                                                break;
+                                            case "s":
+                                                newKey = "SW";
+                                                stateKey = "fan_mode";
+                                                processedValue = Number.parseInt(value, 10);
+                                                pmtsd.s = processedValue;
+                                                displayValue = ["auto", "low", "medium", "high"][processedValue];
+                                                break;
+                                            case "d":
+                                                newKey = "DW";
+                                                stateKey = "unused";
+                                                processedValue = Number.parseInt(value, 10);
+                                                pmtsd.d = processedValue;
+                                                displayValue = String(processedValue);
+                                                break;
+                                            default:
+                                                newKey = `${key.toUpperCase()}W`;
+                                        }
+                                        result[newKey] = value;
+                                        if (stateKey) {
+                                            stateUpdate[stateKey] = displayValue;
+                                            result[stateKey] = displayValue;
+                                        }
+                                        partsForCombined.push(`${newKey}${value}`);
+                                    }
+                                });
+                                const modeDisplay = ["cool", "heat", "auto"][pmtsd.m] || "cool";
+                                const systemMode = pmtsd.p === 1 ? "off" : modeDisplay;
+                                if (pmtsd.p === 0 && pmtsd.m !== undefined) {
+                                    if (!meta.device.meta)
+                                        meta.device.meta = {};
+                                    // biome-ignore lint/suspicious/noExplicitAny: ignored using `--suppress`
+                                    meta.device.meta.lastActiveMode = pmtsd.m;
+                                }
+                                stateUpdate.system_mode = systemMode;
+                                result.system_mode = systemMode;
+                                const date = new Date();
+                                const pad = (n) => n.toString().padStart(2, "0");
+                                const formattedDate = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+                                const combinedString = partsForCombined.length
+                                    ? `${formattedDate}_${partsForCombined.join("_")}`
+                                    : `${formattedDate}`;
+                                result.PMTSD_from_W100_Data = combinedString;
+                            }
+                        }
+                    }
+                }
             }
+            return result;
         },
     },
-    pmtsd_from_w100: {
-        cluster: "manuSpecificLumi",
+    w100_temperature: {
+        cluster: "msTemperatureMeasurement",
         type: ["attributeReport", "readResponse"],
         convert: (model, msg, publish, options, meta) => {
-            const data = msg.data[65522];
-            if (!data || !node_buffer_1.Buffer.isBuffer(data))
-                return;
-            const endsWith = node_buffer_1.Buffer.from([0x08, 0x44]);
-            const idx = data.indexOf(endsWith);
-            if (idx === -1 || idx + 2 >= data.length)
-                return;
-            const payloadLen = data[idx + 2];
-            const payloadStart = idx + 3;
-            const payloadEnd = payloadStart + payloadLen;
-            if (payloadEnd > data.length)
-                return;
-            const payloadBytes = data.slice(payloadStart, payloadEnd);
-            let payloadAscii;
-            try {
-                payloadAscii = payloadBytes.toString("ascii");
+            // W100 needs a custom converter to:
+            // 1. Expose both 'temperature' and 'local_temperature' (needed for climate)
+            // 2. Initialize device defaults (w100EnsureDefaults) needed for other converters
+            const result = fz.temperature.convert(model, msg, publish, options, meta);
+            if (result) {
+                const temperature = Object.values(result)[0];
+                const defaults = w100EnsureDefaults(meta);
+                return { temperature, local_temperature: temperature, ...defaults };
             }
-            catch {
-                return;
-            }
-            const result = {};
-            const partsForCombined = [];
-            const pairs = payloadAscii.split("_");
-            pairs.forEach((p) => {
-                if (p.length >= 2) {
-                    const key = p[0];
-                    const value = p.slice(1);
-                    let newKey;
-                    switch (key) {
-                        case "p":
-                            newKey = "PW";
-                            break;
-                        case "m":
-                            newKey = "MW";
-                            break;
-                        case "t":
-                            newKey = "TW";
-                            break;
-                        case "s":
-                            newKey = "SW";
-                            break;
-                        case "d":
-                            newKey = "DW";
-                            break;
-                        default:
-                            newKey = `${key.toUpperCase()}W`;
-                    }
-                    result[newKey] = value;
-                    partsForCombined.push(`${newKey}${value}`);
-                }
-            });
-            const ts = Date.now();
-            const combinedString = partsForCombined.length ? `${ts}_${partsForCombined.join("_")}` : `${ts}`;
-            logger_1.logger.info(`Decoded PMTSD: ${JSON.stringify(result)} from ${meta.device.ieeeAddr}`, NS);
-            return {
-                ...result,
-                data: combinedString,
-            };
         },
     },
 };
@@ -5661,57 +5835,168 @@ exports.toZigbee = {
             throw new Error(`Not supported: '${key}'`);
         },
     },
-    pmtsd_to_w100: {
-        key: ["PMTSD_to_W100"],
+    w100_pmtsd: {
+        key: ["system_mode", "occupied_heating_setpoint", "fan_mode", "unused", "pmtsd_to_w100"],
         convertSet: async (entity, key, value, meta) => {
-            const { p, m, t, s, d } = value;
-            const pmtsdStr = `P${p}_M${m}_T${t}_S${s}_D${d}`;
-            const pmtsdBytes = Array.from(pmtsdStr).map((c) => c.charCodeAt(0));
-            const pmtsdLen = pmtsdBytes.length;
-            const fixedHeader = [
-                0xaa,
-                0x71,
-                0x1f,
-                0x44,
-                0x00,
-                0x00,
-                0x05,
-                0x41,
-                0x1c,
-                0x00,
-                0x00,
-                0x54,
-                0xef,
-                0x44,
-                0x80,
-                0x71,
-                0x1a,
-                0x08,
-                0x00,
-                0x08,
-                0x44,
-                pmtsdLen,
-            ];
-            const counter = Math.floor(Math.random() * 256);
-            fixedHeader[4] = counter;
-            const fullPayload = [...fixedHeader, ...pmtsdBytes];
-            const checksum = fullPayload.reduce((sum, b) => sum + b, 0) & 0xff;
-            fullPayload[5] = checksum;
-            await entity.write(64704, { 65522: { value: node_buffer_1.Buffer.from(fullPayload), type: 65 } }, { manufacturerCode: 4447, disableDefaultResponse: true });
-            logger_1.logger.info(`PMTSD frame sent: ${pmtsdStr} (Counter: ${counter}, Checksum: ${checksum})`, NS);
-            return {};
-        },
-    },
-    thermostat_mode: {
-        key: ["mode"],
+            const MIN_SEND_INTERVAL_MS = 5000;
+            const base = w100EnsureDefaults(meta);
+            let initialP = 0;
+            let initialM = 0;
+            if (base.system_mode === "off") {
+                initialP = 1;
+                initialM = meta.device?.meta?.lastActiveMode ?? 0;
+            }
+            else {
+                initialP = 0;
+                const modeMap = { cool: 0, heat: 1, auto: 2 };
+                initialM = modeMap[base.system_mode] ?? 0;
+            }
+            let initialS = 0;
+            const speedMap = { auto: 0, low: 1, medium: 2, high: 3 };
+            initialS = speedMap[base.fan_mode] ?? 0;
+            const pmtsd = {
+                p: initialP,
+                m: initialM,
+                t: typeof base.occupied_heating_setpoint === "string"
+                    ? Number.parseFloat(base.occupied_heating_setpoint)
+                    : base.occupied_heating_setpoint,
+                s: initialS,
+                d: typeof base.unused === "string" ? Number.parseInt(base.unused, 10) : base.unused,
+            };
+            if (typeof pmtsd.t === "string")
+                pmtsd.t = Number.parseFloat(pmtsd.t);
+            if (typeof pmtsd.d === "string")
+                pmtsd.d = Number.parseInt(pmtsd.d, 10);
+            let hasChanged = false;
+            if (key === "pmtsd_to_w100") {
+                const val = value;
+                if (val.P !== undefined)
+                    pmtsd.p = Number(val.P);
+                if (val.M !== undefined)
+                    pmtsd.m = Number(val.M);
+                if (val.T !== undefined)
+                    pmtsd.t = Number(val.T);
+                if (val.S !== undefined)
+                    pmtsd.s = Number(val.S);
+                if (val.D !== undefined)
+                    pmtsd.d = Number(val.D);
+                hasChanged = true;
+            }
+            else {
+                if (meta.state?.thermostat_mode !== "ON" && ["system_mode", "occupied_heating_setpoint", "fan_mode"].includes(key)) {
+                    logger_1.logger.warning(`Aqara W100: Ignoring ${key} command - thermostat_mode is not ON`, NS);
+                    return { state: {} };
+                }
+                switch (key) {
+                    case "system_mode": {
+                        if (value === "off") {
+                            if (pmtsd.p === 0 && pmtsd.m !== undefined) {
+                                if (!meta.device.meta)
+                                    meta.device.meta = {};
+                                // biome-ignore lint/suspicious/noExplicitAny: ignored using `--suppress`
+                                meta.device.meta.lastActiveMode = pmtsd.m;
+                            }
+                            if (pmtsd.p !== 1) {
+                                pmtsd.p = 1;
+                                hasChanged = true;
+                            }
+                        }
+                        else {
+                            if (pmtsd.p !== 0) {
+                                pmtsd.p = 0;
+                                hasChanged = true;
+                            }
+                            const modeMap = { cool: 0, heat: 1, auto: 2 };
+                            const numValue = typeof value === "string" ? modeMap[value.toLowerCase()] : Number(value);
+                            if (numValue !== undefined && [0, 1, 2].includes(numValue)) {
+                                if (pmtsd.m !== numValue) {
+                                    pmtsd.m = numValue;
+                                    hasChanged = true;
+                                    if (!meta.device.meta)
+                                        meta.device.meta = {};
+                                    // biome-ignore lint/suspicious/noExplicitAny: ignored using `--suppress`
+                                    meta.device.meta.lastActiveMode = numValue;
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    case "occupied_heating_setpoint": {
+                        const temp = Number.parseFloat(value);
+                        const minTarget = meta.options?.min_target_temp !== undefined ? Number(meta.options.min_target_temp) : w100Defaults.min_target_temp;
+                        const maxTarget = meta.options?.max_target_temp !== undefined ? Number(meta.options.max_target_temp) : w100Defaults.max_target_temp;
+                        if (Number.isNaN(temp) || temp < minTarget || temp > maxTarget)
+                            throw new Error(`occupied_heating_setpoint must be between ${minTarget} and ${maxTarget}`);
+                        if (pmtsd.t !== temp) {
+                            pmtsd.t = temp;
+                            hasChanged = true;
+                        }
+                        break;
+                    }
+                    case "fan_mode": {
+                        let numValue;
+                        if (typeof value === "string") {
+                            const speedMap = { auto: 0, low: 1, medium: 2, high: 3 };
+                            numValue = speedMap[value.toLowerCase()];
+                        }
+                        else {
+                            numValue = Number(value);
+                        }
+                        if (pmtsd.s !== numValue) {
+                            pmtsd.s = numValue;
+                            hasChanged = true;
+                        }
+                        break;
+                    }
+                    case "unused": {
+                        const numValue = typeof value === "string" ? Number.parseInt(value, 10) : Number(value);
+                        if (pmtsd.d !== numValue) {
+                            pmtsd.d = numValue;
+                            hasChanged = true;
+                        }
+                        break;
+                    }
+                }
+            }
+            const modeDisplay = ["cool", "heat", "auto"][pmtsd.m] || "cool";
+            const speedDisplay = ["auto", "low", "medium", "high"][pmtsd.s] || "auto";
+            const stateUpdate = {
+                state: {
+                    occupied_heating_setpoint: pmtsd.t,
+                    fan_mode: speedDisplay,
+                    system_mode: pmtsd.p === 1 ? "off" : modeDisplay,
+                    unused: String(pmtsd.d),
+                },
+            };
+            const { p, m, t, s, d } = pmtsd;
+            if (p === undefined || m === undefined || t === undefined || s === undefined || d === undefined)
+                return stateUpdate;
+            const now = Date.now();
+            if (meta.device) {
+                if (!meta.device.meta)
+                    meta.device.meta = {};
+            }
+            const lastSendTime = meta.device?.meta?.lastPMTSDSend || 0;
+            const timeElapsed = now - lastSendTime;
+            const shouldSend = hasChanged || timeElapsed >= MIN_SEND_INTERVAL_MS;
+            if (!shouldSend)
+                return stateUpdate;
+            await w100SendPMTSD(entity, pmtsd, meta);
+            return stateUpdate;
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read("manuSpecificLumi", [65522], { manufacturerCode: 4447 });
+        },
+    },
+    w100_mode: {
+        key: ["thermostat_mode"],
         convertSet: async (entity, key, value, meta) => {
             const deviceMac = meta.device.ieeeAddr.replace(/^0x/, "").toLowerCase();
             const hubMac = "54ef4480711a";
             function cleanMac(mac, expectedLen) {
                 const cleaned = mac.replace(/[:-]/g, "");
-                if (cleaned.length !== expectedLen) {
+                if (cleaned.length !== expectedLen)
                     throw new Error(`MAC must be ${expectedLen} hex digits`);
-                }
                 return cleaned;
             }
             const dev = node_buffer_1.Buffer.from(cleanMac(deviceMac, 16), "hex");
@@ -5735,13 +6020,13 @@ exports.toZigbee = {
                 const seq = node_buffer_1.Buffer.from([Math.floor(Math.random() * 256)]);
                 const control = node_buffer_1.Buffer.from([0x18]);
                 frame = node_buffer_1.Buffer.concat([prefix, frameId, seq, control, dev]);
-                if (frame.length < 34) {
+                if (frame.length < 34)
                     frame = node_buffer_1.Buffer.concat([frame, node_buffer_1.Buffer.alloc(34 - frame.length, 0x00)]);
-                }
             }
             await entity.write(64704, { 65522: { value: frame, type: 0x41 } }, { manufacturerCode: 4447, disableDefaultResponse: true });
-            logger_1.logger.info(`Thermostat_Mode=${value} payload=${frame.toString("hex")}`, NS);
-            return {};
+            logger_1.logger.info(`Aqara W100: thermostat_mode set to ${value}`, NS);
+            const defaults = w100EnsureDefaults(meta);
+            return { state: { ...defaults, thermostat_mode: value } };
         },
     },
 };