@willieee802/zigbee-herdsman 0.49.0 → 0.49.2

package/dist/controller/helpers/ota.d.ts

@@ -0,0 +1,53 @@
+import type { TZclFrame } from "../../zspec/zcl/zclFrame";
+import type Endpoint from "../model/endpoint";
+import type { OtaDataSettings, OtaImage, OtaImageElement, OtaImageHeader, OtaSource, ZigbeeOtaImageMeta } from "../tstype";
+export declare enum OtaTagId {
+    UpgradeImage = 0,
+    /** signer IEEE address (8-byte), signature data (42-byte) */
+    ECDSASignatureCryptoSuite1 = 1,
+    /** ECDSA certificate (48-byte) */
+    ECDSASigningCertificateCryptoSuite1 = 2,
+    /** hash value (16-byte) */
+    ImageIntegrityCode = 3,
+    /** */
+    PictureData = 4,
+    /** signer IEEE address (8-byte), signature data (72-byte) */
+    ECDSASignatureCryptoSuite2 = 5,
+    /** ECDSA certificate (74-byte) */
+    ECDSASigningCertificateCryptoSuite2 = 6,
+    /**
+     * 2-byte header before actual `UpgradeImage`
+     * see https://github.com/telink-semi/telink_zigbee_sdk/blob/d5bc2f7b0c1f8536fe21c8127ca680ea8214bc8e/tl_zigbee_sdk/zigbee/ota/ota.h#L38
+     */
+    TelinkAES = 61440
+}
+/** uint32 LE */
+export declare const UPGRADE_FILE_IDENTIFIER = 200208670;
+export declare const UPGRADE_FILE_IDENTIFIER_BUF: Buffer<ArrayBuffer>;
+/**
+ * Set the dataDir for relative path needs (firmware file, index) as well as override index if any.
+ */
+export declare function setOtaConfiguration(inDataDir: string, inOverrideIndexLocation: string | undefined): void;
+export declare function getOtaFirmware(url: string, sha512: string | undefined): Promise<Buffer>;
+export declare function getOtaIndex(source: OtaSource): Promise<ZigbeeOtaImageMeta[]>;
+export declare function parseOtaHeader(buffer: Buffer): OtaImageHeader;
+export declare function parseOtaSubElement(buffer: Buffer, position: number): [OtaImageElement, metaOffset: number];
+export declare function parseOtaImage(buffer: Buffer): OtaImage;
+export declare class OtaSession {
+    #private;
+    private readonly ieeeAddr;
+    private readonly endpoint;
+    private readonly image;
+    private readonly onProgress;
+    private readonly dataSettings;
+    private readonly waitForOtaCommand;
+    get startTime(): number;
+    constructor(ieeeAddr: string, endpoint: Endpoint, image: OtaImage, onProgress: (progress: number, remaining: number) => void, dataSettings: OtaDataSettings, waitForOtaCommand: <Co extends string>(endpointId: number, commandId: number, transactionSequenceNumber: number | undefined, timeout: number) => {
+        promise: Promise<TZclFrame<"genOta", Co>>;
+        cancel: () => void;
+    });
+    run(): Promise<TZclFrame<"genOta", "upgradeEndRequest">>;
+    private commandStream;
+    private sendImageBlockResponse;
+}
+//# sourceMappingURL=ota.d.ts.map

package/dist/controller/helpers/ota.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ota.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/ota.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAC,eAAe,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,SAAS,EAAE,kBAAkB,EAAC,MAAM,WAAW,CAAC;AAoBzH,oBAAY,QAAQ;IAChB,YAAY,IAAS;IACrB,6DAA6D;IAC7D,0BAA0B,IAAS;IACnC,kCAAkC;IAClC,mCAAmC,IAAS;IAC5C,2BAA2B;IAC3B,kBAAkB,IAAS;IAC3B,MAAM;IACN,WAAW,IAAS;IACpB,6DAA6D;IAC7D,0BAA0B,IAAS;IACnC,kCAAkC;IAClC,mCAAmC,IAAS;IAE5C;;;OAGG;IACH,SAAS,QAAS;CAGrB;AASD,gBAAgB;AAChB,eAAO,MAAM,uBAAuB,YAAa,CAAC;AAClD,eAAO,MAAM,2BAA2B,qBAAwC,CAAC;AAOjF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAQxG;AAoED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7F;AAMD,wBAAsB,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAoDlF;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CA+C7D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,eAAe,EAAE,UAAU,EAAE,MAAM,CAAC,CAgB1G;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAgBtD;AA4ED,qBAAa,UAAU;;IAUf,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVtC,IAAI,SAAS,WAEZ;gBAGoB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,EACzD,YAAY,EAAE,eAAe,EAC7B,iBAAiB,EAAE,CAAC,EAAE,SAAS,MAAM,EAClD,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,yBAAyB,EAAE,MAAM,GAAG,SAAS,EAC7C,OAAO,EAAE,MAAM,KACd;QAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAC;IAqD3D,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;YAkDtD,aAAa;YA4Bd,sBAAsB;CAoDvC"}

