Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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
|
||||
|
||||
@@ -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",
|
||||
|
||||
+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`;
|
||||
@@ -303,7 +308,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);
|
||||
|
||||
@@ -637,6 +637,22 @@ function elementById(id) {
|
||||
};
|
||||
const layoutCapabilities = { broadcast: false, digital: false };
|
||||
let activeRigId = null;
|
||||
const layoutSections = [
|
||||
{ id: "advanced-radio-controls", key: "advanced" },
|
||||
{ id: "audio-controls", key: "audio" },
|
||||
{ id: "scheduler-controls", key: "scheduler" }
|
||||
];
|
||||
const seededSections = /* @__PURE__ */ new Set();
|
||||
let appliedLayoutName = null;
|
||||
function seedLayoutSections(layout, layoutChanged) {
|
||||
layoutSections.forEach(({ id, key }) => {
|
||||
const section = document.getElementById(id);
|
||||
if (!section) return;
|
||||
if (!layoutChanged && seededSections.has(id)) return;
|
||||
seededSections.add(id);
|
||||
section.open = layout[key];
|
||||
});
|
||||
}
|
||||
function layoutStorageKey() {
|
||||
return activeRigId ? `trxOperatorLayout:${activeRigId}` : "trxOperatorLayout";
|
||||
}
|
||||
@@ -690,12 +706,9 @@ function elementById(id) {
|
||||
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");
|
||||
if (details) details.open = layout.advanced;
|
||||
const audioDetails = document.getElementById("audio-controls");
|
||||
if (audioDetails) audioDetails.open = layout.audio;
|
||||
const schedulerDetails = document.getElementById("scheduler-controls");
|
||||
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);
|
||||
}
|
||||
@@ -734,6 +747,95 @@ function elementById(id) {
|
||||
api.applyLayout(savedLayoutName(), { persist: false });
|
||||
}
|
||||
}
|
||||
const overflowOrder = [".operator-layout-picker", ".header-style-pick", "#theme-toggle"];
|
||||
function anchorMenu(button, menu) {
|
||||
const rect = button.getBoundingClientRect();
|
||||
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";
|
||||
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(".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();
|
||||
});
|
||||
const barFits = () => {
|
||||
const bar = actions.closest(".tab-bar");
|
||||
if (!bar) return true;
|
||||
const identity = bar.querySelector(".header-main");
|
||||
const nav = bar.querySelector(".tab-bar-nav");
|
||||
const gutters = 48;
|
||||
const needed = (identity?.offsetWidth ?? 0) + (nav?.scrollWidth ?? 0) + actions.scrollWidth + gutters;
|
||||
return needed <= bar.clientWidth;
|
||||
};
|
||||
const reflowOverflow = () => {
|
||||
overflowOrder.forEach((selector) => {
|
||||
const element = menu.querySelector(selector);
|
||||
if (element) actions.insertBefore(element, wrap);
|
||||
});
|
||||
wrap.hidden = true;
|
||||
for (const selector of overflowOrder) {
|
||||
if (barFits()) break;
|
||||
const element = actions.querySelector(selector);
|
||||
if (!element) continue;
|
||||
wrap.hidden = false;
|
||||
menu.appendChild(element);
|
||||
}
|
||||
wrap.hidden = menu.children.length === 0;
|
||||
if (wrap.hidden) closeMenu();
|
||||
};
|
||||
reflowOverflow();
|
||||
window.addEventListener("resize", reflowOverflow);
|
||||
}
|
||||
function installMobileMore() {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
if (!nav || document.getElementById("mobile-more-btn")) return;
|
||||
@@ -741,7 +843,8 @@ function elementById(id) {
|
||||
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");
|
||||
@@ -773,7 +876,10 @@ function elementById(id) {
|
||||
more.addEventListener("click", () => {
|
||||
const open = menu.classList.toggle("is-open");
|
||||
more.setAttribute("aria-expanded", String(open));
|
||||
if (open) menu.querySelector('[role="menuitem"]')?.focus();
|
||||
if (open) {
|
||||
anchorMenu(more, menu);
|
||||
menu.querySelector('[role="menuitem"]')?.focus();
|
||||
}
|
||||
});
|
||||
document.addEventListener("click", (event) => {
|
||||
if (!(event.target instanceof Node) || !menu.contains(event.target) && !more.contains(event.target)) closeMore();
|
||||
@@ -840,6 +946,7 @@ function elementById(id) {
|
||||
api.init = function init() {
|
||||
ensureLiveRegions();
|
||||
installLayoutControls();
|
||||
installTopBarOverflow();
|
||||
installMobileMore();
|
||||
installDecoderPicker();
|
||||
installDecoderBadges();
|
||||
@@ -1934,7 +2041,6 @@ var signalSplitValueEl = document.getElementById("signal-split-value");
|
||||
var overviewPeakHoldEl = document.getElementById("overview-peak-hold");
|
||||
var themeToggleBtn = document.getElementById("theme-toggle");
|
||||
var headerRigSwitchSelect = document.getElementById("header-rig-switch-select");
|
||||
var headerRigSummary = document.getElementById("header-rig-summary");
|
||||
var headerStylePickSelect = document.getElementById("header-style-pick-select");
|
||||
var rdsPsOverlay = document.getElementById("rds-ps-overlay");
|
||||
var tabMainEl = document.getElementById("tab-main");
|
||||
@@ -2651,19 +2757,6 @@ function populateRigPicker(selectEl, rigIds, activeRigId, disabled) {
|
||||
}
|
||||
selectEl.disabled = disabled;
|
||||
}
|
||||
function updateRigIdentitySummary(rigId, pending = false) {
|
||||
if (!headerRigSummary) return;
|
||||
const rig = serverRigs.find((entry) => entry?.remote === rigId);
|
||||
if (!rig) {
|
||||
headerRigSummary.textContent = pending ? "Switching rigs…" : "No rig details available";
|
||||
return;
|
||||
}
|
||||
const hardware = [rig.manufacturer, rig.model].map((value) => String(value || "").trim()).filter(Boolean).join(" ") || rig.remote;
|
||||
const modes = Array.isArray(rig.supported_modes) ? rig.supported_modes.map(normalizeMode).filter(Boolean) : [];
|
||||
const features = [rig.tx ? "TX" : "RX", rig.filter_controls ? "SDR filters" : null, ...modes.slice(0, 5)];
|
||||
if (modes.length > 5) features.push(`+${modes.length - 5} modes`);
|
||||
headerRigSummary.textContent = `${pending ? "Switching to " : ""}${hardware} · ${features.filter(Boolean).join(" · ")}`;
|
||||
}
|
||||
function updateRigSubtitle(activeRigId) {
|
||||
if (!rigSubtitle) return;
|
||||
const name = activeRigId && lastRigDisplayNames[activeRigId] || activeRigId || "--";
|
||||
@@ -2694,7 +2787,6 @@ function applyRigList(activeRigId, rigIds, displayNames = {}) {
|
||||
const disableSwitch = lastRigIds.length === 0 || !authRole || authRole === "rx";
|
||||
populateRigPicker(headerRigSwitchSelect, lastRigIds, lastActiveRigId, disableSwitch);
|
||||
updateRigSubtitle(lastActiveRigId);
|
||||
updateRigIdentitySummary(lastActiveRigId);
|
||||
window.trxUi?.setActiveRig(lastActiveRigId);
|
||||
if (rigListChanged) {
|
||||
window.trx.modules.scheduler?.setRig(lastActiveRigId);
|
||||
@@ -3206,6 +3298,7 @@ function refreshWavelengthDisplay(hz) {
|
||||
wavelengthEl.textContent = formatWavelength(hz);
|
||||
}
|
||||
function refreshFreqDisplay() {
|
||||
if (window.trx?.modules.vchan?.interceptFreqDisplay()) return;
|
||||
if (lastFreqHz == null || freqDirty) return;
|
||||
freqEl.value = formatFrequencyForStep(lastFreqHz, jogUnit);
|
||||
refreshWavelengthDisplay(lastFreqHz);
|
||||
@@ -3625,12 +3718,19 @@ async function ensureTunedBandwidthCoverage(freqHz, bandwidthHz = coverageGuardB
|
||||
}
|
||||
var _freqOptimisticHz = null;
|
||||
var _freqOptimisticSeq = 0;
|
||||
function armOptimisticFrequency(freqHz) {
|
||||
if (!isFiniteNumber(freqHz)) return;
|
||||
_freqOptimisticSeq += 1;
|
||||
_freqOptimisticHz = Math.round(freqHz);
|
||||
}
|
||||
function setRigFrequency(freqHz) {
|
||||
const targetHz = Math.round(freqHz);
|
||||
if (!freqAllowed(targetHz)) {
|
||||
showUnsupportedFreqPopup(targetHz);
|
||||
throw new Error(`Unsupported frequency: ${targetHz}`);
|
||||
}
|
||||
if (window.trx?.modules.vchan?.interceptFrequency(targetHz)) return;
|
||||
void window.trx?.modules.vchan?.takeSchedulerControl();
|
||||
const prevFreqHz = lastFreqHz;
|
||||
const seq = ++_freqOptimisticSeq;
|
||||
_freqOptimisticHz = targetHz;
|
||||
@@ -4947,7 +5047,7 @@ async function switchRigFromSelect(selectEl) {
|
||||
rigSwitchInProgress = true;
|
||||
setControlPending(selectEl, true);
|
||||
selectEl.closest(".header-rig-switch")?.classList.add("is-switching");
|
||||
updateRigIdentitySummary(nextRig, true);
|
||||
showHint(`Switching to ${lastRigDisplayNames[nextRig] || nextRig}…`);
|
||||
showHint(`Switching to ${lastRigDisplayNames[nextRig] || nextRig}…`);
|
||||
try {
|
||||
const sidParam = sseSessionId ? `&session_id=${encodeURIComponent(sseSessionId)}` : "";
|
||||
@@ -4955,7 +5055,6 @@ async function switchRigFromSelect(selectEl) {
|
||||
lastActiveRigId = nextRig;
|
||||
resetDecoderStateOnRigSwitch();
|
||||
updateRigSubtitle(lastActiveRigId);
|
||||
updateRigIdentitySummary(lastActiveRigId);
|
||||
window.trxUi?.setActiveRig(lastActiveRigId);
|
||||
window.trx.modules.scheduler?.setRig(lastActiveRigId);
|
||||
window.trx.modules.backgroundDecode?.setRig(lastActiveRigId);
|
||||
@@ -4974,7 +5073,6 @@ async function switchRigFromSelect(selectEl) {
|
||||
} catch (err) {
|
||||
console.error("select_rig failed:", err);
|
||||
selectEl.value = prevRig || "";
|
||||
updateRigIdentitySummary(prevRig);
|
||||
window.trxUi?.notify("Rig could not be switched", { kind: "error" });
|
||||
} finally {
|
||||
rigSwitchInProgress = false;
|
||||
@@ -5494,6 +5592,8 @@ function navigateToTab(name, options = {}) {
|
||||
_activeTab = name;
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => t.classList.remove("active"));
|
||||
btn.classList.add("active");
|
||||
const toolsBtn = document.getElementById("mobile-more-btn");
|
||||
if (toolsBtn) toolsBtn.classList.toggle("active", getComputedStyle(btn).display === "none");
|
||||
window.trxUi?.syncSelectedTab(document.querySelector(".tab-bar-nav"), btn);
|
||||
document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const panel = document.getElementById(`tab-${name}`);
|
||||
@@ -5713,6 +5813,9 @@ Object.defineProperties(trxState, {
|
||||
decodeHistoryRetentionMin: { get() {
|
||||
return decodeHistoryRetentionMin;
|
||||
} },
|
||||
authEnabled: { get() {
|
||||
return authEnabled;
|
||||
} },
|
||||
authRole: { get() {
|
||||
return authRole;
|
||||
} },
|
||||
@@ -5765,6 +5868,19 @@ Object.defineProperties(trxState, {
|
||||
} },
|
||||
lastModeName: { get() {
|
||||
return lastModeName;
|
||||
}, set(v) {
|
||||
lastModeName = v;
|
||||
} },
|
||||
jogUnit: { get() {
|
||||
return jogUnit;
|
||||
} },
|
||||
rxActive: { get() {
|
||||
return rxActive;
|
||||
} },
|
||||
audioChannelOverride: { get() {
|
||||
return _audioChannelOverride;
|
||||
}, set(v) {
|
||||
_audioChannelOverride = v;
|
||||
} },
|
||||
lastSpectrumData: { get() {
|
||||
return lastSpectrumData;
|
||||
@@ -5816,6 +5932,22 @@ var trxCore = Object.freeze({
|
||||
scheduleUiFrameJob,
|
||||
navigateToTab,
|
||||
rigBadgeColor,
|
||||
setRigFrequency,
|
||||
applyLocalTunedFrequency,
|
||||
armOptimisticFrequency,
|
||||
syncBandwidthInput,
|
||||
scheduleSpectrumDraw,
|
||||
onDecoderRegistryReady,
|
||||
formatFreqForStep: formatFrequencyForStep,
|
||||
refreshFreqDisplay,
|
||||
setJogDivisor,
|
||||
mwDefaultsForMode,
|
||||
resetRdsDisplay,
|
||||
positionRdsPsOverlay,
|
||||
updateWfmControls,
|
||||
updateSdrSquelchControlVisibility,
|
||||
startRxAudio,
|
||||
stopRxAudio,
|
||||
latLonToMaidenhead,
|
||||
locatorToLatLon,
|
||||
haversineKm,
|
||||
|
||||
@@ -8,12 +8,16 @@ import {
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.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 +62,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`;
|
||||
@@ -260,7 +264,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);
|
||||
|
||||
+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,43 @@ 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();
|
||||
}
|
||||
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 +380,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 +392,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 +430,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 +536,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 +556,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
|
||||
};
|
||||
+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);
|
||||
@@ -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();
|
||||
|
||||
@@ -8,10 +8,14 @@ import {
|
||||
renderAprsInfo,
|
||||
renderLocalAprsSymbol
|
||||
} from "./chunk-M2I6DH4X.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 escapeHfAprsHtml = (input) => hostCore.escapeMapHtml(input);
|
||||
var hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
var hfAprsPacketsEl = document.getElementById("hf-aprs-packets");
|
||||
var hfAprsFilterInput = document.getElementById("hf-aprs-filter");
|
||||
@@ -44,8 +48,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`;
|
||||
@@ -134,10 +138,10 @@ function renderHfAprsRow(pkt, isFresh) {
|
||||
const clipboard = Reflect.get(navigator, "clipboard");
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hfAprsWindow.showHint?.("Coordinates copied", 1200);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hfAprsWindow.showHint?.("Copy failed", 1500);
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
})();
|
||||
});
|
||||
@@ -201,7 +205,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 +215,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 {
|
||||
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,11 +279,7 @@ 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");
|
||||
@@ -290,21 +289,21 @@ function vchanSyncModeDisplay() {
|
||||
if (ch && ch.mode) modeEl.value = ch.mode.toUpperCase();
|
||||
}
|
||||
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 +313,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 +332,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 +405,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 +434,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 +449,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");
|
||||
@@ -231,7 +235,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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -46,7 +46,7 @@ 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>
|
||||
@@ -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">
|
||||
@@ -1052,6 +1051,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 +1192,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 +1488,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">
|
||||
|
||||
@@ -1229,12 +1229,20 @@ small { color: var(--text-muted); }
|
||||
gap: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
/* One row, always. Controls that do not fit are moved into the overflow menu
|
||||
* by ui-core rather than wrapping: wrapping made the header's height depend on
|
||||
* the viewport width in a way that was not even monotonic (112px at 1440,
|
||||
* 169px at 1100, 131px at 900), which is what made the bar feel unstable. */
|
||||
.top-bar-actions {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 0.45rem 0.6rem;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
min-width: 0;
|
||||
flex-wrap: wrap;
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
/* Every control in the bar is the same height and none of them stretch. */
|
||||
.top-bar-actions > * {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.header-bar-btn.header-audio-btn {
|
||||
width: 2rem;
|
||||
@@ -1403,21 +1411,13 @@ small { color: var(--text-muted); }
|
||||
gap: 0.8rem;
|
||||
padding: 0.9rem 0.2rem 0;
|
||||
}
|
||||
/* Inline, not stacked: the summary used to sit under the select, making this
|
||||
* the only 54px control in a bar of 32px ones. */
|
||||
.header-rig-switch {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
align-items: start;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
.header-rig-summary {
|
||||
display: block;
|
||||
max-width: 20rem;
|
||||
color: var(--text-muted);
|
||||
font-size: var(--fs-xs);
|
||||
line-height: 1.35;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
min-width: 0;
|
||||
}
|
||||
.header-rig-switch select {
|
||||
min-width: 8rem;
|
||||
@@ -1531,7 +1531,19 @@ small { color: var(--text-muted); }
|
||||
align-items: center;
|
||||
gap: 0.2rem;
|
||||
min-width: 0;
|
||||
flex-wrap: wrap;
|
||||
/* Never wraps. It must still be able to shrink below its content, or it
|
||||
* overlaps the controls; the menus it anchors are reparented to the body on
|
||||
* open, so clipping here no longer reaches them. */
|
||||
flex-wrap: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
.tab-bar-nav .tab { flex: 0 0 auto; }
|
||||
/* Icons before scrolling: every tab already carries one, and four icons plus
|
||||
* More always fit, so the strip never has to hide a destination. */
|
||||
@media (max-width: 1360px) and (min-width: 701px) {
|
||||
.tab-bar-nav .tab .tab-label { display: none; }
|
||||
.tab-bar-nav .tab .tab-icon, .tab-bar-nav .tab .tab-more-icon { display: block; }
|
||||
.tab-bar-nav .tab { padding: 0.5rem 0.6rem; }
|
||||
}
|
||||
.tab {
|
||||
background: transparent;
|
||||
@@ -1554,6 +1566,7 @@ small { color: var(--text-muted); }
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.tab-label { display: block; }
|
||||
.tab-more-icon { display: none; }
|
||||
.about-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); gap: 1rem; }
|
||||
.about-card { background: var(--card-bg); border: 1px solid var(--border); border-radius: 0.5rem; padding: 0; overflow: hidden; }
|
||||
.about-card-title { display: flex; align-items: center; gap: 0.5rem; padding: 0.6rem 0.75rem; font-size: 0.8rem; font-weight: 600; text-transform: uppercase; letter-spacing: 0.04em; color: var(--text-heading); border-bottom: 1px solid var(--border); background: color-mix(in srgb, var(--card-bg) 50%, var(--bg)); }
|
||||
@@ -2964,7 +2977,10 @@ button.is-active {
|
||||
text-transform: uppercase;
|
||||
overflow: visible;
|
||||
}
|
||||
.operator-layout-picker::before { content: "Layout"; }
|
||||
/* The prefix made the least-used control the widest in the bar; the
|
||||
* select carries its own aria-label and title instead. */
|
||||
.operator-layout-picker { padding-left: 0; }
|
||||
.operator-layout-picker select { max-width: 8rem; }
|
||||
.operator-layout-picker select {
|
||||
width: auto;
|
||||
min-height: 2rem;
|
||||
@@ -3060,9 +3076,22 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
body[data-operator-layout="broadcast"] .controls-row { grid-template-columns: 1fr auto; }
|
||||
body[data-operator-layout="broadcast"] #wfm-controls-col { grid-column: 1 / -1; }
|
||||
}
|
||||
.mobile-more-btn, .mobile-more-menu, .decoder-tab-select { display: none; }
|
||||
/* One navigation model at every width. Statistics, Recorder, Settings and
|
||||
* About are occasional destinations: they live behind More rather than
|
||||
* competing with the operating tabs for the row and then scrolling out of
|
||||
* reach. The mobile layout already grouped them this way; the desktop strip
|
||||
* now matches it, which is why the tab strip no longer needs to scroll. */
|
||||
.tab-bar-nav .tab[data-tab="statistics"],
|
||||
.tab-bar-nav .tab[data-tab="recorder"],
|
||||
.tab-bar-nav .tab[data-tab="settings"],
|
||||
.tab-bar-nav .tab[data-tab="about"] { display: none; }
|
||||
.mobile-more-btn { display: flex; flex: 0 0 auto; }
|
||||
.mobile-more-menu, .decoder-tab-select { display: none; }
|
||||
.tab-bar-nav { position: relative; }
|
||||
.mobile-more-menu {
|
||||
position: fixed;
|
||||
position: absolute;
|
||||
top: calc(100% + 0.4rem);
|
||||
right: 0;
|
||||
right: max(0.75rem, env(safe-area-inset-right));
|
||||
bottom: calc(5.4rem + env(safe-area-inset-bottom));
|
||||
z-index: 80;
|
||||
@@ -3251,7 +3280,7 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
color: var(--text);
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, #ffffff 8%, transparent);
|
||||
}
|
||||
.tab-icon { display: block; }
|
||||
.tab-icon, .tab-more-icon { display: block; }
|
||||
/* Shorten long tab labels to keep bottom nav compact */
|
||||
.tab[data-tab="bookmarks"] .tab-label { font-size: 0.6rem; }
|
||||
.tab[data-tab="digital-modes"] .tab-label { font-size: 0.6rem; }
|
||||
@@ -3259,6 +3288,12 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
.tab[data-tab="statistics"], .tab[data-tab="recorder"],
|
||||
.tab[data-tab="settings"], .tab[data-tab="about"] { display: none; }
|
||||
.mobile-more-btn { display: flex; }
|
||||
.mobile-more-menu {
|
||||
position: fixed;
|
||||
top: auto;
|
||||
right: max(0.75rem, env(safe-area-inset-right));
|
||||
bottom: calc(5.4rem + env(safe-area-inset-bottom));
|
||||
}
|
||||
.mobile-more-btn[aria-expanded="true"] {
|
||||
color: var(--accent-text);
|
||||
background: color-mix(in srgb, var(--accent-green) 10%, transparent);
|
||||
@@ -3282,24 +3317,24 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
.toast-region { bottom: calc(5.7rem + env(safe-area-inset-bottom)); }
|
||||
.top-bar-actions {
|
||||
width: 100%;
|
||||
justify-content: flex-start;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.45rem;
|
||||
justify-content: flex-end;
|
||||
flex-wrap: nowrap;
|
||||
gap: 0.4rem;
|
||||
}
|
||||
.operator-layout-picker { max-width: 100%; }
|
||||
.operator-layout-picker select { max-width: 10rem; }
|
||||
.header-rig-switch,
|
||||
.header-style-pick {
|
||||
flex: 1 1 12rem;
|
||||
flex: 0 0 auto;
|
||||
min-width: 0;
|
||||
}
|
||||
.header-rig-switch select,
|
||||
.header-style-pick select {
|
||||
width: 100%;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
}
|
||||
.header-bar-btn {
|
||||
flex: 1 1 calc(50% - 0.3rem);
|
||||
flex: 0 0 auto;
|
||||
min-width: 0;
|
||||
}
|
||||
#tab-main,
|
||||
@@ -5153,7 +5188,6 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
padding: 1rem;
|
||||
}
|
||||
.stats-controls {
|
||||
display: flex;
|
||||
@@ -5379,3 +5413,51 @@ body[data-operator-layout="broadcast"] #cw-bar-overlay {
|
||||
font-size: max(0.75rem, 12px);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* --- Top bar overflow menu ------------------------------------------------ */
|
||||
.top-bar-more { position: relative; }
|
||||
.top-bar-more[hidden] { display: none; }
|
||||
.top-bar-more-btn {
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
min-height: 2rem;
|
||||
padding: 0;
|
||||
font-size: 1rem;
|
||||
line-height: 1;
|
||||
}
|
||||
.top-bar-more-menu {
|
||||
position: absolute;
|
||||
top: calc(100% + 0.35rem);
|
||||
right: 0;
|
||||
z-index: 40;
|
||||
display: none;
|
||||
flex-direction: column;
|
||||
gap: 0.4rem;
|
||||
min-width: 12rem;
|
||||
padding: 0.5rem;
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: var(--radius-md);
|
||||
background: var(--surface);
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.28);
|
||||
}
|
||||
.top-bar-more-menu.is-open { display: flex; }
|
||||
.top-bar-more-menu > * { width: 100%; }
|
||||
.top-bar-more-menu select { width: 100%; max-width: none; }
|
||||
|
||||
|
||||
/* Page title for destinations reached through the Tools menu. The tab strip
|
||||
* cannot show which of them is active, so each states its own name.
|
||||
*
|
||||
* The margin is the spacing on the plain block panels; #tab-statistics is a
|
||||
* flex column with its own `gap`, where the margin lands on top of that gap
|
||||
* and doubles the space under the title. */
|
||||
.section-heading {
|
||||
margin: 0 0 var(--space-3);
|
||||
font-size: 1.15rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.2;
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
#tab-statistics > .section-heading { margin-bottom: 0; }
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
applyDecoderRegistryVisibility,
|
||||
decoderRegistry,
|
||||
loadDecoderRegistry,
|
||||
onDecoderRegistryReady,
|
||||
} from "./core/decoder-registry.js";
|
||||
import {
|
||||
fetchAuthSession,
|
||||
@@ -201,6 +202,8 @@ interface TrxModules {
|
||||
handleChannels(data: string): void;
|
||||
handleSession(data: string): void;
|
||||
interceptBandwidth(bandwidthHz: number): Promise<boolean>;
|
||||
interceptFrequency(frequencyHz: number): boolean;
|
||||
interceptFreqDisplay(): boolean;
|
||||
interceptMode(mode: string): Promise<boolean>;
|
||||
isOnVirtual(): boolean;
|
||||
takeSchedulerControl(): Promise<void>;
|
||||
@@ -217,6 +220,7 @@ interface TrxState {
|
||||
readonly lastRigDisplayNames: Record<string, string>;
|
||||
readonly initialMapZoom: number;
|
||||
readonly decodeHistoryRetentionMin: number;
|
||||
readonly authEnabled: boolean;
|
||||
readonly authRole: AuthRole | null;
|
||||
readonly decoderRegistry: typeof decoderRegistry;
|
||||
readonly sseSessionId: string | null;
|
||||
@@ -233,7 +237,10 @@ interface TrxState {
|
||||
readonly aisVesselUrlBase: string | null;
|
||||
readonly serverRigs: RigListItem[];
|
||||
readonly serverActiveRigId: string | null;
|
||||
readonly lastModeName: string;
|
||||
lastModeName: string;
|
||||
readonly jogUnit: number;
|
||||
readonly rxActive: boolean;
|
||||
audioChannelOverride: string | null;
|
||||
readonly lastSpectrumData: SpectrumFrame | null;
|
||||
readonly lastSpectrumRenderData: SpectrumFrame | null;
|
||||
currentBandwidthHz: number;
|
||||
@@ -717,7 +724,6 @@ const signalSplitValueEl = document.getElementById("signal-split-value");
|
||||
const overviewPeakHoldEl = document.getElementById("overview-peak-hold") as HTMLInputElement | null;
|
||||
const themeToggleBtn = document.getElementById("theme-toggle") as HTMLButtonElement | null;
|
||||
const headerRigSwitchSelect = document.getElementById("header-rig-switch-select") as HTMLSelectElement | null;
|
||||
const headerRigSummary = document.getElementById("header-rig-summary");
|
||||
const headerStylePickSelect = document.getElementById("header-style-pick-select") as HTMLSelectElement | null;
|
||||
const rdsPsOverlay = document.getElementById("rds-ps-overlay");
|
||||
const tabMainEl = document.getElementById("tab-main");
|
||||
@@ -1364,20 +1370,6 @@ function populateRigPicker(selectEl: HTMLSelectElement | null, rigIds: string[],
|
||||
selectEl.disabled = disabled;
|
||||
}
|
||||
|
||||
function updateRigIdentitySummary(rigId: string | null, pending = false) {
|
||||
if (!headerRigSummary) return;
|
||||
const rig = serverRigs.find((entry) => entry?.remote === rigId);
|
||||
if (!rig) {
|
||||
headerRigSummary.textContent = pending ? "Switching rigs…" : "No rig details available";
|
||||
return;
|
||||
}
|
||||
const hardware = [rig.manufacturer, rig.model].map(value => String(value || "").trim()).filter(Boolean).join(" ") || rig.remote;
|
||||
const modes = Array.isArray(rig.supported_modes) ? rig.supported_modes.map(normalizeMode).filter(Boolean) : [];
|
||||
const features = [rig.tx ? "TX" : "RX", rig.filter_controls ? "SDR filters" : null, ...modes.slice(0, 5)];
|
||||
if (modes.length > 5) features.push(`+${modes.length - 5} modes`);
|
||||
headerRigSummary.textContent = `${pending ? "Switching to " : ""}${hardware} · ${features.filter(Boolean).join(" · ")}`;
|
||||
}
|
||||
|
||||
function updateRigSubtitle(activeRigId: string | null) {
|
||||
if (!rigSubtitle) return;
|
||||
const name = (activeRigId && lastRigDisplayNames[activeRigId]) || activeRigId || "--";
|
||||
@@ -1414,7 +1406,6 @@ function applyRigList(activeRigId: string | null, rigIds: string[], displayNames
|
||||
const disableSwitch = lastRigIds.length === 0 || !authRole || authRole === "rx";
|
||||
populateRigPicker(headerRigSwitchSelect, lastRigIds, lastActiveRigId, disableSwitch);
|
||||
updateRigSubtitle(lastActiveRigId);
|
||||
updateRigIdentitySummary(lastActiveRigId);
|
||||
window.trxUi?.setActiveRig(lastActiveRigId);
|
||||
if (rigListChanged) {
|
||||
window.trx.modules.scheduler?.setRig(lastActiveRigId);
|
||||
@@ -1984,6 +1975,9 @@ function refreshWavelengthDisplay(hz: number) {
|
||||
}
|
||||
|
||||
function refreshFreqDisplay() {
|
||||
// On a virtual channel the field must show that channel's frequency; SSE
|
||||
// rig-state updates would otherwise overwrite it with the primary channel.
|
||||
if (window.trx?.modules.vchan?.interceptFreqDisplay()) return;
|
||||
if (lastFreqHz == null || freqDirty) return;
|
||||
freqEl.value = formatFreqForStep(lastFreqHz, jogUnit);
|
||||
refreshWavelengthDisplay(lastFreqHz);
|
||||
@@ -2476,12 +2470,26 @@ async function ensureTunedBandwidthCoverage(freqHz: number, bandwidthHz = covera
|
||||
let _freqOptimisticHz: number | null = null;
|
||||
let _freqOptimisticSeq = 0;
|
||||
|
||||
// Lazy features paint their own optimistic frequency before starting the tune
|
||||
// round-trip (a bookmark updates the marker before mode and bandwidth settle).
|
||||
// Arming the guard from there keeps SSE from snapping back to the stale value.
|
||||
function armOptimisticFrequency(freqHz: number) {
|
||||
if (!isFiniteNumber(freqHz)) return;
|
||||
_freqOptimisticSeq += 1;
|
||||
_freqOptimisticHz = Math.round(freqHz);
|
||||
}
|
||||
|
||||
function setRigFrequency(freqHz: number) {
|
||||
const targetHz = Math.round(freqHz);
|
||||
if (!freqAllowed(targetHz)) {
|
||||
showUnsupportedFreqPopup(targetHz);
|
||||
throw new Error(`Unsupported frequency: ${targetHz}`);
|
||||
}
|
||||
// A virtual channel owns its own tuning path: the plugin applies the
|
||||
// optimistic update and posts to the channel API instead of the rig.
|
||||
if (window.trx?.modules.vchan?.interceptFrequency(targetHz)) return;
|
||||
// Scheduler control is fire-and-forget — don't block the freq change.
|
||||
void window.trx?.modules.vchan?.takeSchedulerControl();
|
||||
// Optimistic local update — visual is instant via CSS overlay + guard.
|
||||
const prevFreqHz = lastFreqHz;
|
||||
const seq = ++_freqOptimisticSeq;
|
||||
@@ -3999,7 +4007,7 @@ async function switchRigFromSelect(selectEl: HTMLSelectElement) {
|
||||
rigSwitchInProgress = true;
|
||||
setControlPending(selectEl, true);
|
||||
selectEl.closest(".header-rig-switch")?.classList.add("is-switching");
|
||||
updateRigIdentitySummary(nextRig, true);
|
||||
showHint(`Switching to ${lastRigDisplayNames[nextRig] || nextRig}…`);
|
||||
showHint(`Switching to ${lastRigDisplayNames[nextRig] || nextRig}…`);
|
||||
try {
|
||||
const sidParam = sseSessionId ? `&session_id=${encodeURIComponent(sseSessionId)}` : "";
|
||||
@@ -4007,7 +4015,6 @@ async function switchRigFromSelect(selectEl: HTMLSelectElement) {
|
||||
lastActiveRigId = nextRig;
|
||||
resetDecoderStateOnRigSwitch();
|
||||
updateRigSubtitle(lastActiveRigId);
|
||||
updateRigIdentitySummary(lastActiveRigId);
|
||||
window.trxUi?.setActiveRig(lastActiveRigId);
|
||||
window.trx.modules.scheduler?.setRig(lastActiveRigId);
|
||||
window.trx.modules.backgroundDecode?.setRig(lastActiveRigId);
|
||||
@@ -4026,7 +4033,6 @@ async function switchRigFromSelect(selectEl: HTMLSelectElement) {
|
||||
} catch (err) {
|
||||
console.error("select_rig failed:", err);
|
||||
selectEl.value = prevRig || "";
|
||||
updateRigIdentitySummary(prevRig);
|
||||
window.trxUi?.notify("Rig could not be switched", { kind: "error" });
|
||||
} finally {
|
||||
rigSwitchInProgress = false;
|
||||
@@ -4594,6 +4600,12 @@ function navigateToTab(name: TabName, options: { updateHistory?: boolean; replac
|
||||
_activeTab = name;
|
||||
document.querySelectorAll(".tab-bar .tab").forEach((t) => t.classList.remove("active"));
|
||||
btn.classList.add("active");
|
||||
// A destination the strip hides is reached through Tools, so mark that
|
||||
// button instead — otherwise the strip looks identical on all four of them.
|
||||
// Derived from what is actually hidden rather than from a second copy of the
|
||||
// grouping, which would drift from the one ui-core installs.
|
||||
const toolsBtn = document.getElementById("mobile-more-btn");
|
||||
if (toolsBtn) toolsBtn.classList.toggle("active", getComputedStyle(btn).display === "none");
|
||||
window.trxUi?.syncSelectedTab(document.querySelector(".tab-bar-nav"), btn);
|
||||
document.querySelectorAll<HTMLElement>(".tab-panel").forEach((p) => p.style.display = "none");
|
||||
const panel = document.getElementById(`tab-${name}`);
|
||||
@@ -4822,6 +4834,7 @@ Object.defineProperties(trxState, {
|
||||
lastRigDisplayNames: { get() { return lastRigDisplayNames; } },
|
||||
initialMapZoom: { get() { return initialMapZoom; } },
|
||||
decodeHistoryRetentionMin: { get() { return decodeHistoryRetentionMin; } },
|
||||
authEnabled: { get() { return authEnabled; } },
|
||||
authRole: { get() { return authRole; } },
|
||||
decoderRegistry: { get() { return decoderRegistry; } },
|
||||
sseSessionId: { get() { return sseSessionId; } },
|
||||
@@ -4838,7 +4851,10 @@ Object.defineProperties(trxState, {
|
||||
aisVesselUrlBase: { get() { return aisVesselUrlBase; } },
|
||||
serverRigs: { get() { return serverRigs; } },
|
||||
serverActiveRigId: { get() { return serverActiveRigId; } },
|
||||
lastModeName: { get() { return lastModeName; } },
|
||||
lastModeName: { get() { return lastModeName; }, set(v: string) { lastModeName = v; } },
|
||||
jogUnit: { get() { return jogUnit; } },
|
||||
rxActive: { get() { return rxActive; } },
|
||||
audioChannelOverride: { get() { return _audioChannelOverride; }, set(v: string | null) { _audioChannelOverride = v; } },
|
||||
lastSpectrumData: { get() { return lastSpectrumData; } },
|
||||
lastSpectrumRenderData: { get() { return lastSpectrumRenderData; } },
|
||||
currentBandwidthHz: { get() { return currentBandwidthHz; }, set(v: number) { currentBandwidthHz = v; window.currentBandwidthHz = v; } },
|
||||
@@ -4855,6 +4871,11 @@ const trxCore = Object.freeze({
|
||||
saveSetting, loadSetting, showHint, escapeMapHtml, formatFreq, formatFreqForHumans,
|
||||
formatWavelength, formatBwLabel, formatUptime, formatSigStrength, formatSignal,
|
||||
postPath, scheduleUiFrameJob, navigateToTab, rigBadgeColor,
|
||||
setRigFrequency, applyLocalTunedFrequency, armOptimisticFrequency,
|
||||
syncBandwidthInput, scheduleSpectrumDraw, onDecoderRegistryReady,
|
||||
formatFreqForStep, refreshFreqDisplay, setJogDivisor, mwDefaultsForMode,
|
||||
resetRdsDisplay, positionRdsPsOverlay, updateWfmControls,
|
||||
updateSdrSquelchControlVisibility, startRxAudio, stopRxAudio,
|
||||
latLonToMaidenhead, locatorToLatLon, haversineKm, formatDistanceKm,
|
||||
formatTimeAgo, bookmarkDistanceText, buildBookmarkTooltipText,
|
||||
nearestBookmarkForHz, currentDecodeHistoryRetentionMs,
|
||||
@@ -5475,8 +5496,9 @@ function extractAudioFrameChannels(frame: AudioData) {
|
||||
return out;
|
||||
}
|
||||
|
||||
// Optional channel_id injected by vchan.js when connecting to a virtual channel.
|
||||
const _audioChannelOverride: string | null = null;
|
||||
// Optional channel_id set by the vchan feature when a virtual channel is
|
||||
// active, so RX audio subscribes to that channel instead of the primary one.
|
||||
let _audioChannelOverride: string | null = null;
|
||||
|
||||
/** Schedule decoded PCM channels for playback via Web Audio API. */
|
||||
function scheduleDecodedAudio(channelData: Float32Array[], frameCount: number, sampleRate: number) {
|
||||
|
||||
@@ -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";
|
||||
@@ -27,22 +29,15 @@ interface AisChannelInfo { label: string; badgeClass: string; freqText: string }
|
||||
interface AisBridge {
|
||||
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 +171,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`;
|
||||
@@ -405,7 +400,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);
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
@@ -18,26 +20,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 +81,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`;
|
||||
@@ -354,7 +348,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);
|
||||
|
||||
+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,44 @@ 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();
|
||||
}
|
||||
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 +500,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 +529,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 +544,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 +579,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 +688,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 +716,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,6 +2,8 @@
|
||||
//
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import { hostCore, hostState } from "./host.js";
|
||||
|
||||
import {
|
||||
aprsAgeText,
|
||||
aprsCategoryLabel,
|
||||
@@ -19,21 +21,13 @@ 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('"', """);
|
||||
const escapeHfAprsHtml = (input: string): string => hostCore.escapeMapHtml(input);
|
||||
|
||||
// --- HF APRS Decoder Plugin (server-side decode, 300 baud) ---
|
||||
const hfAprsStatus = document.getElementById("hf-aprs-status");
|
||||
@@ -72,8 +66,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`;
|
||||
@@ -214,10 +208,10 @@ function renderHfAprsRow(pkt: AprsPacket, isFresh: boolean): HTMLElement {
|
||||
const clipboard = Reflect.get(navigator, "clipboard") as Clipboard | undefined;
|
||||
if (clipboard) {
|
||||
await clipboard.writeText(raw);
|
||||
hfAprsWindow.showHint?.("Coordinates copied", 1200);
|
||||
hostCore.showHint("Coordinates copied", 1200);
|
||||
}
|
||||
} catch {
|
||||
hfAprsWindow.showHint?.("Copy failed", 1500);
|
||||
hostCore.showHint("Copy failed", 1500);
|
||||
}
|
||||
})(); });
|
||||
}
|
||||
@@ -289,7 +283,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 +292,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,72 @@
|
||||
// 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;
|
||||
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;
|
||||
@@ -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.
|
||||
@@ -432,21 +407,21 @@ function vchanSyncModeDisplay() {
|
||||
}
|
||||
// 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 +434,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 +455,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 +539,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 +571,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 +588,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");
|
||||
@@ -337,7 +335,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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -300,6 +322,125 @@ function elementById<T extends HTMLElement>(id: string): T {
|
||||
}
|
||||
}
|
||||
|
||||
// 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(); });
|
||||
|
||||
// Measured against the bar, not the actions container: the actions are
|
||||
// sized by their content, so their own scrollWidth never exceeds their
|
||||
// clientWidth. A viewport-width threshold is not enough either — how much
|
||||
// fits depends on the rig name and the translated labels, so a bar that is
|
||||
// wide enough on one rig clips a control on another.
|
||||
// `bar.scrollWidth > bar.clientWidth` is true even when nothing is clipped,
|
||||
// so it cannot be the test. What actually matters is that the controls stay
|
||||
// inside the bar and the page tabs are not squeezed into a scroller: seeing
|
||||
// every tab beats keeping the style picker inline.
|
||||
// Compare natural widths against the space available. Rendered widths
|
||||
// cannot answer this: the nav has min-width 0 and scrolls, so it always
|
||||
// shrinks to the leftover space and always reports "scrolling", while the
|
||||
// bar reports overflow even when nothing is clipped. scrollWidth on a
|
||||
// scroll container is its unconstrained content width, which is what a fit
|
||||
// test needs.
|
||||
const barFits = () => {
|
||||
const bar = actions.closest<HTMLElement>(".tab-bar");
|
||||
if (!bar) return true;
|
||||
const identity = bar.querySelector<HTMLElement>(".header-main");
|
||||
const nav = bar.querySelector<HTMLElement>(".tab-bar-nav");
|
||||
const gutters = 48;
|
||||
const needed = (identity?.offsetWidth ?? 0) + (nav?.scrollWidth ?? 0) + actions.scrollWidth + gutters;
|
||||
return needed <= bar.clientWidth;
|
||||
};
|
||||
const reflowOverflow = () => {
|
||||
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);
|
||||
}
|
||||
wrap.hidden = menu.children.length === 0;
|
||||
if (wrap.hidden) closeMenu();
|
||||
};
|
||||
reflowOverflow();
|
||||
window.addEventListener("resize", reflowOverflow);
|
||||
}
|
||||
|
||||
function installMobileMore() {
|
||||
const nav = document.querySelector(".tab-bar-nav");
|
||||
if (!nav || document.getElementById("mobile-more-btn")) return;
|
||||
@@ -307,7 +448,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 +481,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 +549,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);
|
||||
|
||||
|
||||
@@ -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,48 @@ 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 };
|
||||
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; },
|
||||
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 +78,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 +97,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, "");
|
||||
});
|
||||
|
||||
@@ -9,6 +9,9 @@ import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { chromium } from "playwright-core";
|
||||
|
||||
// page.evaluate callbacks run in the browser, not in this Node process.
|
||||
/* global document */
|
||||
|
||||
const frontendDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
|
||||
const webDir = path.resolve(frontendDir, "../assets/web");
|
||||
const generatedDir = path.join(webDir, "generated");
|
||||
@@ -184,7 +187,10 @@ try {
|
||||
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,6 +198,55 @@ try {
|
||||
await page.locator("#tab-main").waitFor({ state: "visible" });
|
||||
assert.equal(new URL(page.url()).pathname, "/");
|
||||
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");
|
||||
|
||||
} finally {
|
||||
await browser.close();
|
||||
await new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve()));
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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,66 @@
|
||||
// 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"),
|
||||
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)}`);
|
||||
});
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user