Merge branch 'main' of git.ssh.surf:snxraven/LinkUp-P2P-Chat

chatBot/bot.js

@@ -57,14 +57,14 @@ loadCommands().then(commands => {
         commandHandler.handler(bot, args, message);
       }
     }
-  })
-  bot.joinChatRoom();
+  });
 
-  // Wait for 2 seconds for the bot to connect
-  setTimeout(() => {
-    // Send a message
+  bot.on('onBotJoinRoom', () => {
+    console.log("Bot is ready!");
     bot.sendMessage(process.env.ON_READY_MESSAGE);
-  }, 2000); // Adjust the delay as necessary
+  });
+
+  bot.joinChatRoom();
 }).catch(error => {
   console.error('Error loading commands:', error);
 });

chatBot/includes/client.js

@@ -4,6 +4,9 @@ import EventEmitter from 'node:events'
 class Client extends EventEmitter {
   constructor(chatRoomID, botName) {
     super();
+
+    if(!chatRoomID || !botName) return console.error("ChatRoomID or BotName is not defined!");
+
     this.topicBuffer = Buffer.from(chatRoomID, 'hex');
     this.botName = botName;
     this.swarm = new Hyperswarm();
@@ -12,8 +15,11 @@ class Client extends EventEmitter {
 
   setupSwarm() {
     this.swarm.on('connection', (peer) => {
-      peer.on('data', message => this.emit("onMessage", peer, JSON.parse(message.toString())));
-      peer.on('error', e => console.log(`Connection error: ${e}`));
+      peer.on('data', message => this.emit('onMessage', peer, JSON.parse(message.toString())));
+      peer.on('error', e => {
+        this.emit('onError', e);
+        console.error(`Connection error: ${e}`)
+      });
     });
 
     this.swarm.on('update', () => {
@@ -25,6 +31,7 @@ class Client extends EventEmitter {
     this.discovery = this.swarm.join(this.topicBuffer, {client: true, server: true});
     this.discovery.flushed().then(() => {
       console.log(`Bot ${this.botName} joined the chat room.`);
+      this.emit('onBotJoinRoom');
     });
   }