[Remove MalformedReply] fixup! core: frontend: Adapt to the new Zenoh API

Author: joaoantoniocardoso

core/frontend/src/components/cloud/CloudTrayMenu.vue

@@ -458,17 +458,13 @@ export default Vue.extend({
 
         let reply = await receiveQueryReply(receiver)
         while (reply !== RecvErr.Disconnected) {
-          if (reply === RecvErr.MalformedReply) {
-            console.warn(`[CloudTrayMenu] Malformed reply while querying ${topic}.`)
-          } else {
-            const response = reply.result()
-            if (response instanceof Sample) {
-              const payload = response.payload().toString()
-              return this.parseFileSyncQueue(payload)
-            }
-            const errorResponse: ReplyError = response
-            console.warn(`[CloudTrayMenu] Query error for ${topic}:`, errorResponse.payload().toString())
+          const response = reply.result()
+          if (response instanceof Sample) {
+            const payload = response.payload().toString()
+            return this.parseFileSyncQueue(payload)
           }
+          const errorResponse: ReplyError = response
+          console.warn(`[CloudTrayMenu] Query error for ${topic}:`, errorResponse.payload().toString())
 
           reply = await receiveQueryReply(receiver)
         }

core/frontend/src/components/zenoh-inspector/ZenohNetwork.vue

@@ -308,69 +308,65 @@ export default Vue.extend({
         let responseCount = 0
 
         while (reply !== RecvErr.Disconnected && responseCount < 10) { // Limit responses to prevent infinite loops
-          if (reply === RecvErr.MalformedReply) {
-            console.warn('[Zenoh Network] MalformedReply from router query')
-          } else {
-            const resp = reply.result()
-            if (resp instanceof Sample) {
-              const sample: Sample = resp
-              responseCount += 1
-
-              try {
-                const payload = sample.payload().toString()
-                console.debug('[Zenoh Network] Router payload:', payload)
-
-                const data = JSON.parse(payload)
-
-                // Add router node
-                const zid = data.zid || 'unknown-router'
-                const metadata = data.metadata || {}
-                this.networkData.nodes.push({
-                  id: zid,
-                  whatami: 'router',
-                  metadata,
-                })
-
-                // Add connected sessions
-                if (data.sessions && Array.isArray(data.sessions)) {
-                  for (const sess of data.sessions) {
-                    const peer = sess.peer || 'unknown-peer'
-                    const whatami = sess.whatami || 'unknown'
-
-                    let linkProtocols = 'unknown'
-                    try {
-                      if (sess.links && Array.isArray(sess.links)) {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        linkProtocols = sess.links.map((link: any) => {
-                          if (typeof link === 'string') {
-                            return link.split('/')[0]
-                          }
-                          return link.src?.split('/')[0] || 'unknown'
-                        }).join(',')
-                      }
-                    } catch (error) {
-                      console.warn('Error parsing link protocols:', error)
+          const resp = reply.result()
+          if (resp instanceof Sample) {
+            const sample: Sample = resp
+            responseCount += 1
+
+            try {
+              const payload = sample.payload().toString()
+              console.debug('[Zenoh Network] Router payload:', payload)
+
+              const data = JSON.parse(payload)
+
+              // Add router node
+              const zid = data.zid || 'unknown-router'
+              const metadata = data.metadata || {}
+              this.networkData.nodes.push({
+                id: zid,
+                whatami: 'router',
+                metadata,
+              })
+
+              // Add connected sessions
+              if (data.sessions && Array.isArray(data.sessions)) {
+                for (const sess of data.sessions) {
+                  const peer = sess.peer || 'unknown-peer'
+                  const whatami = sess.whatami || 'unknown'
+
+                  let linkProtocols = 'unknown'
+                  try {
+                    if (sess.links && Array.isArray(sess.links)) {
+                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                      linkProtocols = sess.links.map((link: any) => {
+                        if (typeof link === 'string') {
+                          return link.split('/')[0]
+                        }
+                        return link.src?.split('/')[0] || 'unknown'
+                      }).join(',')
                     }
+                  } catch (error) {
+                    console.warn('Error parsing link protocols:', error)
+                  }
 
-                    this.networkData.nodes.push({
-                      id: peer,
-                      whatami,
-                    })
+                  this.networkData.nodes.push({
+                    id: peer,
+                    whatami,
+                  })
 
-                    this.networkData.edges.push({
-                      source: zid,
-                      target: peer,
-                      protocol: linkProtocols,
-                    })
-                  }
+                  this.networkData.edges.push({
+                    source: zid,
+                    target: peer,
+                    protocol: linkProtocols,
+                  })
                 }
-              } catch (parseError) {
-                console.error('[Zenoh Network] Error parsing router response:', parseError)
               }
-            } else {
-              const replyError: ReplyError = resp
-              console.error('[Zenoh Network] Router query error:', replyError.payload().toString())
+            } catch (parseError) {
+              console.error('[Zenoh Network] Error parsing router response:', parseError)
             }
+          } else {
+            const replyError: ReplyError = resp
+            console.error('[Zenoh Network] Router query error:', replyError.payload().toString())
           }
           reply = await receiveQueryReply(receiver)
         }
@@ -393,31 +389,27 @@ export default Vue.extend({
         let responseCount = 0
 
         while (reply !== RecvErr.Disconnected && responseCount < 10) { // Limit responses
-          if (reply === RecvErr.MalformedReply) {
-            console.warn('[Zenoh Network] MalformedReply from peer query')
-          } else {
-            const resp = reply.result()
-            if (resp instanceof Sample) {
-              const sample: Sample = resp
-              responseCount += 1
-
-              try {
-                const payload = sample.payload().toString()
-                const data = JSON.parse(payload)
-                const peerId = data.zid || data.id || 'unknown-peer'
-                if (!this.networkData.nodes.find((n) => n.id === peerId)) {
-                  this.networkData.nodes.push({
-                    id: peerId,
-                    whatami: 'peer',
-                  })
-                }
-              } catch (parseError) {
-                console.error('[Zenoh Network] Error parsing peer response:', parseError)
+          const resp = reply.result()
+          if (resp instanceof Sample) {
+            const sample: Sample = resp
+            responseCount += 1
+
+            try {
+              const payload = sample.payload().toString()
+              const data = JSON.parse(payload)
+              const peerId = data.zid || data.id || 'unknown-peer'
+              if (!this.networkData.nodes.find((n) => n.id === peerId)) {
+                this.networkData.nodes.push({
+                  id: peerId,
+                  whatami: 'peer',
+                })
               }
-            } else {
-              const replyError: ReplyError = resp
-              console.error('[Zenoh Network] Peer query error:', replyError.payload().toString())
+            } catch (parseError) {
+              console.error('[Zenoh Network] Error parsing peer response:', parseError)
             }
+          } else {
+            const replyError: ReplyError = resp
+            console.error('[Zenoh Network] Peer query error:', replyError.payload().toString())
           }
           reply = await receiveQueryReply(receiver)
         }
@@ -445,11 +437,6 @@ export default Vue.extend({
           return null
         }
 
-        if (reply === RecvErr.MalformedReply) {
-          console.warn(`[Zenoh Network] MalformedReply from ${keyexpr}`)
-          return null
-        }
-
         const resp = reply.result()
         if (resp instanceof Sample) {
           const sample: Sample = resp

core/frontend/src/libs/zenoh/index.ts

@@ -4,7 +4,6 @@ import { ChannelReceiver, Config, QueryTarget, Reply, Sample, Session, Subscribe
 // (and the query has its own timeout), so we just map that rejection to Disconnected.
 export enum RecvErr {
   Disconnected,
-  MalformedReply,
 }
 
 export type Receiver = ChannelReceiver<Reply>