mirror of
https://github.com/brianshea2/meshmap.net.git
synced 2025-03-05 21:00:01 -08:00
show channel name from mqtt topic
This commit is contained in:
parent
0c24138070
commit
b08beabc6b
|
@ -251,18 +251,32 @@
|
||||||
}
|
}
|
||||||
</tbody></table>
|
</tbody></table>
|
||||||
<table><thead>
|
<table><thead>
|
||||||
<tr><th>Last seen</th><th>via</th><th>on root topic</th></tr>
|
<tr><th>Last seen</th><th>via</th><th>root topic</th><th>channel</th></tr>
|
||||||
</thead><tbody>
|
</thead><tbody>
|
||||||
${Object.entries(seenBy).sort((a, b) => b[1] - a[1]).map(([topic, seen]) => `
|
${Object.entries(seenBy).sort((a, b) => b[1] - a[1]).map(([topic, seen]) => {
|
||||||
|
const captures = topic.match(/^(.*)(?:\/2\/e\/(.*)\/(![0-9a-f]+)|\/2\/map\/)$/)
|
||||||
|
let reporter
|
||||||
|
if (!captures[3]) {
|
||||||
|
reporter = 'map report'
|
||||||
|
} else if (captures[3] === id) {
|
||||||
|
reporter = 'self'
|
||||||
|
} else {
|
||||||
|
reporter = parseInt(captures[3].slice(1), 16)
|
||||||
|
if (data[reporter]) {
|
||||||
|
reporter = nodeLink(reporter, captures[3])
|
||||||
|
} else {
|
||||||
|
reporter = captures[3]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return `
|
||||||
<tr>
|
<tr>
|
||||||
<td>${since(seen)}</td>
|
<td>${since(seen)}</td>
|
||||||
<td>${topic.endsWith('/2/map/') ? 'map report' : topic.endsWith(`/${id}`) ? 'self' : topic.replace(/^.*\/(![0-9a-f]+)$/, (_, reporterId) => {
|
<td>${reporter}</td>
|
||||||
const reporterNum = Number(`0x${reporterId.slice(1)}`)
|
<td class="break">${html(captures[1])}</td>
|
||||||
return data[reporterNum] ? nodeLink(reporterNum, reporterId) : reporterId
|
<td class="break">${html(captures[2] ?? '')}</td>
|
||||||
})}</td>
|
|
||||||
<td class="break">${html(topic.replace(/\/2\/e\/[^\/]+\/[^\/]+$|\/2\/map\/$/, ''))}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
`).join('')}
|
`
|
||||||
|
}).join('')}
|
||||||
</tbody></table>
|
</tbody></table>
|
||||||
`
|
`
|
||||||
const populateDetailsLayer = () => {
|
const populateDetailsLayer = () => {
|
||||||
|
|
Loading…
Reference in a new issue