Compare commits
66
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09634eb851 | ||
|
|
90ab7781ad | ||
|
|
88d04253ca | ||
|
|
08005c5c07 | ||
|
|
026f816ddb | ||
|
|
d31b6f545f | ||
|
|
39f551c914 | ||
|
|
6d25ecdc11 | ||
|
|
37987b2779 | ||
|
|
67a7bace4e | ||
|
|
b48cc23d6e | ||
|
|
c1899229a0 | ||
|
|
84a99a3636 | ||
|
|
84bdf2593c | ||
|
|
c527f20a88 | ||
|
|
9f495021f0 | ||
|
|
33aa7b807c | ||
|
|
2c56d82a81 | ||
|
|
0fc2115973 | ||
|
|
2c1df75d19 | ||
|
|
aefd36c4b1 | ||
|
|
25b9c31c9b | ||
|
|
d68a84f7f9 | ||
|
|
4fa191e9b6 | ||
|
|
c073d03ffb | ||
|
|
730f129404 | ||
|
|
f95f3d0104 | ||
|
|
e70e82c8c0 | ||
|
|
23cc0db1fa | ||
|
|
657f952a2c | ||
|
|
1f256cbb68 | ||
|
|
92fbdb692c | ||
|
|
b2fbcb318d | ||
|
|
44721b579c | ||
|
|
889d00007d | ||
|
|
6f53592041 | ||
|
|
709939f60b | ||
|
|
5b7dd493d4 | ||
|
|
02fe492dbf | ||
|
|
1bc2c88e2f | ||
|
|
863a6d8fd4 | ||
|
|
b252717f6b | ||
|
|
92697b11c5 | ||
|
|
b409c57296 | ||
|
|
00191c8d7a | ||
|
|
56c363a517 | ||
|
|
5ad91b4ab6 | ||
|
|
1843522b45 | ||
|
|
41ddecf5a7 | ||
|
|
b06c37affa | ||
|
|
b4912f5879 | ||
|
|
27f2558193 | ||
|
|
3a9bf1b7ce | ||
|
|
dd5760c436 | ||
|
|
eee3630f04 | ||
|
|
b31790ff48 | ||
|
|
2f4973ed70 | ||
|
|
26b00608b2 | ||
|
|
c2455bb08c | ||
|
|
22ff1349f3 | ||
|
|
8b72573521 | ||
|
|
f64032dcbe | ||
|
|
8fd1761688 | ||
|
|
7022f20b76 | ||
|
|
0d4c657b97 | ||
|
|
23dbcac5b6 |
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"name": "trx-rs SDK",
|
||||
"image": "git.haxx.space/sjg/trx-rs/sdk:latest",
|
||||
"workspaceFolder": "/work",
|
||||
"workspaceMount": "source=${localWorkspaceFolder},target=/work,type=bind",
|
||||
"mounts": [
|
||||
"source=trx-rs-sccache,target=/sccache,type=volume"
|
||||
],
|
||||
"containerEnv": {
|
||||
"RUSTC_WRAPPER": "sccache",
|
||||
"CARGO_INCREMENTAL": "0",
|
||||
"SCCACHE_DIR": "/sccache"
|
||||
},
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
"rust-lang.rust-analyzer",
|
||||
"tamasfe.even-better-toml"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
+24
-14
@@ -2,10 +2,11 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
# CI for the self-hosted, host-executor Podman runners (see container/).
|
||||
# The runner image bakes in the Rust toolchain and all build dependencies,
|
||||
# so jobs go straight to cargo — no apt/rustup setup steps (which also
|
||||
# collided on the dpkg lock when jobs ran concurrently in the same runner).
|
||||
# CI for the Docker-executor runner (VM). The lint, test and frontend jobs run
|
||||
# inside the shared trx-rs SDK image (container/Containerfile), which bakes in
|
||||
# the pinned Rust toolchain, Node.js, Chromium and all build dependencies. The
|
||||
# reuse job uses the upstream Docker action, which the Docker executor launches
|
||||
# as a sibling container.
|
||||
|
||||
name: CI
|
||||
|
||||
@@ -16,28 +17,44 @@ on:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
# sccache: shared compilation cache persisted on the runner host (see the
|
||||
# -v mount in runner-config.example.yaml). CARGO_INCREMENTAL=0 because
|
||||
# sccache cannot cache incremental artifacts.
|
||||
RUSTC_WRAPPER: sccache
|
||||
CARGO_INCREMENTAL: "0"
|
||||
SCCACHE_DIR: /sccache
|
||||
SCCACHE_CACHE_SIZE: "20G"
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
container: git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: rustfmt
|
||||
run: cargo fmt --all -- --check
|
||||
- name: clippy
|
||||
run: cargo clippy --workspace --all-targets --all-features -- -D warnings
|
||||
- name: sccache stats
|
||||
if: always()
|
||||
run: sccache --show-stats
|
||||
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
container: git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: cargo build --workspace --all-targets --locked
|
||||
- name: Test
|
||||
run: cargo test --workspace --locked
|
||||
- name: sccache stats
|
||||
if: always()
|
||||
run: sccache --show-stats
|
||||
|
||||
frontend:
|
||||
runs-on: ubuntu-latest
|
||||
container: git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: src/trx-client/trx-frontend/trx-frontend-http/frontend
|
||||
@@ -58,22 +75,15 @@ jobs:
|
||||
run: npm run lint
|
||||
- name: Test
|
||||
run: npm test
|
||||
- name: Install browser smoke dependency
|
||||
run: command -v chromium >/dev/null || (sudo apt-get update && sudo apt-get install -y --no-install-recommends chromium)
|
||||
# Chromium comes from the SDK image at the path the smoke test defaults
|
||||
# to, so there is nothing to install here.
|
||||
- name: Browser smoke test
|
||||
run: npm run test:browser
|
||||
- name: Verify generated assets
|
||||
run: npm run verify-generated
|
||||
- name: Verify generated-file licensing
|
||||
working-directory: .
|
||||
run: reuse lint
|
||||
|
||||
reuse:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: REUSE compliance
|
||||
# `reuse` CLI instead of fsfe/reuse-action: the latter is a Docker
|
||||
# action, which the host-executor runners cannot run. `reuse` is baked
|
||||
# into the runner image (see container/Containerfile).
|
||||
run: reuse lint
|
||||
- uses: fsfe/reuse-action@v5
|
||||
|
||||
@@ -0,0 +1,434 @@
|
||||
APRS symbol set (https://github.com/hessu/aprs-symbols)
|
||||
=========================================================
|
||||
|
||||
Verbatim copy of the upstream COPYRIGHT.md, retrieved 2026-08-03 from
|
||||
https://github.com/hessu/aprs-symbols. The set has no single SPDX license:
|
||||
individual symbols carry different terms, summarized below. Attribution
|
||||
requirement from the upstream README: "If you use this symbol set, please
|
||||
provide a pointer to the source (http://github.com/hessu/aprs-symbols/)."
|
||||
|
||||
---
|
||||
|
||||
|
||||
Copyright and licensing information
|
||||
======================================
|
||||
|
||||
This is a collection of vectorized symbols for use on the APRS system.
|
||||
|
||||
The copyright status of this collection is a bit complicated, since the
|
||||
symbols come from various sources, each having different copyright owners.
|
||||
|
||||
Most of the vectorized symbols are loosely based on the low-resolution
|
||||
"standard" bitmap symbol set as distributed by Stephen Smith, WA8LMF. That
|
||||
set is used by most APRS software around the world. The low resolution of
|
||||
those symbols does not allow direct vector conversion, so I've drawn new
|
||||
symbols in a similar layout. The vector versions try to mimic the original
|
||||
appearance and colours, with the intention of keeping the set recognizable
|
||||
and familiar to existing users. In some cases the vector versions are
|
||||
probably similar enough to the originals, so that they cannot be considered
|
||||
"original work" by myself. In some of these cases, the originals are
|
||||
probably also mimicking someone else's design.
|
||||
|
||||
The original symbols do not come with any information on their licensing.
|
||||
They've been distributed with a lot of APRS software over time, but I don't
|
||||
know who designed which symbol originally. Most likely all of them are
|
||||
drawn by one of:
|
||||
|
||||
* Roger Barker, G4IDE, "original set provided with UI-View" (SK)
|
||||
* Steve Dimse, KH4G, "U.S. customary set"
|
||||
* Stephen Smith, WA8LMF
|
||||
|
||||
The Adobe Illustrator (.ai) file contains a copy of the original bitmaps
|
||||
as a hidden layer, just for reference.
|
||||
|
||||
Some symbols I obtained from other sources, such as Wikipedia. In those
|
||||
cases I picked SVG versions which allow commercial reuse (source known, and
|
||||
the work is placed on public domain, or with a CC license which allows
|
||||
adaptation and commercial reuse).
|
||||
|
||||
Some symbols are vectorized versions of product or brand logos. The
|
||||
copyright of those is owned by the respective companies (Apple, Microsoft,
|
||||
Kenwood), and each of those may have some opinions on how the logos are
|
||||
used. Please check for yourself if you can use them or not.
|
||||
|
||||
In the list below I try to summarize the licensing status for each symbol.
|
||||
|
||||
|
||||
Shorthand notation for common licensing status
|
||||
-------------------------------------------------
|
||||
|
||||
* *VEC-OH7LZB* - Vectorized by OH7LZB, based on original APRS symbol set
|
||||
* Source of original bitmap: http://wa8lmf.net/aprs/APRS_symbols.htm
|
||||
* Original designer of individual symbol unknown at this time, but one of:
|
||||
* Roger Barker, G4IDE
|
||||
* Steve Dimse, KH4G
|
||||
* Stephen Smith, WA8LMF
|
||||
* Vectorized versions are designed to look similar
|
||||
* Licensing: Unknown
|
||||
* *OH7LZB* - Original vector design by Heikki Hannikainen, OH7LZB
|
||||
* Different enough (by author's opinion) to make it a new original work,
|
||||
instead of a copy of the old symbol
|
||||
* License: CC BY-SA 2.0
|
||||
* https://creativecommons.org/licenses/by-sa/2.0/
|
||||
|
||||
|
||||
Primary table
|
||||
----------------
|
||||
|
||||
* /! - Police station
|
||||
* VEC-OH7LZB
|
||||
* /# - Digipeater / Green star with D in middle
|
||||
* VEC-OH7LZB
|
||||
* /$ - Telephone
|
||||
* VEC-OH7LZB
|
||||
* /% - DX cluster
|
||||
* VEC-OH7LZB
|
||||
* /& - HF gateway
|
||||
* VEC-OH7LZB
|
||||
* /' - Small aircraft
|
||||
* https://openclipart.org/detail/27182/topdown-airplane-view
|
||||
* Author: Wirelizard (Brian Burger)
|
||||
* With color and some other small tuning added by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /( - Mobile satellite station
|
||||
* OH7LZB
|
||||
* /) - Wheelchair, handicapped
|
||||
* PD wheelchair symbol
|
||||
* Vectorized from bitmap by OH7LZB
|
||||
* /* - Snowmobile
|
||||
* https://openclipart.org/detail/15849/snowmobile
|
||||
* Author: Mystica (https://openclipart.org/user-detail/mystica)
|
||||
* PD: https://openclipart.org/share
|
||||
* /+ - Red Cross
|
||||
* VEC-OH7LZB
|
||||
* /, - Boy Scouts
|
||||
* VEC-OH7LZB
|
||||
* /- - House
|
||||
* VEC-OH7LZB
|
||||
* /. - Red X
|
||||
* VEC-OH7LZB
|
||||
* // - Red dot
|
||||
* VEC-OH7LZB
|
||||
* /0 to /9 - Numbered circles
|
||||
* VEC-OH7LZB
|
||||
* Fire
|
||||
* http://commons.wikimedia.org/wiki/File:FireIcon.svg
|
||||
* Author: Piotr Jaworski
|
||||
* PD: I, the copyright holder of this work, release this work into the public domain. This applies worldwide.
|
||||
* Tent
|
||||
* https://openclipart.org/detail/174933/green-tent-by-stamps-174933
|
||||
* Author: stamps
|
||||
* PD: https://openclipart.org/share
|
||||
* Motorcycle
|
||||
* http://commons.wikimedia.org/wiki/File:MUTCD_W8-15P.svg
|
||||
* This file is in the public domain because it comes from the Manual on
|
||||
Uniform Traffic Control Devices, sign number W8-15P, which states
|
||||
specifically on page I-1 that: Any traffic control device design or
|
||||
application provision contained in this Manual shall be considered to
|
||||
be in the public domain. Traffic control devices contained in this
|
||||
Manual shall not be protected by a patent, trademark, or copyright,
|
||||
except for the Interstate Shield and any other items owned by FHWA.
|
||||
* Colour version by OH7LZB
|
||||
* /= - Railroad engine
|
||||
* http://commons.wikimedia.org/wiki/File:Icon_train.svg
|
||||
* Author: http://en.wikipedia.org/wiki/User:Richtom80
|
||||
* CC-BY-SA-2.5,2.0,1.0
|
||||
* /> - Car
|
||||
* OH7LZB
|
||||
* /? - File server
|
||||
* https://openclipart.org/detail/163717/file-server-by-lyte
|
||||
* Author: lyte
|
||||
* PD: https://openclipart.org/share
|
||||
* /@ - Hurricane predicted path
|
||||
* VEC-OH7LZB
|
||||
* /A - Aid station
|
||||
* VEC-OH7LZB
|
||||
* Mail (BBS)
|
||||
* https://openclipart.org/detail/29268/yellow-mail-by-rg1024-29268
|
||||
* Author: rg1024
|
||||
* PD: https://openclipart.org/share
|
||||
* /C - Canoe
|
||||
* https://openclipart.org/detail/179047/red-canoe-by-rambo-tribble-179047
|
||||
* https://openclipart.org/detail/179041/canoe-paddle-by-rambo-tribble-179041
|
||||
* Author: Rambo Tribble
|
||||
* PD: I, the copyright holder of this work, release this work into the public domain. This applies worldwide.
|
||||
* /E - Eyeball
|
||||
* http://commons.wikimedia.org/wiki/File:Blue_eye.svg
|
||||
* PD: "This file is from the Open Clip Art Library, which released it explicitly into the public domain"
|
||||
* PD: https://openclipart.org/share
|
||||
* /F - Tractor
|
||||
* https://openclipart.org/detail/191654/farm-tractor-by-tmjbeary-191654
|
||||
* Author: tmjbeary
|
||||
* PD: https://openclipart.org/share
|
||||
* /G - Grid square, 3 by 3
|
||||
* VEC-OH7LZB
|
||||
* /H - Hotel
|
||||
* VEC-OH7LZB
|
||||
* /I - TCP/IP
|
||||
* VEC-OH7LZB
|
||||
* /K - School
|
||||
* OH7LZB
|
||||
* /L - PC user
|
||||
* OH7LZB
|
||||
* /M - Mac apple
|
||||
* Apple
|
||||
* /N - NTS
|
||||
* VEC-OH7LZB
|
||||
* /O - Hot air balloon
|
||||
* OH7LZB
|
||||
* /P - Police
|
||||
* OH7LZB
|
||||
* /R - RV
|
||||
* OH7LZB
|
||||
* /S - Space Shuttle
|
||||
* https://openclipart.org/detail/814/space-shuttle-by-johnny_automatic
|
||||
* PD: Published by the NASA, in "The Brain in Space"
|
||||
* /T - SSTV
|
||||
* https://openclipart.org/detail/48997/flat-screen-by-rg1024
|
||||
* Author: rg1024
|
||||
* Adjusted by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /U - Bus
|
||||
* OH7LZB
|
||||
* /V - ATV, amateur television
|
||||
* https://openclipart.org/detail/48997/flat-screen-by-rg1024
|
||||
* Author: rg1024
|
||||
* Adjusted by OH7LZB
|
||||
* PD: https://openclipart.org/share
|
||||
* /W - Wx, Weather service site
|
||||
* VEC-OH7LZB
|
||||
* /X - Helicopter
|
||||
* OH7LZB
|
||||
* /Y - Sailboat
|
||||
* OH7LZB
|
||||
* /Z - Windows flag
|
||||
* Microsoft
|
||||
* /[ - Human
|
||||
* VEC-OH7LZB
|
||||
* /\ - DF triangle
|
||||
* VEC-OH7LZB
|
||||
* /] - Mailbox, post office, letter
|
||||
* /^ - Large aircraft
|
||||
* https://openclipart.org/detail/183204/plane-red-by-sketchartist-183204
|
||||
* Author: SketchArtist
|
||||
* PD: https://openclipart.org/share
|
||||
* /_ - Weather station
|
||||
* VEC-OH7LZB
|
||||
* /` - Satellite dish
|
||||
* OH7LZB
|
||||
* /a - Ambulance
|
||||
* OH7LZB
|
||||
* /b - Bicycle
|
||||
* http://commons.wikimedia.org/wiki/File:Bicycle_evolution-numbers.svg
|
||||
* Author: Wikipedia user: Al2
|
||||
* CC BY 3.0
|
||||
* /c - Incident command post
|
||||
* VEC-OH7LZB
|
||||
* /d - Fire station
|
||||
* VEC-OH7LZB
|
||||
* /e - Horse, equestrian
|
||||
* https://openclipart.org/detail/142627/horse-riding-lesson-by-olku
|
||||
* Author: OlKu
|
||||
* PD: https://openclipart.org/share
|
||||
* /f - Fire truck
|
||||
* OH7LZB
|
||||
* /g - Hang glider
|
||||
* OH7LZB
|
||||
* /h - Hospital
|
||||
* VEC-OH7LZB
|
||||
* /i - IOTA, islands on the air
|
||||
* http://commons.wikimedia.org/wiki/File:Palm_Island_R.svg
|
||||
* PI
|
||||
* /j - Jeep
|
||||
* OH7LZB
|
||||
* /k - Truck
|
||||
* OH7LZB
|
||||
* /l - Laptop
|
||||
* OH7LZB
|
||||
* /m - Mic-E repeater
|
||||
* VEC-OH7LZB
|
||||
* /n - Node, black bulls-eye
|
||||
* VEC-OH7LZB
|
||||
* /o - Emergency operations center
|
||||
* VEC-OH7LZB
|
||||
* /p - Dog(e)
|
||||
* OH7LZB
|
||||
* /q - Grid square, 2 by 2
|
||||
* VEC-OH7LZB
|
||||
* /r - Repeater tower
|
||||
* OH7LZB
|
||||
* /s - Ship, power boat
|
||||
* OH7LZB
|
||||
* /t - Truck stop
|
||||
* VEC-OH7LZB
|
||||
* /u - Semi-trailer truck, 18-wheeler
|
||||
* OH7LZB
|
||||
* /v - Van
|
||||
* OH7LZB
|
||||
* /w - Water station
|
||||
* VEC-OH7LZB
|
||||
* /x - X / Unix
|
||||
* https://commons.wikimedia.org/wiki/File:X11.svg
|
||||
* PD
|
||||
* /y - House, yagi antenna
|
||||
* VEC-OH7LZB
|
||||
* /z - Shelter
|
||||
* VEC-OH7LZB
|
||||
|
||||
|
||||
Secondary table
|
||||
------------------
|
||||
|
||||
* Emergency
|
||||
* VEC-OH7LZB
|
||||
* Numbered digipeater / Green star
|
||||
* VEC-OH7LZB
|
||||
* Bank
|
||||
* VEC-OH7LZB
|
||||
* Numbered gateway / Black diamond
|
||||
* VEC-OH7LZB
|
||||
* Crash site
|
||||
* OH7LZB
|
||||
* Cloudy
|
||||
* OH7LZB
|
||||
* MEO
|
||||
* VEC-OH7LZB
|
||||
* Snowflake
|
||||
* http://commons.wikimedia.org/wiki/File:Snowflake_01.svg
|
||||
* Author: Wikipedia user: Amada44
|
||||
* Public Domain
|
||||
* Church
|
||||
* VEC-OH7LZB
|
||||
* Girl Scout
|
||||
* VEC-OH7LZB
|
||||
* Looks slightly like the common USA girl scouts logos. Should be different
|
||||
enough to not infringe on "Girl Scouts of the USA" copyrights.
|
||||
* Home (HF antenna)
|
||||
* VEC-OH7LZB
|
||||
* Unknown position
|
||||
* VEC-OH7LZB
|
||||
* Destination
|
||||
* VEC-OH7LZB
|
||||
* Numbered circle
|
||||
* VEC-OH7LZB
|
||||
|
||||
* Petrol Station
|
||||
* OH7LZB
|
||||
* Hail
|
||||
* VEC-OH7LZB
|
||||
* Park
|
||||
* VEC-OH7LZB
|
||||
* Gale Flag
|
||||
* VEC-OH7LZB
|
||||
* Red car from above
|
||||
* OH7LZB
|
||||
* Info Kiosk
|
||||
* VEC-OH7LZB
|
||||
* Hurricane
|
||||
* OH7LZB
|
||||
|
||||
* Numbered white box
|
||||
* VEC-OH7LZB
|
||||
* Snow blowing
|
||||
* VEC-OH7LZB
|
||||
* Coast Guard
|
||||
* VEC-OH7LZB
|
||||
* Drizzle
|
||||
* VEC-OH7LZB
|
||||
* Smoke / Chimney
|
||||
* VEC-OH7LZB
|
||||
* Freezing rain
|
||||
* VEC-OH7LZB
|
||||
* Snow Shwr
|
||||
* VEC-OH7LZB
|
||||
* Haze
|
||||
* VEC-OH7LZB
|
||||
* Rain Shower
|
||||
* VEC-OH7LZB
|
||||
* Lightning
|
||||
* OH7LZB
|
||||
* "Kenwood radio"
|
||||
* Kenwood logo, vectorized
|
||||
* "Lighthouse"
|
||||
* CC BY-SA 2.0
|
||||
* http://wiki.openstreetmap.org/wiki/File:Lighthouse.svg
|
||||
* Nav Buoy
|
||||
* OH7LZB
|
||||
* Rocket
|
||||
* http://www.clker.com/clipart-gglkuglug.html
|
||||
* PD according to clker.com license
|
||||
* Parking
|
||||
* VEC-OH7LZB
|
||||
|
||||
* Earthquake, Restaurant
|
||||
* VEC-OH7LZB
|
||||
* Satellite
|
||||
* OH7LZB
|
||||
* Thunderstorm
|
||||
* OH7LZB
|
||||
* Sunny
|
||||
* OH7LZB
|
||||
* VORTAC, Numbered WXS
|
||||
* VEC-OH7LZB
|
||||
* Pharmacy Rx
|
||||
* OH7LZB
|
||||
* Wall Cloud
|
||||
* OH7LZB
|
||||
* Numbered plane
|
||||
* https://openclipart.org/detail/183204/plane-red-by-sketchartist-183204
|
||||
* Author: SketchArtist
|
||||
* PD: https://openclipart.org/share
|
||||
* Numbered WX Station
|
||||
* VEC-OH7LZB
|
||||
* Rain
|
||||
* Source: http://commons.wikimedia.org/wiki/File:Heavy-rain-shower-transparent.svg
|
||||
* Author: Wikipedia user: Peepo
|
||||
* Public Domain
|
||||
* With modifications by OH7LZB
|
||||
|
||||
* Numbered diamond
|
||||
* VEC-OH7LZB
|
||||
* Dust blowing
|
||||
* NA
|
||||
* Numbered civil defence
|
||||
* VEC-OH7LZB
|
||||
* DX spot
|
||||
* VEC-OH7LZB
|
||||
* Sleet
|
||||
* NA
|
||||
* Funnel Cloud
|
||||
* NA
|
||||
* Gale
|
||||
* VEC-OH7LZB
|
||||
* Store
|
||||
* https://openclipart.org/detail/89299/cart-medium-by-martins.bruvelis
|
||||
* Author: martins.bruvelis
|
||||
* Public Domain
|
||||
* Adjustments by OH7LZB
|
||||
* Numbered black box
|
||||
* VEC-OH7LZB
|
||||
* Work zone / Excavator
|
||||
* Based on http://www.clker.com/clipart-292480.html PNG version
|
||||
* Vectorized and colors adjusted by OH7LZB
|
||||
* PD according to clker.com documentation, uploader KURSVEIAL
|
||||
* SUV
|
||||
* OH7LZB
|
||||
* Milepost, Numbered triangle, Circle sm
|
||||
* VEC-OH7LZB
|
||||
* Partly cloudy
|
||||
* OH7LZB
|
||||
|
||||
* Restrooms, Numbered boat
|
||||
* VEC-OH7LZB
|
||||
* Tornado (also used in Funnel cloud, Skywarn)
|
||||
* https://openclipart.org/detail/104887/tornado-by-laabadon
|
||||
* Author: Laabadon
|
||||
* Public Domain
|
||||
* Numbered truck
|
||||
* OH7LZB
|
||||
* Numbered van
|
||||
* OH7LZB
|
||||
* Flooding
|
||||
* NA
|
||||
* Sky warn, Numbered shelter, fog
|
||||
* VEC-OH7LZB
|
||||
@@ -144,4 +144,7 @@ a unified set of frontends.
|
||||
GPL-2.0-or-later. See [`LICENSES`](LICENSES) for the full license text and
|
||||
bundled third-party license files. Bundled third-party components retain their
|
||||
original licenses: Leaflet is BSD-2-Clause, DSEG is OFL-1.1, and opus-decoder
|
||||
is MIT.
|
||||
is MIT. The APRS symbol sprites come from
|
||||
[hessu/aprs-symbols](https://github.com/hessu/aprs-symbols); their per-symbol
|
||||
copyright status is catalogued in
|
||||
[`LICENSES/LicenseRef-APRS-Symbols.txt`](LICENSES/LicenseRef-APRS-Symbols.txt).
|
||||
|
||||
+18
@@ -12,6 +12,8 @@ path = [
|
||||
"trx-rs.toml.example",
|
||||
"docs/**",
|
||||
"aidocs/**",
|
||||
"container/**",
|
||||
".devcontainer/**",
|
||||
"src/decoders/trx-ftx/README.md",
|
||||
"src/decoders/trx-wxsat/README.md",
|
||||
"assets/trx-logo.png",
|
||||
@@ -54,3 +56,19 @@ SPDX-License-Identifier = "OFL-1.1"
|
||||
path = ["src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/opus-decoder-0.7.11.min.js"]
|
||||
SPDX-FileCopyrightText = "2021-2025 Ethan Halsall"
|
||||
SPDX-License-Identifier = "MIT"
|
||||
|
||||
# Vendored APRS symbol sprites (https://github.com/hessu/aprs-symbols), rev H.
|
||||
# The set has no single upstream license -- individual symbols carry different
|
||||
# terms, catalogued in LICENSES/LicenseRef-APRS-Symbols.txt. Upstream asks that
|
||||
# users point back to https://github.com/hessu/aprs-symbols/.
|
||||
[[annotations]]
|
||||
path = [
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-0.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-1.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-2.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-0-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-1-2x.png",
|
||||
"src/trx-client/trx-frontend/trx-frontend-http/assets/web/vendor/aprs-symbols-24-2-2x.png",
|
||||
]
|
||||
SPDX-FileCopyrightText = "Heikki Hannikainen OH7LZB and the APRS symbol set authors (https://github.com/hessu/aprs-symbols)"
|
||||
SPDX-License-Identifier = "LicenseRef-APRS-Symbols"
|
||||
|
||||
+45
-38
@@ -2,60 +2,67 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
# Gitea Actions runner image for trx-rs CI (host-executor / "Pattern B").
|
||||
# trx-rs SDK / build image.
|
||||
#
|
||||
# All build dependencies, the Rust toolchain, Node.js (for JS actions such as
|
||||
# actions/checkout and actions/cache) and the `reuse` tool are baked in, so CI
|
||||
# runs skip the per-run apt/rustup install cost. `sudo` is present so the
|
||||
# existing workflow's `sudo apt-get ...` / rustup steps remain valid — they
|
||||
# just become fast no-ops because everything is already installed.
|
||||
# Single source of truth for the build environment. Used two ways:
|
||||
# * CI — as the job container for the lint/test jobs (Docker executor).
|
||||
# * Dev — run locally or via .devcontainer for a reproducible toolchain.
|
||||
#
|
||||
# Pinning the Rust version here (and in rust-toolchain.toml) means CI and every
|
||||
# developer share the exact same rustc/clippy, so "works locally, fails in CI"
|
||||
# cannot happen.
|
||||
FROM docker.io/library/debian:bookworm-slim
|
||||
|
||||
ARG ACT_RUNNER_VERSION=0.2.11
|
||||
# Keep in sync with rust-toolchain.toml.
|
||||
ARG RUST_VERSION=1.97.1
|
||||
ARG NODE_MAJOR=20
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive \
|
||||
RUSTUP_HOME=/opt/rustup \
|
||||
CARGO_HOME=/opt/cargo \
|
||||
PATH=/opt/cargo/bin:/usr/local/bin:/usr/bin:/bin
|
||||
RUSTUP_HOME=/usr/local/rustup \
|
||||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:/usr/local/bin:/usr/bin:/bin
|
||||
|
||||
# Base tooling + trx-rs build dependencies (mirrors .gitea/workflows/ci.yml).
|
||||
# Build dependencies (mirror README's manual instructions).
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates curl xz-utils git sudo pipx \
|
||||
ca-certificates curl git \
|
||||
build-essential pkg-config cmake clang libclang-dev \
|
||||
libopus-dev libasound2-dev libsoapysdr-dev chromium \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Node.js (JS-based actions need node in PATH under the host executor).
|
||||
# Node.js — JS-based actions (actions/checkout, actions/cache) run *inside*
|
||||
# the job container under the Docker executor, so node must be present.
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
|
||||
&& apt-get install -y --no-install-recommends nodejs \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# REUSE >= 3 (Debian's packaged reuse is too old for REUSE.toml).
|
||||
# The [charset-normalizer] extra provides an encoding-detection backend;
|
||||
# without it (and without libmagic) reuse fails to import at runtime.
|
||||
RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install 'reuse[charset-normalizer]'
|
||||
|
||||
# Rust stable with rustfmt + clippy, installed system-wide.
|
||||
# Pinned Rust toolchain, installed world-readable so any UID the runner or a
|
||||
# devcontainer uses can invoke cargo.
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
|
||||
| sh -s -- -y --no-modify-path --profile minimal \
|
||||
--component rustfmt --component clippy \
|
||||
&& chmod -R a+rwX "$CARGO_HOME" "$RUSTUP_HOME"
|
||||
| sh -s -- -y --no-modify-path \
|
||||
--default-toolchain "${RUST_VERSION}" --profile minimal \
|
||||
--component rustfmt --component clippy \
|
||||
&& chmod -R a+rwX "$RUSTUP_HOME" "$CARGO_HOME"
|
||||
|
||||
# act_runner binary.
|
||||
RUN arch="$(dpkg --print-architecture)"; \
|
||||
case "$arch" in amd64) rarch=amd64;; arm64) rarch=arm64;; *) echo "unsupported arch $arch" >&2; exit 1;; esac; \
|
||||
curl -fsSL -o /usr/local/bin/act_runner \
|
||||
"https://gitea.com/gitea/act_runner/releases/download/v${ACT_RUNNER_VERSION}/act_runner-${ACT_RUNNER_VERSION}-linux-${rarch}" \
|
||||
&& chmod +x /usr/local/bin/act_runner
|
||||
# sccache — shared compilation cache. Enabled at build time via
|
||||
# RUSTC_WRAPPER (see the CI workflow and .devcontainer), not repo-wide, so
|
||||
# non-SDK builds are unaffected. musl build is static and runs anywhere.
|
||||
#
|
||||
# The release asset is per-architecture, so resolve it from `uname -m` rather
|
||||
# than hardcoding one triple: everything else in this image is arch-agnostic,
|
||||
# and a pinned x86_64 URL is what forces an amd64 build (and Rosetta or qemu)
|
||||
# on an arm64 host. `uname -m` reflects the build platform under plain
|
||||
# docker/podman build as well as buildx, unlike the BuildKit-only TARGETARCH.
|
||||
ARG SCCACHE_VERSION=0.8.2
|
||||
RUN set -eux; \
|
||||
case "$(uname -m)" in \
|
||||
x86_64) sccache_arch=x86_64 ;; \
|
||||
aarch64|arm64) sccache_arch=aarch64 ;; \
|
||||
*) echo "unsupported architecture for sccache: $(uname -m)" >&2; exit 1 ;; \
|
||||
esac; \
|
||||
sccache_dist="sccache-v${SCCACHE_VERSION}-${sccache_arch}-unknown-linux-musl"; \
|
||||
curl -fsSL "https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/${sccache_dist}.tar.gz" \
|
||||
| tar -xz -C /tmp; \
|
||||
install -m755 "/tmp/${sccache_dist}/sccache" /usr/local/bin/sccache; \
|
||||
rm -rf /tmp/sccache-*
|
||||
|
||||
# Default config template (seeded into the /data volume on first boot).
|
||||
COPY config.yaml /etc/act_runner/config.yaml
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||
|
||||
# /data holds the .runner registration, cache and workflow workspaces.
|
||||
VOLUME /data
|
||||
WORKDIR /data
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
WORKDIR /work
|
||||
|
||||
+156
-81
@@ -3,116 +3,191 @@ SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
-->
|
||||
|
||||
# Podman-based Gitea Actions runners
|
||||
# trx-rs SDK image
|
||||
|
||||
Run two independent Gitea Actions runners on one host as rootless Podman
|
||||
containers managed by systemd (Quadlet) — one per project — instead of two
|
||||
VMs. Uses the **host executor**: workflow steps run directly inside a
|
||||
purpose-built runner image that already has the Rust toolchain and all build
|
||||
dependencies baked in, so CI runs skip the per-run install cost and no
|
||||
Docker/Podman socket is needed.
|
||||
|
||||
## Files
|
||||
A single container image that is the canonical build environment for trx-rs,
|
||||
used **both** by CI and by developers. It bakes in the pinned Rust toolchain
|
||||
(matching `rust-toolchain.toml`) and every build dependency, so the compiler
|
||||
and `clippy` are identical everywhere — no "works on my machine".
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `Containerfile` | Runner image: Debian + build deps + clang + Rust + Node + `reuse` + `act_runner`. |
|
||||
| `entrypoint.sh` | Registers on first boot (if needed), then runs the daemon. |
|
||||
| `config.yaml` | act_runner config template (seeded into each runner's volume). |
|
||||
| `trx-rs-runner.container` | Quadlet unit for the trx-rs runner. |
|
||||
| `project2-runner.container` | Quadlet unit for the second project's runner. |
|
||||
| `Containerfile` | The SDK image (Debian + build deps + pinned Rust + Node + git). |
|
||||
| `runner-config.example.yaml` | Example act_runner config for the CI VM (Docker executor). |
|
||||
|
||||
## Prerequisites (once per host)
|
||||
## Build and publish
|
||||
|
||||
Rootless Podman with cgroups v2 (default on modern distros). As the unprivileged
|
||||
user that will own the runners:
|
||||
Nothing in the image is architecture-specific: the base image, the Debian build
|
||||
dependencies, Node.js, `rustup` and the `sccache` release all resolve per
|
||||
architecture, so the same `Containerfile` builds natively on x86_64 and arm64.
|
||||
|
||||
Single architecture — the tag then only works on the architecture you built it
|
||||
on:
|
||||
|
||||
```bash
|
||||
# Survive logout / start on boot without an interactive session.
|
||||
loginctl enable-linger "$USER"
|
||||
# from the repo root
|
||||
podman build -t git.haxx.space/sjg/trx-rs/sdk:latest container
|
||||
podman login git.haxx.space
|
||||
podman push git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
```
|
||||
|
||||
No `podman.socket` is required for the host executor.
|
||||
|
||||
## 1. Build the image
|
||||
**Both architectures without emulation.** The CI runner is x86_64 and Apple
|
||||
Silicon developer machines are arm64, so `:latest` has to be a manifest list —
|
||||
a single-architecture tag makes the other side fall back to Rosetta or qemu.
|
||||
Build each half natively on a host of that architecture, then join them:
|
||||
|
||||
```bash
|
||||
cd container
|
||||
podman build -t trx-rs-ci:latest .
|
||||
# on an x86_64 host
|
||||
podman build --platform linux/amd64 -t git.haxx.space/sjg/trx-rs/sdk:latest-amd64 container
|
||||
podman push git.haxx.space/sjg/trx-rs/sdk:latest-amd64
|
||||
|
||||
# on an arm64 host
|
||||
podman build --platform linux/arm64 -t git.haxx.space/sjg/trx-rs/sdk:latest-arm64 container
|
||||
podman push git.haxx.space/sjg/trx-rs/sdk:latest-arm64
|
||||
|
||||
# from either, once both are pushed
|
||||
podman manifest create git.haxx.space/sjg/trx-rs/sdk:latest \
|
||||
git.haxx.space/sjg/trx-rs/sdk:latest-amd64 \
|
||||
git.haxx.space/sjg/trx-rs/sdk:latest-arm64
|
||||
podman manifest push --all git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
```
|
||||
|
||||
## 2. Get a registration token
|
||||
Building both from one machine is a single command
|
||||
(`podman build --platform linux/amd64,linux/arm64 --manifest ...`), but the
|
||||
foreign half runs under emulation and is slow — the two-host flow above is
|
||||
what keeps every build native.
|
||||
|
||||
For **each** repo: *Settings → Actions → Runners → Create new Runner* and copy
|
||||
the token. (Org- or instance-level tokens work too if you prefer wider scope.)
|
||||
Tag with the Rust version too (e.g. `:1.97.1`) if you want reproducible pins.
|
||||
Make the package **public** (Gitea → Packages → the image → Settings) so the CI
|
||||
runner and developers can pull it without credentials. If you keep it private,
|
||||
add `credentials:` under the workflow's `container:` and log the runner into the
|
||||
registry.
|
||||
|
||||
## 3. Install and start the runners
|
||||
Pushing a rebuilt image is not enough on its own: `:latest` is a moving tag, and
|
||||
act_runner reuses whatever it cached the first time unless `force_pull: true` is
|
||||
set (see `runner-config.example.yaml`). Without it the job log says
|
||||
`Image exists? true` and the run behaves as though the image were never
|
||||
rebuilt — a tool added to the `Containerfile` reads as missing from the image.
|
||||
Either set `force_pull`, or refresh the VM's copy by hand:
|
||||
|
||||
```bash
|
||||
mkdir -p ~/.config/containers/systemd
|
||||
cp trx-rs-runner.container project2-runner.container ~/.config/containers/systemd/
|
||||
|
||||
# Paste each repo's token for the FIRST boot only:
|
||||
# Environment=GITEA_RUNNER_REGISTRATION_TOKEN=xxxx…
|
||||
$EDITOR ~/.config/containers/systemd/trx-rs-runner.container
|
||||
$EDITOR ~/.config/containers/systemd/project2-runner.container
|
||||
|
||||
systemctl --user daemon-reload
|
||||
systemctl --user start trx-rs-runner
|
||||
systemctl --user start project2-runner
|
||||
|
||||
systemctl --user status trx-rs-runner
|
||||
podman logs -f gitea-runner-trx-rs
|
||||
docker pull git.haxx.space/sjg/trx-rs/sdk:latest
|
||||
docker run --rm git.haxx.space/sjg/trx-rs/sdk:latest sccache --version
|
||||
```
|
||||
|
||||
Once each runner shows **online** in the repo's runner list, blank out the
|
||||
`GITEA_RUNNER_REGISTRATION_TOKEN` line again (the registration is persisted in
|
||||
the `…-data` volume) and `systemctl --user daemon-reload`.
|
||||
### macOS note
|
||||
|
||||
## Required workflow change: the `reuse` job
|
||||
Apple's `container` CLI builds through a BuildKit helper VM that is configured
|
||||
with Rosetta whether or not the target is x86_64, so `container build` fails
|
||||
with *"Rosetta is not installed"* on a clean machine. That is a property of the
|
||||
builder, not of this image — `container run` works natively without it. Either
|
||||
install Rosetta once (`softwareupdate --install-rosetta`, after which an arm64
|
||||
build still produces a native arm64 image), or build with Podman, whose arm64
|
||||
BuildKit needs no emulation.
|
||||
|
||||
The host executor runs steps directly in the container and therefore **cannot
|
||||
run Docker-based actions**. The current `reuse` job uses `fsfe/reuse-action@v5`,
|
||||
which is a Docker action. `reuse` is baked into the image, so replace that job
|
||||
with a plain command:
|
||||
## Developer use
|
||||
|
||||
```yaml
|
||||
reuse:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: REUSE compliance
|
||||
run: reuse lint
|
||||
Reproducible one-off build, no local toolchain needed:
|
||||
|
||||
```bash
|
||||
podman run --rm -it -v "$PWD":/work -w /work \
|
||||
git.haxx.space/sjg/trx-rs/sdk:latest \
|
||||
cargo build --release
|
||||
```
|
||||
|
||||
The `lint` and `test` jobs need no changes: their `sudo apt-get …` and rustup
|
||||
steps still run, but become fast no-ops because the image already has those
|
||||
packages and the toolchain. (`sudo` is included in the image for exactly this
|
||||
reason.)
|
||||
Or open the repo in the image via VS Code / JetBrains "Reopen in Container"
|
||||
(`.devcontainer/devcontainer.json` points at the same image).
|
||||
|
||||
> If you would rather keep Docker-based actions and per-run images, use the
|
||||
> **Docker executor** instead: drop the `:host` suffix from the label in
|
||||
> `config.yaml`, enable `systemctl --user --now enable podman.socket`, mount it
|
||||
> into the container, and set `container.docker_host` to the socket path. That
|
||||
> trades the baked-in speed for stronger per-job isolation.
|
||||
Building outside the container? `rust-toolchain.toml` pins the same rustc, so
|
||||
`rustup` installs the matching toolchain automatically.
|
||||
|
||||
## Tuning
|
||||
## CI use
|
||||
|
||||
- **`capacity`** (in `config.yaml`) — concurrent jobs per runner. Rust builds
|
||||
are heavy; 1–2 is sensible when two runners share a host.
|
||||
- **`PodmanArgs=--cpus/--memory`** (in each `.container`) — hard resource caps
|
||||
so one project cannot starve the other.
|
||||
- **SELinux** — the `:Z` volume flag is already set; keep it if SELinux is
|
||||
enforcing.
|
||||
`.gitea/workflows/ci.yml` runs the `lint`, `test` and `frontend` jobs *inside*
|
||||
this image via the `container:` key, so they skip all setup and go straight to
|
||||
`cargo` and `npm`. The frontend job needs three things from the image beyond
|
||||
Rust: Node.js for the toolchain, Chromium at `/usr/bin/chromium` for the
|
||||
browser smoke test, and `cargo` — `npm run verify-generated` regenerates the
|
||||
Rust wire contracts before checking for drift.
|
||||
|
||||
## Committing these files
|
||||
The `reuse` job stays on the upstream `fsfe/reuse-action` (a Docker action the
|
||||
Docker executor launches as a sibling container) — nothing REUSE-related is
|
||||
baked into the SDK, and it lints the whole repository, so no job runs its own
|
||||
licence check.
|
||||
|
||||
If you add this directory to a REUSE-checked repo, register the markdown in
|
||||
`REUSE.toml` (the other files carry inline SPDX headers):
|
||||
## Compilation cache (sccache)
|
||||
|
||||
```toml
|
||||
[[annotations]]
|
||||
path = ["container/**"]
|
||||
SPDX-FileCopyrightText = "2026 Stan Grams <sjg@haxx.space>"
|
||||
SPDX-License-Identifier = "GPL-2.0-or-later"
|
||||
The SDK image ships [`sccache`](https://github.com/mozilla/sccache). It is
|
||||
enabled via `RUSTC_WRAPPER=sccache` in CI and the devcontainer (not repo-wide,
|
||||
so plain `cargo` builds outside the SDK are unaffected).
|
||||
|
||||
- **CI** persists the cache on the runner host — create the dir once:
|
||||
`mkdir -p /var/cache/sccache`. It is bind-mounted into each job container at
|
||||
`/sccache` (see `runner-config.example.yaml`), so cache survives across runs
|
||||
and is shared between the lint/test jobs and both projects.
|
||||
- **Devcontainer** uses a named volume (`trx-rs-sccache`).
|
||||
- Check effectiveness with `sccache --show-stats` (the CI jobs print it).
|
||||
|
||||
`CARGO_INCREMENTAL=0` is set wherever sccache is on, since sccache cannot cache
|
||||
incremental artifacts.
|
||||
|
||||
## CI runner (Alpine / OpenRC)
|
||||
|
||||
The runner uses the **Docker executor** (not the host executor): per-job
|
||||
container isolation and standard `ubuntu-latest` semantics. `act_runner` runs
|
||||
as an OpenRC service. Files provided:
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `act_runner.openrc` | OpenRC init script (`supervise-daemon`, depends on docker). |
|
||||
| `act_runner.confd.example` | Per-instance `conf.d` settings for multi-runner hosts. |
|
||||
|
||||
**Cap the thread budget.** In a VM, pin its vCPUs to specific host threads
|
||||
(libvirt/KVM):
|
||||
|
||||
```xml
|
||||
<vcpu placement='static'>2</vcpu>
|
||||
<cputune>
|
||||
<vcpupin vcpu='0' cpuset='4'/>
|
||||
<vcpupin vcpu='1' cpuset='5'/>
|
||||
</cputune>
|
||||
```
|
||||
|
||||
On bare metal, the `container.options: "--cpus=2"` and `capacity: 1` in
|
||||
`runner-config.example.yaml` already bound each runner.
|
||||
|
||||
**Set it up:**
|
||||
|
||||
```bash
|
||||
# 1. Docker + a dedicated user with socket access
|
||||
apk add docker docker-cli
|
||||
rc-update add docker default && rc-service docker start
|
||||
adduser -S -D -H -h /var/lib/act_runner act
|
||||
addgroup act docker
|
||||
|
||||
# 2. act_runner binary (static Go build, works on musl)
|
||||
# Upstream publishes per-architecture builds; pick the host's.
|
||||
case "$(uname -m)" in x86_64) arch=amd64 ;; aarch64) arch=arm64 ;; esac
|
||||
curl -fsSL -o /usr/local/bin/act_runner \
|
||||
"https://gitea.com/gitea/act_runner/releases/download/v0.2.11/act_runner-0.2.11-linux-${arch}"
|
||||
chmod +x /usr/local/bin/act_runner
|
||||
|
||||
# 3. Config + register one runner per project (scope keeps their jobs apart)
|
||||
install -Dm644 container/runner-config.example.yaml /etc/act_runner/trx-rs.yaml
|
||||
install -d -o act /var/lib/act_runner/trx-rs
|
||||
su act -s /bin/sh -c 'cd /var/lib/act_runner/trx-rs && \
|
||||
act_runner register --no-interactive \
|
||||
--instance https://git.haxx.space --token <TOKEN> \
|
||||
--name trx-rs-ci \
|
||||
--labels "ubuntu-latest:docker://catthehacker/ubuntu:act-latest"'
|
||||
|
||||
# 4. OpenRC service (repeat the symlink+conf.d for the second project)
|
||||
install -m755 container/act_runner.openrc /etc/init.d/act_runner
|
||||
ln -s act_runner /etc/init.d/act_runner.trx-rs
|
||||
install -m644 container/act_runner.confd.example /etc/conf.d/act_runner.trx-rs
|
||||
rc-update add act_runner.trx-rs default
|
||||
rc-service act_runner.trx-rs start
|
||||
```
|
||||
|
||||
Check it with `rc-service act_runner.trx-rs status` and
|
||||
`tail -f /var/log/act_runner.trx-rs.log`.
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Per-instance settings for an act_runner OpenRC service.
|
||||
# Copy to /etc/conf.d/<service-name>, e.g. /etc/conf.d/act_runner.trx-rs
|
||||
# (the name must match the /etc/init.d/ symlink).
|
||||
|
||||
# User that runs the daemon. Must be a member of the `docker` group.
|
||||
runner_user="act"
|
||||
|
||||
# Per-instance state dir (holds the .runner registration) and config file,
|
||||
# so two runners on one host stay independent.
|
||||
runner_dir="/var/lib/act_runner/trx-rs"
|
||||
runner_config="/etc/act_runner/trx-rs.yaml"
|
||||
@@ -0,0 +1,44 @@
|
||||
#!/sbin/openrc-run
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# OpenRC service for a Gitea act_runner (Docker executor) on Alpine.
|
||||
#
|
||||
# Install as /etc/init.d/act_runner (chmod +x). Single instance uses
|
||||
# /etc/act_runner/config.yaml. For one runner per project, symlink this script
|
||||
# and add a matching conf.d file:
|
||||
#
|
||||
# ln -s act_runner /etc/init.d/act_runner.trx-rs
|
||||
# cp container/act_runner.confd.example /etc/conf.d/act_runner.trx-rs
|
||||
# $EDITOR /etc/conf.d/act_runner.trx-rs # set runner_dir / runner_config
|
||||
# rc-update add act_runner.trx-rs default
|
||||
# rc-service act_runner.trx-rs start
|
||||
|
||||
description="Gitea Actions runner"
|
||||
|
||||
: "${runner_user:=act}"
|
||||
: "${runner_dir:=/var/lib/act_runner}"
|
||||
: "${runner_config:=/etc/act_runner/config.yaml}"
|
||||
|
||||
command="/usr/local/bin/act_runner"
|
||||
command_args="daemon --config ${runner_config}"
|
||||
# No group given, so supplementary groups (incl. docker) are initialised.
|
||||
command_user="${runner_user}"
|
||||
directory="${runner_dir}"
|
||||
|
||||
supervisor="supervise-daemon"
|
||||
respawn_delay=5
|
||||
respawn_max=0
|
||||
pidfile="/run/${RC_SVCNAME}.pid"
|
||||
output_log="/var/log/${RC_SVCNAME}.log"
|
||||
error_log="/var/log/${RC_SVCNAME}.log"
|
||||
|
||||
depend() {
|
||||
need docker
|
||||
use net dns
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -d -m 0750 -o "${runner_user}" "${runner_dir}"
|
||||
checkpath -f -m 0640 -o "${runner_user}" "${output_log}"
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# act_runner configuration template. Seeded into /data/config.yaml on first
|
||||
# boot; edit the copy inside the volume to change settings per runner.
|
||||
|
||||
log:
|
||||
level: info
|
||||
|
||||
runner:
|
||||
# Registration state. Relative to the daemon's working directory (/data).
|
||||
file: .runner
|
||||
# Concurrent jobs this runner will pick up. Rust builds are heavy — keep this
|
||||
# modest, especially if two runners share one host. The trx-rs workflow has
|
||||
# three parallel jobs (lint, test, reuse); capacity 2 lets two overlap.
|
||||
capacity: 2
|
||||
timeout: 3h
|
||||
# Map the workflow's `runs-on: ubuntu-latest` to the HOST executor, i.e. run
|
||||
# steps directly inside THIS container (which already has all the toolchain).
|
||||
# No Docker/Podman socket is required in this mode.
|
||||
labels:
|
||||
- "ubuntu-latest:host"
|
||||
|
||||
cache:
|
||||
# Built-in actions cache server (used by actions/cache). Stored in the volume.
|
||||
enabled: true
|
||||
dir: "/data/cache"
|
||||
|
||||
host:
|
||||
# Where per-job workspaces are created.
|
||||
workdir_parent: /data/workflows
|
||||
@@ -1,38 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Registers the runner on first boot (if no .runner state exists in /data),
|
||||
# then runs the act_runner daemon. Idempotent: on subsequent boots it reuses
|
||||
# the stored registration and ignores the token.
|
||||
set -euo pipefail
|
||||
|
||||
CONFIG_FILE="${CONFIG_FILE:-/data/config.yaml}"
|
||||
|
||||
cd /data
|
||||
|
||||
# Seed the config from the image's template on first boot so it lives in the
|
||||
# persistent volume and can be edited there.
|
||||
if [ ! -f "$CONFIG_FILE" ]; then
|
||||
cp /etc/act_runner/config.yaml "$CONFIG_FILE"
|
||||
fi
|
||||
|
||||
# runner.file in config.yaml is ".runner" (relative to this CWD => /data/.runner).
|
||||
if [ ! -f /data/.runner ]; then
|
||||
if [ -z "${GITEA_RUNNER_REGISTRATION_TOKEN:-}" ]; then
|
||||
echo "ERROR: no /data/.runner registration and GITEA_RUNNER_REGISTRATION_TOKEN is empty." >&2
|
||||
echo " Grab a token from the repo's Settings -> Actions -> Runners and set it" >&2
|
||||
echo " in the Quadlet unit for the first boot only." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Registering runner '${GITEA_RUNNER_NAME:-podman}' with ${GITEA_INSTANCE_URL} ..."
|
||||
act_runner register --no-interactive \
|
||||
--config "$CONFIG_FILE" \
|
||||
--instance "${GITEA_INSTANCE_URL:?set GITEA_INSTANCE_URL}" \
|
||||
--token "$GITEA_RUNNER_REGISTRATION_TOKEN" \
|
||||
--name "${GITEA_RUNNER_NAME:-podman}" \
|
||||
--labels "${GITEA_RUNNER_LABELS:-ubuntu-latest:host}"
|
||||
fi
|
||||
|
||||
exec act_runner daemon --config "$CONFIG_FILE"
|
||||
@@ -1,40 +0,0 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Rootless Podman Quadlet for the SECOND project's Gitea Actions runner,
|
||||
# co-located on the same host as the trx-rs runner.
|
||||
#
|
||||
# It has its own name, its own data volume and its own registration token, so
|
||||
# the two runners are fully independent. They share the `ubuntu-latest` label,
|
||||
# but registration SCOPE (which repo each token came from) keeps their jobs
|
||||
# separate — neither will pick up the other's work.
|
||||
#
|
||||
# If project 2 needs different build dependencies, build it its own image from
|
||||
# an adjusted Containerfile and point Image= at that instead of reusing the
|
||||
# trx-rs image below.
|
||||
|
||||
[Unit]
|
||||
Description=Gitea Actions runner — project 2
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Container]
|
||||
Image=localhost/gitea-act-runner:latest
|
||||
ContainerName=gitea-runner-project2
|
||||
Volume=gitea-runner-project2-data:/data:Z
|
||||
|
||||
Environment=CONFIG_FILE=/data/config.yaml
|
||||
Environment=GITEA_INSTANCE_URL=https://git.haxx.space
|
||||
Environment=GITEA_RUNNER_NAME=project2-podman
|
||||
Environment=GITEA_RUNNER_LABELS=ubuntu-latest:host
|
||||
Environment=GITEA_RUNNER_REGISTRATION_TOKEN=
|
||||
|
||||
PodmanArgs=--cpus=4.0 --memory=6g
|
||||
|
||||
[Service]
|
||||
Restart=always
|
||||
TimeoutStartSec=0
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -0,0 +1,47 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Example act_runner config for the Docker-executor runner that lives in the
|
||||
# CI VM. This is NOT the SDK image — it configures the runner that launches
|
||||
# per-job containers (including the trx-rs SDK image referenced by the
|
||||
# workflow's `container:` key). Copy to the VM and pass with
|
||||
# `act_runner daemon --config`.
|
||||
|
||||
log:
|
||||
level: info
|
||||
|
||||
runner:
|
||||
file: .runner
|
||||
# One concurrent job. With one runner per project on a 2-vCPU VM this keeps
|
||||
# total CI usage at ~2 threads.
|
||||
capacity: 1
|
||||
timeout: 3h
|
||||
# Docker executor: no ":host" suffix. Maps runs-on labels to base images
|
||||
# (the workflow overrides these per job via `container:`).
|
||||
labels:
|
||||
- "ubuntu-latest:docker://catthehacker/ubuntu:act-latest"
|
||||
|
||||
cache:
|
||||
enabled: true
|
||||
|
||||
container:
|
||||
# Cap every job container's CPU so CI stays within the 2-thread budget even
|
||||
# if capacity is raised later. The -v mount persists the sccache cache on the
|
||||
# host (create it first: `mkdir -p /var/cache/sccache`), matching SCCACHE_DIR
|
||||
# in the workflow.
|
||||
options: "--cpus=2 -v /var/cache/sccache:/sccache"
|
||||
# act_runner rejects every bind mount unless it is listed here — the default
|
||||
# is an empty allowlist, so the -v above is dropped with only a
|
||||
# "[...] is not a valid volume, will be ignored" line in the job log, and
|
||||
# SCCACHE_DIR then points at a directory that does not outlive the job.
|
||||
valid_volumes:
|
||||
- /var/cache/sccache
|
||||
# Reuse the host VM's Docker network for the built-in cache/artifact server.
|
||||
network: "host"
|
||||
# The workflow pulls the SDK image by the moving `:latest` tag. Without this
|
||||
# the runner logs "Image exists? true" and reuses whatever it cached the
|
||||
# first time, so pushing a rebuilt image has no effect until someone pulls
|
||||
# on the VM by hand — which looks like the image is missing a tool it in
|
||||
# fact has. The extra registry round-trip per job is nothing next to a build.
|
||||
force_pull: true
|
||||
@@ -1,41 +0,0 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Rootless Podman Quadlet for the trx-rs Gitea Actions runner.
|
||||
# Install to ~/.config/containers/systemd/trx-rs-runner.container then:
|
||||
# systemctl --user daemon-reload
|
||||
# systemctl --user start trx-rs-runner
|
||||
#
|
||||
# First boot only: paste a registration token (repo Settings -> Actions ->
|
||||
# Runners) into GITEA_RUNNER_REGISTRATION_TOKEN. After the runner appears
|
||||
# online you can blank it again — the registration is persisted in the volume.
|
||||
|
||||
[Unit]
|
||||
Description=Gitea Actions runner — trx-rs
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Container]
|
||||
Image=localhost/trx-rs-ci:latest
|
||||
ContainerName=gitea-runner-trx-rs
|
||||
# Persistent state: .runner registration, cache, workspaces.
|
||||
Volume=gitea-runner-trx-rs-data:/data:Z
|
||||
|
||||
Environment=CONFIG_FILE=/data/config.yaml
|
||||
Environment=GITEA_INSTANCE_URL=https://git.haxx.space
|
||||
Environment=GITEA_RUNNER_NAME=trx-rs-podman
|
||||
Environment=GITEA_RUNNER_LABELS=ubuntu-latest:host
|
||||
Environment=GITEA_RUNNER_REGISTRATION_TOKEN=
|
||||
|
||||
# Resource caps so a heavy Rust build here cannot starve the other project's
|
||||
# runner on the same host. Tune to your box.
|
||||
PodmanArgs=--cpus=4.0 --memory=6g
|
||||
|
||||
[Service]
|
||||
Restart=always
|
||||
# A cold Rust build can be slow; don't let systemd consider startup failed.
|
||||
TimeoutStartSec=0
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -39,6 +39,15 @@ entry, so they use three intentional host namespaces:
|
||||
| `window.trxPluginRuntime` | Typed decoder registration and message dispatch | Runtime object is installed once; plugins register lifecycle handlers through its API. |
|
||||
| `window.trxUi` | Notifications, confirmations, tab accessibility, and control presentation | Installed once by `ui-core.ts`; consumers call methods but do not replace them. |
|
||||
|
||||
`frontend/src/plugins/host.ts` declares the typed view of `window.trx.state`
|
||||
and `window.trx.core` that feature bundles consume. Feature entries import it
|
||||
instead of re-deriving the contract, so a service that moves out of the
|
||||
application entry is added in one place. Application state that a feature needs
|
||||
belongs in `trx.state`, and shared behavior belongs in `trx.core`; a feature
|
||||
that has to intercept application behavior registers a `modules.*` method the
|
||||
application calls, as the virtual-channel entry does for tuning, mode,
|
||||
bandwidth, and frequency display.
|
||||
|
||||
The WebGL adapter exposes `createTrxWebGlRenderer`, `trxParseCssColor`,
|
||||
`trxHslToRgba`, and `trxClearCssColorCache` for the application bundle. Leaflet
|
||||
adds `L.TrxAisTrackSymbol` and `L.trxAisTrackSymbol` to the vendored Leaflet
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
# Pins the Rust toolchain for reproducible builds. Keep in sync with the
|
||||
# SDK image (container/Containerfile, ARG RUST_VERSION). rustup honours this
|
||||
# automatically for local builds outside the SDK container.
|
||||
|
||||
[toolchain]
|
||||
channel = "1.97.1"
|
||||
components = ["rustfmt", "clippy"]
|
||||
@@ -1,6 +1,11 @@
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/ais.ts
|
||||
var aisWindow = window;
|
||||
var escapeAisHtml = (input) => aisWindow.escapeMapHtml?.(input) ?? input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
var escapeAisHtml = (input) => hostCore.escapeMapHtml(input);
|
||||
var aisStatus = document.getElementById("ais-status");
|
||||
var aisMessagesEl = document.getElementById("ais-messages");
|
||||
var aisFilterInput = document.getElementById("ais-filter");
|
||||
@@ -119,10 +124,10 @@ function aisRouteText(msg) {
|
||||
return [msg.callsign, msg.destination].filter(Boolean).join(" -> ");
|
||||
}
|
||||
function aisDistanceText(msg) {
|
||||
if (aisWindow.serverLat == null || aisWindow.serverLon == null || msg.lat == null || msg.lon == null || !aisWindow.haversineKm) {
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || msg.lat == null || msg.lon == null) {
|
||||
return "";
|
||||
}
|
||||
const distKm = aisWindow.haversineKm(aisWindow.serverLat, aisWindow.serverLon, msg.lat, msg.lon);
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, msg.lat, msg.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1e3)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -155,8 +160,18 @@ function updateAisSummary() {
|
||||
}
|
||||
}
|
||||
}
|
||||
function aisSummaryText(msg) {
|
||||
const parts = [];
|
||||
if (msg.lat != null && msg.lon != null) parts.push(`${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}`);
|
||||
const motion = aisMotionText(msg);
|
||||
if (motion) parts.push(motion);
|
||||
const route = aisRouteText(msg);
|
||||
if (route && parts.length < 2) parts.push(route);
|
||||
if (!parts.length) return route || "no position reported";
|
||||
return parts.join(" · ");
|
||||
}
|
||||
function renderAisRow(msg) {
|
||||
const row = document.createElement("div");
|
||||
const row = document.createElement("details");
|
||||
row.className = "ais-message";
|
||||
const ts = msg._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
@@ -169,7 +184,8 @@ function renderAisRow(msg) {
|
||||
const motion = aisMotionText(msg);
|
||||
const route = aisRouteText(msg);
|
||||
const distance = aisDistanceText(msg);
|
||||
const pos = msg.lat != null && msg.lon != null ? `<a class="ais-pos-link" href="javascript:void(0)" onclick="window.navigateToAprsMap(${msg.lat},${msg.lon})">${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}</a>` : "";
|
||||
const pos = msg.lat != null && msg.lon != null ? `<a class="ais-pos-link" href="javascript:void(0)" data-ais-map="${msg.lat},${msg.lon}">${msg.lat.toFixed(5)}, ${msg.lon.toFixed(5)}</a>` : "";
|
||||
const vesselUrl = aisWindow.buildAisVesselUrl?.(msg.mmsi) ?? null;
|
||||
row.dataset.filterText = [
|
||||
name,
|
||||
msg.mmsi,
|
||||
@@ -180,7 +196,16 @@ function renderAisRow(msg) {
|
||||
msg.destination,
|
||||
aisTypeLabel(msg.message_type)
|
||||
].filter(Boolean).join(" ").toUpperCase();
|
||||
row.innerHTML = `<div class="ais-row-head"><span class="ais-time">${ts}</span><span class="ais-call">${nameHtml}</span><span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span><span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span></div><div class="ais-row-meta"><span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` + (route ? `<span class="ais-meta-text">${escapeAisHtml(route)}</span>` : "") + `<span class="ais-meta-text">${escapeAisHtml(channel.freqText)}</span></div><div class="ais-row-detail">` + (motion ? `<span>${escapeAisHtml(motion)}</span>` : `<span>No motion data</span>`) + (distance ? `<span>${escapeAisHtml(distance)}</span>` : "") + (pos ? `<span>${pos}</span>` : "") + `<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span></div>`;
|
||||
row.innerHTML = `<summary class="decode-line"><span class="ais-time">${escapeAisHtml(ts)}</span><span class="ais-call">${nameHtml}</span><span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span><span class="decode-line-summary">${escapeAisHtml(aisSummaryText(msg))}</span><span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` + (distance ? `<span class="decode-line-distance">${escapeAisHtml(distance)}</span>` : "") + `</summary><div class="decode-expanded"><div class="decode-expanded-meta"><span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span><span>${escapeAisHtml(channel.freqText)}</span>` + (route ? `<span>${escapeAisHtml(route)}</span>` : "") + (motion ? `<span>${escapeAisHtml(motion)}</span>` : "") + `<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` + (pos ? `<span>${pos}</span>` : "") + `</div><div class="aprs-row-actions">` + (msg.lat != null && msg.lon != null ? `<button class="aprs-inline-btn" type="button" data-ais-map="${msg.lat},${msg.lon}">Map</button>` : "") + (vesselUrl ? `<a class="aprs-inline-btn" href="${escapeAisHtml(vesselUrl)}" target="_blank" rel="noopener">Vessel</a>` : "") + `</div></div>`;
|
||||
row.querySelectorAll("[data-ais-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aisMap ?? "").split(",").map(Number);
|
||||
if (lat == null || lon == null || !Number.isFinite(lat) || !Number.isFinite(lon)) return;
|
||||
aisWindow.navigateToAprsMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
applyAisFilterToRow(row);
|
||||
return row;
|
||||
}
|
||||
@@ -260,9 +285,11 @@ function addAisMessage(msg) {
|
||||
pruneAisMessageHistory();
|
||||
scheduleAisBarUpdate();
|
||||
scheduleAisHistoryRender();
|
||||
if (msg.lat != null && msg.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
plotAisMessage(msg);
|
||||
}
|
||||
function plotAisMessage(msg) {
|
||||
if (msg.lat == null || msg.lon == null || !aisWindow.aisMapAddVessel) return;
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
function normalizeServerAisMessage(msg) {
|
||||
return {
|
||||
@@ -283,9 +310,7 @@ function onServerAisBatch(messages) {
|
||||
minute: "2-digit",
|
||||
second: "2-digit"
|
||||
});
|
||||
if (next.lat != null && next.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(next);
|
||||
}
|
||||
plotAisMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -303,7 +328,7 @@ document.getElementById("settings-clear-ais-history")?.addEventListener("click",
|
||||
void (async () => {
|
||||
if (!await aisWindow.trxUi.confirm({ title: "Clear AIS history?", message: "All stored AIS messages will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await aisWindow.postPath?.("/clear_ais_decode");
|
||||
await hostCore.postPath("/clear_ais_decode");
|
||||
resetAisHistoryView();
|
||||
} catch (e) {
|
||||
console.error("AIS history clear failed", e);
|
||||
@@ -327,5 +352,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerAisBatch,
|
||||
restore: onServerAisBatch,
|
||||
reset: resetAisHistoryView,
|
||||
prune: pruneAisHistoryView
|
||||
prune: pruneAisHistoryView,
|
||||
// Oldest first, so vessel tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...aisMessageHistory].reverse()) plotAisMessage(entry);
|
||||
}
|
||||
});
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,19 +1,20 @@
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.js";
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/aprs.ts
|
||||
var aprsWindow = window;
|
||||
var escapeAprsHtml = (input) => aprsWindow.escapeMapHtml?.(input) ?? input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
var escapeAprsHtml = (input) => hostCore.escapeMapHtml(input);
|
||||
var showAprsHint = (message, durationMs) => {
|
||||
aprsWindow.showHint?.(message, durationMs);
|
||||
hostCore.showHint(message, durationMs);
|
||||
};
|
||||
var aprsStatus = document.getElementById("aprs-status");
|
||||
var aprsPacketsEl = document.getElementById("aprs-packets");
|
||||
@@ -58,8 +59,8 @@ function scheduleAprsBarUpdate() {
|
||||
});
|
||||
}
|
||||
function aprsDistanceText(pkt) {
|
||||
if (aprsWindow.serverLat == null || aprsWindow.serverLon == null || pkt.lat == null || pkt.lon == null || !aprsWindow.haversineKm) return "";
|
||||
const distKm = aprsWindow.haversineKm(aprsWindow.serverLat, aprsWindow.serverLon, pkt.lat, pkt.lon);
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || pkt.lat == null || pkt.lon == null) return "";
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, pkt.lat, pkt.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1e3)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -110,51 +111,27 @@ function updateAprsChipState() {
|
||||
aprsHideCrcBtn?.classList.toggle("active", aprsHideCrc);
|
||||
aprsCollapseDupBtn?.classList.toggle("active", aprsCollapseDup);
|
||||
}
|
||||
function renderAprsRow(pkt, isFresh) {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
const ts = pkt._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>` : "";
|
||||
const distance = aprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
row.innerHTML = `<div class="aprs-row-head"><span class="aprs-time">${ts}</span>` + symbolHtml + `<span class="aprs-call">${escapeAprsHtml(pkt.srcCall ?? "")}</span><span>>${escapeAprsHtml(pkt.destCall || "")}</span><span class="${categoryClass}">${escapeAprsHtml(categoryLabel)}</span>` + pathBadge + crcBadge + `</div><div class="aprs-row-meta"><span class="aprs-meta-text">${escapeAprsHtml(age)}</span>` + (distance ? `<span class="aprs-meta-text">${escapeAprsHtml(distance)}</span>` : "") + `<span class="aprs-meta-text">${escapeAprsHtml(pkt.type || "--")}</span></div><div class="aprs-row-detail"><span title="${escapeAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` + (posLink ? `<span>${posLink}</span>` : "") + `</div><div class="aprs-row-actions">` + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div><details class="aprs-details"><summary>Details</summary><div class="aprs-details-grid"><span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.srcCall || "--")}</span><span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.destCall || "--")}</span><span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.type || "--")}</span><span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.path || "--")}</span><span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeAprsHtml(age)}</span><span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span><span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span><span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.info || "--")}</span><span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeAprsHtml(aprsHexBytes(pkt.info_bytes))}</span></div></details>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (aprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
aprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
});
|
||||
const copyBtn = row.querySelector("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
})();
|
||||
});
|
||||
async function copyAprsCoords(text) {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
return row;
|
||||
}
|
||||
function renderAprsRow(pkt, isFresh) {
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
distance: aprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => {
|
||||
aprsWindow.navigateToAprsMap?.(lat, lon);
|
||||
},
|
||||
onCopy: (text) => {
|
||||
void copyAprsCoords(text);
|
||||
}
|
||||
});
|
||||
}
|
||||
function renderAprsHistory() {
|
||||
pruneAprsPacketHistory();
|
||||
@@ -219,15 +196,17 @@ function pruneAprsHistoryView() {
|
||||
updateAprsBar();
|
||||
renderAprsHistory();
|
||||
}
|
||||
function plotAprsPacket(pkt) {
|
||||
if (pkt.lat == null || pkt.lon == null || !aprsWindow.aprsMapAddStation) return;
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
function addAprsPacket(pkt) {
|
||||
const tsMs = Number.isFinite(pkt.ts_ms) ? Number(pkt.ts_ms) : Date.now();
|
||||
pkt._tsMs = tsMs;
|
||||
pkt._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
aprsPacketHistory.unshift(pkt);
|
||||
pruneAprsPacketHistory();
|
||||
if (pkt.lat != null && pkt.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
plotAprsPacket(pkt);
|
||||
if (pkt.crcOk) scheduleAprsBarUpdate();
|
||||
scheduleAprsHistoryRender();
|
||||
}
|
||||
@@ -244,9 +223,7 @@ function onServerAprsBatch(packets) {
|
||||
const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
|
||||
next._tsMs = tsMs;
|
||||
next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
if (next.lat != null && next.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(next.srcCall ?? "", next.lat, next.lon, next.info ?? "", next.symbolTable, next.symbolCode, next);
|
||||
}
|
||||
plotAprsPacket(next);
|
||||
if (next.crcOk) hasCrcOk = true;
|
||||
normalized.push(next);
|
||||
}
|
||||
@@ -260,7 +237,7 @@ document.getElementById("settings-clear-aprs-history")?.addEventListener("click"
|
||||
void (async () => {
|
||||
if (!await aprsWindow.trxUi.confirm({ title: "Clear APRS history?", message: "All stored APRS packets will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await aprsWindow.postPath?.("/clear_aprs_decode");
|
||||
await hostCore.postPath("/clear_aprs_decode");
|
||||
resetAprsHistoryView();
|
||||
} catch (e) {
|
||||
console.error("APRS history clear failed", e);
|
||||
@@ -310,5 +287,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerAprsBatch,
|
||||
restore: onServerAprsBatch,
|
||||
reset: resetAprsHistoryView,
|
||||
prune: pruneAprsHistoryView
|
||||
prune: pruneAprsHistoryView,
|
||||
// Oldest first, so station tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...aprsPacketHistory].reverse()) plotAprsPacket(entry);
|
||||
}
|
||||
});
|
||||
|
||||
+5
-1
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/background-decode.ts
|
||||
var bgdWindow = window;
|
||||
(function() {
|
||||
@@ -104,7 +108,7 @@ var bgdWindow = window;
|
||||
}
|
||||
setCheckbox("background-decode-enabled", currentConfig.enabled);
|
||||
renderBookmarkChecklist();
|
||||
const isControl = backgroundDecodeRole === "control" || bgdWindow.authEnabled === false;
|
||||
const isControl = backgroundDecodeRole === "control" || hostState.authEnabled === false;
|
||||
const panel = document.getElementById("background-decode-panel");
|
||||
if (panel) {
|
||||
panel.querySelectorAll("input, select, button.sch-write").forEach(function(el) {
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/bookmarks.ts
|
||||
var bridge = window;
|
||||
function bmEl(id) {
|
||||
@@ -5,6 +10,9 @@ function bmEl(id) {
|
||||
if (!element) throw new Error(`Missing bookmark element #${id}`);
|
||||
return element;
|
||||
}
|
||||
function bmOptionalEl(id) {
|
||||
return document.getElementById(id);
|
||||
}
|
||||
function errorMessage(error) {
|
||||
return error instanceof Error ? error.message : String(error);
|
||||
}
|
||||
@@ -34,7 +42,7 @@ function bmEsc(str) {
|
||||
return d.innerHTML;
|
||||
}
|
||||
function bmCanControl() {
|
||||
return typeof bridge.authEnabled !== "undefined" && !bridge.authEnabled || typeof bridge.authRole !== "undefined" && bridge.authRole === "control";
|
||||
return !hostState.authEnabled || hostState.authRole === "control";
|
||||
}
|
||||
function bmSyncAccess() {
|
||||
const canCtrl = bmCanControl();
|
||||
@@ -44,8 +52,7 @@ function bmSyncAccess() {
|
||||
if (selectAllBtn) selectAllBtn.style.display = canCtrl ? "" : "none";
|
||||
}
|
||||
function bmListScope() {
|
||||
const rig = typeof bridge.lastActiveRigId !== "undefined" ? bridge.lastActiveRigId : null;
|
||||
return rig || "general";
|
||||
return hostState.lastActiveRigId || "general";
|
||||
}
|
||||
async function bmFetchOverlay() {
|
||||
const overlayScope = bmListScope();
|
||||
@@ -61,7 +68,7 @@ async function bmFetchOverlay() {
|
||||
if (typeof bridge.syncBookmarkMapLocators === "function") {
|
||||
bridge.syncBookmarkMapLocators(bmOverlayList);
|
||||
}
|
||||
if (typeof bridge.scheduleSpectrumDraw === "function") bridge.scheduleSpectrumDraw();
|
||||
hostCore.scheduleSpectrumDraw();
|
||||
}
|
||||
async function bmFetch(categoryFilter) {
|
||||
let url = "/bookmarks";
|
||||
@@ -184,12 +191,12 @@ function bmChangePage(delta) {
|
||||
bmRender(bmFilteredList);
|
||||
}
|
||||
function bmReadDecoders() {
|
||||
return (bridge.decoderRegistry || []).filter((d) => d.bookmark_selectable).filter((d) => bmEl("bm-dec-" + d.id)?.checked).map((d) => d.id);
|
||||
return hostState.decoderRegistry.filter((d) => d.bookmark_selectable).filter((d) => bmOptionalEl("bm-dec-" + d.id)?.checked).map((d) => d.id);
|
||||
}
|
||||
function bmWriteDecoders(decoders) {
|
||||
const set = new Set(decoders || []);
|
||||
(bridge.decoderRegistry || []).filter((d) => d.bookmark_selectable).forEach((d) => {
|
||||
const el = bmEl("bm-dec-" + d.id);
|
||||
hostState.decoderRegistry.filter((d) => d.bookmark_selectable).forEach((d) => {
|
||||
const el = bmOptionalEl("bm-dec-" + d.id);
|
||||
if (el) el.checked = set.has(d.id);
|
||||
});
|
||||
}
|
||||
@@ -197,7 +204,7 @@ function bmBuildDecoderCheckboxes() {
|
||||
const container = bmEl("bm-decoder-checkboxes");
|
||||
if (!container) return;
|
||||
container.innerHTML = "";
|
||||
(bridge.decoderRegistry || []).filter((d) => d.bookmark_selectable).forEach((d) => {
|
||||
hostState.decoderRegistry.filter((d) => d.bookmark_selectable).forEach((d) => {
|
||||
const label = document.createElement("label");
|
||||
label.className = "bm-decoder-check";
|
||||
label.innerHTML = '<input type="checkbox" id="bm-dec-' + d.id + '" value="' + d.id + '" /> ' + d.label;
|
||||
@@ -227,19 +234,17 @@ function bmCloseForm() {
|
||||
if (wrap) wrap.style.display = "none";
|
||||
}
|
||||
function bmPrefillFromStatus() {
|
||||
if (typeof bridge.lastFreqHz === "number" && Number.isFinite(bridge.lastFreqHz)) {
|
||||
bmEl("bm-freq").value = String(Math.round(bridge.lastFreqHz));
|
||||
const freqHz = hostState.lastFreqHz;
|
||||
if (freqHz != null && Number.isFinite(freqHz)) {
|
||||
bmEl("bm-freq").value = String(Math.round(freqHz));
|
||||
}
|
||||
if (typeof bridge.lastModeName === "string" && bridge.lastModeName) {
|
||||
bmEl("bm-mode").value = bridge.lastModeName;
|
||||
if (hostState.lastModeName) {
|
||||
bmEl("bm-mode").value = hostState.lastModeName;
|
||||
}
|
||||
if (typeof bridge.currentBandwidthHz === "number" && bridge.currentBandwidthHz > 0) {
|
||||
bmEl("bm-bw").value = String(Math.round(bridge.currentBandwidthHz));
|
||||
if (hostState.currentBandwidthHz > 0) {
|
||||
bmEl("bm-bw").value = String(Math.round(hostState.currentBandwidthHz));
|
||||
}
|
||||
const activeDecoders = (bridge.decoderRegistry || []).filter((d) => d.bookmark_selectable && d.activation === "toggle").filter((d) => {
|
||||
const btn = bmEl(d.id + "-decode-toggle-btn");
|
||||
return btn && btn.dataset.enabled === "true";
|
||||
}).map((d) => d.id);
|
||||
const activeDecoders = hostState.decoderRegistry.filter((d) => d.bookmark_selectable && d.activation === "toggle").filter((d) => bmOptionalEl(d.id + "-decode-toggle-btn")?.dataset.enabled === "true").map((d) => d.id);
|
||||
bmWriteDecoders(activeDecoders);
|
||||
}
|
||||
async function bmSave(e) {
|
||||
@@ -320,55 +325,44 @@ async function bmDelete(id) {
|
||||
}
|
||||
function bmApply(bm) {
|
||||
try {
|
||||
if (typeof bridge.modeEl !== "undefined" && bridge.modeEl) {
|
||||
bridge.modeEl.value = (bm.mode || "").toUpperCase();
|
||||
const modeEl = document.getElementById("mode");
|
||||
if (modeEl) {
|
||||
modeEl.value = (bm.mode || "").toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
if (bm.bandwidth_hz) {
|
||||
if (typeof bridge.currentBandwidthHz !== "undefined") {
|
||||
bridge.currentBandwidthHz = bm.bandwidth_hz;
|
||||
}
|
||||
bridge.currentBandwidthHz = bm.bandwidth_hz;
|
||||
if (typeof bridge.syncBandwidthInput === "function") {
|
||||
bridge.syncBandwidthInput(bm.bandwidth_hz);
|
||||
}
|
||||
hostState.currentBandwidthHz = bm.bandwidth_hz;
|
||||
hostCore.syncBandwidthInput(bm.bandwidth_hz);
|
||||
}
|
||||
if (typeof bridge.applyLocalTunedFrequency === "function") {
|
||||
if (typeof bridge._freqOptimisticSeq !== "undefined") {
|
||||
++bridge._freqOptimisticSeq;
|
||||
bridge._freqOptimisticHz = bm.freq_hz;
|
||||
}
|
||||
bridge.applyLocalTunedFrequency(bm.freq_hz, true);
|
||||
}
|
||||
if (typeof bridge.scheduleSpectrumDraw === "function" && typeof bridge.lastSpectrumData !== "undefined" && bridge.lastSpectrumData) {
|
||||
bridge.scheduleSpectrumDraw();
|
||||
hostCore.armOptimisticFrequency(bm.freq_hz);
|
||||
hostCore.applyLocalTunedFrequency(bm.freq_hz, true);
|
||||
if (hostState.lastSpectrumData) {
|
||||
hostCore.scheduleSpectrumDraw();
|
||||
}
|
||||
const tunePromise = (async () => {
|
||||
await bridge.trx?.modules?.vchan?.takeSchedulerControl();
|
||||
const onVirtual = await bridge.trx?.modules?.vchan?.interceptMode(bm.mode) ?? false;
|
||||
await bridge.trx.modules.vchan?.takeSchedulerControl();
|
||||
const onVirtual = await bridge.trx.modules.vchan?.interceptMode(bm.mode) ?? false;
|
||||
if (!onVirtual) {
|
||||
await bridge.postPath("/set_mode?mode=" + encodeURIComponent(bm.mode));
|
||||
await hostCore.postPath("/set_mode?mode=" + encodeURIComponent(bm.mode));
|
||||
}
|
||||
if (bm.bandwidth_hz) {
|
||||
const bwHandledByVchan = await bridge.trx?.modules?.vchan?.interceptBandwidth(bm.bandwidth_hz) ?? false;
|
||||
const bwHandledByVchan = await bridge.trx.modules.vchan?.interceptBandwidth(bm.bandwidth_hz) ?? false;
|
||||
if (!bwHandledByVchan) {
|
||||
await bridge.postPath(`/set_bandwidth?hz=${bm.bandwidth_hz}`);
|
||||
await hostCore.postPath(`/set_bandwidth?hz=${bm.bandwidth_hz}`);
|
||||
}
|
||||
}
|
||||
if (typeof bridge.setRigFrequency === "function") {
|
||||
await bridge.setRigFrequency(bm.freq_hz);
|
||||
} else {
|
||||
await bridge.postPath(`/set_freq?hz=${bm.freq_hz}`);
|
||||
}
|
||||
hostCore.setRigFrequency(bm.freq_hz);
|
||||
})();
|
||||
const hasDecoders = Array.isArray(bm.decoders) && bm.decoders.length > 0;
|
||||
const modeUp = (bm.mode || "").toUpperCase();
|
||||
const allToggleDecoders = (bridge.decoderRegistry || []).filter(
|
||||
const allToggleDecoders = hostState.decoderRegistry.filter(
|
||||
(d) => d.activation === "toggle"
|
||||
);
|
||||
const decoderPromise = allToggleDecoders.length ? (async () => {
|
||||
let statusUrl = "/status";
|
||||
if (typeof bridge.lastActiveRigId !== "undefined" && bridge.lastActiveRigId) {
|
||||
statusUrl += "?remote=" + encodeURIComponent(bridge.lastActiveRigId);
|
||||
const rigId = hostState.lastActiveRigId;
|
||||
if (rigId) {
|
||||
statusUrl += "?remote=" + encodeURIComponent(rigId);
|
||||
}
|
||||
const statusResp = await fetch(statusUrl);
|
||||
if (!statusResp.ok) return;
|
||||
@@ -387,7 +381,7 @@ function bmApply(bm) {
|
||||
wanted = currentlyOn;
|
||||
}
|
||||
if (wanted !== currentlyOn) {
|
||||
toggles.push(bridge.postPath("/toggle_" + d.id.replace(/-/g, "_") + "_decode"));
|
||||
toggles.push(hostCore.postPath("/toggle_" + d.id.replace(/-/g, "_") + "_decode"));
|
||||
}
|
||||
}
|
||||
if (toggles.length) await Promise.all(toggles);
|
||||
@@ -399,8 +393,6 @@ function bmApply(bm) {
|
||||
console.error("Failed to apply bookmark:", err);
|
||||
}
|
||||
}
|
||||
bridge.trx ??= {};
|
||||
bridge.trx.modules ??= {};
|
||||
bridge.trx.modules.bookmarks = {
|
||||
get overlayList() {
|
||||
return bmOverlayList;
|
||||
@@ -439,8 +431,8 @@ function bmUpdateSelectionUi() {
|
||||
function bmPopulateMoveTarget() {
|
||||
const sel = bmEl("bm-move-target");
|
||||
if (!sel) return;
|
||||
const rigIds = typeof bridge.lastRigIds !== "undefined" && Array.isArray(bridge.lastRigIds) ? bridge.lastRigIds : [];
|
||||
const displayNames = typeof bridge.lastRigDisplayNames !== "undefined" ? bridge.lastRigDisplayNames : {};
|
||||
const rigIds = hostState.lastRigIds;
|
||||
const displayNames = hostState.lastRigDisplayNames;
|
||||
const prev = sel.value;
|
||||
sel.innerHTML = "";
|
||||
if (bmScope !== "general") {
|
||||
@@ -545,8 +537,8 @@ async function bmDeleteSelected() {
|
||||
function bmPopulateScopePicker() {
|
||||
const picker = bmEl("bm-scope-picker");
|
||||
if (!picker) return;
|
||||
const rigIds = typeof bridge.lastRigIds !== "undefined" && Array.isArray(bridge.lastRigIds) ? bridge.lastRigIds : [];
|
||||
const displayNames = typeof bridge.lastRigDisplayNames !== "undefined" ? bridge.lastRigDisplayNames : {};
|
||||
const rigIds = hostState.lastRigIds;
|
||||
const displayNames = hostState.lastRigDisplayNames;
|
||||
const prev = picker.value;
|
||||
while (picker.options.length > 1) picker.remove(1);
|
||||
rigIds.forEach((id) => {
|
||||
@@ -565,9 +557,7 @@ function bmPopulateScopePicker() {
|
||||
(function initBookmarks() {
|
||||
bmSyncAccess();
|
||||
bmBuildDecoderCheckboxes();
|
||||
if (typeof bridge.onDecoderRegistryReady === "function") {
|
||||
bridge.onDecoderRegistryReady(bmBuildDecoderCheckboxes);
|
||||
}
|
||||
hostCore.onDecoderRegistryReady(bmBuildDecoderCheckboxes);
|
||||
bmPopulateScopePicker();
|
||||
const scopePicker = bmEl("bm-scope-picker");
|
||||
if (scopePicker) {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
// src/plugins/host.ts
|
||||
var host = window;
|
||||
var hostState = host.trx.state;
|
||||
var hostCore = host.trx.core;
|
||||
|
||||
export {
|
||||
hostState,
|
||||
hostCore
|
||||
};
|
||||
@@ -1,112 +0,0 @@
|
||||
// src/plugins/aprs-shared.ts
|
||||
function aprsPacketCategory(packet) {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
if (packet.lat != null && packet.lon != null || type.includes("position")) return "position";
|
||||
if (type.includes("message") || info.startsWith(":")) return "message";
|
||||
if (type.includes("weather") || info.startsWith("_")) return "weather";
|
||||
if (type.includes("telemetry") || info.startsWith("t#")) return "telemetry";
|
||||
return "other";
|
||||
}
|
||||
function aprsCategoryLabel(category) {
|
||||
switch (category) {
|
||||
case "position":
|
||||
return "Position";
|
||||
case "message":
|
||||
return "Message";
|
||||
case "weather":
|
||||
return "Weather";
|
||||
case "telemetry":
|
||||
return "Telemetry";
|
||||
default:
|
||||
return "Other";
|
||||
}
|
||||
}
|
||||
function aprsAgeText(timestampMs) {
|
||||
if (typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return "just now";
|
||||
const seconds = Math.round(Math.max(0, Date.now() - timestampMs) / 1e3);
|
||||
if (seconds < 5) return "just now";
|
||||
if (seconds < 60) return `${String(seconds)}s ago`;
|
||||
const minutes = Math.round(seconds / 60);
|
||||
if (minutes < 60) return `${String(minutes)}m ago`;
|
||||
return `${String(Math.round(minutes / 60))}h ago`;
|
||||
}
|
||||
function aprsPacketSignature(packet) {
|
||||
return [
|
||||
packet.srcCall ?? "",
|
||||
packet.destCall ?? "",
|
||||
packet.path ?? "",
|
||||
packet.info ?? "",
|
||||
packet.type ?? "",
|
||||
packet.lat?.toFixed(4) ?? "",
|
||||
packet.lon?.toFixed(4) ?? ""
|
||||
].join("|");
|
||||
}
|
||||
function collapseAprsDuplicates(packets) {
|
||||
const seen = /* @__PURE__ */ new Set();
|
||||
return packets.filter((packet) => {
|
||||
const signature = aprsPacketSignature(packet);
|
||||
if (seen.has(signature)) return false;
|
||||
seen.add(signature);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
function aprsHexBytes(bytes) {
|
||||
if (!bytes?.length) return "--";
|
||||
return bytes.map((byte) => byte.toString(16).toUpperCase().padStart(2, "0")).join(" ");
|
||||
}
|
||||
function renderAprsInfo(packet) {
|
||||
if (packet.info_bytes?.length) {
|
||||
return packet.info_bytes.map((byte) => renderAprsByte(byte)).join("");
|
||||
}
|
||||
return Array.from(packet.info ?? "", (character) => renderAprsCharacter(character)).join("");
|
||||
}
|
||||
function renderAprsByte(byte) {
|
||||
return byte >= 32 && byte <= 126 ? escapeAprsCharacter(String.fromCharCode(byte)) : `<span class="aprs-byte">0x${byte.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function renderAprsCharacter(character) {
|
||||
const code = character.charCodeAt(0);
|
||||
return code >= 32 && code <= 126 ? escapeAprsCharacter(character) : `<span class="aprs-byte">0x${code.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function escapeAprsCharacter(character) {
|
||||
if (character === "<") return "<";
|
||||
if (character === ">") return ">";
|
||||
if (character === "&") return "&";
|
||||
if (character === '"') return """;
|
||||
return character;
|
||||
}
|
||||
function renderLocalAprsSymbol(packet, escapeHtml) {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
}
|
||||
function normalizeAprsPacket(packet, receiver) {
|
||||
return {
|
||||
rig_id: packet.rig_id || null,
|
||||
receiver,
|
||||
srcCall: packet.src_call ?? "",
|
||||
destCall: packet.dest_call ?? "",
|
||||
path: packet.path ?? "",
|
||||
info: packet.info ?? "",
|
||||
info_bytes: packet.info_bytes ?? [],
|
||||
type: packet.packet_type ?? "",
|
||||
crcOk: packet.crc_ok ?? false,
|
||||
ts_ms: packet.ts_ms ?? null,
|
||||
lat: packet.lat ?? null,
|
||||
lon: packet.lon ?? null,
|
||||
symbolTable: packet.symbol_table ?? null,
|
||||
symbolCode: packet.symbol_code ?? null
|
||||
};
|
||||
}
|
||||
|
||||
export {
|
||||
aprsPacketCategory,
|
||||
aprsCategoryLabel,
|
||||
aprsAgeText,
|
||||
collapseAprsDuplicates,
|
||||
aprsHexBytes,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol,
|
||||
normalizeAprsPacket
|
||||
};
|
||||
+11
-3
@@ -1,5 +1,13 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/ftx-family.ts
|
||||
var bridge = window;
|
||||
function formatBarTime(timestampMs) {
|
||||
if (!timestampMs) return "--:--:--";
|
||||
return new Date(timestampMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
}
|
||||
function finiteNumber(value) {
|
||||
const number = typeof value === "number" ? value : Number(value);
|
||||
return Number.isFinite(number) ? number : null;
|
||||
@@ -198,7 +206,7 @@ function initializeFtxDecoder(config) {
|
||||
let html = "";
|
||||
for (const message of recent) {
|
||||
const timestamp = finiteNumber(message._tsMs ?? message.ts_ms);
|
||||
const time = timestamp === null ? "" : `<span class="aprs-bar-time">${bridge.fmtTime?.(timestamp) ?? ""}</span>`;
|
||||
const time = timestamp === null ? "" : `<span class="aprs-bar-time">${formatBarTime(timestamp)}</span>`;
|
||||
const snr = finiteNumber(message.snr_db);
|
||||
const delta = finiteNumber(message.dt_s);
|
||||
const frequency = displayFrequency(message.freq_hz);
|
||||
@@ -243,7 +251,7 @@ function initializeFtxDecoder(config) {
|
||||
void (async () => {
|
||||
try {
|
||||
await bridge.takeSchedulerControlForDecoderDisable?.(toggle);
|
||||
await bridge.postPath?.(`/toggle_${id}_decode`);
|
||||
await hostCore.postPath(`/toggle_${id}_decode`);
|
||||
} catch (error) {
|
||||
console.error(`${label} toggle failed`, error);
|
||||
}
|
||||
@@ -253,7 +261,7 @@ function initializeFtxDecoder(config) {
|
||||
void (async () => {
|
||||
if (!await bridge.trxUi.confirm({ title: `Clear ${label} history?`, message: `All stored ${label} decodes will be permanently removed.`, confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await bridge.postPath?.(`/clear_${id}_decode`);
|
||||
await hostCore.postPath(`/clear_${id}_decode`);
|
||||
reset();
|
||||
} catch (error) {
|
||||
console.error(`${label} history clear failed`, error);
|
||||
@@ -0,0 +1,254 @@
|
||||
// src/plugins/aprs-shared.ts
|
||||
function escapeAprsHtml(value) {
|
||||
return String(value ?? "").replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
}
|
||||
function aprsPacketCategory(packet) {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
if (packet.lat != null && packet.lon != null || type.includes("position")) return "position";
|
||||
if (type.includes("message") || info.startsWith(":")) return "message";
|
||||
if (type.includes("weather") || info.startsWith("_")) return "weather";
|
||||
if (type.includes("telemetry") || info.startsWith("t#")) return "telemetry";
|
||||
return "other";
|
||||
}
|
||||
function aprsCategoryLabel(category) {
|
||||
switch (category) {
|
||||
case "position":
|
||||
return "Position";
|
||||
case "message":
|
||||
return "Message";
|
||||
case "weather":
|
||||
return "Weather";
|
||||
case "telemetry":
|
||||
return "Telemetry";
|
||||
default:
|
||||
return "Other";
|
||||
}
|
||||
}
|
||||
function aprsAgeText(timestampMs) {
|
||||
if (typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return "just now";
|
||||
const seconds = Math.round(Math.max(0, Date.now() - timestampMs) / 1e3);
|
||||
if (seconds < 5) return "just now";
|
||||
if (seconds < 60) return `${String(seconds)}s ago`;
|
||||
const minutes = Math.round(seconds / 60);
|
||||
if (minutes < 60) return `${String(minutes)}m ago`;
|
||||
return `${String(Math.round(minutes / 60))}h ago`;
|
||||
}
|
||||
function aprsPacketSignature(packet) {
|
||||
return [
|
||||
packet.srcCall ?? "",
|
||||
packet.destCall ?? "",
|
||||
packet.path ?? "",
|
||||
packet.info ?? "",
|
||||
packet.type ?? "",
|
||||
packet.lat?.toFixed(4) ?? "",
|
||||
packet.lon?.toFixed(4) ?? ""
|
||||
].join("|");
|
||||
}
|
||||
function collapseAprsDuplicates(packets) {
|
||||
const seen = /* @__PURE__ */ new Set();
|
||||
return packets.filter((packet) => {
|
||||
const signature = aprsPacketSignature(packet);
|
||||
if (seen.has(signature)) return false;
|
||||
seen.add(signature);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
function aprsHexBytes(bytes) {
|
||||
if (!bytes?.length) return "--";
|
||||
return bytes.map((byte) => byte.toString(16).toUpperCase().padStart(2, "0")).join(" ");
|
||||
}
|
||||
function renderAprsInfo(packet) {
|
||||
if (packet.info_bytes?.length) {
|
||||
return packet.info_bytes.map((byte) => renderAprsByte(byte)).join("");
|
||||
}
|
||||
return Array.from(packet.info ?? "", (character) => renderAprsCharacter(character)).join("");
|
||||
}
|
||||
function renderAprsByte(byte) {
|
||||
return byte >= 32 && byte <= 126 ? escapeAprsCharacter(String.fromCharCode(byte)) : `<span class="aprs-byte">0x${byte.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function renderAprsCharacter(character) {
|
||||
const code = character.charCodeAt(0);
|
||||
return code >= 32 && code <= 126 ? escapeAprsCharacter(character) : `<span class="aprs-byte">0x${code.toString(16).toUpperCase().padStart(2, "0")}</span>`;
|
||||
}
|
||||
function escapeAprsCharacter(character) {
|
||||
if (character === "<") return "<";
|
||||
if (character === ">") return ">";
|
||||
if (character === "&") return "&";
|
||||
if (character === '"') return """;
|
||||
return character;
|
||||
}
|
||||
var APRS_SPRITE_COLUMNS = 16;
|
||||
var APRS_SPRITE_CELL_PX = 24;
|
||||
var APRS_SPRITE_FIRST_CODE = 33;
|
||||
var APRS_SPRITE_LAST_CODE = 126;
|
||||
function aprsSpriteOffset(code) {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
function aprsSymbolSprite(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`
|
||||
};
|
||||
}
|
||||
function renderAprsSymbolSlot(packet, escapeHtml) {
|
||||
return renderLocalAprsSymbol(packet, escapeHtml) || '<span class="aprs-symbol aprs-symbol-empty" aria-hidden="true"></span>';
|
||||
}
|
||||
function renderLocalAprsSymbol(packet, escapeHtml) {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
}
|
||||
function normalizeAprsPacket(packet, receiver) {
|
||||
return {
|
||||
rig_id: packet.rig_id || null,
|
||||
receiver,
|
||||
srcCall: packet.src_call ?? "",
|
||||
destCall: packet.dest_call ?? "",
|
||||
path: packet.path ?? "",
|
||||
info: packet.info ?? "",
|
||||
info_bytes: packet.info_bytes ?? [],
|
||||
type: packet.packet_type ?? "",
|
||||
crcOk: packet.crc_ok ?? false,
|
||||
ts_ms: packet.ts_ms ?? null,
|
||||
lat: packet.lat ?? null,
|
||||
lon: packet.lon ?? null,
|
||||
symbolTable: packet.symbol_table ?? null,
|
||||
symbolCode: packet.symbol_code ?? null
|
||||
};
|
||||
}
|
||||
function fahrenheitToCelsius(fahrenheit) {
|
||||
return Math.round((fahrenheit - 32) * 5 / 9 * 10) / 10;
|
||||
}
|
||||
function summarizeAprsWeather(info) {
|
||||
const parts = [];
|
||||
const temperature = /t(-?\d{2,3})/.exec(info);
|
||||
if (temperature) parts.push(`${fahrenheitToCelsius(Number(temperature[1]))} °C`);
|
||||
const wind = /(\d{3})\/(\d{3})/.exec(info) ?? /c(\d{3}).*?s(\d{3})/.exec(info);
|
||||
if (wind) {
|
||||
const gust = /g(\d{3})/.exec(info);
|
||||
const knots = Number(wind[2]);
|
||||
parts.push(`wind ${Number(wind[1])}° ${knots} kt${gust ? ` gust ${Number(gust[1])}` : ""}`);
|
||||
}
|
||||
const humidity = /h(\d{2})/.exec(info);
|
||||
if (humidity) {
|
||||
const value = Number(humidity[1]);
|
||||
parts.push(`${value === 0 ? 100 : value}% RH`);
|
||||
}
|
||||
const pressure = /b(\d{5})/.exec(info);
|
||||
if (pressure) parts.push(`${(Number(pressure[1]) / 10).toFixed(1)} hPa`);
|
||||
const rain = /r(\d{3})/.exec(info);
|
||||
if (rain && Number(rain[1]) > 0) parts.push(`rain ${(Number(rain[1]) / 100).toFixed(2)}"`);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
function summarizeAprsTelemetry(info) {
|
||||
const match = /^T#(\d+|MIC)((?:,-?[\d.]*)+)(?:,([01]{8}))?/.exec(info.trim());
|
||||
if (!match?.[2]) return null;
|
||||
const channels = match[2].split(",").filter((value) => value.length > 0);
|
||||
const bits = match[3] ? ` · bits ${match[3]}` : "";
|
||||
return `#${match[1]} · ${channels.join(" ")}${bits}`;
|
||||
}
|
||||
function summarizeAprsMessage(info) {
|
||||
const match = /^:([^:]{9}):(.*)$/.exec(info);
|
||||
if (!match?.[1] || match[2] == null) return null;
|
||||
const addressee = match[1].trim();
|
||||
const text = match[2].replace(/\{\d+\s*$/, "").trim();
|
||||
return `→ ${addressee}: ${text}`;
|
||||
}
|
||||
function summarizeAprsCourseSpeed(info) {
|
||||
const match = /(\d{3})\/(\d{3})/.exec(info);
|
||||
if (!match) return null;
|
||||
const knots = Number(match[2]);
|
||||
if (knots === 0) return null;
|
||||
return `${Number(match[1])}° ${knots} kt`;
|
||||
}
|
||||
function summarizeAprsPayload(packet) {
|
||||
const info = packet.info ?? "";
|
||||
if (!info) return null;
|
||||
const category = aprsPacketCategory(packet);
|
||||
if (category === "message") return summarizeAprsMessage(info);
|
||||
if (category === "weather") return summarizeAprsWeather(info);
|
||||
if (category === "telemetry") return summarizeAprsTelemetry(info);
|
||||
if (category === "position") {
|
||||
const parts = [];
|
||||
if (packet.lat != null && packet.lon != null) {
|
||||
parts.push(`${packet.lat.toFixed(4)}, ${packet.lon.toFixed(4)}`);
|
||||
}
|
||||
const courseSpeed = summarizeAprsCourseSpeed(info);
|
||||
if (courseSpeed) parts.push(courseSpeed);
|
||||
const comment = info.replace(/^[!=@/][^>]*[>_]?/, "").replace(/\d{3}\/\d{3}/, "").trim();
|
||||
if (comment && comment.length <= 60) parts.push(comment);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
const text = info.replace(/^[>;<?]/, "").trim();
|
||||
return text.length ? text : null;
|
||||
}
|
||||
function renderAprsPacketRow(packet, options = {}) {
|
||||
const row = document.createElement("details");
|
||||
row.className = "aprs-packet";
|
||||
if (!packet.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (options.fresh) row.classList.add("aprs-packet-new");
|
||||
const time = packet._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const category = aprsPacketCategory(packet);
|
||||
const summary = summarizeAprsPayload(packet);
|
||||
const hasPosition = packet.lat != null && packet.lon != null;
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(packet.srcCall || "")}`;
|
||||
row.innerHTML = `<summary class="decode-line"><span class="aprs-time">${escapeAprsHtml(time)}</span>` + (options.badge ? `<span class="aprs-badge aprs-badge-band">${escapeAprsHtml(options.badge)}</span>` : "") + renderAprsSymbolSlot(packet, escapeAprsHtml) + `<span class="aprs-call">${escapeAprsHtml(packet.srcCall ?? "")}</span><span class="aprs-badge aprs-badge-type aprs-badge-type-${category}">${escapeAprsHtml(aprsCategoryLabel(category))}</span><span class="decode-line-summary">${summary ? escapeAprsHtml(summary) : renderAprsInfo(packet)}</span>` + (packet.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC</span>') + (options.distance ? `<span class="decode-line-distance">${escapeAprsHtml(options.distance)}</span>` : "") + `</summary><div class="decode-expanded"><div class="decode-expanded-meta"><span>>${escapeAprsHtml(packet.destCall || "--")}</span><span>${escapeAprsHtml(packet.path || "no path")}</span><span>${escapeAprsHtml(aprsAgeText(packet._tsMs))}</span><span>CRC ${packet.crcOk ? "ok" : "failed"}</span>` + (hasPosition ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${packet.lat},${packet.lon}">${packet.lat?.toFixed(5)}, ${packet.lon?.toFixed(5)}</a>` : "") + `</div><div class="decode-expanded-raw">${renderAprsInfo(packet)}</div>` + (packet.info_bytes?.length ? `<div class="decode-expanded-bytes">${escapeAprsHtml(aprsHexBytes(packet.info_bytes))}</div>` : "") + `<div class="aprs-row-actions">` + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${packet.lat},${packet.lon}">Map</button>` : "") + (hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${packet.lat},${packet.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div></div>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aprsMap ?? "").split(",").map(Number);
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
const copyButton = row.querySelector("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
options.onCopy?.(copyButton.dataset.aprsCopy ?? "", copyButton);
|
||||
});
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
export {
|
||||
aprsPacketCategory,
|
||||
aprsAgeText,
|
||||
collapseAprsDuplicates,
|
||||
aprsSymbolSprite,
|
||||
normalizeAprsPacket,
|
||||
renderAprsPacketRow
|
||||
};
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/cw.ts
|
||||
var cwWindow = window;
|
||||
var cwStatusEl = document.getElementById("cw-status");
|
||||
@@ -25,7 +29,7 @@ var cwBarCurrentLine = null;
|
||||
var cwBarDismissedAtMs = 0;
|
||||
var cwAutoLocalOverride = null;
|
||||
function escapeCwHtml(input) {
|
||||
return cwWindow.escapeMapHtml?.(input) ?? input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
return hostCore.escapeMapHtml(input);
|
||||
}
|
||||
function applyCwAutoUi(enabled) {
|
||||
if (cwAutoInput) cwAutoInput.checked = enabled;
|
||||
@@ -246,7 +250,7 @@ async function setCwTone(tone, { syncInput = true } = {}) {
|
||||
cwToneInput.value = String(clamped);
|
||||
}
|
||||
try {
|
||||
await cwWindow.postPath?.(`/set_cw_tone?tone_hz=${encodeURIComponent(clamped)}`);
|
||||
await hostCore.postPath(`/set_cw_tone?tone_hz=${encodeURIComponent(clamped)}`);
|
||||
} catch (e) {
|
||||
console.error("CW tone set failed", e);
|
||||
}
|
||||
@@ -259,7 +263,7 @@ if (cwAutoInput) {
|
||||
cwAutoLocalOverride = enabled;
|
||||
applyCwAutoUi(enabled);
|
||||
try {
|
||||
await cwWindow.postPath?.(`/set_cw_auto?enabled=${enabled ? "true" : "false"}`);
|
||||
await hostCore.postPath(`/set_cw_auto?enabled=${enabled ? "true" : "false"}`);
|
||||
drawCwTonePicker();
|
||||
} catch (error) {
|
||||
console.error("CW auto toggle failed", error);
|
||||
@@ -276,7 +280,7 @@ if (cwWpmInput) {
|
||||
const wpm = clampCwWpm(cwWpmInput.value);
|
||||
cwWpmInput.value = String(wpm);
|
||||
try {
|
||||
await cwWindow.postPath?.(`/set_cw_wpm?wpm=${encodeURIComponent(wpm)}`);
|
||||
await hostCore.postPath(`/set_cw_wpm?wpm=${encodeURIComponent(wpm)}`);
|
||||
} catch (error) {
|
||||
console.error("CW WPM set failed", error);
|
||||
}
|
||||
@@ -312,7 +316,7 @@ document.getElementById("settings-clear-cw-history")?.addEventListener("click",
|
||||
void (async () => {
|
||||
if (!await cwWindow.trxUi.confirm({ title: "Clear CW history?", message: "All stored CW decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await cwWindow.postPath?.("/clear_cw_decode");
|
||||
await hostCore.postPath("/clear_cw_decode");
|
||||
resetCwHistoryView();
|
||||
} catch (error) {
|
||||
console.error("CW history clear failed", error);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import {
|
||||
initializeFtxDecoder
|
||||
} from "./chunk-SGMG5LG2.js";
|
||||
} from "./chunk-O2Y7YEVQ.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/ft2.ts
|
||||
initializeFtxDecoder({ id: "ft2", label: "FT2", periodMs: 3750 });
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import {
|
||||
initializeFtxDecoder
|
||||
} from "./chunk-SGMG5LG2.js";
|
||||
} from "./chunk-O2Y7YEVQ.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/ft4.ts
|
||||
initializeFtxDecoder({ id: "ft4", label: "FT4", periodMs: 7500 });
|
||||
|
||||
@@ -2,7 +2,8 @@ import {
|
||||
initializeFt8FamilyBar,
|
||||
initializeFtxDecoder,
|
||||
installFtxCompatibilityHelpers
|
||||
} from "./chunk-SGMG5LG2.js";
|
||||
} from "./chunk-O2Y7YEVQ.js";
|
||||
import "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/ft8.ts
|
||||
installFtxCompatibilityHelpers();
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.js";
|
||||
renderAprsPacketRow
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/hf-aprs.ts
|
||||
var hfAprsWindow = window;
|
||||
var escapeHfAprsHtml = (input) => hfAprsWindow.escapeMapHtml?.(input) ?? input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
var hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
var hfAprsPacketsEl = document.getElementById("hf-aprs-packets");
|
||||
var hfAprsFilterInput = document.getElementById("hf-aprs-filter");
|
||||
@@ -44,8 +44,8 @@ function scheduleHfAprsHistoryRender() {
|
||||
renderHfAprsHistory();
|
||||
}
|
||||
function hfAprsDistanceText(pkt) {
|
||||
if (hfAprsWindow.serverLat == null || hfAprsWindow.serverLon == null || pkt.lat == null || pkt.lon == null || !hfAprsWindow.haversineKm) return "";
|
||||
const distKm = hfAprsWindow.haversineKm(hfAprsWindow.serverLat, hfAprsWindow.serverLon, pkt.lat, pkt.lon);
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || pkt.lat == null || pkt.lon == null) return "";
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, pkt.lat, pkt.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1e3)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -98,51 +98,27 @@ function updateHfAprsChipState() {
|
||||
hfAprsCollapseDupBtn?.classList.toggle("active", hfAprsCollapseDup);
|
||||
}
|
||||
function renderHfAprsRow(pkt, isFresh) {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
const ts = pkt._ts || (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeHfAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const hfBadge = '<span class="aprs-badge" style="background:var(--accent-alt,#f59e0b);color:#000">HF</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeHfAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null ? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>` : "";
|
||||
const distance = hfAprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
row.innerHTML = `<div class="aprs-row-head"><span class="aprs-time">${ts}</span>` + hfBadge + symbolHtml + `<span class="aprs-call">${escapeHfAprsHtml(pkt.srcCall ?? "")}</span><span>>${escapeHfAprsHtml(pkt.destCall || "")}</span><span class="${categoryClass}">${escapeHfAprsHtml(categoryLabel)}</span>` + pathBadge + crcBadge + `</div><div class="aprs-row-meta"><span class="aprs-meta-text">${escapeHfAprsHtml(age)}</span>` + (distance ? `<span class="aprs-meta-text">${escapeHfAprsHtml(distance)}</span>` : "") + `<span class="aprs-meta-text">${escapeHfAprsHtml(pkt.type || "--")}</span></div><div class="aprs-row-detail"><span title="${escapeHfAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` + (posLink ? `<span>${posLink}</span>` : "") + `</div><div class="aprs-row-actions">` + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") + (pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") + `<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a></div><details class="aprs-details"><summary>Details</summary><div class="aprs-details-grid"><span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.srcCall || "--")}</span><span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.destCall || "--")}</span><span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.type || "--")}</span><span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.path || "--")}</span><span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeHfAprsHtml(age)}</span><span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span><span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span><span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.info || "--")}</span><span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeHfAprsHtml(aprsHexBytes(pkt.info_bytes))}</span></div></details>`;
|
||||
row.querySelectorAll("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (hfAprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
hfAprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
badge: "HF",
|
||||
distance: hfAprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => {
|
||||
hfAprsWindow.navigateToAprsMap?.(lat, lon);
|
||||
},
|
||||
onCopy: (text) => {
|
||||
void copyHfAprsCoords(text);
|
||||
}
|
||||
});
|
||||
const copyBtn = row.querySelector("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hfAprsWindow.showHint?.("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hfAprsWindow.showHint?.("Copy failed", 1500);
|
||||
}
|
||||
})();
|
||||
});
|
||||
}
|
||||
async function copyHfAprsCoords(text) {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
return row;
|
||||
}
|
||||
function renderHfAprsHistory() {
|
||||
pruneHfAprsPacketHistory();
|
||||
@@ -201,7 +177,7 @@ hfAprsDecodeToggleBtn?.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
try {
|
||||
await hfAprsWindow.takeSchedulerControlForDecoderDisable?.(hfAprsDecodeToggleBtn);
|
||||
await hfAprsWindow.postPath?.("/toggle_hf_aprs_decode");
|
||||
await hostCore.postPath("/toggle_hf_aprs_decode");
|
||||
} catch (e) {
|
||||
console.error("HF APRS toggle failed", e);
|
||||
}
|
||||
@@ -211,7 +187,7 @@ document.getElementById("settings-clear-hf-aprs-history")?.addEventListener("cli
|
||||
void (async () => {
|
||||
if (!await hfAprsWindow.trxUi.confirm({ title: "Clear HF APRS history?", message: "All stored HF APRS packets will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await hfAprsWindow.postPath?.("/clear_hf_aprs_decode");
|
||||
await hostCore.postPath("/clear_hf_aprs_decode");
|
||||
resetHfAprsHistoryView();
|
||||
} catch (e) {
|
||||
console.error("HF APRS history clear failed", e);
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
aprsSymbolSprite
|
||||
} from "./chunk-OPEIVJGD.js";
|
||||
|
||||
// src/map-core.ts
|
||||
function mapEl(id) {
|
||||
const element = document.querySelector(`#${CSS.escape(id)}`);
|
||||
@@ -58,6 +62,7 @@ var mapWindow = window;
|
||||
const mapMarkers = /* @__PURE__ */ new Set();
|
||||
const DEFAULT_MAP_SOURCE_FILTER = { ais: true, vdes: true, aprs: true, bookmark: false, ft8: true, ft4: true, ft2: true, wspr: true, sat: false };
|
||||
const mapFilter = { ...DEFAULT_MAP_SOURCE_FILTER };
|
||||
const MAP_FILTER_ALL_KEY = "__all";
|
||||
const mapLocatorFilter = { phase: "band", bands: /* @__PURE__ */ new Set() };
|
||||
let mapSearchFilter = "";
|
||||
let mapRigFilter = "";
|
||||
@@ -834,38 +839,36 @@ var mapWindow = window;
|
||||
container.innerHTML = `<span class="map-locator-empty">No ${kind === "band" ? "bands" : "sources"} available</span>`;
|
||||
return;
|
||||
}
|
||||
let helperText = "";
|
||||
const noun = kind === "band" ? "bands" : "sources";
|
||||
const sourceKeys = kind === "source" ? Object.keys(DEFAULT_MAP_SOURCE_FILTER) : [];
|
||||
const noneSelected = kind === "source" && sourceKeys.every((k) => !mapFilter[k]);
|
||||
if (kind === "source") {
|
||||
if (noneSelected) {
|
||||
helperText = "All sources visible — click to filter";
|
||||
}
|
||||
} else if (!(selectedSet instanceof Set) || selectedSet.size === 0) {
|
||||
helperText = `All ${kind === "band" ? "bands" : "sources"} visible by default`;
|
||||
}
|
||||
const showingAll = kind === "source" ? sourceKeys.every((k) => !mapFilter[k]) : !(selectedSet instanceof Set) || selectedSet.size === 0;
|
||||
const allChip = document.createElement("button");
|
||||
allChip.type = "button";
|
||||
allChip.className = "map-locator-chip map-locator-chip-all";
|
||||
if (showingAll) allChip.classList.add("is-active");
|
||||
allChip.dataset.filterKind = kind;
|
||||
allChip.dataset.filterKey = MAP_FILTER_ALL_KEY;
|
||||
allChip.setAttribute("aria-pressed", showingAll ? "true" : "false");
|
||||
allChip.title = showingAll ? `All ${noun} shown` : `Show all ${noun}`;
|
||||
allChip.innerHTML = `<span class="map-locator-chip-text">All</span>`;
|
||||
container.appendChild(allChip);
|
||||
for (const item of items) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.className = "map-locator-chip";
|
||||
const isActive = kind === "source" ? !!mapFilter[item.key] : !!selectedSet?.has(item.key);
|
||||
if (kind === "source" && noneSelected) {
|
||||
if (showingAll) {
|
||||
btn.classList.add("is-default");
|
||||
} else if (!isActive) {
|
||||
btn.classList.add("is-inactive");
|
||||
}
|
||||
btn.setAttribute("aria-pressed", !showingAll && isActive ? "true" : "false");
|
||||
btn.dataset.filterKind = kind;
|
||||
btn.dataset.filterKey = item.key;
|
||||
btn.style.setProperty("--chip-color", item.color);
|
||||
btn.innerHTML = `<span class="map-locator-chip-text">${escapeMapHtml(item.label)}</span>`;
|
||||
container.appendChild(btn);
|
||||
}
|
||||
if (helperText) {
|
||||
const hint = document.createElement("span");
|
||||
hint.className = "map-locator-empty";
|
||||
hint.textContent = helperText;
|
||||
container.appendChild(hint);
|
||||
}
|
||||
}
|
||||
function renderMapLocatorPhaseRow(container, phase) {
|
||||
if (!container) return;
|
||||
@@ -973,11 +976,10 @@ var mapWindow = window;
|
||||
renderMapLocatorLegend(mapLocatorFilter.phase, sourceItems, bandItems);
|
||||
if (!phaseEl || !choiceEl || !choiceLabelEl) return;
|
||||
renderMapLocatorPhaseRow(phaseEl, mapLocatorFilter.phase);
|
||||
choiceLabelEl.textContent = "Show";
|
||||
if (mapLocatorFilter.phase === "band") {
|
||||
choiceLabelEl.textContent = "Visible Bands";
|
||||
renderMapLocatorChipRow(choiceEl, bandItems, mapLocatorFilter.bands, "band");
|
||||
} else {
|
||||
choiceLabelEl.textContent = "Visible Sources";
|
||||
renderMapLocatorChipRow(choiceEl, sourceItems, null, "source");
|
||||
}
|
||||
syncLocatorMarkerStyles();
|
||||
@@ -1331,7 +1333,8 @@ var mapWindow = window;
|
||||
function applyMapOverlayPanelVisibility() {
|
||||
const panel = document.querySelector("#map-stage .map-overlay-panel");
|
||||
if (!panel) return;
|
||||
panel.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
panel.classList.toggle("filters-hidden", !mapOverlayPanelVisible);
|
||||
panel.querySelector(".map-overlay-filters")?.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
}
|
||||
function updateMapOverlayToggleButton() {
|
||||
const btn = mapEl("map-overlay-toggle-btn");
|
||||
@@ -1528,7 +1531,13 @@ var mapWindow = window;
|
||||
const kind = String(chip.dataset.filterKind || "");
|
||||
const key = String(chip.dataset.filterKey || "");
|
||||
if (!key) return;
|
||||
if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
if (key === MAP_FILTER_ALL_KEY) {
|
||||
if (kind === "source") {
|
||||
for (const srcKey of Object.keys(DEFAULT_MAP_SOURCE_FILTER)) mapFilter[srcKey] = false;
|
||||
} else {
|
||||
mapLocatorFilter.bands.clear();
|
||||
}
|
||||
} else if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
const sourceKey = key;
|
||||
mapFilter[sourceKey] = !mapFilter[sourceKey];
|
||||
const srcKeys = Object.keys(DEFAULT_MAP_SOURCE_FILTER);
|
||||
@@ -1643,42 +1652,29 @@ var mapWindow = window;
|
||||
return;
|
||||
}
|
||||
const mapRect = mapContainer.getBoundingClientRect();
|
||||
const width = mapContainer.clientWidth || mapRect.width;
|
||||
const footer = document.querySelector(".footer");
|
||||
let bottom = mapIsFullscreen() && stage ? stage.getBoundingClientRect().bottom : window.innerHeight;
|
||||
if (!mapIsFullscreen() && footer) {
|
||||
let bottom = window.innerHeight;
|
||||
if (footer) {
|
||||
const fr = footer.getBoundingClientRect();
|
||||
if (fr.top > mapRect.top + 50) bottom = fr.top;
|
||||
if (fr.top > mapRect.top + 50) bottom = Math.min(fr.top, bottom);
|
||||
}
|
||||
const available = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
const widthDriven = width > 0 ? Math.floor(width / 1.55) : available;
|
||||
const viewportCap = mapIsFullscreen() ? Math.floor(window.innerHeight * 0.9) : Math.floor(window.innerHeight * 0.75);
|
||||
const minHeight = Math.min(260, available);
|
||||
const target = Math.max(minHeight, Math.min(available, viewportCap, widthDriven));
|
||||
const target = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
mapContainer.style.height = `${target}px`;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
}
|
||||
function aprsSymbolIcon(symbolTable, symbolCode) {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const table = symbolTable === "/" ? "primary" : "alternate";
|
||||
const sprite = aprsSymbolSprite(symbolTable, symbolCode);
|
||||
const html = sprite ? `<div class="aprs-symbol aprs-symbol-marker ${sprite.className}" role="img" style="background-position:${sprite.backgroundPosition}" title="${escapeMapHtml(sprite.label)}" aria-label="${escapeMapHtml(sprite.label)}"></div>` : `<div class="aprs-symbol aprs-symbol-marker aprs-symbol-local" title="${symbolTable === "/" ? "primary" : "alternate"} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`;
|
||||
return L.divIcon({
|
||||
className: "",
|
||||
html: `<div class="aprs-symbol-local" title="${table} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`,
|
||||
html,
|
||||
iconSize: [24, 24],
|
||||
iconAnchor: [12, 12],
|
||||
popupAnchor: [0, -12]
|
||||
});
|
||||
}
|
||||
mapWindow.navigateToAprsMap = function(lat, lon) {
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => {
|
||||
t.classList.remove("active");
|
||||
});
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
function focusMapPosition(lat, lon) {
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (aprsMap) {
|
||||
@@ -1690,19 +1686,10 @@ var mapWindow = window;
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
mapWindow.navigateToMapLocator = function(grid, preferredType = null) {
|
||||
}
|
||||
function focusMapLocator(grid, preferredType = null) {
|
||||
const normalizedGrid = String(grid || "").trim().toUpperCase();
|
||||
if (!/^[A-R]{2}\d{2}(?:[A-X]{2})?$/.test(normalizedGrid)) return false;
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => {
|
||||
t.classList.remove("active");
|
||||
});
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (!aprsMap) return false;
|
||||
@@ -1747,7 +1734,7 @@ var mapWindow = window;
|
||||
requestAnimationFrame(focusMarker);
|
||||
});
|
||||
return true;
|
||||
};
|
||||
}
|
||||
function buildReceiverPopupHtml(rigIds) {
|
||||
const call = T.serverCallsign || T.ownerCallsign || "Receiver";
|
||||
let meta = "";
|
||||
@@ -2165,14 +2152,16 @@ var mapWindow = window;
|
||||
function updateMapContactPathsToggle() {
|
||||
const btn = mapEl("map-contact-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapDecodeContactPathsEnabled ? "Contact Paths On" : "Contact Paths Off";
|
||||
btn.classList.toggle("is-active", mapDecodeContactPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapDecodeContactPathsEnabled ? "true" : "false");
|
||||
btn.title = mapDecodeContactPathsEnabled ? "Directed decode paths are drawn when the target locator is known" : "Directed decode paths are hidden";
|
||||
}
|
||||
function updateMapP2pPathsToggle() {
|
||||
const btn = mapEl("map-p2p-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapP2pRadioPathsEnabled ? "TRX Paths On" : "TRX Paths Off";
|
||||
btn.classList.toggle("is-active", mapP2pRadioPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapP2pRadioPathsEnabled ? "true" : "false");
|
||||
btn.title = mapP2pRadioPathsEnabled ? "TRX paths are drawn from a station popup" : "TRX paths are hidden";
|
||||
}
|
||||
function scheduleDecodeMapMaintenance() {
|
||||
if (C.decodeHistoryMapRenderingDeferred()) {
|
||||
@@ -2332,7 +2321,7 @@ var mapWindow = window;
|
||||
selectedMapQsoKey = selectedMapQsoKey === entry.pathKey ? null : entry.pathKey ?? null;
|
||||
syncDecodeContactPathVisibility();
|
||||
if (selectedMapQsoKey && entry.sourceGrid) {
|
||||
mapWindow.navigateToMapLocator?.(entry.sourceGrid, entry.sourceType);
|
||||
focusMapLocator(entry.sourceGrid, entry.sourceType);
|
||||
}
|
||||
});
|
||||
const head = document.createElement("div");
|
||||
@@ -2438,7 +2427,7 @@ var mapWindow = window;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
const head = document.createElement("div");
|
||||
@@ -2544,7 +2533,7 @@ var mapWindow = window;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
const head = document.createElement("div");
|
||||
@@ -3049,6 +3038,8 @@ var mapWindow = window;
|
||||
}
|
||||
modules.map = {
|
||||
initAprsMap,
|
||||
focusMapPosition,
|
||||
focusMapLocator,
|
||||
sizeAprsMapToViewport,
|
||||
syncAprsReceiverMarker,
|
||||
updateMapRigFilter,
|
||||
@@ -3109,5 +3100,6 @@ var mapWindow = window;
|
||||
bandForHz,
|
||||
reverseGeocodeLocation
|
||||
};
|
||||
window.trxPluginRuntime.syncMapAll();
|
||||
autoInitIfVisible();
|
||||
})();
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/sat.ts
|
||||
var satWindow = window;
|
||||
var satDom = {
|
||||
@@ -243,7 +247,7 @@ lrptDecodeToggleBtn?.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
try {
|
||||
await satWindow.takeSchedulerControlForDecoderDisable?.(lrptDecodeToggleBtn);
|
||||
await satWindow.postPath?.("/toggle_lrpt_decode");
|
||||
await hostCore.postPath("/toggle_lrpt_decode");
|
||||
} catch (e) {
|
||||
console.error("LRPT toggle failed", e);
|
||||
}
|
||||
@@ -264,7 +268,7 @@ document.getElementById("settings-clear-sat-history")?.addEventListener("click",
|
||||
void (async () => {
|
||||
if (!await satWindow.trxUi.confirm({ title: "Clear satellite history?", message: "All stored satellite decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await satWindow.postPath?.("/clear_lrpt_decode");
|
||||
await hostCore.postPath("/clear_lrpt_decode");
|
||||
resetSatHistoryView();
|
||||
} catch (e) {
|
||||
console.error("Weather satellite history clear failed", e);
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/scheduler.ts
|
||||
var schedulerWindow = window;
|
||||
var wiredElements = /* @__PURE__ */ new WeakSet();
|
||||
@@ -6,6 +10,9 @@ function schedulerEl(id) {
|
||||
if (!element) throw new Error(`Missing scheduler element #${id}`);
|
||||
return element;
|
||||
}
|
||||
function schedulerOptionalEl(id) {
|
||||
return document.getElementById(id);
|
||||
}
|
||||
(function() {
|
||||
"use strict";
|
||||
let schedulerRole = null;
|
||||
@@ -359,8 +366,8 @@ function schedulerEl(id) {
|
||||
renderSatelliteSection();
|
||||
if (mode === "grayline" && currentConfig && currentConfig.grayline) {
|
||||
const gl = currentConfig.grayline;
|
||||
const lat = gl.lat ?? schedulerWindow.serverLat ?? "";
|
||||
const lon = gl.lon ?? schedulerWindow.serverLon ?? "";
|
||||
const lat = gl.lat ?? hostState.serverLat ?? "";
|
||||
const lon = gl.lon ?? hostState.serverLon ?? "";
|
||||
setInputValue("scheduler-gl-lat", lat != null ? lat : "");
|
||||
setInputValue("scheduler-gl-lon", lon != null ? lon : "");
|
||||
const gridEl = schedulerEl("scheduler-gl-grid");
|
||||
@@ -373,8 +380,8 @@ function schedulerEl(id) {
|
||||
renderBookmarkSelect("scheduler-gl-dusk", gl.dusk_bookmark_id);
|
||||
renderBookmarkSelect("scheduler-gl-night", gl.night_bookmark_id);
|
||||
} else if (mode === "grayline") {
|
||||
const lat = schedulerWindow.serverLat ?? "";
|
||||
const lon = schedulerWindow.serverLon ?? "";
|
||||
const lat = hostState.serverLat ?? "";
|
||||
const lon = hostState.serverLon ?? "";
|
||||
setInputValue("scheduler-gl-lat", lat != null ? lat : "");
|
||||
setInputValue("scheduler-gl-lon", lon != null ? lon : "");
|
||||
const gridEl2 = schedulerEl("scheduler-gl-grid");
|
||||
@@ -624,7 +631,7 @@ function schedulerEl(id) {
|
||||
return '<line class="sch-timeline-needle" x1="' + x.toFixed(1) + '" y1="2" x2="' + x.toFixed(1) + '" y2="38" /><polygon class="sch-timeline-needle-head" points="' + (x - 3).toFixed(1) + ",2 " + (x + 3).toFixed(1) + ",2 " + x.toFixed(1) + ',6" />';
|
||||
}
|
||||
function renderTimelineNeedle() {
|
||||
const g = schedulerEl("sch-timeline-needle-g");
|
||||
const g = schedulerOptionalEl("sch-timeline-needle-g");
|
||||
if (g) g.innerHTML = timelineNeedleSvg();
|
||||
}
|
||||
function schInlineEdit(tr, entry, idx) {
|
||||
@@ -1213,8 +1220,8 @@ function schedulerEl(id) {
|
||||
markDirty: markSchedulerDirty
|
||||
};
|
||||
schedulerWindow.trx.modules.scheduler = schedulerService;
|
||||
if (schedulerWindow.authRole != null) {
|
||||
initScheduler(schedulerWindow.lastActiveRigId ?? null, schedulerWindow.authRole);
|
||||
if (hostState.authRole != null) {
|
||||
initScheduler(hostState.lastActiveRigId, hostState.authRole);
|
||||
wireSchedulerEvents();
|
||||
}
|
||||
})();
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
import {
|
||||
hostCore,
|
||||
hostState
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/vchan.ts
|
||||
var vchanWindow = window;
|
||||
var vchanSessionId = null;
|
||||
@@ -63,7 +68,7 @@ function vchanStartSchedulerReleasePolling() {
|
||||
}
|
||||
async function vchanToggleSchedulerRelease() {
|
||||
if (!vchanSessionId) return;
|
||||
const rigId = vchanRigId || vchanWindow.lastActiveRigId || null;
|
||||
const rigId = vchanRigId || hostState.lastActiveRigId || null;
|
||||
try {
|
||||
const resp = await fetch("/scheduler-control", {
|
||||
method: "PUT",
|
||||
@@ -161,14 +166,12 @@ function vchanRender() {
|
||||
});
|
||||
picker.appendChild(addBtn);
|
||||
vchanSyncAccentUI();
|
||||
if (vchanWindow.updateDocumentTitle && vchanWindow.activeChannelRds) {
|
||||
vchanWindow.updateDocumentTitle(vchanWindow.activeChannelRds());
|
||||
}
|
||||
hostCore.updateDocumentTitle(hostCore.activeChannelRds());
|
||||
vchanRenderSchedulerRelease();
|
||||
}
|
||||
async function vchanAllocate() {
|
||||
if (!vchanSessionId || !vchanRigId) return;
|
||||
const freqHz = typeof vchanWindow.lastFreqHz === "number" && vchanWindow.lastFreqHz > 0 ? vchanWindow.lastFreqHz : 0;
|
||||
const freqHz = typeof hostState.lastFreqHz === "number" && hostState.lastFreqHz > 0 ? hostState.lastFreqHz : 0;
|
||||
const modeEl = document.getElementById("mode");
|
||||
const mode = modeEl ? modeEl.value || "USB" : "USB";
|
||||
try {
|
||||
@@ -251,11 +254,11 @@ async function vchanSubscribe(channelId) {
|
||||
}
|
||||
function vchanReconnectAudio() {
|
||||
const ch = vchanIsOnVirtual() ? vchanActiveChannel() : null;
|
||||
vchanWindow._audioChannelOverride = ch?.id ?? null;
|
||||
if (!vchanWindow.rxActive) return;
|
||||
vchanWindow.stopRxAudio?.();
|
||||
hostState.audioChannelOverride = ch?.id ?? null;
|
||||
if (!hostState.rxActive) return;
|
||||
hostCore.stopRxAudio();
|
||||
setTimeout(() => {
|
||||
vchanWindow.startRxAudio?.();
|
||||
hostCore.startRxAudio();
|
||||
}, 300);
|
||||
}
|
||||
function vchanApplyCapabilities(caps) {
|
||||
@@ -276,35 +279,34 @@ function vchanUpdateFreqDisplay() {
|
||||
if (!ch) return;
|
||||
const el = document.getElementById("freq");
|
||||
if (!el) return;
|
||||
if (vchanWindow.formatFreqForStep && typeof vchanWindow.jogUnit === "number") {
|
||||
el.value = vchanWindow.formatFreqForStep(ch.freq_hz, vchanWindow.jogUnit);
|
||||
} else {
|
||||
el.value = (ch.freq_hz / 1e6).toFixed(6).replace(/\.?0+$/, "");
|
||||
}
|
||||
el.value = hostCore.formatFreqForStep(ch.freq_hz, hostState.jogUnit);
|
||||
}
|
||||
function vchanSyncModeDisplay() {
|
||||
const modeEl = document.getElementById("mode");
|
||||
if (!modeEl) return;
|
||||
if (vchanIsOnVirtual()) {
|
||||
const ch = vchanActiveChannel();
|
||||
if (ch && ch.mode) modeEl.value = ch.mode.toUpperCase();
|
||||
if (ch && ch.mode) {
|
||||
modeEl.value = ch.mode.toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
}
|
||||
const modeUpper = (modeEl.value || "").toUpperCase();
|
||||
if (typeof vchanWindow.lastModeName === "string") {
|
||||
if (modeUpper === "WFM" && vchanWindow.lastModeName !== "WFM") {
|
||||
vchanWindow.setJogDivisor?.(10);
|
||||
vchanWindow.resetRdsDisplay?.();
|
||||
} else if (modeUpper !== "WFM" && vchanWindow.lastModeName === "WFM") {
|
||||
vchanWindow.resetRdsDisplay?.();
|
||||
if (typeof hostState.lastModeName === "string") {
|
||||
if (modeUpper === "WFM" && hostState.lastModeName !== "WFM") {
|
||||
hostCore.setJogDivisor(10);
|
||||
hostCore.resetRdsDisplay();
|
||||
} else if (modeUpper !== "WFM" && hostState.lastModeName === "WFM") {
|
||||
hostCore.resetRdsDisplay();
|
||||
}
|
||||
vchanWindow.lastModeName = modeUpper;
|
||||
hostState.lastModeName = modeUpper;
|
||||
}
|
||||
vchanWindow.updateWfmControls?.();
|
||||
vchanWindow.updateSdrSquelchControlVisibility?.();
|
||||
hostCore.updateWfmControls();
|
||||
hostCore.updateSdrSquelchControlVisibility();
|
||||
if (vchanWindow.refreshRdsUi) {
|
||||
vchanWindow.refreshRdsUi();
|
||||
} else {
|
||||
vchanWindow.positionRdsPsOverlay?.();
|
||||
hostCore.positionRdsPsOverlay();
|
||||
}
|
||||
}
|
||||
function vchanSyncBwDisplay() {
|
||||
@@ -314,12 +316,12 @@ function vchanSyncBwDisplay() {
|
||||
const bwEl = document.getElementById("spectrum-bw-input");
|
||||
if (!bwEl) return;
|
||||
let bwHz = ch.bandwidth_hz || 0;
|
||||
if (bwHz === 0 && vchanWindow.mwDefaultsForMode) {
|
||||
bwHz = vchanWindow.mwDefaultsForMode(ch.mode)[0] || 0;
|
||||
if (bwHz === 0) {
|
||||
bwHz = hostCore.mwDefaultsForMode(ch.mode)[0] || 0;
|
||||
}
|
||||
if (bwHz > 0) {
|
||||
bwEl.value = (bwHz / 1e3).toFixed(3).replace(/\.?0+$/, "");
|
||||
vchanWindow.currentBandwidthHz = bwHz;
|
||||
hostState.currentBandwidthHz = bwHz;
|
||||
}
|
||||
}
|
||||
function vchanSyncAccentUI() {
|
||||
@@ -333,25 +335,20 @@ function vchanSyncAccentUI() {
|
||||
vchanSyncModeDisplay();
|
||||
vchanSyncBwDisplay();
|
||||
} else {
|
||||
origRefreshFreqDisplay?.();
|
||||
}
|
||||
if (vchanWindow.updateDocumentTitle && vchanWindow.activeChannelRds) {
|
||||
vchanWindow.updateDocumentTitle(vchanWindow.activeChannelRds());
|
||||
hostCore.refreshFreqDisplay();
|
||||
}
|
||||
hostCore.updateDocumentTitle(hostCore.activeChannelRds());
|
||||
}
|
||||
var origRefreshFreqDisplay = null;
|
||||
function vchanSetChannelFreq(freqHz) {
|
||||
if (!vchanRigId || !vchanActiveId) return;
|
||||
if (vchanWindow.lastSpectrumData && vchanWindow.lastSpectrumData.sample_rate > 0) {
|
||||
const halfSpan = vchanWindow.lastSpectrumData.sample_rate / 2;
|
||||
const center = vchanWindow.lastSpectrumData.center_hz;
|
||||
if (hostState.lastSpectrumData && hostState.lastSpectrumData.sample_rate > 0) {
|
||||
const halfSpan = hostState.lastSpectrumData.sample_rate / 2;
|
||||
const center = hostState.lastSpectrumData.center_hz;
|
||||
if (Math.abs(freqHz - center) > halfSpan) {
|
||||
if (vchanWindow.showHint) {
|
||||
vchanWindow.showHint(
|
||||
`Out of SDR bandwidth (center ${(center / 1e6).toFixed(3)} MHz ±${(halfSpan / 1e3).toFixed(0)} kHz)`,
|
||||
3e3
|
||||
);
|
||||
}
|
||||
hostCore.showHint(
|
||||
`Out of SDR bandwidth (center ${(center / 1e6).toFixed(3)} MHz ±${(halfSpan / 1e3).toFixed(0)} kHz)`,
|
||||
3e3
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -411,6 +408,19 @@ async function vchanInterceptBandwidth(bwHz) {
|
||||
await vchanSetChannelBandwidth(bwHz);
|
||||
return true;
|
||||
}
|
||||
function vchanInterceptFrequency(freqHz) {
|
||||
if (!vchanIsOnVirtual()) return false;
|
||||
const targetHz = Math.round(freqHz);
|
||||
hostCore.armOptimisticFrequency(targetHz);
|
||||
hostCore.applyLocalTunedFrequency(targetHz);
|
||||
vchanSetChannelFreq(freqHz);
|
||||
return true;
|
||||
}
|
||||
function vchanInterceptFreqDisplay() {
|
||||
if (!vchanIsOnVirtual()) return false;
|
||||
vchanUpdateFreqDisplay();
|
||||
return true;
|
||||
}
|
||||
vchanWindow.trx ??= {};
|
||||
vchanWindow.trx.modules ??= {};
|
||||
vchanWindow.trx.modules.vchan = {
|
||||
@@ -427,27 +437,11 @@ vchanWindow.trx.modules.vchan = {
|
||||
isOnVirtual: vchanIsOnVirtual,
|
||||
interceptMode: vchanInterceptMode,
|
||||
interceptBandwidth: vchanInterceptBandwidth,
|
||||
interceptFrequency: vchanInterceptFrequency,
|
||||
interceptFreqDisplay: vchanInterceptFreqDisplay,
|
||||
takeSchedulerControl: vchanTakeSchedulerControl,
|
||||
releaseToScheduler: vchanToggleSchedulerRelease
|
||||
};
|
||||
(function() {
|
||||
const original = vchanWindow.setRigFrequency;
|
||||
vchanWindow.setRigFrequency = function(freqHz) {
|
||||
if (vchanIsOnVirtual()) {
|
||||
if (vchanWindow.applyLocalTunedFrequency) {
|
||||
if (typeof vchanWindow._freqOptimisticSeq === "number") {
|
||||
vchanWindow._freqOptimisticSeq += 1;
|
||||
vchanWindow._freqOptimisticHz = Math.round(freqHz);
|
||||
}
|
||||
vchanWindow.applyLocalTunedFrequency(Math.round(freqHz));
|
||||
}
|
||||
vchanSetChannelFreq(freqHz);
|
||||
return;
|
||||
}
|
||||
void vchanTakeSchedulerControl();
|
||||
original?.(freqHz);
|
||||
};
|
||||
})();
|
||||
(function initSchedulerReleaseControl() {
|
||||
const btn = document.getElementById("scheduler-release-btn");
|
||||
if (btn) {
|
||||
@@ -458,13 +452,3 @@ vchanWindow.trx.modules.vchan = {
|
||||
vchanStartSchedulerReleasePolling();
|
||||
vchanRenderSchedulerRelease();
|
||||
})();
|
||||
(function() {
|
||||
origRefreshFreqDisplay = vchanWindow.refreshFreqDisplay ?? null;
|
||||
vchanWindow.refreshFreqDisplay = function() {
|
||||
if (vchanIsOnVirtual()) {
|
||||
vchanUpdateFreqDisplay();
|
||||
return;
|
||||
}
|
||||
origRefreshFreqDisplay?.();
|
||||
};
|
||||
})();
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/vdes.ts
|
||||
var vdesWindow = window;
|
||||
var escapeVdesHtml = (input) => vdesWindow.escapeMapHtml?.(input) ?? input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """);
|
||||
var escapeVdesHtml = (input) => hostCore.escapeMapHtml(input);
|
||||
var vdesStatus = document.getElementById("vdes-status");
|
||||
var vdesMessagesEl = document.getElementById("vdes-messages");
|
||||
var vdesFilterInput = document.getElementById("vdes-filter");
|
||||
@@ -216,9 +220,7 @@ function onServerVdesBatch(messages) {
|
||||
minute: "2-digit",
|
||||
second: "2-digit"
|
||||
});
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -231,7 +233,7 @@ document.getElementById("settings-clear-vdes-history")?.addEventListener("click"
|
||||
void (async () => {
|
||||
if (!await vdesWindow.trxUi.confirm({ title: "Clear VDES history?", message: "All stored VDES decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await vdesWindow.postPath?.("/clear_vdes_decode");
|
||||
await hostCore.postPath("/clear_vdes_decode");
|
||||
resetVdesHistoryView();
|
||||
} catch (e) {
|
||||
console.error("VDES history clear failed", e);
|
||||
@@ -244,13 +246,15 @@ if (vdesFilterInput) {
|
||||
renderVdesHistory();
|
||||
});
|
||||
}
|
||||
function plotVdesMessage(msg) {
|
||||
if (msg.lat == null || msg.lon == null || !vdesWindow.vdesMapAddPoint) return;
|
||||
vdesWindow.vdesMapAddPoint(msg);
|
||||
}
|
||||
function onServerVdes(msg) {
|
||||
if (vdesStatus) vdesStatus.textContent = "Receiving";
|
||||
const next = normalizeServerVdesMessage(msg);
|
||||
addVdesMessage(next);
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
}
|
||||
function pruneVdesHistoryView() {
|
||||
pruneVdesMessageHistory();
|
||||
@@ -264,5 +268,9 @@ window.trxPluginRuntime.registerDecoder({
|
||||
onBatch: onServerVdesBatch,
|
||||
restore: onServerVdesBatch,
|
||||
reset: resetVdesHistoryView,
|
||||
prune: pruneVdesHistoryView
|
||||
prune: pruneVdesHistoryView,
|
||||
// Oldest first, so tracks are rebuilt in the order they happened.
|
||||
syncMap: () => {
|
||||
for (const entry of [...vdesMessageHistory].reverse()) plotVdesMessage(entry);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/wefax.ts
|
||||
var wefaxWindow = window;
|
||||
var wefaxDom = {
|
||||
@@ -299,7 +303,7 @@ if (wefaxDom.toggleBtn) {
|
||||
if (wefaxWindow.takeSchedulerControlForDecoderDisable) {
|
||||
await wefaxWindow.takeSchedulerControlForDecoderDisable(toggleButton);
|
||||
}
|
||||
await wefaxWindow.postPath?.("/toggle_wefax_decode");
|
||||
await hostCore.postPath("/toggle_wefax_decode");
|
||||
} catch (e) {
|
||||
console.error("WEFAX toggle failed", e);
|
||||
}
|
||||
@@ -310,7 +314,7 @@ if (wefaxDom.clearBtn) {
|
||||
wefaxDom.clearBtn.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
try {
|
||||
await wefaxWindow.postPath?.("/clear_wefax_decode");
|
||||
await hostCore.postPath("/clear_wefax_decode");
|
||||
resetWefaxHistoryView();
|
||||
} catch (e) {
|
||||
console.error("WEFAX clear failed", e);
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
hostCore
|
||||
} from "./chunk-KL66PICH.js";
|
||||
|
||||
// src/plugins/wspr.ts
|
||||
var wsprWindow = window;
|
||||
var wsprStatus = document.getElementById("wspr-status");
|
||||
@@ -229,7 +233,7 @@ wsprDecodeToggleBtn?.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
try {
|
||||
await wsprWindow.takeSchedulerControlForDecoderDisable?.(wsprDecodeToggleBtn);
|
||||
await wsprWindow.postPath?.("/toggle_wspr_decode");
|
||||
await hostCore.postPath("/toggle_wspr_decode");
|
||||
} catch (error) {
|
||||
console.error("WSPR toggle failed", error);
|
||||
}
|
||||
@@ -239,7 +243,7 @@ document.getElementById("settings-clear-wspr-history")?.addEventListener("click"
|
||||
void (async () => {
|
||||
if (!await wsprWindow.trxUi.confirm({ title: "Clear WSPR history?", message: "All stored WSPR decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await wsprWindow.postPath?.("/clear_wspr_decode");
|
||||
await hostCore.postPath("/clear_wspr_decode");
|
||||
resetWsprHistoryView();
|
||||
} catch (error) {
|
||||
console.error("WSPR history clear failed", error);
|
||||
|
||||
@@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
|
||||
<symbol id="icon-home" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M2.8 7 8 2.9 13.2 7"/><path d="M4.3 5.9V13h7.4V5.9"/><path d="M6.8 13V9.3h2.4V13"/></symbol>
|
||||
<symbol id="icon-bookmark" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M4 2h8v12l-4-2.5L4 14V2z"/></symbol>
|
||||
<symbol id="icon-signal" viewBox="0 0 16 16" fill="currentColor"><rect x="1" y="11" width="2.5" height="4" rx="0.5"/><rect x="4.75" y="8" width="2.5" height="7" rx="0.5"/><rect x="8.5" y="5" width="2.5" height="10" rx="0.5"/><rect x="12.25" y="2" width="2.5" height="13" rx="0.5"/></symbol>
|
||||
<symbol id="icon-digital" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M1 11.5h2.6V4.5h3.2v7h3.2v-7h3.2v7H15"/></symbol>
|
||||
<symbol id="icon-map" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M8 2a4 4 0 0 1 4 4c0 3-4 8-4 8S4 9 4 6a4 4 0 0 1 4-4z"/><circle cx="8" cy="6" r="1.2" fill="currentColor" stroke="none"/></symbol>
|
||||
<symbol id="icon-stats" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M2 14h12"/><rect x="3" y="8" width="2" height="6" rx="0.4" fill="currentColor" stroke="none" opacity="0.6"/><rect x="7" y="5" width="2" height="9" rx="0.4" fill="currentColor" stroke="none" opacity="0.75"/><rect x="11" y="2" width="2" height="12" rx="0.4" fill="currentColor" stroke="none" opacity="0.9"/></symbol>
|
||||
<symbol id="icon-record" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="8" r="6"/><circle cx="8" cy="8" r="2.5" fill="currentColor" stroke="none"/></symbol>
|
||||
@@ -46,14 +46,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="tab-bar-nav" aria-label="Primary navigation">
|
||||
<button class="tab active" data-tab="main">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-home"/></svg>
|
||||
<span class="tab-label">Main</span>
|
||||
<span class="tab-label">Radio</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="bookmarks">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-bookmark"/></svg>
|
||||
<span class="tab-label">Bookmarks</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="digital-modes">
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-signal"/></svg>
|
||||
<svg class="tab-icon" aria-hidden="true"><use href="#icon-digital"/></svg>
|
||||
<span class="tab-label">Digital modes</span>
|
||||
</button>
|
||||
<button class="tab" data-tab="map">
|
||||
@@ -85,7 +85,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="header-rec-btn" class="header-bar-btn header-rec-btn" type="button" aria-label="Toggle recording" title="Toggle recording">REC</button>
|
||||
<div class="header-rig-switch">
|
||||
<select id="header-rig-switch-select" aria-label="Select active rig"></select>
|
||||
<span id="header-rig-summary" class="header-rig-summary" aria-live="polite"></span>
|
||||
</div>
|
||||
<div class="header-style-pick">
|
||||
<select id="header-style-pick-select" aria-label="Select UI style">
|
||||
@@ -143,6 +142,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div id="spectrum-bookmark-side-left" class="spectrum-bookmark-side spectrum-bookmark-side-left" aria-hidden="true"></div>
|
||||
<canvas id="spectrum-canvas" tabindex="0" role="img" aria-label="Spectrum display" aria-describedby="spectrum-text-summary"></canvas>
|
||||
<p id="spectrum-text-summary" class="visually-hidden">Spectrum data is waiting for the receiver.</p>
|
||||
<div id="spectrum-squelch-line" class="spectrum-squelch-line" style="display:none;" data-state="closed">
|
||||
<span class="spectrum-squelch-grip" id="spectrum-squelch-grip" role="slider" tabindex="0"
|
||||
aria-label="Squelch threshold" aria-valuemin="-120" aria-valuemax="-30" aria-valuenow="-95">SQL <span id="spectrum-squelch-label">-95</span> dB</span>
|
||||
</div>
|
||||
<div id="spectrum-zoom-indicator" aria-hidden="true"></div>
|
||||
<div id="spectrum-minimap" aria-hidden="true"><div class="minimap-view"></div></div>
|
||||
<div id="spectrum-db-axis" aria-hidden="true"></div>
|
||||
@@ -206,38 +209,27 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="label"><span>Signal strength</span></div>
|
||||
</div>
|
||||
<div class="freq-field frequency-col">
|
||||
<input class="status-input" id="freq" type="text" value="--" aria-describedby="freq-label" aria-label="Tuned frequency" />
|
||||
<input class="status-input" id="freq" type="text" value="--" aria-describedby="freq-label" aria-label="Tuned frequency" autocomplete="off" autocorrect="off" spellcheck="false" />
|
||||
<div class="label" id="freq-label"><span>Frequency</span></div>
|
||||
</div>
|
||||
<div class="freq-field frequency-col center-frequency-col" id="center-freq-field" style="display:none;">
|
||||
<input class="status-input" id="center-freq" type="text" value="--" aria-describedby="center-freq-label" aria-label="SDR center frequency" />
|
||||
<input class="status-input" id="center-freq" type="text" value="--" aria-describedby="center-freq-label" aria-label="SDR center frequency" autocomplete="off" autocorrect="off" spellcheck="false" />
|
||||
<div class="label" id="center-freq-label"><span>Center Frequency</span></div>
|
||||
</div>
|
||||
<div class="freq-field unit-col">
|
||||
<div class="jog-step" id="jog-step">
|
||||
<button type="button" data-step="1000000">MHz</button>
|
||||
<button type="button" data-step="1000" class="active">kHz</button>
|
||||
<button type="button" data-step="1">Hz</button>
|
||||
</div>
|
||||
<div class="label"><span>Unit</span></div>
|
||||
</div>
|
||||
<div class="freq-field mult-col">
|
||||
<div class="jog-mult" id="jog-mult">
|
||||
<button type="button" data-mult="1" class="active" aria-label="Use full tune step">1x</button>
|
||||
<button type="button" data-mult="10" aria-label="Use one tenth tune step">0.1x</button>
|
||||
</div>
|
||||
<div class="label"><span>Step Scale</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="full-row controls-tray-shell">
|
||||
<div class="controls-tray-scroll">
|
||||
<div class="controls-tray">
|
||||
<div class="controls-row full-row">
|
||||
<div class="controls-col label-below-col">
|
||||
<div class="controls-col controls-col-mode label-below-col">
|
||||
<div class="label"><span>Mode</span></div>
|
||||
<div class="inline">
|
||||
<select class="status-input" id="mode" aria-label="Demodulation mode"></select>
|
||||
<!-- The select stays as the mode's value: a dozen call sites and
|
||||
several plugins read #mode.value. It is hidden from sight and
|
||||
from assistive tech; the buttons beside it are the control. -->
|
||||
<select class="visually-hidden" id="mode" tabindex="-1" aria-hidden="true"></select>
|
||||
<div id="mode-picker" class="mode-picker" role="group" aria-label="Demodulation mode"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-center">
|
||||
@@ -249,6 +241,35 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="jog-up" type="button" class="jog-btn">+</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-step">
|
||||
<div class="inline step-controls-inline">
|
||||
<div class="freq-field unit-col">
|
||||
<div class="jog-step" id="jog-step">
|
||||
<button type="button" data-step="1000000">MHz</button>
|
||||
<button type="button" data-step="1000" class="active">kHz</button>
|
||||
<button type="button" data-step="1">Hz</button>
|
||||
</div>
|
||||
<div class="label"><span>Unit</span></div>
|
||||
</div>
|
||||
<div class="freq-field mult-col">
|
||||
<div class="jog-mult" id="jog-mult">
|
||||
<button type="button" data-mult="1" class="active" aria-label="Use full tune step">1x</button>
|
||||
<button type="button" data-mult="10" aria-label="Use one tenth tune step">0.1x</button>
|
||||
</div>
|
||||
<div class="label"><span>Step Scale</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-power label-below-col" id="tx-power-col">
|
||||
<div class="label"><span>Transmit / Power</span></div>
|
||||
<div class="btn-grid">
|
||||
<button id="ptt-btn" type="button" aria-pressed="false">Start TX</button>
|
||||
<button id="power-btn" type="button" aria-pressed="false">Power On</button>
|
||||
<button id="lock-btn" type="button" aria-pressed="false">Lock Tuning</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="controls-row controls-row-mode full-row" id="mode-controls-row" style="display:none">
|
||||
<div class="controls-col controls-col-wfm label-below-col" id="wfm-controls-col" style="display:none;">
|
||||
<div class="inline wfm-controls-inline">
|
||||
<label class="wfm-control">
|
||||
@@ -306,14 +327,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</div>
|
||||
<div class="label"><span>SAM</span></div>
|
||||
</div>
|
||||
<div class="controls-col controls-col-power label-below-col" id="tx-power-col">
|
||||
<div class="label"><span>Transmit / Power</span></div>
|
||||
<div class="btn-grid">
|
||||
<button id="ptt-btn" type="button" aria-pressed="false">Start TX</button>
|
||||
<button id="power-btn" type="button" aria-pressed="false">Power On</button>
|
||||
<button id="lock-btn" type="button" aria-pressed="false">Lock Tuning</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="full-row label-below-row" id="vfo-row">
|
||||
<div class="label"><span>VFO</span></div>
|
||||
@@ -363,32 +376,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="vchan-picker" id="vchan-picker"></div>
|
||||
</div>
|
||||
</div>
|
||||
<details id="scheduler-controls" class="advanced-radio-controls scheduler-controls-section">
|
||||
<summary>Scheduler controls</summary>
|
||||
<div class="advanced-radio-body">
|
||||
<div class="scheduler-control-row" style="display:none">
|
||||
<div class="scheduler-release-wrap">
|
||||
<button id="scheduler-release-btn" type="button">Release to Scheduler</button>
|
||||
<div class="scheduler-step-controls">
|
||||
<button id="scheduler-prev-btn" type="button">Previous Entry</button>
|
||||
<button id="scheduler-next-btn" type="button">Next Entry</button>
|
||||
</div>
|
||||
<div id="scheduler-release-status" class="scheduler-release-status">Scheduler is controlling the rig.</div>
|
||||
<div id="scheduler-cycle-status" class="interleave-ring-wrap" style="display:none;">
|
||||
<svg class="interleave-ring" viewBox="0 0 36 36">
|
||||
<circle class="interleave-ring-bg" cx="18" cy="18" r="15.915" />
|
||||
<circle class="interleave-ring-fill" id="interleave-ring-fill" cx="18" cy="18" r="15.915"
|
||||
stroke-dasharray="100" stroke-dashoffset="100" />
|
||||
</svg>
|
||||
<div class="interleave-ring-text">
|
||||
<div class="interleave-ring-label" id="interleave-active-name">--</div>
|
||||
<div class="interleave-ring-sub" id="interleave-countdown">--</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
<div class="full-row label-below-row">
|
||||
<div class="label"><span>Signal</span></div>
|
||||
<div class="signal" style="gap: 1rem;">
|
||||
@@ -426,13 +413,51 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="inline" style="gap: 0.6rem; flex-wrap: wrap; align-items: center;">
|
||||
<button id="rx-audio-btn" type="button">Play Audio</button>
|
||||
<button id="tx-audio-btn" type="button">Transmit Audio</button>
|
||||
<label class="vol-label">RX<input type="range" id="rx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="rx-vol-pct">80%</small></label>
|
||||
<label class="vol-label">TX<input type="range" id="tx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="tx-vol-pct">80%</small></label>
|
||||
<label class="vol-label" id="sdr-squelch-wrap" style="display:none;">SQL<input type="range" id="sdr-squelch" min="0" max="100" value="0" class="vol-slider" /><small class="vol-pct" id="sdr-squelch-pct">Open</small><button id="sdr-squelch-auto" type="button" class="sql-auto-btn" title="Set squelch to current noise level">Auto</button></label>
|
||||
<div id="audio-level">
|
||||
<div id="audio-level-fill"></div>
|
||||
<span class="audio-group audio-volume-group">
|
||||
<span class="audio-group-label">Volume</span>
|
||||
<label class="vol-label">RX<input type="range" id="rx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="rx-vol-pct">80%</small></label>
|
||||
<label class="vol-label">TX<input type="range" id="tx-vol" min="0" max="100" value="80" class="vol-slider" /><small class="vol-pct" id="tx-vol-pct">80%</small></label>
|
||||
</span>
|
||||
<span class="sql-control" id="sdr-squelch-wrap" style="display:none;">
|
||||
<button id="sdr-squelch-toggle" type="button" class="sql-toggle" aria-pressed="false" title="Turn the squelch on or off"><span class="sql-state" id="sdr-squelch-state" data-state="off" aria-hidden="true"></span>SQL</button>
|
||||
<label class="sql-db"><input type="number" id="sdr-squelch-db" min="-120" max="-30" step="1" value="-95" inputmode="numeric" aria-label="Squelch threshold in dB" /><span class="sql-db-unit">dB</span></label>
|
||||
<button id="sdr-squelch-auto" type="button" class="sql-auto-btn" title="Set the threshold just above the noise floor">Auto</button>
|
||||
</span>
|
||||
<span class="audio-group audio-level-group">
|
||||
<span class="audio-group-label">Level</span>
|
||||
<div id="audio-level">
|
||||
<div id="audio-level-fill"></div>
|
||||
</div>
|
||||
<small id="audio-status">Off</small>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
<details id="scheduler-controls" class="advanced-radio-controls scheduler-controls-section">
|
||||
<summary>Scheduler controls</summary>
|
||||
<div class="advanced-radio-body">
|
||||
<div class="scheduler-control-row" style="display:none">
|
||||
<div class="scheduler-release-wrap">
|
||||
<div class="scheduler-action-row">
|
||||
<div class="scheduler-step-controls">
|
||||
<button id="scheduler-prev-btn" type="button">Previous Entry</button>
|
||||
<button id="scheduler-next-btn" type="button">Next Entry</button>
|
||||
</div>
|
||||
<button id="scheduler-release-btn" type="button">Release to Scheduler</button>
|
||||
<div id="scheduler-cycle-status" class="interleave-ring-wrap" style="display:none;">
|
||||
<svg class="interleave-ring" viewBox="0 0 36 36">
|
||||
<circle class="interleave-ring-bg" cx="18" cy="18" r="15.915" />
|
||||
<circle class="interleave-ring-fill" id="interleave-ring-fill" cx="18" cy="18" r="15.915"
|
||||
stroke-dasharray="100" stroke-dashoffset="100" />
|
||||
</svg>
|
||||
<div class="interleave-ring-text">
|
||||
<div class="interleave-ring-label" id="interleave-active-name">--</div>
|
||||
<div class="interleave-ring-sub" id="interleave-countdown">--</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<small id="audio-status" style="min-width: 60px;">Off</small>
|
||||
<div id="scheduler-release-status" class="scheduler-release-status">Scheduler is controlling the rig.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -655,19 +680,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="ais-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. MMSI, vessel, A)" />
|
||||
<small id="ais-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="ais-summary">
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Channels</span>
|
||||
<span id="ais-channel-summary" class="ais-summary-value">A 161.975 MHz · B 162.025 MHz</span>
|
||||
</div>
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Tracked</span>
|
||||
<span id="ais-vessel-count" class="ais-summary-value">0 vessels</span>
|
||||
</div>
|
||||
<div class="ais-summary-card">
|
||||
<span class="ais-summary-label">Latest</span>
|
||||
<span id="ais-latest-seen" class="ais-summary-value">No traffic yet</span>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-counts">
|
||||
<span id="ais-vessel-count" class="aprs-counts-value">0 vessels</span>
|
||||
<span id="ais-latest-seen" class="aprs-counts-value">No traffic yet</span>
|
||||
<span id="ais-channel-summary" class="aprs-counts-value">A 161.975 MHz · B 162.025 MHz</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="ais-messages"></div>
|
||||
</div>
|
||||
@@ -697,20 +715,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="aprs-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. SP2, beacon)" />
|
||||
<small id="aprs-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="aprs-summary">
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Frames</span>
|
||||
<span id="aprs-total-count" class="aprs-summary-value">0 total</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Visible</span>
|
||||
<span id="aprs-visible-count" class="aprs-summary-value">0 shown</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Latest</span>
|
||||
<span id="aprs-latest-seen" class="aprs-summary-value">No packets yet</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<button id="aprs-type-all" class="aprs-chip active" type="button">All</button>
|
||||
<button id="aprs-type-position" class="aprs-chip" type="button">Pos</button>
|
||||
@@ -718,11 +722,15 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="aprs-type-weather" class="aprs-chip" type="button">Wx</button>
|
||||
<button id="aprs-type-telemetry" class="aprs-chip" type="button">Tlm</button>
|
||||
<button id="aprs-type-other" class="aprs-chip" type="button">Other</button>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-filter-sep" aria-hidden="true"></span>
|
||||
<button id="aprs-only-pos-btn" class="aprs-chip" type="button">Pos Only</button>
|
||||
<button id="aprs-hide-crc-btn" class="aprs-chip" type="button">No CRC</button>
|
||||
<button id="aprs-collapse-dup-btn" class="aprs-chip" type="button">Dupes</button>
|
||||
<span class="aprs-counts">
|
||||
<span id="aprs-visible-count" class="aprs-counts-value">0 shown</span>
|
||||
<span id="aprs-total-count" class="aprs-counts-value">0 total</span>
|
||||
<span id="aprs-latest-seen" class="aprs-counts-value">No packets yet</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="aprs-packets"></div>
|
||||
</div>
|
||||
@@ -732,20 +740,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<input id="hf-aprs-filter" class="ft8-filter" type="text" placeholder="Filter (e.g. SP2, beacon)" />
|
||||
<small id="hf-aprs-status" style="color:var(--text-muted);">Waiting for server decode</small>
|
||||
</div>
|
||||
<div class="aprs-summary">
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Frames</span>
|
||||
<span id="hf-aprs-total-count" class="aprs-summary-value">0 total</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Visible</span>
|
||||
<span id="hf-aprs-visible-count" class="aprs-summary-value">0 shown</span>
|
||||
</div>
|
||||
<div class="aprs-summary-card">
|
||||
<span class="aprs-summary-label">Latest</span>
|
||||
<span id="hf-aprs-latest-seen" class="aprs-summary-value">No packets yet</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<button id="hf-aprs-type-all" class="aprs-chip active" type="button">All</button>
|
||||
<button id="hf-aprs-type-position" class="aprs-chip" type="button">Pos</button>
|
||||
@@ -753,11 +747,15 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<button id="hf-aprs-type-weather" class="aprs-chip" type="button">Wx</button>
|
||||
<button id="hf-aprs-type-telemetry" class="aprs-chip" type="button">Tlm</button>
|
||||
<button id="hf-aprs-type-other" class="aprs-chip" type="button">Other</button>
|
||||
</div>
|
||||
<div class="aprs-filter-row">
|
||||
<span class="aprs-filter-sep" aria-hidden="true"></span>
|
||||
<button id="hf-aprs-only-pos-btn" class="aprs-chip" type="button">Pos Only</button>
|
||||
<button id="hf-aprs-hide-crc-btn" class="aprs-chip" type="button">No CRC</button>
|
||||
<button id="hf-aprs-collapse-dup-btn" class="aprs-chip" type="button">Dupes</button>
|
||||
<span class="aprs-counts">
|
||||
<span id="hf-aprs-visible-count" class="aprs-counts-value">0 shown</span>
|
||||
<span id="hf-aprs-total-count" class="aprs-counts-value">0 total</span>
|
||||
<span id="hf-aprs-latest-seen" class="aprs-counts-value">No packets yet</span>
|
||||
</span>
|
||||
</div>
|
||||
<div id="hf-aprs-packets"></div>
|
||||
</div>
|
||||
@@ -1003,48 +1001,52 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<template id="tmpl-map">
|
||||
<div id="map-stage">
|
||||
<div class="map-overlay-panel">
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Filter by</span>
|
||||
<div id="map-locator-phase" class="map-locator-phase-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label" id="map-locator-choice-label">Show</span>
|
||||
<div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Rig</span>
|
||||
<select id="map-rig-filter" class="map-history-select" aria-label="Filter by rig">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Search</span>
|
||||
<input type="text" id="map-search-filter" class="map-search-input" placeholder="Callsign, MMSI, locator, message..." />
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">History</span>
|
||||
<select id="map-history-limit" class="map-history-select" aria-label="Map history limit">
|
||||
<option value="15">15 min</option>
|
||||
<option value="30">30 min</option>
|
||||
<option value="60">1 hr</option>
|
||||
<option value="180">3 hrs</option>
|
||||
<option value="360">6 hrs</option>
|
||||
<option value="720">12 hrs</option>
|
||||
<option value="1440">24 hrs</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Paths</span>
|
||||
<div class="map-locator-phase-row">
|
||||
<button type="button" id="map-p2p-paths-toggle" class="map-locator-phase-btn">TRX Paths On</button>
|
||||
<button type="button" id="map-contact-paths-toggle" class="map-locator-phase-btn">Contact Paths On</button>
|
||||
<span class="map-locator-empty">TRX paths on popup, directed decode paths when target locator is known</span>
|
||||
<div class="map-overlay-filters">
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Filter</span>
|
||||
<div id="map-locator-phase" class="map-locator-phase-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label" id="map-locator-choice-label">Show</span>
|
||||
<div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Rig</span>
|
||||
<select id="map-rig-filter" class="map-history-select" aria-label="Filter by rig">
|
||||
<option value="">All</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">History</span>
|
||||
<select id="map-history-limit" class="map-history-select" aria-label="Map history limit">
|
||||
<option value="15">15 min</option>
|
||||
<option value="30">30 min</option>
|
||||
<option value="60">1 hr</option>
|
||||
<option value="180">3 hrs</option>
|
||||
<option value="360">6 hrs</option>
|
||||
<option value="720">12 hrs</option>
|
||||
<option value="1440">24 hrs</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="map-locator-filter-group">
|
||||
<span class="map-locator-filter-label">Paths</span>
|
||||
<div class="map-locator-phase-row">
|
||||
<button type="button" id="map-p2p-paths-toggle" class="map-locator-phase-btn" aria-pressed="true" title="TRX paths are drawn from a station popup">TRX</button>
|
||||
<button type="button" id="map-contact-paths-toggle" class="map-locator-phase-btn" aria-pressed="true" title="Directed decode paths are drawn when the target locator is known">Contact</button>
|
||||
<span class="map-paths-hint">TRX paths on popup, directed decode paths when target locator is known</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Last, so the search field takes whatever the fixed-width
|
||||
groups leave on the bar's final row rather than a sliver. -->
|
||||
<div class="map-locator-filter-group map-filter-grow">
|
||||
<span class="map-locator-filter-label">Search</span>
|
||||
<input type="text" id="map-search-filter" class="map-search-input" placeholder="Callsign, MMSI, locator, message..." />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="map-corner-controls">
|
||||
<button type="button" id="map-fullscreen-btn" class="map-fullscreen-btn">Fullscreen</button>
|
||||
<button type="button" id="map-overlay-toggle-btn" class="map-overlay-toggle-btn">Hide Filters</button>
|
||||
<div class="map-overlay-actions">
|
||||
<button type="button" id="map-fullscreen-btn" class="map-fullscreen-btn">Fullscreen</button>
|
||||
<button type="button" id="map-overlay-toggle-btn" class="map-overlay-toggle-btn">Hide Filters</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="map-band-legend" class="map-band-legend" aria-label="Band color legend"></div>
|
||||
<div id="aprs-map"></div>
|
||||
@@ -1052,6 +1054,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</template>
|
||||
</div>
|
||||
<div id="tab-statistics" class="tab-panel" style="display:none;">
|
||||
<h2 class="section-heading">Statistics</h2>
|
||||
<template id="tmpl-statistics">
|
||||
<div class="stats-controls">
|
||||
<div class="stats-control-group">
|
||||
@@ -1192,6 +1195,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</section>
|
||||
</div>
|
||||
<div id="tab-settings" class="tab-panel" style="display:none;">
|
||||
<h2 class="section-heading">Settings</h2>
|
||||
<div class="sub-tab-bar">
|
||||
<button class="sub-tab active" data-subtab="settings-scheduler">Scheduler</button>
|
||||
<button class="sub-tab" data-subtab="settings-background-decode">Background Decode</button>
|
||||
@@ -1487,6 +1491,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-about" class="tab-panel" style="display:none;">
|
||||
<h2 class="section-heading">About</h2>
|
||||
<div id="auth-badge" style="display:none; margin-bottom: 1rem; padding: 0.5rem; background: var(--bg-secondary); border-radius: 0.25rem; color: var(--text-muted); font-size: 0.85rem;">Authenticated as: <strong id="auth-role-badge">--</strong></div>
|
||||
<template id="tmpl-about">
|
||||
<div class="sub-tab-bar">
|
||||
@@ -1592,10 +1597,13 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</template>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="copyright">
|
||||
Built by <a href="https://www.qrzcq.com/call/SP2SJG" target="_blank" rel="noopener">SP2SJG</a> from <a href="https://haxx.space" target="_blank" rel="noopener">haxx.space</a> · <span class="gh-link-wrap"><a class="gh-link" href="https://git.haxx.space/sjg/trx-rs" target="_blank" rel="noopener" aria-label="Open trx-rs source repository"><svg class="gh-link-icon" viewBox="0 0 16 16" aria-hidden="true"><path d="M9.5 3.25a2.25 2.25 0 1 1 3 2.122V6A2.5 2.5 0 0 1 10 8.5H6a1 1 0 0 0-1 1v1.128a2.251 2.251 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.5 0v1.836A2.493 2.493 0 0 1 6 7h4a1 1 0 0 0 1-1v-.628A2.25 2.25 0 0 1 9.5 3.25Zm-6 0a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Zm8.25-.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM4.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z"></path></svg><span>trx-rs source</span></a></span> — <span id="copyright-year"></span>
|
||||
<div class="footer-meta">
|
||||
<span class="copyright">
|
||||
Built by <a href="https://www.qrzcq.com/call/SP2SJG" target="_blank" rel="noopener">SP2SJG</a> from <a href="https://haxx.space" target="_blank" rel="noopener">haxx.space</a> · © <span id="copyright-year"></span>
|
||||
</span>
|
||||
<span class="gh-link-wrap"><a class="gh-link" href="https://git.haxx.space/sjg/trx-rs" target="_blank" rel="noopener" aria-label="Open trx-rs source repository"><svg class="gh-link-icon" viewBox="0 0 16 16" aria-hidden="true"><path d="M9.5 3.25a2.25 2.25 0 1 1 3 2.122V6A2.5 2.5 0 0 1 10 8.5H6a1 1 0 0 0-1 1v1.128a2.251 2.251 0 1 1-1.5 0V5.372a2.25 2.25 0 1 1 1.5 0v1.836A2.493 2.493 0 0 1 6 7h4a1 1 0 0 0 1-1v-.628A2.25 2.25 0 0 1 9.5 3.25Zm-6 0a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Zm8.25-.75a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM4.25 12a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Z"></path></svg><span>trx-rs source</span></a></span>
|
||||
</div>
|
||||
<div class="hint" id="power-hint" aria-live="polite">Connecting…</div>
|
||||
<div class="hint" id="power-hint" data-state="busy" aria-live="polite">Connecting…</div>
|
||||
</div>
|
||||
<div id="conn-lost-overlay" class="decode-history-overlay content-overlay is-hidden" aria-live="assertive" aria-atomic="true">
|
||||
<div class="decode-history-overlay-card">
|
||||
@@ -1629,11 +1637,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
<div class="shortcut-overlay-hint">Press <kbd>F1</kbd> or <kbd>Esc</kbd> to close</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="decode-history-overlay" class="decode-history-overlay is-hidden" aria-live="polite" aria-atomic="true">
|
||||
<div class="decode-history-overlay-card">
|
||||
<div id="decode-history-overlay-title" class="decode-history-overlay-title">Loading decode history…</div>
|
||||
<div id="decode-history-overlay-sub" class="decode-history-overlay-sub">Preparing recent decodes for the UI</div>
|
||||
<div id="decode-history-overlay" class="history-progress is-hidden" role="status" aria-live="polite" aria-atomic="true">
|
||||
<div class="history-progress-text">
|
||||
<span id="decode-history-overlay-title" class="history-progress-title">Loading decode history…</span>
|
||||
<span id="decode-history-overlay-sub" class="history-progress-sub">Preparing recent decodes for the UI</span>
|
||||
</div>
|
||||
<span class="history-progress-track"><span id="decode-history-progress-bar" class="history-progress-bar"></span></span>
|
||||
</div>
|
||||
<script defer src="/vendor/opus-decoder-0.7.11.min.js" charset="UTF-8"></script>
|
||||
<script defer src="/vendor/leaflet.js"></script>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
|
After Width: | Height: | Size: 105 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 93 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -12,7 +12,7 @@
|
||||
"typecheck": "tsc --project tsconfig.json && tsc --project tsconfig.worker.json",
|
||||
"lint": "eslint \"src/**/*.ts\" \"tests/**/*.mjs\" build.mjs --no-error-on-unmatched-pattern",
|
||||
"test": "node --test tests/*.test.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs",
|
||||
"test:browser": "node tests/browser-smoke.mjs && node tests/spectrum-layout.mjs && node tests/decode-flow.mjs",
|
||||
"verify-generated": "npm run generate-types && npm run build && git diff --exit-code -- ../assets/web/generated src/api/generated.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -42,6 +42,9 @@ source change.
|
||||
- `core/` contains dependency-light shared helpers.
|
||||
- `features/` contains application behavior grouped by responsibility.
|
||||
- `plugins/` contains lazy decoder and high-coupling feature entries.
|
||||
- `plugins/host.ts` declares the typed `window.trx` state and services that
|
||||
feature bundles read; feature entries import it rather than reaching for bare
|
||||
`window` properties, which the module graph does not publish.
|
||||
- Files under `assets/web/vendor/` are vendored JavaScript and are not part of
|
||||
the TypeScript migration.
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import type * as Leaflet from "leaflet";
|
||||
import { aprsSymbolSprite } from "./plugins/aprs-shared";
|
||||
import type { PluginRuntimeWindow } from "./plugins/runtime-contract";
|
||||
|
||||
export {};
|
||||
|
||||
@@ -228,6 +230,8 @@ const mapWindow = window as unknown as MapWindow;
|
||||
const mapMarkers = new Set<TrxLayer>();
|
||||
const DEFAULT_MAP_SOURCE_FILTER: Record<MapFilterKey, boolean> = { ais: true, vdes: true, aprs: true, bookmark: false, ft8: true, ft4: true, ft2: true, wspr: true, sat: false };
|
||||
const mapFilter: Record<MapFilterKey, boolean> = { ...DEFAULT_MAP_SOURCE_FILTER };
|
||||
/** Chip key that clears a selection rather than naming a band or a source. */
|
||||
const MAP_FILTER_ALL_KEY = "__all";
|
||||
const mapLocatorFilter: { phase: "band" | "type"; bands: Set<string> } = { phase: "band", bands: new Set() };
|
||||
let mapSearchFilter = "";
|
||||
let mapRigFilter = ""; // "" = all rigs
|
||||
@@ -1077,38 +1081,42 @@ const mapWindow = window as unknown as MapWindow;
|
||||
container.innerHTML = `<span class="map-locator-empty">No ${kind === "band" ? "bands" : "sources"} available</span>`;
|
||||
return;
|
||||
}
|
||||
let helperText = "";
|
||||
const noun = kind === "band" ? "bands" : "sources";
|
||||
const sourceKeys = kind === "source" ? Object.keys(DEFAULT_MAP_SOURCE_FILTER) as MapFilterKey[] : [];
|
||||
const noneSelected = kind === "source" && sourceKeys.every((k) => !mapFilter[k]);
|
||||
if (kind === "source") {
|
||||
if (noneSelected) {
|
||||
helperText = "All sources visible \u2014 click to filter";
|
||||
}
|
||||
} else if (!(selectedSet instanceof Set) || selectedSet.size === 0) {
|
||||
helperText = `All ${kind === "band" ? "bands" : "sources"} visible by default`;
|
||||
}
|
||||
// Selecting nothing selects everything, for both kinds.
|
||||
const showingAll = kind === "source"
|
||||
? sourceKeys.every((k) => !mapFilter[k])
|
||||
: !(selectedSet instanceof Set) || selectedSet.size === 0;
|
||||
// An "All" chip carries what a sentence of helper text used to say, in a
|
||||
// width the bar can afford, and gives the selection somewhere to be undone.
|
||||
const allChip = document.createElement("button");
|
||||
allChip.type = "button";
|
||||
allChip.className = "map-locator-chip map-locator-chip-all";
|
||||
if (showingAll) allChip.classList.add("is-active");
|
||||
allChip.dataset.filterKind = kind;
|
||||
allChip.dataset.filterKey = MAP_FILTER_ALL_KEY;
|
||||
allChip.setAttribute("aria-pressed", showingAll ? "true" : "false");
|
||||
allChip.title = showingAll ? `All ${noun} shown` : `Show all ${noun}`;
|
||||
allChip.innerHTML = `<span class="map-locator-chip-text">All</span>`;
|
||||
container.appendChild(allChip);
|
||||
for (const item of items) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.className = "map-locator-chip";
|
||||
const isActive = kind === "source" ? !!mapFilter[item.key as MapFilterKey] : !!selectedSet?.has(item.key);
|
||||
if (kind === "source" && noneSelected) {
|
||||
// Nothing is filtered out yet, so no chip is dimmed as if it were.
|
||||
if (showingAll) {
|
||||
btn.classList.add("is-default");
|
||||
} else if (!isActive) {
|
||||
btn.classList.add("is-inactive");
|
||||
}
|
||||
btn.setAttribute("aria-pressed", !showingAll && isActive ? "true" : "false");
|
||||
btn.dataset.filterKind = kind;
|
||||
btn.dataset.filterKey = item.key;
|
||||
btn.style.setProperty("--chip-color", item.color);
|
||||
btn.innerHTML = `<span class="map-locator-chip-text">${escapeMapHtml(item.label)}</span>`;
|
||||
container.appendChild(btn);
|
||||
}
|
||||
if (helperText) {
|
||||
const hint = document.createElement("span");
|
||||
hint.className = "map-locator-empty";
|
||||
hint.textContent = helperText;
|
||||
container.appendChild(hint);
|
||||
}
|
||||
}
|
||||
|
||||
function renderMapLocatorPhaseRow(container: HTMLElement, phase: "band" | "type"): void {
|
||||
@@ -1232,11 +1240,12 @@ const mapWindow = window as unknown as MapWindow;
|
||||
if (!phaseEl || !choiceEl || !choiceLabelEl) return;
|
||||
|
||||
renderMapLocatorPhaseRow(phaseEl, mapLocatorFilter.phase);
|
||||
// The phase buttons next door already name the dimension; "Show" is the
|
||||
// rest of the sentence, and it keeps the bar's labels a uniform width.
|
||||
choiceLabelEl.textContent = "Show";
|
||||
if (mapLocatorFilter.phase === "band") {
|
||||
choiceLabelEl.textContent = "Visible Bands";
|
||||
renderMapLocatorChipRow(choiceEl, bandItems, mapLocatorFilter.bands, "band");
|
||||
} else {
|
||||
choiceLabelEl.textContent = "Visible Sources";
|
||||
renderMapLocatorChipRow(choiceEl, sourceItems, null, "source");
|
||||
}
|
||||
syncLocatorMarkerStyles();
|
||||
@@ -1635,7 +1644,10 @@ const mapWindow = window as unknown as MapWindow;
|
||||
function applyMapOverlayPanelVisibility() {
|
||||
const panel = document.querySelector("#map-stage .map-overlay-panel");
|
||||
if (!panel) return;
|
||||
panel.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
// Only the filters collapse. The bar itself stays, because it carries the
|
||||
// button that brings them back.
|
||||
panel.classList.toggle("filters-hidden", !mapOverlayPanelVisible);
|
||||
panel.querySelector(".map-overlay-filters")?.classList.toggle("is-hidden", !mapOverlayPanelVisible);
|
||||
}
|
||||
|
||||
function updateMapOverlayToggleButton() {
|
||||
@@ -1858,7 +1870,14 @@ const mapWindow = window as unknown as MapWindow;
|
||||
const kind = String(chip.dataset.filterKind || "");
|
||||
const key = String(chip.dataset.filterKey || "");
|
||||
if (!key) return;
|
||||
if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
if (key === MAP_FILTER_ALL_KEY) {
|
||||
// Back to no selection at all, which is what shows everything.
|
||||
if (kind === "source") {
|
||||
for (const srcKey of Object.keys(DEFAULT_MAP_SOURCE_FILTER) as MapFilterKey[]) mapFilter[srcKey] = false;
|
||||
} else {
|
||||
mapLocatorFilter.bands.clear();
|
||||
}
|
||||
} else if (kind === "source" && Object.prototype.hasOwnProperty.call(mapFilter, key)) {
|
||||
// toggle the clicked source; when none are selected everything is shown
|
||||
const sourceKey = key as MapFilterKey;
|
||||
mapFilter[sourceKey] = !mapFilter[sourceKey];
|
||||
@@ -1979,48 +1998,43 @@ const mapWindow = window as unknown as MapWindow;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
return;
|
||||
}
|
||||
// Everything below is the windowed path — the fullscreen branch returned.
|
||||
// The map tab is a whole page, so the stage fills the column down to the
|
||||
// footer. Capping it at a fraction of the viewport, or at a width-derived
|
||||
// aspect ratio, left a dead band under the map that grew with the window
|
||||
// (and on narrow screens made the map barely a third of the page).
|
||||
const mapRect = mapContainer.getBoundingClientRect();
|
||||
const width = mapContainer.clientWidth || mapRect.width;
|
||||
const footer = document.querySelector(".footer");
|
||||
let bottom = mapIsFullscreen() && stage
|
||||
? stage.getBoundingClientRect().bottom
|
||||
: window.innerHeight;
|
||||
if (!mapIsFullscreen() && footer) {
|
||||
let bottom = window.innerHeight;
|
||||
if (footer) {
|
||||
const fr = footer.getBoundingClientRect();
|
||||
if (fr.top > mapRect.top + 50) bottom = fr.top;
|
||||
// Clamped to the viewport: once the column is tall enough to push the
|
||||
// footer below the fold, growing into it would push it further still.
|
||||
if (fr.top > mapRect.top + 50) bottom = Math.min(fr.top, bottom);
|
||||
}
|
||||
const available = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
const widthDriven = width > 0 ? Math.floor(width / 1.55) : available;
|
||||
const viewportCap = mapIsFullscreen()
|
||||
? Math.floor(window.innerHeight * 0.9)
|
||||
: Math.floor(window.innerHeight * 0.75);
|
||||
const minHeight = Math.min(260, available);
|
||||
const target = Math.max(minHeight, Math.min(available, viewportCap, widthDriven));
|
||||
const target = Math.max(0, Math.floor(bottom - mapRect.top - 8));
|
||||
mapContainer.style.height = `${target}px`;
|
||||
if (aprsMap) aprsMap.invalidateSize();
|
||||
}
|
||||
|
||||
function aprsSymbolIcon(symbolTable: string, symbolCode: string): Leaflet.DivIcon | null {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const table = symbolTable === "/" ? "primary" : "alternate";
|
||||
const sprite = aprsSymbolSprite(symbolTable, symbolCode);
|
||||
const html = sprite
|
||||
? `<div class="aprs-symbol aprs-symbol-marker ${sprite.className}" role="img"` +
|
||||
` style="background-position:${sprite.backgroundPosition}"` +
|
||||
` title="${escapeMapHtml(sprite.label)}" aria-label="${escapeMapHtml(sprite.label)}"></div>`
|
||||
: `<div class="aprs-symbol aprs-symbol-marker aprs-symbol-local" title="${symbolTable === "/" ? "primary" : "alternate"} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`;
|
||||
return L.divIcon({
|
||||
className: "",
|
||||
html: `<div class="aprs-symbol-local" title="${table} APRS symbol ${escapeMapHtml(symbolCode)}">${escapeMapHtml(symbolCode)}</div>`,
|
||||
html,
|
||||
iconSize: [24, 24],
|
||||
iconAnchor: [12, 12],
|
||||
popupAnchor: [0, -12]
|
||||
});
|
||||
}
|
||||
|
||||
mapWindow.navigateToAprsMap = function(lat, lon) {
|
||||
// Activate the map tab
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => { t.classList.remove("active"); });
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => (p.style.display = "none"));
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
function focusMapPosition(lat: number, lon: number) {
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (aprsMap) {
|
||||
@@ -2032,20 +2046,12 @@ const mapWindow = window as unknown as MapWindow;
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mapWindow.navigateToMapLocator = function(grid, preferredType = null) {
|
||||
function focusMapLocator(grid: string, preferredType: string | null = null) {
|
||||
const normalizedGrid = String(grid || "").trim().toUpperCase();
|
||||
if (!/^[A-R]{2}\d{2}(?:[A-X]{2})?$/.test(normalizedGrid)) return false;
|
||||
|
||||
T._activeTab = "map";
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => { t.classList.remove("active"); });
|
||||
const mapTabBtn = document.querySelector(".tab-bar .tab[data-tab='map']");
|
||||
if (mapTabBtn) mapTabBtn.classList.add("active");
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => (p.style.display = "none"));
|
||||
const mapPanel = mapEl("tab-map");
|
||||
if (mapPanel) mapPanel.style.display = "";
|
||||
|
||||
initAprsMap();
|
||||
sizeAprsMapToViewport();
|
||||
if (!aprsMap) return false;
|
||||
@@ -2095,7 +2101,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
requestAnimationFrame(focusMarker);
|
||||
});
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -2592,18 +2598,26 @@ const mapWindow = window as unknown as MapWindow;
|
||||
syncDecodeContactPathVisibility();
|
||||
}
|
||||
|
||||
// The buttons light up when they are on, so the label need not repeat it —
|
||||
// an "On"/"Off" suffix on each cost the bar most of a row.
|
||||
function updateMapContactPathsToggle() {
|
||||
const btn = mapEl("map-contact-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapDecodeContactPathsEnabled ? "Contact Paths On" : "Contact Paths Off";
|
||||
btn.classList.toggle("is-active", mapDecodeContactPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapDecodeContactPathsEnabled ? "true" : "false");
|
||||
btn.title = mapDecodeContactPathsEnabled
|
||||
? "Directed decode paths are drawn when the target locator is known"
|
||||
: "Directed decode paths are hidden";
|
||||
}
|
||||
|
||||
function updateMapP2pPathsToggle() {
|
||||
const btn = mapEl("map-p2p-paths-toggle");
|
||||
if (!btn) return;
|
||||
btn.textContent = mapP2pRadioPathsEnabled ? "TRX Paths On" : "TRX Paths Off";
|
||||
btn.classList.toggle("is-active", mapP2pRadioPathsEnabled);
|
||||
btn.setAttribute("aria-pressed", mapP2pRadioPathsEnabled ? "true" : "false");
|
||||
btn.title = mapP2pRadioPathsEnabled
|
||||
? "TRX paths are drawn from a station popup"
|
||||
: "TRX paths are hidden";
|
||||
}
|
||||
|
||||
function scheduleDecodeMapMaintenance() {
|
||||
@@ -2806,7 +2820,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
selectedMapQsoKey = selectedMapQsoKey === entry.pathKey ? null : entry.pathKey ?? null;
|
||||
syncDecodeContactPathVisibility();
|
||||
if (selectedMapQsoKey && entry.sourceGrid) {
|
||||
mapWindow.navigateToMapLocator?.(entry.sourceGrid, entry.sourceType);
|
||||
focusMapLocator(entry.sourceGrid, entry.sourceType);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2933,7 +2947,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -3059,7 +3073,7 @@ const mapWindow = window as unknown as MapWindow;
|
||||
card.className = "map-qso-card";
|
||||
if (entry.grid) {
|
||||
card.addEventListener("click", () => {
|
||||
mapWindow.navigateToMapLocator?.(entry.grid ?? "", entry.sourceType);
|
||||
focusMapLocator(entry.grid ?? "", entry.sourceType);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -3623,6 +3637,8 @@ const mapWindow = window as unknown as MapWindow;
|
||||
// Register module API for core to call
|
||||
modules.map = {
|
||||
initAprsMap,
|
||||
focusMapPosition,
|
||||
focusMapLocator,
|
||||
sizeAprsMapToViewport,
|
||||
syncAprsReceiverMarker,
|
||||
updateMapRigFilter,
|
||||
@@ -3672,6 +3688,18 @@ const mapWindow = window as unknown as MapWindow;
|
||||
reverseGeocodeLocation,
|
||||
};
|
||||
|
||||
// Everything the decoders already hold goes onto the map now. This module is
|
||||
// lazy -- it arrives when the Map tab is first opened, long after startup
|
||||
// restored the decode history -- and until it does, aprsMapAddStation and
|
||||
// friends are undefined, so every restored position was dropped on the floor.
|
||||
// The map then showed only what arrived live after it loaded, which is why it
|
||||
// took a second reload (with the module cached, and so loaded early enough to
|
||||
// win the race against the history fetch) for the stations to appear.
|
||||
//
|
||||
// The add functions are keyed by callsign/MMSI/point, so replaying costs
|
||||
// nothing on a second call and cannot duplicate a marker.
|
||||
(window as unknown as PluginRuntimeWindow).trxPluginRuntime.syncMapAll();
|
||||
|
||||
// If the map tab is already visible (direct /map URL), init immediately.
|
||||
autoInitIfVisible();
|
||||
})();
|
||||
|
||||
@@ -5,7 +5,14 @@
|
||||
type PluginGroup = "digital-modes" | "map-data" | "map" | "statistics" | "bookmarks" | "recorder" | "settings";
|
||||
|
||||
const pluginGroups: Readonly<Record<PluginGroup, readonly string[]>> = {
|
||||
"digital-modes": ["/ft8.js", "/ft4.js", "/ft2.js", "/wspr.js", "/cw.js", "/background-decode.js", "/sat.js", "/wefax.js"],
|
||||
// AIS, VDES and the two APRS decoders have panels on this tab, so they load
|
||||
// with it. They used to come only with the map group, which left their
|
||||
// sub-tabs empty — decodes queueing in the runtime — until something opened
|
||||
// the Map tab. Their map calls are optional, so map-core stays lazy.
|
||||
"digital-modes": [
|
||||
"/ft8.js", "/ft4.js", "/ft2.js", "/wspr.js", "/cw.js", "/background-decode.js",
|
||||
"/sat.js", "/wefax.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js",
|
||||
],
|
||||
"map-data": ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js"],
|
||||
map: ["/map-core.js", "/ais.js", "/vdes.js", "/aprs.js", "/hf-aprs.js", "/sat.js", "/sat-scheduler.js"],
|
||||
statistics: ["/map-core.js"],
|
||||
|
||||
@@ -81,6 +81,7 @@ const runtime: TrxPluginRuntime = {
|
||||
plugin.prune();
|
||||
return true;
|
||||
},
|
||||
syncMapAll() { for (const plugin of decoders.values()) plugin.syncMap?.(); },
|
||||
clearQueued() { queued.clear(); },
|
||||
hasDecoder: (id) => decoders.has(id),
|
||||
};
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract";
|
||||
@@ -25,24 +27,18 @@ interface AisMessage {
|
||||
}
|
||||
interface AisChannelInfo { label: string; badgeClass: string; freqText: string }
|
||||
interface AisBridge {
|
||||
navigateToAprsMap?: (lat: number, lon: number) => void;
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
escapeMapHtml?: (input: string) => string;
|
||||
buildAisVesselUrl?: (mmsi: number | null | undefined) => string | null;
|
||||
serverLat?: number | null;
|
||||
serverLon?: number | null;
|
||||
haversineKm?: (lat1: number, lon1: number, lat2: number, lon2: number) => number;
|
||||
aisMapAddVessel?: (message: AisMessage) => void;
|
||||
clearMapMarkersByType?: (type: string) => void;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
updateAisBar?: () => void;
|
||||
clearAisBar?: () => void;
|
||||
}
|
||||
const aisWindow = window as unknown as AisBridge;
|
||||
const escapeAisHtml = (input: string): string => aisWindow.escapeMapHtml?.(input) ?? input
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """);
|
||||
const escapeAisHtml = (input: string): string => hostCore.escapeMapHtml(input);
|
||||
|
||||
// --- AIS Decoder Plugin (server-side decode) ---
|
||||
const aisStatus = document.getElementById("ais-status");
|
||||
@@ -176,10 +172,10 @@ function aisRouteText(msg: AisMessage): string {
|
||||
}
|
||||
|
||||
function aisDistanceText(msg: AisMessage): string {
|
||||
if (aisWindow.serverLat == null || aisWindow.serverLon == null || msg.lat == null || msg.lon == null || !aisWindow.haversineKm) {
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || msg.lat == null || msg.lon == null) {
|
||||
return "";
|
||||
}
|
||||
const distKm = aisWindow.haversineKm(aisWindow.serverLat, aisWindow.serverLon, msg.lat, msg.lon);
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, msg.lat, msg.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1000)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -217,8 +213,21 @@ function updateAisSummary() {
|
||||
}
|
||||
}
|
||||
|
||||
/** What the message says, in one line: where the vessel is and what it is
|
||||
* doing, or — for the static reports that carry no fix — where it is going. */
|
||||
function aisSummaryText(msg: AisMessage): string {
|
||||
const parts: string[] = [];
|
||||
if (msg.lat != null && msg.lon != null) parts.push(`${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}`);
|
||||
const motion = aisMotionText(msg);
|
||||
if (motion) parts.push(motion);
|
||||
const route = aisRouteText(msg);
|
||||
if (route && parts.length < 2) parts.push(route);
|
||||
if (!parts.length) return route || "no position reported";
|
||||
return parts.join(" · ");
|
||||
}
|
||||
|
||||
function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
const row = document.createElement("details");
|
||||
row.className = "ais-message";
|
||||
const ts = msg._ts || new Date().toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
@@ -232,8 +241,9 @@ function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
const route = aisRouteText(msg);
|
||||
const distance = aisDistanceText(msg);
|
||||
const pos = msg.lat != null && msg.lon != null
|
||||
? `<a class="ais-pos-link" href="javascript:void(0)" onclick="window.navigateToAprsMap(${msg.lat},${msg.lon})">${msg.lat.toFixed(4)}, ${msg.lon.toFixed(4)}</a>`
|
||||
? `<a class="ais-pos-link" href="javascript:void(0)" data-ais-map="${msg.lat},${msg.lon}">${msg.lat.toFixed(5)}, ${msg.lon.toFixed(5)}</a>`
|
||||
: "";
|
||||
const vesselUrl = aisWindow.buildAisVesselUrl?.(msg.mmsi) ?? null;
|
||||
row.dataset.filterText = [
|
||||
name,
|
||||
msg.mmsi,
|
||||
@@ -248,23 +258,43 @@ function renderAisRow(msg: AisMessage): HTMLElement {
|
||||
.join(" ")
|
||||
.toUpperCase();
|
||||
row.innerHTML =
|
||||
`<div class="ais-row-head">` +
|
||||
`<span class="ais-time">${ts}</span>` +
|
||||
`<summary class="decode-line">` +
|
||||
`<span class="ais-time">${escapeAisHtml(ts)}</span>` +
|
||||
`<span class="ais-call">${nameHtml}</span>` +
|
||||
`<span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` +
|
||||
`<span class="ais-badge ais-badge-type">${escapeAisHtml(aisTypeLabel(msg.message_type))}</span>` +
|
||||
`</div>` +
|
||||
`<div class="ais-row-meta">` +
|
||||
`<span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` +
|
||||
(route ? `<span class="ais-meta-text">${escapeAisHtml(route)}</span>` : "") +
|
||||
`<span class="ais-meta-text">${escapeAisHtml(channel.freqText)}</span>` +
|
||||
`</div>` +
|
||||
`<div class="ais-row-detail">` +
|
||||
(motion ? `<span>${escapeAisHtml(motion)}</span>` : `<span>No motion data</span>`) +
|
||||
(distance ? `<span>${escapeAisHtml(distance)}</span>` : "") +
|
||||
(pos ? `<span>${pos}</span>` : "") +
|
||||
`<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` +
|
||||
`<span class="decode-line-summary">${escapeAisHtml(aisSummaryText(msg))}</span>` +
|
||||
`<span class="${channel.badgeClass}">${escapeAisHtml(channel.label)}</span>` +
|
||||
(distance ? `<span class="decode-line-distance">${escapeAisHtml(distance)}</span>` : "") +
|
||||
`</summary>` +
|
||||
`<div class="decode-expanded">` +
|
||||
`<div class="decode-expanded-meta">` +
|
||||
`<span>MMSI ${escapeAisHtml(String(msg.mmsi))}</span>` +
|
||||
`<span>${escapeAisHtml(channel.freqText)}</span>` +
|
||||
(route ? `<span>${escapeAisHtml(route)}</span>` : "") +
|
||||
(motion ? `<span>${escapeAisHtml(motion)}</span>` : "") +
|
||||
`<span>${escapeAisHtml(aisAgeText(msg._tsMs))}</span>` +
|
||||
(pos ? `<span>${pos}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(msg.lat != null && msg.lon != null
|
||||
? `<button class="aprs-inline-btn" type="button" data-ais-map="${msg.lat},${msg.lon}">Map</button>`
|
||||
: "") +
|
||||
(vesselUrl
|
||||
? `<a class="aprs-inline-btn" href="${escapeAisHtml(vesselUrl)}" target="_blank" rel="noopener">Vessel</a>`
|
||||
: "") +
|
||||
`</div>` +
|
||||
`</div>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-ais-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aisMap ?? "").split(",").map(Number);
|
||||
if (lat == null || lon == null || !Number.isFinite(lat) || !Number.isFinite(lon)) return;
|
||||
aisWindow.navigateToAprsMap?.(lat, lon);
|
||||
});
|
||||
});
|
||||
|
||||
applyAisFilterToRow(row);
|
||||
return row;
|
||||
}
|
||||
@@ -359,9 +389,13 @@ function addAisMessage(msg: AisMessage): void {
|
||||
scheduleAisBarUpdate();
|
||||
scheduleAisHistoryRender();
|
||||
|
||||
if (msg.lat != null && msg.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
plotAisMessage(msg);
|
||||
}
|
||||
|
||||
/** Hands a positioned message to the map, if the map module is loaded yet. */
|
||||
function plotAisMessage(msg: AisMessage): void {
|
||||
if (msg.lat == null || msg.lon == null || !aisWindow.aisMapAddVessel) return;
|
||||
aisWindow.aisMapAddVessel(msg);
|
||||
}
|
||||
|
||||
function normalizeServerAisMessage(msg: AisMessage): AisMessage {
|
||||
@@ -384,9 +418,7 @@ function onServerAisBatch(messages: AisMessage[]): void {
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
});
|
||||
if (next.lat != null && next.lon != null && aisWindow.aisMapAddVessel) {
|
||||
aisWindow.aisMapAddVessel(next);
|
||||
}
|
||||
plotAisMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -405,7 +437,7 @@ function pruneAisHistoryView(): void {
|
||||
document.getElementById("settings-clear-ais-history")?.addEventListener("click", () => { void (async () => {
|
||||
if (!await aisWindow.trxUi.confirm({ title: "Clear AIS history?", message: "All stored AIS messages will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await aisWindow.postPath?.("/clear_ais_decode");
|
||||
await hostCore.postPath("/clear_ais_decode");
|
||||
resetAisHistoryView();
|
||||
} catch (e) {
|
||||
console.error("AIS history clear failed", e);
|
||||
@@ -432,4 +464,6 @@ updateAisSummary();
|
||||
restore: onServerAisBatch,
|
||||
reset: resetAisHistoryView,
|
||||
prune: pruneAisHistoryView,
|
||||
// Oldest first, so vessel tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...aisMessageHistory].reverse()) plotAisMessage(entry); },
|
||||
});
|
||||
|
||||
@@ -30,6 +30,14 @@ export interface AprsPacket {
|
||||
symbol_code?: string | null;
|
||||
}
|
||||
|
||||
function escapeAprsHtml(value: string): string {
|
||||
return String(value ?? "")
|
||||
.replaceAll("&", "&")
|
||||
.replaceAll("<", "<")
|
||||
.replaceAll(">", ">")
|
||||
.replaceAll('"', """);
|
||||
}
|
||||
|
||||
export function aprsPacketCategory(packet: AprsPacket): AprsCategory {
|
||||
const type = (packet.type ?? "").toLowerCase();
|
||||
const info = (packet.info ?? "").toLowerCase();
|
||||
@@ -108,8 +116,87 @@ function escapeAprsCharacter(character: string): string {
|
||||
return character;
|
||||
}
|
||||
|
||||
// The vendored sprite sheets (assets/web/vendor/aprs-symbols-24-*.png) are
|
||||
// 16x6 grids of 24px cells covering the printable codes 0x21..0x7E, so a
|
||||
// symbol's cell index is simply `code - 0x21`. The sheet URLs live in CSS so
|
||||
// the retina variants can be picked up by a media query; only the cell offsets
|
||||
// are computed here.
|
||||
const APRS_SPRITE_COLUMNS = 16;
|
||||
const APRS_SPRITE_CELL_PX = 24;
|
||||
const APRS_SPRITE_FIRST_CODE = 0x21;
|
||||
const APRS_SPRITE_LAST_CODE = 0x7e;
|
||||
|
||||
export interface AprsSymbolSprite {
|
||||
/** Sheet modifier class appended to `.aprs-symbol`. */
|
||||
className: string;
|
||||
/** `background-position` covering the overlay layer first, if any. */
|
||||
backgroundPosition: string;
|
||||
/** Human-readable description for the tooltip. */
|
||||
label: string;
|
||||
}
|
||||
|
||||
function aprsSpriteOffset(code: string): string | null {
|
||||
if (code.length !== 1) return null;
|
||||
const point = code.charCodeAt(0);
|
||||
if (point < APRS_SPRITE_FIRST_CODE || point > APRS_SPRITE_LAST_CODE) return null;
|
||||
const index = point - APRS_SPRITE_FIRST_CODE;
|
||||
const column = index % APRS_SPRITE_COLUMNS;
|
||||
const row = Math.floor(index / APRS_SPRITE_COLUMNS);
|
||||
return `${String(-column * APRS_SPRITE_CELL_PX)}px ${String(-row * APRS_SPRITE_CELL_PX)}px`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve an APRS table/code pair to a sprite cell. A table identifier of `/`
|
||||
* selects the primary sheet and `\` the alternate one; any other character is
|
||||
* an overlay, which draws that character from the overlay sheet on top of the
|
||||
* alternate symbol. Returns null when the pair is outside the sprite sheets,
|
||||
* leaving callers to fall back to the raw character.
|
||||
*/
|
||||
export function aprsSymbolSprite(
|
||||
symbolTable: string | null | undefined,
|
||||
symbolCode: string | null | undefined,
|
||||
): AprsSymbolSprite | null {
|
||||
if (!symbolTable || !symbolCode) return null;
|
||||
const symbolOffset = aprsSpriteOffset(symbolCode);
|
||||
if (!symbolOffset) return null;
|
||||
if (symbolTable === "/") {
|
||||
return {
|
||||
className: "aprs-symbol-primary",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Primary APRS symbol ${symbolTable}${symbolCode}`,
|
||||
};
|
||||
}
|
||||
if (symbolTable === "\\") {
|
||||
return {
|
||||
className: "aprs-symbol-alternate",
|
||||
backgroundPosition: symbolOffset,
|
||||
label: `Alternate APRS symbol ${symbolTable}${symbolCode}`,
|
||||
};
|
||||
}
|
||||
const overlayOffset = aprsSpriteOffset(symbolTable);
|
||||
if (!overlayOffset) return null;
|
||||
return {
|
||||
className: "aprs-symbol-overlaid",
|
||||
backgroundPosition: `${overlayOffset}, ${symbolOffset}`,
|
||||
label: `Alternate APRS symbol \\${symbolCode} with overlay ${symbolTable}`,
|
||||
};
|
||||
}
|
||||
|
||||
/** An empty slot of the symbol's size, so a frame without one still lines up
|
||||
* with the frames around it in the list. */
|
||||
export function renderAprsSymbolSlot(packet: AprsPacket, escapeHtml: (value: string) => string): string {
|
||||
return renderLocalAprsSymbol(packet, escapeHtml)
|
||||
|| '<span class="aprs-symbol aprs-symbol-empty" aria-hidden="true"></span>';
|
||||
}
|
||||
|
||||
export function renderLocalAprsSymbol(packet: AprsPacket, escapeHtml: (value: string) => string): string {
|
||||
if (!packet.symbolTable || !packet.symbolCode) return "";
|
||||
const sprite = aprsSymbolSprite(packet.symbolTable, packet.symbolCode);
|
||||
if (sprite) {
|
||||
return `<span class="aprs-symbol ${sprite.className}" role="img"` +
|
||||
` style="background-position:${sprite.backgroundPosition}"` +
|
||||
` title="${escapeHtml(sprite.label)}" aria-label="${escapeHtml(sprite.label)}"></span>`;
|
||||
}
|
||||
const symbol = escapeHtml(packet.symbolCode);
|
||||
const table = packet.symbolTable === "/" ? "Primary" : "Alternate";
|
||||
return `<span class="aprs-symbol aprs-symbol-local" title="${table} APRS symbol ${symbol}">${symbol}</span>`;
|
||||
@@ -133,3 +220,174 @@ export function normalizeAprsPacket(packet: AprsPacket, receiver: unknown): Aprs
|
||||
symbolCode: packet.symbol_code ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
// ── Payload summaries ──────────────────────────────────────────────────────
|
||||
// APRS packs its meaning into the information field with a set of one-character
|
||||
// type identifiers and fixed-width encodings (APRS 1.0.1, chapters 6-15). The
|
||||
// list showed that field as it arrives on the air, so reading a weather report
|
||||
// meant decoding "_10090556c220s004g005t077..." by eye. These produce a line
|
||||
// of plain text for the common types and leave the raw field to the expanded
|
||||
// view, which is still the authority when a summary cannot be made.
|
||||
|
||||
/** `t077` → 25.0 °C. APRS carries temperature in whole degrees Fahrenheit. */
|
||||
function fahrenheitToCelsius(fahrenheit: number): number {
|
||||
return Math.round(((fahrenheit - 32) * 5 / 9) * 10) / 10;
|
||||
}
|
||||
|
||||
/** Weather report fields: wind, gust, temperature, rain, humidity, pressure. */
|
||||
function summarizeAprsWeather(info: string): string | null {
|
||||
const parts: string[] = [];
|
||||
const temperature = /t(-?\d{2,3})/.exec(info);
|
||||
if (temperature) parts.push(`${fahrenheitToCelsius(Number(temperature[1]))} °C`);
|
||||
const wind = /(\d{3})\/(\d{3})/.exec(info) ?? /c(\d{3}).*?s(\d{3})/.exec(info);
|
||||
if (wind) {
|
||||
const gust = /g(\d{3})/.exec(info);
|
||||
const knots = Number(wind[2]);
|
||||
parts.push(`wind ${Number(wind[1])}° ${knots} kt${gust ? ` gust ${Number(gust[1])}` : ""}`);
|
||||
}
|
||||
const humidity = /h(\d{2})/.exec(info);
|
||||
if (humidity) {
|
||||
const value = Number(humidity[1]);
|
||||
parts.push(`${value === 0 ? 100 : value}% RH`);
|
||||
}
|
||||
const pressure = /b(\d{5})/.exec(info);
|
||||
if (pressure) parts.push(`${(Number(pressure[1]) / 10).toFixed(1)} hPa`);
|
||||
const rain = /r(\d{3})/.exec(info);
|
||||
if (rain && Number(rain[1]) > 0) parts.push(`rain ${(Number(rain[1]) / 100).toFixed(2)}"`);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
|
||||
/** `T#005,199,000,255,073,123,01101001` → sequence, five channels, eight bits. */
|
||||
function summarizeAprsTelemetry(info: string): string | null {
|
||||
const match = /^T#(\d+|MIC)((?:,-?[\d.]*)+)(?:,([01]{8}))?/.exec(info.trim());
|
||||
if (!match?.[2]) return null;
|
||||
const channels = match[2].split(",").filter((value) => value.length > 0);
|
||||
const bits = match[3] ? ` · bits ${match[3]}` : "";
|
||||
return `#${match[1]} · ${channels.join(" ")}${bits}`;
|
||||
}
|
||||
|
||||
/** `:DEST :text{01` → addressed message text. */
|
||||
function summarizeAprsMessage(info: string): string | null {
|
||||
const match = /^:([^:]{9}):(.*)$/.exec(info);
|
||||
if (!match?.[1] || match[2] == null) return null;
|
||||
const addressee = match[1].trim();
|
||||
const text = match[2].replace(/\{\d+\s*$/, "").trim();
|
||||
return `→ ${addressee}: ${text}`;
|
||||
}
|
||||
|
||||
/** Course/speed appended to a position, as `088/036`. */
|
||||
function summarizeAprsCourseSpeed(info: string): string | null {
|
||||
const match = /(\d{3})\/(\d{3})/.exec(info);
|
||||
if (!match) return null;
|
||||
const knots = Number(match[2]);
|
||||
if (knots === 0) return null;
|
||||
return `${Number(match[1])}° ${knots} kt`;
|
||||
}
|
||||
|
||||
/** Whatever a frame is worth saying in one line, or null to fall back to raw. */
|
||||
export function summarizeAprsPayload(packet: AprsPacket): string | null {
|
||||
const info = packet.info ?? "";
|
||||
if (!info) return null;
|
||||
const category = aprsPacketCategory(packet);
|
||||
if (category === "message") return summarizeAprsMessage(info);
|
||||
if (category === "weather") return summarizeAprsWeather(info);
|
||||
if (category === "telemetry") return summarizeAprsTelemetry(info);
|
||||
if (category === "position") {
|
||||
const parts: string[] = [];
|
||||
if (packet.lat != null && packet.lon != null) {
|
||||
parts.push(`${packet.lat.toFixed(4)}, ${packet.lon.toFixed(4)}`);
|
||||
}
|
||||
const courseSpeed = summarizeAprsCourseSpeed(info);
|
||||
if (courseSpeed) parts.push(courseSpeed);
|
||||
// Whatever the station wrote after the position report.
|
||||
const comment = info.replace(/^[!=@/][^>]*[>_]?/, "").replace(/\d{3}\/\d{3}/, "").trim();
|
||||
if (comment && comment.length <= 60) parts.push(comment);
|
||||
return parts.length ? parts.join(" · ") : null;
|
||||
}
|
||||
// Status and anything else: the text it carries, minus its type character.
|
||||
const text = info.replace(/^[>;<?]/, "").trim();
|
||||
return text.length ? text : null;
|
||||
}
|
||||
|
||||
// ── Frame row ──────────────────────────────────────────────────────────────
|
||||
// Shared by the APRS and HF APRS lists, which had a copy each of the same
|
||||
// forty lines of markup and drifted only by one badge.
|
||||
|
||||
export interface AprsRowOptions {
|
||||
/** Marks the newest frame so it can flash on arrival. */
|
||||
fresh?: boolean;
|
||||
/** Leading badge, e.g. the band a copy of this list is dedicated to. */
|
||||
badge?: string;
|
||||
/** Distance from the receiver, already formatted, or "" to leave it out. */
|
||||
distance?: string;
|
||||
/** Opens the map on a frame's position. */
|
||||
onMap?: (lat: number, lon: number) => void;
|
||||
/** Puts a frame's coordinates on the clipboard. */
|
||||
onCopy?: (text: string, button: HTMLElement) => void;
|
||||
}
|
||||
|
||||
export function renderAprsPacketRow(packet: AprsPacket, options: AprsRowOptions = {}): HTMLElement {
|
||||
const row = document.createElement("details");
|
||||
row.className = "aprs-packet";
|
||||
if (!packet.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (options.fresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const time = packet._ts
|
||||
|| new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const category = aprsPacketCategory(packet);
|
||||
const summary = summarizeAprsPayload(packet);
|
||||
const hasPosition = packet.lat != null && packet.lon != null;
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(packet.srcCall || "")}`;
|
||||
|
||||
row.innerHTML =
|
||||
`<summary class="decode-line">` +
|
||||
`<span class="aprs-time">${escapeAprsHtml(time)}</span>` +
|
||||
(options.badge ? `<span class="aprs-badge aprs-badge-band">${escapeAprsHtml(options.badge)}</span>` : "") +
|
||||
renderAprsSymbolSlot(packet, escapeAprsHtml) +
|
||||
`<span class="aprs-call">${escapeAprsHtml(packet.srcCall ?? "")}</span>` +
|
||||
`<span class="aprs-badge aprs-badge-type aprs-badge-type-${category}">` +
|
||||
`${escapeAprsHtml(aprsCategoryLabel(category))}</span>` +
|
||||
`<span class="decode-line-summary">${summary ? escapeAprsHtml(summary) : renderAprsInfo(packet)}</span>` +
|
||||
(packet.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC</span>') +
|
||||
(options.distance ? `<span class="decode-line-distance">${escapeAprsHtml(options.distance)}</span>` : "") +
|
||||
`</summary>` +
|
||||
`<div class="decode-expanded">` +
|
||||
`<div class="decode-expanded-meta">` +
|
||||
`<span>>${escapeAprsHtml(packet.destCall || "--")}</span>` +
|
||||
`<span>${escapeAprsHtml(packet.path || "no path")}</span>` +
|
||||
`<span>${escapeAprsHtml(aprsAgeText(packet._tsMs))}</span>` +
|
||||
`<span>CRC ${packet.crcOk ? "ok" : "failed"}</span>` +
|
||||
(hasPosition
|
||||
? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${packet.lat},${packet.lon}">`
|
||||
+ `${packet.lat?.toFixed(5)}, ${packet.lon?.toFixed(5)}</a>`
|
||||
: "") +
|
||||
`</div>` +
|
||||
`<div class="decode-expanded-raw">${renderAprsInfo(packet)}</div>` +
|
||||
(packet.info_bytes?.length
|
||||
? `<div class="decode-expanded-bytes">${escapeAprsHtml(aprsHexBytes(packet.info_bytes))}</div>`
|
||||
: "") +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${packet.lat},${packet.lon}">Map</button>` : "") +
|
||||
(hasPosition ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${packet.lat},${packet.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
`</div>` +
|
||||
`</div>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((element) => {
|
||||
element.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
const [lat, lon] = (element.dataset.aprsMap ?? "").split(",").map(Number);
|
||||
if (Number.isFinite(lat) && Number.isFinite(lon)) options.onMap?.(lat as number, lon as number);
|
||||
});
|
||||
});
|
||||
const copyButton = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyButton) {
|
||||
copyButton.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
options.onCopy?.(copyButton.dataset.aprsCopy ?? "", copyButton);
|
||||
});
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol,
|
||||
renderAprsPacketRow,
|
||||
type AprsPacket,
|
||||
type AprsTypeFilter,
|
||||
} from "./aprs-shared";
|
||||
@@ -18,26 +17,18 @@ import type { PluginRuntimeWindow } from "./runtime-contract";
|
||||
interface AprsBridge {
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
serverLat?: number | null;
|
||||
serverLon?: number | null;
|
||||
haversineKm?: (lat1: number, lon1: number, lat2: number, lon2: number) => number;
|
||||
escapeMapHtml?: (input: string) => string;
|
||||
navigateToAprsMap?: (lat: number, lon: number) => void;
|
||||
showHint?: (message: string, durationMs: number) => void;
|
||||
clearMapMarkersByType?: (type: string) => void;
|
||||
aprsMapAddStation?: (call: string, lat: number, lon: number, info: string, symbolTable: string | null | undefined, symbolCode: string | null | undefined, packet: AprsPacket) => void;
|
||||
getDecodeRigMeta?: () => unknown;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
updateAprsBar?: () => void;
|
||||
clearAprsBar?: () => void;
|
||||
closeAprsBar?: () => void;
|
||||
}
|
||||
const aprsWindow = window as unknown as AprsBridge;
|
||||
const escapeAprsHtml = (input: string): string => aprsWindow.escapeMapHtml?.(input) ?? input
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """);
|
||||
const showAprsHint = (message: string, durationMs: number): void => { aprsWindow.showHint?.(message, durationMs); };
|
||||
const escapeAprsHtml = (input: string): string => hostCore.escapeMapHtml(input);
|
||||
const showAprsHint = (message: string, durationMs: number): void => { hostCore.showHint(message, durationMs); };
|
||||
|
||||
// --- APRS Decoder Plugin (server-side decode) ---
|
||||
const aprsStatus = document.getElementById("aprs-status");
|
||||
@@ -87,8 +78,8 @@ function scheduleAprsBarUpdate() {
|
||||
}
|
||||
|
||||
function aprsDistanceText(pkt: AprsPacket): string {
|
||||
if (aprsWindow.serverLat == null || aprsWindow.serverLon == null || pkt.lat == null || pkt.lon == null || !aprsWindow.haversineKm) return "";
|
||||
const distKm = aprsWindow.haversineKm(aprsWindow.serverLat, aprsWindow.serverLon, pkt.lat, pkt.lon);
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || pkt.lat == null || pkt.lon == null) return "";
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, pkt.lat, pkt.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1000)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -147,93 +138,24 @@ function updateAprsChipState() {
|
||||
aprsCollapseDupBtn?.classList.toggle("active", aprsCollapseDup);
|
||||
}
|
||||
|
||||
function renderAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const ts = pkt._ts || new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null
|
||||
? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>`
|
||||
: "";
|
||||
const distance = aprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
|
||||
row.innerHTML =
|
||||
`<div class="aprs-row-head">` +
|
||||
`<span class="aprs-time">${ts}</span>` +
|
||||
symbolHtml +
|
||||
`<span class="aprs-call">${escapeAprsHtml(pkt.srcCall ?? "")}</span>` +
|
||||
`<span>>${escapeAprsHtml(pkt.destCall || "")}</span>` +
|
||||
`<span class="${categoryClass}">${escapeAprsHtml(categoryLabel)}</span>` +
|
||||
pathBadge +
|
||||
crcBadge +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-meta">` +
|
||||
`<span class="aprs-meta-text">${escapeAprsHtml(age)}</span>` +
|
||||
(distance ? `<span class="aprs-meta-text">${escapeAprsHtml(distance)}</span>` : "") +
|
||||
`<span class="aprs-meta-text">${escapeAprsHtml(pkt.type || "--")}</span>` +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-detail">` +
|
||||
`<span title="${escapeAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` +
|
||||
(posLink ? `<span>${posLink}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
`</div>` +
|
||||
`<details class="aprs-details">` +
|
||||
`<summary>Details</summary>` +
|
||||
`<div class="aprs-details-grid">` +
|
||||
`<span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.srcCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.destCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.type || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.path || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeAprsHtml(age)}</span>` +
|
||||
`<span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span>` +
|
||||
`<span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span>` +
|
||||
`<span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeAprsHtml(pkt.info || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeAprsHtml(aprsHexBytes(pkt.info_bytes))}</span>` +
|
||||
`</div>` +
|
||||
`</details>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (aprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
aprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const copyBtn = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => { void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
})(); });
|
||||
async function copyAprsCoords(text: string): Promise<void> {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
showAprsHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
showAprsHint("Copy failed", 1500);
|
||||
}
|
||||
}
|
||||
|
||||
return row;
|
||||
function renderAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
distance: aprsDistanceText(pkt),
|
||||
onMap: (lat, lon) => { aprsWindow.navigateToAprsMap?.(lat, lon); },
|
||||
onCopy: (text) => { void copyAprsCoords(text); },
|
||||
});
|
||||
}
|
||||
|
||||
function renderAprsHistory() {
|
||||
@@ -307,6 +229,12 @@ function pruneAprsHistoryView(): void {
|
||||
renderAprsHistory();
|
||||
}
|
||||
|
||||
/** Hands a positioned packet to the map, if the map module is loaded yet. */
|
||||
function plotAprsPacket(pkt: AprsPacket): void {
|
||||
if (pkt.lat == null || pkt.lon == null || !aprsWindow.aprsMapAddStation) return;
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
|
||||
function addAprsPacket(pkt: AprsPacket): void {
|
||||
const tsMs = Number.isFinite(pkt.ts_ms) ? Number(pkt.ts_ms) : Date.now();
|
||||
pkt._tsMs = tsMs;
|
||||
@@ -315,9 +243,7 @@ function addAprsPacket(pkt: AprsPacket): void {
|
||||
aprsPacketHistory.unshift(pkt);
|
||||
pruneAprsPacketHistory();
|
||||
|
||||
if (pkt.lat != null && pkt.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(pkt.srcCall ?? "", pkt.lat, pkt.lon, pkt.info ?? "", pkt.symbolTable, pkt.symbolCode, pkt);
|
||||
}
|
||||
plotAprsPacket(pkt);
|
||||
|
||||
if (pkt.crcOk) scheduleAprsBarUpdate();
|
||||
|
||||
@@ -338,9 +264,7 @@ function onServerAprsBatch(packets: AprsPacket[]): void {
|
||||
const tsMs = Number.isFinite(next.ts_ms) ? Number(next.ts_ms) : Date.now();
|
||||
next._tsMs = tsMs;
|
||||
next._ts = new Date(tsMs).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
if (next.lat != null && next.lon != null && aprsWindow.aprsMapAddStation) {
|
||||
aprsWindow.aprsMapAddStation(next.srcCall ?? "", next.lat, next.lon, next.info ?? "", next.symbolTable, next.symbolCode, next);
|
||||
}
|
||||
plotAprsPacket(next);
|
||||
if (next.crcOk) hasCrcOk = true;
|
||||
normalized.push(next);
|
||||
}
|
||||
@@ -354,7 +278,7 @@ function onServerAprsBatch(packets: AprsPacket[]): void {
|
||||
document.getElementById("settings-clear-aprs-history")?.addEventListener("click", () => { void (async () => {
|
||||
if (!await aprsWindow.trxUi.confirm({ title: "Clear APRS history?", message: "All stored APRS packets will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await aprsWindow.postPath?.("/clear_aprs_decode");
|
||||
await hostCore.postPath("/clear_aprs_decode");
|
||||
resetAprsHistoryView();
|
||||
} catch (e) {
|
||||
console.error("APRS history clear failed", e);
|
||||
@@ -412,4 +336,6 @@ renderAprsHistory();
|
||||
restore: onServerAprsBatch,
|
||||
reset: resetAprsHistoryView,
|
||||
prune: pruneAprsHistoryView,
|
||||
// Oldest first, so station tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...aprsPacketHistory].reverse()) plotAprsPacket(entry); },
|
||||
});
|
||||
|
||||
+3
-2
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostState } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
interface DecoderDescriptor {
|
||||
@@ -38,7 +40,6 @@ interface BackgroundDecodeStatus {
|
||||
}
|
||||
interface BackgroundBridge {
|
||||
decoderRegistry?: DecoderDescriptor[];
|
||||
authEnabled?: boolean;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
trx?: { modules?: { backgroundDecode?: BackgroundDecodeService } };
|
||||
}
|
||||
@@ -170,7 +171,7 @@ const bgdWindow = window as unknown as BackgroundBridge;
|
||||
setCheckbox("background-decode-enabled", currentConfig.enabled);
|
||||
renderBookmarkChecklist();
|
||||
|
||||
const isControl = backgroundDecodeRole === "control" || bgdWindow.authEnabled === false;
|
||||
const isControl = backgroundDecodeRole === "control" || hostState.authEnabled === false;
|
||||
const panel = document.getElementById("background-decode-panel");
|
||||
if (panel) {
|
||||
panel.querySelectorAll<HTMLInputElement | HTMLSelectElement | HTMLButtonElement>("input, select, button.sch-write").forEach(function (el) {
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
/* DOM IDs in the server-owned page are required by this feature; bmEl throws
|
||||
@@ -19,14 +21,6 @@ interface Bookmark {
|
||||
scope?: string;
|
||||
}
|
||||
|
||||
interface DecoderDescriptor {
|
||||
id: string;
|
||||
label: string;
|
||||
activation?: string;
|
||||
active_modes?: string[];
|
||||
bookmark_selectable?: boolean;
|
||||
}
|
||||
|
||||
interface BookmarkService {
|
||||
readonly overlayList: readonly Bookmark[];
|
||||
readonly overlayRevision: number;
|
||||
@@ -44,31 +38,12 @@ interface VirtualChannelService {
|
||||
}
|
||||
|
||||
interface BookmarkBridge {
|
||||
authEnabled?: boolean;
|
||||
authRole?: string | null;
|
||||
lastActiveRigId?: string | null;
|
||||
lastRigIds?: string[];
|
||||
lastRigDisplayNames?: Record<string, string>;
|
||||
lastFreqHz?: number;
|
||||
lastModeName?: string;
|
||||
lastSpectrumData?: unknown;
|
||||
currentBandwidthHz?: number;
|
||||
modeEl?: HTMLSelectElement | null;
|
||||
decoderRegistry?: DecoderDescriptor[];
|
||||
trx?: { modules?: { bookmarks?: BookmarkService; vchan?: VirtualChannelService } };
|
||||
trx: { modules: { bookmarks?: BookmarkService; vchan?: VirtualChannelService } };
|
||||
trxUi: {
|
||||
confirm(options: { title: string; message: string; confirmLabel: string; danger?: boolean }): Promise<boolean>;
|
||||
notify?(message: string, options: { kind: "error" }): void;
|
||||
};
|
||||
syncBookmarkMapLocators?(bookmarks: readonly Bookmark[]): void;
|
||||
scheduleSpectrumDraw?(): void;
|
||||
syncBandwidthInput?(bandwidthHz: number): void;
|
||||
applyLocalTunedFrequency?(frequencyHz: number, force?: boolean): void;
|
||||
setRigFrequency?(frequencyHz: number): Promise<unknown>;
|
||||
postPath(path: string): Promise<unknown>;
|
||||
onDecoderRegistryReady?(callback: () => void): void;
|
||||
_freqOptimisticSeq?: number;
|
||||
_freqOptimisticHz?: number;
|
||||
}
|
||||
|
||||
type BookmarkElement = HTMLElement & HTMLInputElement & HTMLSelectElement;
|
||||
@@ -79,6 +54,12 @@ function bmEl(id: string): BookmarkElement {
|
||||
return element as BookmarkElement;
|
||||
}
|
||||
|
||||
/* Decoder checkboxes and decoder toggle buttons are built from the runtime
|
||||
* registry, so their elements are legitimately absent for unbuilt decoders. */
|
||||
function bmOptionalEl(id: string): BookmarkElement | null {
|
||||
return document.getElementById(id) as BookmarkElement | null;
|
||||
}
|
||||
|
||||
function errorMessage(error: unknown): string {
|
||||
return error instanceof Error ? error.message : String(error);
|
||||
}
|
||||
@@ -119,10 +100,7 @@ function bmEsc(str: unknown): string {
|
||||
}
|
||||
|
||||
function bmCanControl() {
|
||||
return (
|
||||
(typeof bridge.authEnabled !== "undefined" && !bridge.authEnabled) ||
|
||||
(typeof bridge.authRole !== "undefined" && bridge.authRole === "control")
|
||||
);
|
||||
return !hostState.authEnabled || hostState.authRole === "control";
|
||||
}
|
||||
|
||||
// Show/hide the Add Bookmark / Select All buttons based on the current auth role.
|
||||
@@ -136,8 +114,7 @@ function bmSyncAccess() {
|
||||
|
||||
/** The listing scope: always the active rig (to merge general + rig bookmarks). */
|
||||
function bmListScope() {
|
||||
const rig = (typeof bridge.lastActiveRigId !== "undefined") ? bridge.lastActiveRigId : null;
|
||||
return rig || "general";
|
||||
return hostState.lastActiveRigId || "general";
|
||||
}
|
||||
|
||||
async function bmFetchOverlay() {
|
||||
@@ -154,7 +131,7 @@ async function bmFetchOverlay() {
|
||||
if (typeof bridge.syncBookmarkMapLocators === "function") {
|
||||
bridge.syncBookmarkMapLocators(bmOverlayList);
|
||||
}
|
||||
if (typeof bridge.scheduleSpectrumDraw === "function") bridge.scheduleSpectrumDraw();
|
||||
hostCore.scheduleSpectrumDraw();
|
||||
}
|
||||
|
||||
async function bmFetch(categoryFilter: string): Promise<void> {
|
||||
@@ -310,19 +287,19 @@ function bmChangePage(delta: number): void {
|
||||
|
||||
// Read decoder checkboxes and return an array of selected decoder names.
|
||||
function bmReadDecoders(): string[] {
|
||||
return (bridge.decoderRegistry || [])
|
||||
return hostState.decoderRegistry
|
||||
.filter(d => d.bookmark_selectable)
|
||||
.filter(d => bmEl("bm-dec-" + d.id)?.checked)
|
||||
.filter(d => bmOptionalEl("bm-dec-" + d.id)?.checked)
|
||||
.map(d => d.id);
|
||||
}
|
||||
|
||||
// Set decoder checkboxes to match the given array.
|
||||
function bmWriteDecoders(decoders: readonly string[]): void {
|
||||
const set = new Set(decoders || []);
|
||||
(bridge.decoderRegistry || [])
|
||||
hostState.decoderRegistry
|
||||
.filter(d => d.bookmark_selectable)
|
||||
.forEach(d => {
|
||||
const el = bmEl("bm-dec-" + d.id);
|
||||
const el = bmOptionalEl("bm-dec-" + d.id);
|
||||
if (el) el.checked = set.has(d.id);
|
||||
});
|
||||
}
|
||||
@@ -332,7 +309,7 @@ function bmBuildDecoderCheckboxes() {
|
||||
const container = bmEl("bm-decoder-checkboxes");
|
||||
if (!container) return;
|
||||
container.innerHTML = "";
|
||||
(bridge.decoderRegistry || [])
|
||||
hostState.decoderRegistry
|
||||
.filter(d => d.bookmark_selectable)
|
||||
.forEach(d => {
|
||||
const label = document.createElement("label");
|
||||
@@ -372,23 +349,21 @@ function bmCloseForm() {
|
||||
}
|
||||
|
||||
function bmPrefillFromStatus() {
|
||||
// Use globals maintained by app.js (updated by SSE stream)
|
||||
if (typeof bridge.lastFreqHz === "number" && Number.isFinite(bridge.lastFreqHz)) {
|
||||
bmEl("bm-freq").value = String(Math.round(bridge.lastFreqHz));
|
||||
// Read live rig state from the host contract (updated by the SSE stream).
|
||||
const freqHz = hostState.lastFreqHz;
|
||||
if (freqHz != null && Number.isFinite(freqHz)) {
|
||||
bmEl("bm-freq").value = String(Math.round(freqHz));
|
||||
}
|
||||
if (typeof bridge.lastModeName === "string" && bridge.lastModeName) {
|
||||
bmEl("bm-mode").value = bridge.lastModeName;
|
||||
if (hostState.lastModeName) {
|
||||
bmEl("bm-mode").value = hostState.lastModeName;
|
||||
}
|
||||
if (typeof bridge.currentBandwidthHz === "number" && bridge.currentBandwidthHz > 0) {
|
||||
bmEl("bm-bw").value = String(Math.round(bridge.currentBandwidthHz));
|
||||
if (hostState.currentBandwidthHz > 0) {
|
||||
bmEl("bm-bw").value = String(Math.round(hostState.currentBandwidthHz));
|
||||
}
|
||||
// Prefill decoder checkboxes from current toggle button state.
|
||||
const activeDecoders = (bridge.decoderRegistry || [])
|
||||
const activeDecoders = hostState.decoderRegistry
|
||||
.filter(d => d.bookmark_selectable && d.activation === "toggle")
|
||||
.filter(d => {
|
||||
const btn = bmEl(d.id + "-decode-toggle-btn");
|
||||
return btn && btn.dataset.enabled === "true";
|
||||
})
|
||||
.filter(d => bmOptionalEl(d.id + "-decode-toggle-btn")?.dataset.enabled === "true")
|
||||
.map(d => d.id);
|
||||
bmWriteDecoders(activeDecoders);
|
||||
}
|
||||
@@ -478,58 +453,45 @@ async function bmDelete(id: string): Promise<void> {
|
||||
function bmApply(bm: Bookmark): void {
|
||||
try {
|
||||
// --- Optimistic UI updates (instant, before any network round-trips) ---
|
||||
if (typeof bridge.modeEl !== "undefined" && bridge.modeEl) {
|
||||
bridge.modeEl.value = (bm.mode || "").toUpperCase();
|
||||
const modeEl = document.getElementById("mode") as HTMLSelectElement | null;
|
||||
if (modeEl) {
|
||||
modeEl.value = (bm.mode || "").toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
if (bm.bandwidth_hz) {
|
||||
if (typeof bridge.currentBandwidthHz !== "undefined") {
|
||||
bridge.currentBandwidthHz = bm.bandwidth_hz;
|
||||
}
|
||||
bridge.currentBandwidthHz = bm.bandwidth_hz;
|
||||
if (typeof bridge.syncBandwidthInput === "function") {
|
||||
bridge.syncBandwidthInput(bm.bandwidth_hz);
|
||||
}
|
||||
hostState.currentBandwidthHz = bm.bandwidth_hz;
|
||||
hostCore.syncBandwidthInput(bm.bandwidth_hz);
|
||||
}
|
||||
if (typeof bridge.applyLocalTunedFrequency === "function") {
|
||||
// Set optimistic guard before applying so SSE cannot snap back.
|
||||
if (typeof bridge._freqOptimisticSeq !== "undefined") {
|
||||
++bridge._freqOptimisticSeq;
|
||||
bridge._freqOptimisticHz = bm.freq_hz;
|
||||
}
|
||||
// Force display so the BW overlay is repositioned even when freq is unchanged.
|
||||
bridge.applyLocalTunedFrequency(bm.freq_hz, true);
|
||||
}
|
||||
if (typeof bridge.scheduleSpectrumDraw === "function" && typeof bridge.lastSpectrumData !== "undefined" && bridge.lastSpectrumData) {
|
||||
bridge.scheduleSpectrumDraw();
|
||||
// Set optimistic guard before applying so SSE cannot snap back.
|
||||
hostCore.armOptimisticFrequency(bm.freq_hz);
|
||||
// Force display so the BW overlay is repositioned even when freq is unchanged.
|
||||
hostCore.applyLocalTunedFrequency(bm.freq_hz, true);
|
||||
if (hostState.lastSpectrumData) {
|
||||
hostCore.scheduleSpectrumDraw();
|
||||
}
|
||||
|
||||
// Take scheduler control up front, then apply mode before bandwidth so a
|
||||
// late SetMode cannot revert a saved WFM bookmark bandwidth to 180 kHz.
|
||||
const tunePromise = (async () => {
|
||||
await bridge.trx?.modules?.vchan?.takeSchedulerControl();
|
||||
await bridge.trx.modules.vchan?.takeSchedulerControl();
|
||||
|
||||
const onVirtual = await bridge.trx?.modules?.vchan?.interceptMode(bm.mode) ?? false;
|
||||
const onVirtual = await bridge.trx.modules.vchan?.interceptMode(bm.mode) ?? false;
|
||||
if (!onVirtual) {
|
||||
await bridge.postPath("/set_mode?mode=" + encodeURIComponent(bm.mode));
|
||||
await hostCore.postPath("/set_mode?mode=" + encodeURIComponent(bm.mode));
|
||||
}
|
||||
|
||||
if (bm.bandwidth_hz) {
|
||||
const bwHandledByVchan =
|
||||
await bridge.trx?.modules?.vchan?.interceptBandwidth(bm.bandwidth_hz) ?? false;
|
||||
await bridge.trx.modules.vchan?.interceptBandwidth(bm.bandwidth_hz) ?? false;
|
||||
if (!bwHandledByVchan) {
|
||||
await bridge.postPath(`/set_bandwidth?hz=${bm.bandwidth_hz}`);
|
||||
await hostCore.postPath(`/set_bandwidth?hz=${bm.bandwidth_hz}`);
|
||||
}
|
||||
}
|
||||
|
||||
// bridge.setRigFrequency is wrapped by vchan.js to redirect to the channel API
|
||||
// when on a virtual channel, so this call works correctly in both cases.
|
||||
// It also does its own optimistic update (bridge.applyLocalTunedFrequency) but
|
||||
// that's a no-op since we already set the same value above.
|
||||
if (typeof bridge.setRigFrequency === "function") {
|
||||
await bridge.setRigFrequency(bm.freq_hz);
|
||||
} else {
|
||||
await bridge.postPath(`/set_freq?hz=${bm.freq_hz}`);
|
||||
}
|
||||
// setRigFrequency redirects to the channel API when a virtual channel is
|
||||
// active. It repeats the optimistic update applied above, which is a
|
||||
// no-op because the value is unchanged.
|
||||
hostCore.setRigFrequency(bm.freq_hz);
|
||||
})();
|
||||
// Decoder toggles — fire-and-forget.
|
||||
// - Decoders incompatible with the new mode are always turned off
|
||||
@@ -539,13 +501,14 @@ function bmApply(bm: Bookmark): void {
|
||||
// alone.
|
||||
const hasDecoders = Array.isArray(bm.decoders) && bm.decoders.length > 0;
|
||||
const modeUp = (bm.mode || "").toUpperCase();
|
||||
const allToggleDecoders = (bridge.decoderRegistry || []).filter(d =>
|
||||
const allToggleDecoders = hostState.decoderRegistry.filter(d =>
|
||||
d.activation === "toggle"
|
||||
);
|
||||
const decoderPromise = allToggleDecoders.length ? (async () => {
|
||||
let statusUrl = "/status";
|
||||
if (typeof bridge.lastActiveRigId !== "undefined" && bridge.lastActiveRigId) {
|
||||
statusUrl += "?remote=" + encodeURIComponent(bridge.lastActiveRigId);
|
||||
const rigId = hostState.lastActiveRigId;
|
||||
if (rigId) {
|
||||
statusUrl += "?remote=" + encodeURIComponent(rigId);
|
||||
}
|
||||
const statusResp = await fetch(statusUrl);
|
||||
if (!statusResp.ok) return;
|
||||
@@ -567,7 +530,7 @@ function bmApply(bm: Bookmark): void {
|
||||
wanted = currentlyOn;
|
||||
}
|
||||
if (wanted !== currentlyOn) {
|
||||
toggles.push(bridge.postPath("/toggle_" + d.id.replace(/-/g, "_") + "_decode"));
|
||||
toggles.push(hostCore.postPath("/toggle_" + d.id.replace(/-/g, "_") + "_decode"));
|
||||
}
|
||||
}
|
||||
if (toggles.length) await Promise.all(toggles);
|
||||
@@ -582,8 +545,6 @@ function bmApply(bm: Bookmark): void {
|
||||
}
|
||||
}
|
||||
|
||||
bridge.trx ??= {};
|
||||
bridge.trx.modules ??= {};
|
||||
bridge.trx.modules.bookmarks = {
|
||||
get overlayList() { return bmOverlayList; },
|
||||
get overlayRevision() { return bmOverlayRevision; },
|
||||
@@ -619,8 +580,8 @@ function bmUpdateSelectionUi() {
|
||||
function bmPopulateMoveTarget() {
|
||||
const sel = bmEl("bm-move-target");
|
||||
if (!sel) return;
|
||||
const rigIds = (typeof bridge.lastRigIds !== "undefined" && Array.isArray(bridge.lastRigIds)) ? bridge.lastRigIds : [];
|
||||
const displayNames = (typeof bridge.lastRigDisplayNames !== "undefined") ? bridge.lastRigDisplayNames : {};
|
||||
const rigIds = hostState.lastRigIds;
|
||||
const displayNames = hostState.lastRigDisplayNames;
|
||||
const prev = sel.value;
|
||||
sel.innerHTML = "";
|
||||
if (bmScope !== "general") {
|
||||
@@ -728,8 +689,8 @@ async function bmDeleteSelected() {
|
||||
function bmPopulateScopePicker() {
|
||||
const picker = bmEl("bm-scope-picker");
|
||||
if (!picker) return;
|
||||
const rigIds = (typeof bridge.lastRigIds !== "undefined" && Array.isArray(bridge.lastRigIds)) ? bridge.lastRigIds : [];
|
||||
const displayNames = (typeof bridge.lastRigDisplayNames !== "undefined") ? bridge.lastRigDisplayNames : {};
|
||||
const rigIds = hostState.lastRigIds;
|
||||
const displayNames = hostState.lastRigDisplayNames;
|
||||
// Preserve current selection if still valid.
|
||||
const prev = picker.value;
|
||||
while (picker.options.length > 1) picker.remove(1);
|
||||
@@ -756,9 +717,7 @@ function bmPopulateScopePicker() {
|
||||
// Build decoder checkboxes from registry. The registry is fetched async
|
||||
// so we rebuild once it arrives to ensure checkboxes are present.
|
||||
bmBuildDecoderCheckboxes();
|
||||
if (typeof bridge.onDecoderRegistryReady === "function") {
|
||||
bridge.onDecoderRegistryReady(bmBuildDecoderCheckboxes);
|
||||
}
|
||||
hostCore.onDecoderRegistryReady(bmBuildDecoderCheckboxes);
|
||||
|
||||
// Scope picker
|
||||
bmPopulateScopePicker();
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract.js";
|
||||
|
||||
export {};
|
||||
@@ -30,8 +32,6 @@ interface CwBridge {
|
||||
lastFreqHz?: number;
|
||||
currentBandwidthHz?: number;
|
||||
lastSpectrumData?: CwSpectrum;
|
||||
escapeMapHtml?: (input: string) => string;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
applyCwAutoUi?: (enabled: boolean) => void;
|
||||
applyCwAutoUiFromServer?: (enabled: boolean) => void;
|
||||
@@ -75,9 +75,7 @@ let cwBarDismissedAtMs = 0;
|
||||
let cwAutoLocalOverride: boolean | null = null;
|
||||
|
||||
function escapeCwHtml(input: string): string {
|
||||
return cwWindow.escapeMapHtml?.(input) ?? input
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """);
|
||||
return hostCore.escapeMapHtml(input);
|
||||
}
|
||||
|
||||
function applyCwAutoUi(enabled: boolean): void {
|
||||
@@ -344,7 +342,7 @@ async function setCwTone(tone: unknown, { syncInput = true }: { syncInput?: bool
|
||||
cwToneInput.value = String(clamped);
|
||||
}
|
||||
try {
|
||||
await cwWindow.postPath?.(`/set_cw_tone?tone_hz=${encodeURIComponent(clamped)}`);
|
||||
await hostCore.postPath(`/set_cw_tone?tone_hz=${encodeURIComponent(clamped)}`);
|
||||
} catch (e) {
|
||||
console.error("CW tone set failed", e);
|
||||
}
|
||||
@@ -358,7 +356,7 @@ if (cwAutoInput) {
|
||||
cwAutoLocalOverride = enabled;
|
||||
applyCwAutoUi(enabled);
|
||||
try {
|
||||
await cwWindow.postPath?.(`/set_cw_auto?enabled=${enabled ? "true" : "false"}`);
|
||||
await hostCore.postPath(`/set_cw_auto?enabled=${enabled ? "true" : "false"}`);
|
||||
drawCwTonePicker();
|
||||
} catch (error: unknown) {
|
||||
console.error("CW auto toggle failed", error);
|
||||
@@ -375,7 +373,7 @@ if (cwWpmInput) {
|
||||
if (cwAutoInput?.checked) return;
|
||||
const wpm = clampCwWpm(cwWpmInput.value);
|
||||
cwWpmInput.value = String(wpm);
|
||||
try { await cwWindow.postPath?.(`/set_cw_wpm?wpm=${encodeURIComponent(wpm)}`); }
|
||||
try { await hostCore.postPath(`/set_cw_wpm?wpm=${encodeURIComponent(wpm)}`); }
|
||||
catch (error: unknown) { console.error("CW WPM set failed", error); }
|
||||
})();
|
||||
});
|
||||
@@ -413,7 +411,7 @@ document.getElementById("settings-clear-cw-history")?.addEventListener("click",
|
||||
void (async () => {
|
||||
if (!await cwWindow.trxUi.confirm({ title: "Clear CW history?", message: "All stored CW decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await cwWindow.postPath?.("/clear_cw_decode");
|
||||
await hostCore.postPath("/clear_cw_decode");
|
||||
resetCwHistoryView();
|
||||
} catch (error: unknown) {
|
||||
console.error("CW history clear failed", error);
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract.js";
|
||||
|
||||
export type FtxDecoderId = "ft2" | "ft4" | "ft8";
|
||||
@@ -45,8 +47,6 @@ interface FtxBridge {
|
||||
updateFt8Bar?: () => void;
|
||||
registerFt8FamilyBarRenderer?: (decoder: FtxDecoderId, renderer: () => BarFrames) => void;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<void>;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
fmtTime?: (timestampMs: number) => string;
|
||||
trxUi: ConfirmApi;
|
||||
clearFt8Bar?: () => void;
|
||||
closeFt8Bar?: () => void;
|
||||
@@ -62,6 +62,14 @@ interface FtxConfig {
|
||||
|
||||
const bridge = window as unknown as FtxBridge & PluginRuntimeWindow;
|
||||
|
||||
// Legacy ft8.js owned this formatter locally; the shared module kept reading it
|
||||
// off `window`, where nothing published it, so bar timestamps rendered empty.
|
||||
function formatBarTime(timestampMs: number): string {
|
||||
if (!timestampMs) return "--:--:--";
|
||||
return new Date(timestampMs)
|
||||
.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
}
|
||||
|
||||
function finiteNumber(value: unknown): number | null {
|
||||
const number = typeof value === "number" ? value : Number(value);
|
||||
return Number.isFinite(number) ? number : null;
|
||||
@@ -274,7 +282,7 @@ export function initializeFtxDecoder(config: FtxConfig): void {
|
||||
let html = "";
|
||||
for (const message of recent) {
|
||||
const timestamp = finiteNumber(message._tsMs ?? message.ts_ms);
|
||||
const time = timestamp === null ? "" : `<span class="aprs-bar-time">${bridge.fmtTime?.(timestamp) ?? ""}</span>`;
|
||||
const time = timestamp === null ? "" : `<span class="aprs-bar-time">${formatBarTime(timestamp)}</span>`;
|
||||
const snr = finiteNumber(message.snr_db);
|
||||
const delta = finiteNumber(message.dt_s);
|
||||
const frequency = displayFrequency(message.freq_hz);
|
||||
@@ -309,12 +317,12 @@ export function initializeFtxDecoder(config: FtxConfig): void {
|
||||
toggle?.addEventListener("click", () => { void (async () => {
|
||||
try {
|
||||
await bridge.takeSchedulerControlForDecoderDisable?.(toggle);
|
||||
await bridge.postPath?.(`/toggle_${id}_decode`);
|
||||
await hostCore.postPath(`/toggle_${id}_decode`);
|
||||
} catch (error: unknown) { console.error(`${label} toggle failed`, error); }
|
||||
})(); });
|
||||
document.getElementById(`settings-clear-${id}-history`)?.addEventListener("click", () => { void (async () => {
|
||||
if (!await bridge.trxUi.confirm({ title: `Clear ${label} history?`, message: `All stored ${label} decodes will be permanently removed.`, confirmLabel: "Clear history" })) return;
|
||||
try { await bridge.postPath?.(`/clear_${id}_decode`); reset(); }
|
||||
try { await hostCore.postPath(`/clear_${id}_decode`); reset(); }
|
||||
catch (error: unknown) { console.error(`${label} history clear failed`, error); }
|
||||
})(); });
|
||||
}
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
aprsHexBytes,
|
||||
aprsPacketCategory,
|
||||
collapseAprsDuplicates,
|
||||
normalizeAprsPacket,
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol,
|
||||
renderAprsPacketRow,
|
||||
type AprsPacket,
|
||||
type AprsTypeFilter,
|
||||
} from "./aprs-shared";
|
||||
@@ -19,21 +18,12 @@ import type { PluginRuntimeWindow } from "./runtime-contract";
|
||||
interface HfAprsBridge {
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
serverLat?: number | null;
|
||||
serverLon?: number | null;
|
||||
haversineKm?: (lat1: number, lon1: number, lat2: number, lon2: number) => number;
|
||||
escapeMapHtml?: (input: string) => string;
|
||||
navigateToAprsMap?: (lat: number, lon: number) => void;
|
||||
showHint?: (message: string, durationMs: number) => void;
|
||||
getDecodeRigMeta?: () => unknown;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<unknown>;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
}
|
||||
const hfAprsWindow = window as unknown as HfAprsBridge;
|
||||
const escapeHfAprsHtml = (input: string): string => hfAprsWindow.escapeMapHtml?.(input) ?? input
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """);
|
||||
|
||||
// --- HF APRS Decoder Plugin (server-side decode, 300 baud) ---
|
||||
const hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
@@ -72,8 +62,8 @@ function scheduleHfAprsHistoryRender() {
|
||||
}
|
||||
|
||||
function hfAprsDistanceText(pkt: AprsPacket): string {
|
||||
if (hfAprsWindow.serverLat == null || hfAprsWindow.serverLon == null || pkt.lat == null || pkt.lon == null || !hfAprsWindow.haversineKm) return "";
|
||||
const distKm = hfAprsWindow.haversineKm(hfAprsWindow.serverLat, hfAprsWindow.serverLon, pkt.lat, pkt.lon);
|
||||
if (hostState.serverLat == null || hostState.serverLon == null || pkt.lat == null || pkt.lon == null) return "";
|
||||
const distKm = hostCore.haversineKm(hostState.serverLat, hostState.serverLon, pkt.lat, pkt.lon);
|
||||
if (!Number.isFinite(distKm)) return "";
|
||||
if (distKm < 1) return `${Math.round(distKm * 1000)} m from TRX`;
|
||||
return `${distKm.toFixed(1)} km from TRX`;
|
||||
@@ -134,95 +124,27 @@ function updateHfAprsChipState() {
|
||||
hfAprsCollapseDupBtn?.classList.toggle("active", hfAprsCollapseDup);
|
||||
}
|
||||
|
||||
// HF traffic goes in the same row as VHF, marked with the band it came in on.
|
||||
// This was a second copy of the same forty lines of markup.
|
||||
function renderHfAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
const row = document.createElement("div");
|
||||
row.className = "aprs-packet";
|
||||
if (!pkt.crcOk) row.classList.add("aprs-packet-crc");
|
||||
if (isFresh) row.classList.add("aprs-packet-new");
|
||||
|
||||
const ts = pkt._ts || new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
|
||||
const age = aprsAgeText(pkt._tsMs);
|
||||
const category = aprsPacketCategory(pkt);
|
||||
const categoryLabel = aprsCategoryLabel(category);
|
||||
const categoryClass = `aprs-badge aprs-badge-type aprs-badge-type-${category}`;
|
||||
const pathBadge = pkt.path ? `<span class="aprs-badge">${escapeHfAprsHtml(pkt.path)}</span>` : "";
|
||||
const crcBadge = pkt.crcOk ? "" : '<span class="aprs-badge aprs-badge-crc">CRC Fail</span>';
|
||||
const hfBadge = '<span class="aprs-badge" style="background:var(--accent-alt,#f59e0b);color:#000">HF</span>';
|
||||
const symbolHtml = renderLocalAprsSymbol(pkt, escapeHfAprsHtml);
|
||||
const posLink = pkt.lat != null && pkt.lon != null
|
||||
? `<a class="aprs-pos" href="javascript:void(0)" data-aprs-map="${pkt.lat},${pkt.lon}">${pkt.lat.toFixed(4)}, ${pkt.lon.toFixed(4)}</a>`
|
||||
: "";
|
||||
const distance = hfAprsDistanceText(pkt);
|
||||
const qrzHref = `https://qrzcq.com/call/${encodeURIComponent(pkt.srcCall || "")}`;
|
||||
|
||||
row.innerHTML =
|
||||
`<div class="aprs-row-head">` +
|
||||
`<span class="aprs-time">${ts}</span>` +
|
||||
hfBadge +
|
||||
symbolHtml +
|
||||
`<span class="aprs-call">${escapeHfAprsHtml(pkt.srcCall ?? "")}</span>` +
|
||||
`<span>>${escapeHfAprsHtml(pkt.destCall || "")}</span>` +
|
||||
`<span class="${categoryClass}">${escapeHfAprsHtml(categoryLabel)}</span>` +
|
||||
pathBadge +
|
||||
crcBadge +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-meta">` +
|
||||
`<span class="aprs-meta-text">${escapeHfAprsHtml(age)}</span>` +
|
||||
(distance ? `<span class="aprs-meta-text">${escapeHfAprsHtml(distance)}</span>` : "") +
|
||||
`<span class="aprs-meta-text">${escapeHfAprsHtml(pkt.type || "--")}</span>` +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-detail">` +
|
||||
`<span title="${escapeHfAprsHtml(pkt.type || "")}">${renderAprsInfo(pkt)}</span>` +
|
||||
(posLink ? `<span>${posLink}</span>` : "") +
|
||||
`</div>` +
|
||||
`<div class="aprs-row-actions">` +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-map="${pkt.lat},${pkt.lon}">Map</button>` : "") +
|
||||
(pkt.lat != null && pkt.lon != null ? `<button class="aprs-inline-btn" type="button" data-aprs-copy="${pkt.lat},${pkt.lon}">Copy Coords</button>` : "") +
|
||||
`<a class="aprs-inline-btn" href="${qrzHref}" target="_blank" rel="noopener">QRZ</a>` +
|
||||
`</div>` +
|
||||
`<details class="aprs-details">` +
|
||||
`<summary>Details</summary>` +
|
||||
`<div class="aprs-details-grid">` +
|
||||
`<span class="aprs-detail-label">Source</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.srcCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Destination</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.destCall || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Type</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.type || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Path</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.path || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Age</span><span class="aprs-detail-value">${escapeHfAprsHtml(age)}</span>` +
|
||||
`<span class="aprs-detail-label">CRC</span><span class="aprs-detail-value">${pkt.crcOk ? "OK" : "Failed"}</span>` +
|
||||
`<span class="aprs-detail-label">Position</span><span class="aprs-detail-value">${pkt.lat != null && pkt.lon != null ? `${pkt.lat.toFixed(5)}, ${pkt.lon.toFixed(5)}` : "--"}</span>` +
|
||||
`<span class="aprs-detail-label">Info</span><span class="aprs-detail-value">${escapeHfAprsHtml(pkt.info || "--")}</span>` +
|
||||
`<span class="aprs-detail-label">Info Bytes</span><span class="aprs-detail-value">${escapeHfAprsHtml(aprsHexBytes(pkt.info_bytes))}</span>` +
|
||||
`</div>` +
|
||||
`</details>`;
|
||||
|
||||
row.querySelectorAll<HTMLElement>("[data-aprs-map]").forEach((el) => {
|
||||
el.addEventListener("click", (evt) => {
|
||||
evt.preventDefault();
|
||||
const raw = el.dataset.aprsMap ?? "";
|
||||
const [lat, lon] = raw.split(",").map(Number);
|
||||
if (hfAprsWindow.navigateToAprsMap && typeof lat === "number" && typeof lon === "number" && Number.isFinite(lat) && Number.isFinite(lon)) {
|
||||
hfAprsWindow.navigateToAprsMap(lat, lon);
|
||||
}
|
||||
});
|
||||
return renderAprsPacketRow(pkt, {
|
||||
fresh: isFresh,
|
||||
badge: "HF",
|
||||
distance: hfAprsDistanceText(pkt),
|
||||
onMap: (lat: number, lon: number) => { hfAprsWindow.navigateToAprsMap?.(lat, lon); },
|
||||
onCopy: (text: string) => { void copyHfAprsCoords(text); },
|
||||
});
|
||||
}
|
||||
|
||||
const copyBtn = row.querySelector<HTMLElement>("[data-aprs-copy]");
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener("click", () => { void (async () => {
|
||||
const raw = copyBtn.dataset.aprsCopy ?? "";
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hfAprsWindow.showHint?.("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hfAprsWindow.showHint?.("Copy failed", 1500);
|
||||
}
|
||||
})(); });
|
||||
async function copyHfAprsCoords(text: string): Promise<void> {
|
||||
try {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (!clipboard) return;
|
||||
await clipboard.writeText(text);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
} catch {
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
|
||||
return row;
|
||||
}
|
||||
|
||||
function renderHfAprsHistory() {
|
||||
@@ -289,7 +211,7 @@ const hfAprsDecodeToggleBtn = document.getElementById("hf-aprs-decode-toggle-btn
|
||||
hfAprsDecodeToggleBtn?.addEventListener("click", () => { void (async () => {
|
||||
try {
|
||||
await hfAprsWindow.takeSchedulerControlForDecoderDisable?.(hfAprsDecodeToggleBtn);
|
||||
await hfAprsWindow.postPath?.("/toggle_hf_aprs_decode");
|
||||
await hostCore.postPath("/toggle_hf_aprs_decode");
|
||||
} catch (e) {
|
||||
console.error("HF APRS toggle failed", e);
|
||||
}
|
||||
@@ -298,7 +220,7 @@ hfAprsDecodeToggleBtn?.addEventListener("click", () => { void (async () => {
|
||||
document.getElementById("settings-clear-hf-aprs-history")?.addEventListener("click", () => { void (async () => {
|
||||
if (!await hfAprsWindow.trxUi.confirm({ title: "Clear HF APRS history?", message: "All stored HF APRS packets will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await hfAprsWindow.postPath?.("/clear_hf_aprs_decode");
|
||||
await hostCore.postPath("/clear_hf_aprs_decode");
|
||||
resetHfAprsHistoryView();
|
||||
} catch (e) {
|
||||
console.error("HF APRS history clear failed", e);
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Typed view of the `window.trx` host contract for lazy feature bundles.
|
||||
//
|
||||
// Feature entries are separate esbuild bundles, so they cannot share module
|
||||
// instances with the application entry and must reach application state and
|
||||
// services through the host namespace documented in
|
||||
// `docs/frontend-architecture.md`. Declaring that contract once here keeps the
|
||||
// feature bundles from re-deriving it — and from drifting back to bare `window`
|
||||
// properties, which the module graph no longer publishes.
|
||||
|
||||
export interface HostDecoderDescriptor {
|
||||
id: string;
|
||||
label: string;
|
||||
activation?: string;
|
||||
active_modes?: string[];
|
||||
bookmark_selectable?: boolean;
|
||||
}
|
||||
|
||||
export interface HostState {
|
||||
readonly serverLat: number | null;
|
||||
readonly serverLon: number | null;
|
||||
readonly authEnabled: boolean;
|
||||
readonly authRole: string | null;
|
||||
readonly lastActiveRigId: string | null;
|
||||
readonly lastRigIds: string[];
|
||||
readonly lastRigDisplayNames: Record<string, string>;
|
||||
readonly lastFreqHz: number | null;
|
||||
readonly lastSpectrumData: { sample_rate: number; center_hz: number } | null;
|
||||
readonly jogUnit: number;
|
||||
readonly rxActive: boolean;
|
||||
readonly decoderRegistry: readonly HostDecoderDescriptor[];
|
||||
lastModeName: string;
|
||||
currentBandwidthHz: number;
|
||||
audioChannelOverride: string | null;
|
||||
}
|
||||
|
||||
export interface HostCore {
|
||||
postPath(path: string): Promise<unknown>;
|
||||
applyLocalTunedFrequency(frequencyHz: number, forceDisplay?: boolean): void;
|
||||
armOptimisticFrequency(frequencyHz: number): void;
|
||||
escapeMapHtml(value: string): string;
|
||||
haversineKm(lat1: number, lon1: number, lat2: number, lon2: number): number;
|
||||
showHint(message: string, durationMs?: number): void;
|
||||
formatFreqForStep(frequencyHz: number, stepHz: number): string;
|
||||
refreshFreqDisplay(): void;
|
||||
setJogDivisor(divisor: number): void;
|
||||
mwDefaultsForMode(mode: string): [number, number, number, number];
|
||||
resetRdsDisplay(): void;
|
||||
positionRdsPsOverlay(): void;
|
||||
updateWfmControls(): void;
|
||||
updateSdrSquelchControlVisibility(): void;
|
||||
updateDocumentTitle(rds: unknown): void;
|
||||
activeChannelRds(): unknown;
|
||||
startRxAudio(): void;
|
||||
stopRxAudio(): void;
|
||||
setRigFrequency(frequencyHz: number): void;
|
||||
syncBandwidthInput(bandwidthHz: number): void;
|
||||
scheduleSpectrumDraw(): void;
|
||||
/** Repaints the mode buttons from #mode after writing to it. */
|
||||
syncModePicker(): void;
|
||||
onDecoderRegistryReady(callback: () => void): void;
|
||||
}
|
||||
|
||||
interface HostWindow {
|
||||
trx: { state: HostState; core: HostCore };
|
||||
}
|
||||
|
||||
const host = window as unknown as HostWindow;
|
||||
|
||||
export const hostState: HostState = host.trx.state;
|
||||
export const hostCore: HostCore = host.trx.core;
|
||||
@@ -9,6 +9,9 @@ export interface DecoderPlugin<TMessage = unknown> {
|
||||
restore?(messages: TMessage[]): void;
|
||||
reset?(): void;
|
||||
prune?(): void;
|
||||
/** Replay everything the plugin is holding onto the map. Called when the map
|
||||
* module attaches, which can happen long after the decodes arrived. */
|
||||
syncMap?(): void;
|
||||
}
|
||||
|
||||
export interface TrxPluginRuntime {
|
||||
@@ -19,6 +22,7 @@ export interface TrxPluginRuntime {
|
||||
reset(id: string): boolean;
|
||||
resetAll(): void;
|
||||
prune(id: string): boolean;
|
||||
syncMapAll(): void;
|
||||
clearQueued(): void;
|
||||
hasDecoder(id: string): boolean;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
import type { LrptProgress, SatelliteImage, SatelliteLiveUpdate, SatellitePass, SatellitePassResponse } from "./satellite-types";
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract.js";
|
||||
|
||||
@@ -13,7 +15,6 @@ interface SatelliteBridge {
|
||||
addSatMapOverlay?: (image: SatelliteImage) => void;
|
||||
clearSatMapOverlays?: () => void;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<unknown>;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
satShowOnMap?: (south: number, west: number, north: number, east: number) => void;
|
||||
enableMapSourceFilter?: (source: string) => void;
|
||||
@@ -305,7 +306,7 @@ const lrptDecodeToggleBtn = document.getElementById("lrpt-decode-toggle-btn");
|
||||
lrptDecodeToggleBtn?.addEventListener("click", () => { void (async () => {
|
||||
try {
|
||||
await satWindow.takeSchedulerControlForDecoderDisable?.(lrptDecodeToggleBtn);
|
||||
await satWindow.postPath?.("/toggle_lrpt_decode");
|
||||
await hostCore.postPath("/toggle_lrpt_decode");
|
||||
} catch (e) {
|
||||
console.error("LRPT toggle failed", e);
|
||||
}
|
||||
@@ -327,7 +328,7 @@ document
|
||||
?.addEventListener("click", () => { void (async () => {
|
||||
if (!await satWindow.trxUi.confirm({ title: "Clear satellite history?", message: "All stored satellite decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await satWindow.postPath?.("/clear_lrpt_decode");
|
||||
await hostCore.postPath("/clear_lrpt_decode");
|
||||
resetSatHistoryView();
|
||||
} catch (e) {
|
||||
console.error("Weather satellite history clear failed", e);
|
||||
|
||||
@@ -80,9 +80,5 @@ export interface SchedulerWindow {
|
||||
confirm(options: { title: string; message: string; confirmLabel: string; danger?: boolean }): Promise<boolean>;
|
||||
notify?(message: string, options: { kind: "error" }): void;
|
||||
};
|
||||
authRole?: string | null;
|
||||
lastActiveRigId?: string | null;
|
||||
serverLat?: number | null;
|
||||
serverLon?: number | null;
|
||||
satScheduler?: SatelliteSchedulerApi;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostState } from "./host.js";
|
||||
|
||||
import type {
|
||||
ScheduleEntry,
|
||||
SchedulerBookmark,
|
||||
@@ -27,6 +29,12 @@ function schedulerEl(id: string): SchedulerElement {
|
||||
return element as SchedulerElement;
|
||||
}
|
||||
|
||||
/* The timeline needle group is drawn by this feature's own SVG markup, so it is
|
||||
* absent until the timeline has rendered at least once. */
|
||||
function schedulerOptionalEl(id: string): SchedulerElement | null {
|
||||
return document.getElementById(id) as SchedulerElement | null;
|
||||
}
|
||||
|
||||
// Background Decoding Scheduler UI
|
||||
|
||||
(function () {
|
||||
@@ -481,8 +489,8 @@ function schedulerEl(id: string): SchedulerElement {
|
||||
if (mode === "grayline" && currentConfig && currentConfig.grayline) {
|
||||
const gl = currentConfig.grayline;
|
||||
// Prefer saved value; fall back to server coordinates from app.js globals.
|
||||
const lat = gl.lat ?? schedulerWindow.serverLat ?? "";
|
||||
const lon = gl.lon ?? schedulerWindow.serverLon ?? "";
|
||||
const lat = gl.lat ?? hostState.serverLat ?? "";
|
||||
const lon = gl.lon ?? hostState.serverLon ?? "";
|
||||
setInputValue("scheduler-gl-lat", lat != null ? lat : "");
|
||||
setInputValue("scheduler-gl-lon", lon != null ? lon : "");
|
||||
const gridEl = schedulerEl("scheduler-gl-grid");
|
||||
@@ -496,8 +504,8 @@ function schedulerEl(id: string): SchedulerElement {
|
||||
renderBookmarkSelect("scheduler-gl-night", gl.night_bookmark_id);
|
||||
} else if (mode === "grayline") {
|
||||
// No saved grayline config yet — pre-fill coords from server if available.
|
||||
const lat = schedulerWindow.serverLat ?? "";
|
||||
const lon = schedulerWindow.serverLon ?? "";
|
||||
const lat = hostState.serverLat ?? "";
|
||||
const lon = hostState.serverLon ?? "";
|
||||
setInputValue("scheduler-gl-lat", lat != null ? lat : "");
|
||||
setInputValue("scheduler-gl-lon", lon != null ? lon : "");
|
||||
const gridEl2 = schedulerEl("scheduler-gl-grid");
|
||||
@@ -821,7 +829,7 @@ function schedulerEl(id: string): SchedulerElement {
|
||||
}
|
||||
|
||||
function renderTimelineNeedle() {
|
||||
const g = schedulerEl("sch-timeline-needle-g");
|
||||
const g = schedulerOptionalEl("sch-timeline-needle-g");
|
||||
if (g) g.innerHTML = timelineNeedleSvg();
|
||||
}
|
||||
|
||||
@@ -1566,8 +1574,8 @@ function schedulerEl(id: string): SchedulerElement {
|
||||
// When loaded eagerly, initSettingsUI() in app.js calls initScheduler();
|
||||
// when loaded lazily (e.g. settings tab click after boot), the app has
|
||||
// already passed that point, so we must self-initialize here.
|
||||
if (schedulerWindow.authRole != null) {
|
||||
initScheduler(schedulerWindow.lastActiveRigId ?? null, schedulerWindow.authRole);
|
||||
if (hostState.authRole != null) {
|
||||
initScheduler(hostState.lastActiveRigId, hostState.authRole);
|
||||
wireSchedulerEvents();
|
||||
}
|
||||
})();
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
interface VirtualChannel {
|
||||
@@ -21,35 +23,12 @@ interface SchedulerReleaseState {
|
||||
all_released?: boolean;
|
||||
current_session_released?: boolean;
|
||||
}
|
||||
interface SpectrumSnapshot { sample_rate: number; center_hz: number }
|
||||
// Callbacks the application publishes as documented transitional window
|
||||
// properties; all other application state and services arrive through the
|
||||
// typed host contract in ./host.ts.
|
||||
interface VirtualChannelBridge {
|
||||
lastActiveRigId?: string | null;
|
||||
lastFreqHz?: number;
|
||||
lastModeName?: string;
|
||||
lastSpectrumData?: SpectrumSnapshot | null;
|
||||
currentBandwidthHz?: number;
|
||||
jogUnit?: number;
|
||||
rxActive?: boolean;
|
||||
_audioChannelOverride?: string | null;
|
||||
_freqOptimisticSeq?: number;
|
||||
_freqOptimisticHz?: number;
|
||||
renderRdsOverlays?: () => void;
|
||||
updateDocumentTitle?: (rds: unknown) => void;
|
||||
activeChannelRds?: () => unknown;
|
||||
stopRxAudio?: () => void;
|
||||
startRxAudio?: () => void;
|
||||
formatFreqForStep?: (frequencyHz: number, jogUnit: number) => string;
|
||||
setJogDivisor?: (divisor: number) => void;
|
||||
resetRdsDisplay?: () => void;
|
||||
updateWfmControls?: () => void;
|
||||
updateSdrSquelchControlVisibility?: () => void;
|
||||
refreshRdsUi?: () => void;
|
||||
positionRdsPsOverlay?: () => void;
|
||||
mwDefaultsForMode?: (mode: string) => [number, ...unknown[]];
|
||||
showHint?: (message: string, durationMs: number) => void;
|
||||
applyLocalTunedFrequency?: (frequencyHz: number) => void;
|
||||
setRigFrequency?: (frequencyHz: number) => void;
|
||||
refreshFreqDisplay?: () => void;
|
||||
trx?: { modules?: { vchan?: VirtualChannelService } };
|
||||
}
|
||||
|
||||
@@ -63,6 +42,8 @@ interface VirtualChannelService {
|
||||
isOnVirtual(): boolean;
|
||||
interceptMode(mode: string): Promise<boolean>;
|
||||
interceptBandwidth(bandwidthHz: number): Promise<boolean>;
|
||||
interceptFrequency(frequencyHz: number): boolean;
|
||||
interceptFreqDisplay(): boolean;
|
||||
takeSchedulerControl(): Promise<void>;
|
||||
releaseToScheduler(): Promise<void>;
|
||||
}
|
||||
@@ -146,7 +127,7 @@ function vchanStartSchedulerReleasePolling() {
|
||||
|
||||
async function vchanToggleSchedulerRelease() {
|
||||
if (!vchanSessionId) return;
|
||||
const rigId = vchanRigId || vchanWindow.lastActiveRigId || null;
|
||||
const rigId = vchanRigId || hostState.lastActiveRigId || null;
|
||||
try {
|
||||
const resp = await fetch("/scheduler-control", {
|
||||
method: "PUT",
|
||||
@@ -261,9 +242,7 @@ function vchanRender() {
|
||||
picker.appendChild(addBtn);
|
||||
|
||||
vchanSyncAccentUI();
|
||||
if (vchanWindow.updateDocumentTitle && vchanWindow.activeChannelRds) {
|
||||
vchanWindow.updateDocumentTitle(vchanWindow.activeChannelRds());
|
||||
}
|
||||
hostCore.updateDocumentTitle(hostCore.activeChannelRds());
|
||||
vchanRenderSchedulerRelease();
|
||||
}
|
||||
|
||||
@@ -271,8 +250,8 @@ async function vchanAllocate() {
|
||||
if (!vchanSessionId || !vchanRigId) return;
|
||||
|
||||
// Use the last known rig frequency and mode as the starting point.
|
||||
const freqHz = (typeof vchanWindow.lastFreqHz === "number" && vchanWindow.lastFreqHz > 0)
|
||||
? vchanWindow.lastFreqHz
|
||||
const freqHz = (typeof hostState.lastFreqHz === "number" && hostState.lastFreqHz > 0)
|
||||
? hostState.lastFreqHz
|
||||
: 0;
|
||||
const modeEl = document.getElementById("mode") as HTMLSelectElement | null;
|
||||
const mode = modeEl ? (modeEl.value || "USB") : "USB";
|
||||
@@ -374,14 +353,14 @@ function vchanReconnectAudio(): void {
|
||||
// Always update the override so startRxAudio picks up the right URL,
|
||||
// even when audio isn't currently running.
|
||||
const ch = vchanIsOnVirtual() ? vchanActiveChannel() : null;
|
||||
vchanWindow._audioChannelOverride = ch?.id ?? null;
|
||||
if (!vchanWindow.rxActive) return;
|
||||
vchanWindow.stopRxAudio?.();
|
||||
hostState.audioChannelOverride = ch?.id ?? null;
|
||||
if (!hostState.rxActive) return;
|
||||
hostCore.stopRxAudio();
|
||||
// Delay so the server has time to set up the per-channel encoder.
|
||||
// The server-side audio_ws handler also polls for up to 2 s, so this
|
||||
// just needs to be long enough for the WS upgrade to reach the server.
|
||||
setTimeout(() => {
|
||||
vchanWindow.startRxAudio?.();
|
||||
hostCore.startRxAudio();
|
||||
}, 300);
|
||||
}
|
||||
|
||||
@@ -414,11 +393,7 @@ function vchanUpdateFreqDisplay() {
|
||||
if (!ch) return;
|
||||
const el = document.getElementById("freq") as HTMLInputElement | null;
|
||||
if (!el) return;
|
||||
if (vchanWindow.formatFreqForStep && typeof vchanWindow.jogUnit === "number") {
|
||||
el.value = vchanWindow.formatFreqForStep(ch.freq_hz, vchanWindow.jogUnit);
|
||||
} else {
|
||||
el.value = (ch.freq_hz / 1e6).toFixed(6).replace(/\.?0+$/, "");
|
||||
}
|
||||
el.value = hostCore.formatFreqForStep(ch.freq_hz, hostState.jogUnit);
|
||||
}
|
||||
|
||||
// Sync the mode picker to the active virtual channel's mode.
|
||||
@@ -428,25 +403,28 @@ function vchanSyncModeDisplay() {
|
||||
if (!modeEl) return;
|
||||
if (vchanIsOnVirtual()) {
|
||||
const ch = vchanActiveChannel();
|
||||
if (ch && ch.mode) modeEl.value = ch.mode.toUpperCase();
|
||||
if (ch && ch.mode) {
|
||||
modeEl.value = ch.mode.toUpperCase();
|
||||
hostCore.syncModePicker();
|
||||
}
|
||||
}
|
||||
// When on primary channel, app.js rig-state updates handle the picker.
|
||||
const modeUpper = (modeEl.value || "").toUpperCase();
|
||||
if (typeof vchanWindow.lastModeName === "string") {
|
||||
if (modeUpper === "WFM" && vchanWindow.lastModeName !== "WFM") {
|
||||
vchanWindow.setJogDivisor?.(10);
|
||||
vchanWindow.resetRdsDisplay?.();
|
||||
} else if (modeUpper !== "WFM" && vchanWindow.lastModeName === "WFM") {
|
||||
vchanWindow.resetRdsDisplay?.();
|
||||
if (typeof hostState.lastModeName === "string") {
|
||||
if (modeUpper === "WFM" && hostState.lastModeName !== "WFM") {
|
||||
hostCore.setJogDivisor(10);
|
||||
hostCore.resetRdsDisplay();
|
||||
} else if (modeUpper !== "WFM" && hostState.lastModeName === "WFM") {
|
||||
hostCore.resetRdsDisplay();
|
||||
}
|
||||
vchanWindow.lastModeName = modeUpper;
|
||||
hostState.lastModeName = modeUpper;
|
||||
}
|
||||
vchanWindow.updateWfmControls?.();
|
||||
vchanWindow.updateSdrSquelchControlVisibility?.();
|
||||
hostCore.updateWfmControls();
|
||||
hostCore.updateSdrSquelchControlVisibility();
|
||||
if (vchanWindow.refreshRdsUi) {
|
||||
vchanWindow.refreshRdsUi();
|
||||
} else {
|
||||
vchanWindow.positionRdsPsOverlay?.();
|
||||
hostCore.positionRdsPsOverlay();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -459,12 +437,12 @@ function vchanSyncBwDisplay() {
|
||||
if (!bwEl) return;
|
||||
// bandwidth_hz == 0 means mode-default; derive it from the channel mode.
|
||||
let bwHz = ch.bandwidth_hz || 0;
|
||||
if (bwHz === 0 && vchanWindow.mwDefaultsForMode) {
|
||||
bwHz = vchanWindow.mwDefaultsForMode(ch.mode)[0] || 0;
|
||||
if (bwHz === 0) {
|
||||
bwHz = hostCore.mwDefaultsForMode(ch.mode)[0] || 0;
|
||||
}
|
||||
if (bwHz > 0) {
|
||||
bwEl.value = (bwHz / 1000).toFixed(3).replace(/\.?0+$/, "");
|
||||
vchanWindow.currentBandwidthHz = bwHz;
|
||||
hostState.currentBandwidthHz = bwHz;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -480,29 +458,22 @@ function vchanSyncAccentUI() {
|
||||
vchanSyncModeDisplay();
|
||||
vchanSyncBwDisplay();
|
||||
} else {
|
||||
origRefreshFreqDisplay?.();
|
||||
}
|
||||
if (vchanWindow.updateDocumentTitle && vchanWindow.activeChannelRds) {
|
||||
vchanWindow.updateDocumentTitle(vchanWindow.activeChannelRds());
|
||||
hostCore.refreshFreqDisplay();
|
||||
}
|
||||
hostCore.updateDocumentTitle(hostCore.activeChannelRds());
|
||||
}
|
||||
|
||||
// Saved reference to the original refreshFreqDisplay from app.js.
|
||||
let origRefreshFreqDisplay: (() => void) | null = null;
|
||||
|
||||
function vchanSetChannelFreq(freqHz: number): void {
|
||||
if (!vchanRigId || !vchanActiveId) return;
|
||||
// Validate against current SDR capture window.
|
||||
if (vchanWindow.lastSpectrumData && vchanWindow.lastSpectrumData.sample_rate > 0) {
|
||||
const halfSpan = vchanWindow.lastSpectrumData.sample_rate / 2;
|
||||
const center = vchanWindow.lastSpectrumData.center_hz;
|
||||
if (hostState.lastSpectrumData && hostState.lastSpectrumData.sample_rate > 0) {
|
||||
const halfSpan = hostState.lastSpectrumData.sample_rate / 2;
|
||||
const center = hostState.lastSpectrumData.center_hz;
|
||||
if (Math.abs(freqHz - center) > halfSpan) {
|
||||
if (vchanWindow.showHint) {
|
||||
vchanWindow.showHint(
|
||||
`Out of SDR bandwidth (center ${(center / 1e6).toFixed(3)} MHz ±${(halfSpan / 1e3).toFixed(0)} kHz)`,
|
||||
3000
|
||||
);
|
||||
}
|
||||
hostCore.showHint(
|
||||
`Out of SDR bandwidth (center ${(center / 1e6).toFixed(3)} MHz ±${(halfSpan / 1e3).toFixed(0)} kHz)`,
|
||||
3000
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -571,6 +542,26 @@ async function vchanInterceptBandwidth(bwHz: number): Promise<boolean> {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called by setRigFrequency before it posts /set_freq. When a non-primary
|
||||
// channel is active the change belongs to the channel API instead of the rig,
|
||||
// so this applies the optimistic local update and reports the tune as handled.
|
||||
function vchanInterceptFrequency(freqHz: number): boolean {
|
||||
if (!vchanIsOnVirtual()) return false;
|
||||
const targetHz = Math.round(freqHz);
|
||||
hostCore.armOptimisticFrequency(targetHz);
|
||||
hostCore.applyLocalTunedFrequency(targetHz);
|
||||
vchanSetChannelFreq(freqHz);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called by the application's refreshFreqDisplay. While a virtual channel is
|
||||
// active the field belongs to that channel, so report the render as handled.
|
||||
function vchanInterceptFreqDisplay(): boolean {
|
||||
if (!vchanIsOnVirtual()) return false;
|
||||
vchanUpdateFreqDisplay();
|
||||
return true;
|
||||
}
|
||||
|
||||
vchanWindow.trx ??= {};
|
||||
vchanWindow.trx.modules ??= {};
|
||||
vchanWindow.trx.modules.vchan = {
|
||||
@@ -583,34 +574,12 @@ vchanWindow.trx.modules.vchan = {
|
||||
isOnVirtual: vchanIsOnVirtual,
|
||||
interceptMode: vchanInterceptMode,
|
||||
interceptBandwidth: vchanInterceptBandwidth,
|
||||
interceptFrequency: vchanInterceptFrequency,
|
||||
interceptFreqDisplay: vchanInterceptFreqDisplay,
|
||||
takeSchedulerControl: vchanTakeSchedulerControl,
|
||||
releaseToScheduler: vchanToggleSchedulerRelease,
|
||||
};
|
||||
|
||||
// Wrap setRigFrequency (defined in app.js, loaded before this file) so that
|
||||
// frequency changes are redirected to the active virtual channel instead of
|
||||
// the server when on a non-primary channel.
|
||||
(function() {
|
||||
const original = vchanWindow.setRigFrequency;
|
||||
vchanWindow.setRigFrequency = function(freqHz: number) {
|
||||
if (vchanIsOnVirtual()) {
|
||||
// Optimistic local update first, then fire-and-forget channel API.
|
||||
if (vchanWindow.applyLocalTunedFrequency) {
|
||||
if (typeof vchanWindow._freqOptimisticSeq === "number") {
|
||||
vchanWindow._freqOptimisticSeq += 1;
|
||||
vchanWindow._freqOptimisticHz = Math.round(freqHz);
|
||||
}
|
||||
vchanWindow.applyLocalTunedFrequency(Math.round(freqHz));
|
||||
}
|
||||
vchanSetChannelFreq(freqHz);
|
||||
return;
|
||||
}
|
||||
// Scheduler control is fire-and-forget — don't block the freq change.
|
||||
void vchanTakeSchedulerControl();
|
||||
original?.(freqHz);
|
||||
};
|
||||
})();
|
||||
|
||||
(function initSchedulerReleaseControl() {
|
||||
const btn = document.getElementById("scheduler-release-btn");
|
||||
if (btn) {
|
||||
@@ -622,16 +591,3 @@ vchanWindow.trx.modules.vchan = {
|
||||
vchanRenderSchedulerRelease();
|
||||
})();
|
||||
|
||||
// Wrap refreshFreqDisplay so the main freq field stays in sync with the
|
||||
// active virtual channel's frequency (SSE rig-state updates would otherwise
|
||||
// constantly overwrite it with channel 0's freq).
|
||||
(function() {
|
||||
origRefreshFreqDisplay = vchanWindow.refreshFreqDisplay ?? null;
|
||||
vchanWindow.refreshFreqDisplay = function() {
|
||||
if (vchanIsOnVirtual()) {
|
||||
vchanUpdateFreqDisplay();
|
||||
return;
|
||||
}
|
||||
origRefreshFreqDisplay?.();
|
||||
};
|
||||
})();
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
export {};
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract";
|
||||
@@ -38,8 +40,6 @@ interface VdesMessage {
|
||||
interface VdesBridge {
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
escapeMapHtml?: (input: string) => string;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
vdesMapAddPoint?: (message: VdesMessage) => void;
|
||||
updateVdesBar?: () => void;
|
||||
@@ -47,9 +47,7 @@ interface VdesBridge {
|
||||
}
|
||||
|
||||
const vdesWindow = window as unknown as VdesBridge;
|
||||
const escapeVdesHtml = (input: string): string => vdesWindow.escapeMapHtml?.(input) ?? input
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """);
|
||||
const escapeVdesHtml = (input: string): string => hostCore.escapeMapHtml(input);
|
||||
|
||||
// --- VDES Decoder Plugin (server-side decode) ---
|
||||
const vdesStatus = document.getElementById("vdes-status");
|
||||
@@ -322,9 +320,7 @@ function onServerVdesBatch(messages: VdesMessage[]): void {
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
});
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
normalized.push(next);
|
||||
}
|
||||
normalized.reverse();
|
||||
@@ -337,7 +333,7 @@ function onServerVdesBatch(messages: VdesMessage[]): void {
|
||||
document.getElementById("settings-clear-vdes-history")?.addEventListener("click", () => { void (async () => {
|
||||
if (!await vdesWindow.trxUi.confirm({ title: "Clear VDES history?", message: "All stored VDES decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await vdesWindow.postPath?.("/clear_vdes_decode");
|
||||
await hostCore.postPath("/clear_vdes_decode");
|
||||
resetVdesHistoryView();
|
||||
} catch (e) {
|
||||
console.error("VDES history clear failed", e);
|
||||
@@ -351,13 +347,17 @@ if (vdesFilterInput) {
|
||||
});
|
||||
}
|
||||
|
||||
/** Hands a positioned message to the map, if the map module is loaded yet. */
|
||||
function plotVdesMessage(msg: VdesMessage): void {
|
||||
if (msg.lat == null || msg.lon == null || !vdesWindow.vdesMapAddPoint) return;
|
||||
vdesWindow.vdesMapAddPoint(msg);
|
||||
}
|
||||
|
||||
function onServerVdes(msg: VdesMessage): void {
|
||||
if (vdesStatus) vdesStatus.textContent = "Receiving";
|
||||
const next = normalizeServerVdesMessage(msg);
|
||||
addVdesMessage(next);
|
||||
if (next.lat != null && next.lon != null && vdesWindow.vdesMapAddPoint) {
|
||||
vdesWindow.vdesMapAddPoint(next);
|
||||
}
|
||||
plotVdesMessage(next);
|
||||
}
|
||||
|
||||
function pruneVdesHistoryView(): void {
|
||||
@@ -374,4 +374,6 @@ updateVdesSummary();
|
||||
restore: onServerVdesBatch,
|
||||
reset: resetVdesHistoryView,
|
||||
prune: pruneVdesHistoryView,
|
||||
// Oldest first, so tracks are rebuilt in the order they happened.
|
||||
syncMap: () => { for (const entry of [...vdesMessageHistory].reverse()) plotVdesMessage(entry); },
|
||||
});
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract.js";
|
||||
|
||||
export {};
|
||||
@@ -29,7 +31,6 @@ interface WefaxProgress {
|
||||
interface WefaxBridge {
|
||||
getDecodeHistoryRetentionMs?: () => number;
|
||||
trxScheduleUiFrameJob?: (key: string, job: () => void) => void;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<unknown>;
|
||||
syncWefaxToggle?: (enabled: boolean) => void;
|
||||
}
|
||||
@@ -411,7 +412,7 @@ if (wefaxDom.toggleBtn) {
|
||||
if (wefaxWindow.takeSchedulerControlForDecoderDisable) {
|
||||
await wefaxWindow.takeSchedulerControlForDecoderDisable(toggleButton);
|
||||
}
|
||||
await wefaxWindow.postPath?.('/toggle_wefax_decode');
|
||||
await hostCore.postPath('/toggle_wefax_decode');
|
||||
} catch (e) {
|
||||
console.error('WEFAX toggle failed', e);
|
||||
}
|
||||
@@ -420,7 +421,7 @@ if (wefaxDom.toggleBtn) {
|
||||
if (wefaxDom.clearBtn) {
|
||||
wefaxDom.clearBtn.addEventListener('click', () => { void (async () => {
|
||||
try {
|
||||
await wefaxWindow.postPath?.('/clear_wefax_decode');
|
||||
await hostCore.postPath('/clear_wefax_decode');
|
||||
resetWefaxHistoryView();
|
||||
} catch (e) {
|
||||
console.error('WEFAX clear failed', e);
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore } from "./host.js";
|
||||
|
||||
import type { PluginRuntimeWindow } from "./runtime-contract.js";
|
||||
|
||||
export {};
|
||||
@@ -25,7 +27,6 @@ interface WsprBridge {
|
||||
navigateToMapLocator?: (grid: string, type: "wspr") => void;
|
||||
clearMapMarkersByType?: (type: "wspr") => void;
|
||||
takeSchedulerControlForDecoderDisable?: (button: HTMLElement) => Promise<void>;
|
||||
postPath?: (path: string) => Promise<unknown>;
|
||||
trxUi: { confirm(options: { title: string; message: string; confirmLabel: string }): Promise<boolean> };
|
||||
[key: string]: unknown;
|
||||
}
|
||||
@@ -291,7 +292,7 @@ wsprDecodeToggleBtn?.addEventListener("click", () => {
|
||||
void (async () => {
|
||||
try {
|
||||
await wsprWindow.takeSchedulerControlForDecoderDisable?.(wsprDecodeToggleBtn);
|
||||
await wsprWindow.postPath?.("/toggle_wspr_decode");
|
||||
await hostCore.postPath("/toggle_wspr_decode");
|
||||
} catch (error: unknown) {
|
||||
console.error("WSPR toggle failed", error);
|
||||
}
|
||||
@@ -302,7 +303,7 @@ document.getElementById("settings-clear-wspr-history")?.addEventListener("click"
|
||||
void (async () => {
|
||||
if (!await wsprWindow.trxUi.confirm({ title: "Clear WSPR history?", message: "All stored WSPR decodes will be permanently removed.", confirmLabel: "Clear history" })) return;
|
||||
try {
|
||||
await wsprWindow.postPath?.("/clear_wspr_decode");
|
||||
await hostCore.postPath("/clear_wspr_decode");
|
||||
resetWsprHistoryView();
|
||||
} catch (error: unknown) {
|
||||
console.error("WSPR history clear failed", error);
|
||||
|
||||
@@ -195,6 +195,31 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
const layoutCapabilities: Record<LayoutCapability, boolean> = { broadcast: false, digital: false };
|
||||
let activeRigId: string | null = null;
|
||||
|
||||
// A layout seeds the collapsible sections; it does not hold them there.
|
||||
// applyLayout runs on every rig-state refresh, so re-applying the disclosure
|
||||
// state unconditionally would reopen or close sections under the operator
|
||||
// once a second — the reason a section could not be expanded while a layout
|
||||
// that collapses it was selected. Sections are therefore written only when
|
||||
// the layout actually changes, or the first time each one appears in the DOM
|
||||
// (the advanced controls are built after the first applyLayout call).
|
||||
const layoutSections: { id: string; key: "advanced" | "audio" | "scheduler" }[] = [
|
||||
{ id: "advanced-radio-controls", key: "advanced" },
|
||||
{ id: "audio-controls", key: "audio" },
|
||||
{ id: "scheduler-controls", key: "scheduler" },
|
||||
];
|
||||
const seededSections = new Set<string>();
|
||||
let appliedLayoutName: LayoutName | null = null;
|
||||
|
||||
function seedLayoutSections(layout: OperatorLayout, layoutChanged: boolean) {
|
||||
layoutSections.forEach(({ id, key }) => {
|
||||
const section = document.getElementById(id) as HTMLDetailsElement | null;
|
||||
if (!section) return;
|
||||
if (!layoutChanged && seededSections.has(id)) return;
|
||||
seededSections.add(id);
|
||||
section.open = layout[key];
|
||||
});
|
||||
}
|
||||
|
||||
function layoutStorageKey() {
|
||||
return activeRigId ? `trxOperatorLayout:${activeRigId}` : "trxOperatorLayout";
|
||||
}
|
||||
@@ -255,12 +280,9 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
const layout = layouts[permittedName];
|
||||
document.body.dataset.operatorLayout = permittedName in layouts ? permittedName : "compact";
|
||||
if (options.persist !== false) localStorage.setItem(layoutStorageKey(), permittedName);
|
||||
const details = document.getElementById("advanced-radio-controls") as HTMLDetailsElement | null;
|
||||
if (details) details.open = layout.advanced;
|
||||
const audioDetails = document.getElementById("audio-controls") as HTMLDetailsElement | null;
|
||||
if (audioDetails) audioDetails.open = layout.audio;
|
||||
const schedulerDetails = document.getElementById("scheduler-controls") as HTMLDetailsElement | null;
|
||||
if (schedulerDetails) schedulerDetails.open = layout.scheduler;
|
||||
const layoutChanged = appliedLayoutName !== permittedName;
|
||||
appliedLayoutName = permittedName;
|
||||
seedLayoutSections(layout, layoutChanged);
|
||||
if (options.navigate && typeof browserWindow.navigateToTab === "function") {
|
||||
browserWindow.navigateToTab(layout.preferredTab);
|
||||
}
|
||||
@@ -295,11 +317,163 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
const element = document.getElementById(id);
|
||||
if (element) body.appendChild(element);
|
||||
});
|
||||
tray.appendChild(details);
|
||||
// Ahead of the collapsibles the markup ships: the radio's own settings
|
||||
// come before audio and the scheduler, and appending would put the
|
||||
// section built here last whatever the markup says.
|
||||
tray.insertBefore(details, document.getElementById("audio-controls"));
|
||||
api.applyLayout(savedLayoutName(), { persist: false });
|
||||
}
|
||||
}
|
||||
|
||||
// Secondary controls, in the order they leave the bar when it gets tight.
|
||||
// Audio, record and the rig picker are the operating controls and stay.
|
||||
const overflowOrder = [".operator-layout-picker", ".header-style-pick", "#theme-toggle"];
|
||||
|
||||
// Anchored at paint time in fixed coordinates. An absolutely positioned
|
||||
// dropdown is clipped by any scrolling ancestor and trapped inside the
|
||||
// stacking context its ancestors create, so it can end up squashed inside
|
||||
// the bar or painted underneath page content. Fixed positioning answers to
|
||||
// the viewport instead, and the menu flips above its button near the bottom
|
||||
// edge.
|
||||
function anchorMenu(button: HTMLElement, menu: HTMLElement) {
|
||||
const rect = button.getBoundingClientRect();
|
||||
// Reparent to the body. Fixed positioning escapes clipping but not
|
||||
// stacking: the header sets `z-index: 2`, which makes it a stacking
|
||||
// context, so any z-index the menu carries is confined below every panel
|
||||
// that paints above level 2 — the spectrum overlays reach 9600. Only
|
||||
// leaving that subtree lets the menu sit above the page.
|
||||
if (menu.parentElement !== document.body) document.body.appendChild(menu);
|
||||
menu.style.position = "fixed";
|
||||
menu.style.zIndex = "9700";
|
||||
menu.style.top = "0px";
|
||||
menu.style.bottom = "auto";
|
||||
// The stylesheet pins these menus to the right of their anchor; leaving
|
||||
// that in place while setting a left would stretch them across the bar.
|
||||
menu.style.right = "auto";
|
||||
const width = menu.offsetWidth || 200;
|
||||
const height = menu.offsetHeight || 0;
|
||||
menu.style.left = `${String(Math.round(Math.min(Math.max(8, rect.right - width), window.innerWidth - width - 8)))}px`;
|
||||
const below = rect.bottom + 8;
|
||||
if (below + height <= window.innerHeight - 8) {
|
||||
menu.style.top = `${String(Math.round(below))}px`;
|
||||
} else {
|
||||
menu.style.top = "auto";
|
||||
menu.style.bottom = `${String(Math.round(window.innerHeight - rect.top + 8))}px`;
|
||||
}
|
||||
}
|
||||
|
||||
function installTopBarOverflow() {
|
||||
const actions = document.querySelector<HTMLElement>(".top-bar-actions");
|
||||
if (!actions || document.getElementById("top-bar-more")) return;
|
||||
const wrap = document.createElement("div");
|
||||
wrap.id = "top-bar-more";
|
||||
wrap.className = "top-bar-more";
|
||||
const button = document.createElement("button");
|
||||
button.type = "button";
|
||||
button.id = "top-bar-more-btn";
|
||||
button.className = "header-bar-btn top-bar-more-btn";
|
||||
button.textContent = "⋯";
|
||||
button.setAttribute("aria-haspopup", "menu");
|
||||
button.setAttribute("aria-expanded", "false");
|
||||
button.setAttribute("aria-label", "More controls");
|
||||
button.title = "More controls";
|
||||
const menu = document.createElement("div");
|
||||
menu.id = "top-bar-more-menu";
|
||||
menu.className = "top-bar-more-menu";
|
||||
menu.setAttribute("role", "menu");
|
||||
button.setAttribute("aria-controls", menu.id);
|
||||
wrap.append(button, menu);
|
||||
actions.appendChild(wrap);
|
||||
|
||||
const closeMenu = () => {
|
||||
menu.classList.remove("is-open");
|
||||
button.setAttribute("aria-expanded", "false");
|
||||
};
|
||||
button.addEventListener("click", () => {
|
||||
const open = menu.classList.toggle("is-open");
|
||||
button.setAttribute("aria-expanded", String(open));
|
||||
if (open) anchorMenu(button, menu);
|
||||
});
|
||||
document.addEventListener("click", (event) => {
|
||||
if (!(event.target instanceof Node)) { closeMenu(); return; }
|
||||
if (!wrap.contains(event.target) && !menu.contains(event.target)) closeMenu();
|
||||
});
|
||||
document.addEventListener("keydown", (event) => { if (event.key === "Escape") closeMenu(); });
|
||||
|
||||
// What "fits" means, measured rather than predicted. Two things have to
|
||||
// hold: the controls stay inside the bar, and no tab reaches them. The
|
||||
// tabs are the test rather than the nav's own box because the nav may
|
||||
// shrink below its content — its box gets smaller while the tabs inside
|
||||
// keep their width and slide under the controls, so the container reports
|
||||
// nothing wrong while destinations become unclickable.
|
||||
//
|
||||
// This was an arithmetic estimate — identity + nav.scrollWidth +
|
||||
// actions.scrollWidth + a 48px allowance for the gaps — which under-counts
|
||||
// whatever the allowance does not cover. On a platform whose fonts run
|
||||
// wider than this machine's it declared a fit that overlapped by 9px, and
|
||||
// nothing degraded because nothing thought anything was wrong. Reading
|
||||
// the geometry costs a synchronous layout per step, at most five per pass,
|
||||
// and cannot disagree with what the operator sees.
|
||||
const barFits = () => {
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
const nav = bar?.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
if (!bar || !nav) return true;
|
||||
const barRect = bar.getBoundingClientRect();
|
||||
const actionsRect = actions.getBoundingClientRect();
|
||||
if (actionsRect.right > barRect.right + 1) return false;
|
||||
const tabs = Array.from(nav.querySelectorAll<HTMLElement>(".tab"))
|
||||
.filter((tab) => tab.offsetParent !== null);
|
||||
if (!tabs.length) return true;
|
||||
const tabsRight = Math.max(...tabs.map((tab) => tab.getBoundingClientRect().right));
|
||||
return tabsRight <= actionsRect.left - 1;
|
||||
};
|
||||
const reflowOverflow = () => {
|
||||
const nav = document.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
// Measure from the roomiest state every time, so the decision is a
|
||||
// function of the current widths alone and cannot ratchet.
|
||||
nav?.classList.remove("nav-icons-only");
|
||||
bar?.classList.remove("bar-tight");
|
||||
overflowOrder.forEach((selector) => {
|
||||
const element = menu.querySelector<HTMLElement>(selector);
|
||||
if (element) actions.insertBefore(element, wrap);
|
||||
});
|
||||
wrap.hidden = true;
|
||||
for (const selector of overflowOrder) {
|
||||
if (barFits()) break;
|
||||
const element = actions.querySelector<HTMLElement>(selector);
|
||||
if (!element) continue;
|
||||
wrap.hidden = false;
|
||||
menu.appendChild(element);
|
||||
}
|
||||
// Last resort, once every movable control is already in the menu: drop
|
||||
// the tabs to their icons. Without it the nav — which may shrink below
|
||||
// its content — keeps its tabs at full width and runs them under the
|
||||
// controls, so the destinations nearest the controls become unclickable.
|
||||
// Icon widths are fixed, so this always buys back the labels' width.
|
||||
if (nav && !barFits()) nav.classList.add("nav-icons-only");
|
||||
// Still short with the tabs down to icons: hand the squeeze to the
|
||||
// identity block, which can ellipsise, rather than to the strip, which
|
||||
// can only clip destinations out of reach.
|
||||
if (bar && !barFits()) bar.classList.add("bar-tight");
|
||||
wrap.hidden = menu.children.length === 0;
|
||||
if (wrap.hidden) closeMenu();
|
||||
};
|
||||
reflowOverflow();
|
||||
window.addEventListener("resize", reflowOverflow);
|
||||
// A resize is not the only thing that changes what fits: the rig name
|
||||
// arrives from the server, the style picker fills in, a web font swaps in
|
||||
// wider metrics. Each changes the bar's content without touching the
|
||||
// window, and the strip stayed as it was through all of them.
|
||||
if (typeof ResizeObserver !== "undefined") {
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
const observer = new ResizeObserver(() => { reflowOverflow(); });
|
||||
if (bar) observer.observe(bar);
|
||||
observer.observe(actions);
|
||||
}
|
||||
document.fonts?.ready.then(() => { reflowOverflow(); }).catch(() => {});
|
||||
}
|
||||
|
||||
function installMobileMore() {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
if (!nav || document.getElementById("mobile-more-btn")) return;
|
||||
@@ -307,7 +481,8 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
more.id = "mobile-more-btn";
|
||||
more.className = "tab mobile-more-btn";
|
||||
more.type = "button";
|
||||
more.innerHTML = '<span class="tab-more-icon" aria-hidden="true">•••</span><span class="tab-label">More</span>';
|
||||
more.innerHTML = '<span class="tab-more-icon" aria-hidden="true">•••</span><span class="tab-label">Tools</span>';
|
||||
more.setAttribute("aria-label", "Tools and settings");
|
||||
more.setAttribute("aria-haspopup", "menu");
|
||||
more.setAttribute("aria-expanded", "false");
|
||||
const menu = document.createElement("div");
|
||||
@@ -339,7 +514,10 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
more.addEventListener("click", () => {
|
||||
const open = menu.classList.toggle("is-open");
|
||||
more.setAttribute("aria-expanded", String(open));
|
||||
if (open) menu.querySelector<HTMLElement>('[role="menuitem"]')?.focus();
|
||||
if (open) {
|
||||
anchorMenu(more, menu);
|
||||
menu.querySelector<HTMLElement>('[role="menuitem"]')?.focus();
|
||||
}
|
||||
});
|
||||
document.addEventListener("click", (event) => {
|
||||
if (!(event.target instanceof Node) || (!menu.contains(event.target) && !more.contains(event.target))) closeMore();
|
||||
@@ -404,6 +582,7 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
api.init = function init() {
|
||||
ensureLiveRegions();
|
||||
installLayoutControls();
|
||||
installTopBarOverflow();
|
||||
installMobileMore();
|
||||
installDecoderPicker();
|
||||
installDecoderBadges();
|
||||
|
||||
@@ -3,14 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("AIS entry forwards positioned vessels with normalized metadata", async () => {
|
||||
const forwarded = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
trxUi: { confirm: async () => true },
|
||||
aisMapAddVessel: (message) => { forwarded.push(message); },
|
||||
};
|
||||
@@ -25,7 +26,7 @@ test("AIS entry forwards positioned vessels with normalized metadata", async ()
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/ais.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/ais.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
const sharedUrl = new URL("../src/plugins/aprs-shared.ts", import.meta.url);
|
||||
const stylePath = new URL("../../assets/web/style.css", import.meta.url);
|
||||
|
||||
async function loadShared() {
|
||||
const source = await bundleEntry(sharedUrl, "trxAprsShared");
|
||||
const context = vm.createContext({ Math, String, Number, Array, Date, Set, console });
|
||||
new vm.Script(source).runInContext(context);
|
||||
return context.trxAprsShared;
|
||||
}
|
||||
|
||||
// The sheets are 16x6 grids of 24px cells covering 0x21..0x7E, so cell index
|
||||
// is `code - 0x21`. Getting this wrong shifts every station to a neighbouring
|
||||
// icon, which is invisible in a screenshot but wrong on every packet.
|
||||
test("sprite cells are indexed from the first printable symbol code", async () => {
|
||||
const { aprsSymbolSprite } = await loadShared();
|
||||
|
||||
const first = aprsSymbolSprite("/", "!");
|
||||
assert.equal(first.className, "aprs-symbol-primary");
|
||||
assert.equal(first.backgroundPosition, "0px 0px");
|
||||
assert.equal(first.label, "Primary APRS symbol /!");
|
||||
// '>' is 0x3E -> index 29 -> column 13, row 1.
|
||||
assert.equal(aprsSymbolSprite("/", ">").backgroundPosition, "-312px -24px");
|
||||
// '~' is 0x7E -> index 93 -> the last cell of the last row.
|
||||
assert.equal(aprsSymbolSprite("/", "~").backgroundPosition, "-312px -120px");
|
||||
});
|
||||
|
||||
test("the table identifier selects the primary, alternate, or overlay sheet", async () => {
|
||||
const { aprsSymbolSprite } = await loadShared();
|
||||
|
||||
assert.equal(aprsSymbolSprite("/", "_").className, "aprs-symbol-primary");
|
||||
assert.equal(aprsSymbolSprite("\\", "_").className, "aprs-symbol-alternate");
|
||||
|
||||
// An alphanumeric table identifier is an overlay character drawn on top of
|
||||
// the alternate symbol: overlay cell first, then the symbol cell.
|
||||
const overlaid = aprsSymbolSprite("S", ">");
|
||||
assert.equal(overlaid.className, "aprs-symbol-overlaid");
|
||||
assert.equal(overlaid.backgroundPosition, "-48px -72px, -312px -24px");
|
||||
assert.equal(overlaid.label, "Alternate APRS symbol \\> with overlay S");
|
||||
});
|
||||
|
||||
test("codes outside the sprite sheets fall back to the raw character", async () => {
|
||||
const { aprsSymbolSprite, renderLocalAprsSymbol } = await loadShared();
|
||||
const escape = (value) => value;
|
||||
|
||||
assert.equal(aprsSymbolSprite("/", " "), null);
|
||||
assert.equal(aprsSymbolSprite("/", ""), null);
|
||||
assert.equal(aprsSymbolSprite("/", "ab"), null);
|
||||
assert.equal(aprsSymbolSprite(null, ">"), null);
|
||||
|
||||
assert.equal(renderLocalAprsSymbol({ symbolTable: "/", symbolCode: " " }, escape),
|
||||
'<span class="aprs-symbol aprs-symbol-local" title="Primary APRS symbol "> </span>');
|
||||
assert.equal(renderLocalAprsSymbol({}, escape), "");
|
||||
});
|
||||
|
||||
test("rendered symbols carry a sprite class and an inline cell offset", async () => {
|
||||
const { renderLocalAprsSymbol } = await loadShared();
|
||||
const html = renderLocalAprsSymbol({ symbolTable: "/", symbolCode: ">" }, (value) => value);
|
||||
|
||||
assert.match(html, /class="aprs-symbol aprs-symbol-primary"/);
|
||||
assert.match(html, /style="background-position:-312px -24px"/);
|
||||
assert.match(html, /aria-label="Primary APRS symbol \/>"/);
|
||||
assert.equal(html.includes("http"), false);
|
||||
});
|
||||
|
||||
// The cell offsets are computed in the bundles, so the sheet URLs and the grid
|
||||
// geometry have to stay in lockstep with them here.
|
||||
test("the stylesheet serves every sheet locally at the sprite geometry", async () => {
|
||||
const css = await readFile(stylePath, "utf8");
|
||||
|
||||
assert.match(css, /\.aprs-symbol\s*\{[^}]*background-size:\s*384px 144px/);
|
||||
for (const sheet of ["24-0", "24-1", "24-2", "24-0-2x", "24-1-2x", "24-2-2x"]) {
|
||||
assert.ok(css.includes(`url('/vendor/aprs-symbols-${sheet}.png')`), `missing sheet ${sheet}`);
|
||||
}
|
||||
assert.match(css, /\.aprs-symbol-overlaid\s*\{[^}]*aprs-symbols-24-2\.png'\), url\('\/vendor\/aprs-symbols-24-1\.png'\)/);
|
||||
});
|
||||
@@ -6,10 +6,12 @@ import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("APRS entry normalizes positioned packets without remote symbol assets", async () => {
|
||||
const forwarded = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
trxUi: { confirm: async () => true },
|
||||
aprsMapAddStation: (...args) => { forwarded.push(args); },
|
||||
};
|
||||
@@ -38,3 +40,49 @@ test("APRS entry normalizes positioned packets without remote symbol assets", as
|
||||
assert.equal(forwarded[0][1], 54.5);
|
||||
assert.equal(forwarded[0][6].rig_id, null);
|
||||
});
|
||||
|
||||
// Distance is computed from the receiver position and the great-circle helper,
|
||||
// both of which the entry reads through the host contract. These used to be
|
||||
// bare window properties that the module graph stopped publishing, so the
|
||||
// distance column rendered empty for every positioned packet.
|
||||
test("APRS distance text uses the receiver position from the host contract", async () => {
|
||||
const distanceArgs = [];
|
||||
const host = createHost({
|
||||
state: { serverLat: 54.0, serverLon: 18.0 },
|
||||
core: {
|
||||
haversineKm: (lat1, lon1, lat2, lon2) => {
|
||||
distanceArgs.push([lat1, lon1, lat2, lon2]);
|
||||
return 61.7;
|
||||
},
|
||||
},
|
||||
});
|
||||
const window = { ...host, trxUi: { confirm: async () => true }, aprsMapAddStation: () => {} };
|
||||
const node = () => ({
|
||||
innerHTML: "", textContent: "", className: "", style: {}, dataset: {},
|
||||
appendChild(child) { return child; }, addEventListener() {}, replaceChildren() {},
|
||||
querySelector: () => null, querySelectorAll: () => [], setAttribute() {},
|
||||
classList: { add() {}, toggle() {} },
|
||||
});
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: {
|
||||
getElementById: (id) => (id === "aprs-packets" ? node() : null),
|
||||
querySelectorAll: () => [],
|
||||
createElement: node,
|
||||
createDocumentFragment: node,
|
||||
},
|
||||
navigator: {},
|
||||
Date, Number, String, Array, Set, Reflect, console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await bundleEntry(new URL("../src/plugins/aprs.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
window.trxPluginRuntime.dispatch("aprs", {
|
||||
src_call: "SP0ABC", dest_call: "APRS", crc_ok: true, lat: 54.5, lon: 18.5,
|
||||
symbol_table: "/", symbol_code: ">",
|
||||
});
|
||||
|
||||
assert.deepEqual(distanceArgs, [[54.0, 18.0, 54.5, 18.5]]);
|
||||
});
|
||||
|
||||
+4
-2
@@ -3,13 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
test("background decode loads configuration for the explicitly selected rig", async () => {
|
||||
const requested = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
decoderRegistry: [],
|
||||
trxUi: { confirm: async () => true },
|
||||
};
|
||||
@@ -35,7 +37,7 @@ test("background decode loads configuration for the explicitly selected rig", as
|
||||
Error,
|
||||
console,
|
||||
});
|
||||
const source = await readFile(new URL("../../assets/web/generated/background-decode.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/background-decode.ts", import.meta.url));
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
window.trx.modules.backgroundDecode.initialize("rig/a", "control");
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
class ElementFixture {
|
||||
constructor() {
|
||||
@@ -26,6 +26,49 @@ class ElementFixture {
|
||||
querySelector() { return null; }
|
||||
}
|
||||
|
||||
// Mirrors the `window.trx` host contract published by app.ts. The plugin is a
|
||||
// separate bundle, so every application service it uses arrives this way.
|
||||
function hostFixture(overrides = {}) {
|
||||
const calls = { postPath: [], setRigFrequency: [], armOptimisticFrequency: [], applyLocalTunedFrequency: [], syncBandwidthInput: [], scheduleSpectrumDraw: 0, syncModePicker: 0 };
|
||||
const state = {
|
||||
authEnabled: false,
|
||||
authRole: "control",
|
||||
lastActiveRigId: null,
|
||||
lastRigIds: [],
|
||||
lastRigDisplayNames: {},
|
||||
lastFreqHz: 14_074_000,
|
||||
lastModeName: "USB",
|
||||
lastSpectrumData: null,
|
||||
currentBandwidthHz: 2400,
|
||||
decoderRegistry: [],
|
||||
...overrides,
|
||||
};
|
||||
const core = {
|
||||
postPath: async (path) => { calls.postPath.push(path); },
|
||||
setRigFrequency: (hz) => { calls.setRigFrequency.push(hz); },
|
||||
applyLocalTunedFrequency: (hz, force) => { calls.applyLocalTunedFrequency.push([hz, force]); },
|
||||
armOptimisticFrequency: (hz) => { calls.armOptimisticFrequency.push(hz); },
|
||||
syncBandwidthInput: (hz) => { calls.syncBandwidthInput.push(hz); },
|
||||
scheduleSpectrumDraw: () => { calls.scheduleSpectrumDraw += 1; },
|
||||
syncModePicker: () => { calls.syncModePicker += 1; },
|
||||
onDecoderRegistryReady: () => {},
|
||||
};
|
||||
return { window: { trx: { state, core, modules: {} }, trxUi: { confirm: async () => true } }, calls };
|
||||
}
|
||||
|
||||
function documentFixture(element) {
|
||||
return {
|
||||
getElementById: element,
|
||||
querySelector: () => new ElementFixture(),
|
||||
querySelectorAll: () => [],
|
||||
createElement: () => new ElementFixture(),
|
||||
createTextNode: (text) => ({ textContent: text }),
|
||||
addEventListener() {},
|
||||
};
|
||||
}
|
||||
|
||||
const source = await bundleEntry(new URL("../src/plugins/bookmarks.ts", import.meta.url));
|
||||
|
||||
test("bookmarks register an explicit typed service for application consumers", async () => {
|
||||
const elements = new Map();
|
||||
const element = (id) => {
|
||||
@@ -36,33 +79,15 @@ test("bookmarks register an explicit typed service for application consumers", a
|
||||
element("bm-category-filter").options.push({ value: "" });
|
||||
element("bm-mode-filter").options.push({ value: "" });
|
||||
const bookmarks = [{ id: "one", name: "Local", freq_hz: 145_500_000, mode: "FM", scope: "general" }];
|
||||
const window = {
|
||||
trx: { modules: {} },
|
||||
trxUi: { confirm: async () => true },
|
||||
decoderRegistry: [],
|
||||
};
|
||||
const { window } = hostFixture();
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: {
|
||||
getElementById: element,
|
||||
querySelector: () => new ElementFixture(),
|
||||
querySelectorAll: () => [],
|
||||
createElement: () => new ElementFixture(),
|
||||
createTextNode: (text) => ({ textContent: text }),
|
||||
addEventListener() {},
|
||||
},
|
||||
document: documentFixture(element),
|
||||
fetch: async () => ({ ok: true, json: async () => bookmarks }),
|
||||
CSS: { escape: (value) => value },
|
||||
Element: ElementFixture,
|
||||
Set,
|
||||
Map,
|
||||
Array,
|
||||
Number,
|
||||
String,
|
||||
Promise,
|
||||
console,
|
||||
});
|
||||
const source = await readFile(new URL("../../assets/web/generated/bookmarks.js", import.meta.url), "utf8");
|
||||
new vm.Script(source).runInContext(context);
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
|
||||
@@ -73,3 +98,80 @@ test("bookmarks register an explicit typed service for application consumers", a
|
||||
assert.equal(typeof window.trx.modules.bookmarks.populateScopePicker, "function");
|
||||
assert.equal(globalThis.bmOverlayList, undefined);
|
||||
});
|
||||
|
||||
test("applying a bookmark drives tuning through the host services", async () => {
|
||||
const elements = new Map();
|
||||
const element = (id) => {
|
||||
if (!elements.has(id)) elements.set(id, new ElementFixture());
|
||||
return elements.get(id);
|
||||
};
|
||||
const { window, calls } = hostFixture({
|
||||
lastActiveRigId: "sdr",
|
||||
decoderRegistry: [
|
||||
{ id: "ft8", label: "FT8", activation: "toggle", active_modes: ["USB"], bookmark_selectable: true },
|
||||
{ id: "cw", label: "CW", activation: "toggle", active_modes: ["CW"], bookmark_selectable: true },
|
||||
],
|
||||
});
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: documentFixture(element),
|
||||
fetch: async (url) => ({
|
||||
ok: true,
|
||||
json: async () => (url.startsWith("/status") ? { ft8_decode_enabled: false, cw_decode_enabled: true } : []),
|
||||
}),
|
||||
CSS: { escape: (value) => value },
|
||||
Element: ElementFixture,
|
||||
console,
|
||||
});
|
||||
new vm.Script(source).runInContext(context);
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
calls.postPath.length = 0;
|
||||
|
||||
window.trx.modules.bookmarks.apply({
|
||||
id: "ft8-20m", name: "FT8 20m", freq_hz: 14_074_000, mode: "USB", bandwidth_hz: 3000, decoders: ["ft8"],
|
||||
});
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
|
||||
// Optimistic UI: the guard is armed before the display update so a stale SSE
|
||||
// frame cannot snap the marker back while the tune is in flight.
|
||||
assert.deepEqual(calls.armOptimisticFrequency, [14_074_000]);
|
||||
assert.deepEqual(calls.applyLocalTunedFrequency, [[14_074_000, true]]);
|
||||
assert.deepEqual(calls.syncBandwidthInput, [3000]);
|
||||
assert.equal(window.trx.state.currentBandwidthHz, 3000);
|
||||
assert.equal(element("mode").value, "USB");
|
||||
|
||||
// Rig commands: mode and bandwidth over postPath, frequency via the core
|
||||
// tuning service so virtual-channel redirection still applies.
|
||||
assert.deepEqual(calls.setRigFrequency, [14_074_000]);
|
||||
assert.ok(calls.postPath.includes("/set_mode?mode=USB"));
|
||||
assert.ok(calls.postPath.includes("/set_bandwidth?hz=3000"));
|
||||
// ft8 is selected and off; cw is on but incompatible with USB.
|
||||
assert.ok(calls.postPath.includes("/toggle_ft8_decode"));
|
||||
assert.ok(calls.postPath.includes("/toggle_cw_decode"));
|
||||
});
|
||||
|
||||
test("bookmark controls follow the host authentication state", async () => {
|
||||
const elements = new Map();
|
||||
const element = (id) => {
|
||||
if (!elements.has(id)) elements.set(id, new ElementFixture());
|
||||
return elements.get(id);
|
||||
};
|
||||
const { window } = hostFixture({ authEnabled: true, authRole: "rx" });
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: documentFixture(element),
|
||||
fetch: async () => ({ ok: true, json: async () => [] }),
|
||||
CSS: { escape: (value) => value },
|
||||
Element: ElementFixture,
|
||||
console,
|
||||
});
|
||||
new vm.Script(source).runInContext(context);
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
|
||||
assert.equal(element("bm-add-btn").style.display, "none");
|
||||
|
||||
window.trx.state.authRole = "control";
|
||||
await window.trx.modules.bookmarks.fetch("");
|
||||
assert.equal(element("bm-add-btn").style.display, "");
|
||||
});
|
||||
|
||||
@@ -3,167 +3,18 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import http from "node:http";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
const frontendDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
const webDir = path.resolve(frontendDir, "../assets/web");
|
||||
const generatedDir = path.join(webDir, "generated");
|
||||
const rigItems = ["rig-a", "rig-b"].map((remote) => ({
|
||||
remote,
|
||||
display_name: remote === "rig-a" ? "Primary fixture" : "Secondary fixture",
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
supported_modes: ["FM"],
|
||||
tx: false,
|
||||
filter_controls: false,
|
||||
initialized: true,
|
||||
latitude: null,
|
||||
longitude: null,
|
||||
}));
|
||||
const rigsResponse = { rigs: rigItems, active_remote: "rig-a" };
|
||||
const selectedRigs = [];
|
||||
// page.evaluate callbacks run in the browser, not in this Node process.
|
||||
/* global document, getComputedStyle, window, location */
|
||||
|
||||
const jsonRoutes = new Map([
|
||||
["/auth/session", { authenticated: true, role: "control", auth_disabled: true }],
|
||||
["/decoders", []],
|
||||
["/rigs", rigsResponse],
|
||||
["/status", {
|
||||
info: {
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
revision: "1",
|
||||
access: { Tcp: { addr: "127.0.0.1:0" } },
|
||||
capabilities: {
|
||||
min_freq_step_hz: 1,
|
||||
supported_bands: [],
|
||||
supported_modes: ["FM"],
|
||||
num_vfos: 1,
|
||||
lock: false,
|
||||
lockable: false,
|
||||
attenuator: false,
|
||||
preamp: false,
|
||||
rit: false,
|
||||
rpt: false,
|
||||
split: false,
|
||||
tx: false,
|
||||
tx_limit: false,
|
||||
vfo_switch: false,
|
||||
filter_controls: false,
|
||||
signal_meter: false,
|
||||
},
|
||||
},
|
||||
status: { freq: { hz: 100_000_000 }, mode: "FM", tx_en: false, vfo: null, tx: null, rx: null, lock: null },
|
||||
band: null,
|
||||
enabled: true,
|
||||
initialized: true,
|
||||
cw_auto: false,
|
||||
cw_wpm: 20,
|
||||
cw_tone_hz: 700,
|
||||
aprs_decode_enabled: false,
|
||||
hf_aprs_decode_enabled: false,
|
||||
cw_decode_enabled: false,
|
||||
ft8_decode_enabled: false,
|
||||
ft4_decode_enabled: false,
|
||||
ft2_decode_enabled: false,
|
||||
wspr_decode_enabled: false,
|
||||
lrpt_decode_enabled: false,
|
||||
wefax_decode_enabled: false,
|
||||
recorder_enabled: false,
|
||||
clients: 1,
|
||||
rigctl_clients: 0,
|
||||
audio_clients: 0,
|
||||
active_remote: "rig-a",
|
||||
remotes: ["rig-a", "rig-b"],
|
||||
show_sdr_gain_control: false,
|
||||
initial_map_zoom: 10,
|
||||
spectrum_coverage_margin_hz: 50_000,
|
||||
spectrum_usable_span_ratio: 0.92,
|
||||
bandplan_enabled: false,
|
||||
bandplan_region: "iaru1",
|
||||
decode_history_retention_min: 1440,
|
||||
server_connected: true,
|
||||
}],
|
||||
["/bandplan.json", {}],
|
||||
["/api/recorder/status", []],
|
||||
["/api/recorder/files", []],
|
||||
]);
|
||||
|
||||
const contentTypes = new Map([
|
||||
[".css", "text/css; charset=utf-8"],
|
||||
[".html", "text/html; charset=utf-8"],
|
||||
[".js", "application/javascript; charset=utf-8"],
|
||||
[".json", "application/json; charset=utf-8"],
|
||||
[".png", "image/png"],
|
||||
[".woff2", "font/woff2"],
|
||||
]);
|
||||
|
||||
function assetPath(urlPath) {
|
||||
if (urlPath === "/") return path.join(webDir, "index.html");
|
||||
if (urlPath.startsWith("/vendor/")) return path.join(webDir, urlPath);
|
||||
const generated = path.join(generatedDir, path.basename(urlPath));
|
||||
if (urlPath.endsWith(".js")) return generated;
|
||||
return path.join(webDir, urlPath);
|
||||
}
|
||||
|
||||
const server = http.createServer(async (request, response) => {
|
||||
const url = new URL(request.url ?? "/", "http://127.0.0.1");
|
||||
if (url.pathname === "/select_rig" && request.method === "POST") {
|
||||
const remote = url.searchParams.get("remote");
|
||||
if (remote) {
|
||||
rigsResponse.active_remote = remote;
|
||||
jsonRoutes.get("/status").active_remote = remote;
|
||||
selectedRigs.push(remote);
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
if (jsonRoutes.has(url.pathname)) {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify(jsonRoutes.get(url.pathname)));
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/audio") {
|
||||
response.writeHead(404).end();
|
||||
return;
|
||||
}
|
||||
if (["/events", "/decode", "/spectrum", "/meter"].includes(url.pathname)) {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": browser smoke stream\n\n");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const file = assetPath(url.pathname);
|
||||
const bytes = await readFile(file);
|
||||
response.writeHead(200, {
|
||||
"content-type": contentTypes.get(path.extname(file)) ?? "application/octet-stream",
|
||||
});
|
||||
response.end(bytes);
|
||||
} catch {
|
||||
response.writeHead(404).end();
|
||||
}
|
||||
});
|
||||
|
||||
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
||||
const address = server.address();
|
||||
assert(address && typeof address === "object");
|
||||
|
||||
const executablePath = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH
|
||||
?? "/usr/bin/chromium";
|
||||
const browser = await chromium.launch({ executablePath, headless: true, args: ["--no-sandbox"] });
|
||||
const page = await browser.newPage();
|
||||
const runtimeErrors = [];
|
||||
page.on("pageerror", (error) => runtimeErrors.push(error.stack ?? error.message));
|
||||
const fixture = await startWebFixture();
|
||||
const { selectedRigs } = fixture;
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await page.goto(`http://127.0.0.1:${address.port}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.goto(`${fixture.origin}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.waitForTimeout(500);
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
await page.locator("#content").waitFor({ state: "visible" });
|
||||
@@ -172,6 +23,167 @@ try {
|
||||
await page.locator("summary", { hasText: "Audio controls" }).click();
|
||||
assert.equal(await page.locator("#rx-audio-btn").count(), 1);
|
||||
|
||||
// Digital modes: the decoders are a list down the side, and the panel for the
|
||||
// selected one sits beside it. A horizontal strip put thirteen decoders in a
|
||||
// scroller and marked the open one with a single underline among them.
|
||||
await page.locator('.tab[data-tab="digital-modes"]').click();
|
||||
await page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await page.locator('.sub-tab[data-subtab="ft8"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const digital = await page.evaluate(() => {
|
||||
const bar = document.querySelector("#tab-digital-modes > .sub-tab-bar").getBoundingClientRect();
|
||||
const panel = document.getElementById("subtab-ft8").getBoundingClientRect();
|
||||
const shown = [...document.querySelectorAll("#tab-digital-modes > .sub-tab-panel")]
|
||||
.filter((element) => getComputedStyle(element).display !== "none")
|
||||
.map((element) => element.id);
|
||||
return {
|
||||
sidebarIsColumn: bar.height > bar.width,
|
||||
panelBesideSidebar: Math.round(panel.left) >= Math.round(bar.right),
|
||||
panelsShown: shown,
|
||||
decoders: document.querySelectorAll("#tab-digital-modes > .sub-tab-bar .sub-tab").length,
|
||||
};
|
||||
});
|
||||
assert.ok(digital.sidebarIsColumn, "the decoder list is not a sidebar");
|
||||
assert.ok(digital.panelBesideSidebar, "the decoder panel does not sit beside the sidebar");
|
||||
assert.deepEqual(digital.panelsShown, ["subtab-ft8"], `panels shown: ${JSON.stringify(digital.panelsShown)}`);
|
||||
assert.ok(digital.decoders >= 10, `only ${digital.decoders} decoders in the sidebar`);
|
||||
|
||||
// Each decoder's list fills its panel. FT8, FT4, FT2 and WSPR size against
|
||||
// the panel with flex, so a panel sized to its own content collapsed them to
|
||||
// their 120px minimum with the rest of the page left empty; the marine lists
|
||||
// were sized by a viewport formula that stopped matching when the panel
|
||||
// changed shape.
|
||||
for (const [subtab, list] of [["ft8", "ft8-messages"], ["wspr", "wspr-messages"],
|
||||
["ais", "ais-messages"], ["aprs", "aprs-packets"], ["hf-aprs", "hf-aprs-packets"]]) {
|
||||
await page.locator(`.sub-tab[data-subtab="${subtab}"]`).click();
|
||||
await page.waitForTimeout(150);
|
||||
const filled = await page.evaluate((id) => {
|
||||
const element = document.getElementById(id);
|
||||
const panel = element.closest(".sub-tab-panel");
|
||||
return {
|
||||
list: Math.round(element.getBoundingClientRect().height),
|
||||
panel: Math.round(panel.getBoundingClientRect().height),
|
||||
scrolls: getComputedStyle(element).overflowY,
|
||||
};
|
||||
}, list);
|
||||
assert.ok(filled.list > filled.panel * 0.6,
|
||||
`${subtab}: the list is ${filled.list}px in a ${filled.panel}px panel`);
|
||||
assert.equal(filled.scrolls, "auto", `${subtab}: the list does not scroll on its own`);
|
||||
}
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Map links from decode rows, before anything has opened the Map tab. The
|
||||
// lazy map module used to install these globals itself, so an AIS pin threw
|
||||
// "not a function" and an APRS link silently did nothing until the tab had
|
||||
// been visited once.
|
||||
const mapLinkReady = await page.evaluate(() => ({
|
||||
position: typeof window.navigateToAprsMap,
|
||||
locator: typeof window.navigateToMapLocator,
|
||||
mapModuleLoaded: !!window.trx.modules.map,
|
||||
}));
|
||||
assert.equal(mapLinkReady.position, "function", "navigateToAprsMap is missing before the map loads");
|
||||
assert.equal(mapLinkReady.locator, "function", "navigateToMapLocator is missing before the map loads");
|
||||
assert.equal(mapLinkReady.mapModuleLoaded, false, "the map module was already loaded, so this proves nothing");
|
||||
|
||||
await page.evaluate(() => { window.navigateToAprsMap(52.2, 21.0); });
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await page.waitForTimeout(500);
|
||||
const followed = await page.evaluate(() => ({
|
||||
path: location.pathname,
|
||||
active: [...document.querySelectorAll(".tab-bar .tab.active")].map((tab) => tab.dataset.tab || tab.id),
|
||||
mapHeight: Math.round(document.getElementById("aprs-map").getBoundingClientRect().height),
|
||||
}));
|
||||
assert.equal(followed.path, "/map", `the map link left the page on ${followed.path}`);
|
||||
assert.ok(followed.active.includes("map"), `the strip marks ${JSON.stringify(followed.active)}`);
|
||||
assert.ok(followed.mapHeight > 100, `the map came up ${followed.mapHeight}px tall`);
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(200);
|
||||
|
||||
// Section order in the tray. "Advanced radio controls" is built at runtime,
|
||||
// so it lands wherever ui-core puts it rather than where the markup says —
|
||||
// appending, as it once did, always left it last.
|
||||
const sections = await page.evaluate(() =>
|
||||
[...document.querySelectorAll(".controls-tray > details")].map((section) =>
|
||||
section.querySelector("summary").textContent.trim()));
|
||||
assert.deepEqual(sections, ["Advanced radio controls", "Audio controls", "Scheduler controls"],
|
||||
`tray sections are ${JSON.stringify(sections)}`);
|
||||
|
||||
// Mode is a button group over a hidden <select>, which stays the value a
|
||||
// dozen call sites and several plugins read. The click has to reach it, and
|
||||
// the select must not take part in layout while it does.
|
||||
const modeBefore = await page.evaluate(() => ({
|
||||
buttons: document.querySelectorAll("#mode-picker button").length,
|
||||
value: document.getElementById("mode").value,
|
||||
active: document.querySelector("#mode-picker button.active")?.dataset.mode,
|
||||
}));
|
||||
assert.ok(modeBefore.buttons > 1, `mode picker rendered ${modeBefore.buttons} buttons`);
|
||||
assert.equal(modeBefore.active, modeBefore.value, "mode picker disagrees with the select");
|
||||
const target = await page.evaluate(() => {
|
||||
const other = [...document.querySelectorAll("#mode-picker button")]
|
||||
.find((btn) => btn.dataset.mode !== document.getElementById("mode").value);
|
||||
return other?.dataset.mode;
|
||||
});
|
||||
await page.locator(`#mode-picker button[data-mode="${target}"]`).click();
|
||||
await page.waitForTimeout(200);
|
||||
const modeAfter = await page.evaluate(() => ({
|
||||
value: document.getElementById("mode").value,
|
||||
active: document.querySelector("#mode-picker button.active")?.dataset.mode,
|
||||
selectWidth: Math.round(document.getElementById("mode").getBoundingClientRect().width),
|
||||
}));
|
||||
assert.equal(modeAfter.value, target, `clicking ${target} left the select at ${modeAfter.value}`);
|
||||
assert.equal(modeAfter.active, target, "the clicked mode is not the marked one");
|
||||
assert.ok(modeAfter.selectWidth <= 2, `the hidden select still occupies ${modeAfter.selectWidth}px`);
|
||||
|
||||
// Mode-specific controls live on their own row, which has to leave with them:
|
||||
// an empty one would still take a track and a gap in the tray and draw its
|
||||
// divider under the controls every rig has.
|
||||
const modeRowState = async () => page.evaluate(() => {
|
||||
const row = document.getElementById("mode-controls-row");
|
||||
return { display: getComputedStyle(row).display, height: Math.round(row.getBoundingClientRect().height) };
|
||||
});
|
||||
await page.locator('#mode-picker button[data-mode="WFM"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const withWfm = await modeRowState();
|
||||
assert.notEqual(withWfm.display, "none", "WFM controls did not bring their row up");
|
||||
assert.ok(withWfm.height > 0, `WFM row has no height (${withWfm.height}px)`);
|
||||
await page.locator('#mode-picker button[data-mode="FM"]').click();
|
||||
await page.waitForTimeout(250);
|
||||
const withoutWfm = await modeRowState();
|
||||
assert.equal(withoutWfm.display, "none", "the mode row stayed behind with nothing in it");
|
||||
|
||||
// Scheduler controls read left to right: step, hand back, then the entry on
|
||||
// air. The separator is drawn by the current-entry block, so it can only sit
|
||||
// in the right place if that block is last.
|
||||
const schedulerRow = await page.evaluate(() => [...document.querySelectorAll(".scheduler-action-row > *")]
|
||||
.map((el) => el.id || [...el.children].map((c) => c.id).join("+")));
|
||||
assert.deepEqual(schedulerRow,
|
||||
["scheduler-prev-btn+scheduler-next-btn", "scheduler-release-btn", "scheduler-cycle-status"],
|
||||
`scheduler control order is ${JSON.stringify(schedulerRow)}`);
|
||||
|
||||
// The footer status pill colours its dot from data-state, so a hint written
|
||||
// straight to textContent would leave the dot stuck on the previous state.
|
||||
const hint = await page.evaluate(() => {
|
||||
const element = document.getElementById("power-hint");
|
||||
return { state: element.dataset.state, text: element.textContent.trim() };
|
||||
});
|
||||
assert.ok(["ok", "busy", "error"].includes(hint.state), `status pill state is ${hint.state}`);
|
||||
assert.equal(hint.state, "ok", `fixture reports "${hint.text}" but the pill is ${hint.state}`);
|
||||
|
||||
// Rig names, and they have to survive the state stream. The updates carry
|
||||
// only rig ids — /rigs is what knows the names — and applying one used to
|
||||
// clear the names, so the picker and the header fell back to the lowercase
|
||||
// ids a second after load and stayed there.
|
||||
await page.waitForTimeout(1500);
|
||||
const rigLabels = await page.evaluate(() => ({
|
||||
options: [...document.getElementById("header-rig-switch-select").options].map((o) => o.textContent),
|
||||
subtitle: document.getElementById("rig-subtitle").textContent,
|
||||
}));
|
||||
assert.deepEqual(rigLabels.options, ["Primary fixture", "Secondary fixture"],
|
||||
`the picker reads ${JSON.stringify(rigLabels.options)}`);
|
||||
assert.equal(rigLabels.subtitle, "Rig: Primary fixture",
|
||||
`the header reads "${rigLabels.subtitle}"`);
|
||||
|
||||
const rigPicker = page.locator("#header-rig-switch-select");
|
||||
await rigPicker.locator("option").nth(1).waitFor({ state: "attached" });
|
||||
await rigPicker.selectOption("rig-b");
|
||||
@@ -181,10 +193,51 @@ try {
|
||||
await page.locator('.tab[data-tab="map"]').click();
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
assert.equal(new URL(page.url()).pathname, "/map");
|
||||
|
||||
// The selected destination is marked by a box on all four sides, so a rule
|
||||
// that drops one edge (the mobile nav used to lose its bottom border) is a
|
||||
// regression even though the tab still reads as "active".
|
||||
const activeTab = await page.evaluate(() => {
|
||||
const style = getComputedStyle(document.querySelector(".tab-bar-nav .tab.active"));
|
||||
return ["Top", "Right", "Bottom", "Left"].map((side) => ({
|
||||
width: style.getPropertyValue(`border-${side.toLowerCase()}-width`),
|
||||
color: style.getPropertyValue(`border-${side.toLowerCase()}-color`),
|
||||
}));
|
||||
});
|
||||
for (const edge of activeTab) {
|
||||
assert.notEqual(edge.width, "0px", `active tab border: ${JSON.stringify(activeTab)}`);
|
||||
assert.ok(!/rgba\(0, 0, 0, 0\)|transparent/.test(edge.color), `active tab border: ${JSON.stringify(activeTab)}`);
|
||||
}
|
||||
|
||||
// The map is full-bleed: it breaks out of the centred .card column and
|
||||
// reaches both viewport edges, without pushing the page sideways.
|
||||
const stage = await page.evaluate(() => {
|
||||
const rect = document.getElementById("map-stage").getBoundingClientRect();
|
||||
return {
|
||||
left: Math.round(rect.left),
|
||||
right: Math.round(rect.right),
|
||||
viewport: document.documentElement.clientWidth,
|
||||
sideways: document.documentElement.scrollWidth > document.documentElement.clientWidth + 1,
|
||||
gapToFooter: Math.round(document.querySelector(".footer").getBoundingClientRect().top - rect.bottom),
|
||||
pageScrolls: document.documentElement.scrollHeight > document.documentElement.clientHeight + 1,
|
||||
};
|
||||
});
|
||||
assert.equal(stage.left, 0, `map stage starts at ${stage.left}px, not the viewport edge`);
|
||||
assert.equal(stage.right, stage.viewport, `map stage ends at ${stage.right}px, not ${stage.viewport}px`);
|
||||
assert.equal(stage.sideways, false, "full-bleed map makes the page scroll sideways");
|
||||
// ...and fills the column down to the footer. Capping the height at a
|
||||
// fraction of the viewport left a dead band that grew with the window.
|
||||
assert.ok(stage.gapToFooter <= 16,
|
||||
`${stage.gapToFooter}px of dead space between the map and the footer`);
|
||||
assert.equal(stage.pageScrolls, false, "the map grew past the viewport");
|
||||
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
assert.equal(new URL(page.url()).pathname, "/");
|
||||
|
||||
await page.locator('.tab[data-tab="about"]').click();
|
||||
// About is an occasional destination, so it lives behind More at every
|
||||
// width rather than in the operating tab strip.
|
||||
await page.locator("#mobile-more-btn").click();
|
||||
await page.locator('[data-navigate-tab="about"]').click();
|
||||
await page.locator("#tab-about").waitFor({ state: "visible" });
|
||||
assert.equal(new URL(page.url()).pathname, "/about");
|
||||
|
||||
@@ -192,7 +245,150 @@ try {
|
||||
await page.locator("#tab-main").waitFor({ state: "visible" });
|
||||
assert.equal(new URL(page.url()).pathname, "/");
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
|
||||
// Refreshing or deep-linking must mark the destination, not Tools. The first
|
||||
// route navigation runs while the card is still behind the loading state, so
|
||||
// a test that asked whether the tab was displayed saw "none" for every tab
|
||||
// and lit Tools up on every refresh of every page.
|
||||
for (const [route, tab, toolsLit] of [["/map", "map", false], ["/about", "about", true]]) {
|
||||
await page.goto(`${fixture.origin}${route}`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator(`#tab-${tab}`).waitFor({ state: "visible" });
|
||||
const marked = await page.evaluate(() => ({
|
||||
actives: [...document.querySelectorAll(".tab-bar .tab.active")].map((t) => t.dataset.tab || t.id),
|
||||
tools: document.getElementById("mobile-more-btn").classList.contains("active"),
|
||||
}));
|
||||
assert.ok(marked.actives.includes(tab), `${route} marks ${JSON.stringify(marked.actives)}`);
|
||||
assert.equal(marked.tools, toolsLit, `${route}: Tools active is ${marked.tools}`);
|
||||
}
|
||||
await page.goto(`${fixture.origin}/`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#tab-main").waitFor({ state: "visible" });
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
|
||||
// --- Layout regressions -------------------------------------------------
|
||||
// Every fault below shipped at some point while the rest of this file
|
||||
// passed, because nothing here looked at geometry: a header whose height
|
||||
// tracked the viewport, controls that stretched, a tab strip that ran under
|
||||
// the controls, and a dropdown that opened underneath the spectrum.
|
||||
for (const width of [1440, 1280, 1100, 900]) {
|
||||
await page.setViewportSize({ width, height: 900 });
|
||||
await page.waitForTimeout(250);
|
||||
const header = await page.evaluate(() => {
|
||||
const bar = document.querySelector(".tab-bar");
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
const actions = document.querySelector(".top-bar-actions");
|
||||
const controls = [...actions.children]
|
||||
.filter((el) => !el.hidden && el.getBoundingClientRect().height > 0)
|
||||
.map((el) => Math.round(el.getBoundingClientRect().height));
|
||||
return {
|
||||
barHeight: Math.round(bar.getBoundingClientRect().height),
|
||||
// The tabs, not the strip: with the strip allowed to overflow its box
|
||||
// shrinks while its content paints across the controls, so the
|
||||
// container's own rect never registers the collision.
|
||||
overlap: Math.round(Math.max(...[...nav.querySelectorAll(".tab")]
|
||||
.filter((tab) => tab.offsetParent !== null)
|
||||
.map((tab) => tab.getBoundingClientRect().right))
|
||||
- actions.getBoundingClientRect().left),
|
||||
heights: [...new Set(controls)],
|
||||
pageScrollsSideways: document.documentElement.scrollWidth > document.documentElement.clientWidth + 1,
|
||||
};
|
||||
});
|
||||
assert.ok(header.barHeight <= 96, `header is ${header.barHeight}px at ${width}px; it should stay one row`);
|
||||
assert.ok(header.overlap <= 0, `tab strip overlaps the controls by ${header.overlap}px at ${width}px`);
|
||||
assert.ok(header.heights.length <= 2, `controls have heights ${header.heights.join(", ")} at ${width}px`);
|
||||
assert.equal(header.pageScrollsSideways, false, `page scrolls sideways at ${width}px`);
|
||||
}
|
||||
|
||||
// A dropdown must paint over the page, not inside the header: fixed
|
||||
// positioning escapes clipping but not the header's stacking context.
|
||||
await page.setViewportSize({ width: 1280, height: 900 });
|
||||
await page.waitForTimeout(250);
|
||||
const menu = await page.evaluate(() => {
|
||||
document.getElementById("mobile-more-btn").click();
|
||||
const element = document.getElementById("mobile-more-menu");
|
||||
const rect = element.getBoundingClientRect();
|
||||
const hit = document.elementFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2);
|
||||
return { width: Math.round(rect.width), height: Math.round(rect.height), onTop: element.contains(hit) };
|
||||
});
|
||||
assert.ok(menu.height > 40 && menu.width > 80, `menu rendered ${menu.width}x${menu.height}`);
|
||||
assert.ok(menu.onTop, "menu is painted underneath the page");
|
||||
|
||||
// Wider text than this machine renders. This suite passed on macOS twice
|
||||
// while CI, whose system font is wider, put the tab strip into the controls —
|
||||
// the second time by 9px at 1440px with no scaling at all, because the fit
|
||||
// test was an arithmetic estimate whose fixed allowance for the gaps did not
|
||||
// cover them at those metrics. A single scale factor cannot stand in for
|
||||
// another platform's fonts, so sweep: somewhere in this range is whatever CI
|
||||
// renders, and the strip has to hold at every step of it.
|
||||
const applyTextScale = (scale) => page.addStyleTag({ content: `
|
||||
.tab-bar .title { font-size: ${1.05 * scale}rem !important; }
|
||||
.tab-bar .subtitle { font-size: ${0.78 * scale}rem !important; }
|
||||
.tab-bar .tab { font-size: ${0.95 * scale}rem !important; }
|
||||
.tab-bar select, .tab-bar button { font-size: ${0.95 * scale}rem !important; }
|
||||
` });
|
||||
const measureBar = () => page.evaluate(() => {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
const actions = document.querySelector(".top-bar-actions");
|
||||
const tabs = [...nav.querySelectorAll(".tab")].filter((tab) => tab.offsetParent !== null);
|
||||
return {
|
||||
overlap: Math.round(Math.max(...tabs.map((tab) => tab.getBoundingClientRect().right))
|
||||
- actions.getBoundingClientRect().left),
|
||||
iconsOnly: nav.classList.contains("nav-icons-only"),
|
||||
};
|
||||
});
|
||||
|
||||
for (const scale of [1.0, 1.15, 1.3, 1.5, 1.75, 2.0]) {
|
||||
await applyTextScale(scale);
|
||||
// 1100px is the narrowest bar in the app: the bookmark gutters take 9.5rem
|
||||
// a side above that width, leaving less room than 900px has.
|
||||
for (const width of [1440, 1280, 1100, 900]) {
|
||||
await page.setViewportSize({ width, height: 900 });
|
||||
await page.waitForTimeout(120);
|
||||
const crowded = await measureBar();
|
||||
assert.ok(crowded.overlap <= 0,
|
||||
`at ${scale}x text the tab strip overlaps the controls by ${crowded.overlap}px at ${width}px`);
|
||||
}
|
||||
}
|
||||
|
||||
// A station name long enough that the bar cannot hold it, which is the rung
|
||||
// below icons: the identity has to give, not the strip.
|
||||
await page.evaluate(() => {
|
||||
document.getElementById("rig-subtitle").textContent =
|
||||
"Rig: Shack SDR — RTL-SDR v4 on the attic dipole, north-west";
|
||||
});
|
||||
await applyTextScale(1.6);
|
||||
for (const width of [1440, 1100]) {
|
||||
await page.setViewportSize({ width, height: 900 });
|
||||
await page.waitForTimeout(200);
|
||||
const crowded = await measureBar();
|
||||
assert.ok(crowded.overlap <= 0,
|
||||
`with a long station name the tab strip overlaps the controls by ${crowded.overlap}px at ${width}px`);
|
||||
}
|
||||
|
||||
// ...and when the text changes under a bar that is not resized. The rig name
|
||||
// arrives from the server, a web font swaps in: neither is a window resize,
|
||||
// and the strip used to sit there as it was.
|
||||
await page.setViewportSize({ width: 1440, height: 900 });
|
||||
await page.waitForTimeout(200);
|
||||
await applyTextScale(2.4);
|
||||
await page.waitForTimeout(400);
|
||||
const unresized = await measureBar();
|
||||
assert.ok(unresized.overlap <= 0,
|
||||
`text grew without a resize and the strip overlaps by ${unresized.overlap}px`);
|
||||
assert.equal(unresized.iconsOnly, true, "the strip kept its labels with no room for them");
|
||||
|
||||
// The frequency readouts are typed into, so the browser remembers what went
|
||||
// in and offers it back in a dropdown over the reading — Edge does this by
|
||||
// default. Nothing here wants to be autofilled from what was tuned last week.
|
||||
const autofill = await page.evaluate(() => ["freq", "center-freq"].map((id) => {
|
||||
const input = document.getElementById(id);
|
||||
return { id, autocomplete: input?.getAttribute("autocomplete") ?? null };
|
||||
}));
|
||||
for (const field of autofill) {
|
||||
assert.equal(field.autocomplete, "off",
|
||||
`#${field.id} offers autofill (autocomplete=${field.autocomplete})`);
|
||||
}
|
||||
|
||||
} finally {
|
||||
await browser.close();
|
||||
await new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve()));
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import { build } from "esbuild";
|
||||
|
||||
export async function bundleEntry(entryUrl) {
|
||||
export async function bundleEntry(entryUrl, globalName) {
|
||||
const result = await build({
|
||||
entryPoints: [entryUrl.pathname],
|
||||
bundle: true,
|
||||
@@ -12,6 +12,7 @@ export async function bundleEntry(entryUrl) {
|
||||
platform: "browser",
|
||||
target: "es2022",
|
||||
write: false,
|
||||
...(globalName ? { globalName } : {}),
|
||||
});
|
||||
const output = result.outputFiles[0];
|
||||
if (!output) throw new Error(`No bundle output for ${entryUrl.pathname}`);
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
class ElementFixture {
|
||||
constructor() { this.children = []; this.textContent = ""; this.style = {}; this.classList = { toggle() {} }; }
|
||||
@@ -21,7 +21,7 @@ test("CW entry appends server-decoded text and registers lifecycle callbacks", a
|
||||
const output = new ElementFixture();
|
||||
const status = new ElementFixture();
|
||||
const elements = new Map([["cw-output", output], ["cw-status", status]]);
|
||||
const window = { trxUi: { confirm: async () => true }, addEventListener() {} };
|
||||
const window = { ...createHost(), trxUi: { confirm: async () => true }, addEventListener() {} };
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: {
|
||||
@@ -39,7 +39,7 @@ test("CW entry appends server-decoded text and registers lifecycle callbacks", a
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/cw.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/cw.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -0,0 +1,334 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// What happens to a decode after it arrives: the panel on its tab, the mini
|
||||
// view over the waterfall, the marker on the map, and the link between them.
|
||||
// Nothing exercised this before — the fixture served an empty decode stream —
|
||||
// which is how the map links came to be broken for every decoder at once.
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, getComputedStyle, window, location, requestAnimationFrame, MutationObserver */
|
||||
|
||||
const VESSEL = {
|
||||
type: "ais", mmsi: 244660000, lat: 52.37, lon: 4.89, vessel_name: "NEDERLAND",
|
||||
callsign: "PBTX", sog_knots: 8.2, cog_deg: 91, channel: "A", message_type: 1, rig_id: "rig-a",
|
||||
};
|
||||
const BEACON = {
|
||||
type: "aprs", src_call: "SP2SJG-9", dest_call: "APRS", path: "WIDE1-1", info: "Test beacon",
|
||||
packet_type: "position", crc_ok: true, lat: 54.35, lon: 18.65,
|
||||
symbol_table: "/", symbol_code: ">", rig_id: "rig-a",
|
||||
};
|
||||
|
||||
// AIS is what the mini view for vessels is gated on; the rig has to be on it.
|
||||
const fixture = await startWebFixture({ spectrum: true, decodes: [VESSEL, BEACON], mode: "AIS" });
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await page.setViewportSize({ width: 1500, height: 950 });
|
||||
await page.goto(`${fixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
// The decoders with panels on this tab have to load with it. They used to
|
||||
// come only with the map group, so these panels stayed empty — decodes
|
||||
// queued in the plugin runtime — until something opened the Map tab.
|
||||
const panels = await page.evaluate(() => ({
|
||||
ais: document.getElementById("ais-messages")?.children.length ?? 0,
|
||||
aprs: document.getElementById("aprs-packets")?.children.length ?? 0,
|
||||
aisStatus: document.getElementById("ais-status")?.textContent ?? "",
|
||||
aprsStatus: document.getElementById("aprs-status")?.textContent ?? "",
|
||||
mapLoaded: !!window.trx.modules.map,
|
||||
}));
|
||||
assert.equal(panels.mapLoaded, false, "the map module was loaded, so this proves nothing");
|
||||
assert.ok(panels.ais > 0, `the AIS panel is empty (status: ${panels.aisStatus})`);
|
||||
assert.ok(panels.aprs > 0, `the APRS panel is empty (status: ${panels.aprsStatus})`);
|
||||
|
||||
// The mini view rides over the waterfall on the radio page.
|
||||
await page.locator('.tab[data-tab="main"]').click();
|
||||
await page.waitForTimeout(1500);
|
||||
const miniView = await page.evaluate(() => {
|
||||
const bar = document.getElementById("ais-bar-overlay");
|
||||
return {
|
||||
shown: getComputedStyle(bar).display !== "none",
|
||||
pins: bar.querySelectorAll(".aprs-bar-pin").length,
|
||||
names: bar.textContent.includes("NEDERLAND"),
|
||||
};
|
||||
});
|
||||
assert.equal(miniView.shown, true, "the AIS mini view did not appear");
|
||||
assert.ok(miniView.pins > 0, "the mini view has no pin to follow");
|
||||
assert.equal(miniView.names, true, "the mini view does not name the vessel");
|
||||
|
||||
// Following the pin: the map opens, on the vessel. This is the path that was
|
||||
// broken for every decoder — the module that owned the navigation had not
|
||||
// been loaded, so the pin did nothing at all.
|
||||
await page.locator("#ais-bar-overlay .aprs-bar-pin").first().click();
|
||||
await page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await page.waitForTimeout(800);
|
||||
const followed = await page.evaluate(() => {
|
||||
const centre = window.trx.modules.map?.aprsMap?.getCenter?.();
|
||||
return {
|
||||
path: location.pathname,
|
||||
lat: centre ? Number(centre.lat.toFixed(2)) : null,
|
||||
lon: centre ? Number(centre.lng.toFixed(2)) : null,
|
||||
};
|
||||
});
|
||||
assert.equal(followed.path, "/map", `the pin left the page on ${followed.path}`);
|
||||
assert.equal(followed.lat, VESSEL.lat, `the map centred on ${followed.lat}, not the vessel`);
|
||||
assert.equal(followed.lon, VESSEL.lon, `the map centred on ${followed.lon}, not the vessel`);
|
||||
|
||||
// Both decoders put their own marker on it.
|
||||
await page.waitForTimeout(1200);
|
||||
const markers = await page.evaluate(() => {
|
||||
const map = window.trx.modules.map;
|
||||
const size = (collection) => (collection instanceof Map
|
||||
? collection.size
|
||||
: Object.keys(collection ?? {}).length);
|
||||
return { ais: size(map?.aisMarkers), stations: size(map?.stationMarkers) };
|
||||
});
|
||||
assert.ok(markers.ais > 0, "the vessel never reached the map");
|
||||
assert.ok(markers.stations > 0, "the APRS station never reached the map");
|
||||
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
// Stored history, which is what is on screen a second after a page load. The
|
||||
// endpoint answers in CBOR, so the fixture speaks CBOR: serving anything else
|
||||
// left the client on its retry path and the history path untested.
|
||||
const HISTORY_AIS = 900;
|
||||
const HISTORY_APRS = 300;
|
||||
const historyFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
mode: "AIS",
|
||||
history: {
|
||||
ais: Array.from({ length: HISTORY_AIS }, (_, index) => ({
|
||||
mmsi: 244660000 + index, lat: 52.3 + index * 0.001, lon: 4.8,
|
||||
vessel_name: `HISTORIC ${index}`, channel: "A", message_type: 1,
|
||||
rig_id: "rig-a", ts_ms: Date.now() - (index + 1) * 1000,
|
||||
})),
|
||||
aprs: Array.from({ length: HISTORY_APRS }, (_, index) => ({
|
||||
src_call: `SP2SJG-${index % 15}`, dest_call: "APRS", path: "WIDE1-1",
|
||||
info: `history ${index}`, packet_type: "position", crc_ok: true,
|
||||
lat: 54.3 + (index % 15) * 0.01, lon: 18.6, rig_id: "rig-a",
|
||||
ts_ms: Date.now() - (index + 1) * 1000,
|
||||
})),
|
||||
},
|
||||
});
|
||||
const replay = await startBrowser(chromium);
|
||||
|
||||
// Installed before the page's own scripts, so nothing can be missed: every
|
||||
// time the progress element becomes visible, its geometry is recorded.
|
||||
await replay.page.addInitScript(() => {
|
||||
window.__historyProgressSamples = [];
|
||||
const watch = () => {
|
||||
const element = document.getElementById("decode-history-overlay");
|
||||
if (!element) { requestAnimationFrame(watch); return; }
|
||||
const sample = () => {
|
||||
if (element.classList.contains("is-hidden")) return;
|
||||
const rect = element.getBoundingClientRect();
|
||||
window.__historyProgressSamples.push({
|
||||
width: Math.round(rect.width),
|
||||
coversCentre: document.elementFromPoint(700, 450)?.id === "decode-history-overlay",
|
||||
});
|
||||
};
|
||||
new MutationObserver(sample).observe(element, { attributes: true, attributeFilter: ["class"] });
|
||||
sample();
|
||||
};
|
||||
watch();
|
||||
});
|
||||
|
||||
try {
|
||||
await replay.page.setViewportSize({ width: 1400, height: 900 });
|
||||
await replay.page.goto(`${historyFixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await replay.page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
|
||||
// While it loads, the operator can still see the radio. This used to be a
|
||||
// full-screen scrim over everything for as long as the replay ran.
|
||||
//
|
||||
// Watched from inside the page rather than polled from here: a fast replay
|
||||
// can start and finish between two polls, and then the test reports that no
|
||||
// progress was ever shown when what happened is that it blinked.
|
||||
const shown = await replay.page.evaluate(() => window.__historyProgressSamples ?? []);
|
||||
assert.ok(shown.length > 0, "no progress was shown while the history loaded");
|
||||
for (const sample of shown) {
|
||||
assert.ok(sample.width < 700, `the progress covers ${sample.width}px of a 1400px page`);
|
||||
assert.equal(sample.coversCentre, false, "the progress sits over the page");
|
||||
}
|
||||
|
||||
// And all of it arrives, on the first load.
|
||||
await replay.page.waitForTimeout(2000);
|
||||
const restored = await replay.page.evaluate(() => ({
|
||||
ais: document.getElementById("ais-messages")?.children.length ?? 0,
|
||||
aprs: document.getElementById("aprs-packets")?.children.length ?? 0,
|
||||
progressHidden: document.getElementById("decode-history-overlay").classList.contains("is-hidden"),
|
||||
}));
|
||||
assert.equal(restored.ais, HISTORY_AIS, `restored ${restored.ais} of ${HISTORY_AIS} AIS records`);
|
||||
assert.equal(restored.aprs, HISTORY_APRS, `restored ${restored.aprs} of ${HISTORY_APRS} APRS records`);
|
||||
assert.equal(restored.progressHidden, true, "the progress stayed up after the replay finished");
|
||||
|
||||
// Opening the map for the first time has to show the stored history too.
|
||||
// The map module is lazy, so at the moment the history was restored its
|
||||
// aprsMapAddStation/aisMapAddVessel hooks did not exist yet and every
|
||||
// position was dropped. Nothing replayed them when the module finally
|
||||
// arrived, so the map came up empty and only filled in from decodes heard
|
||||
// afterwards -- a station heard once was never plotted at all, and it took a
|
||||
// second reload (module cached, so loaded early enough to beat the history
|
||||
// fetch) before the map showed anything.
|
||||
//
|
||||
// This fixture serves no live decode stream on purpose: with one, fresh
|
||||
// frames arriving after the module loads would paper over the whole thing.
|
||||
const mapLoadedDuringReplay = await replay.page.evaluate(() => !!window.trx.modules.map);
|
||||
assert.equal(mapLoadedDuringReplay, false, "the map was already loaded, so this proves nothing");
|
||||
|
||||
await replay.page.locator('.tab[data-tab="map"]').click();
|
||||
await replay.page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await replay.page.waitForTimeout(1500);
|
||||
const plotted = await replay.page.evaluate(() => {
|
||||
const map = window.trx.modules.map;
|
||||
const size = (collection) => (collection instanceof Map
|
||||
? collection.size
|
||||
: Object.keys(collection ?? {}).length);
|
||||
return { ais: size(map?.aisMarkers), stations: size(map?.stationMarkers) };
|
||||
});
|
||||
assert.equal(plotted.ais, HISTORY_AIS, `${plotted.ais} of ${HISTORY_AIS} vessels reached the map`);
|
||||
assert.equal(plotted.stations, 15, `${plotted.stations} of 15 stations reached the map`);
|
||||
|
||||
assert.deepEqual(replay.runtimeErrors, []);
|
||||
} finally {
|
||||
await replay.browser.close();
|
||||
await historyFixture.close();
|
||||
}
|
||||
|
||||
// The APRS list: one line per frame, with the information field read for the
|
||||
// operator rather than shown as it arrives on the air.
|
||||
const APRS_FRAMES = [
|
||||
{ packet_type: "weather", info: "_10090556c220s004g005t077r000p000P000h50b09900" },
|
||||
{ packet_type: "message", info: ":SP2SJG-9 :Hello from the field{01" },
|
||||
{ packet_type: "telemetry", info: "T#005,199,000,255,073,123,01101001" },
|
||||
{ packet_type: "position", info: "!5421.30N/01839.20E>Test beacon 73", lat: 54.35, lon: 18.65 },
|
||||
].map((frame, index) => ({
|
||||
src_call: `SP2SJG-${index}`, dest_call: "APRS", path: "WIDE1-1", crc_ok: true,
|
||||
// Only position reports carry a symbol here, which is the case the columns
|
||||
// have to survive: a frame without one used to close the gap and shift
|
||||
// everything after it left.
|
||||
...(frame.packet_type === "position" ? { symbol_table: "/", symbol_code: ">" } : {}),
|
||||
rig_id: "rig-a", ts_ms: Date.now() - index * 1000,
|
||||
...frame,
|
||||
}));
|
||||
|
||||
// The AIS list is the same shape: a line per message, saying where the vessel
|
||||
// is and what it is doing, with the identifiers behind it.
|
||||
const AIS_MESSAGES = [
|
||||
{ message_type: 1, mmsi: 244660001, vessel_name: "NEDERLAND", channel: "A",
|
||||
lat: 54.35, lon: 18.65, sog_knots: 8.2, cog_deg: 91.4 },
|
||||
{ message_type: 5, mmsi: 244660002, vessel_name: "STENA SPIRIT", channel: "B",
|
||||
callsign: "PBTX", destination: "GDANSK" },
|
||||
].map((message, index) => ({ rig_id: "rig-a", ts_ms: Date.now() - index * 1000, ...message }));
|
||||
|
||||
const aprsFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
mode: "AIS",
|
||||
history: { aprs: APRS_FRAMES, ais: AIS_MESSAGES },
|
||||
});
|
||||
const aprs = await startBrowser(chromium);
|
||||
|
||||
try {
|
||||
await aprs.page.setViewportSize({ width: 1400, height: 900 });
|
||||
await aprs.page.goto(`${aprsFixture.origin}/digital-modes`, { waitUntil: "domcontentloaded" });
|
||||
await aprs.page.locator("#tab-digital-modes").waitFor({ state: "visible" });
|
||||
await aprs.page.waitForTimeout(2000);
|
||||
await aprs.page.locator('.sub-tab[data-subtab="aprs"]').click();
|
||||
await aprs.page.waitForTimeout(400);
|
||||
|
||||
const rows = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#aprs-packets .aprs-packet")].map((row) => ({
|
||||
tag: row.tagName,
|
||||
height: Math.round(row.getBoundingClientRect().height),
|
||||
type: row.querySelector(".aprs-badge-type")?.textContent?.trim() ?? "",
|
||||
summary: row.querySelector(".decode-line-summary")?.textContent?.trim() ?? "",
|
||||
})));
|
||||
// Newest first, so find each by the type it carries rather than by position.
|
||||
const summaryOf = (type) => rows.find((row) => row.type === type)?.summary ?? "";
|
||||
assert.equal(rows.length, APRS_FRAMES.length, `rendered ${rows.length} frames`);
|
||||
for (const row of rows) {
|
||||
assert.equal(row.tag, "DETAILS", "a frame is not expandable in place");
|
||||
assert.ok(row.height < 44, `a frame is ${row.height}px tall; it used to be a card of about 140`);
|
||||
}
|
||||
// Each payload read rather than echoed: 25 °C from t077, the addressee from
|
||||
// a message, the sequence from telemetry, the fix from a position report.
|
||||
assert.match(summaryOf("Weather"), /25 °C/, `weather summary: ${summaryOf("Weather")}`);
|
||||
assert.match(summaryOf("Weather"), /990\.0 hPa/, `weather summary: ${summaryOf("Weather")}`);
|
||||
assert.match(summaryOf("Message"), /→ SP2SJG-9: Hello from the field/, `message summary: ${summaryOf("Message")}`);
|
||||
assert.match(summaryOf("Telemetry"), /^#005/, `telemetry summary: ${summaryOf("Telemetry")}`);
|
||||
assert.match(summaryOf("Position"), /54\.3500, 18\.6500/, `position summary: ${summaryOf("Position")}`);
|
||||
|
||||
// Frames with and without a symbol line up: the slot is held open either way.
|
||||
const columns = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#aprs-packets .aprs-packet")].map((row) => ({
|
||||
call: Math.round(row.querySelector(".aprs-call").getBoundingClientRect().x),
|
||||
summary: Math.round(row.querySelector(".decode-line-summary").getBoundingClientRect().x),
|
||||
symbol: !!row.querySelector(".aprs-symbol:not(.aprs-symbol-empty)"),
|
||||
})));
|
||||
assert.ok(columns.some((column) => column.symbol) && columns.some((column) => !column.symbol),
|
||||
"the sample has to mix frames with and without a symbol to test this");
|
||||
assert.equal(new Set(columns.map((column) => column.call)).size, 1,
|
||||
`callsigns start at ${JSON.stringify(columns.map((column) => column.call))}`);
|
||||
assert.equal(new Set(columns.map((column) => column.summary)).size, 1,
|
||||
`summaries start at ${JSON.stringify(columns.map((column) => column.summary))}`);
|
||||
|
||||
// The frame as it arrived is still there, one click away.
|
||||
await aprs.page.locator("#aprs-packets .aprs-packet", { hasText: "25 °C" })
|
||||
.locator(".decode-line").first().click();
|
||||
await aprs.page.waitForTimeout(200);
|
||||
const expanded = await aprs.page.evaluate(() => {
|
||||
const row = document.querySelector("#aprs-packets .aprs-packet[open]");
|
||||
return {
|
||||
open: row.hasAttribute("open"),
|
||||
raw: row.querySelector(".decode-expanded-raw")?.textContent?.trim() ?? "",
|
||||
meta: row.querySelector(".decode-expanded-meta")?.textContent ?? "",
|
||||
};
|
||||
});
|
||||
assert.equal(expanded.open, true, "the frame did not open");
|
||||
assert.match(expanded.raw, /^_10090556c220s004g005t077/, `raw frame: ${expanded.raw}`);
|
||||
assert.match(expanded.meta, /WIDE1-1/, `expanded meta: ${expanded.meta}`);
|
||||
|
||||
// AIS, on the same row.
|
||||
await aprs.page.locator('.sub-tab[data-subtab="ais"]').click();
|
||||
await aprs.page.waitForTimeout(300);
|
||||
const aisRows = await aprs.page.evaluate(() =>
|
||||
[...document.querySelectorAll("#ais-messages .ais-message")].map((row) => ({
|
||||
tag: row.tagName,
|
||||
height: Math.round(row.getBoundingClientRect().height),
|
||||
name: row.querySelector(".ais-call")?.textContent?.trim() ?? "",
|
||||
summary: row.querySelector(".decode-line-summary")?.textContent?.trim() ?? "",
|
||||
})));
|
||||
assert.equal(aisRows.length, AIS_MESSAGES.length, `rendered ${aisRows.length} messages`);
|
||||
for (const row of aisRows) {
|
||||
assert.equal(row.tag, "DETAILS", "an AIS message is not expandable in place");
|
||||
assert.ok(row.height < 44, `an AIS message is ${row.height}px tall`);
|
||||
}
|
||||
const positionRow = aisRows.find((row) => row.name === "NEDERLAND");
|
||||
const staticRow = aisRows.find((row) => row.name === "STENA SPIRIT");
|
||||
assert.match(positionRow?.summary ?? "", /54\.3500, 18\.6500/, `position: ${positionRow?.summary}`);
|
||||
assert.match(positionRow?.summary ?? "", /8\.2 kn/, `position: ${positionRow?.summary}`);
|
||||
// A static report carries no fix, so it says where the vessel is going.
|
||||
assert.match(staticRow?.summary ?? "", /PBTX -> GDANSK/, `static: ${staticRow?.summary}`);
|
||||
|
||||
await aprs.page.locator("#ais-messages .ais-message .decode-line").first().click();
|
||||
await aprs.page.waitForTimeout(200);
|
||||
const aisExpanded = await aprs.page.evaluate(() =>
|
||||
document.querySelector("#ais-messages .ais-message[open] .decode-expanded-meta")?.textContent ?? "");
|
||||
assert.match(aisExpanded, /MMSI 2446600/, `expanded AIS: ${aisExpanded}`);
|
||||
assert.match(aisExpanded, /MHz/, `expanded AIS: ${aisExpanded}`);
|
||||
|
||||
assert.deepEqual(aprs.runtimeErrors, []);
|
||||
} finally {
|
||||
await aprs.browser.close();
|
||||
await aprsFixture.close();
|
||||
}
|
||||
@@ -6,11 +6,13 @@ import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("FT2 entry normalizes audio offsets and registers typed callbacks", async () => {
|
||||
let barRenderer;
|
||||
const mapMessages = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
ft8BaseHz: 14_074_000,
|
||||
trxUi: { confirm: async () => true },
|
||||
ft8ExtractAllGrids: () => ["JO91"],
|
||||
@@ -46,6 +48,7 @@ test("FT2 entry normalizes audio offsets and registers typed callbacks", async (
|
||||
test("FT8 entry installs shared parsing without relying on script globals", async () => {
|
||||
const forwarded = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
ft8BaseHz: 7_074_000,
|
||||
trxUi: { confirm: async () => true },
|
||||
mapAddLocator: (...args) => { forwarded.push(args); },
|
||||
|
||||
@@ -6,9 +6,10 @@ import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("HF APRS entry uses shared typed normalization and local symbols", async () => {
|
||||
const window = { trxUi: { confirm: async () => true } };
|
||||
const window = { ...createHost(), trxUi: { confirm: async () => true } };
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: { getElementById: () => null, querySelectorAll: () => [] },
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Mirrors the `window.trx` host contract that app.ts publishes and that
|
||||
// src/plugins/host.ts consumes. Feature bundles read all application state
|
||||
// and services through it, so every plugin test needs it on its stub window.
|
||||
|
||||
export function createHost({ state = {}, core = {}, modules = {} } = {}) {
|
||||
const calls = [];
|
||||
const record = (name, result) => (...args) => {
|
||||
calls.push({ name, args });
|
||||
return typeof result === "function" ? result(...args) : result;
|
||||
};
|
||||
return {
|
||||
calls,
|
||||
trx: {
|
||||
state: {
|
||||
serverLat: null,
|
||||
serverLon: null,
|
||||
authEnabled: false,
|
||||
authRole: "control",
|
||||
lastActiveRigId: null,
|
||||
lastRigIds: [],
|
||||
lastRigDisplayNames: {},
|
||||
lastFreqHz: null,
|
||||
lastSpectrumData: null,
|
||||
jogUnit: 1000,
|
||||
rxActive: false,
|
||||
decoderRegistry: [],
|
||||
lastModeName: "",
|
||||
currentBandwidthHz: 2400,
|
||||
audioChannelOverride: null,
|
||||
...state,
|
||||
},
|
||||
core: {
|
||||
postPath: record("postPath", async () => undefined),
|
||||
applyLocalTunedFrequency: record("applyLocalTunedFrequency"),
|
||||
armOptimisticFrequency: record("armOptimisticFrequency"),
|
||||
escapeMapHtml: (value) => String(value)
|
||||
.replaceAll("&", "&").replaceAll("<", "<")
|
||||
.replaceAll(">", ">").replaceAll('"', """),
|
||||
haversineKm: record("haversineKm", () => 0),
|
||||
showHint: record("showHint"),
|
||||
formatFreqForStep: (hz) => String(hz),
|
||||
refreshFreqDisplay: record("refreshFreqDisplay"),
|
||||
setJogDivisor: record("setJogDivisor"),
|
||||
mwDefaultsForMode: record("mwDefaultsForMode", () => [0, 0, 0, 0]),
|
||||
resetRdsDisplay: record("resetRdsDisplay"),
|
||||
positionRdsPsOverlay: record("positionRdsPsOverlay"),
|
||||
updateWfmControls: record("updateWfmControls"),
|
||||
updateSdrSquelchControlVisibility: record("updateSdrSquelchControlVisibility"),
|
||||
updateDocumentTitle: record("updateDocumentTitle"),
|
||||
activeChannelRds: record("activeChannelRds", () => null),
|
||||
startRxAudio: record("startRxAudio"),
|
||||
stopRxAudio: record("stopRxAudio"),
|
||||
setRigFrequency: record("setRigFrequency"),
|
||||
syncBandwidthInput: record("syncBandwidthInput"),
|
||||
scheduleSpectrumDraw: record("scheduleSpectrumDraw"),
|
||||
syncModePicker: record("syncModePicker"),
|
||||
onDecoderRegistryReady: record("onDecoderRegistryReady"),
|
||||
...core,
|
||||
},
|
||||
modules,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -3,14 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("satellite entry registers lifecycle callbacks and forwards georeferenced images", async () => {
|
||||
const overlays = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
trxUi: { confirm: async () => true },
|
||||
addSatMapOverlay: (image) => { overlays.push(image); },
|
||||
};
|
||||
@@ -28,7 +29,7 @@ test("satellite entry registers lifecycle callbacks and forwards georeferenced i
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/sat.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/sat.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -3,12 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
test("scheduler registers a typed module service without lifecycle globals", async () => {
|
||||
const window = { trx: { modules: {} }, trxUi: { confirm: async () => true } };
|
||||
// No role known yet: the entry registers its service and waits for the
|
||||
// application to drive initialization.
|
||||
const window = { ...createHost({ state: { authRole: null } }), trxUi: { confirm: async () => true } };
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: {
|
||||
@@ -31,7 +34,7 @@ test("scheduler registers a typed module service without lifecycle globals", asy
|
||||
WeakSet,
|
||||
console,
|
||||
});
|
||||
const source = await readFile(new URL("../../assets/web/generated/scheduler.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/scheduler.ts", import.meta.url));
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
const service = window.trx.modules.scheduler;
|
||||
@@ -41,3 +44,70 @@ test("scheduler registers a typed module service without lifecycle globals", asy
|
||||
assert.equal(window.initScheduler, undefined);
|
||||
assert.equal(window.schedulerBridge, undefined);
|
||||
});
|
||||
|
||||
// Lazy-load case: the settings tab is opened after boot, so the application has
|
||||
// already passed initSettingsUI() and the entry must initialize itself from the
|
||||
// host state. This read used to come from a bare window property that the
|
||||
// module graph stopped publishing, so the scheduler never started.
|
||||
test("scheduler self-initializes for the active rig when a role is already known", async () => {
|
||||
class ElementFixture {
|
||||
constructor() {
|
||||
this.value = "";
|
||||
this.textContent = "";
|
||||
this.innerHTML = "";
|
||||
this.style = {};
|
||||
this.dataset = {};
|
||||
this.options = [];
|
||||
this.classList = { add() {}, remove() {}, toggle() {}, contains: () => false };
|
||||
this.children = [];
|
||||
}
|
||||
addEventListener() {}
|
||||
appendChild(child) { this.children.push(child); return child; }
|
||||
remove() {}
|
||||
focus() {}
|
||||
closest() { return null; }
|
||||
querySelector() { return null; }
|
||||
querySelectorAll() { return []; }
|
||||
}
|
||||
const elements = new Map();
|
||||
const fetched = [];
|
||||
const element = (id) => {
|
||||
if (!elements.has(id)) elements.set(id, new ElementFixture());
|
||||
return elements.get(id);
|
||||
};
|
||||
const window = {
|
||||
...createHost({ state: { authRole: "control", lastActiveRigId: "sdr" } }),
|
||||
trxUi: { confirm: async () => true },
|
||||
};
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: {
|
||||
activeElement: null,
|
||||
addEventListener() {},
|
||||
getElementById: element,
|
||||
querySelector: () => new ElementFixture(),
|
||||
querySelectorAll: () => [],
|
||||
createElement: () => new ElementFixture(),
|
||||
},
|
||||
localStorage: { getItem: () => null, setItem() {} },
|
||||
fetch: async (url) => { fetched.push(String(url)); return { ok: true, json: async () => ({}) }; },
|
||||
setInterval: () => 1,
|
||||
clearInterval() {},
|
||||
setTimeout: () => 1,
|
||||
HTMLElement: ElementFixture,
|
||||
Element: ElementFixture,
|
||||
Date,
|
||||
Number,
|
||||
String,
|
||||
Array,
|
||||
Promise,
|
||||
WeakSet,
|
||||
console,
|
||||
});
|
||||
const source = await bundleEntry(new URL("../src/plugins/scheduler.ts", import.meta.url));
|
||||
new vm.Script(source).runInContext(context);
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
|
||||
assert.ok(fetched.some((url) => url.includes("scheduler") && url.includes("sdr")),
|
||||
`expected a scheduler load for the active rig, saw ${JSON.stringify(fetched)}`);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,380 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Geometry of the spectrum area while tuning. Everything above the spectrum is
|
||||
// driven by what happens to be in the visible range — band plan allocations,
|
||||
// bookmarks — and the strips that show them used to appear and disappear with
|
||||
// it, so tuning across a band edge moved the whole page under the operator's
|
||||
// cursor. Nothing else in the suite serves a rig with a spectrum.
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { chromium } from "playwright-core";
|
||||
import { startBrowser, startWebFixture } from "./web-fixture.mjs";
|
||||
|
||||
/* global document, getComputedStyle, window */
|
||||
|
||||
const BOOKMARKS = [
|
||||
{ id: "b1", name: "40m FT8", freq_hz: 7074000, mode: "DIG", category: "Digital", comment: "", locator: "" },
|
||||
{ id: "b2", name: "40m CW", freq_hz: 7030000, mode: "CW", category: "", comment: "", locator: "" },
|
||||
];
|
||||
const BANDPLAN = {
|
||||
iaru1: {
|
||||
bands: [{
|
||||
name: "40m",
|
||||
low_hz: 7000000,
|
||||
high_hz: 7200000,
|
||||
segments: [
|
||||
{ low_hz: 7000000, high_hz: 7040000, mode: "CW", label: "CW" },
|
||||
{ low_hz: 7040000, high_hz: 7200000, mode: "All", label: "All modes" },
|
||||
],
|
||||
}],
|
||||
},
|
||||
};
|
||||
// 40m has both bookmarks and allocations; 20m has neither.
|
||||
const BAND_WITH_CONTENT = 7074000;
|
||||
const BAND_WITHOUT_CONTENT = 14074000;
|
||||
|
||||
// The meter sits well away from the spectrum's noise floor, so a squelch that
|
||||
// took its level from the plot would land somewhere else entirely.
|
||||
const METER_DB = -70;
|
||||
|
||||
const fixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
bookmarks: BOOKMARKS,
|
||||
bandplan: BANDPLAN,
|
||||
bandplanEnabled: true,
|
||||
meterDb: METER_DB,
|
||||
});
|
||||
const { browser, page, runtimeErrors } = await startBrowser(chromium);
|
||||
|
||||
function readGeometry() {
|
||||
const top = (selector) => {
|
||||
const el = document.querySelector(selector);
|
||||
return el ? Math.round(el.getBoundingClientRect().top) : null;
|
||||
};
|
||||
const axis = document.getElementById("spectrum-bookmark-axis");
|
||||
const strip = document.getElementById("spectrum-bandplan-strip");
|
||||
return {
|
||||
chips: axis.querySelectorAll(".spectrum-bookmark-chip").length,
|
||||
axisEmpty: axis.classList.contains("bm-axis-empty"),
|
||||
stripReserved: strip.classList.contains("bp-visible"),
|
||||
stripEmpty: strip.classList.contains("bp-empty"),
|
||||
overviewTop: top(".overview-strip"),
|
||||
spectrumTop: top("#spectrum-panel"),
|
||||
controlsTop: top(".controls-row"),
|
||||
footerTop: top(".footer"),
|
||||
docHeight: document.documentElement.scrollHeight,
|
||||
};
|
||||
}
|
||||
|
||||
const layoutOf = (geometry) => ({
|
||||
overviewTop: geometry.overviewTop,
|
||||
spectrumTop: geometry.spectrumTop,
|
||||
controlsTop: geometry.controlsTop,
|
||||
footerTop: geometry.footerTop,
|
||||
docHeight: geometry.docHeight,
|
||||
});
|
||||
|
||||
async function tuneTo(hz) {
|
||||
fixture.setCenterHz(hz);
|
||||
await page.waitForTimeout(900);
|
||||
return page.evaluate(readGeometry);
|
||||
}
|
||||
|
||||
try {
|
||||
await page.setViewportSize({ width: 1600, height: 950 });
|
||||
await page.goto(fixture.origin, { waitUntil: "domcontentloaded" });
|
||||
await page.locator("#content").waitFor({ state: "visible" });
|
||||
await page.locator("#spectrum-panel").waitFor({ state: "visible" });
|
||||
await page.waitForTimeout(1500);
|
||||
|
||||
const populated = await tuneTo(BAND_WITH_CONTENT);
|
||||
assert.equal(populated.chips, BOOKMARKS.length, `expected both bookmarks, saw ${populated.chips}`);
|
||||
assert.equal(populated.axisEmpty, false, "bookmark rail claims to be empty with chips in it");
|
||||
assert.equal(populated.stripReserved, true, "band plan strip is missing on a band with allocations");
|
||||
assert.equal(populated.stripEmpty, false, "band plan strip claims to be empty with segments in it");
|
||||
|
||||
const bare = await tuneTo(BAND_WITHOUT_CONTENT);
|
||||
assert.equal(bare.chips, 0, `expected no bookmarks on ${BAND_WITHOUT_CONTENT}Hz, saw ${bare.chips}`);
|
||||
assert.equal(bare.axisEmpty, true, "bookmark rail should show its placeholder");
|
||||
assert.equal(bare.stripReserved, true, "band plan strip gave its height back");
|
||||
assert.equal(bare.stripEmpty, true, "band plan strip should be marked empty");
|
||||
|
||||
// The point of both placeholders: tuning must not move anything.
|
||||
assert.deepEqual(layoutOf(bare), layoutOf(populated),
|
||||
`tuning off the band moved the page: ${JSON.stringify(populated)} -> ${JSON.stringify(bare)}`);
|
||||
|
||||
const back = await tuneTo(BAND_WITH_CONTENT);
|
||||
assert.equal(back.chips, BOOKMARKS.length, "bookmarks did not come back");
|
||||
assert.deepEqual(layoutOf(back), layoutOf(populated), "tuning back moved the page");
|
||||
|
||||
// The rail covers the top of the overview, so only the chips may take
|
||||
// pointer events — the rest has to fall through to the plot behind it.
|
||||
const hits = await page.evaluate(() => {
|
||||
const chip = document.querySelector("#spectrum-bookmark-axis .spectrum-bookmark-chip");
|
||||
const chipRect = chip.getBoundingClientRect();
|
||||
const axisRect = document.getElementById("spectrum-bookmark-axis").getBoundingClientRect();
|
||||
const onChip = document.elementFromPoint(chipRect.left + chipRect.width / 2, chipRect.top + chipRect.height / 2);
|
||||
const besideChip = document.elementFromPoint(axisRect.right - 30, axisRect.top + 10);
|
||||
return {
|
||||
chip: onChip?.closest(".spectrum-bookmark-chip") ? "chip" : (onChip?.id || onChip?.tagName),
|
||||
besideChip: besideChip?.id || besideChip?.tagName,
|
||||
};
|
||||
});
|
||||
assert.equal(hits.chip, "chip", `chip is not clickable, hit ${hits.chip}`);
|
||||
assert.equal(hits.besideChip, "overview-canvas", `rail swallows events, hit ${hits.besideChip}`);
|
||||
|
||||
// Squelch: the threshold is in the dB the spectrum axis is labelled in, so the
|
||||
// line is the control. It used to be a percentage on a slider in the audio
|
||||
// row, with nothing on screen to relate the number to.
|
||||
await page.locator("summary", { hasText: "Audio controls" }).click();
|
||||
await page.locator("#sdr-squelch-toggle").click();
|
||||
// Auto parks it just above the noise the meter reports — not above the
|
||||
// spectrum's noise floor, which sits anywhere from 1 dB below to 22 dB above
|
||||
// the meter depending on span, bandwidth and decimation.
|
||||
await page.locator("#sdr-squelch-auto").click();
|
||||
await page.waitForTimeout(400);
|
||||
const auto = await page.evaluate(() => Number(document.getElementById("sdr-squelch-db").value));
|
||||
assert.ok(Math.abs(auto - (METER_DB + 5)) <= 1,
|
||||
`auto put the threshold at ${auto} dB with the meter at ${METER_DB} dB`);
|
||||
const squelchOn = await page.evaluate(() => {
|
||||
const line = document.getElementById("spectrum-squelch-line");
|
||||
return {
|
||||
shown: getComputedStyle(line).display !== "none",
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
label: Number(document.getElementById("spectrum-squelch-label").textContent),
|
||||
toggle: document.getElementById("sdr-squelch-toggle").getAttribute("aria-pressed"),
|
||||
top: Math.round(line.getBoundingClientRect().top),
|
||||
};
|
||||
});
|
||||
assert.equal(squelchOn.shown, true, "the threshold line did not appear with the squelch on");
|
||||
assert.equal(squelchOn.toggle, "true", "the SQL switch did not follow the squelch state");
|
||||
assert.equal(squelchOn.label, squelchOn.db, "the line and the readout disagree on the threshold");
|
||||
|
||||
// Dragging the line down lowers the threshold and tells the server.
|
||||
const submitted = [];
|
||||
page.on("request", (request) => {
|
||||
if (request.url().includes("/set_sdr_squelch")) {
|
||||
submitted.push(Number(new URL(request.url()).searchParams.get("threshold_db")));
|
||||
}
|
||||
});
|
||||
const grip = await page.locator("#spectrum-squelch-grip").boundingBox();
|
||||
await page.mouse.move(grip.x + grip.width / 2, grip.y + grip.height / 2);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(grip.x + grip.width / 2, grip.y + grip.height / 2 + 60, { steps: 8 });
|
||||
await page.mouse.up();
|
||||
await page.waitForTimeout(400);
|
||||
const dragged = await page.evaluate(() => ({
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
label: Number(document.getElementById("spectrum-squelch-label").textContent),
|
||||
top: Math.round(document.getElementById("spectrum-squelch-line").getBoundingClientRect().top),
|
||||
}));
|
||||
assert.ok(dragged.db < squelchOn.db,
|
||||
`dragging down left the threshold at ${dragged.db} dB (was ${squelchOn.db})`);
|
||||
assert.equal(dragged.label, dragged.db, "the line label did not follow the drag");
|
||||
assert.ok(dragged.top > squelchOn.top, "the line did not move with the drag");
|
||||
assert.ok(submitted.includes(dragged.db),
|
||||
`the server was never told about ${dragged.db} dB (saw ${JSON.stringify(submitted)})`);
|
||||
|
||||
// Turning it off leaves the threshold alone — the old control conflated the
|
||||
// two, so dropping to zero to listen threw the setting away.
|
||||
await page.locator("#sdr-squelch-toggle").click();
|
||||
await page.waitForTimeout(300);
|
||||
const squelchOff = await page.evaluate(() => ({
|
||||
db: Number(document.getElementById("sdr-squelch-db").value),
|
||||
shown: getComputedStyle(document.getElementById("spectrum-squelch-line")).display !== "none",
|
||||
dot: document.getElementById("sdr-squelch-state").dataset.state,
|
||||
}));
|
||||
assert.equal(squelchOff.db, dragged.db, "turning the squelch off discarded the threshold");
|
||||
assert.equal(squelchOff.shown, false, "the line stayed up with the squelch off");
|
||||
assert.equal(squelchOff.dot, "off", "the indicator did not follow the squelch off");
|
||||
|
||||
assert.deepEqual(runtimeErrors, []);
|
||||
} finally {
|
||||
await browser.close();
|
||||
await fixture.close();
|
||||
}
|
||||
|
||||
// The band plan is fetched once at startup, which can land before the session
|
||||
// exists. It used to fail silently and never retry, so the allocations only
|
||||
// turned up if the operator reloaded the page by hand.
|
||||
const retryFixture = await startWebFixture({
|
||||
spectrum: true,
|
||||
bandplan: BANDPLAN,
|
||||
bandplanEnabled: true,
|
||||
bandplanUnauthorizedFirst: true,
|
||||
});
|
||||
const retry = await startBrowser(chromium);
|
||||
try {
|
||||
await retry.page.setViewportSize({ width: 1600, height: 950 });
|
||||
await retry.page.goto(retryFixture.origin, { waitUntil: "domcontentloaded" });
|
||||
await retry.page.locator("#spectrum-panel").waitFor({ state: "visible" });
|
||||
await retry.page.waitForTimeout(2000);
|
||||
const strip = await retry.page.evaluate(() => {
|
||||
const element = document.getElementById("spectrum-bandplan-strip");
|
||||
return { segments: element.children.length, empty: element.classList.contains("bp-empty") };
|
||||
});
|
||||
assert.ok(strip.segments > 0,
|
||||
"the band plan never arrived after its first request was refused");
|
||||
assert.equal(strip.empty, false, "the strip is still showing its placeholder");
|
||||
} finally {
|
||||
await retry.browser.close();
|
||||
await retryFixture.close();
|
||||
}
|
||||
|
||||
// The map's filter panel is a bar across the top of the map, not a window
|
||||
// sitting on it: it has to stay one or two rows tall, span most of the width,
|
||||
// and keep clear of what shares the map's corners — Leaflet's zoom buttons and
|
||||
// the band legend. A panel that grew a column would cover the map it filters.
|
||||
// Fullscreen and the filter toggle ride at the bar's right-hand end, so only
|
||||
// the filters collapse: the bar itself has to survive Hide Filters, or there
|
||||
// is nothing left to click to bring them back.
|
||||
const mapFixture = await startWebFixture({ spectrum: true });
|
||||
const mapView = await startBrowser(chromium);
|
||||
try {
|
||||
for (const width of [1600, 1200]) {
|
||||
await mapView.page.setViewportSize({ width, height: 950 });
|
||||
await mapView.page.goto(`${mapFixture.origin}/map`, { waitUntil: "domcontentloaded" });
|
||||
await mapView.page.locator("#aprs-map .leaflet-pane").first().waitFor({ state: "attached" });
|
||||
await mapView.page.waitForTimeout(1200);
|
||||
|
||||
const bar = await mapView.page.evaluate(() => {
|
||||
const box = (element) => (element ? element.getBoundingClientRect() : null);
|
||||
const panel = document.querySelector(".map-overlay-panel");
|
||||
const stage = box(document.getElementById("map-stage"));
|
||||
const zoom = box(document.querySelector("#aprs-map .leaflet-control-zoom"));
|
||||
const legend = box(document.getElementById("map-band-legend"));
|
||||
const panelBox = box(panel);
|
||||
const hits = (a, b) => !!a && !!b
|
||||
&& a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
|
||||
return {
|
||||
widthPct: Math.round((panelBox.width / stage.width) * 100),
|
||||
height: Math.round(panelBox.height),
|
||||
outsideStage: panelBox.right > stage.right + 1 || panelBox.bottom > stage.bottom + 1,
|
||||
hitsZoom: hits(panelBox, zoom),
|
||||
hitsLegend: hits(panelBox, legend),
|
||||
// Both controls belong to the bar now, not to a floating corner block.
|
||||
actionsInBar: [...panel.querySelectorAll(".map-overlay-actions button")]
|
||||
.map((button) => button.id).join(","),
|
||||
// The rule dividing them from the filters is drawn on this block's
|
||||
// edge, so the block has to run the height of the filters beside it —
|
||||
// centred, it left the rule floating as a stub against a two-row bar.
|
||||
actionsShort: Math.round(box(panel.querySelector(".map-overlay-filters")).height
|
||||
- box(panel.querySelector(".map-overlay-actions")).height),
|
||||
// Every label sits in a gutter of one width, so whichever group leads
|
||||
// a row leads it from the same place: with the labels at their natural
|
||||
// widths, a row starting "Search" began 10px off one starting "Filter".
|
||||
rowStarts: (() => {
|
||||
const leaders = new Map();
|
||||
for (const group of panel.querySelectorAll(".map-overlay-filters .map-locator-filter-group")) {
|
||||
const rect = box(group);
|
||||
// Groups of a row differ in height, so bucket them by their middle.
|
||||
const row = Math.round((rect.top + rect.height / 2) / 20);
|
||||
if (!leaders.has(row) || rect.left < box(leaders.get(row)).left) leaders.set(row, group);
|
||||
}
|
||||
return [...leaders.values()].map((group) => Math.round(box(group.children[1]).left));
|
||||
})(),
|
||||
clipped: panel.scrollWidth > panel.clientWidth + 1 || panel.scrollHeight > panel.clientHeight + 1,
|
||||
};
|
||||
});
|
||||
assert.ok(bar.widthPct >= 70, `the filter bar covers ${bar.widthPct}% of the map at ${width}px`);
|
||||
assert.ok(bar.height <= 140, `the filter bar is ${bar.height}px tall at ${width}px, not a bar`);
|
||||
assert.equal(bar.outsideStage, false, `the filter bar runs off the map at ${width}px`);
|
||||
assert.equal(bar.hitsZoom, false, `the filter bar covers the zoom buttons at ${width}px`);
|
||||
assert.equal(bar.actionsInBar, "map-fullscreen-btn,map-overlay-toggle-btn",
|
||||
`the bar carries "${bar.actionsInBar}" at ${width}px`);
|
||||
assert.ok(bar.actionsShort <= 1,
|
||||
`the buttons' divider falls ${bar.actionsShort}px short of the bar at ${width}px`);
|
||||
assert.equal(new Set(bar.rowStarts).size, 1,
|
||||
`the bar's rows start at ${bar.rowStarts.join(", ")}px at ${width}px`);
|
||||
assert.equal(bar.hitsLegend, false, `the filter bar covers the band legend at ${width}px`);
|
||||
assert.equal(bar.clipped, false, `the filter bar is clipping its own controls at ${width}px`);
|
||||
}
|
||||
|
||||
// Band chips only exist once something has been heard on a band. The bar
|
||||
// used to explain "all bands visible by default" in a line of prose wedged
|
||||
// between the chips and the next group, which is neither what a toolbar is
|
||||
// for nor a width it can spare: an "All" chip says it and undoes a
|
||||
// selection. Nothing is dimmed while nothing is filtered out, either — every
|
||||
// chip used to come up greyed at the very moment all of them were showing.
|
||||
await mapView.page.evaluate(() => {
|
||||
const ts = Date.now();
|
||||
for (const [grid, hz] of [["JO94", 14_074_000], ["JN48", 7_074_000], ["FN42", 21_074_000]]) {
|
||||
window.trxPluginRuntime.dispatch("ft8",
|
||||
{ message: `CQ TEST ${grid}`, grid, freq_hz: hz, snr_db: -8, ts_ms: ts, rig_id: "rig-a" });
|
||||
}
|
||||
});
|
||||
await mapView.page.waitForTimeout(1500);
|
||||
const chipRow = () => mapView.page.evaluate(() => {
|
||||
const row = document.getElementById("map-locator-choice-filter");
|
||||
const chips = [...row.querySelectorAll(".map-locator-chip")];
|
||||
const all = row.querySelector(".map-locator-chip-all");
|
||||
return {
|
||||
bands: chips.filter((chip) => chip !== all).map((chip) => chip.textContent.trim()),
|
||||
prose: row.querySelector(".map-locator-empty")?.textContent ?? null,
|
||||
allActive: all?.classList.contains("is-active") ?? null,
|
||||
dimmed: chips.filter((chip) => chip.classList.contains("is-inactive"))
|
||||
.map((chip) => chip.textContent.trim()),
|
||||
selected: chips.filter((chip) => chip.getAttribute("aria-pressed") === "true"
|
||||
&& chip !== all).map((chip) => chip.textContent.trim()),
|
||||
};
|
||||
});
|
||||
|
||||
const unfiltered = await chipRow();
|
||||
assert.ok(unfiltered.bands.includes("20m") && unfiltered.bands.includes("40m"),
|
||||
`the chip row is showing ${unfiltered.bands.join(",")}`);
|
||||
assert.equal(unfiltered.prose, null, `the bar is explaining itself in prose: "${unfiltered.prose}"`);
|
||||
assert.equal(unfiltered.allActive, true, "All is not lit while every band is on the map");
|
||||
assert.deepEqual(unfiltered.dimmed, [], `${unfiltered.dimmed.join(",")} came up dimmed with no filter set`);
|
||||
|
||||
await mapView.page.locator('#map-locator-choice-filter .map-locator-chip[data-filter-key="20m"]').click();
|
||||
await mapView.page.waitForTimeout(300);
|
||||
const filtered = await chipRow();
|
||||
assert.deepEqual(filtered.selected, ["20m"], `picking 20m selected ${filtered.selected.join(",")}`);
|
||||
assert.equal(filtered.allActive, false, "All stayed lit with a band picked out");
|
||||
assert.ok(filtered.dimmed.includes("40m"), "the bands now filtered out are not shown as such");
|
||||
|
||||
// And back: All is how a selection is undone without hunting for the chips
|
||||
// that are in it.
|
||||
await mapView.page.locator('#map-locator-choice-filter .map-locator-chip-all').click();
|
||||
await mapView.page.waitForTimeout(300);
|
||||
const cleared = await chipRow();
|
||||
assert.equal(cleared.allActive, true, "All did not clear the band selection");
|
||||
assert.deepEqual(cleared.selected, [], `${cleared.selected.join(",")} survived All`);
|
||||
assert.deepEqual(cleared.dimmed, [], `${cleared.dimmed.join(",")} stayed dimmed after All`);
|
||||
|
||||
// Hiding gives the map back, but leaves the bar itself — collapsed to its
|
||||
// two controls at the right-hand edge — so the filters can be brought back.
|
||||
await mapView.page.locator("#map-overlay-toggle-btn").click();
|
||||
await mapView.page.waitForTimeout(400);
|
||||
const toggled = await mapView.page.evaluate(() => {
|
||||
const panel = document.querySelector(".map-overlay-panel");
|
||||
const stage = document.getElementById("map-stage").getBoundingClientRect();
|
||||
const panelBox = panel.getBoundingClientRect();
|
||||
const visible = (id) => document.getElementById(id).getBoundingClientRect().width > 0;
|
||||
return {
|
||||
filtersHidden: panel.querySelector(".map-overlay-filters").classList.contains("is-hidden"),
|
||||
widthPct: Math.round((panelBox.width / stage.width) * 100),
|
||||
rightGap: Math.round(stage.right - panelBox.right),
|
||||
label: document.getElementById("map-overlay-toggle-btn").textContent.trim(),
|
||||
togglesVisible: visible("map-fullscreen-btn") && visible("map-overlay-toggle-btn"),
|
||||
};
|
||||
});
|
||||
assert.equal(toggled.filtersHidden, true, "the filters stayed up after Hide Filters");
|
||||
assert.equal(toggled.togglesVisible, true, "Hide Filters took its own button down with it");
|
||||
assert.ok(toggled.widthPct < 30, `the collapsed bar still covers ${toggled.widthPct}% of the map`);
|
||||
assert.ok(toggled.rightGap < 30, `the collapsed bar sits ${toggled.rightGap}px from the map's edge`);
|
||||
assert.equal(toggled.label, "Show Filters", `the toggle still reads "${toggled.label}"`);
|
||||
|
||||
await mapView.page.locator("#map-overlay-toggle-btn").click();
|
||||
await mapView.page.waitForTimeout(400);
|
||||
const restored = await mapView.page.evaluate(() =>
|
||||
!document.querySelector(".map-overlay-filters").classList.contains("is-hidden"));
|
||||
assert.equal(restored, true, "Show Filters did not bring the filters back");
|
||||
|
||||
assert.deepEqual(mapView.runtimeErrors, []);
|
||||
} finally {
|
||||
await mapView.browser.close();
|
||||
await mapFixture.close();
|
||||
}
|
||||
@@ -143,4 +143,31 @@ ui.applyLayout("digital");
|
||||
assert.equal(document.body.dataset.operatorLayout, "compact");
|
||||
assert.equal(localStorage.getItem("trxOperatorLayout:rig-b"), "compact");
|
||||
|
||||
// A layout seeds the collapsible sections but must not hold them there:
|
||||
// applyLayout runs on every rig-state refresh, so an operator who expands a
|
||||
// section a layout collapses by default had it shut again about once a second.
|
||||
const schedulerSection = new Element("details", document);
|
||||
schedulerSection.id = "scheduler-controls";
|
||||
const audioSection = new Element("details", document);
|
||||
audioSection.id = "audio-controls";
|
||||
|
||||
ui.setActiveRig("rig-c");
|
||||
ui.applyLayout("compact");
|
||||
assert.equal(schedulerSection.open, false, "compact seeds the scheduler section closed");
|
||||
|
||||
schedulerSection.open = true; // operator expands it
|
||||
ui.applyLayout("compact"); // the next rig-state refresh
|
||||
assert.equal(schedulerSection.open, true, "re-applying the same layout leaves sections alone");
|
||||
ui.setActiveRig("rig-c");
|
||||
assert.equal(schedulerSection.open, true, "a rig-state refresh leaves sections alone");
|
||||
|
||||
// Choosing a different layout is an explicit request for its defaults.
|
||||
ui.applyLayout("full");
|
||||
assert.equal(schedulerSection.open, true, "full seeds the scheduler section open");
|
||||
assert.equal(audioSection.open, true, "full seeds the audio section open");
|
||||
audioSection.open = false;
|
||||
ui.applyLayout("compact");
|
||||
assert.equal(audioSection.open, false, "compact seeds the audio section closed");
|
||||
assert.equal(schedulerSection.open, false, "switching layout reseeds every section");
|
||||
|
||||
console.log("ui-core component tests passed");
|
||||
|
||||
@@ -3,12 +3,13 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
|
||||
test("virtual channels expose typed SSE and interception boundaries", async () => {
|
||||
const window = {};
|
||||
const window = { ...createHost() };
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: { getElementById: () => null },
|
||||
@@ -25,7 +26,7 @@ test("virtual channels expose typed SSE and interception boundaries", async () =
|
||||
Error,
|
||||
console,
|
||||
});
|
||||
const source = await readFile(new URL("../../assets/web/generated/vchan.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/vchan.ts", import.meta.url));
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
const service = window.trx.modules.vchan;
|
||||
@@ -34,6 +35,8 @@ test("virtual channels expose typed SSE and interception boundaries", async () =
|
||||
assert.equal(typeof service.applyCapabilities, "function");
|
||||
assert.equal(await service.interceptMode("USB"), false);
|
||||
assert.equal(await service.interceptBandwidth(2400), false);
|
||||
// No virtual channel is active, so tuning stays with the physical rig.
|
||||
assert.equal(service.interceptFrequency(14_074_000), false);
|
||||
assert.equal(window.vchanHandleSession, undefined);
|
||||
assert.equal(window.vchanInterceptBandwidth, undefined);
|
||||
});
|
||||
|
||||
@@ -3,14 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("VDES entry normalizes and forwards positioned server messages", async () => {
|
||||
const forwarded = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
trxUi: { confirm: async () => true },
|
||||
vdesMapAddPoint: (message) => { forwarded.push(message); },
|
||||
};
|
||||
@@ -24,7 +25,7 @@ test("VDES entry normalizes and forwards positioned server messages", async () =
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/vdes.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/vdes.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -0,0 +1,407 @@
|
||||
// SPDX-FileCopyrightText: 2026 Stan Grams <sjg@haxx.space>
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// The static server the browser tests load the real web assets from. It was
|
||||
// inline in browser-smoke.mjs until a second browser test needed a rig with a
|
||||
// spectrum: the interesting layout lives in the spectrum area, and none of it
|
||||
// could be exercised while the only fixture served a CAT-only rig.
|
||||
|
||||
import { readFile } from "node:fs/promises";
|
||||
import http from "node:http";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const frontendDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
const webDir = path.resolve(frontendDir, "../assets/web");
|
||||
const generatedDir = path.join(webDir, "generated");
|
||||
|
||||
// A realistic decoder registry. Serving an empty one hid most of the
|
||||
// application from this test: the decoder sub-tabs, their panels, the decode
|
||||
// toggles and the bookmark decoder checkboxes are all built from it, so with
|
||||
// no decoders only three of thirteen sub-tabs existed and none of the decoder
|
||||
// UI was ever constructed.
|
||||
const DECODER_REGISTRY = [
|
||||
{ id: "ft8", label: "FT8", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ft4", label: "FT4", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ft2", label: "FT2", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "wspr", label: "WSPR", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "cw", label: "CW", activation: "toggle", active_modes: ["CW", "CWR"] },
|
||||
{ id: "sat", label: "SAT", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "wefax", label: "WEFAX", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "ais", label: "AIS", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "aprs", label: "APRS", activation: "toggle", active_modes: ["FM"] },
|
||||
{ id: "hf-aprs", label: "HF APRS", activation: "toggle", active_modes: ["USB"] },
|
||||
{ id: "vdes", label: "VDES", activation: "toggle", active_modes: ["FM"] },
|
||||
].map((decoder) => ({ ...decoder, background_decode: false, bookmark_selectable: true }));
|
||||
|
||||
const CONTENT_TYPES = new Map([
|
||||
[".css", "text/css; charset=utf-8"],
|
||||
[".html", "text/html; charset=utf-8"],
|
||||
[".js", "application/javascript; charset=utf-8"],
|
||||
[".json", "application/json; charset=utf-8"],
|
||||
[".png", "image/png"],
|
||||
[".woff2", "font/woff2"],
|
||||
]);
|
||||
|
||||
// The history endpoint answers in CBOR (see api/decoder.rs), and the worker
|
||||
// that reads it takes the body as CBOR unconditionally. Serving JSON here left
|
||||
// every run exercising the client's retry path instead of its history path.
|
||||
function encodeCbor(value) {
|
||||
const chunks = [];
|
||||
const head = (major, length) => {
|
||||
if (length < 24) return Buffer.from([(major << 5) | length]);
|
||||
if (length < 0x100) return Buffer.from([(major << 5) | 24, length]);
|
||||
if (length < 0x10000) {
|
||||
const buffer = Buffer.alloc(3);
|
||||
buffer[0] = (major << 5) | 25;
|
||||
buffer.writeUInt16BE(length, 1);
|
||||
return buffer;
|
||||
}
|
||||
if (length < 0x1_0000_0000) {
|
||||
const buffer = Buffer.alloc(5);
|
||||
buffer[0] = (major << 5) | 26;
|
||||
buffer.writeUInt32BE(length, 1);
|
||||
return buffer;
|
||||
}
|
||||
// Timestamps are past 2^32 milliseconds, so the 64-bit form is needed.
|
||||
const buffer = Buffer.alloc(9);
|
||||
buffer[0] = (major << 5) | 27;
|
||||
buffer.writeBigUInt64BE(BigInt(length), 1);
|
||||
return buffer;
|
||||
};
|
||||
const write = (item) => {
|
||||
if (item === null || item === undefined) { chunks.push(Buffer.from([0xf6])); return; }
|
||||
if (typeof item === "boolean") { chunks.push(Buffer.from([item ? 0xf5 : 0xf4])); return; }
|
||||
if (typeof item === "number") {
|
||||
if (Number.isInteger(item) && item >= 0) { chunks.push(head(0, item)); return; }
|
||||
if (Number.isInteger(item) && item < 0) { chunks.push(head(1, -item - 1)); return; }
|
||||
const buffer = Buffer.alloc(9);
|
||||
buffer[0] = 0xfb;
|
||||
buffer.writeDoubleBE(item, 1);
|
||||
chunks.push(buffer);
|
||||
return;
|
||||
}
|
||||
if (typeof item === "string") {
|
||||
const bytes = Buffer.from(item, "utf8");
|
||||
chunks.push(head(3, bytes.length), bytes);
|
||||
return;
|
||||
}
|
||||
if (Array.isArray(item)) {
|
||||
chunks.push(head(4, item.length));
|
||||
item.forEach(write);
|
||||
return;
|
||||
}
|
||||
const entries = Object.entries(item);
|
||||
chunks.push(head(5, entries.length));
|
||||
for (const [key, entryValue] of entries) {
|
||||
const keyBytes = Buffer.from(key, "utf8");
|
||||
chunks.push(head(3, keyBytes.length), keyBytes);
|
||||
write(entryValue);
|
||||
}
|
||||
};
|
||||
write(value);
|
||||
return Buffer.concat(chunks);
|
||||
}
|
||||
|
||||
const HISTORY_GROUPS = ["ais", "vdes", "aprs", "hf_aprs", "cw", "ft8", "ft4", "ft2", "wspr", "wefax"];
|
||||
|
||||
function assetPath(urlPath) {
|
||||
// Every tab route has its own index handler on the server (see api/assets.rs),
|
||||
// so a deep link or a refresh serves the SPA shell, not a 404.
|
||||
if (!path.extname(urlPath)) return path.join(webDir, "index.html");
|
||||
if (urlPath.startsWith("/vendor/")) return path.join(webDir, urlPath);
|
||||
const generated = path.join(generatedDir, path.basename(urlPath));
|
||||
if (urlPath.endsWith(".js")) return generated;
|
||||
return path.join(webDir, urlPath);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the fixture server.
|
||||
*
|
||||
* `spectrum` turns the rig into an SDR: `filter_controls` is what gates the
|
||||
* spectrum panel, and frames are pushed on the /spectrum stream from a centre
|
||||
* frequency the test moves with `setCenterHz` to simulate tuning across bands.
|
||||
*/
|
||||
export async function startWebFixture({
|
||||
spectrum = false,
|
||||
tx = false,
|
||||
meterDb = -70,
|
||||
decodes = [],
|
||||
mode = "FM",
|
||||
history = {},
|
||||
bookmarks = [],
|
||||
bandplan = {},
|
||||
bandplanEnabled = false,
|
||||
bandplanUnauthorizedFirst = false,
|
||||
} = {}) {
|
||||
const rigItems = ["rig-a", "rig-b"].map((remote) => ({
|
||||
remote,
|
||||
display_name: remote === "rig-a" ? "Primary fixture" : "Secondary fixture",
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
supported_modes: ["FM"],
|
||||
tx,
|
||||
filter_controls: spectrum,
|
||||
initialized: true,
|
||||
latitude: null,
|
||||
longitude: null,
|
||||
}));
|
||||
const rigsResponse = { rigs: rigItems, active_remote: "rig-a" };
|
||||
const selectedRigs = [];
|
||||
const state = { centerHz: 7074000 };
|
||||
let bandplanServed = false;
|
||||
|
||||
const status = {
|
||||
info: {
|
||||
manufacturer: "Smoke",
|
||||
model: "Fixture",
|
||||
revision: "1",
|
||||
access: { Tcp: { addr: "127.0.0.1:0" } },
|
||||
capabilities: {
|
||||
min_freq_step_hz: 1,
|
||||
supported_bands: [],
|
||||
supported_modes: ["LSB", "USB", "CW", "CWR", "AM", "SAM", "WFM", "FM", "AIS", "VDES", "DIG", "PKT"],
|
||||
num_vfos: 1,
|
||||
lock: false,
|
||||
lockable: tx,
|
||||
attenuator: false,
|
||||
preamp: false,
|
||||
rit: false,
|
||||
rpt: false,
|
||||
split: false,
|
||||
tx,
|
||||
tx_limit: tx,
|
||||
vfo_switch: false,
|
||||
filter_controls: spectrum,
|
||||
signal_meter: spectrum,
|
||||
},
|
||||
},
|
||||
status: { freq: { hz: 100_000_000 }, mode, tx_en: false, vfo: null, tx: null, rx: { sig: meterDb }, lock: null },
|
||||
// Reported only by SDR backends, and what makes the client show the
|
||||
// squelch control at all.
|
||||
filter: spectrum
|
||||
? {
|
||||
bandwidth_hz: 12_000,
|
||||
sdr_squelch_enabled: false,
|
||||
sdr_squelch_threshold_db: -95,
|
||||
sdr_agc_enabled: false,
|
||||
}
|
||||
: null,
|
||||
band: null,
|
||||
enabled: true,
|
||||
initialized: true,
|
||||
cw_auto: false,
|
||||
cw_wpm: 20,
|
||||
cw_tone_hz: 700,
|
||||
aprs_decode_enabled: false,
|
||||
hf_aprs_decode_enabled: false,
|
||||
cw_decode_enabled: false,
|
||||
ft8_decode_enabled: false,
|
||||
ft4_decode_enabled: false,
|
||||
ft2_decode_enabled: false,
|
||||
wspr_decode_enabled: false,
|
||||
lrpt_decode_enabled: false,
|
||||
wefax_decode_enabled: false,
|
||||
recorder_enabled: false,
|
||||
clients: 1,
|
||||
rigctl_clients: 0,
|
||||
audio_clients: 0,
|
||||
active_remote: "rig-a",
|
||||
remotes: ["rig-a", "rig-b"],
|
||||
show_sdr_gain_control: false,
|
||||
initial_map_zoom: 10,
|
||||
spectrum_coverage_margin_hz: 50_000,
|
||||
spectrum_usable_span_ratio: 0.92,
|
||||
bandplan_enabled: bandplanEnabled,
|
||||
bandplan_region: "iaru1",
|
||||
decode_history_retention_min: 1440,
|
||||
server_connected: true,
|
||||
};
|
||||
|
||||
const jsonRoutes = new Map([
|
||||
["/auth/session", { authenticated: true, role: "control", auth_disabled: true }],
|
||||
["/decoders", DECODER_REGISTRY],
|
||||
["/rigs", rigsResponse],
|
||||
["/status", status],
|
||||
["/bookmarks", bookmarks],
|
||||
["/bandplan.json", bandplan],
|
||||
["/api/recorder/status", []],
|
||||
["/api/recorder/files", []],
|
||||
]);
|
||||
|
||||
// Flat i8 bins: the shape does not matter, only that frames arrive so the
|
||||
// page has a spectrum range to place bookmarks and allocations against.
|
||||
const spectrumBins = Buffer.alloc(512, 200);
|
||||
const spectrumB64 = spectrumBins.toString("base64");
|
||||
|
||||
const server = http.createServer(async (request, response) => {
|
||||
const url = new URL(request.url ?? "/", "http://127.0.0.1");
|
||||
// Setting a control means the next status carries the new value, the way a
|
||||
// real server echoes what it applied.
|
||||
if (url.pathname === "/set_sdr_squelch") {
|
||||
const enabled = url.searchParams.get("enabled") === "true";
|
||||
const threshold = Number(url.searchParams.get("threshold_db"));
|
||||
if (status.filter) {
|
||||
status.filter.sdr_squelch_enabled = enabled;
|
||||
if (Number.isFinite(threshold)) status.filter.sdr_squelch_threshold_db = threshold;
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/select_rig" && request.method === "POST") {
|
||||
const remote = url.searchParams.get("remote");
|
||||
if (remote) {
|
||||
rigsResponse.active_remote = remote;
|
||||
status.active_remote = remote;
|
||||
selectedRigs.push(remote);
|
||||
}
|
||||
response.writeHead(200).end();
|
||||
return;
|
||||
}
|
||||
// Rejects the first band plan request the way the server did before it was
|
||||
// classified as a public asset: the page asks for it at startup, which can
|
||||
// land before the session exists.
|
||||
if (bandplanUnauthorizedFirst && url.pathname === "/bandplan.json" && !bandplanServed) {
|
||||
bandplanServed = true;
|
||||
response.writeHead(401).end();
|
||||
return;
|
||||
}
|
||||
if (jsonRoutes.has(url.pathname)) {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify(jsonRoutes.get(url.pathname)));
|
||||
return;
|
||||
}
|
||||
// 200 means "audio is configured": the client hides the whole audio row —
|
||||
// and the squelch control with it — when this 404s.
|
||||
if (url.pathname === "/audio") {
|
||||
response.writeHead(200, { "content-type": "application/json" });
|
||||
response.end(JSON.stringify({ sample_rate: 48_000, channels: 1 }));
|
||||
return;
|
||||
}
|
||||
if (spectrum && url.pathname === "/spectrum") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
const timer = setInterval(() => {
|
||||
response.write(`event: b\ndata: ${state.centerHz},192000,${spectrumB64}\n\n`);
|
||||
}, 100);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// The meter streams like the server's does: the squelch reads its noise
|
||||
// level from here, so a static snapshot would leave it nothing to measure.
|
||||
if (url.pathname === "/meter") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
const timer = setInterval(() => {
|
||||
response.write(`data: ${JSON.stringify({ sig: meterDb })}\n\n`);
|
||||
}, 120);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// Decodes arrive on this stream in the server's own shape: a routing
|
||||
// "type" naming the decoder, snake_case fields inside. The mini views, the
|
||||
// map markers and the history all hang off it, and serving nothing left
|
||||
// every one of them untested.
|
||||
if (url.pathname === "/decode/history") {
|
||||
const payload = Object.fromEntries(HISTORY_GROUPS.map((group) => [group, history[group] ?? []]));
|
||||
response.writeHead(200, { "content-type": "application/cbor" });
|
||||
response.end(encodeCbor(payload));
|
||||
return;
|
||||
}
|
||||
if (url.pathname === "/decode") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": decode stream\n\n");
|
||||
// Repeats: a live decoder keeps producing, and the views that collapse
|
||||
// by station or vessel need more than one frame to behave like they do
|
||||
// in front of a radio.
|
||||
let sent = 0;
|
||||
const timer = setInterval(() => {
|
||||
if (!decodes.length) return;
|
||||
const decode = decodes[sent++ % decodes.length];
|
||||
// Stamped as they leave: the client prunes anything older than the
|
||||
// retention window, so a fixed epoch would be dropped on arrival.
|
||||
response.write(`data: ${JSON.stringify({ ts_ms: Date.now(), ...decode })}\n\n`);
|
||||
}, 400);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
// The real server pushes rig state here every second or so; serving an
|
||||
// open-but-silent stream meant nothing in the client's state-update path
|
||||
// was ever exercised.
|
||||
if (url.pathname === "/events") {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
// Varying, as a real one is: the client skips a frame identical to the
|
||||
// last, so a repeated payload exercises none of the state-update path.
|
||||
const frame = () => JSON.stringify({
|
||||
...status,
|
||||
status: { ...status.status, freq: { hz: 100_000_000 + (Date.now() % 1000) } },
|
||||
});
|
||||
response.write(`data: ${frame()}\n\n`);
|
||||
const timer = setInterval(() => {
|
||||
response.write(`data: ${frame()}\n\n`);
|
||||
}, 700);
|
||||
request.on("close", () => clearInterval(timer));
|
||||
return;
|
||||
}
|
||||
if (["/events", "/decode", "/spectrum", "/meter"].includes(url.pathname)) {
|
||||
response.writeHead(200, {
|
||||
"cache-control": "no-cache",
|
||||
connection: "keep-alive",
|
||||
"content-type": "text/event-stream",
|
||||
});
|
||||
response.write(": browser smoke stream\n\n");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const file = assetPath(url.pathname);
|
||||
const bytes = await readFile(file);
|
||||
response.writeHead(200, {
|
||||
"content-type": CONTENT_TYPES.get(path.extname(file)) ?? "application/octet-stream",
|
||||
});
|
||||
response.end(bytes);
|
||||
} catch {
|
||||
response.writeHead(404).end();
|
||||
}
|
||||
});
|
||||
|
||||
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
||||
const address = server.address();
|
||||
if (!address || typeof address !== "object") throw new Error("fixture server has no port");
|
||||
|
||||
return {
|
||||
origin: `http://127.0.0.1:${address.port}`,
|
||||
selectedRigs,
|
||||
rigsResponse,
|
||||
/** Moves the spectrum centre, i.e. tunes the fixture rig to another band. */
|
||||
setCenterHz(hz) { state.centerHz = hz; },
|
||||
close() {
|
||||
return new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve()));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/** Launches headless Chromium and records any uncaught page error. */
|
||||
export async function startBrowser(chromium) {
|
||||
const executablePath = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH
|
||||
?? "/usr/bin/chromium";
|
||||
const browser = await chromium.launch({ executablePath, headless: true, args: ["--no-sandbox"] });
|
||||
const page = await browser.newPage();
|
||||
const runtimeErrors = [];
|
||||
page.on("pageerror", (error) => runtimeErrors.push(error.stack ?? error.message));
|
||||
return { browser, page, runtimeErrors };
|
||||
}
|
||||
@@ -3,14 +3,14 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("WEFAX entry exposes typed lifecycle handlers and renders decoder state", async () => {
|
||||
const status = { textContent: "", style: { color: "" } };
|
||||
const window = {};
|
||||
const window = { ...createHost() };
|
||||
const context = vm.createContext({
|
||||
window,
|
||||
document: { getElementById: (id) => id === "wefax-status" ? status : null },
|
||||
@@ -21,7 +21,7 @@ test("WEFAX entry exposes typed lifecycle handlers and renders decoder state", a
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/wefax.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/wefax.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -3,14 +3,15 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import test from "node:test";
|
||||
import vm from "node:vm";
|
||||
import { bundleEntry } from "./bundle-entry.mjs";
|
||||
import { createHost } from "./host-fixture.mjs";
|
||||
|
||||
test("WSPR entry forwards decoded locators at their absolute frequency", async () => {
|
||||
const forwarded = [];
|
||||
const window = {
|
||||
...createHost(),
|
||||
ft8BaseHz: 14_095_600,
|
||||
trxUi: { confirm: async () => true },
|
||||
mapAddLocator: (...args) => { forwarded.push(args); },
|
||||
@@ -27,7 +28,7 @@ test("WSPR entry forwards decoded locators at their absolute frequency", async (
|
||||
console,
|
||||
});
|
||||
const runtime = await bundleEntry(new URL("../src/plugin-runtime.ts", import.meta.url));
|
||||
const source = await readFile(new URL("../../assets/web/generated/wspr.js", import.meta.url), "utf8");
|
||||
const source = await bundleEntry(new URL("../src/plugins/wspr.ts", import.meta.url));
|
||||
new vm.Script(runtime).runInContext(context);
|
||||
new vm.Script(source).runInContext(context);
|
||||
|
||||
|
||||
@@ -95,6 +95,18 @@ pub(crate) async fn about_index(req: HttpRequest) -> impl Responder {
|
||||
static_asset_response(&req, "text/html; charset=utf-8", c)
|
||||
}
|
||||
|
||||
#[get("/statistics")]
|
||||
pub(crate) async fn statistics_index(req: HttpRequest) -> impl Responder {
|
||||
let c = gz_index_html();
|
||||
static_asset_response(&req, "text/html; charset=utf-8", c)
|
||||
}
|
||||
|
||||
#[get("/bookmarks")]
|
||||
pub(crate) async fn bookmarks_index(req: HttpRequest) -> impl Responder {
|
||||
let c = gz_index_html();
|
||||
static_asset_response(&req, "text/html; charset=utf-8", c)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Favicon & logo
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -267,6 +279,47 @@ pub(crate) async fn leaflet_layers_2x() -> impl Responder {
|
||||
.body(status::LEAFLET_LAYERS_2X)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Vendored APRS symbol sprites
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
fn embedded_png(bytes: &'static [u8]) -> HttpResponse {
|
||||
HttpResponse::Ok()
|
||||
.insert_header((header::CONTENT_TYPE, "image/png"))
|
||||
.insert_header((header::CACHE_CONTROL, "public, max-age=604800, immutable"))
|
||||
.body(bytes)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-0.png")]
|
||||
pub(crate) async fn aprs_symbols_primary() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_PRIMARY)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-0-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_primary_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_PRIMARY_2X)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-1.png")]
|
||||
pub(crate) async fn aprs_symbols_alternate() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_ALTERNATE)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-1-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_alternate_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_ALTERNATE_2X)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-2.png")]
|
||||
pub(crate) async fn aprs_symbols_overlay() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_OVERLAY)
|
||||
}
|
||||
|
||||
#[get("/vendor/aprs-symbols-24-2-2x.png")]
|
||||
pub(crate) async fn aprs_symbols_overlay_2x() -> impl Responder {
|
||||
embedded_png(status::APRS_SYMBOLS_OVERLAY_2X)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -295,4 +348,41 @@ mod tests {
|
||||
);
|
||||
assert_eq!(generated_content_type("secret.txt"), None);
|
||||
}
|
||||
|
||||
/// Reads the width and height out of a PNG IHDR chunk.
|
||||
fn png_dimensions(bytes: &[u8]) -> (u32, u32) {
|
||||
assert_eq!(&bytes[..8], b"\x89PNG\r\n\x1a\n", "not a PNG");
|
||||
assert_eq!(&bytes[12..16], b"IHDR", "first chunk is not IHDR");
|
||||
let width = u32::from_be_bytes(bytes[16..20].try_into().expect("IHDR width"));
|
||||
let height = u32::from_be_bytes(bytes[20..24].try_into().expect("IHDR height"));
|
||||
(width, height)
|
||||
}
|
||||
|
||||
/// The browser computes sprite cell offsets from a 16x6 grid of 24px cells,
|
||||
/// so a sheet at any other size would silently shift every APRS symbol.
|
||||
#[test]
|
||||
fn aprs_symbol_sheets_match_the_sprite_grid_the_frontend_assumes() {
|
||||
for (name, bytes) in [
|
||||
("aprs-symbols-24-0", status::APRS_SYMBOLS_PRIMARY),
|
||||
("aprs-symbols-24-1", status::APRS_SYMBOLS_ALTERNATE),
|
||||
("aprs-symbols-24-2", status::APRS_SYMBOLS_OVERLAY),
|
||||
] {
|
||||
assert_eq!(
|
||||
png_dimensions(bytes),
|
||||
(384, 144),
|
||||
"{name} is not a 16x6 grid"
|
||||
);
|
||||
}
|
||||
for (name, bytes) in [
|
||||
("aprs-symbols-24-0-2x", status::APRS_SYMBOLS_PRIMARY_2X),
|
||||
("aprs-symbols-24-1-2x", status::APRS_SYMBOLS_ALTERNATE_2X),
|
||||
("aprs-symbols-24-2-2x", status::APRS_SYMBOLS_OVERLAY_2X),
|
||||
] {
|
||||
assert_eq!(
|
||||
png_dimensions(bytes),
|
||||
(768, 288),
|
||||
"{name} is not a 2x sheet"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -637,6 +637,8 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||
.service(assets::recorder_index)
|
||||
.service(assets::settings_index)
|
||||
.service(assets::about_index)
|
||||
.service(assets::statistics_index)
|
||||
.service(assets::bookmarks_index)
|
||||
.service(assets::favicon)
|
||||
.service(assets::favicon_png)
|
||||
.service(assets::logo)
|
||||
@@ -656,6 +658,13 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||
.service(assets::leaflet_marker_shadow)
|
||||
.service(assets::leaflet_layers)
|
||||
.service(assets::leaflet_layers_2x)
|
||||
// Vendored APRS symbol sprites
|
||||
.service(assets::aprs_symbols_primary)
|
||||
.service(assets::aprs_symbols_primary_2x)
|
||||
.service(assets::aprs_symbols_alternate)
|
||||
.service(assets::aprs_symbols_alternate_2x)
|
||||
.service(assets::aprs_symbols_overlay)
|
||||
.service(assets::aprs_symbols_overlay_2x)
|
||||
.service(assets::generated_asset)
|
||||
// Virtual channels
|
||||
.service(vchan::list_channels)
|
||||
|
||||
@@ -504,7 +504,14 @@ impl RouteAccess {
|
||||
return Self::Public;
|
||||
}
|
||||
|
||||
// Static assets
|
||||
// Static assets. The band plan is one of them: it is compiled into the
|
||||
// binary and identical for every user, but ".json" is not an asset
|
||||
// suffix, so it used to fall through to Control — leaving read-only
|
||||
// users without a band plan, and everyone else without one whenever the
|
||||
// page requested it before the session was established.
|
||||
if path == "/bandplan.json" {
|
||||
return Self::Public;
|
||||
}
|
||||
if path.starts_with("/style.css")
|
||||
|| path.starts_with("/app.js")
|
||||
|| path.ends_with(".js")
|
||||
@@ -696,6 +703,12 @@ mod tests {
|
||||
assert_eq!(RouteAccess::from_path("/auth/logout"), RouteAccess::Public);
|
||||
assert_eq!(RouteAccess::from_path("/style.css"), RouteAccess::Public);
|
||||
assert_eq!(RouteAccess::from_path("/app.js"), RouteAccess::Public);
|
||||
// Static reference data, served to every role: ".json" is not in the
|
||||
// asset suffix list, so this one has to be named.
|
||||
assert_eq!(
|
||||
RouteAccess::from_path("/bandplan.json"),
|
||||
RouteAccess::Public
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -37,6 +37,23 @@ pub const LEAFLET_MARKER_SHADOW: &[u8] = include_bytes!("../assets/web/vendor/ma
|
||||
pub const LEAFLET_LAYERS: &[u8] = include_bytes!("../assets/web/vendor/layers.png");
|
||||
pub const LEAFLET_LAYERS_2X: &[u8] = include_bytes!("../assets/web/vendor/layers-2x.png");
|
||||
|
||||
// Vendored APRS symbol sprites (https://github.com/hessu/aprs-symbols).
|
||||
// Each sheet is a 16x6 grid of 24px cells indexed by `symbol code - 0x21`:
|
||||
// table 0 is the primary ('/') set, table 1 the alternate ('\') set, and
|
||||
// table 2 the overlay characters drawn on top of an alternate symbol.
|
||||
pub const APRS_SYMBOLS_PRIMARY: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-0.png");
|
||||
pub const APRS_SYMBOLS_PRIMARY_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-0-2x.png");
|
||||
pub const APRS_SYMBOLS_ALTERNATE: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-1.png");
|
||||
pub const APRS_SYMBOLS_ALTERNATE_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-1-2x.png");
|
||||
pub const APRS_SYMBOLS_OVERLAY: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-2.png");
|
||||
pub const APRS_SYMBOLS_OVERLAY_2X: &[u8] =
|
||||
include_bytes!("../assets/web/vendor/aprs-symbols-24-2-2x.png");
|
||||
|
||||
/// Build version tag used for cache-busting asset URLs and ETag headers.
|
||||
/// Computed once from `PKG_VERSION` + `CLIENT_BUILD_DATE`.
|
||||
pub fn build_version_tag() -> &'static str {
|
||||
|
||||
@@ -837,12 +837,6 @@ impl ChannelDsp {
|
||||
}
|
||||
}
|
||||
|
||||
let signal_power = decimated
|
||||
.iter()
|
||||
.map(|s| s.re * s.re + s.im * s.im)
|
||||
.sum::<f32>()
|
||||
/ decimated.len() as f32;
|
||||
let signal_db = 10.0 * signal_power.max(1e-12).log10();
|
||||
const WFM_OUTPUT_GAIN: f32 = 0.50;
|
||||
let mut audio = if let Some(decoder) = self.wfm_decoder.as_mut() {
|
||||
let mut out = decoder.process_iq(decimated);
|
||||
@@ -884,7 +878,14 @@ impl ChannelDsp {
|
||||
raw
|
||||
}
|
||||
};
|
||||
if !self.squelch.update(&self.mode, signal_db) {
|
||||
// Against the meter reading, not the block level after the IQ AGC.
|
||||
// The threshold arrives in the scale the operator sets it from — the
|
||||
// S-meter and the spectrum — while the level measured here had been
|
||||
// through the AGC, whose whole job is to hold it at a setpoint. For
|
||||
// every mode that has one (FM, PKT, AIS, AM, SAM) the squelch was
|
||||
// therefore comparing against a near-constant, and for the rest it was
|
||||
// still off by the decimation correction the meter applies.
|
||||
if !self.squelch.update(&self.mode, self.last_signal_db) {
|
||||
audio.fill(0.0);
|
||||
}
|
||||
|
||||
@@ -933,6 +934,93 @@ mod tests {
|
||||
dsp.process_block(&block);
|
||||
}
|
||||
|
||||
/// Feeds one signal twice, with the squelch threshold set from the channel's
|
||||
/// own meter reading: 6 dB above it must gate the audio, 6 dB below it must
|
||||
/// pass. FM runs an IQ AGC, so a squelch measured after that stage compares
|
||||
/// against a level pinned near the AGC setpoint — some 20 dB adrift of the
|
||||
/// scale the operator reads the threshold off, and open on plain noise.
|
||||
#[test]
|
||||
fn squelch_follows_the_meter_the_threshold_is_set_from() {
|
||||
const AMPLITUDE: f32 = 0.0025;
|
||||
|
||||
let (pcm_tx, mut pcm_rx) = broadcast::channel::<Vec<f32>>(4096);
|
||||
let (iq_tx, _iq_rx) = broadcast::channel::<Vec<Complex<f32>>>(8);
|
||||
let mut dsp = ChannelDsp::new(
|
||||
0.0,
|
||||
&RigMode::FM,
|
||||
48_000,
|
||||
8_000,
|
||||
1,
|
||||
20,
|
||||
12_000,
|
||||
75,
|
||||
true,
|
||||
false,
|
||||
VirtualSquelchConfig::default(),
|
||||
NoiseBlankerConfig::default(),
|
||||
pcm_tx,
|
||||
iq_tx,
|
||||
);
|
||||
|
||||
// A 1 kHz tone on the carrier, so an open gate is audibly non-zero and
|
||||
// a closed one is unambiguously silent.
|
||||
let mut phase = 0.0_f32;
|
||||
let mut mod_phase = 0.0_f32;
|
||||
let mut feed = |dsp: &mut ChannelDsp, blocks: usize| {
|
||||
for _ in 0..blocks {
|
||||
let mut block = Vec::with_capacity(4096);
|
||||
for _ in 0..4096 {
|
||||
mod_phase += std::f32::consts::TAU * 1_000.0 / 48_000.0;
|
||||
phase += std::f32::consts::TAU * (3_000.0 * mod_phase.sin()) / 48_000.0;
|
||||
block.push(Complex::new(
|
||||
AMPLITUDE * phase.cos(),
|
||||
AMPLITUDE * phase.sin(),
|
||||
));
|
||||
}
|
||||
dsp.process_block(&block);
|
||||
}
|
||||
};
|
||||
let drain = |rx: &mut broadcast::Receiver<Vec<f32>>| {
|
||||
let mut audio = Vec::new();
|
||||
while let Ok(frame) = rx.try_recv() {
|
||||
audio.extend_from_slice(&frame);
|
||||
}
|
||||
audio
|
||||
};
|
||||
let peak = |audio: &[f32]| audio.iter().fold(0.0_f32, |acc, s| acc.max(s.abs()));
|
||||
|
||||
// Settle the meter on this signal, then read what the operator would.
|
||||
feed(&mut dsp, 24);
|
||||
let meter_db = dsp.signal_db();
|
||||
assert!(
|
||||
meter_db > -120.0,
|
||||
"the meter never moved off its floor ({meter_db} dB)"
|
||||
);
|
||||
|
||||
dsp.set_squelch(true, meter_db + 6.0);
|
||||
let _ = drain(&mut pcm_rx);
|
||||
feed(&mut dsp, 24);
|
||||
let gated = drain(&mut pcm_rx);
|
||||
assert!(!gated.is_empty(), "no audio frames were produced at all");
|
||||
// From the second half on: the first frame out still carries the audio
|
||||
// that was already buffered when the threshold changed.
|
||||
assert_eq!(
|
||||
peak(&gated[gated.len() / 2..]),
|
||||
0.0,
|
||||
"squelch set 6 dB above the meter ({meter_db} dB) still passed audio"
|
||||
);
|
||||
|
||||
dsp.set_squelch(true, meter_db - 6.0);
|
||||
let _ = drain(&mut pcm_rx);
|
||||
feed(&mut dsp, 24);
|
||||
let passed = drain(&mut pcm_rx);
|
||||
assert!(!passed.is_empty(), "no audio frames were produced at all");
|
||||
assert!(
|
||||
peak(&passed[passed.len() / 2..]) > 0.0,
|
||||
"squelch set 6 dB below the meter ({meter_db} dB) gated the audio"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn channel_dsp_set_mode() {
|
||||
let (pcm_tx, _) = broadcast::channel::<Vec<f32>>(8);
|
||||
|
||||
Reference in New Issue
Block a user