changed from filter to find since mdns answers are single

ExpressLRS · May 20, 2022 · d6a364e · d6a364e
1 parent ce7c3c1
commit d6a364e
Showing 1 changed file with 42 additions and 47 deletions.
diff --git a/src/api/src/services/MulticastDns/index.ts b/src/api/src/services/MulticastDns/index.ts
@@ -119,22 +119,20 @@ export default class MulticastDnsService {
   private handleMulticastDnsResponse(response: ResponsePacket) {
     const items = [...response.answers, ...response.additionals];
 
-    // check if any of the answers on the response have a name that starts with
-    // 'elrs_', which indicates that it is an elers device
-    const txtResponses: TxtAnswer[] = items.filter(
+    const txtResponse: TxtAnswer = items.find(
       (answer) => answer.type === 'TXT'
-    ) as TxtAnswer[];
+    ) as TxtAnswer;
 
-    txtResponses.forEach((item) => {
+    if (txtResponse) {
       let options: UserDefine[] = [];
       let version = '';
       let target = '';
       let type = '';
       let vendor = '';
       let deviceName = '';
 
-      if (Array.isArray(item.data)) {
-        item.data.forEach((i) => {
+      if (Array.isArray(txtResponse.data)) {
+        txtResponse.data.forEach((i) => {
           if (i instanceof Buffer) {
             const dataItem = i.toString('utf-8');
             const delimPos = dataItem.indexOf('=');
@@ -168,57 +166,54 @@ export default class MulticastDnsService {
       }
 
       if (vendor === 'elrs') {
-        const name = item.name?.substring(0, item.name.indexOf('.'));
+        const name = txtResponse.name?.substring(
+          0,
+          txtResponse.name.indexOf('.')
+        );
 
-        const srvResponses: SrvAnswer[] = items.filter(
+        const srvResponse: SrvAnswer = items.find(
           (answer) => answer.type === 'SRV'
-        ) as SrvAnswer[];
-
-        const srvResponse: SrvAnswer | undefined = srvResponses.find((i) => {
-          return i.name.startsWith(name);
-        });
+        ) as SrvAnswer;
 
         if (srvResponse) {
           const dns: string = srvResponse.data?.target;
           const port: number = srvResponse.data?.port;
 
-          if (srvResponse) {
-            const aResponse: StringAnswer | undefined = items.find(
-              (answer) =>
-                answer.type === 'A' && answer.name === srvResponse.data.target
-            ) as StringAnswer;
-
-            if (aResponse) {
-              const ip: string = aResponse.data;
-
-              const mdnsInformation: MulticastDnsInformation = {
-                name,
-                dns,
-                ip,
-                options,
-                version,
-                target,
-                type,
-                vendor,
-                port,
-                deviceName,
-              };
-
-              if (!this.devices[name]) {
-                this.devices[name] = mdnsInformation;
-                this.notifications.sendDeviceAdded(mdnsInformation);
-              } else if (
-                JSON.stringify(this.devices[name]) !==
-                JSON.stringify(mdnsInformation)
-              ) {
-                this.devices[name] = mdnsInformation;
-                this.notifications.sendDeviceUpdated(mdnsInformation);
-              }
+          const aResponse: StringAnswer = items.find(
+            (answer) =>
+              answer.type === 'A' && answer.name === srvResponse.data.target
+          ) as StringAnswer;
+
+          if (aResponse) {
+            const ip: string = aResponse.data;
+
+            const mdnsInformation: MulticastDnsInformation = {
+              name,
+              dns,
+              ip,
+              options,
+              version,
+              target,
+              type,
+              vendor,
+              port,
+              deviceName,
+            };
+
+            if (!this.devices[name]) {
+              this.devices[name] = mdnsInformation;
+              this.notifications.sendDeviceAdded(mdnsInformation);
+            } else if (
+              JSON.stringify(this.devices[name]) !==
+              JSON.stringify(mdnsInformation)
+            ) {
+              this.devices[name] = mdnsInformation;
+              this.notifications.sendDeviceUpdated(mdnsInformation);
             }
           }
         }
       }
-    });
+    }
   }
 
   private removeDevice(name: string) {