fix(topic): correct topic inference, inital pub of activity

src/handleDiscordReady.ts

@@ -27,15 +27,17 @@ export const createHandleDiscordReady = (
 		printInviteLink(discordClient);
 
 		console.info(`Discord: Logged in as "${discordClient.user.username}".`);
+		const initialActivity = "🏠 Watching the house";
 		discordClient.user.setPresence({
 			activities: [
 				{
-					name: "🏠 Watching the house",
+					name: initialActivity,
 					type: ActivityType.Custom,
 				},
 			],
 			status: "online",
 		});
+		mqttClient.publish(config.mqtt.topics.activity, initialActivity);
 		// If permissions allow, set the nickname to the custom one.
 		setBotNickname(config.bot.nickname, discordClient, config);
 		// Set initial state of the user.

src/handleMqttConnect.ts

@@ -1,5 +1,7 @@
 import { MqttClient } from "mqtt";
 import { type BotConfig } from "./models/BotConfig";
+import { publishDiscoveryMessages } from './publishDiscoveryMessages';
+import type { Client } from 'discord.js';
 
 /**
  * Handles MQTT connection and subscribes to necessary topics. Publishes connected message and discovery messages.
@@ -9,6 +11,7 @@ import { type BotConfig } from "./models/BotConfig";
  */
 export const CreateHandleMqttReady = (
 	mqttClient: MqttClient,
+	discordClient: Client,
 	config: BotConfig,
 ) => {
 	/**
@@ -25,6 +28,8 @@ export const CreateHandleMqttReady = (
 			qos: 1,
 			retain: true,
 		});
+		// Publish discovery messages.
+		publishDiscoveryMessages(mqttClient, discordClient, config)
 	};
 
 	return handleMqttConnect;

src/index.ts

@@ -51,7 +51,7 @@ const discordClient: Client = createDiscordClient();
 const mqttClient: MqttClient = createMqttClient(config);
 
 // Bind handlers to listeners.
-mqttClient.on("connect", CreateHandleMqttReady(mqttClient, config));
+mqttClient.on("connect", CreateHandleMqttReady(mqttClient, discordClient, config));
 mqttClient.on("error", handleMqttError);
 mqttClient.on("close", handleMqttDisconnect);
 mqttClient.on(

src/loadConfig.ts

@@ -20,7 +20,7 @@ export function loadConfig(): BotConfig {
 		},
 		mqtt: {
 			url: process.env["MQTT_URL"] ?? throwEnvironmentError("MQTT_URL"),
-			port: process.env["MQTT_PORT"] ?? throwEnvironmentError("MQTT_PORT"),
+			port: process.env["MQTT_PORT"] ?? '1883',
 			username:
 				process.env["MQTT_USERNAME"] ?? throwEnvironmentError("MQTT_USERNAME"),
 			password:
@@ -29,10 +29,10 @@ export function loadConfig(): BotConfig {
 				process.env["MQTT_CLIENT_ID"] ??
 				throwEnvironmentError("MQTT_CLIENT_ID"),
 			topics: {
+				discovery: process.env['TOPIC_DISCOVERY'] ?? 'homeassistant',
 				bot: botTopic,
 				activity: `${botTopic}/activity`,
 				connected: `${botTopic}/connected`,
-				discovery: `${botTopic}/discovery`,
 				online: `${botTopic}/online`,
 				command: `${botTopic}/command`,
 				voice: `${botTopic}/voice`,