fix: limit general topics with feed ids

HSLdevcom · Nov 22, 2023 · d57e43d · d57e43d
1 parent 4aa4ac6
commit d57e43d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/app/util/mqttClient.js b/app/util/mqttClient.js
@@ -135,7 +135,14 @@ export function changeTopics(settings, actionContext) {
 
 export function startMqttClient(settings, actionContext) {
   const options = settings.options || [{}];
-  const topics = options.map(option => getTopic(option, settings));
+  let topics = options.map(option => getTopic(option, settings));
+  // If a general topic is returned, at least limit it to instances feed ids
+  if (topics[0] === '/gtfsrt/vp/+/+/+/+/+/+/+/+/+/+/+/+/+/+/+/#') {
+    const { feedIds } = actionContext.config;
+    topics = feedIds.map(
+      feedId => `/gtfsrt/vp/${feedId}/+/+/+/+/+/+/+/+/+/+/+/+/+/+/#`,
+    );
+  }
 
   return import(/* webpackChunkName: "mqtt" */ 'mqtt').then(mqtt => {
     if (settings.gtfsrt) {