github/zigbee-OTA
2
0
Fork 0
mirror of https://github.com/Koenkk/zigbee-OTA.git synced 2026-06-24 14:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: aqara/lumi enforce modelId meta (#986)

Browse Source 
Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
This commit is contained in:
Nerivec
2025-12-30 14:38:12 +01:00
committed by GitHub
parent b705265a74
commit ee8505577c
8 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ghw_process_ota_files.ts
View File

@@ -22,6 +22,7 @@ import type {ExtraMetas, GHExtraMetas, RepoImageMeta} from "./types.js";
const GLEDOPTO_MANUFACTURER_CODE = 4687;
const TUYA_MANUFACTURER_CODE_1 = 4098;
const TUYA_MANUFACTURER_CODE_2 = 4417;
const LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN = 4447;
const EXTRA_METAS_PR_BODY_START_TAG = "```json";
const EXTRA_METAS_PR_BODY_END_TAG = "```";
@@ -149,21 +150,33 @@ export async function processOtaFiles(
const statusToBase = getParsedImageStatus(parsedImage, baseMatch);
// Manufacturer specific checks
if (
parsedImage.manufacturerCode === GLEDOPTO_MANUFACTURER_CODE &&
!fileExtraMetas.modelId &&
(fileExtraMetas.manufacturerName == null || fileExtraMetas.manufacturerName.some((name) => name.toLowerCase().includes("gledopto")))
) {
// Gledopto uses the same imageType for every device, force modelId to be present.
// https://github.com/Koenkk/zigbee-OTA/pull/864
throw new Error("Gledopto image requires extra `modelId` metadata");
}
if (
(TUYA_MANUFACTURER_CODE_1 === parsedImage.manufacturerCode || TUYA_MANUFACTURER_CODE_2 === parsedImage.manufacturerCode) &&
!fileExtraMetas.manufacturerName
) {
// Tuya uses the same imageType for every device, force manufacturerName to be present.
throw new Error("Tuya image requires extra `manufacturerName` metadata");
switch (parsedImage.manufacturerCode) {
case GLEDOPTO_MANUFACTURER_CODE: {
if (
!fileExtraMetas.modelId &&
(fileExtraMetas.manufacturerName == null ||
fileExtraMetas.manufacturerName.some((name) => name.toLowerCase().includes("gledopto")))
) {
// Gledopto uses the same imageType for every device, force modelId to be present.
// https://github.com/Koenkk/zigbee-OTA/pull/864
throw new Error("Gledopto image requires extra `modelId` metadata");
}
break;
}
case TUYA_MANUFACTURER_CODE_1:
case TUYA_MANUFACTURER_CODE_2: {
if (!fileExtraMetas.manufacturerName) {
// Tuya uses the same imageType for every device, force manufacturerName to be present.
throw new Error("Tuya image requires extra `manufacturerName` metadata");
}
break;
}
case LUMI_UNITED_TECHOLOGY_LTD_SHENZHEN: {
if (!fileExtraMetas.modelId) {
throw new Error("Lumi/Aqara image requires extra `modelId` metadata");
}
break;
}
}
switch (statusToBase) {