fix: Publish definition source in bridge/devices (#28076)

Nerivec · web-flow · commit 65eef1b6900a · 2025-07-25T19:22:17.000+02:00
diff --git a/lib/extension/bridge.ts b/lib/extension/bridge.ts
@@ -837,6 +837,7 @@ export default class Bridge extends Extension {
         }
 
         const payload: Zigbee2MQTTDevice["definition"] = {
+            source: device.definition.externalConverterName ? "external" : device.definition.generated ? "generated" : "native",
             model: device.definition.model,
             vendor: device.definition.vendor,
             description: device.definition.description,
diff --git a/lib/types/api.ts b/lib/types/api.ts
@@ -220,6 +220,7 @@ export interface Zigbee2MQTTDeviceEndpointConfiguredReporting {
 }
 
 export interface Zigbee2MQTTDeviceDefinition {
+    source: "native" | "generated" | "external";
     model: string;
     vendor: string;
     description: string;
diff --git a/test/extensions/bridge.test.ts b/test/extensions/bridge.test.ts
@@ -368,6 +368,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",
                         exposes: [
                             {
@@ -625,6 +626,7 @@ describe("Extension: Bridge", () => {
                 {
                     date_code: "2019.09",
                     definition: {
+                        source: "native",
                         description: "Hue Go",
                         exposes: [
                             {
@@ -820,6 +822,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "Hue dimmer switch",
                         exposes: [
                             {
@@ -956,6 +959,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "generated",
                         description: "Automatically generated definition",
                         exposes: [
                             {
@@ -1050,6 +1054,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "Wireless mini switch",
                         exposes: [
                             {
@@ -1160,6 +1165,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "Temperature and humidity sensor",
                         exposes: [
                             {
@@ -1302,6 +1308,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "Mi smart plug",
                         exposes: [
                             {
@@ -1449,6 +1456,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "zigfred plus smart in-wall switch",
                         exposes: [
                             {
@@ -1957,6 +1965,7 @@ describe("Extension: Bridge", () => {
                 },
                 {
                     definition: {
+                        source: "native",
                         description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",
                         exposes: [
                             {
@@ -2391,6 +2400,7 @@ describe("Extension: Bridge", () => {
             stringify({
                 data: {
                     definition: {
+                        source: "native",
                         description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",
                         exposes: [
                             {
@@ -2626,6 +2636,7 @@ describe("Extension: Bridge", () => {
             stringify({
                 data: {
                     definition: {
+                        source: "generated",
                         description: "Automatically generated definition",
                         exposes: [
                             {

Original file line number	Diff line number	Diff line change
`@@ -837,6 +837,7 @@ export default class Bridge extends Extension {`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`const payload: Zigbee2MQTTDevice["definition"] = {`
	`840`	`+ source: device.definition.externalConverterName ? "external" : device.definition.generated ? "generated" : "native",`
`840`	`841`	`model: device.definition.model,`
`841`	`842`	`vendor: device.definition.vendor,`
`842`	`843`	`description: device.definition.description,`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ export interface Zigbee2MQTTDeviceEndpointConfiguredReporting {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`export interface Zigbee2MQTTDeviceDefinition {`
	`223`	`+ source: "native" \| "generated" \| "external";`
`223`	`224`	`model: string;`
`224`	`225`	`vendor: string;`
`225`	`226`	`description: string;`
Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,7 @@ describe("Extension: Bridge", () => {`
`368`	`368`	`},`
`369`	`369`	`{`
`370`	`370`	`definition: {`
	`371`	`+ source: "native",`
`371`	`372`	`description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",`
`372`	`373`	`exposes: [`
`373`	`374`	`{`
`@@ -625,6 +626,7 @@ describe("Extension: Bridge", () => {`
`625`	`626`	`{`
`626`	`627`	`date_code: "2019.09",`
`627`	`628`	`definition: {`
	`629`	`+ source: "native",`
`628`	`630`	`description: "Hue Go",`
`629`	`631`	`exposes: [`
`630`	`632`	`{`
`@@ -820,6 +822,7 @@ describe("Extension: Bridge", () => {`
`820`	`822`	`},`
`821`	`823`	`{`
`822`	`824`	`definition: {`
	`825`	`+ source: "native",`
`823`	`826`	`description: "Hue dimmer switch",`
`824`	`827`	`exposes: [`
`825`	`828`	`{`
`@@ -956,6 +959,7 @@ describe("Extension: Bridge", () => {`
`956`	`959`	`},`
`957`	`960`	`{`
`958`	`961`	`definition: {`
	`962`	`+ source: "generated",`
`959`	`963`	`description: "Automatically generated definition",`
`960`	`964`	`exposes: [`
`961`	`965`	`{`
`@@ -1050,6 +1054,7 @@ describe("Extension: Bridge", () => {`
`1050`	`1054`	`},`
`1051`	`1055`	`{`
`1052`	`1056`	`definition: {`
	`1057`	`+ source: "native",`
`1053`	`1058`	`description: "Wireless mini switch",`
`1054`	`1059`	`exposes: [`
`1055`	`1060`	`{`
`@@ -1160,6 +1165,7 @@ describe("Extension: Bridge", () => {`
`1160`	`1165`	`},`
`1161`	`1166`	`{`
`1162`	`1167`	`definition: {`
	`1168`	`+ source: "native",`
`1163`	`1169`	`description: "Temperature and humidity sensor",`
`1164`	`1170`	`exposes: [`
`1165`	`1171`	`{`
`@@ -1302,6 +1308,7 @@ describe("Extension: Bridge", () => {`
`1302`	`1308`	`},`
`1303`	`1309`	`{`
`1304`	`1310`	`definition: {`
	`1311`	`+ source: "native",`
`1305`	`1312`	`description: "Mi smart plug",`
`1306`	`1313`	`exposes: [`
`1307`	`1314`	`{`
`@@ -1449,6 +1456,7 @@ describe("Extension: Bridge", () => {`
`1449`	`1456`	`},`
`1450`	`1457`	`{`
`1451`	`1458`	`definition: {`
	`1459`	`+ source: "native",`
`1452`	`1460`	`description: "zigfred plus smart in-wall switch",`
`1453`	`1461`	`exposes: [`
`1454`	`1462`	`{`
`@@ -1957,6 +1965,7 @@ describe("Extension: Bridge", () => {`
`1957`	`1965`	`},`
`1958`	`1966`	`{`
`1959`	`1967`	`definition: {`
	`1968`	`+ source: "native",`
`1960`	`1969`	`description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",`
`1961`	`1970`	`exposes: [`
`1962`	`1971`	`{`
`@@ -2391,6 +2400,7 @@ describe("Extension: Bridge", () => {`
`2391`	`2400`	`stringify({`
`2392`	`2401`	`data: {`
`2393`	`2402`	`definition: {`
	`2403`	`+ source: "native",`
`2394`	`2404`	`description: "TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm",`
`2395`	`2405`	`exposes: [`
`2396`	`2406`	`{`
`@@ -2626,6 +2636,7 @@ describe("Extension: Bridge", () => {`
`2626`	`2636`	`stringify({`
`2627`	`2637`	`data: {`
`2628`	`2638`	`definition: {`
	`2639`	`+ source: "generated",`
`2629`	`2640`	`description: "Automatically generated definition",`
`2630`	`2641`	`exposes: [`
`2631`	`2642`	`{`