dandri/beacon-server
1
0 Fork 0
mirror of https://github.com/MeshCore-Beacon/beacon-server.git synced 2026-10-22 14:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(neighbors): add zero hop advert neighbors for observers w/ snr

Browse Source
This commit is contained in:
Enot (ded) Skelly committed 2026-06-16 14:47:30 -07:00
1 parent fd24a71143
commit f6f94acad8
2 files changed
+16 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/ingest/packet.go
+1 -1
View File
@@ -760,7 +760,7 @@ func (w *Worker) handlePacket(ctx context.Context, iata, pubkeyHex string, raw [
}
w.runCapabilityDetection(ctx, packet.PayloadType(), packet.PathHashSize(), resolvedIDs)
if inserted {
w.handlePayloadTypeSideEffects(ctx, packet, iata, packetHash[:], radio, scopeID, matchedScope)
w.handlePayloadTypeSideEffects(ctx, packet, iata, packetHash[:], radio, scopeID, matchedScope, pubkeyBytes, float32(parseNumber(envelope.SNR)))
evt := packetObservationEvent{}
evt.PacketHash = hex.EncodeToString(packetHash[:])
evt.Packet.PayloadType = packet.PayloadType()
internal/ingest/side_effects.go
+15 -1
View File
@@ -65,7 +65,7 @@ type nodeUpdateEvent struct {
// new observation is confirmed inserted. Currently handles:
// - PayloadTypeAdvert (0x04): upsert node and node_iatas
// - PayloadTypeGrpTxt (0x05): decrypt and store channel message if key is known
func (w *Worker) handlePayloadTypeSideEffects(ctx context.Context, packet *meshcore.Packet, iata string, packetHash []byte, radio RadioSettings, scopeID *int32, matchedScope *string) {
func (w *Worker) handlePayloadTypeSideEffects(ctx context.Context, packet *meshcore.Packet, iata string, packetHash []byte, radio RadioSettings, scopeID *int32, matchedScope *string, observerPubkey []byte, rxSNR float32) {
if packet.PayloadType() == meshcore.PayloadTypeAdvert {
advert, err := meshcore.AdvertFromBytes(packet.Payload)
if err != nil {
@@ -99,6 +99,7 @@ func (w *Worker) handlePayloadTypeSideEffects(ctx context.Context, packet *meshc
if w.onNodeUpsert != nil {
w.onNodeUpsert(ctx, nodeID)
}
// record advertiser neighbors
// if the advert was forwarded, the first hop is a neighbor
if packet.PathHashCount() > 0 && (advert.Type() == meshcore.AdvertTypeRepeater || advert.Type() == meshcore.AdvertTypeRoom) {
firstHop := packet.PathHashes()
@@ -114,6 +115,19 @@ func (w *Worker) handlePayloadTypeSideEffects(ctx context.Context, packet *meshc
}
}
}
// record observer neighbors
// if heard directly (zero-hop), record the observer's own RX SNR
// of hearing this advertiser as a node_neighbors edge. Skipped if
// the observer has no node row yet (hasn't advertised itself).
if packet.PathHashCount() == 0 && (advert.Type() == meshcore.AdvertTypeRepeater || advert.Type() == meshcore.AdvertTypeRoom) {
observerNodeID, oErr := w.db.GetNodeByPubkey(ctx, observerPubkey)
if oErr == nil && observerNodeID != nodeID {
snr := rxSNR
if err := w.db.UpsertNodeNeighbor(ctx, observerNodeID, nodeID, iata, &snr); err != nil {
log.Printf("ingest[%s]: failed to upsert observer-advert neighbor: %v", w.cfg.BrokerName, err)
}
}
}
if err := w.db.UpsertNodeIATA(ctx, nodeID, iata); err != nil {
log.Printf("ingest[%s]: db: upsert node IATA failed: %v", w.cfg.BrokerName, err)
}