mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-08-26 17:31:34 +00:00
* feat(region-routing): P1 tagging + region_routes primitive + read/write API + preview launcher - config.py: add Coverage.region_tagging (bool=False); add RegionRouteMatrix dataclass (enabled, cells) above NotificationsConfig; add region_routes field to NotificationsConfig; add explicit hydration branch for region_routes in _dict_to_dataclass mirroring destinations pattern. - coverage_area.py: add MonitoringArea.name (str|None=None, frozen); update areas_from_config to preserve name; refactor inline geom extraction from classify_event_areas into shared _event_geom_json helper; add matching_area_names(geom_json, areas)->list[str] (additive, all named matches, config-order, deduped; gate unchanged); add event_region_names convenience wrapper. - coverage_filter.py: add region_tagging ctor kwarg; stamp event.region/ regions before the gate when region_tagging=True and areas non-empty and not event.regions (never clobbers satpass preset). - pipeline/__init__.py: wire region_tagging into CoverageFilter construction. - notification_routes.py: add GET /notifications/regions (named coverage area names, config-order, deduped); GET /notifications/region-routing (matrix as JSON); POST /notifications/region-routing (explicit RMW — only region_routes changes, toggles/rules/destinations survive). - scripts/preview_dashboard.py: mesh-free launcher — dashboard API only, no mesh connector, no broadcast loop; vite runs separately. All 87 coverage tests pass; 300 total pass; 6 pre-existing failures unchanged (adapter config count mismatch + MeshCore EventType.NEW_CONTACT). * feat(region-routing): manual region x family matrix editor page Adds RegionRoutingMatrix.tsx — a plain editor over the region_routes config primitive. Rows = families (via useFamilies()), cols = regions (from GET /api/notifications/regions). Each cell exposes MT channel (ChannelPicker single + includeDisabled), MC channel name (text input), min_severity select (routine/priority/critical/immediate), and an enabled checkbox. Only cells where MT or MC is set are included in the sparse POST payload. Master enable toggle maps to top-level enabled. MT budget guard warns when more than 7 distinct MT indices are in use. Sticky family column; horizontal scroll for wide region sets. Registers route /region-routing in App.tsx and adds "Region Routing" nav entry (Map icon) under the Meshtastic section in Layout.tsx, immediately after Routing. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(region-routing): regions endpoint reads saved (disk) coverage so routing columns are dynamic without a bot restart; preview reloads config after writes * feat(routing): unify MT/MC routing into per-family cards; region routing as an in-card expand; remove rules/destinations UI + standalone page * refactor(routing): move Meshtastic Routing from /notifications to /meshtastic/routing (mirror /meshcore/routing); redirect legacy path * feat(region-routing): dispatcher honors region_routes matrix (authoritative-on-match, per-region cooldown, per-channel dedup); non-matrix path unchanged Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(region-routing): matrix dedup key must match boot-restore 2-tuple form (prevents restart re-broadcast flood); regression test --------- Co-authored-by: Matt Johnson <mj@k7zvx.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
86 lines
3.3 KiB
JavaScript
86 lines
3.3 KiB
JavaScript
let crypto = require('crypto')
|
|
|
|
let { urlAlphabet } = require('./url-alphabet/index.cjs')
|
|
|
|
// It is best to make fewer, larger requests to the crypto module to
|
|
// avoid system call overhead. So, random numbers are generated in a
|
|
// pool. The pool is a Buffer that is larger than the initial random
|
|
// request size by this multiplier. The pool is enlarged if subsequent
|
|
// requests exceed the maximum buffer size.
|
|
const POOL_SIZE_MULTIPLIER = 128
|
|
let pool, poolOffset
|
|
|
|
let fillPool = bytes => {
|
|
if (bytes < 0 || bytes > 1024) throw new RangeError('Wrong ID size')
|
|
if (!pool || pool.length < bytes) {
|
|
pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER)
|
|
crypto.randomFillSync(pool)
|
|
poolOffset = 0
|
|
} else if (poolOffset + bytes > pool.length) {
|
|
crypto.randomFillSync(pool)
|
|
poolOffset = 0
|
|
}
|
|
poolOffset += bytes
|
|
}
|
|
|
|
let random = bytes => {
|
|
// `|=` convert `bytes` to number to prevent `valueOf` abusing and pool pollution
|
|
fillPool((bytes |= 0))
|
|
return pool.subarray(poolOffset - bytes, poolOffset)
|
|
}
|
|
|
|
let customRandom = (alphabet, defaultSize, getRandom) => {
|
|
// First, a bitmask is necessary to generate the ID. The bitmask makes bytes
|
|
// values closer to the alphabet size. The bitmask calculates the closest
|
|
// `2^31 - 1` number, which exceeds the alphabet size.
|
|
// For example, the bitmask for the alphabet size 30 is 31 (00011111).
|
|
let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
|
|
// Though, the bitmask solution is not perfect since the bytes exceeding
|
|
// the alphabet size are refused. Therefore, to reliably generate the ID,
|
|
// the random bytes redundancy has to be satisfied.
|
|
|
|
// Note: every hardware random generator call is performance expensive,
|
|
// because the system call for entropy collection takes a lot of time.
|
|
// So, to avoid additional system calls, extra bytes are requested in advance.
|
|
|
|
// Next, a step determines how many random bytes to generate.
|
|
// The number of random bytes gets decided upon the ID size, mask,
|
|
// alphabet size, and magic number 1.6 (using 1.6 peaks at performance
|
|
// according to benchmarks).
|
|
let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
|
|
|
|
return (size = defaultSize) => {
|
|
let id = ''
|
|
while (true) {
|
|
let bytes = getRandom(step)
|
|
// A compact alternative for `for (let i = 0; i < step; i++)`.
|
|
let i = step
|
|
while (i--) {
|
|
// Adding `|| ''` refuses a random byte that exceeds the alphabet size.
|
|
id += alphabet[bytes[i] & mask] || ''
|
|
if (id.length === size) return id
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
let customAlphabet = (alphabet, size = 21) =>
|
|
customRandom(alphabet, size, random)
|
|
|
|
let nanoid = (size = 21) => {
|
|
// `|=` convert `size` to number to prevent `valueOf` abusing and pool pollution
|
|
fillPool((size |= 0))
|
|
let id = ''
|
|
// We are reading directly from the random pool to avoid creating new array
|
|
for (let i = poolOffset - size; i < poolOffset; i++) {
|
|
// It is incorrect to use bytes exceeding the alphabet size.
|
|
// The following mask reduces the random byte in the 0-255 value
|
|
// range to the 0-63 value range. Therefore, adding hacks, such
|
|
// as empty string fallback or magic numbers, is unneccessary because
|
|
// the bitmask trims bytes down to the alphabet size.
|
|
id += urlAlphabet[pool[i] & 63]
|
|
}
|
|
return id
|
|
}
|
|
|
|
module.exports = { nanoid, customAlphabet, customRandom, urlAlphabet, random }
|