Skip to content

Colors: Absturz beheben, wenn eine Verbraucher-Nachricht vor der Hierarchie-Nachricht ankommt #4296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seaspotter wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Colors: Absturz beheben, wenn eine Verbraucher-Nachricht vor der Hierarchie-Nachricht ankommt #4296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2847b9d
Colors: fix crash when a consumer message arrives before the hierarch…
seaspotter Nov 10, 2026
076405f
Colors: buffer consumer messages that arrive before the hierarchy ins…
seaspotter Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import {
processVehicleTemplateMessages,
} from '@/components/chargePointList/processMessages'
import { processSmarthomeMessages } from '@/components/smartHome/processMessages'
import { processConsumerMessages } from '@/components/consumerList/processMessages'
import {
processConsumerMessages,
registerConsumerFromHierarchy,
} from '@/components/consumerList/processMessages'
import {
addCounter,
counters,
Expand All @@ -33,7 +36,7 @@ import {
import { mqttClientId } from './mqttClient'
import { add } from '@/components/mqttViewer/model'
import { globalConfig } from './themeConfig'
import { addConsumer, consumers } from '@/components/consumerList/model'
import { consumers } from '@/components/consumerList/model'

const topicsToSubscribe = [
'openWB/counter/#',
Expand Down Expand Up @@ -183,7 +186,7 @@ function processHierarchy(hierarchy: Hierarchy) {
addPvSystem(hierarchy.id)
break
case 'consumer':
addConsumer(hierarchy.id)
registerConsumerFromHierarchy(hierarchy.id)
break
default:
// console.warn('Ignored Hierarchy type: ' + hierarchy.type)
Expand Down
23 changes: 22 additions & 1 deletion packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ export function processConsumerMessages(topic: string, message: string) {
}
}

// device messages for a consumer id not yet created by the hierarchy are buffered here and
// replayed once registerConsumerFromHierarchy creates it, instead of being dropped or creating
// a consumer that may not actually be in the current hierarchy (eg. a stale retained topic)
const pendingMessages = new Map<number, { topic: string; message: string }[]>()

// called from hierarchy processing - the only place a consumer may be created, so its color
// (assigned from consumers.size at creation) stays consistent with the hierarchy order
export function registerConsumerFromHierarchy(index: number, showInList = true) {
addConsumer(index, showInList)
const pending = pendingMessages.get(index)
if (pending) {
pendingMessages.delete(index)
pending.forEach(({ topic, message }) =>
processConsumerDeviceMessages(topic, message),
)
}
}

// Consumers device messages
function processConsumerDeviceMessages(topic: string, message: string) {
const index = getIndex(topic)
Expand All @@ -19,7 +37,10 @@ function processConsumerDeviceMessages(topic: string, message: string) {
return
}
if (!consumers.has(index)) {
console.warn('Invalid consumer id received: ' + index)
const pending = pendingMessages.get(index) ?? []
pending.push({ topic, message })
pendingMessages.set(index, pending)
return
}
const dev = consumers.get(index)!
if (topic.match(/^openWB\/consumer\/[0-9]+\/get\/power$/i)) {
Expand Down
Loading