Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Default owners for everything
* @446564
* @MrAlders0n


# EXAMPLE Specific ownership by directory
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -570,4 +570,8 @@ The initial analytics archive migration includes unknown-type activity. Existing
development previews that used the earlier draft require a separate operator repair;
radio samples already discarded for those legacy rows cannot be recovered.

Saved-route evidence: see [the operator guide](https://github.com/MeshCore-Beacon/beacon-docs/blob/main/app_documentation/saved-route-evidence.md).
### Saved-route evidence

`GET /api/v1/routes/{iata}/{pathKey}/observations` returns retained observations that match a saved
route's full path bytes, hash size and hop count within its IATA. `range` defaults to `24h` (max `720h`),
`limit` to 50 (max 200); page with `nextPageCursor` → `pageCursor`. Evidence expires with raw packets.
2 changes: 0 additions & 2 deletions db/sqlc/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions db/sqlc/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 23 additions & 5 deletions internal/ingest/packet.go
Original file line number Diff line number Diff line change
Expand Up @@ -730,11 +730,7 @@ func (w *Worker) handlePacket(ctx context.Context, iata, pubkeyHex string, raw [
w.log.Error(fmt.Sprintf("db: upsert packet failed from %s/%s", iata, pubkeyHex), "error", err)
return
}
// Prefer an explicit RFC3339 offset; legacy timezone-less observers use UTC.
heardAt, err := time.Parse(time.RFC3339Nano, envelope.Timestamp)
if err != nil {
heardAt, err = time.Parse("2006-01-02T15:04:05", envelope.Timestamp)
}
heardAt, err := parseHeardAt(envelope.Timestamp)
if err != nil {
w.log.Warn(fmt.Sprintf("failed to parse timestamp %q", envelope.Timestamp), "error", err)
heardAt = time.Now().UTC()
Expand Down Expand Up @@ -959,3 +955,25 @@ func computeTransportCode(key []byte, payloadType uint8, payload []byte) uint16
}
return code
}

// heardAtLayouts lists offset forms first; timezone-less observers are read as UTC.
// Fractional seconds are optional in every layout.
var heardAtLayouts = []string{
time.RFC3339Nano,
"2006-01-02 15:04:05.999999999Z07:00",
"2006-01-02T15:04:05.999999999Z0700",
"2006-01-02 15:04:05.999999999Z0700",
"2006-01-02T15:04:05",
"2006-01-02 15:04:05",
}

func parseHeardAt(s string) (time.Time, error) {
var err error
for _, layout := range heardAtLayouts {
var t time.Time
if t, err = time.Parse(layout, s); err == nil {
return t, nil
}
}
return time.Time{}, err
}
36 changes: 28 additions & 8 deletions internal/ingest/timestamp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,36 @@ func TestPacketTimestampFormatsAndSkew(t *testing.T) {
}
for _, precision := range []time.Duration{time.Second, time.Microsecond, time.Nanosecond} {
expected := want.Truncate(precision)
stamp := expected.Format("2006-01-02T15:04:05.999999999")
if got := capture(t, stamp); !got.Equal(expected) {
t.Fatalf("timezone-less UTC changed: got %s want %s", got, expected)
for _, layout := range []string{"2006-01-02T15:04:05.999999999", "2006-01-02 15:04:05.999999999"} {
stamp := expected.Format(layout)
t.Run("naive "+stamp, func(t *testing.T) {
if got := capture(t, stamp); !got.Equal(expected) {
t.Fatalf("timezone-less UTC changed: got %s want %s", got, expected)
}
})
}
}
west := time.FixedZone("west", -4*60*60)
for _, layout := range []string{
"2006-01-02 15:04:05.999999-07:00", // Python str(datetime)
"2006-01-02T15:04:05.999-0700",
"2006-01-02 15:04:05-0700",
} {
stamp := want.Truncate(time.Microsecond).In(west).Format(layout)
expected, _ := time.Parse(layout, stamp)
t.Run(stamp, func(t *testing.T) {
if got := capture(t, stamp); !got.Equal(expected) {
t.Fatalf("reported time changed: got %s want %s", got, expected)
}
})
}
for _, stamp := range []string{"", "invalid", "2026-09-29T25:00:00+00:00", time.Now().Add(31 * time.Minute).Format(time.RFC3339), time.Now().Add(-31 * time.Minute).Format(time.RFC3339)} {
before := time.Now().UTC()
got := capture(t, stamp)
if got.Before(before) || got.After(time.Now().UTC()) {
t.Fatalf("invalid/skewed time escaped server-time guard: %s => %s", stamp, got)
}
t.Run("guard "+stamp, func(t *testing.T) {
before := time.Now().UTC()
got := capture(t, stamp)
if got.Before(before) || got.After(time.Now().UTC()) {
t.Fatalf("invalid/skewed time escaped server-time guard: %s => %s", stamp, got)
}
})
}
}
Loading