Files
meshcore-analyzer/public/payload-labels.js
T
b74a64ccfa fix(ui): canonical payload label map across packets/live/packet-filter (#1799) (#1804)
## Summary

Replaces the three drifted per-surface payload-type label vocabularies
with a single canonical map keyed by firmware enum name.

Per the locked triage comment on #1799
([comment-4823975431](https://github.com/Kpa-clawbot/CoreScope/issues/1799#issuecomment-4823975431)):

> Create `public/payload-labels.js` exporting `{GRP_DATA: {short:'Group
Data', long:'Group data packet', enumId:6}, ...}`. Migrate `packets.js
typeMap`, `packet-filter.js FW_PAYLOAD_TYPES`, `live.js TYPE_COLORS
legend` to consume it. E2E that scrapes each surface and asserts label
equality.

## Changes

- **`public/payload-labels.js`** (new) — canonical map exposed as
`window.PayloadLabels` and `window.PayloadLabelsApi`. Keys are firmware
enum names; values carry `{short, long, enumId}` plus derived
`SHORT_BY_ID` / `FW_PAYLOAD_TYPES` / `TYPE_ALIASES` for legacy callers.
- **`public/packets.js`** — `TYPE_NAMES` + `typeMap` now read from
`PayloadLabelsApi.SHORT_BY_ID`. Literal kept only as a defensive
fallback for the case where the script tag fails to load.
- **`public/packet-filter.js`** — `FW_PAYLOAD_TYPES` + `TYPE_ALIASES`
now sourced from `PayloadLabelsApi`. Literal fallback retained so `node
test-packet-filter.js` still works headlessly.
- **`public/live.js`** — legend `<li>` rows are now generated from
`window.PayloadLabels` in stable order, killing the third-vocabulary
`Message — Group text` / `Direct — Direct message` drift the #1797
review surfaced.
- **`public/index.html`** — `<script src="payload-labels.js">` loaded
before `roles.js` / `packet-filter.js` / `packets.js`.
- **`test-issue-1799-label-vocab-e2e.js`** (new) — Playwright E2E.
Scrapes `#liveLegend` rows and the `/packets` type-filter checklist,
asserts each label matches `window.PayloadLabels[ENUM].short` for
`TXT_MSG`, `GRP_TXT`, `GRP_DATA`. Also verifies `window.PacketFilter`
still recognises the enum names.
- **`.github/workflows/deploy.yml`** — wired the new E2E into the
existing Playwright block.

## TDD trail

- Red commit `eb392d4` — adds the failing E2E only (asserts
`window.PayloadLabels` exists and labels match; both fail).
- Green commit `44e902a` — introduces the canonical map and migrates the
three surfaces.

## Verification

- `node test-packet-filter.js` — 92/92 pass with the new fallback
wiring.
- Preflight: `bash ~/.openclaw/skills/pr-preflight/scripts/run-all.sh
origin/master` — clean.

Browser verified: E2E `test-issue-1799-label-vocab-e2e.js` exercises
`/live` legend + `/packets` type filter against a Playwright headless
Chromium; CI's Playwright block runs it on every push.

E2E assertion added: `test-issue-1799-label-vocab-e2e.js:139` —
`assert(fromLegend === canon, ...)` and `assert(fromPackets === canon,
...)` per enum.

Fixes #1799

---------

Co-authored-by: mc-bot <bot@corescope>
Co-authored-by: openclaw-bot <bot@openclaw.local>
Co-authored-by: clawbot <clawbot@kpa.com>
Co-authored-by: clawbot <bot@clawbot.local>
2026-06-30 05:48:47 -07:00

164 lines
7.7 KiB
JavaScript

/* payload-labels.js — canonical MeshCore payload-type label map.
*
* Single source of truth for human-readable labels of firmware payload type
* enums. Surfaces that previously hand-rolled their own vocabularies
* (packets.js typeMap, packet-filter.js FW_PAYLOAD_TYPES/TYPE_ALIASES,
* live.js legend) consume this map so the same payload reads identically
* everywhere the operator sees it.
*
* ABBREVIATION POLICY (#1799 PR #1804 r1 item 5):
* - `short` is the compact label that appears in dropdowns, table cells,
* legend titles, badges. Policy is <=12 characters, Title Case, with
* ONE documented exception: 'ACK' (wire-protocol acronym). Abbreviate
* only when the un-abbreviated form would exceed the cap or would be
* ambiguous (e.g. 'Direct Msg' for 'Direct Message'). Apply the same
* contraction rule across all entries — do not mix 'Direct Msg' with
* 'Channel Message'.
* - `long` is the descriptive sentence used in tooltips and legend
* sub-text. It MUST describe the packet's purpose/behaviour, NOT
* echo the short label. Reviewers reject `Path — Path discovery`-
* shaped tautologies.
* - When adding a new enum: pick a short that obeys the policy, then
* write a long that a new operator could read aloud and learn what
* the packet is for.
*
* Keyed by the firmware enum name; values carry:
* enumName — firmware enum name (mirrors the key; #1799 r1 item 9)
* short — compact label used in dropdowns, table cells, legend titles
* long — descriptive label used in tooltips and legend sub-text
* enumId — numeric firmware payload_type value (the wire byte)
*
* Refs #1799.
*/
(function () {
'use strict';
// PAYLOAD_LABELS — every entry carries enumName for shape uniformity with
// BY_ID (#1799 r1 item 9). `long` values are behavioural descriptions
// (PR #1804 r1 item 2 / tufte2). Source for semantics: cmd/server/
// decoder.go + cmd/ingestor/decoder.go + firmware Packet.h enum.
var PAYLOAD_LABELS = {
REQ: { enumName: 'REQ', short: 'Request', long: 'Encrypted data request to a remote node', enumId: 0 },
RESPONSE: { enumName: 'RESPONSE', short: 'Response', long: 'Encrypted data response from a remote node', enumId: 1 },
TXT_MSG: { enumName: 'TXT_MSG', short: 'Direct Msg', long: 'Encrypted point-to-point text message', enumId: 2 },
ACK: { enumName: 'ACK', short: 'ACK', long: 'Acknowledgment of a prior message or request', enumId: 3 },
ADVERT: { enumName: 'ADVERT', short: 'Advert', long: 'Node identity and capability advertisement', enumId: 4 },
GRP_TXT: { enumName: 'GRP_TXT', short: 'Channel Msg', long: 'Channel-scoped group text message', enumId: 5 },
GRP_DATA: { enumName: 'GRP_DATA', short: 'Group Data', long: 'Channel-scoped group datagram (non-text payload)', enumId: 6 },
ANON_REQ: { enumName: 'ANON_REQ', short: 'Anon Req', long: 'Anonymous encrypted request via ephemeral key', enumId: 7 },
PATH: { enumName: 'PATH', short: 'Path', long: 'Network path discovery and return-path advertisement', enumId: 8 },
TRACE: { enumName: 'TRACE', short: 'Trace', long: 'Per-hop route trace with SNR samples', enumId: 9 },
MULTIPART: { enumName: 'MULTIPART', short: 'Multipart', long: 'Fragmented payload reassembled across multiple packets', enumId: 10 },
CONTROL: { enumName: 'CONTROL', short: 'Control', long: 'Mesh control-plane signalling (e.g. zero-hop direct)', enumId: 11 },
RAW_CUSTOM: { enumName: 'RAW_CUSTOM', short: 'Raw Custom', long: 'Application-defined raw payload, no firmware envelope', enumId: 15 }
};
// Legend display order (#1799 r1 item 5) — keeps Advert/GRP_TXT/TXT_MSG up
// top per the historical Live legend layout.
var ORDER = [
'ADVERT', 'GRP_TXT', 'TXT_MSG', 'REQ', 'RESPONSE', 'TRACE', 'PATH',
'ANON_REQ', 'GRP_DATA', 'MULTIPART', 'CONTROL', 'RAW_CUSTOM', 'ACK'
];
// Reverse lookup: numeric enumId → entry. Built from PAYLOAD_LABELS.
// Single `Object.entries` loop pattern across the module (#1799 r1 item 8).
var BY_ID = {};
Object.entries(PAYLOAD_LABELS).forEach(function (kv) {
BY_ID[kv[1].enumId] = kv[1];
});
// Numeric id → firmware enum name. Mirrors what packet-filter.js used to
// hand-roll as FW_PAYLOAD_TYPES.
var FW_PAYLOAD_TYPES = {};
Object.entries(BY_ID).forEach(function (kv) {
FW_PAYLOAD_TYPES[kv[0]] = kv[1].enumName;
});
// Numeric id → short prose label. Replaces packets.js typeMap/TYPE_NAMES.
var SHORT_BY_ID = {};
Object.entries(BY_ID).forEach(function (kv) {
SHORT_BY_ID[kv[0]] = kv[1].short;
});
// User-input alias map (lowercased short label & legacy aliases) → enum.
// Replaces packet-filter.js TYPE_ALIASES while staying backward-compatible
// with the legacy free-text inputs operators have memorised.
//
// NOTE: 'raw custom' is intentionally listed alongside 'raw'/'custom' so
// the documented filter syntax mirrors the rendered short label
// ("Raw Custom"). (#1799 r1 item 11.)
var TYPE_ALIASES = {
'request': 'REQ',
'response': 'RESPONSE',
'direct msg': 'TXT_MSG',
'dm': 'TXT_MSG',
'ack': 'ACK',
'advert': 'ADVERT',
'channel msg': 'GRP_TXT',
'channel': 'GRP_TXT',
'group data': 'GRP_DATA',
'anon req': 'ANON_REQ',
'path': 'PATH',
'trace': 'TRACE',
'multipart': 'MULTIPART',
'control': 'CONTROL',
'raw': 'RAW_CUSTOM',
'custom': 'RAW_CUSTOM',
'raw custom': 'RAW_CUSTOM'
};
// Public namespace (#1799 PR #1804 r1 item 8 / adv4): separate the
// CANONICAL ENUM MAP from the HELPERS/DERIVED collections.
// window.PayloadLabels.enums[ENUM] → entry { enumName, short, long, enumId }
// window.PayloadLabels.api → helpers + derived (SHORT_BY_ID,
// ORDER, TYPE_ALIASES, shortById(), …)
// A future enum named 'BY_ID' or 'ORDER' is now impossible to confuse
// with a helper key.
//
// BACK-COMPAT: every legacy access shape still works because we also
// hang the enums + helpers at the root of the same object — direct
// `PayloadLabels.GRP_TXT.short` and `PayloadLabels.SHORT_BY_ID`
// continue to resolve. Removed in a future cycle.
var api = {
LABELS: PAYLOAD_LABELS,
ORDER: ORDER,
BY_ID: BY_ID,
FW_PAYLOAD_TYPES: FW_PAYLOAD_TYPES,
SHORT_BY_ID: SHORT_BY_ID,
TYPE_ALIASES: TYPE_ALIASES,
shortById: function (id) { return SHORT_BY_ID[id]; },
longById: function (id) { return (BY_ID[id] && BY_ID[id].long) || ''; },
enumNameById: function (id) { return FW_PAYLOAD_TYPES[id]; }
};
var ns = {
enums: PAYLOAD_LABELS,
api: api,
// Legacy root-level helpers — kept for callers that haven't migrated
// to .api yet. Same object references, so a new enum can't shadow
// them at runtime (collisions still possible structurally, but the
// .enums/.api split is the safe path).
LABELS: PAYLOAD_LABELS,
ORDER: ORDER,
BY_ID: BY_ID,
FW_PAYLOAD_TYPES: FW_PAYLOAD_TYPES,
SHORT_BY_ID: SHORT_BY_ID,
TYPE_ALIASES: TYPE_ALIASES,
shortById: api.shortById,
longById: api.longById,
enumNameById: api.enumNameById
};
// Mirror each enum at the root for legacy direct-prop access
// (`window.PayloadLabels.GRP_TXT.short`). New code should read
// `.enums[GRP_TXT].short` and let this mirror retire.
Object.entries(PAYLOAD_LABELS).forEach(function (kv) {
ns[kv[0]] = kv[1];
});
if (typeof window !== 'undefined') {
window.PayloadLabels = ns;
}
if (typeof module !== 'undefined' && module.exports) {
module.exports = ns;
}
})();