package/dist/controller/helpers/ota.js

@@ -0,0 +1,467 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OtaSession = exports.UPGRADE_FILE_IDENTIFIER_BUF = exports.UPGRADE_FILE_IDENTIFIER = exports.OtaTagId = void 0;
+exports.setOtaConfiguration = setOtaConfiguration;
+exports.getOtaFirmware = getOtaFirmware;
+exports.getOtaIndex = getOtaIndex;
+exports.parseOtaHeader = parseOtaHeader;
+exports.parseOtaSubElement = parseOtaSubElement;
+exports.parseOtaImage = parseOtaImage;
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_perf_hooks_1 = require("node:perf_hooks");
+const logger_1 = require("../../utils/logger");
+const Zcl = __importStar(require("../../zspec/zcl"));
+const NS = "zh:controller:ota";
+// OTA_HEADER_VERSION_ZIGBEE  0x0100
+// ZIGBEE_2006_STACK_VERSION  0x0000
+// ZIGBEE_2007_STACK_VERSION  0x0001
+// ZIGBEE_PRO_STACK_VERSION   0x0002
+// ZIGBEE_IP_STACK_VERSION    0x0003
+// MANUFACTURE_CODE_WILD_CARD 0xFFFF
+// IMAGE_TYPE_WILD_CARD       0xFFFF
+// IMAGE_TYPE_SECURITY        0xFFC0
+// IMAGE_TYPE_CONFIG          0xFFC1
+// IMAGE_TYPE_LOG             0xFFC2
+// FILE_VERSION_WILD_CARD     0xFFFFFFFF
+var OtaTagId;
+(function (OtaTagId) {
+    OtaTagId[OtaTagId["UpgradeImage"] = 0] = "UpgradeImage";
+    /** signer IEEE address (8-byte), signature data (42-byte) */
+    OtaTagId[OtaTagId["ECDSASignatureCryptoSuite1"] = 1] = "ECDSASignatureCryptoSuite1";
+    /** ECDSA certificate (48-byte) */
+    OtaTagId[OtaTagId["ECDSASigningCertificateCryptoSuite1"] = 2] = "ECDSASigningCertificateCryptoSuite1";
+    /** hash value (16-byte) */
+    OtaTagId[OtaTagId["ImageIntegrityCode"] = 3] = "ImageIntegrityCode";
+    /** */
+    OtaTagId[OtaTagId["PictureData"] = 4] = "PictureData";
+    /** signer IEEE address (8-byte), signature data (72-byte) */
+    OtaTagId[OtaTagId["ECDSASignatureCryptoSuite2"] = 5] = "ECDSASignatureCryptoSuite2";
+    /** ECDSA certificate (74-byte) */
+    OtaTagId[OtaTagId["ECDSASigningCertificateCryptoSuite2"] = 6] = "ECDSASigningCertificateCryptoSuite2";
+    // "Manufacturer Specific Use" = 0xf000 – 0xffff,
+    /**
+     * 2-byte header before actual `UpgradeImage`
+     * see https://github.com/telink-semi/telink_zigbee_sdk/blob/d5bc2f7b0c1f8536fe21c8127ca680ea8214bc8e/tl_zigbee_sdk/zigbee/ota/ota.h#L38
+     */
+    OtaTagId[OtaTagId["TelinkAES"] = 61440] = "TelinkAES";
+    // IkeaUnknown1 = 0xffbf, // parse fine as regular tag
+    // IkeaUnknown2 = 0xffbe, // parse fine as regular tag (custom ECDSA?)
+})(OtaTagId || (exports.OtaTagId = OtaTagId = {}));
+const ZIGBEE_OTA_LATEST_URL = "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index.json";
+const ZIGBEE_OTA_PREVIOUS_URL = "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/index1.json";
+const UPGRADE_END_REQUEST_ID = Zcl.Clusters.genOta.commands.upgradeEndRequest.ID;
+const IMAGE_BLOCK_REQUEST_ID = Zcl.Clusters.genOta.commands.imageBlockRequest.ID;
+const IMAGE_PAGE_REQUEST_ID = Zcl.Clusters.genOta.commands.imagePageRequest.ID;
+/** uint32 LE */
+exports.UPGRADE_FILE_IDENTIFIER = 0x0beef11e;
+exports.UPGRADE_FILE_IDENTIFIER_BUF = Buffer.from([0x1e, 0xf1, 0xee, 0x0b]);
+// #region General Utils
+let dataDir;
+let overrideIndexLocation;
+/**
+ * Set the dataDir for relative path needs (firmware file, index) as well as override index if any.
+ */
+function setOtaConfiguration(inDataDir, inOverrideIndexLocation) {
+    dataDir = inDataDir;
+    // If the file name is not a full path, then treat it as a relative to the data directory
+    overrideIndexLocation =
+        inOverrideIndexLocation && !isValidUrl(inOverrideIndexLocation) && !node_path_1.default.isAbsolute(inOverrideIndexLocation)
+            ? node_path_1.default.join(dataDir, inOverrideIndexLocation)
+            : inOverrideIndexLocation;
+}
+function isValidUrl(url) {
+    try {
+        const parsed = new URL(url);
+        return parsed.protocol === "http:" || parsed.protocol === "https:";
+    }
+    catch {
+        return false;
+    }
+}
+async function getJson(pageUrl) {
+    const response = await fetch(pageUrl);
+    if (!response.ok || !response.body) {
+        throw new Error(`Invalid response from ${pageUrl} status=${response.status}`);
+    }
+    return (await response.json());
+}
+/**
+ * Validates a firmware file and returns the appropriate buffer (without possible manufacturer-specific header)
+ */
+function validateFirmware(fileBuffer, sha512) {
+    const otaIdentifier = fileBuffer.indexOf(exports.UPGRADE_FILE_IDENTIFIER_BUF);
+    (0, node_assert_1.default)(otaIdentifier !== -1, "Not a valid OTA file");
+    if (sha512) {
+        const hash = node_crypto_1.default.createHash("sha512");
+        hash.update(fileBuffer);
+        (0, node_assert_1.default)(hash.digest("hex") === sha512, "File checksum validation failed");
+    }
+    return fileBuffer.subarray(otaIdentifier);
+}
+async function fetchFirmware(url, sha512) {
+    logger_1.logger.debug(() => `Downloading firmware image from '${url}'`, NS);
+    const firmwareFileRsp = await fetch(url);
+    if (!firmwareFileRsp.ok || !firmwareFileRsp.body) {
+        throw new Error(`Invalid response from ${url} status=${firmwareFileRsp.status}`);
+    }
+    const fileBuffer = Buffer.from(await firmwareFileRsp.arrayBuffer());
+    return validateFirmware(fileBuffer, sha512);
+}
+function readFirmware(filePath, sha512) {
+    logger_1.logger.debug(() => `Reading firmware image from '${filePath}'`, NS);
+    if (dataDir && !node_path_1.default.isAbsolute(filePath)) {
+        // If the file name is not a full path, then treat it as a relative to the data directory
+        filePath = node_path_1.default.join(dataDir, filePath);
+    }
+    const fileBuffer = (0, node_fs_1.readFileSync)(filePath);
+    return validateFirmware(fileBuffer, sha512);
+}
+async function getOtaFirmware(url, sha512) {
+    return isValidUrl(url) ? await fetchFirmware(url, sha512) : readFirmware(url, sha512);
+}
+async function getOtaIndexInternal(url) {
+    return isValidUrl(url) ? await getJson(url) : JSON.parse((0, node_fs_1.readFileSync)(url, "utf-8"));
+}
+async function getOtaIndex(source) {
+    let mainIndexUrl;
+    if (source.url) {
+        if (!isValidUrl(source.url) && !node_path_1.default.isAbsolute(source.url)) {
+            if (!dataDir) {
+                throw new Error("Invalid OTA configuration");
+            }
+            mainIndexUrl = node_path_1.default.join(dataDir, source.url);
+        }
+        else {
+            mainIndexUrl = source.url;
+        }
+    }
+    else {
+        mainIndexUrl = source.downgrade ? ZIGBEE_OTA_PREVIOUS_URL : ZIGBEE_OTA_LATEST_URL;
+    }
+    if (overrideIndexLocation) {
+        logger_1.logger.debug(`Loading override index '${overrideIndexLocation}'`, NS);
+        const localIndex = await getOtaIndexInternal(overrideIndexLocation);
+        // Resulting index will have overridden items first
+        const mappedLocalIndex = localIndex.map((meta) => {
+            // Web-hosted images must come with all fields filled already
+            // Nothing to do if needed fields were filled already
+            if (isValidUrl(meta.url) || (meta.imageType !== undefined && meta.manufacturerCode !== undefined && meta.fileVersion !== undefined)) {
+                return meta;
+            }
+            const image = parseOtaImage(readFirmware(meta.url, meta.sha512));
+            meta.imageType = image.header.imageType;
+            meta.manufacturerCode = image.header.manufacturerCode;
+            meta.fileVersion = image.header.fileVersion;
+            return meta;
+        });
+        try {
+            const mainIndex = await getOtaIndexInternal(mainIndexUrl);
+            logger_1.logger.debug("Retrieved main index", NS);
+            return mappedLocalIndex.concat(mainIndex);
+        }
+        catch {
+            logger_1.logger.info("Failed to download main index, only override index is loaded", NS);
+            return mappedLocalIndex;
+        }
+    }
+    return await getOtaIndexInternal(mainIndexUrl);
+}
+// #endregion
+// #region OTA Utils
+function parseOtaHeader(buffer) {
+    const otaUpgradeFileIdentifier = buffer.readUInt32LE(0);
+    (0, node_assert_1.default)(exports.UPGRADE_FILE_IDENTIFIER === otaUpgradeFileIdentifier, "Not a valid OTA file");
+    const otaHeaderVersion = buffer.readUInt16LE(4);
+    const otaHeaderLength = buffer.readUInt16LE(6);
+    const otaHeaderFieldControl = buffer.readUInt16LE(8);
+    const manufacturerCode = buffer.readUInt16LE(10);
+    const imageType = buffer.readUInt16LE(12);
+    const fileVersion = buffer.readUInt32LE(14);
+    const zigbeeStackVersion = buffer.readUInt16LE(18);
+    const otaHeaderString = buffer.toString("utf8", 20, 52);
+    const totalImageSize = buffer.readUInt32LE(52);
+    const header = {
+        otaUpgradeFileIdentifier,
+        otaHeaderVersion,
+        otaHeaderLength,
+        otaHeaderFieldControl,
+        manufacturerCode,
+        imageType,
+        fileVersion,
+        zigbeeStackVersion,
+        otaHeaderString,
+        totalImageSize,
+    };
+    let headerPosition = 56;
+    if (header.otaHeaderFieldControl & 1) {
+        header.securityCredentialVersion = buffer.readUInt8(headerPosition);
+        headerPosition += 1;
+    }
+    if (header.otaHeaderFieldControl & 2) {
+        header.upgradeFileDestination = buffer.subarray(headerPosition, headerPosition + 8);
+        headerPosition += 8;
+    }
+    if (header.otaHeaderFieldControl & 4) {
+        header.minimumHardwareVersion = buffer.readUInt16LE(headerPosition);
+        headerPosition += 2;
+        header.maximumHardwareVersion = buffer.readUInt16LE(headerPosition);
+        headerPosition += 2;
+    }
+    return header;
+}
+function parseOtaSubElement(buffer, position) {
+    const tagId = buffer.readUInt16LE(position);
+    const length = buffer.readUInt32LE(position + 2);
+    // this is fine for now, no known other uses of this tag
+    if (tagId === OtaTagId.TelinkAES) {
+        // OTA_FLAG_IMAGE_ELEM_INFO1 (1-byte) + OTA_FLAG_IMAGE_ELEM_INFO2 (1-byte)
+        //   buffer.subarray(position + 6, position + 8);
+        const data = buffer.subarray(position + 8, position + 8 + length);
+        return [{ tagId, length, data }, 8];
+    }
+    const data = buffer.subarray(position + 6, position + 6 + length);
+    return [{ tagId, length, data }, 6];
+}
+function parseOtaImage(buffer) {
+    const header = parseOtaHeader(buffer);
+    const raw = buffer.subarray(0, header.totalImageSize);
+    let position = header.otaHeaderLength;
+    const elements = [];
+    while (position < header.totalImageSize) {
+        const [element, metaOffset] = parseOtaSubElement(buffer, position);
+        position += element.data.length + metaOffset;
+        elements.push(element);
+    }
+    (0, node_assert_1.default)(position === header.totalImageSize, "Size mismatch");
+    return { header, elements, raw };
+}
+function buildImageBlockPayload(image, requestPayload, pageOffset, pageSize, baseDataSize) {
+    let dataSize = baseDataSize;
+    if (requestPayload.manufacturerCode === Zcl.ManufacturerCode.INSTA_GMBH ||
+        requestPayload.manufacturerCode === Zcl.ManufacturerCode.DRESDEN_ELEKTRONIK_INGENIEURTECHNIK_GMBH) {
+        // Insta and some Dresden Elektronik devices, OTA only works for data sizes 40 and smaller (= manufacturerCode 4474 [Insta], 4405 [Dresden Elektronik]).
+        dataSize = 40;
+    }
+    if (requestPayload.manufacturerCode === Zcl.ManufacturerCode.LEGRAND_GROUP) {
+        // Legrand devices (newer firmware) require up to 64 bytes (= manufacturerCode 4129), let it drive the size
+        dataSize = requestPayload.maximumDataSize;
+    }
+    if (Number.isFinite(requestPayload.maximumDataSize)) {
+        dataSize = Math.min(dataSize, requestPayload.maximumDataSize);
+    }
+    let start = requestPayload.fileOffset + pageOffset;
+    /* v8 ignore start */
+    if (requestPayload.manufacturerCode === Zcl.ManufacturerCode.LEGRAND_GROUP &&
+        requestPayload.fileOffset === 50 &&
+        requestPayload.maximumDataSize === 12) {
+        // Hack for https://github.com/Koenkk/zigbee-OTA/issues/328 (Legrand OTA not working)
+        logger_1.logger.info("Detected Legrand firmware issue, attempting to reset the OTA stack", NS);
+        // The following vector seems to buffer overflow the device to reset the OTA stack!
+        start = 78;
+        dataSize = 64;
+    }
+    /* v8 ignore stop */
+    if (pageSize) {
+        dataSize = Math.min(dataSize, pageSize - pageOffset);
+    }
+    let end = start + dataSize;
+    if (end > image.raw.length) {
+        end = image.raw.length;
+    }
+    logger_1.logger.debug(() => `Request offsets: fileOffset=${requestPayload.fileOffset} pageOffset=${pageOffset} maximumDataSize=${requestPayload.maximumDataSize}`, NS);
+    logger_1.logger.debug(() => `Payload offsets: start=${start} end=${end} dataSize=${dataSize}`, NS);
+    return {
+        status: Zcl.Status.SUCCESS,
+        manufacturerCode: requestPayload.manufacturerCode,
+        imageType: requestPayload.imageType,
+        fileVersion: requestPayload.fileVersion,
+        fileOffset: start,
+        dataSize: end - start,
+        data: image.raw.subarray(start, end),
+    };
+}
+class OtaSession {
+    ieeeAddr;
+    endpoint;
+    image;
+    onProgress;
+    dataSettings;
+    waitForOtaCommand;
+    #lastBlockResponseTime = 0;
+    #lastProgressUpdate = 0;
+    #startTime;
+    get startTime() {
+        return this.#startTime;
+    }
+    constructor(ieeeAddr, endpoint, image, onProgress, dataSettings, waitForOtaCommand) {
+        this.ieeeAddr = ieeeAddr;
+        this.endpoint = endpoint;
+        this.image = image;
+        this.onProgress = onProgress;
+        this.dataSettings = dataSettings;
+        this.waitForOtaCommand = waitForOtaCommand;
+        this.#startTime = node_perf_hooks_1.performance.now();
+        // TODO: should `dataSettings.requestTimeout` be override if >0?
+        //       to allow easier testing when devices misbehave otherwise potentially overridden by below switch
+        // if (!this.dataSettings.requestTimeout) {
+        switch (image.header.manufacturerCode) {
+            case Zcl.ManufacturerCode.ROBERT_BOSCH_GMBH: {
+                // Bosch transmits the firmware updates in the background in their native implementation.
+                // According to the app, this can take up to 2 days. Therefore, we assume to get at least
+                // one package request per hour from the device here.
+                this.dataSettings.requestTimeout = 60 * 60 * 1000;
+                break;
+            }
+            case Zcl.ManufacturerCode.LEGRAND_GROUP: {
+                // Increase the timeout for Legrand devices, so that they will re-initiate and update themselves
+                // Newer firmwares have awkward behaviours when it comes to the handling of the last bytes of OTA updates
+                this.dataSettings.requestTimeout = 30 * 60 * 1000;
+                break;
+            }
+            case Zcl.ManufacturerCode.SHENZHEN_COOLKIT_TECHNOLOGY_CO_LTD: {
+                if (image.header.imageType === 8199) {
+                    // increase the upgradeEndReq wait time to solve the problem of OTA timeout failure of Sonoff Devices
+                    // (https://github.com/Koenkk/zigbee-herdsman-converters/issues/6657)
+                    this.dataSettings.requestTimeout = 3600000;
+                }
+                break;
+            }
+        }
+        // }
+        if (!this.dataSettings.requestTimeout) {
+            this.dataSettings.requestTimeout = 150000; // ensures never zero
+        }
+        if (!this.dataSettings.baseSize) {
+            this.dataSettings.baseSize = 50; // ensures never zero
+        }
+        // report initial progress with estimated time
+        const expectedBlocks = Math.ceil(image.header.totalImageSize / dataSettings.baseSize);
+        const blocksPerSec = dataSettings.responseDelay > 0 ? Math.round((1000 / dataSettings.responseDelay) * 100) / 100 : 20; // (1000 / 50)
+        const estimatedRemainingSeconds = expectedBlocks / blocksPerSec;
+        onProgress(0, estimatedRemainingSeconds);
+        logger_1.logger.info(() => `OTA update of '${this.ieeeAddr}' estimated at ${estimatedRemainingSeconds} seconds (${expectedBlocks} chunks, ${blocksPerSec} per second)`, NS);
+    }
+    async run() {
+        // can take a long time, use max (int32 - 1), ~24 days
+        const upgradeEndRequest = this.waitForOtaCommand(this.endpoint.ID, UPGRADE_END_REQUEST_ID, undefined, 2147483647);
+        try {
+            for await (const request of this.commandStream(upgradeEndRequest)) {
+                if (request.command.ID === UPGRADE_END_REQUEST_ID) {
+                    return request;
+                }
+                if (request.command.ID === IMAGE_PAGE_REQUEST_ID) {
+                    const pagePayload = request.payload;
+                    let pageOffset = 0;
+                    while (pageOffset < pagePayload.pageSize) {
+                        pageOffset = await this.sendImageBlockResponse(pagePayload, request.header.transactionSequenceNumber, pageOffset, pagePayload.pageSize);
+                    }
+                }
+                else {
+                    await this.sendImageBlockResponse(request.payload, request.header.transactionSequenceNumber, 0, 0);
+                }
+                /* v8 ignore start */
+            }
+            // this code is logically unreachable
+            // the generator always yields `UPGRADE_END_REQUEST_ID` before completing or it will eventually throw a timeout
+            // but TypeScript can't detect this and requires a return statement
+            const endPayload = await upgradeEndRequest.promise;
+            return endPayload;
+            /* v8 ignore stop */
+        }
+        catch (error) {
+            upgradeEndRequest.cancel();
+            const err = error;
+            err.message = `Device ${this.ieeeAddr} did not start/finish firmware download after being notified. (${err.message})`;
+            throw err;
+        }
+    }
+    async *commandStream(upgradeEndRequest) {
+        while (true) {
+            const imageBlockRequest = this.waitForOtaCommand(this.endpoint.ID, IMAGE_BLOCK_REQUEST_ID, undefined, this.dataSettings.requestTimeout);
+            const imagePageRequest = this.waitForOtaCommand(this.endpoint.ID, IMAGE_PAGE_REQUEST_ID, undefined, this.dataSettings.requestTimeout);
+            const dataRequest = Promise.race([imageBlockRequest.promise, imagePageRequest.promise]);
+            const request = await Promise.race([dataRequest, upgradeEndRequest.promise]);
+            imageBlockRequest.cancel();
+            imagePageRequest.cancel();
+            // if this is `UPGRADE_END_REQUEST_ID`, `run()` will return and thus terminate the generator (no endless loop possible)
+            yield request;
+        }
+    }
+    async sendImageBlockResponse(requestPayload, requestTsn, pageOffset, pageSize) {
+        // throttle if needed
+        let callNow = node_perf_hooks_1.performance.now();
+        const timeSinceLast = callNow - this.#lastBlockResponseTime;
+        const delayNeeded = this.dataSettings.responseDelay - timeSinceLast;
+        if (delayNeeded > 0) {
+            await new Promise((resolve) => setTimeout(resolve, delayNeeded));
+            // avoids a second call to `performance.now()`
+            callNow += delayNeeded;
+        }
+        this.#lastBlockResponseTime = callNow;
+        try {
+            const blockPayload = buildImageBlockPayload(this.image, requestPayload, pageOffset, pageSize, this.dataSettings.baseSize);
+            await this.endpoint.commandResponse("genOta", "imageBlockResponse", blockPayload, undefined, requestTsn);
+            const nextOffset = pageOffset + blockPayload.dataSize;
+            const now = node_perf_hooks_1.performance.now();
+            if (now - this.#lastProgressUpdate > 30000) {
+                const totalDurationSeconds = (now - this.#startTime) / 1000;
+                const bytesPerSecond = requestPayload.fileOffset / totalDurationSeconds;
+                // first 30 seconds will be ignored due to first fileOffset being 0
+                // remain on ctor progress estimate until then (more reliable)
+                if (bytesPerSecond > 0) {
+                    const percentage = Math.round((requestPayload.fileOffset / this.image.header.totalImageSize) * 10000) / 100;
+                    const remainingSeconds = Math.round((this.image.header.totalImageSize - requestPayload.fileOffset) / bytesPerSecond);
+                    logger_1.logger.info(() => `OTA update of '${this.ieeeAddr}' at ${percentage}%, ${remainingSeconds} seconds remaining`, NS);
+                    this.onProgress(percentage, remainingSeconds);
+                }
+                this.#lastProgressUpdate = now;
+            }
+            return nextOffset;
+        }
+        catch (error) {
+            logger_1.logger.debug(() => `Image block response failed for ${this.ieeeAddr}: ${error.message}`, NS);
+            return pageOffset;
+        }
+    }
+}
+exports.OtaSession = OtaSession;
+//# sourceMappingURL=ota.js.map

package/dist/controller/helpers/ota.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ota.js","sourceRoot":"","sources":["../../../src/controller/helpers/ota.ts"],"names":[],"mappings":"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"}

package/dist/controller/helpers/request.d.ts

@@ -0,0 +1,22 @@
+import type * as Zcl from "../../zspec/zcl";
+import type { SendPolicy } from "../tstype";
+export declare class Request<Type = any> {
+    static defaultSendPolicy: {
+        [key: number]: SendPolicy;
+    };
+    private func;
+    frame: Zcl.Frame;
+    expires: number;
+    sendPolicy: SendPolicy | undefined;
+    private resolveQueue;
+    private rejectQueue;
+    private lastError;
+    constructor(func: () => Promise<Type>, frame: Zcl.Frame, timeout: number, sendPolicy?: SendPolicy, lastError?: Error, resolve?: (value: Type) => void, reject?: (error: Error) => void);
+    moveCallbacks(from: Request<Type>): void;
+    addCallbacks(resolve: (value: Type) => void, reject: (error: Error) => void): void;
+    reject(error?: Error): void;
+    resolve(value: Type): void;
+    send(): Promise<Type>;
+}
+export default Request;
+//# sourceMappingURL=request.d.ts.map

package/dist/controller/helpers/request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAG1C,qBAAa,OAAO,CAAC,IAAI,GAAG,GAAG;IAC3B,MAAM,CAAC,iBAAiB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAC,CAwBnD;IAEF,OAAO,CAAC,IAAI,CAAsB;IAClC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,SAAS,CAAQ;gBAGrB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACzB,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,UAAU,EACvB,SAAS,CAAC,EAAE,KAAK,EACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAC/B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAWnC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAOxC,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAKlF,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAO3B,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI;IAOpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAU9B;AAED,eAAe,OAAO,CAAC"}