fix: channel database no longer shadows device channels with same PSK (#2415)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Yeraze

src/server/meshtasticManager.ts

@@ -3906,8 +3906,22 @@ class MeshtasticManager {
         if (isDirectMessage) {
           channelIndex = -1;
         } else if (context?.decryptedBy === 'server' && context?.decryptedChannelId !== undefined) {
-          // Use Channel Database ID + offset for server-decrypted messages
-          channelIndex = CHANNEL_DB_OFFSET + context.decryptedChannelId;
+          // Check if the database channel's PSK matches a device channel — if so, prefer the device channel
+          // This prevents database channels from "shadowing" device channels with the same key (#2375, #2413)
+          const dbChannel = await databaseService.channelDatabase.getByIdAsync(context.decryptedChannelId);
+          const deviceChannels = await databaseService.channels.getAllChannels();
+          const matchingDeviceChannel = dbChannel?.psk
+            ? deviceChannels.find(dc => dc.psk === dbChannel.psk && dc.role !== 0)
+            : null;
+
+          if (matchingDeviceChannel) {
+            // Device channel has the same PSK — use device channel slot instead of database channel
+            channelIndex = matchingDeviceChannel.id;
+            logger.debug(`📡 Server-decrypted message matches device channel ${matchingDeviceChannel.id} ("${matchingDeviceChannel.name}") — using device channel instead of database channel`);
+          } else {
+            // No matching device channel — use Channel Database ID + offset
+            channelIndex = CHANNEL_DB_OFFSET + context.decryptedChannelId;
+          }
         } else {
           channelIndex = meshPacket.channel !== undefined ? meshPacket.channel : 0;
         }
@@ -3974,22 +3988,39 @@ class MeshtasticManager {
             logger.debug(`💾 Saved channel message from ${message.fromNodeId} on channel ${channelIndex}: "${messageText.substring(0, 30)}..." (replyId: ${message.replyId})`);
           }
 
-          // Dual-channel insertion: if server-decrypted and the packet has a radio channel,
-          // also insert a copy in the radio channel so both views show the message (#2375)
-          if (!isDirectMessage && context?.decryptedBy === 'server' && meshPacket.channel !== undefined) {
-            const radioChannelIndex = meshPacket.channel;
-            const radioChannel = await databaseService.channels.getChannelById(radioChannelIndex);
-            if (radioChannel) {
-              const radioCopy: TextMessage = {
+          // Dual-channel insertion for server-decrypted messages (#2375, #2413)
+          // Messages should appear in BOTH the device channel and database channel views
+          if (!isDirectMessage && context?.decryptedBy === 'server' && context?.decryptedChannelId !== undefined) {
+            if (channelIndex < CHANNEL_DB_OFFSET) {
+              // Primary went to device channel — also insert into database channel
+              const dbChannelIndex = CHANNEL_DB_OFFSET + context.decryptedChannelId;
+              const dbCopy: TextMessage = {
                 ...message,
-                id: `${message.id}_radio`,
-                channel: radioChannelIndex,
+                id: `${message.id}_dbchan`,
+                channel: dbChannelIndex,
                 decryptedBy: 'server',
               };
-              const radioInserted = await databaseService.messages.insertMessage(radioCopy);
-              if (radioInserted) {
-                dataEventEmitter.emitNewMessage(radioCopy as any);
-                logger.debug(`💾 Also saved to radio channel ${radioChannelIndex} ("${radioChannel.name}")`);
+              const dbInserted = await databaseService.messages.insertMessage(dbCopy);
+              if (dbInserted) {
+                dataEventEmitter.emitNewMessage(dbCopy as any);
+                logger.debug(`💾 Also saved to database channel ${dbChannelIndex}`);
+              }
+            } else if (meshPacket.channel !== undefined) {
+              // Primary went to database channel — also insert into radio channel if it exists
+              const radioChannelIndex = meshPacket.channel;
+              const radioChannel = await databaseService.channels.getChannelById(radioChannelIndex);
+              if (radioChannel) {
+                const radioCopy: TextMessage = {
+                  ...message,
+                  id: `${message.id}_radio`,
+                  channel: radioChannelIndex,
+                  decryptedBy: 'server',
+                };
+                const radioInserted = await databaseService.messages.insertMessage(radioCopy);
+                if (radioInserted) {
+                  dataEventEmitter.emitNewMessage(radioCopy as any);
+                  logger.debug(`💾 Also saved to radio channel ${radioChannelIndex} ("${radioChannel.name}")`);
+                }
               }
             }
           }