Compare commits

...
81 Commits
Author SHA1 Message Date
rouggy 7be6f64596 chore: release v0.25.8 2026-08-17 13:18:32 +02:00
rouggy 0bab7f05b9 feat(relays): accept a self-signed certificate on a generic HTTP board
HTTPS to a relay board could not work. Nearly every board that offers it signs
its own certificate — there is no authority anywhere that could have signed it —
so the request failed verification before it left.

A checkbox, per board, off by default. Not a blanket switch, because the other
HTTPS case is real and opposite: a board reached from outside through a proxy
with a genuine certificate, where verification is the only thing standing
between an antenna switch and the internet. Same setting, two boards, different
answers.

Off by default is only safe if the failure explains itself, so a certificate
error now names the box to tick. Go's own "x509: certificate signed by unknown
authority" is accurate and tells an operator nothing about what to do next.

Shown only once an https:// URL is actually in the board's configuration. A
board on plain HTTP has no certificate to argue about, and an option that cannot
matter yet is one more thing to wonder about.

The flag joins the driver cache key: ticking it has to rebuild the driver, or
the cached one would go on refusing the certificate with the verifying client it
already holds.

The boards that take a bare host — WebSwitch, KMTronic — keep verification. An
https:// typed there is the proxy case by construction, since they default to
plain HTTP on the LAN.

Three tests against a real self-signed TLS server: accepted with the box,
refused with a message naming it without the box, and one board's setting not
leaking into another's.
2026-08-17 10:57:29 +02:00
rouggy dc898ce2af fix(amps): combined amplifiers are commanded together, power level included
Two faults in the combiner coupling, both reported from the operating position.

THE POWER LEVEL WAS NEVER COUPLED. ON, OFF and OPERATE fanned out to the group;
L/M/H did not — it was simply the command nobody had linked. Two combined
amplifiers left at different power levels feed the combiner unevenly, which is
the thing the coupling exists to prevent.

THE COMMANDS DID NOT LEAVE TOGETHER. The second amplifier was commanded only
once the first had answered, and an SPE answers over its own link in its own
time. The combiner heard power appear on one input before the other and beeped
about it, on every OFF and every ON.

Each target now gets a goroutine, all parked on one channel until every one is
ready; closing it releases them together. That is the difference between "start
one, then start the other" and "both leave at once" — they have separate clients
and separate connections, so nothing downstream re-serialises them.

It matters most on the power level, which is not one command at all: an SPE has
no "set level", so the driver taps the POWER key and waits for the amp to report
the new one before tapping again — up to three taps, up to two seconds each. One
after the other, the pair would sit at different levels for six seconds.

A single amplifier still runs inline: no goroutine, no barrier, nothing new to
go wrong for the operators who have one amp. The one that was clicked stays
first, because its failure is the one worth reporting.
2026-08-17 10:42:19 +02:00
rouggy e5c9ca1a7d fix(rotator): the compass shows the heading it already knows
Opening Station Control left the compass blank for a second or two while the
amplifiers, relay boards and power supply filled at once.

Nothing was slow. The status bar keeps the shared heading loop running, so when
the compass mounts there is already a tick pending — up to the full three-second
idle interval away — and the new subscriber simply waited out the rest of it.
The heading was known the whole time and had nowhere to be read from.

The last heading is now kept and handed to whoever subscribes next. That matters
more on the Alpha SPID this was reported on than it would elsewhere: every poll
is an open, a read at 600 baud and a close, so even fetching immediately on
mount would not have been immediate.

In a microtask, so a subscriber is never called back before subscribeRotorHeading
has returned to it.
2026-08-17 10:32:06 +02:00
rouggy 21a0d560de feat(awards): a reference's number can be corrected in the editor
The one field the editor would not let you touch, and the one that was wrong on
WAJA. Every other property of a reference — its name, pattern, entity list,
validity window — was editable; the code was rendered readOnly, so correcting a
number meant deleting all 47 references and importing a new list, throwing away
anything the operator had adjusted in it.

A rename in the store, not a delete plus an insert: everything the reference
carries travels with it, which is the whole point of correcting a number rather
than replacing an entry. A number already in use is refused — REPLACE INTO would
have let one reference silently swallow another, discovered much later as a
prefecture quietly missing from the list.

The typed code is held apart from the selection. The list and every field patch
key off the selected code, so editing it in place made the editor lose the
reference mid-edit.

SaveAwardReference now recomputes the log like Delete and Replace already did. A
reference's name is what the award column SHOWS for awards displaying by name,
and its pattern is part of what matches at all — so editing one changes rows,
and the grid was left showing the old label until something else happened to
trigger a pass.

Changelog: the three TCI-sharing lines are merged into one. The server and the
two fixes made to it while building are one unreleased feature, and an operator
only ever meets the finished thing. The TCI-client PTT line stays separate — it
is OpsLog driving a SunSDR, the other direction entirely.
2026-08-17 10:26:13 +02:00
rouggy 2941121f4b fix(awards): WAJA was numbered by the Japanese state, not by the JARL
The catalog carried Japan's civil prefecture code (JIS X 0401) — 01 Hokkaido,
02 Aomori, 03 Iwate, 04 Miyagi — where the award uses the JARL's own numbering.
The two agree on the first three prefectures and then part company on 35 of the
remaining 44: Tokyo is 10 to the JARL and 13 to the government, Niigata 08
against 15, Toyama 28 against 16.

The names were right throughout, which is why nothing looked wrong: the award
matches on the prefecture NAME in the QTH, so it counted exactly the right
contacts. Only the number against each one was wrong — and that number is what
an operator writes on a JARL claim.

Renumbered by name from the official JARL list, so everything else each entry
carried travels with it. That includes the Tokyo spelling pattern, which had to
move from 13 to 10; left where it was it would have been matching QTHs for
Saitama.

Two digits throughout, as the JARL prints them. Not cosmetic: the codes are
strings, so "1" sorts between "09" and "10" and the reference list appeared in
an order no published list uses.

Version 2 on the definition, so this actually reaches people. An operator who
has not edited WAJA gets it at startup; one who has is offered it, since their
work outranks ours. Nobody has to re-import by hand.

Reported with the official JARL chart alongside the exported award.
2026-08-17 10:17:28 +02:00
rouggy 6c75ff345b fix(tci server): split armed on the frequency asked for, in either order
Audit prompted by "are we sure the commands are implemented — split, Fake It,
Split rig?". The rigctl server is complete and hardened; the TCI one, three days
old, had reintroduced a bug rigctld had already paid for.

A client working split says two things — where to transmit, and that split is
on — and nothing obliges it to say them in that order. A write to channel B
while the rig was still simplex was DISCARDED, on the sound principle that
preparing a transmit frequency is not a request to QSY. But then the split was
armed on whatever the transmit VFO held, which is the receive frequency: the
operator transmits straight onto the DX while their software shows exactly what
they asked for. The frequency is now remembered and used when the split arrives,
which is what rigctld does with set_split_vfo / set_split_freq.

Two more from the same source:

Asking for a split state the rig is already in touches nothing. A client in Fake
It uses no split but still says so to be sure, and answering an error to a
request that was already true is what made JTDX abandon a transmission a second
into the frame through the rigctl server.

A repeated PTT command is not re-sent. One client restated it sixteen times a
second, and the Flex's own "xmit 1" was overwritten between two of them inside a
millisecond. The same radio sits behind this server — the operator reporting
this is on the Flex API backend.

Fake It itself needs nothing but channel A, and now has a test saying so.
2026-08-17 10:00:57 +02:00
rouggy d5e25244ee fix(tci server): announce transmit permission, and log what the client sends
MSHV's PTT test does nothing against the TCI sharing server.

The initialisation block never carried TX_ENABLE. The document files it under
unidirectional control rather than initialisation, so it was missed when the
block was written from §4.1 — but its own note says it is "sent to the client
when connected", and that is the point: a client that models transmit
permission starts out assuming it may NOT transmit. Without it MSHV never even
tries, so nothing arrives to relay and there is nothing to see at either end.

Sent as true always. OpsLog is not what decides — the radio behind whichever
backend is connected does, and its refusal already travels back through SetPTT
into the log.

TX_FREQUENCY goes with it, at connect and whenever the transmit frequency
moves. It is the command a client showing "TX 14.200" reads; channel B alone
left that stale.

And every command a client sends is now logged. This is the only evidence there
will ever be about a program on someone else's machine: "the PTT test does
nothing" cannot be answered without knowing whether MSHV sent trx at all, and
in what form. Cheap — TCI is event-driven, a client speaks when the operator
does something — and capped at 200 lines per connection so one that does poll
cannot quietly fill the log.

If this was not the cause, the next report answers it in one line rather than
another round of guessing.
2026-08-17 09:39:02 +02:00
rouggy 4095455e66 fix(tci): a refused PTT is reported instead of vanishing
"PTT via CAT does nothing on TCI." What OpsLog sends is right — trx:0,true; is
the documented command and the same one the reference clients send — so the
command was going out and the radio was discarding it.

ExpertSDR announces transmit permission with TX_ENABLE: on connect, and again
whenever the band changes, "in case transmitter permission was changed" (§4.3).
While it is false the radio simply IGNORES trx. OpsLog never read that command,
so there was nothing in the log, nothing on screen, and a dead key.

Now the permission is tracked and SetPTT refuses out loud, naming where to look:
the frequency must be inside a transmit band and TX enabled in ExpertSDR. The
refusal travels the path that already exists — Manager.SetPTT to pttKey, which
logs it and hands it to the UI.

Silence is not a "no". A radio that never mentions TX_ENABLE — an older
ExpertSDR, or another program speaking TCI — is not treated as refusing: we key
and let it decide. Permission is also forgotten on connect, so a refusal
remembered from a band since left cannot block PTT until a restart.

This may not be the operator's own cause, and that is the other half of the
change: if it is not, the log now settles it in one line. cat: TCI: → trx:0,true;
present means the command left OpsLog and the radio ignored it for a reason it
has not told us; absent means the fault is on this side.
2026-08-17 09:30:36 +02:00
rouggy 3f95763ca6 feat(lookup): a cache TTL of 0 switches the cache off
Wanted for the case where the answers are moving: an operator correcting their
own QRZ record, or chasing a DXpedition whose page changes during the operation,
otherwise waits out thirty days before OpsLog will ask again. Clearing the cache
by hand works once; this is the setting for a whole session.

Nothing is read from it and nothing is written to it — rows stored while it is
off would only sit there going stale, waiting for the day it comes back on.
Switching off is NOT clearing: what it already holds stays, and the Clear cache
button remains the way to throw that away.

Two distinctions the code now has to keep, both load-bearing:

An EXPLICIT stored zero is off; an ABSENT key is the thirty-day default. Every
operator who has never opened this setting has nothing stored, and reading that
blank as a zero would silently switch the cache off for all of them.

The CONSTRUCTOR's zero is still the default, not off. At startup the settings
have not been read yet, and beginning with no cache would hammer the provider
for the first seconds of every launch. Only SetTTL, called once the operator's
settings are known, can switch it off.

A negative lifetime is meaningless and is ignored rather than rounded into
either meaning.

The input had to change too: it derived its value from the stored number on
every keystroke, so the box could not be emptied — and 0 was unreachable
outright, since parseInt('0') || 30 is 30.
2026-08-17 09:21:12 +02:00
rouggy 72ec3cbb97 feat(cat): share the rig over TCI as well as Hamlib — one or the other
internal/rigctld exists because Windows gives a COM port to ONE process: the
moment OpsLog talks to the radio natively, nothing else can. It answers the
programs that speak Hamlib NET rigctl. This answers the ones built around Expert
Electronics' TCI instead — and it answers them whatever radio is connected,
because it sits on the same backend-agnostic Rig interface. An operator with an
Icom or a Yaesu can now hand a TCI-only program a working rig.

One server or the other, never both. They answer the same questions about the
same radio, nothing speaks both, and a second listener is only a second thing to
go wrong.

Written against the official TCI Protocol document (ExpertSDR3/TCI, 12 January
2024, MIT — downloaded and read, not recalled): the initialisation set of §4.1
in its documented order, and the argument order of every command from §4.2. A
client will not proceed past connect without that block, which is why it is
written out in full rather than stubbed.

The one dangerous detail is the VFO mapping. TCI's channel A is where you
LISTEN and channel B where you transmit — the opposite way round from OpsLog's
RigState, which follows ADIF. Getting that backwards would put a station on the
DX's own frequency, so it is pinned in both directions by a test, and RxFreq was
added to the adapter rather than inferred.

Writing channel B while the rig is simplex is ignored: the client asked to
prepare a split transmit frequency, not to QSY, and a logger doing that on every
spot click would drag the operator off the station they were listening to. A
backend that cannot split still refuses out loud.

Only changes are pushed. TCI clients redraw on each command, so re-sending an
unchanged frequency four times a second makes a VFO readout flicker and fights
the operator's own tuning.

Nine tests, no socket needed — the protocol is the decision, not the transport.
2026-08-17 02:35:21 +02:00
rouggy a8bca8c316 feat(awards): an entity that IS one island group fills its own IOTA reference
QRZ carries <iota> only for the operators who filled it in, and most have not.
But for 99 entities the reference follows from the entity alone — a station in
Ascension is on AF-003 whatever its callbook record says — and the entity is
known for every callsign from cty.dat, with no callbook at all.

So this reaches the operator with no QRZ subscription and the station that has
never touched a callbook, and it lands before the contact is logged, which is
when a reference is worth having.

Filled ONLY when the callbook gave nothing: an operator who typed a reference
knows something a table cannot — an IOTA-heavy entity, a rare island being
activated — and that still wins, as does one picked by hand on the entry.

The table is the IOTA programme's own dxcc_matches_one_iota.json, which lists
exactly the entities that map to ONE reference. France is not among them: a
French station is usually on the mainland and on no island, and guessing would
put a reference on hundreds of contacts that earn none.

Held as a table rather than a download — 3.5 kB that changes when an entity
appears, so fetching it daily would buy nothing and would fail exactly where a
portable station usually is. The header says where it came from and how to
refresh it.

Follows 747c2b9 and eab11db, which read the callbook's own tag.
2026-08-17 02:26:52 +02:00
rouggy 8b75166dbe chore: open 0.25.8
Version constants stay at 0.25.7 — the release script bumps them.
2026-08-17 02:20:56 +02:00
rouggy d9e03d9de3 chore: release v0.25.7 2026-08-17 02:19:36 +02:00
rouggy 491546c7f4 fix(tci): one marker per callsign on the panorama, not one per spotter
Spot mirroring drew the same station two or three times, a few hertz apart.

Not a loop in the spot pipeline — one cluster line produces exactly one
SendSpot. It is that a popular DX station IS spotted two or three times, by
different operators inside the same minute, and no two of them agree on the
frequency to better than a few tens of hertz. This backend assumed ExpertSDR
replaced a spot bearing a callsign it already held, and said so in a comment;
it keys on the frequency too, so each of those became its own marker and stayed.

The FlexRadio backend has always done this properly (spot remove before spot
add, "one live spot per call"). TCI now does the same: the frequency drawn for
each call is remembered, a re-spot within 500 Hz sends nothing at all, and one
further away deletes the old marker before drawing the new one — so a station
that really moves still moves, instead of collecting markers.

SPOT_DELETE was not in the protocol document this backend was written from.
Confirmed before use against ars-ka0s/eesdr-tci, an independent TCI library that
lists SPOT with 5 arguments, SPOT_DELETE with 1 and SPOT_CLEAR with 0 — the
other two matching exactly what already works here, which is what makes the
third trustworthy.

The memory is cleared where Connect sends spot_clear. Left standing, it would
suppress the next spot for every remembered call as "already drawn" onto a
panorama the radio had just emptied — spots would quietly stop appearing after
a reconnect until each station changed frequency.

Five tests on the decision, which is split out from SendSpot so it can be
checked without a radio.
2026-08-17 01:57:11 +02:00
rouggy 91b21a4a36 feat(sync): the folder loop, the hooks and the panel — it can be switched on now
The three layers underneath were already there and unreachable: the change-log
format (7d664bd), the identity column (724e68b) and the no-backfill decision
(c48294b). This is the wiring that gives the operator a switch.

Settings, all profile-scoped, because each profile can point at its own logbook:
the folder, this PC's name, the machine id minted once from it, the per-peer read
offsets and the tie-break counter. Scoping the machine id is what keeps two
profiles sharing one folder from writing two logbooks into one file.

Three hooks. Add and update publish asynchronously, down with the rest of the
after-the-fact work — a folder on a network share can block for seconds and a
contact belongs on screen long before another machine hears about it. Deletion
publishes SYNCHRONOUSLY and BEFORE the row goes, for the same reason
deleteRemoteCopies does: once it is gone its identity is gone with it and the
tombstone names nothing.

The apply path uses the repository directly and never AddQSO/UpdateQSO/DeleteQSO
— those publish, and a change applied here would be written straight back out,
two machines echoing each other for ever.

Saving writes a probe file to the chosen folder rather than asking whether it
exists. A read-only cloud folder, or a share whose credentials expired, exists
perfectly well and would swallow every contact in silence; if the probe fails the
switch goes back off instead of sitting on while nothing is written.

The panel is mostly status, and deliberately: every part of this runs on another
machine and on a sync client OpsLog cannot see, so "it is not working" has to be
answerable from the settings page — which PCs are in the folder, when each last
logged, what is waiting unread.

Four tests on the apply path, the middle two being the ones that matter: an edit
made on the other PC lands on the copy already here, matched on the contact
itself, instead of becoming a second row — that is what makes the no-backfill
decision safe — and a contact with the same station on another band stays a
separate contact.
2026-08-17 01:34:00 +02:00
rouggy eab11db766 fix(awards): the callbook island only reached stations already in the log
withIOTARef was applied inside fillFromLastQso, the backfill that runs when the
provider came up short. That function returns early when there is no previous
contact with the callsign — so the island reference appeared for stations
already worked and never for the new one calling from the island, which is the
entire point of reading QRZ's <iota>.

Moved to the provider result in runLookup, where the rest of the callbook fields
are applied. The precedence is unchanged: a reference the operator typed or
picked still wins over the callbook.

Reported on F5IRH, Le Palais, Belle-Île-en-Mer — EU-048 in the QRZ record, and
nothing on the IOTA award.

No changelog line: the feature has not shipped yet, so the entry already in the
0.25.7 block now describes what it does.
2026-08-17 01:14:30 +02:00
rouggy 0c64bdcaf9 ui(settings): Open folder and Reset to default sit right, and the backup hint goes
The four buttons on the left change WHICH settings database is in use; the two
on the right act on the file already there. Splitting them by that line makes
the row read as two groups instead of six equal choices, and it stops the pair
wrapping to a ragged second line under the others.

ml-auto rather than a second container, so they still wrap gracefully when the
panel is narrow.

Also removed: "OpsLog can copy the SQLite database to a folder of your choice
when you close it, once per day. Rotation keeps the last N copies…" — everyone
knows what a backup is, and the controls underneath say the same thing in their
own labels. Gone from both dictionaries, and the bilingual test passes.
2026-08-17 01:01:26 +02:00
rouggy f0d7a07ed6 docs(settings): drop four explanatory paragraphs
Text only — every feature stays exactly as it was.

  gen.mwDesc     what a Most Wanted rank is
  bk.hintMysql   what the on-close backup does with a MySQL logbook
  db.profileHint that the logbook follows the active profile
  db.mysqlHint   that several OpsLogs on one MySQL see each other live

They explained things an operator already knows, in a settings panel that has
plenty to read as it is. The backup header keeps its ordinary hint; only the
longer MySQL variant goes.

Each removed from BOTH dictionaries: a string left in one and dropped from the
other shows the bare key in the other language, which is what
TestEveryStringIsInBothLanguages exists to catch — and it passes.
2026-08-17 00:55:24 +02:00
rouggy 2aceb99948 fix(lookup): a cached callsign kept its missing IOTA for thirty days
Reported with the evidence side by side: a QRZ record plainly carrying
<iota>EU-048</iota>, and no IOTA on the entry.

Adding a field to the lookup cache leaves every row already in it without that
field — and the cache lasts thirty days. So the change worked perfectly for a
callsign never looked up before, and did nothing at all for one already cached,
which is every callsign an operator actually works.

A row written before the column existed has NULL there, and is now treated as
stale: one refetch per such callsign, the next time it is used.

NULL and "" had to be made to mean different things for that. Put no longer
passes the reference through nullable(), so an operator with NO island stores an
empty string — otherwise every ordinary callsign would look unwritten and
refetch for ever, turning a cache into a tax on every lookup. Both halves are
tested.

Same trap for web and zip, added the same way in 0026 and never noticed.
2026-08-17 00:48:49 +02:00
rouggy c48294b0ca refactor(sync): no mass backfill — identities are stamped on what is touched
Correcting an over-design of my own. I had contacts given an identity in bulk
the first time synchronisation was switched on, and a full dedupe-key map of the
logbook rebuilt on every pass, both sized for 123 000 contacts.

Neither is needed, because the change log starts EMPTY. Contacts logged before
synchronisation was switched on are never in anyone's log and so are never
exchanged; an identity is stamped only on a contact that is actually logged,
edited or deleted from then on. Seeding a second machine with the existing
history is a one-time copy of the database or an ADIF import — not something
synchronisation should be doing, and not something it can do from a file that
starts empty.

One case survives, and it is why the dedupe key stays. Two machines can already
hold the SAME old contact, the second seeded by that copy or import, with
different row ids and no identity on either. The day one of them edits it, it
stamps an identity and sends a change naming it; the other has never seen that
identity and would insert a duplicate. Matching on the contact itself —
callsign, minute, band, mode, the importer's own key — recognises it.

So that became a targeted lookup through idx_qso_callsign, run only when an
identity is unknown, instead of a whole-table map rebuilt each pass. Rare work,
priced as rare work.
2026-08-17 00:42:59 +02:00
rouggy 747c2b9105 feat(lookup): read QRZ's island reference and fill the IOTA award
QRZ's XML carries <iota>EU-048</iota> for an operator on an island, and OpsLog
read past it. Wired end to end: the provider, the lookup cache (a column, like
web and zip before it), and the entry's award references.

It matters more here than the same field would for another award. There is no
live "who is on an island right now" feed anywhere — POTA has one and that is
what OpsLog matches spots against; SOTA has one behind conditions; IOTA
publishes only static lists. So the callbook record is the practical source, and
it is known BEFORE the contact is logged, which is when a reference is useful.

The reference goes in as an IOTA award reference, exactly as one picked by hand,
so the existing path carries it to the qso.iota column on save.

Two limits, both deliberate. A reference the operator typed or picked WINS: a
callbook entry can be years out of date, and the operator in front of the radio
has just been told where the station is. And the value must look like an IOTA
reference — two letters, a hyphen, three digits — because writing anything else
into the award makes a reference no list contains, which counts for nothing and
has to be found by hand later.
2026-08-16 23:22:37 +02:00
rouggy 724e68b38d feat(sync): a stable identity per contact, indexed
Two PCs exchanging changes through a folder must be able to name the SAME
contact in both logs. "the QSO with M0ABC at 14:32" is a guess and the two
machines can disagree about which row that is, so an edit or a deletion cannot
be addressed at all without an identity that travels with the record.

A real indexed column, not a key inside extras_json: the identity is resolved
once per incoming change, and scanning JSON for it would turn every sync into a
full read of a 120 000-QSO logbook. A column costs one migration; the JSON would
cost a scan every time. That was the decision to confirm, and it is confirmed.

It follows the award_refs pattern — read in selectCols, absent from columnList,
written only through its own methods. So an ordinary edit cannot clobber it,
which matters: another machine addresses the contact by that id, and losing it
makes the same QSO arrive again as a new one. Pinned by a test that saves an
edit with the field deliberately blanked.

Existing contacts are stamped in batches inside one transaction rather than one
commit each — on a remote MySQL the round trip dominates, and 120 000 commits is
the difference between a minute and an afternoon. And a dedupe-key map lets two
machines that already hold the same imported log recognise each other's contacts
instead of copying 120 000 of them across.

MySQL nearly lost its logbook to this. It cannot index a TEXT column without a
prefix length: the migration would fail with error 1170 and fail again on every
startup, with no way out from the interface. The translator only emits VARCHAR
for names listed by hand in varcharColumns. sync_uid is now listed — and a test
reads the migrations, works out which indexed columns are TEXT, and fails if the
list does not cover them, so the next one cannot reach a shared logbook.
2026-08-16 23:16:52 +02:00
rouggy 7d664bd1de feat(sync): the change-log core for one operator on several PCs
The shape we agreed: each PC keeps its own local SQLite and they exchange
CHANGES through a folder the operator already has — Seafile, OneDrive, a NAS, a
USB stick. Not the database file: SQLite over SMB or NFS corrupts, and in WAL
mode the shared-memory index has no meaning across machines at all.

The rule that makes a shared folder safe is one writer per file, append only.
Each machine writes only its own <machine>.ndjson and never touches another's,
so a sync client that replicates whole files can never merge two writers into
one — there are never two. That is the exact opposite of putting the database
there, and it is why it works.

This is the half internal/offlineq deliberately refuses to be: its own doc says
"no mirror, no pull, no merge, no tombstones". All four are here.

Four decisions worth naming, each with a test:

Tombstones. A delete is a record. Without one, a QSO removed on the laptop comes
back on the next sync from the shack PC, for ever — and a contact logged again
after a deletion has to come back, which the ordering also has to allow.

Determinism. Last writer wins, ordered on (time, the writer's own counter, the
writer's id) — not on time alone. Two PCs' clocks are never equal, so a bare
timestamp is not even a total order: two machines merging the same pair in
different orders could reach different answers and disagree for ever. Skew still
decides WHICH edit wins and nothing can fix that; what this guarantees is that
every machine agrees on the winner.

Resumption. Readers resume at a byte offset, so a 40 000-contact file is read
once and thereafter only its tail — and the offset advances only past COMPLETE
lines, because a folder sync catches a file mid-upload sooner or later. A file
that SHRANK was replaced rather than appended to, and is re-read from the start.

Survivability. One unreadable line costs one record. A record stamped with a
FUTURE format version is skipped, never guessed at.

Core only: no UI and nothing wired to the logbook yet, so nothing is
user-visible and there is no changelog entry. Next is the sync_uid column, the
add/update/delete hooks and the settings panel.
2026-08-16 21:44:14 +02:00
rouggy 93732ee563 fix(entity): show the QSO's own entity, and date the ClubLog exception
Two faults behind one screenshot: 3Y0K, recorded in the log as Bouvet Island,
showing the Antarctica matrix.

SELECTING A QSO now shows what that QSO records. The panel asked WorkedBefore
with no DXCC hint, and a hint of zero makes the backend resolve the entity from
cty.dat and the ClubLog exceptions AS THEY ARE TODAY — right for a live contact,
wrong for one being looked at in the log. The repo's own "infer from past QSOs"
path never ran, because the hint was no longer zero by the time it got there.
Hence Antarctica, and "5 QSOs with this entity" against "11 with this call":
two different entities, one of them nobody had asked about. The selected row's
dxcc now travels with it and is passed as the hint.

Browsing the log shows what the log says, even where the log is wrong.
Correcting an entity stays a deliberate act — right-click, Update from ClubLog.

BACK-ENTERING A QSO now resolves the exception at the CONTACT'S date. An
exception carries a validity window and a DXpedition's window closes: 3Y0K typed
months later, with the activation's own date in the form, was resolved against
today, matched nothing, and fell back to cty.dat. Both callers pass the date
they already hold — the entry strip's, and in the editor the record's own.

The date is trusted to move the resolution BACKWARDS only. A half-typed
"2026-0" must not send the lookup to the year 20, and a mistyped future date
must not resolve against a window that has not opened; both fall back to now.
Midday rather than midnight, because a window given in whole days is inclusive
of its end date and 00:00 sits exactly on the boundary.
2026-08-16 21:34:15 +02:00
rouggy 5293bb18c5 fix(i18n): seventeen strings had drifted into English only
Reported from a photograph of a French screen: "Spot lifetime" and "Chase new
grids" still in English in the DX Cluster settings. Diffing the two dictionaries
turned up fifteen more — including the ENTIRE update panel, which is why an
operator who reads French had nothing in French to react to when a new version
appeared.

All seventeen translated. Both dictionaries now hold 2685 keys with no
difference either way.

Every user-visible string ships in both languages: that was a rule, and until
now only a rule. A test parses the two dictionary literals and compares their
keys, so the next one is caught by `go test` instead of by an operator
photographing their own screen. Verified it fails when a key is removed.

A key missing from one side is not a blank — it falls back to the key itself,
so the interface reads "clu.spotTtl" where a label belongs, or keeps the English
text, which looks deliberate and is not.
2026-08-16 18:25:26 +02:00
rouggy 14ac73028e fix(worked-before): a prefixed call is one operator, not a whole country
Reported from a screenshot: working ZA/OE8NDR, the worked-before list showed
ZA/IZ2DPX and ZA/IW2JOP beside him and the header counted all four as contacts
"with this call".

callMatch folded portable forms together by taking the part before the slash.
That is right when the slash carries a suffix — RK3DWA/3, RK3DWA/P are one
person — and exactly wrong when it carries a prefix: ZA/OE8NDR became the
station "ZA", and the predicate `callsign LIKE 'ZA/%'` then selected every other
visitor to Albania.

The operator's own call is now picked out properly: drop the known qualifiers
(P, M, MM, AM, QRP, a bare call-area digit) and of what remains take the longest
part — a country prefix is short by nature, ZA, F, KH6, VP2E, and a callsign is
not. The predicate matches the prefixed forms too, so ZA/OE8NDR and a plain
OE8NDR still find each other, which is the whole point of the fold.

A base under three characters falls back to an exact match: a malformed entry
must not produce a LIKE that selects half the logbook.
2026-08-16 18:08:28 +02:00
rouggy b5a88ee5a2 fix(awards): hide Missing refs where it cannot mean anything
"In this award's scope but with no reference" needs a scope to be in. On a
worldwide reference award — POTA, SOTA, IOTA, WWFF — every contact anywhere
would qualify, so the backend returns nothing and the window says it found
nothing. The button was there regardless, and could only ever open that.

It now appears only for an award scoped to a DXCC entity, which is what the
help text underneath used to have to explain. Better than what I did first,
which was to make a useless screen fast.

Kept from that: the assign dropdown is searched rather than scrolled above 300
references, and the reference list is not fetched until there are rows to
assign it to. Both still bite on a scoped award with a long list — Russian
districts, the bigger European ones.
2026-08-16 18:04:34 +02:00
rouggy e81500f809 fix(awards): Missing refs froze the window on a big reference list
Reported as POTA: missing references, and it hangs.

The Missing-refs modal builds a dropdown of every reference the award has, one
menu item each. A POTA log with the park list imported holds tens of thousands
of them, and putting that many items in the DOM stops the window answering.
Russian districts and the bigger European lists are the same shape.

Two things, and the second is the sharper one.

The list is now searched rather than scrolled: above 300 references a filter box
appears beside the dropdown, and the menu renders at most that many, saying how
many it is holding back. Nobody scrolls to K-4521 — they type it.

And the modal no longer fetches the references at all until there is something
to assign them to. Missing-reference detection needs a DXCC scope, so a
worldwide award like POTA always has zero rows here and the modal says so — it
was loading every park behind that message, for a dropdown that could not be
used for anything. The freeze happened on a screen with nothing to offer.

Whether this is the freeze that was reported I cannot say from here; it is a
freeze on exactly that screen, for exactly that award.
2026-08-16 17:18:45 +02:00
rouggy 37805fe3ed perf(awards): build the logbook snapshot once, not once per caller
A field log showed three pulls of the same 123 615 QSOs inside ten seconds, the
Go heap going 725 MB → 2213 MB → 2539 MB. It is released after the idle TTL, so
not a leak — just the same work done three times with all three results alive at
once.

The cache lock was released before the logbook was read, so every caller that
arrived during a build missed the cache and started its own. Opening the Awards
panel does exactly that. One builder at a time now, with the usual re-check
after taking the lock: the second and third caller wait out the seconds they
were going to spend anyway, minus two round trips to the database.

The slice is also sized from the previous build. Growing to 123 000 structs by
doubling copies the whole thing a dozen times and holds the old and the new
array together at each step, on the largest object OpsLog keeps.

Also, the settings panel registry. The hook trap that broke the window when the
power-supply panel was opened was headed off by a comment, and the comment did
not survive contact with the next panel — so it is now structural. PanelHost is
a module-scope component that calls the selected panel and is keyed by section:
hooks inside a panel land in a component context that persists, section changes
remount it so each gets a fresh and consistent hook list, and no panel state
leaks into the next.

Rendering the panels as <Panel /> instead — the obvious refactor — would have
been wrong: they are nested inside SettingsModal and close over its state, so
each parent render makes a new component TYPE and React would unmount and
remount the panel on every keystroke.
2026-08-16 14:40:18 +02:00
rouggy 7578e49573 chore(changelog): open 0.25.7
v0.25.6 went out with its nine entries; the block is byte-identical to the
tagged one. The version constants are left alone — the release script is the one
source that bumps them, and touching them here would make its "release commit
already exists" check misfire.
2026-08-16 14:20:22 +02:00
rouggy 564d97b692 chore: release v0.25.6 2026-08-16 14:19:31 +02:00
rouggy 99599458ff docs(wiki): cover the recent work, with worked examples
Asked for the wiki to catch up, and to be explicit — examples rather than
descriptions. New page and six rewritten sections.

Recent QSOs and Filters, the page named in the request: the right-click menu is
now a table of what every entry does, and the filter builder has five worked
multi-criteria filters written out field by field, each ending in what you then
do with the result. Including the distinction that prompted it — "export
selected" takes the highlighted rows, "export filtered view" takes every QSO the
filter matched, and after building a filter it is the second one you want. Plus
the traps: ADIF date format, and "is empty" not being "equals N".

Connections (new): the page for a settings section that had none. What OpsLog
listens to and sends, which outbound row another logger actually wants — a
logger asking for "WSJT-X UDP" discards a bare ADIF record — the custom-message
triggers with their placeholder lists, three worked examples, and the port-clash
warning that produced this week's CAT-drop report.

Amplifiers and Switches: the generic HTTP relay in full — per-relay URLs, the
pattern form, {relay}, {relay-1} and {value} with what each one sends — relay
automatic control with a four-relay antenna-switch example, and the bench power
supply including why OpsLog writes only its output.

Rotators: the two new native types (SPID with the Rot1Prog/Rot2Prog choice,
DCU-1), two-rotor setups, and that Test only reads the heading on the types
where it does.

Awards: the US county database, and the difference between the automatic fill
(blanks only) and the right-click re-derive (replaces) — with the Connecticut
planning regions, which is the case that needs it.

QSL Management: QSL_VIA against QSL_SENT_VIA/QSL_RCVD_VIA, why an import shows E
on every Log4OM record, and that V counts as confirmed.

Troubleshooting: the three field reports of the last few days, by symptom.

Every [[link]] checked to resolve.
2026-08-16 14:07:38 +02:00
rouggy 191e92ad62 perf(rotator): one adaptive heading poll for every controller type
Asked whether the faster poll applies to all the rotator backends. It does —
GetRotatorHeading is one binding over PstRotator, Rotator Genius, GS-232/ARCO,
DCU-1 and SPID alike, and it reads only the ACTIVE rotor, so two towers do not
double it. But counting what that costs turned up two things worth fixing.

Every backend builds a fresh client per call — spid.New, gs232.NewSerial,
dcu1.NewSerial, rotgenius.New — so one poll is one OPEN and CLOSE of a serial
port or a TCP connection, not a read on a link already up. And the status bar
and the Station Control compass each ran their own interval against that same
binding, so with the tab open the controller was asked twice over. At the 700 ms
I had just set, that was nearly three port opens a second on a 600-baud line.

Both now share one loop, and it adapts: 500 ms while the position is changing,
3 s once it has been still for six seconds. These controllers do not report
"moving" — a SPID answers a position and nothing else — so it is inferred from
the position itself, and held briefly after the last change so the tail of a
movement stays smooth. Commanding a move, a stop, or switching rotor polls at
once, so the needle starts sweeping on the click.

A slow controller cannot stack requests behind itself either: at 600 baud a SPID
reply takes a fifth of a second on the wire alone, and a port still open from
the last poll cannot be opened again.
2026-08-16 13:39:23 +02:00
rouggy f405e71d7d fix(spid): a Rot1Prog takes three digits, so every target went the wrong way
Field report from a tower: on a RAK/RAU in Rot1Prog, every commanded heading
made the antenna want to turn nearly a full circle ANTICLOCKWISE — 0°, 90°, any
of them — while the heading readout, the stop button and everything else worked.

BuildSet framed the four-digit Rot2Prog azimuth for both dialects. A Rot1Prog
reads three: its replies are three digits in a five-byte frame, and its command
field matches. So 90° went out as "0450" and was read as 045 — 45 − 360 = −315°.
Every target landed 360° low, which is why it was always anticlockwise and
always nearly a full turn. The operator's own guess, that OpsLog was in 720°
mode, was the right instinct in the wrong place: the fault is a decimal shift,
not a range.

The round-trip test added here is the one that would have caught it without a
tower — every degree of the circle through the command builder and back through
the reply parser, which must return the degree that went in. The frame tests
pinned the Rot2Prog form against the reference and said nothing about the other
dialect.

Two more from the same report. A rotator test that only READS the heading — SPID,
ARCO, DCU-1 — said "Packet sent, the antenna should swing to north, check
PstRotator's UDP listener", naming a program not in the path for a move never
commanded; it now says the controller answered and nothing was moved. And the
compass polled every three seconds, so a turning antenna moved the needle in
steps of about thirteen degrees; the heading now has its own 700 ms tick while
the relay boards and the antenna controller stay at three seconds.
2026-08-16 13:31:00 +02:00
rouggy 0924062ced fix(settings): the power-supply panel crashed the window when opened
It held a useState and a useEffect of its own, and the panels in that registry
are called as plain functions — PANELS[x]() — not rendered as elements. So its
hooks landed in SettingsModal's own hook list, and only while that section was
open: React counted more hooks than the render before and stopped drawing the
whole window (error #310).

The file says so three lines above the entry I added, on the two panels that DO
carry hooks and are therefore wrapped in JSX. Reading it would have been quicker
than the screenshot.

No hook here now. The COM ports come from the list SettingsModal already loads
when it opens, for the Winkeyer panel — one machine, one set of serial ports,
fetched once instead of twice.
2026-08-16 13:18:47 +02:00
rouggy 8683a450a7 feat(psu): switch a Modbus RTU bench supply from OpsLog
The manufacturer's document arrived, so this is no longer guesswork: 9600 8N1,
function codes 03 and 06 only, and a register map with the output on/off at
0x0001, the measurements at 0x0010…0x0013 and the set points at 0x0030/0x0031.

ONE REGISTER IS WRITTEN — 0x0001, the output. The map also exposes the voltage
and current set points and the three protection trip levels as writable, and
none of them belong to a logbook: a wrong value there is 30 V where a radio
expected 13.8, or a trip level lifted on a supply feeding an amplifier. They are
read and displayed instead, next to the measured values, which is also how an
operator sees at a glance that the supply is on and the radio is drawing nothing.

The wire layer is tested where it can be. CRC-16/MODBUS is pinned against its
published check value — the CRC of "123456789" is 0x4B37 — which fixes the
polynomial, the initial value, the reflection and the absence of a final xor all
at once; the rest of the protocol is checked frame by frame against the manual,
including the byte order of the CRC, an exception reply told apart from a broken
line, and a reply from another slave on the bus refused. The write echo must
match the value sent: it is the only confirmation the output really switched,
and accepting the frame without it is how a radio ends up dark behind a green
light.

Framing follows the manual's own rules: 3.5 character times of silence between
frames (4 ms at 9600), and a frame is over when the line falls quiet — Modbus
RTU has no terminator, and a serial read that times out returns (0, nil) here,
so the reader is built on a deadline and a quiet-time rather than on an error
that never comes.

Untested against hardware — nobody here has the supply.
2026-08-16 13:15:55 +02:00
rouggy 9f8e3c73d9 fix(udp): OpsLog was re-tuning its own rig from its own broadcasts
Reported as JTDX "Fake It" causing CAT disconnections. Fake It is not the
cause — it is what made an existing loop fire, and a regression of mine from
this morning is what closed that loop.

The station has an inbound remote-call row and an outbound N1MM RadioInfo row
on the same port, 2241, so every RadioInfo datagram OpsLog sends arrives
straight back on the loopback. The remote-call parser strips XML tags and takes
the last token as the callsign: for a RadioInfo that is
<ActiveRadioNr>1</ActiveRadioNr>, i.e. "1" — and <Freq> became a tune request
for the frequency the rig was already on.

That was harmless only while <Freq> was misread. It is in tens of Hz, the parser
assumed MHz, every echoed tune failed "out of the 11-digit CAT range", and the
loop died on the error. Teaching it the unit (331db58) closed the loop.

Fake It shifts the dial for each over rather than using split, so every
transmission changed the state twice — and each change published a RadioInfo,
which came back as a set, which changed the state again. The log shows the dial
oscillating 24915000/24915500 three times in 200 ms, then "timeout answering
IF;" and the shared link down. Every over, all morning.

Two guards, because one was not enough to be sure: a RadioInfo payload is never
a remote-call request, and a callsign has a letter in it — so the next program
to broadcast its state on that port cannot drive the rig either. Reload also
names an inbound and an outbound row sharing a port, which is the arrangement
that permitted this and which no settings panel shows.
2026-08-16 12:25:41 +02:00
rouggy 423cf1f998 feat(relays): follow the entry Band selector when there is no CAT link
Relay automatic control and the band-change outbound rows both hang off the rig
state, which is right when there IS a rig: changing Band in the entry strip
pushes a QSY, the new state comes back through the CAT callback, and the relays
follow from there — which is why this works for anyone with rig control.

Without a CAT connection nothing is pushed and nothing comes back, so a station
whose rig OpsLog does not control changed band and the antenna switch sat
exactly where it was. Reported as automatic control not working; it was never
told the band had changed.

The entry selector now says so itself, but only when the CAT push did not
happen, and never when the band or frequency lock is on: a lock means the entry
is deliberately decoupled from the rig, and moving an antenna to match a contact
logged from last year is worse than doing nothing.

The frequency is passed as unknown on that path — a band selector gives a band
and nothing else, and rules written on a frequency RANGE are left alone rather
than evaluated against a made-up dial reading.

The de-duplication of "is this a new band" is now shared by both sources, so a
station that has both does not command its switch twice for one QSY.

Also: the same credit line as the QSL e-mail now closes the default recording
e-mail body, on the same terms — a default in the template, so a stored one is
untouched.
2026-08-16 11:15:56 +02:00
rouggy c0dc1bfcc4 feat(qsl): credit line at the foot of the default QSL e-mail
"Designed & sent by OpsLog — https://github.com/GregTroar/OpsLog/releases/latest"
now closes the default body, so a fresh install sends it without being asked.

Put in the TEMPLATE, not appended at send time. Two consequences, both of them
the point: an operator who does not want it deletes the line once and it is
gone, and one who has already written their own body never sees it appear —
a stored template is returned verbatim and the default is only the fallback.
Appending it at send would have made it unremovable, which is not a thing to do
to somebody's outgoing mail.

The link is the human release page. updateCheckURL sits next to it in update.go
and answers JSON, which is the easy mistake here — a correspondent who clicks
the credit gets a download page, and a test says so.
2026-08-16 11:07:06 +02:00
rouggy 46d6531cf5 fix(qso list): the grid followed the upload, not the log
Reported as delayed auto-upload breaking Recent QSOs. It does not — the grid was
waiting on the upload for its news.

Nothing reloaded the list on qso:logged. The entry form calls refresh() itself
after AddQSO, so a QSO TYPED in OpsLog always appeared; a QSO logged from
anywhere else — WSJT-X or MSHV over UDP, JTAlert, NET Control, an offline replay
— reached the grid only when something else reloaded it, and the something else
was extsvc:uploaded. With auto-upload set to immediate that arrives a second
later and hides the gap completely.

Set a service to delayed and the QSO appeared one to two minutes late; set it to
upload on close and not until the next launch. So the very thing deferring an
upload exists for — correcting a contact before it goes out — was impossible,
because there was nothing on screen to correct.

The list now follows the log, on the same debounced path the upload events
already use: qso:logged fires twice per contact (insert, then award refs) and a
contest run fires it every few seconds.
2026-08-16 10:48:38 +02:00
rouggy 3ed2d957e5 feat(counties): right-click to re-derive a US county from the ULS database
The automatic pass fills a blank county only, and deliberately: a value the
operator or QRZ supplied usually beats one derived from a ZIP code. That leaves
no way at all to correct a county already stored — and the Connecticut planning
regions are exactly that case. Every CT contact logged before that correction
holds a county the state abolished in 2022, and filling blanks never reaches
one of them.

So the new entry OVERWRITES, because it is asked for by hand on a chosen set of
rows precisely because the stored value is believed wrong. Only US entities are
touched, only callsigns the database holds, and only when the answer actually
differs — so re-running it on a mixed selection is safe and the count reported
is the number of counties that really changed. Award refs are re-materialised:
the county IS the reference for CQ USA-CA and the state for WAS.

The entry appears only once the database has been downloaded, and appears
without a restart when one finishes — an action that can only ever answer "no
database" is not worth a line in a menu this long.
2026-08-16 10:45:21 +02:00
rouggy 5770c40d89 test(adif): pin that an import invents no QSL routing
Reported as OpsLog defaulting QSL_SENT_VIA and QSL_RCVD_VIA to "E" on import.
It does not: recordToQSO reads the field and normalises it, so an absent, empty,
blank or unrecognised value gives an empty one. An "E" seen after an import came
from the file — Log4OM writes QSL_SENT_VIA:1>E on every record whether a card
was ever sent, which TestQSLSentViaDoesNotBecomeManager already pins.

Nothing to change, so this pins the half nothing covered: the ABSENCE case. The
opposite is an easy reach — electronic confirmation is the common case — and
defaulting to it would quietly rewrite the operator's own record of how their
cards travelled, which is the same class of fault as issue #16.

Compiles and vets clean; not executed here — this machine's Application Control
policy began blocking freshly built test binaries partway through the session.
2026-08-16 10:06:30 +02:00
rouggy 5e2c452753 chore(changelog): open 0.25.6
v0.25.5 went out with its seven entries; the block is byte-identical to the
tagged one. The version constants are left alone — the release script is the one
source that bumps them, and touching them here would make its "release commit
already exists" check misfire.
2026-08-16 10:01:14 +02:00
rouggy f3f966f5b7 chore: release v0.25.5 2026-08-16 01:04:54 +02:00
rouggy 38c838d232 chore(changelog): move today's work from the shipped 0.25.4 to 0.25.5
v0.25.4 was already released — tag v0.25.4 at 8113557, fourteen hours ago —
carrying exactly one entry, the WinKeyer probe. Everything since (cluster empty
state and timing, the generic HTTP relay, hardware following the profile, the
SteppIR read that never returned, the DXHunter tune unit) was written into that
block and would have been announced to operators as something they already have.

The 0.25.4 block is now byte-identical to the one that shipped, and the seven
later entries are under 0.25.5.
2026-08-16 00:46:15 +02:00
rouggy 7eb734d86f chore(changelog): open 0.25.5
0.25.4 is going out with eight entries. The version constants are left alone —
the release script is the one source that bumps them, and touching them here
would make its "release commit already exists" check misfire.
2026-08-16 00:35:30 +02:00
rouggy b49599150c fix(steppir): a silent controller wedged the driver for good
io.ReadFull cannot be used on a serial port, and it was.

On Windows a serial read that times out returns (0, nil) — on this transport a
timeout is not an error. io.ReadFull loops while err == nil, so a controller
that goes quiet for one poll, or answers with a truncated frame, spins it
forever. It holds ioMu throughout, and that is the whole failure the operator
sees:

  - the poll goroutine never returns, so nothing is ever logged about a fault
    and the cached status keeps the antenna looking connected;
  - every command blocks on the same mutex, and the trace line sat AFTER the
    lock, so even the attempt left no trace.

One dropped reply on a 4800-baud link therefore stopped the antenna responding
until OpsLog was restarted, with a log that showed the antenna starting, a few
status frames, and then nothing — which is exactly how it was reported.

Reads are now bounded: three seconds for an 11-byte frame that takes 23 ms on
the wire. Giving up returns an error, and the poll loop already knows what to do
with one — say so and reconnect. The command trace moved ahead of the lock, so
what the operator asked for is in the log even when the answer is not.

The SPE driver reads through a bufio.Reader, whose ErrNoProgress guard already
covers this; the ADIF parser reads a file. This was the only exposed one.
2026-08-16 00:33:32 +02:00
rouggy 331db58705 fix(antenna,udp): name the reason tracking is off; infer the remote-tune unit
The SteppIR report was not a SteppIR fault. In the log the antenna starts,
answers every poll, and sits at 21050 kHz while the rig works 21074 — and the
status line only prints when the frame CHANGES, so a link that is alive and
parked looks identical to one that died. The one line that explained it said
"ultrabeam: follow loop stopped", which covers two quite different situations
and, at startup where nothing was running, reads as a fault. Tracking was simply
switched off. It now says which of the two it is, names the antenna type, and
states the consequence — that the antenna will not follow the rig.

Same log, a second and unrelated fault: every launch failed a tune request from
DXHunter with "frequency 2107400000000 out of the 11-digit CAT range".
<FREQ> was read as MHz, but DXHunter had echoed back the value OpsLog itself
published in the N1MM RadioInfo broadcast, whose <Freq> is in tens of Hz. Both
units come from the same peer, so the unit is now inferred: try MHz, kHz, Hz,
tens of Hz, and keep the first that lands on an amateur band — anything a
station is asked to tune to is in one. Hz before tens of Hz because their only
overlap, 40 m against 4 m, is far more likely to be 40 m. Nothing plausible
tunes nothing and says so, rather than sending the rig to a wrong band.
2026-08-16 00:27:53 +02:00
rouggy 62e20de69c fix(profiles): station hardware must follow the active profile
Every setting is per profile, amplifiers included — that is the whole point of
one profile per station. But the amplifier clients were built once at startup
and again only when Settings was saved, so switching profile left them on the
previous profile's port. An operator with an SPE on COM9 for HF and another on
COM10 for 6 m had to open Settings and press Save after every switch. Save is
not a connect button; switching profile is what asks for that hardware.

The amplifier is what was reported, but it was never alone: the motorized
antenna, the Antenna Genius and the Tuner Genius are configured the same way and
were started in the same two places. All four now restart on a profile switch,
asynchronously, exactly as a save does.

Rotators were already correct — their client is built per command rather than
held open, so they read the active profile every time.

Unconditional, like a save: comparing each device's configuration across
profiles to skip a reconnect would trade a second of downtime for the chance of
missing one. A test now keeps the two lists in lockstep — anything started at
boot must be re-applied on a profile switch or be named, with its reason, as
something that must not be.
2026-08-16 00:18:11 +02:00
rouggy 480d24384b fix(relays): {value} is the relay's label, not a per-relay value
It was built the other way round on a misreading of two screenshots: the pattern
held {value} and the per-relay boxes held numbers to drop into it. The ask was
simpler and better — {value} is the name typed in Relay labels, so a switch
addressed by antenna name is one pattern instead of eight URLs:

  http://10.10.10.100/relay?on={value}   relay 1 named Ant1  →  ?on=Ant1

Renaming the antenna re-addresses it, and the name on the button and the name on
the wire cannot drift apart because they are the same string. It works in the
per-relay URLs and in the patterns alike, so the per-relay boxes go back to
holding URLs and nothing about them changes meaning any more.

The label is percent-encoded with %20 rather than "+" for a space: "+" is a
space only in a query string and a literal plus in a path, and this can land in
either half of a URL.

{value} on a relay with no label would send "?on=", an empty parameter that most
boards answer with a cheerful 200 and no movement. The driver refuses it and
names the label as what is missing; the editor warns while it is being typed,
beside the empty box rather than after an antenna fails to switch. The labels
also join the driver's cache key — they are part of the wire format now.
2026-08-16 00:09:18 +02:00
rouggy c2ff0f714a revert(cluster): keep the filter selections across restarts
They were made session-only on a misreading: the ask was about the FIRST launch
of a fresh install, not every launch. Restored as they were — restored on
reopen, and travelling with a copied data/ folder.

A first-ever launch already starts with nothing filtered: every selection
defaults to empty or off and there is no code that switches one on. The one
route by which a new installation can come up filtered is a copied data/ folder,
which carries the previous machine's selections by design.

The filtered-out message and the clear-every-filter button stay: they are what
makes a filter that IS set visible, whenever it was set.
2026-08-15 23:58:40 +02:00
rouggy fe2affc72f fix(relays): the generic HTTP board never sent its URLs; cluster filters start off
buildDeviceDriver had no case for "httpgen", so the generic board fell through
to the WebSwitch driver: it polled an address it had never been given, reported
itself offline, greyed out every relay button, and sent none of the configured
URLs. Nothing in the interface said so — the board was configured, saved and
listed, and simply did nothing. deviceKey did not cover the URLs either, so once
that is fixed, correcting a typo in one would still have handed back the cached
driver holding the old address until a restart.

Two shapes of home-made switch could not be described at all:

  - a bit-mask board whose four URLs differ by one character
    (/Set0/1, /Set0/2, /Set0/4, /Set0/8) — {value} in the pattern now takes the
    number from the per-relay box, keeping the address in one place;
  - a board numbering its channels from zero — {relay-1}, since giving up the
    pattern for eight hand-typed URLs was the only alternative.

The pattern decides what the per-relay boxes hold, and the grid says which as
soon as {value} is typed: guessing per box ("does this look like a URL?") would
change meaning on a typo, which is not a thing to do to something wired to an
antenna. A URL typed without a scheme gets http:// like the named boards get
from relayBase; https:// is passed through untouched.

Host and the connection test are gone for this type. It has no address of its
own — its relays may each live on a different box — and no status to read, so a
test could only ever answer "OK, 4 relays". Save was greyed out without a host,
which made a complete configuration of four full URLs impossible to store.

Cluster filters no longer persist across launches. A band lock set weeks earlier
is invisible to whoever set it: the counter reads 76 spots live, the grid is
empty, and the search goes to the cluster instead. Nobody loses work by
re-ticking a chip. Grouping and the panel state still persist — they change how
spots look, never whether they appear.
2026-08-15 23:53:32 +02:00
rouggy be0326c862 fix(cluster): stop saying "waiting for spots" when 76 have arrived
An operator sent two screenshots: 76 LIVE in the counter, and the panel beside
it reading "Waiting for spots… Spots will appear as the cluster sends them."
Both his band and mode were locked to the rig — 20 m, SSB — so the filters were
doing exactly their job and the empty state was describing a different problem
entirely. He went looking for a connection fault.

It now says how many arrived, names every filter currently narrowing the list,
and offers one button to clear them all. The band and mode locks are named
first: they follow the rig rather than a click, so they are the two nobody
remembers switching on.

Also times the connection. He reports the first launch taking a while to
produce spots and a restart connecting instantly, which is the signature of a
slow name resolution rather than a slow node — the OS caches the answer, so the
second run skips it. The log now carries the dial duration and the delay to the
first spot, which separates that from a node that simply had nothing to say.
Hypothesis, not conclusion: the next log settles it.
2026-08-15 23:35:56 +02:00
rouggy 8113557015 chore: release v0.25.4 2026-08-15 10:29:00 +02:00
rouggy 3def789742 fix(winkeyer): send the probe the way a working client sends it
Logger32's WinKeyer debug against the K3NG that will not answer OpsLog is a
capture of the exchange working, on the same keyer and the same port:

    Sent: 13 13 13 00 04 55
    Rcvd: 55            (72 ms)
    Sent: 00 02  Host open
    Rcvd: 23            (WK2 v23)

That is the sequence I already send. The difference is the grouping: Logger32
puts the three nulls and the echo probe in ONE write, and we split them with a
50 ms pause and a buffer purge in between. On a keyer that reboots when the
port opens, that pause is a window for it to come up mid-sequence and swallow
half of it — and there was nothing to wait for, since a null produces no reply.

The handshake bytes are now logged unconditionally, not behind the diagnostic
option. "No WinKeyer answered" cannot be told apart from a wrong port, a wrong
baud rate, a keyer still booting, or another program holding the line. The
bytes can, and it is four lines per connect attempt.
2026-08-15 10:28:11 +02:00
rouggy 92ea98bcfa chore(changelog): open 0.25.4
0.25.3 shipped with its two entries — the verified-confirmation fix and the
native SPID rotator — and they are two separate subjects, so there was nothing
to merge this time.

Version constants untouched: the release script owns them, and it already
bumped them to 0.25.3 in the commit before this one.
2026-08-15 10:18:17 +02:00
rouggy 15649a4e92 chore: release v0.25.3 2026-08-15 10:15:59 +02:00
rouggy a6842382b2 fix(qsl): show a verified confirmation as verified, not as "No"
Same bug as yesterday's, one screen further on. The QSL Info table maps the
statuses it knows — Y, R, I, M — and falls through to "No" for anything else.
ADIF's V is anything else. So a contact confirmed AND validated by LoTW was
reported as not received, in the one place an operator opens to check.

V now has its own label, Verified, in the green of a confirmation, and it is in
the dropdown too. That second half matters more than it looks: a select whose
value is not among its items renders blank, so a verified contact looked like
nothing had been recorded — and the operator's next click would have replaced
the strongest confirmation they hold with whatever they picked instead.

The QSL Manager's bulk list is deliberately left alone: it sets paper QSL
status across a selection and defaults to "leave", so it never displays a
stored value, and "verified" is not something a paper card can be.
2026-08-15 09:42:17 +02:00
rouggy 5bf7eb45d7 feat(rotator): native SPID / AlfaSpid, so PstRotator can go
An operator with a tower at each end and an AlfaSpid on both wanted OpsLog to
talk to them directly. Multiple rotors were already there; the missing half was
the protocol.

Rot2Prog and Rot1Prog, over the controller's own COM port. The byte layout is
in the package doc and pinned by table tests against Hamlib's spid.c, the
reference implementation — including the one trap this protocol has: digits go
out as ASCII and come back as raw bytes. Send raw and the controller ignores
you; read as ASCII and every heading is wrong by a constant nobody would
recognise as such.

Two things the UI has to get right because they cannot be detected: the dialect
(different reply length AND baud rate) and the baud list, which for a SPID is
600 or 1200 — offering the usual 4800-and-up would have left the controller
permanently mute. Both are handled: picking SPID sets serial transport, 600
baud and Rot2Prog, and the baud dropdown changes to the rates these use.

The connection test reads a status rather than moving anything, so a wrong
dialect shows up there as a reply of the wrong length instead of as an antenna
that behaves oddly an hour later.

Untested against real hardware — I have none. The frames are pinned; the
controller is the only thing that can confirm the rest.
2026-08-15 09:22:51 +02:00
rouggy 09f3ddaacb fix(confirmations): count a LoTW "V" everywhere, not only in the awards
An operator's screenshot had it side by side: the Awards panel showed Morocco
validated on five bands, and the band/mode matrix two inches above showed the
entity as merely worked.

ADIF's QSL_Rcvd enumeration has both Y and V — "received" and "verified" — and
V is what a LoTW download writes for a confirmation the ARRL has validated. The
award engine's isYes accepted "Y" or "V". Everything else in the app compared
against 'Y' alone: the worked-before status grid, the slot statistics, the row
colouring by QSL status, the awards QSO list, the call history badges. So the
confirmations an operator cares most about were the ones that did not count.

Now one definition per side, named so the next reader finds the other:
qso.ConfirmedValues on the Go side, used by the queries themselves, and
isQSLConfirmed in lib/qsl on the frontend, which rowColors and the panels call
instead of testing the letter.

The Go test drives the real query shape against a real database with a 'V' row
— the constant being right is not the point, the queries using it is.
2026-08-15 08:31:49 +02:00
rouggy ca8617c891 chore(changelog): open 0.25.3
0.25.2 is going out. The version constants are left alone — the release script
is the one source that bumps them, and touching them here would make its
"release commit already exists" check misfire.
2026-08-15 02:51:41 +02:00
rouggy e2c442552b chore: release v0.25.2 2026-08-15 02:50:48 +02:00
rouggy bb75c6f23f chore(changelog): one entry per subject in 0.25.2
Fourteen entries for ten subjects. "UDP" appeared four times and "Motorized
antenna" twice, which is one line per commit rather than one per thing an
operator notices.

The two new outbound services are now one Connections entry, everything that
was made loggable is another, and the antenna's two silences — a lost port and
a controller going its own way — read as the single symptom they produce.
2026-08-15 02:45:32 +02:00
rouggy 5c958572dc fix(relays): let the HTTP board's channel count be chosen
The selector offered 1, 2, 4, 8 and 16 and none of them took: the board stayed
at four relays.

The count is decided in three places — deviceRelayCount in Go, chanCount in the
Station Control panel, relayCountUI in Settings. The new type was added to the
first and the dropdown, and to neither of the others, so the panel resized the
labels from a helper that had never heard of it and fell straight through to
its fixed default. The Go side was right the whole time, which is why the
driver would have been built correctly for a count the operator could not set.

All three now know the type. A test pins the Go side against every count the
dropdown offers, and against the fixed boards, whose hardware decides and which
must keep ignoring the field.
2026-08-15 02:35:14 +02:00
rouggy 26b8dade20 feat(relays): generic HTTP relay board, and point band switching at it
An operator was about to build band→relay mapping into the custom URL rows.
It already exists, and better: relay auto-control has a per-relay "band" rule
driving webswitch, KMTronic, Dingtian, Denkovi and USB boards. It holds state
so a relay is only commanded when its wanted position changed, reads the
boards live before the first apply so it does not re-command one already in
place, and carries per-relay labels. A URL fired on a band change has none of
that, and would have been a second definition of "which antenna on which band"
— the drift that cost us a week on counties.

So the gap was only the hardware: a hand-made switch is none of the five named
types. It is now the sixth, "HTTP relay": an ON URL and an OFF URL, either as
one pattern with {relay} substituted, or one pair per relay. The per-relay
form is the reason it exists — these boxes often have URLs with nothing in
common between channels (…/FF0101 and …/FF0201), which no pattern can express.

Status is remembered rather than read: most have no endpoint worth trusting.
The cost is stated in the code and the panel — after a restart every relay is
re-commanded once, which is harmless on a board with no memory and far better
than assuming an antenna is already selected.

And the Connections panel now says so, exactly where the wrong choice is made:
picking a band change with a URL transport shows a note pointing at Station
Control. The URL transport stays — a lookup pushed to a webhook or a QSO to a
dashboard is an event, not a state, and Station Control has no place for it.
2026-08-15 02:23:03 +02:00
rouggy ffd6bcf54b fix(connections): log what was actually sent, and rename the section
Two answers to "can people debug this when it does not work".

They could not. A custom UDP row logged "sent 18 bytes to 127.0.0.1:12000"
and nothing about the message — which is a template the operator wrote, so
the byte count says nothing about whether the substitution came out as they
meant. The payload is now in the line, with the trigger that fired it, for
custom rows only: an ADIF record or a binary WSJT frame on every QSO would
bury the log rather than fill it.

Worse was the silent case. A template that is a single placeholder the trigger
does not carry — {freq} on a band change — renders empty, sends nothing, and
looked exactly like a row that had never fired. It now says so, throttled per
row, and points at the field list.

And a password in a URL is redacted before it reaches the file. Storing
http://admin:secret@switch/ as typed was a deliberate choice for LAN gear;
writing it into a log that gets sent to whoever is helping is a different
choice, and was never made.

The Settings section is "Connections" rather than "UDP integrations", since it
has not been UDP-only since the URL transport landed. The log prefix stays
"udp:" on purpose — renaming it would orphan every log an operator has already
sent and every note anyone has written against it.
2026-08-15 01:52:36 +02:00
rouggy 6c2c1f106a feat(udp): custom outbound messages — a trigger, a template, UDP or a URL
The hard-coded emitters each speak one published format at one fixed moment.
This is the escape hatch, and it exists mainly for antenna switches: they are
driven by a URL, and the band change is the trigger they want.

Four triggers, each carrying its own field set: band change (the RADIO's band,
not the entry form — a switch follows the rig, not what is being typed), QSO
logged, rotator command and callsign lookup. The panel prints the fields the
selected trigger can fill, which is the point of the whole thing: a placeholder
the trigger does not carry renders as nothing, and without the list an operator
writes {freq} on a band change and has no way to learn why the switch never
moved.

Three things the panel cannot show, handled here:

  - Escaping. A URL needs every value percent-encoded; a UDP payload must not
    be touched. The first portable callsign, F4BPO/P, puts a path separator in
    the middle of a query string otherwise — it works on the bench and fails on
    the air.
  - Blocking. An HTTP call to a switch that is unplugged would otherwise sit
    for the operating system's timeout, on the path of a band change. It runs
    in the background with a 3 s limit.
  - Silence. A switch answering 404 after a firmware update fails exactly like
    success looks from here, so the status code is logged, throttled per row.

The rotator trigger hooks the COMMAND rather than the SP/LP buttons, so the
compass and a spot click fire it too, and the path ("SP"/"LP") is passed
through because an azimuth alone cannot say which was taken — 137° is short
path to one station and long to another.

Credentials in a URL are stored as typed. That is the operator's call, on the
grounds that this is LAN gear, and the hint in the panel says so.
2026-08-15 01:39:16 +02:00
rouggy 03d5376d01 chore(udp): name the service for the protocol, not for one program
"WSJT-X logged QSO (Logger32)" reads as Logger32-only, and it is not: the row
speaks the WSJT-X UDP interface, which several loggers listen on. An operator
running something else would have scrolled past a service that would have
worked for them.

Logger32 stays in the hint as the example it is — it is what this was built
against, and its additional sockets are where most people will point it — and
port 2250 stays as the default, a starting point rather than a rule.
2026-08-15 01:18:44 +02:00
rouggy dc14990b44 fix(udp): send the structured QSO Logged too, not only the ADIF one
The ADIF datagram reached Logger32's socket and still nothing appeared in its
log. WSJT-X sends TWO messages for every contact — QSO Logged (type 5), the
structured one, and Logged ADIF (type 12) — and receivers differ on which they
read: MacLoggerDX takes the structured one by default and offers the ADIF as
an option. We were sending only the half Logger32 does not use.

Both now go out on that row, in WSJT-X's own order. Nothing double-logs: any
receiver built for WSJT-X already sees both from the real thing.

Type 5 is read positionally, so the field order is pinned by a test against
NetworkMessage.hpp — one field out of place shifts every one after it and the
receiver files nonsense without complaining. QDateTime is Qt's own encoding:
Julian day, milliseconds since midnight, then the time spec, which is sent as
UTC (1) because a spec of 0 would have the receiver re-read the contact in its
own zone. The Julian arithmetic is checked against known values; a day out
there files every QSO on the wrong date.
2026-08-15 00:55:24 +02:00
rouggy d95c998081 feat(udp): speak WSJT-X to Logger32, and lighten Sahara
"sent 1153 bytes to 127.0.0.1:2250" and nothing in Logger32. Both true: the
line the operator screenshotted is titled "Setup additional WSJT/JTDX UDP
sockets", and those receivers take UDP LOGGING PACKETS — the WSJT-X v2
protocol. A bare ADIF record posted to them is dropped without a word.

So there is a new outbound service rather than a change to the existing one:
"WSJT-X logged QSO (Logger32)" sends the same ADIF wrapped in a Logged ADIF
datagram (magic 0xadbccbda, schema 2, type 12), defaulting to port 2250. The
plain-text row stays for JTAlert/GridTracker-style receivers, because the two
really are different wire formats and one row cannot be both.

The id string is "OpsLog", not "WSJT-X": a receiver uses it to tell instances
apart, and impersonating the real thing would make a second WSJT-X
indistinguishable from us.

Tested both ways — the header byte for byte, and a round trip back through our
own ParseWSJT, since that is the same decoding every receiver applies.

Sahara moves to the parchment an operator asked for: page #e6ded0, panels
#f3eee2, toolbars #ded5c4, terracotta #c4501e on the buttons and the focus
ring. Lighter and less saturated than the deep sand it was.
2026-08-14 17:51:31 +02:00
rouggy c5c9d355ec fix(logging): name the antenna disagreement, and confirm an outbound send
Two silences from one operator's log.

The SteppIR is not blocked — it is being overruled. Every tune is commanded,
acknowledged on the next poll with the frequency asked for, then replaced on
the poll after by a different one: 21075 asked, 21075 confirmed, 21050
reported, again and again, with the operator tuning once more each time. Two
minutes of that reads as a dead link. It now says what it is, once, when the
motors have stopped and the reported frequency is more than 10 kHz from the
commanded one — a controller quantising to its own grid is not a fault, one
sitting somewhere else entirely is.

UDP outbound had no positive signal at all: only failures were logged. When
an operator sets up an ADIF message to a second logger and nothing arrives,
"OpsLog never sent it" and "the other program did not take it" looked exactly
the same from here — and the first is the common case, because a row created
as an inbound ADIF listener instead of an outbound ADIF message matches
nothing and emits nothing. Successful sends are logged with their destination
and service, and a QSO logged with no outbound row says so once a session.
2026-08-14 17:37:12 +02:00
rouggy 7470ebf47e feat(qsl): set the QSL route per direction from the QSL Manager
The paper form had one "Via", which since the QSL_VIA split writes
QSL_SENT_VIA. QSL_RCVD_VIA had no way in at all outside the per-QSO editor —
a field with a column, an import and an export, and nothing to fill it.

Each direction now has its own route dropdown, sitting with the status and
date it belongs to: how the card was sent, beside Sent; how it came back,
beside Received. Both apply to the whole selection, which is the shape of the
job — a stack confirmed in one go usually arrived the same way, a bureau
delivery being exactly that, and doing it one QSO at a time in the editor was
the only option before.

Both store the ADIF enumeration (B/D/E), and neither touches QSL_VIA — that
holds the manager's callsign and belongs to the QSO, not to a stack of cards
being confirmed together.

The two columns were already available in the paper list: it renders through
RecentQSOsGrid, which gained them with the field itself.
2026-08-14 16:32:12 +02:00
rouggy 2cd1274975 fix(logging): say why the antenna stopped and what the ADIF port is receiving
Two problems from one operator's log, both of them the log's fault.

SteppIR. The last line about it is "status query failed, reconnecting: Port
has been closed" and then nothing — for the rest of the session. The poll loop
does retry every two seconds, but a failed open was a bare `continue`: no line,
ever. And startUltrabeam had three silent ways out — settings unreadable, the
antenna turned off, no port or host configured — so a cleared field and a lost
adapter produced exactly the same evidence, which is none. Both now say what
happened, with the port or host named. Reopen failures are reported three
times and then throttled (a port that is gone stays gone), and the recovery
says how many attempts it took.

FLDIGI. Four hundred "ADIF payload ignored" lines and nothing else legible.
The cause is in the same log: two inbound listeners on the SAME multicast
group and port, 239.255.0.1:2237 — one WSJT (MSHV), one ADIF (FLDIGI). Every
WSJT-X packet is delivered to both, and an FT8 cycle is dozens of decodes
every fifteen seconds; the bursts in the log are exactly 15 s apart. The ADIF
listener now checks for the WSJT-X magic and says so once, with what to do
about it, instead of rejecting each packet in writing. Anything else is
described a few times with its payload and then goes quiet.
2026-08-14 16:24:06 +02:00
rouggy 61006d8155 fix(chase-new): the toolbar button was read once, too early
An operator waited over a minute and the button never appeared; opening
Settings and pressing Cancel made it appear at once. That is the whole
diagnosis — Cancel was the only thing that re-read the option.

GetChaseNew returned the cached atomic, which exists for the MQTT goroutine
and is false until startup has read the setting. The UI asked while the
database was still opening, was told "off", believed it, and never asked
again. It now reads the setting, like the grid-chasing binding beside it.

The frontend asks again at the two moments this class of race resolves: when
GetStartupStatus returns, and when the first logbook load succeeds — the seam
that already re-reads the connection label for exactly this reason, with a
comment saying so.

The open/closed state was already remembered per machine; it is now in
PORTABLE_KEYS with the other widget toggles, so it travels with data/ like the
rotor and amplifier panels rather than being the one that does not.
2026-08-14 15:50:40 +02:00
rouggy 94cba2592e feat(chase-new): drop the frequency column, the beacons and the bands you don't have
Three cuts, all of them removing things nobody could act on.

The frequency column is gone. Clicking the row tunes the rig to it, so the
number was there to be read and never used. It is still carried on the spot —
the click is what needs it — and it is in the row's tooltip. The country takes
the space.

Modes are limited to FT8, FT4, FT2, PSK31 and RTTY. WSPR is the one worth
spelling out: it is a beacon, nobody answers a WSPR transmission, so a "new
entity on WSPR" is a path report and not a station to work — and on a quiet
band it would have been most of the list.

Bands are limited to the operator's own list. PSK Reporter carries every band
its receivers listen on, and a 13 cm decode is not an opportunity for a station
with no 13 cm.

Both tests run before the status lookup and both read a cached map: they throw
away most of the feed, so nothing downstream pays for it. The band list is
re-read when the lists are saved, so ticking a band in Settings applies to the
next decode rather than the next restart — which would have looked like the
filter not working.
2026-08-14 15:41:37 +02:00
rouggy 9b1faada38 fix(chase-new): one badge, filters, a way in and a way out — and the frequency
Four things from an operator's first look at the panel, and one of them was
mine.

The frequency column showed "—" on every row. pskr.Spot.FreqHz was declared
and documented in one edit and never assigned in the next, so the payload's
"f" was parsed and dropped. A click therefore filled the callsign and left
the rig where it was, which is half the point of the panel. Assigned, with a
test that runs a real payload through and checks the value survives into the
Spot — the field being declared is what made it look done.

A row now carries ONE indication instead of stacking them. A station can be a
new band and a new prefix at once; the row says the first that matters, in the
order that would make an operator leave what they are doing: entity, band,
mode, slot, then prefix, then square. Two badges on one line made the list
unreadable at a glance, which is the only thing it is for.

Each category has a filter chip in the header, in its own colour, remembered
across sessions. A toolbar button shows the panel and a cross closes it — the
same split the Super Check Partial panel uses, where the setting decides
whether the feature exists and the button whether it is on screen.

The panel is wider and the country column gets what is left, which is more
than it was now that a row carries one badge.
2026-08-14 15:33:15 +02:00
rouggy e67f57fee7 fix(serial): list a COM port once, in the order a human reads it
An operator's keyer dropdown showed COM1 and COM3 twice, in the order
COM1 COM1 COM3 COM8 COM9 COM4 COM3, with "COM3COM3" as the selected value —
two entries sharing one value both counted as selected.

Not our bug to start with, but ours to absorb. Windows enumerates serial
ports from HARDWARE\DEVICEMAP\SERIALCOMM, which maps a DEVICE PATH to a COM
name, so the same name legitimately appears twice when two devices claim it:
a driver uninstalled without cleaning up after itself, or virtual-port
software. go.bug.st/serial returns one entry per device, faithfully.

Deduplicated and naturally sorted in the one binding every port dropdown in
the app calls, so CAT, rotators, amplifiers and the keyer all get it. COM4
now sits between COM3 and COM8 rather than after COM9, which is how a port
gets overlooked on a machine with a dozen.

A dropped duplicate is logged rather than swallowed: two devices holding one
COM name is also a good reason for one of them to report that port busy, and
that is not something an operator can work out from a list.
2026-08-14 15:25:45 +02:00
rouggy a9e3a159d9 feat(cluster): Chase New — a panel for what is new and audible here
PSK Reporter tells you what is actually being decoded in your region, which
is a larger set than what somebody chose to spot: nobody spots the FT8 caller
running ten watts from a rare square.

Almost all of it existed. The MQTT payload already carries frequency, mode,
transmitter and both grids; the watcher already drops any report collected
further than NearKm from the operator, which is exactly the question worth
asking — the station is being heard HERE, not in Japan; and with grid chasing
on the subscription is already every band, filtered at the broker by receiver
square, measured at 0.2 to 1.2 messages a second. This reads messages that
were arriving and being discarded.

"New" is not decided here. Every spot goes through ClusterSpotStatuses, the
same function the DX cluster grid uses and the same cached index, so the two
panels cannot drift apart the way the county columns did. Cost per message is
map lookups behind an option cached in an atomic, because the MQTT goroutine
must never wait on the settings store.

The option is its own, not nested under grid chasing: chasing squares and
chasing entities are different wants, and the feed now has three consumers,
any one of which brings it up and none of which cuts the others loose when it
goes down.

The panel says "digital modes only" in its footer. An empty list has to mean
"nothing new on FT8/FT4/JS8 near you", not "the band is dead" — it will never
show a new entity on CW.
2026-08-14 15:20:18 +02:00
rouggy 7c781bf793 fix(spot): spot the references worth chasing, not the derived ones
The comment came out "SSB WAC EU WAZ 15 WPX HA5" — the QSO's materialised
award_refs hold both kinds, and I took them all. Those four are what every
reader of the spot derives from the callsign in their head. They spent the
whole 30-character comment saying nothing and buried SOTA HA/KM-018, the one
reference anyone would have acted on.

Computed awards are now filtered out with the same rule the QSO editor uses
(isComputedAwardField), which is why they are the ones it lists on the left
and not in its read-only panel. The field map moves from a ref to state as
well: a ref left the first spot of a session computing before GetAwardDefs
had answered.

Also opens 0.25.2, since 0.25.1 shipped before the spot work, and sets the
default mode list to SSB, CW, FT8, FT4, FT2, RTTY, PSK31, FM. AM and
DIGITALVOICE stay in the catalogue but are no longer selected on a fresh
install. FT2 joins the digital family everywhere its siblings are listed —
report list, RST defaults, Flex power class — so it gets dB reports rather
than the 59 an unknown mode falls back to.
2026-08-14 13:31:17 +02:00
rouggy 4f9a366884 feat(spot): put the award references in the spot comment
After the mode, which is the order a cluster line is read in:
"CW POTA FR-11553".

Two sources, because the QSO can be at either stage. While it is being typed
the entry panel holds the references as "CODE@REF;CODE@REF"; once logged they
live on the row as the materialised award_refs. The Send Spot window takes the
entry's when there are any and falls back to the last logged QSO — the same
fallback the callsign and frequency defaults already use — and picking a QSO
from the Latest list fills in that QSO's own.

A self-spot is the opposite case and gets its own builder: it announces OUR
station, so it carries MY_POTA_REF and friends. Using the QSO's award
references there would spot us with the park number of the station we just
worked, announcing us from somewhere we are not.

Both cap at the 30 characters a cluster node keeps, and add a reference whole
or not at all — a truncated park number is worse than none, since nobody can
act on it, and it still costs everyone who reads the spot. Only the comment we
BUILD is held to that; what the operator types is their own business.
2026-08-14 13:22:21 +02:00
125 changed files with 12478 additions and 645 deletions
+76 -1
View File
@@ -1,6 +1,11 @@
package main
import "testing"
import (
"errors"
"sync"
"testing"
"time"
)
// The coupling is a SET, not a global switch.
//
@@ -61,3 +66,73 @@ func TestLinkedAmpsNeedsTwo(t *testing.T) {
}
}
}
// Two combined amplifiers must be commanded AT THE SAME TIME, not one after the
// other.
//
// Sequentially, the second was commanded only once the first had answered — and
// an SPE answers over its own link, in its own time. The combiner heard power
// appear on one input before the other and beeped about it, on every OFF and
// every ON. This is what an operator hears, so it is worth a test that would
// hear it too.
func TestLinkedAmpCommandsLeaveTogether(t *testing.T) {
a := &App{}
const slow = 150 * time.Millisecond
var mu sync.Mutex
starts := map[string]time.Time{}
err := a.ampFanOut([]string{"one", "two"}, func(id string) error {
mu.Lock()
starts[id] = time.Now()
mu.Unlock()
time.Sleep(slow) // an amplifier taking its time to answer
return nil
})
if err != nil {
t.Fatalf("fan-out: %v", err)
}
if len(starts) != 2 {
t.Fatalf("%d amplifiers were commanded, want both", len(starts))
}
// Both goroutines wait on one channel and are released by closing it, so the
// gap is scheduling noise. Sequential execution would put a full command
// between them.
gap := starts["one"].Sub(starts["two"])
if gap < 0 {
gap = -gap
}
if gap > slow/3 {
t.Errorf("the two amplifiers were commanded %v apart — the combiner hears that as one input arriving late", gap)
}
}
// The amplifier the operator clicked comes first, and its failure is the one
// reported: "the amp I pressed did not respond" beats the same message about
// its silent partner.
func TestLinkedAmpErrorNamesTheOneClicked(t *testing.T) {
a := &App{}
clicked := errors.New("the one clicked")
other := errors.New("the other one")
err := a.ampFanOut([]string{"clicked", "other"}, func(id string) error {
if id == "clicked" {
return clicked
}
return other
})
if !errors.Is(err, clicked) {
t.Errorf("fan-out reported %v, want the amplifier the operator pressed", err)
}
}
// One amplifier is the ordinary case and must not change: run inline, no
// goroutine, no barrier, and the error straight back.
func TestSingleAmpRunsInline(t *testing.T) {
a := &App{}
boom := errors.New("not running")
if err := a.ampFanOut([]string{"solo"}, func(string) error { return boom }); !errors.Is(err, boom) {
t.Errorf("a single amplifier reported %v, want the error itself", err)
}
if err := a.ampFanOut(nil, func(string) error { return boom }); err != nil {
t.Errorf("an empty group reported %v, want nothing to do", err)
}
}
+866 -102
View File
File diff suppressed because it is too large Load Diff
+128
View File
@@ -0,0 +1,128 @@
package main
import (
"fmt"
"strconv"
"strings"
"hamlog/internal/applog"
"hamlog/internal/psu"
)
// ── Bench power supply (Modbus RTU) ──────────────────────────────────────────
//
// A programmable supply feeding the shack, switched on and off from OpsLog so
// the station comes up and goes down with the logbook rather than by reaching
// behind the desk.
//
// OpsLog READS the supply's measurements and its set points, and WRITES exactly
// one thing: the output on/off. The register map has the voltage and current
// set points and the three protection trip levels as writable too, and none of
// them belong to a logbook — a wrong value there is 30 V where a radio expected
// 13.8. See internal/psu for the map and where it comes from.
const (
keyPSUEnabled = "psu.enabled"
keyPSUPort = "psu.com_port"
keyPSUBaud = "psu.baud"
keyPSUAddress = "psu.address" // Modbus slave address, 1…15 on this family
)
// PSUSettings is the JSON shape for the Hardware → Power supply panel.
type PSUSettings struct {
Enabled bool `json:"enabled"`
ComPort string `json:"com_port"`
Baud int `json:"baud"` // 9600 from the factory
Address int `json:"address"` // 1 from the factory
}
// GetPSUSettings returns the persisted supply config.
func (a *App) GetPSUSettings() (PSUSettings, error) {
out := PSUSettings{Baud: 9600, Address: 1}
if a.settings == nil {
return out, fmt.Errorf("db not initialized")
}
m, err := a.settings.GetMany(a.ctx, keyPSUEnabled, keyPSUPort, keyPSUBaud, keyPSUAddress)
if err != nil {
return out, err
}
out.Enabled = m[keyPSUEnabled] == "1"
out.ComPort = m[keyPSUPort]
if v, e := strconv.Atoi(m[keyPSUBaud]); e == nil && v > 0 {
out.Baud = v
}
if v, e := strconv.Atoi(m[keyPSUAddress]); e == nil && v >= 1 && v <= 250 {
out.Address = v
}
return out, nil
}
// SavePSUSettings persists the config and (re)starts or stops the client.
func (a *App) SavePSUSettings(s PSUSettings) error {
if a.settings == nil {
return fmt.Errorf("db not initialized")
}
if s.Baud <= 0 {
s.Baud = 9600
}
// The manual gives 1…15 for the address field and 1…250 for the address
// SETTING register. Clamped to the wider range and defaulted to 1: an
// address of 0 is the Modbus broadcast, which never answers, so accepting it
// would give a supply that is present and permanently "not responding".
if s.Address < 1 || s.Address > 250 {
s.Address = 1
}
for k, v := range map[string]string{
keyPSUEnabled: boolStr(s.Enabled),
keyPSUPort: strings.TrimSpace(s.ComPort),
keyPSUBaud: strconv.Itoa(s.Baud),
keyPSUAddress: strconv.Itoa(s.Address),
} {
if err := a.settings.Set(a.ctx, k, v); err != nil {
return err
}
}
a.restartAsync("psu", a.startPSU)
return nil
}
// startPSU stops any running client and starts a fresh one if the supply is
// enabled and has a port. Safe to call repeatedly (startup, settings save,
// profile switch).
func (a *App) startPSU() {
if a.psu != nil {
go a.psu.Stop()
a.psu = nil
}
s, err := a.GetPSUSettings()
if err != nil {
applog.Printf("psu: not started — settings unavailable: %v", err)
return
}
if !s.Enabled {
return
}
if strings.TrimSpace(s.ComPort) == "" {
applog.Printf("psu: not started — no serial port configured")
return
}
applog.Printf("psu: starting on %s @ %d baud, Modbus address %d", s.ComPort, s.Baud, s.Address)
a.psu = psu.New(psu.Config{ComPort: s.ComPort, Baud: s.Baud, Address: byte(s.Address)})
_ = a.psu.Start()
}
// GetPSUStatus returns the supply's last polled state for the UI.
func (a *App) GetPSUStatus() psu.Status {
if a.psu == nil {
return psu.Status{}
}
return a.psu.GetStatus()
}
// SetPSUOutput switches the supply's output. The only write OpsLog makes to it.
func (a *App) SetPSUOutput(on bool) error {
if a.psu == nil {
return fmt.Errorf("the power supply is not enabled in Settings")
}
return a.psu.SetOutput(on)
}
+12 -1
View File
@@ -45,9 +45,20 @@ const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
// qslCredit closes the default QSL e-mail: who made the card, and where the
// recipient can get the same program.
//
// A DEFAULT, not a signature. It lives in the body template like every other
// line, so an operator who does not want it deletes it once and it is gone —
// and one who has already written their own body never sees it appear, because
// a stored template is returned verbatim and the default is only the fallback.
// Appending it at send time instead would have made it unremovable, which is
// not a thing to do to someone's outgoing mail.
const qslCredit = "--\nDesigned & sent by OpsLog — " + releasesPageURL
const (
defaultQSLEmailSubject = "eQSL — {CALL} de {MYCALL}"
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}"
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}\n\n" + qslCredit
)
// qslDir is the root of all designer artifacts: templates/<id>/ and outbox/.
+84
View File
@@ -0,0 +1,84 @@
package main
import (
"sync"
"testing"
"time"
)
// The award snapshot must be built ONCE however many callers ask at once.
//
// The cache lock is released before the logbook is read, so every caller that
// arrives during a build used to miss the cache and start its own. Opening the
// Awards panel does exactly that: a field log showed three pulls of the same
// 123 615 QSOs inside ten seconds, and three copies alive together took the Go
// heap from 725 MB to 2.5 GB.
//
// This models the same shape — a cheap cache check, a slow build, a shared
// result — against the pattern awardSnapshot now uses, so the invariant is
// pinned without needing a logbook.
func TestSnapshotBuildsOncePerRevision(t *testing.T) {
var (
cacheMu sync.Mutex
buildMu sync.Mutex
cached []int
rev = "r1"
gotRev string
builds int
)
get := func() []int {
cacheMu.Lock()
if cached != nil && gotRev == rev {
defer cacheMu.Unlock()
return cached
}
cacheMu.Unlock()
buildMu.Lock()
defer buildMu.Unlock()
// Re-check: whoever held the build lock has just finished.
cacheMu.Lock()
if cached != nil && gotRev == rev {
defer cacheMu.Unlock()
return cached
}
cacheMu.Unlock()
time.Sleep(50 * time.Millisecond) // the logbook read
out := []int{1, 2, 3}
cacheMu.Lock()
builds++
cached, gotRev = out, rev
cacheMu.Unlock()
return out
}
var wg sync.WaitGroup
results := make([][]int, 8)
for i := range results {
wg.Add(1)
go func(i int) { defer wg.Done(); results[i] = get() }(i)
}
wg.Wait()
if builds != 1 {
t.Errorf("%d builds for one revision — each concurrent caller pulled the whole logbook again", builds)
}
for i, r := range results {
if len(r) != 3 {
t.Errorf("caller %d got %v", i, r)
}
}
// A new revision must rebuild: the guard is against duplicate work, not
// against a logbook that changed.
cacheMu.Lock()
rev = "r2"
cacheMu.Unlock()
get()
if builds != 2 {
t.Errorf("builds = %d after the revision moved, want 2 — a changed logbook must be re-read", builds)
}
}
+36
View File
@@ -0,0 +1,36 @@
package main
import "testing"
// A band change now has two sources: the rig, and the entry strip on a station
// whose rig OpsLog does not control. They share one memory of the last band, so
// a station that has both commands its antenna switch once per QSY rather than
// twice — the entry selector pushes a QSY, the rig reports the same band back,
// and only the first of the two is a change.
func TestBandChangeIsNotedOncePerBand(t *testing.T) {
lastTriggerBandMu.Lock()
lastTriggerBand = ""
lastTriggerBandMu.Unlock()
if b, changed := noteBandChange("20m"); !changed || b != "20m" {
t.Fatalf("first 20m = (%q,%v), want (\"20m\",true)", b, changed)
}
// The same band from the other source — the rig echoing the QSY back.
if _, changed := noteBandChange("20M"); changed {
t.Error("the rig echoing the band back counted as a second change — the switch would be commanded twice")
}
if _, changed := noteBandChange(" 20m "); changed {
t.Error("whitespace made the same band look new")
}
if b, changed := noteBandChange("40m"); !changed || b != "40m" {
t.Errorf("40m = (%q,%v), want (\"40m\",true)", b, changed)
}
// An unknown band must not be recorded, or the next real one would look
// unchanged against it.
if _, changed := noteBandChange(""); changed {
t.Error("an empty band was treated as a change")
}
if _, changed := noteBandChange("40m"); changed {
t.Error("the empty band overwrote the last one")
}
}
+16 -7
View File
@@ -138,7 +138,10 @@ func (a *App) startBandOpenFeed() {
a.clearBandOpenings()
}
chaseGrids := a.gridStore != nil
if !s.Enabled && !chaseGrids {
chaseNew := a.chaseNewEnabled()
// Three consumers, one feed. Any one of them is reason enough to bring it up,
// and turning one off must not cut the others loose.
if !s.Enabled && !chaseGrids && !chaseNew {
return
}
// Every spot is measured from the operator's position. Without one there is
@@ -149,10 +152,11 @@ func (a *App) startBandOpenFeed() {
return
}
// Grid chasing wants every band; the opening watch wants its four. "+" is the
// MQTT single-level wildcard, so one subscription per square covers the lot.
// Grid chasing and new-chasing want every band; the opening watch wants its
// four. "+" is the MQTT single-level wildcard, so one subscription per square
// covers the lot.
bands := s.Bands
if chaseGrids {
if chaseGrids || chaseNew {
bands = []string{"+"}
}
// Filter at the BROKER on the receiver's square rather than receiving the
@@ -168,8 +172,13 @@ func (a *App) startBandOpenFeed() {
onGrid = func(call, grid string) { a.rememberDecodeGrid(call, grid, gridcache.SourceMQTT) }
}
var onSpot func(pskr.Spot)
if s.Enabled {
switch {
case s.Enabled && chaseNew:
onSpot = func(sp pskr.Spot) { a.feedBandOpen(sp); a.feedChaseNew(sp) }
case s.Enabled:
onSpot = a.feedBandOpen
case chaseNew:
onSpot = a.feedChaseNew
}
a.pskr = pskr.New(pskr.Config{
@@ -195,8 +204,8 @@ func (a *App) startBandOpenFeed() {
applog.Printf("pskr: feed did not start: %v", err)
return
}
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v)",
bands, len(rxGrids), s.Enabled, chaseGrids)
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v, chase-new=%v)",
bands, len(rxGrids), s.Enabled, chaseGrids, chaseNew)
}
// feedBandOpen hands one PSK Reporter decode to the detector.
+160
View File
@@ -1,4 +1,164 @@
[
{
"version": "0.25.8",
"date": "",
"en": [
"An entity that is a single island group now fills the IOTA reference on its own — no callbook subscription needed.",
"CAT sharing can now speak TCI instead of Hamlib, split included, so a TCI-only program reaches whatever radio you are on.",
"Lookup cache: a TTL of 0 switches it off, so a callbook record you are correcting is re-read every time.",
"TCI radios: when the rig forbids transmitting, PTT says so instead of doing nothing silently.",
"WAJA carried Japans civil prefecture numbers instead of the JARLs: 35 of the 47 references are renumbered.",
"Award references can be renumbered in the editor — the number was the one field it would not let you correct.",
"The compass fills the moment Station Control opens, instead of waiting out the rest of a polling interval.",
"Combined amplifiers: the power level (L/M/H) is coupled too, and both amps are commanded at once so the combiner stops beeping.",
"Generic HTTP relay: an https:// board can be accepted with its own self-signed certificate, per board.",
"Club Log: the on-close upload now goes out as one batch — sending hundreds of contacts one at a time got operators blocked.",
"eQSL: uploads go out in batches of 100 too, and QRZ.com and HRDLog — which have no batch upload — are spaced out instead.",
"A spot you send now shows in your own spot list — most nodes never echo it back, so it looked like nothing had gone out.",
"Icom with JTDX in Fake It split: a lost PTT acknowledgement is sent again instead of failing, which made JTDX drop the rig.",
"A cluster whose only greeting is “login:” and which then asks for a password now connects — both prompts were being missed."
],
"fr": [
"Une entité qui est un seul groupe d’îles remplit désormais la référence IOTA toute seule, sans abonnement callbook.",
"Le partage CAT peut désormais parler TCI au lieu de Hamlib, split compris : un logiciel TCI atteint la radio, quelle quelle soit.",
"Cache des recherches : un TTL à 0 le désactive, pour relire à chaque fois une fiche callbook en cours de correction.",
"Radios TCI : quand la radio interdit l’émission, le PTT le dit au lieu de ne rien faire en silence.",
"WAJA portait les numéros civils des préfectures japonaises et non ceux de la JARL : 35 des 47 références sont renumérotées.",
"Les références dun diplôme se renumérotent dans l’éditeur : le numéro était le seul champ quil refusait de corriger.",
"La boussole se remplit dès louverture de Station Control, au lieu dattendre la fin dun intervalle dinterrogation.",
"Amplis combinés : le niveau de puissance (L/M/H) est couplé lui aussi, et les deux amplis sont commandés en même temps — fini le bip du combineur.",
"Relais HTTP générique : une carte en https:// peut être acceptée avec son certificat auto-signé, carte par carte.",
"Club Log : lenvoi à la fermeture part désormais en un lot — envoyer des centaines de contacts un par un faisait bloquer lopérateur.",
"eQSL : les envois partent aussi par lots de 100, et QRZ.com et HRDLog — qui nont pas denvoi groupé — sont espacés à la place.",
"Un spot que tu envoies apparaît maintenant dans ta liste : la plupart des nœuds ne le renvoient pas, il semblait n’être jamais parti.",
"Icom avec JTDX en split Fake It : un accusé de réception PTT perdu est renvoyé au lieu d’échouer — JTDX lâchait le poste.",
"Un cluster dont tout laccueil est « login: » puis qui réclame un mot de passe se connecte : les deux invites étaient ignorées."
]
},
{
"version": "0.25.7",
"date": "",
"en": [
"Opening the Awards panel no longer pulls the whole logbook several times at once — a large log briefly took gigabytes of memory.",
"Awards: the Missing refs button now only appears where it means something — a worldwide award like POTA could only ever answer “nothing found”.",
"Worked before: a prefixed call like ZA/OE8NDR matched every other visitor to that country instead of that one operator.",
"French: seventeen strings were still in English, the whole update panel among them, plus Spot lifetime and Chase new grids.",
"Selecting a QSO shows the entity the QSO records, not one re-derived from its callsign — a 3Y0K contact logged as Bouvet showed the Antarctica matrix.",
"Back-entering a QSO resolves the ClubLog exception at the CONTACTS date, so a DXpedition entered months later gets the entity it had then.",
"QRZ.com sends an island reference for an operator on one, and OpsLog read past it — it now fills the IOTA award reference before the QSO is logged.",
"Sync across PCs: point every OpsLog at one folder you already synchronise and your contacts follow you between machines.",
"TCI: a station spotted by several operators is drawn once on the panorama instead of two or three times a few hertz apart."
],
"fr": [
"Ouvrir le panneau Awards ne tire plus plusieurs fois le journal entier en même temps — un gros log occupait brièvement des gigaoctets de mémoire.",
"Awards : le bouton Réf. manquantes napparaît plus que là où il a un sens — un diplôme mondial comme POTA ne pouvait répondre que « aucun manque ».",
"Déjà contacté : un indicatif préfixé comme ZA/OE8NDR rapprochait tous les autres visiteurs du pays au lieu de ce seul opérateur.",
"Français : dix-sept textes étaient restés en anglais, dont tout le panneau de mise à jour, la durée de vie des spots et Chasser les nouveaux locators.",
"Sélectionner un QSO affiche lentité que le QSO enregistre, pas une recalculée depuis lindicatif — un 3Y0K logué Bouvet montrait la matrice Antarctique.",
"Saisir un QSO a posteriori résout lexception ClubLog à la date DU CONTACT : une DXpedition entrée des mois après retrouve lentité quelle avait alors.",
"QRZ.com envoie la référence d’île dun opérateur sur une île, et OpsLog lignorait — elle remplit désormais la référence IOTA avant lenregistrement du QSO.",
"Synchro entre PC : fais pointer chaque OpsLog vers un dossier déjà synchronisé et tes contacts te suivent dune machine à lautre.",
"TCI : une station spottée par plusieurs opérateurs nest tracée quune fois sur le panorama, au lieu de deux ou trois fois."
]
},
{
"version": "0.25.6",
"date": "",
"en": [
"Right-click: update the US county of the selected contacts from the ULS database, replacing a county since renamed or abolished.",
"A QSO logged from WSJT-X, MSHV or a net now appears in Recent QSOs at once, instead of waiting for a delayed auto-upload to send it.",
"New installs: the default QSL and recording e-mails end with a credit line and a link to OpsLog. Part of the template, so delete it if unwanted.",
"Relay automatic control and band-change messages now follow the Band selector too, so a station without CAT switches its antenna when you change band.",
"Fixed OpsLog re-tuning its own rig from its own radio broadcasts, which dropped the CAT link on every JTDX or WSJT-X “Fake It” transmission.",
"New device: a bench power supply on Modbus RTU (BSIDE, Wanptek and kin) — its output switched from Station Control, with volts, amps and watts.",
"SPID rotator: a Rot1Prog controller turned nearly a full circle the wrong way for every heading — its commands take three digits, not four.",
"The compass sweeps with a turning antenna instead of jumping, and the controller is polled once for the whole app rather than by each panel.",
"A rotator test that only reads the heading now says so, instead of naming PstRotator for a move it never commanded."
],
"fr": [
"Clic droit : mettre à jour le comté US des contacts sélectionnés depuis la base ULS, pour remplacer un comté renommé ou supprimé.",
"Un QSO logué depuis WSJT-X, MSHV ou un net apparaît aussitôt dans les QSO récents, sans attendre lenvoi dun upload automatique différé.",
"Nouvelles installations : les mails QSL et enregistrement par défaut finissent par une ligne de crédit et un lien vers OpsLog. Dans le modèle, supprimable.",
"Le contrôle automatique des relais et les messages de changement de bande suivent aussi le champ Band : une station sans CAT commute enfin son antenne.",
"Corrigé : OpsLog réaccordait sa propre radio depuis ses propres diffusions, ce qui coupait le lien CAT à chaque émission JTDX ou WSJT-X en « Fake It ».",
"Nouvel appareil : alimentation de laboratoire en Modbus RTU (BSIDE, Wanptek et similaires) — sortie commutée depuis Contrôle station, avec V, A et W.",
"Rotator SPID : un contrôleur Rot1Prog tournait presque un tour complet à lenvers pour chaque azimut — ses commandes tiennent trois chiffres, pas quatre.",
"Le compas suit lantenne en rotation au lieu de sauter, et le contrôleur est interrogé une fois pour toute lapplication, plus par chaque panneau.",
"Un test de rotator qui ne fait que lire lazimut le dit, au lieu de citer PstRotator pour un mouvement jamais commandé."
]
},
{
"version": "0.25.5",
"date": "",
"en": [
"DX cluster: when spots arrive and every one is filtered out, the panel says so, names the filters doing it and offers to clear them — it used to say “waiting for spots” beside a counter reading 76 live.",
"DX cluster: the log times the connection and the first spot, so a slow first launch can be told apart from a quiet node.",
"Generic HTTP relay: its URLs were never actually sent — fixed. {value} sends the relay's label, {relay-1} counts from zero, no host needed.",
"Switching profile now reconnects the amplifier, antenna, Antenna Genius and tuner — they stayed on the previous profile's ports until you saved Settings.",
"SteppIR: one missed reply used to wedge the link — the antenna stopped responding, with nothing at all in the log. It now recovers on its own.",
"The log now says when a motorized antenna is connected but tracking is off, instead of a line that read like a fault.",
"DXHunter spot clicks tune the rig again: the frequency it sends is read in whatever unit it uses, not always as MHz."
],
"fr": [
"Cluster DX : quand des spots arrivent et que tout est filtré, le panneau le dit, nomme les filtres responsables et propose de les effacer — il affichait « en attente de spots » à côté dun compteur à 76 en direct.",
"Cluster DX : le journal chronomètre la connexion et le premier spot, pour distinguer un premier lancement lent dun nœud silencieux.",
"Relais HTTP générique : ses URL n’étaient jamais envoyées — corrigé. {value} envoie le libellé du relais, {relay-1} compte de zéro, hôte inutile.",
"Changer de profil reconnecte lampli, lantenne, lAntenna Genius et le tuner — ils restaient sur les ports du profil précédent jusqu’à un Enregistrer.",
"SteppIR : une seule réponse manquée bloquait la liaison — lantenne ne répondait plus, sans rien dans le journal. Elle se rétablit maintenant seule.",
"Le journal indique désormais quune antenne motorisée est connectée mais que le suivi est désactivé, au lieu dune ligne qui ressemblait à une panne.",
"Les clics de spot DXHunter accordent à nouveau le rig : la fréquence envoyée est lue dans son unité réelle, plus toujours en MHz."
]
},
{
"version": "0.25.4",
"date": "",
"en": [
"WinKeyer: the opening probe goes out as one write, matching a capture of a client that talks to the same K3NG keyer, and the handshake bytes are always logged so a keyer that stays silent can be diagnosed."
],
"fr": [
"WinKeyer : la sonde douverture part en un seul envoi, calquée sur la capture dun client qui dialogue avec le même manipulateur K3NG, et les octets de la poignée de main sont toujours journalisés pour diagnostiquer un manipulateur muet."
]
},
{
"version": "0.25.3",
"date": "",
"en": [
"Confirmations: a LoTW contact marked V (verified) counted for the awards but nowhere else — the band/mode matrix, the slot statistics, the row colours and the QSL Info table all read it as unconfirmed, the last one showing it as “No”. It now reads as Verified everywhere.",
"Rotators: SPID / AlfaSpid controllers are driven natively over their own COM port — Rot2Prog and Rot1Prog — so PstRotator is no longer needed in between. Two towers means two rotors, as before."
],
"fr": [
"Confirmations : un contact LoTW marqué V (vérifié) comptait pour les diplômes et nulle part ailleurs — la matrice bande/mode, les statistiques de créneaux, la coloration des lignes et le tableau Infos QSL le lisaient comme non confirmé, le dernier laffichant même « Non ». Il saffiche désormais « Vérifié » partout.",
"Rotors : les contrôleurs SPID / AlfaSpid sont pilotés nativement par leur propre port COM — Rot2Prog et Rot1Prog — sans passer par PstRotator. Deux pylônes restent deux rotors, comme avant."
]
},
{
"version": "0.25.2",
"date": "",
"en": [
"Send Spot: the comment now carries the award references after the mode — the ones you assigned (POTA, SOTA, IOTA…), not the DXCC, zone and prefix every reader works out from the callsign. A self-spot carries your OWN activation references.",
"Modes: a fresh install now starts with SSB, CW, FT8, FT4, FT2, RTTY, PSK31 and FM. AM and DIGITALVOICE stay in the available list but are no longer selected by default.",
"Chase new: a panel listing the stations PSK Reporter is hearing within about 300 km of you that are new against your log — on FT8, FT4, FT2, PSK31 and RTTY, and only on the bands you have selected. One badge per row, the most valuable first (entity, band, mode, slot, prefix, square), with a filter for each, a toolbar button to show it and a cross to close it. Click a row to put the callsign in the entry and tune the rig.",
"QSL Manager, paper QSL: the route is set per direction — bureau, direct or electronic, beside the sent status and beside the received one — and applies to the whole selection at once.",
"Connections (was “UDP integrations”): two new outbound services. “WSJT-X logged QSO” announces each contact on the WSJT-X UDP interface, both messages WSJT-X itself sends, for loggers that listen there rather than for plain-text ADIF (Logger32 among them). “Custom message” lets you choose what fires it — band change, QSO logged, rotator command, callsign lookup — and what it says, sent as a UDP datagram or an HTTP request.",
"Connections: everything sent is now written to the log. Outbound messages say where they went and, for custom ones, what they contained; a message that came out empty says so instead of vanishing; a password in a URL is hidden; and an ADIF listener sharing a port with a WSJT source now names that traffic once rather than a line per decode.",
"Station relays: new “HTTP relay” device for home-made and generic switches — an ON and an OFF URL, either one pattern with {relay} or one pair per relay, with a channel count from 1 to 16. It then follows the same per-band rules as the named boards.",
"Serial ports: a port claimed by two devices in the Windows port map was listed twice in every port dropdown, and showed as “COM3COM3”. Listed once now, and in natural order — COM4 between COM3 and COM8, not after COM9.",
"Motorized antenna: an antenna that lost its serial port stopped answering with nothing at all in the log, and a controller that settled somewhere other than where it was sent looked exactly the same. Both now say what happened, once.",
"Appearance: the Sahara theme is lighter, parchment rather than deep sand, with a terracotta accent."
],
"fr": [
"Envoi de spot : le commentaire porte désormais les références de diplôme après le mode — celles que vous avez attribuées (POTA, SOTA, IOTA…), pas le DXCC, la zone et le préfixe que chacun déduit de lindicatif. Un auto-spot porte VOS références dactivation.",
"Modes : une installation neuve démarre avec SSB, CW, FT8, FT4, FT2, RTTY, PSK31 et FM. AM et DIGITALVOICE restent dans la liste disponible mais ne sont plus sélectionnés par défaut.",
"Chasse au nouveau : un panneau listant les stations que PSK Reporter entend à moins de 300 km de chez vous et qui sont nouvelles par rapport à votre log — en FT8, FT4, FT2, PSK31 et RTTY, et seulement sur les bandes que vous avez sélectionnées. Une seule indication par ligne, la plus précieuse dabord (entité, bande, mode, créneau, préfixe, carré), avec un filtre pour chacune, un bouton dans la barre pour lafficher et une croix pour le fermer. Un clic met lindicatif en saisie et accorde la radio.",
"Gestionnaire QSL, QSL papier : la voie se règle par sens — bureau, direct ou électronique, à côté du statut envoyé et à côté du statut reçu — et sapplique à toute la sélection dun coup.",
"Connexions (ex-« Intégrations UDP ») : deux nouvelles sorties. « QSO enregistré WSJT-X » annonce chaque contact sur linterface UDP WSJT-X, les deux messages que WSJT-X émet lui-même, pour les loggers qui écoutent là plutôt que lADIF en texte brut (Logger32 entre autres). « Message personnalisé » vous laisse choisir ce qui la déclenche — changement de bande, QSO enregistré, commande de rotor, recherche dindicatif — et ce quelle dit, en datagramme UDP ou en requête HTTP.",
"Connexions : tout ce qui part est désormais inscrit au journal. Les messages sortants indiquent leur destination et, pour les personnalisés, leur contenu ; un message rendu vide le signale au lieu de disparaître ; un mot de passe dans une URL est masqué ; et un écouteur ADIF partageant un port avec une source WSJT nomme ce trafic une fois au lieu d’écrire une ligne par décodage.",
"Relais de station : nouveau périphérique « Relais HTTP » pour les commutateurs faits main ou génériques — une URL ON et une URL OFF, soit un modèle avec {relay}, soit une paire par relais, avec un nombre de voies de 1 à 16. Il suit ensuite les mêmes règles par bande que les cartes reconnues.",
"Ports série : un port revendiqué par deux périphériques dans la table Windows apparaissait en double dans toutes les listes, et saffichait « COM3COM3 ». Une seule fois désormais, et dans lordre naturel — COM4 entre COM3 et COM8, pas après COM9.",
"Antenne motorisée : une antenne ayant perdu son port série cessait de répondre sans rien laisser dans le journal, et un contrôleur qui se fixait ailleurs que là où on lavait envoyé ressemblait exactement à ça. Les deux disent maintenant ce qui sest passé, une fois.",
"Apparence : le thème Sahara s’éclaircit, parchemin plutôt que sable profond, avec un accent terre cuite."
]
},
{
"version": "0.25.1",
"date": "",
+2 -2
View File
@@ -109,9 +109,9 @@ func probeWB(conn *sql.DB, call string, dxcc int) {
SELECT band, mode,
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
MAX(CASE WHEN callsign = ?
AND (lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y')
AND (lotw_rcvd IN ('Y','V') OR qsl_rcvd IN ('Y','V') OR eqsl_rcvd IN ('Y','V'))
THEN 1 ELSE 0 END),
MAX(CASE WHEN lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y'
MAX(CASE WHEN lotw_rcvd IN ('Y','V') OR qsl_rcvd IN ('Y','V') OR eqsl_rcvd IN ('Y','V')
THEN 1 ELSE 0 END)
FROM qso WHERE dxcc = ?
GROUP BY band, mode
+257 -46
View File
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Activity, AlertCircle, Antenna, Bell, Check, CheckCircle2, ChevronDown, Clock, CloudOff, Compass, Database, Ear, Eraser, Flame, Gauge, Hash, Loader2, Lock,
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radar, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
} from 'lucide-react';
import {
@@ -11,16 +11,17 @@ import {
SaveCabrilloFile, ExportCabrillo, ExportCabrilloFiltered, ExportCabrilloSelected,
ContestDupe,
GetQSO, UpdateQSO, DeleteQSO, DeleteQSOs, DeleteAllQSO,
UpdateQSOsFromCty, UpdateQSOsFromQRZ, UpdateQSOsFromClublog, UploadQSOsManual, SendQSORecordingEmail,
UpdateQSOsFromCty, UpdateQSOsFromQRZ, UpdateQSOsFromClublog, UpdateQSOsCountyFromULS, ULSStatus, UploadQSOsManual, SendQSORecordingEmail,
LookupCallsign, GetStationSettings, GetListsSettings,
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
SMTPConfigured, SendLogToDeveloper,
WorkedBefore,
SetCompactMode, SetCompactHeight,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
RotatorGoToPath,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, EntryBandChanged, FlexApplyBandAntenna, FlexApplyBandPower,
GetSecretStatus, UnlockSecrets,
RefreshCtyDat, DownloadAllReferenceLists,
RotatorGoTo, RotatorStop, GetRotatorHeading, SetActiveRotor,
RotatorGoTo, RotatorStop, SetActiveRotor,
GetDBConnectionInfo, GetLogbookRevision,
GetUltrabeamStatus, SetUltrabeamDirection, UILog,
GetAntGeniusStatus, GetAntGeniusSettings, AntGeniusActivate,
@@ -51,11 +52,11 @@ import {
ReportLiveActivity, LiveLastQSOAgeSec,
GetAmpStatuses, AmpOperate,
GetFlexState, FlexAmpOperate,
GetPSKReporterStatus, GetLiveOpenings,
GetPSKReporterStatus, GetLiveOpenings, GetChaseNew,
QSLViaRepairStatus, RepairQSLVia, DismissQSLViaRepair,
} from '../wailsjs/go/main/App';
import { Combobox } from '@/components/ui/combobox';
import { applyAwardRefs } from '@/lib/awardRefs';
import { applyAwardRefs, parseAwardRefs as parseManualRefs, spotRefList , withIOTARef } from '@/lib/awardRefs';
import { EventsOn, BrowserOpenURL, WindowMinimise, WindowToggleMaximise, WindowIsMaximised, Quit } from '../wailsjs/runtime/runtime';
import type { adif as adifModels, lookup as lookupModels, cat as catModels } from '../wailsjs/go/models';
import type { QSOForm, WorkedBeforeView, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
@@ -82,6 +83,7 @@ import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
import { AmpWidget } from '@/components/AmpWidget';
import { ScpPanel, type ScpResult } from '@/components/ScpPanel';
import { ChaseNewPanel } from '@/components/ChaseNewPanel';
import { FilterBuilder, type QueryFilter } from '@/components/FilterBuilder';
import { AwardsPanel } from '@/components/AwardsPanel';
import { StatsPanel } from '@/components/StatsPanel';
@@ -105,6 +107,7 @@ import { DetailsPanel, type DetailsState } from '@/components/DetailsPanel';
import { SendSpotModal, type RecentSpotQSO } from '@/components/SendSpotModal';
import { WinkeyerPanel, type WKStatus, type WKMacro } from '@/components/WinkeyerPanel';
import { RotorCompass } from '@/components/RotorCompass';
import { subscribeRotorHeading, pokeRotorHeading } from '@/lib/rotorHeading';
import { writeUiPref } from '@/lib/uiPref';
import { formatDateTimeUTC } from '@/lib/dateFormat';
import { titleCase, sentenceCase } from '@/lib/textCase';
@@ -141,7 +144,9 @@ type CATState = Omit<catModels.RigState, 'convertValues'>;
// threshold is bypassed while filtering — see buildActiveFilter).
const FILTERED_LIMIT_CAP = 10000;
const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm'];
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE'];
// Mirrors defaultModes in app.go — the fallback used before the backend answers.
// AM and DIGITALVOICE stay in the catalogue but are not offered by default.
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','FT2','RTTY','PSK31','FM'];
// Modes the QSO recorder captures (phone only). Mirrors recordableMode() in
// app.go — digital modes carry no useful audio, and CW has no DAX audio on Flex,
// so neither is recorded (no REC badge / timer for them).
@@ -311,7 +316,7 @@ function modeAccent(mode?: string): string {
type RSTLists = { phone: string[]; cw: string[]; digital: string[] };
function rstCategory(mode: string): keyof RSTLists {
const m = (mode || '').toUpperCase();
const digital = ['FT8', 'FT4', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
const digital = ['FT8', 'FT4', 'FT2', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
if (digital.includes(m)) return 'digital';
if (['CW', 'RTTY', 'PSK31', 'PSK63', 'PSK', 'PSK125'].includes(m)) return 'cw';
return 'phone';
@@ -726,10 +731,19 @@ export default function App() {
function onBandUserChange(v: string) {
setBand(v);
noteManualEdit();
if (catState.enabled && catState.connected && !locks.band && !locks.freq) {
// A lock means this value is deliberately decoupled from the rig (logging an
// old contact off-frequency) — drive nothing, neither the radio nor an antenna.
if (locks.band || locks.freq) return;
if (catState.enabled && catState.connected) {
const hz = qsyFreqHz(v, mode);
if (hz > 0) SetCATFrequency(hz).catch(() => {});
return; // the rig reports back, and the relays follow from its state
}
// No rig to push to, so THIS is the band change. Without it, relay automatic
// control and the band-change outbound rows never heard about it — they only
// ever listened to the CAT state, which on a station without rig control
// never says anything.
EntryBandChanged(v).catch(() => {});
}
function onModeUserChange(v: string) {
setMode(v);
@@ -1535,6 +1549,41 @@ export default function App() {
// Hide spots already worked (exact call worked, or this band+mode slot done).
const [clusterHideWorked, setClusterHideWorked] = useState(() => lsBool('opslog.clusterHideWorked', false));
// Everything currently narrowing the spot list, in words. Shown when spots
// arrived and none survived — the operator needs to know WHICH filter to
// loosen, and the two locks are the least memorable because they follow the
// rig rather than a click.
const clusterActiveFilterSummary = useMemo(() => {
const on: string[] = [];
if (clusterLockBand) on.push(t('clg2.fBandLock'));
else if (clusterBands.size > 0) on.push(t('clg2.fBands', { list: [...clusterBands].join(', ') }));
if (clusterLockMode) on.push(t('clg2.fModeLock'));
else if (clusterModeFilter.size > 0) on.push(t('clg2.fModes', { list: [...clusterModeFilter].join(', ') }));
if (clusterStatusFilter.size > 0) on.push(t('clg2.fStatus'));
if (clusterHideWorked) on.push(t('clg2.fHideWorked'));
if (clusterLotwOnly) on.push(t('clg2.fLotwOnly'));
if (clusterSpotterConts.size > 0) on.push(t('clg2.fSpotterCont'));
if (clusterFilterSource) on.push(t('clg2.fSource'));
if (clusterSearch.trim()) on.push(t('clg2.fSearch', { q: clusterSearch.trim() }));
return on.join(' · ');
}, [t, clusterLockBand, clusterBands, clusterLockMode, clusterModeFilter, clusterStatusFilter,
clusterHideWorked, clusterLotwOnly, clusterSpotterConts, clusterFilterSource, clusterSearch]);
// Undo every one of them at once. A list of ten switches spread down a panel
// is not something to walk back by hand when the answer is "show me anything".
const clearClusterFilters = useCallback(() => {
setClusterLockBand(false);
setClusterBands(new Set());
setClusterLockMode(false);
setClusterModeFilter(new Set());
setClusterStatusFilter(new Set());
setClusterHideWorked(false);
setClusterLotwOnly(false);
setClusterSpotterConts(new Set());
setClusterFilterSource('');
setClusterSearch('');
}, []);
// Persist every cluster filter selection whenever it changes, so it is still
// set after a close/reopen.
useEffect(() => {
@@ -1731,7 +1780,10 @@ export default function App() {
// Stats (F1) matrix whenever the entry form is empty — clicking a past contact
// is the natural way to ask "what else have I got with this one?", and until
// now the panel just sat blank.
const [selQso, setSelQso] = useState<{ call: string; band: string; mode: string } | null>(null);
// The selected row's own entity travels with it. Re-deriving it from the
// callsign is what showed Antarctica for a 3Y0K contact the log records as
// Bouvet Island — see the WorkedBefore call below.
const [selQso, setSelQso] = useState<{ call: string; band: string; mode: string; dxcc: number } | null>(null);
const [bulkEditIds, setBulkEditIds] = useState<number[]>([]);
const [bulkEditOpen, setBulkEditOpen] = useState(false);
const [showSettings, setShowSettings] = useState(false);
@@ -2084,21 +2136,49 @@ export default function App() {
const [showAntGenius, setShowAntGenius] = useState(() => localStorage.getItem('opslog.showAntGenius') !== '0');
const [showTuner, setShowTuner] = useState(() => localStorage.getItem('opslog.showTuner') !== '0');
const [showScp, setShowScp] = useState(() => localStorage.getItem('opslog.showScp') !== '0');
// The Chase New widget follows its own setting rather than a local toggle: the
// panel is only meaningful while the PSK Reporter feed is up, and that is what
// the setting decides.
const [chaseNewOn, setChaseNewOn] = useState(false);
// The setting decides whether the feature exists; this decides whether the
// panel is on screen — the same split the Super Check Partial panel uses.
const [showChaseNew, setShowChaseNew] = useState(() => localStorage.getItem('opslog.showChaseNew') !== '0');
const refreshChaseNew = useCallback(() => { GetChaseNew().then(setChaseNewOn).catch(() => {}); }, []);
useEffect(() => { refreshChaseNew(); }, [refreshChaseNew]);
const [showBeamOnMap, setShowBeamOnMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
// Award code → scanned field (e.g. POTA→pota_ref, WWFF→wwff). Used to route
// picked award references to the QSO field/extras each award actually reads.
const awardFieldRef = useRef<Record<string, string>>({});
// The same map as state, because the spot comment has to be recomputed once it
// arrives — a ref would leave the first Send Spot of a session with no
// references at all, or with the computed ones it is meant to filter out.
const [awardFields, setAwardFields] = useState<Record<string, string>>({});
useEffect(() => {
GetAwardDefs()
.then((defs) => {
const m: Record<string, string> = {};
for (const d of (defs ?? []) as any[]) m[String(d.code).toUpperCase()] = String(d.field || '').toLowerCase();
awardFieldRef.current = m;
setAwardFields(m);
})
.catch(() => {});
}, []);
// Award references offered to the Send Spot window, as cluster-ready strings.
//
// The entry panel holds them as "CODE@REF;CODE@REF" while the QSO is being
// typed; once it is logged they live on the row as the materialised award_refs
// object. Take the entry's when there is one — spotting usually happens with
// the station still in the field — and fall back to the last logged QSO, which
// is where the callsign and frequency defaults come from too.
const spotEntryRefs = useMemo(() => {
const entry = spotRefList(parseManualRefs(details.award_refs ?? ''), awardFields);
if (entry.length) return entry;
return spotRefList(parseAwardRefs(qsos[0]?.award_refs), awardFields);
}, [details.award_refs, qsos, awardFields]);
// === Clock ===
const [utcNow, setUtcNow] = useState('');
useEffect(() => {
@@ -2160,16 +2240,34 @@ export default function App() {
}
}, [buildActiveFilter]);
// Refresh the Recent QSOs grid after external-service uploads stamp the
// sent status (auto-upload via extsvc:uploaded, or manual QSL Manager via
// qslmgr:done). Debounced so a batch of per-QSO events triggers one reload.
// Reload the Recent QSOs grid when the log changes.
//
// qso:logged is the important one, and it was missing. The entry form calls
// refresh() itself after AddQSO, so a QSO TYPED here always appeared — but a
// QSO logged from anywhere else (WSJT-X / MSHV over UDP, JTAlert, NET
// Control, an offline replay) only reached the grid when something else
// happened to reload it, and the something else was the upload: with
// auto-upload set to immediate, extsvc:uploaded arrived a second later and
// hid the gap entirely.
//
// Which is why this surfaced as "delayed upload breaks the recent list". It
// does not — the grid was waiting on the upload for its news. On a delayed
// service the QSO appeared one to two minutes late, and on close-of-session
// upload not until the next launch: the corrections that deferring the upload
// exists to allow could not be made, because there was nothing to correct on
// screen. The list follows the LOG now, and the upload only stamps a status.
//
// Debounced: qso:logged fires twice per contact (once on insert, once when
// the award refs are materialised), and a contest run fires it every few
// seconds.
useEffect(() => {
let t: number | undefined;
const ping = () => { if (t) window.clearTimeout(t); t = window.setTimeout(() => { refresh(); }, 400); };
const offLogged = EventsOn('qso:logged', ping);
const offUploaded = EventsOn('extsvc:uploaded', ping);
const offDone = EventsOn('qslmgr:done', ping);
const offEqsl = EventsOn('qsl:sent', ping);
return () => { offUploaded(); offDone(); offEqsl(); if (t) window.clearTimeout(t); };
return () => { offLogged(); offUploaded(); offDone(); offEqsl(); if (t) window.clearTimeout(t); };
}, [refresh]);
// The backend bulk-recomputed the materialised award_refs (an award definition
@@ -2296,17 +2394,12 @@ export default function App() {
};
}, []);
// Poll PstRotator for the live antenna heading (status bar). Cheap when the
// rotator is disabled (the backend just reads settings and returns).
useEffect(() => {
let alive = true;
const tick = async () => {
try { const h: any = await GetRotatorHeading(); if (alive) setRotatorHeading(h); } catch {}
};
tick();
const id = window.setInterval(tick, 3000);
return () => { alive = false; window.clearInterval(id); };
}, []);
// The live antenna heading, from the shared poller in lib/rotorHeading — fast
// while the antenna turns, slow while it is parked, and ONE loop however many
// panels are watching. This used to be its own interval alongside Station
// Control's, so the controller was polled twice over whenever that tab was
// open, and every poll opens and closes the port.
useEffect(() => subscribeRotorHeading((h) => setRotatorHeading(h as any)), []);
// Poll the Ultrabeam antenna for its connection + pattern direction.
useEffect(() => {
@@ -2617,6 +2710,9 @@ export default function App() {
// case its one-shot fetch ran during the startup race (before the
// backend was determined) and grabbed the wrong/stale value.
GetDBConnectionInfo().then((i) => { if (alive) setDbConn(i as any); }).catch(() => {});
// Same race, same fix: the toolbar options were read once at mount,
// possibly before the profile was active, and a "no" then was final.
refreshChaseNew();
} else if (!ok && alive && tries++ < 360) {
// Quick retries at first (normal startup connects in ~2 s); then keep
// trying for several minutes, because the very first migration against a
@@ -2629,7 +2725,7 @@ export default function App() {
};
attempt();
return () => { alive = false; if (timer) window.clearTimeout(timer); };
}, [refresh]);
}, [refresh, refreshChaseNew]);
useEffect(() => {
(async () => {
try {
@@ -2650,6 +2746,10 @@ export default function App() {
loadStation();
loadLists();
loadCATCfg();
// Options the toolbar reads. At mount the database may still be opening,
// and a one-shot read then answers "off" for everything — which is why the
// Chase New button only appeared after a trip through Settings.
refreshChaseNew();
})();
// Poll the CAT state at launch until the rig reports a frequency: the
// backend connects asynchronously and only PUSHES cat:state on change, so
@@ -3509,6 +3609,26 @@ export default function App() {
catch (e: any) { setError(String(e?.message ?? e)); }
finally { setBulkProgress(null); }
}
// Whether the offline US county database holds anything. It gates the
// right-click entry below: an action that can only answer "no database" is
// not worth a line in a menu this long. Re-read when a download finishes, so
// the entry appears without a restart.
const [ulsReady, setUlsReady] = useState(false);
useEffect(() => {
const read = () => ULSStatus().then((s: any) => setUlsReady((s?.count ?? 0) > 0)).catch(() => {});
read();
const off = EventsOn('uls:done', () => { read(); });
return () => { off(); };
}, []);
// Re-derive the county of the selected US contacts from the offline ULS
// database, OVERWRITING what is stored. Offered only once that database has
// been downloaded — see ulsReady above.
async function bulkUpdateCountyFromULS(ids: number[]) {
if (ids.length === 0) return;
try { await afterBulkUpdate(await UpdateQSOsCountyFromULS(ids as any), t('qctx.fromUlsLabel')); }
catch (e: any) { setError(String(e?.message ?? e)); }
}
async function bulkUpdateFromClublog(ids: number[]) {
if (ids.length === 0) return;
try { await afterBulkUpdate(await UpdateQSOsFromClublog(ids as any), 'from ClubLog'); }
@@ -3635,7 +3755,19 @@ export default function App() {
if (!call || callsign.trim()) { setSelWb(null); return; }
let dead = false;
setSelWbBusy(true);
WorkedBefore(call, 0)
// The SELECTED QSO's own entity, not one re-derived from its callsign.
//
// Passing 0 lets the backend resolve the entity from cty.dat and the
// ClubLog exceptions AS THEY ARE TODAY, which is right for a live contact
// and wrong for one being looked at in the log. A 3Y0K contact recorded as
// Bouvet Island showed the Antarctica matrix, and counted five contacts
// "with this entity" against eleven with the call — two different entities,
// one of them nobody asked about.
//
// Browsing the log shows what the log says, even where the log is wrong.
// Correcting an entity is a deliberate act (right-click → Update from
// ClubLog), not something a panel does behind the operator's back.
WorkedBefore(call, selQso?.dxcc || 0)
.then((w: any) => { if (!dead) setSelWb(w); })
.catch(() => { if (!dead) setSelWb(null); })
.finally(() => { if (!dead) setSelWbBusy(false); });
@@ -3744,7 +3876,11 @@ export default function App() {
const gen = lookupGenRef.current; // invalidated by ESC / resetEntry
setLookupBusy(true);
try {
const r = await LookupCallsign(call);
// The ENTRY'S date, so a ClubLog exception resolves at the moment the
// contact happened. Live, that is now and nothing changes; back-entering
// a past QSO, it is what makes 3Y0K come back Bouvet Island instead of
// Antarctica — the exception's window had closed by today.
const r = await LookupCallsign(call, qsoStartedAt ? qsoStartedAt.toISOString().slice(0, 10) : '');
// Discard a STALE result: the operator already moved to another call
// (clicked a new spot / typed) OR cleared the entry (ESC) while this lookup
// was in flight. Applying it would clobber the current fields and zoom the
@@ -3798,6 +3934,24 @@ export default function App() {
email: d.email || (r.email ?? ''),
web: d.web || (r.web ?? ''),
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
// An island reference from the callbook becomes an IOTA award reference
// on the entry, exactly like one picked by hand.
//
// QRZ carries <iota> for an operator on an island and OpsLog read past
// it. That matters more for IOTA than it would for another award:
// unlike POTA there is no live "who is on an island right now" feed
// anywhere, so the callbook record is the practical source — and it is
// known BEFORE the contact is logged, which is when it is useful.
//
// Only when the operator has not set one already: a reference typed or
// picked by hand outranks a callbook that may be years out of date.
//
// This belongs HERE, on the provider result, and not in the backfill
// from the last QSO where it first went: that runs only when there IS a
// previous contact with the call, so the island appeared for stations
// already in the log and never for the new one on the island — which is
// the entire point of the feature.
award_refs: withIOTARef(d.award_refs ?? '', String((r as any)?.iota ?? '')),
}));
// Backfill anything the provider didn't supply from the last time we worked
// this call (call not found on QRZ/HamQTH, or lookup off → cty.dat only).
@@ -5178,7 +5332,7 @@ export default function App() {
return (
<div className="h-full w-full min-h-0 flex flex-col bg-card border border-border rounded-lg overflow-hidden">
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
onSendTo={bulkSendTo} onSendRecording={bulkSendRecording} onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
@@ -5208,7 +5362,7 @@ export default function App() {
<div className="h-full w-full min-h-0 flex flex-col rounded-lg overflow-hidden border border-border">
<NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes}
qsoMenuHandlers={{
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog,
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog, onUpdateCountyFromULS: ulsReady ? bulkUpdateCountyFromULS : undefined,
onSendTo: bulkSendTo, onSendRecording: bulkSendRecording, onSendEQSL: (ids: number[]) => setEqslQsoId(ids[0] ?? null),
onDelete: (ids: number[]) => setDeletingIds(ids),
}} />
@@ -5232,7 +5386,7 @@ export default function App() {
onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty}
onUpdateFromQRZ={bulkUpdateFromQRZ}
onUpdateFromClublog={bulkUpdateFromClublog}
onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
onSendTo={bulkSendTo}
onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
@@ -5242,7 +5396,7 @@ export default function App() {
onExportFiltered={exportFilteredADIF}
onDelete={(ids) => setDeletingIds(ids)}
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? ""), dxcc: Number(r.dxcc ?? 0) } : null)}
/>
</div>
);
@@ -5332,13 +5486,15 @@ export default function App() {
{(() => {
const p = dxPath;
const disabled = !p;
const goto = (az: number) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)));
// The path is passed through so a custom outbound row can say which
// bearing was taken — 137° is short path to one station and long to another.
const goto = (az: number, path: 'SP' | 'LP') => RotatorGoToPath(Math.round(az), -1, path).catch((err) => setError(String(err?.message ?? err)));
return (
<div className="inline-flex items-center rounded-full border border-info-border bg-info-muted overflow-hidden text-[11px] font-mono font-semibold">
<button
type="button"
disabled={disabled}
onClick={() => p && goto(p.bearingShort)}
onClick={() => p && goto(p.bearingShort, 'SP')}
title={p
? `Rotate short-path · ${Math.round(p.distanceShort).toLocaleString()} km`
: (station.my_grid ? 'No remote grid' : 'Set your station grid in Preferences')}
@@ -5355,7 +5511,7 @@ export default function App() {
<button
type="button"
disabled={disabled}
onClick={() => p && goto(p.bearingLong)}
onClick={() => p && goto(p.bearingLong, 'LP')}
title={p ? `Rotate long-path · ${Math.round(p.distanceLong).toLocaleString()} km` : ''}
className={cn(
'px-1.5 py-0.5 border-l border-info-border text-[10px] transition-colors',
@@ -5368,7 +5524,7 @@ export default function App() {
</button>
<button
type="button"
onClick={() => RotatorStop().catch((err) => setError(String(err?.message ?? err)))}
onClick={() => { pokeRotorHeading(); RotatorStop().catch((err) => setError(String(err?.message ?? err))); }}
title="Stop rotation"
className="px-1.5 py-0.5 border-l border-info-border text-danger hover:bg-danger-muted hover:text-danger-muted-foreground cursor-pointer transition-colors"
>
@@ -5551,6 +5707,20 @@ export default function App() {
<SpellCheck className="size-4" />
</button>
)}
{chaseNewOn && (
<button
type="button"
onClick={() => { const v = !showChaseNew; setShowChaseNew(v); writeUiPref('opslog.showChaseNew', v ? '1' : '0'); }}
title={showChaseNew ? `${t('chn.toggle')}${t('chn.close')}` : t('chn.toggle')}
className={cn(
'relative inline-flex items-center justify-center size-7 rounded-md border transition-colors',
showChaseNew ? 'border-success-border bg-success-muted text-success-muted-foreground hover:bg-success-muted'
: 'border-border text-muted-foreground hover:bg-muted',
)}
>
<Radar className="size-4" />
</button>
)}
{chatAvailable && (
<button
type="button"
@@ -6070,7 +6240,7 @@ export default function App() {
{/* Reserved free space to the right. The WinKeyer CW keyer and/or the
Digital Voice Keyer take this slot when enabled (Log4OM-style);
otherwise it shows the QRZ profile photo. */}
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (showLiveStations && dbConn?.backend === 'mysql')) && (
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (chaseNewOn && showChaseNew) || (showLiveStations && dbConn?.backend === 'mysql')) && (
// relative + absolute inner (like the F1-F5 panel): a taller widget (e.g.
// the DVK with Auto CQ) can't grow the row — the row height stays set by
// the entry strip and each widget fills that height, scrolling inside.
@@ -6144,8 +6314,8 @@ export default function App() {
rotorEnabled={rotatorHeading.enabled && rotatorHeading.ok}
rotors={(rotatorHeading as any).rotors}
activeRotor={(rotatorHeading as any).active}
onSelectRotor={(i) => { SetActiveRotor(i).then(() => GetRotatorHeading()).then((h: any) => setRotatorHeading(h)).catch((err) => setError(String(err?.message ?? err))); }}
onGoto={(az) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)))}
onSelectRotor={(i) => { SetActiveRotor(i).then(pokeRotorHeading).catch((err) => setError(String(err?.message ?? err))); }}
onGoto={(az) => { RotatorGoTo(Math.round(az), -1).then(pokeRotorHeading).catch((err) => setError(String(err?.message ?? err))); }}
onClose={() => { setShowRotor(false); writeUiPref('opslog.showRotor', '0'); }}
/>
</div>
@@ -6196,6 +6366,16 @@ export default function App() {
/>
</div>
)}
{chaseNewOn && showChaseNew && (
<div className="w-[420px] shrink-0 min-h-0">
{/* Same reflex as clicking a cluster spot: the callsign into the
entry, and the rig onto the frequency it was decoded on. */}
<ChaseNewPanel onPick={(sp) => {
onCallsignInput(sp.call, { force: true });
if (sp.freq_hz) void tuneRigCAT(sp.freq_hz, sp.mode);
}} onClose={() => { setShowChaseNew(false); writeUiPref('opslog.showChaseNew', '0'); }} />
</div>
)}
{dvkEnabled && (
<div className="w-[320px] shrink-0 min-h-0">
<DvkPanel
@@ -6522,7 +6702,7 @@ export default function App() {
onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty}
onUpdateFromQRZ={bulkUpdateFromQRZ}
onUpdateFromClublog={bulkUpdateFromClublog}
onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
onSendTo={bulkSendTo}
onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
@@ -6534,7 +6714,7 @@ export default function App() {
onExportCabrilloFiltered={exportFilteredCabrillo}
onDelete={(ids) => setDeletingIds(ids)}
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? ""), dxcc: Number(r.dxcc ?? 0) } : null)}
/>
<div className="px-3 py-1.5 border-t border-border/60 text-[11px] text-muted-foreground flex items-center justify-between gap-3 bg-muted/30">
<div className="flex items-center gap-3">
@@ -6673,14 +6853,41 @@ export default function App() {
// pane). All the filter state lives in the right-side panel.
const rendered = clusterRenderedRows;
if (rendered.length === 0) {
const connected = clusterServerStatuses.some((s) => s.state === 'connected');
// Spots HAVE arrived and the filters ate every one of them.
//
// This used to say "Waiting for spots…" regardless, which is a
// lie the moment the counter beside it reads 76 live: an
// operator reads the two together and goes looking for a
// connection fault instead of at the filter panel. The band and
// mode locks are the usual culprits and the least visible —
// they follow the rig, so nobody remembers switching them on.
if (connected && spots.length > 0) {
return (
<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground gap-2 py-12 px-6 text-center">
<SlidersHorizontal className="size-10 opacity-30" />
<div className="text-sm font-semibold text-foreground/70">
{t('clg2.allFiltered', { n: spots.length })}
</div>
{clusterActiveFilterSummary && (
<div className="text-xs max-w-md leading-relaxed">
{t('clg2.activeFilters')} <span className="font-medium text-foreground/80">{clusterActiveFilterSummary}</span>
</div>
)}
<Button size="sm" variant="outline" className="mt-1" onClick={clearClusterFilters}>
{t('clg2.clearAllFilters')}
</Button>
</div>
);
}
return (
<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground gap-2 py-12">
<Hash className="size-10 opacity-30" />
<div className="text-sm font-semibold text-foreground/70">
{clusterServerStatuses.some((s) => s.state === 'connected') ? 'Waiting for spots…' : 'No active connection'}
{connected ? 'Waiting for spots…' : 'No active connection'}
</div>
<div className="text-xs">
{clusterServerStatuses.some((s) => s.state === 'connected')
{connected
? 'Spots will appear as the cluster sends them.'
: 'Use Connect all (or configure a cluster in Settings → DX Cluster).'}
</div>
@@ -6775,7 +6982,7 @@ export default function App() {
<TabsContent value="worked" className="mt-0 flex flex-col min-h-0 flex-1">
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onSendTo={bulkSendTo} onSendRecording={bulkSendRecording}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined} onSendTo={bulkSendTo} onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
@@ -6872,7 +7079,7 @@ export default function App() {
<TabsContent value="net" className="mt-0 flex flex-col min-h-0 flex-1">
<NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes}
qsoMenuHandlers={{
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog,
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog, onUpdateCountyFromULS: ulsReady ? bulkUpdateCountyFromULS : undefined,
onSendTo: bulkSendTo, onSendRecording: bulkSendRecording, onSendEQSL: (ids: number[]) => setEqslQsoId(ids[0] ?? null),
onDelete: (ids: number[]) => setDeletingIds(ids),
}} />
@@ -7216,6 +7423,9 @@ export default function App() {
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
}
defaultMode={mode || qsos[0]?.mode || ''}
// Award references: the ones on the QSO being entered, else those already
// logged for the last QSO — the same source the callsign above falls back to.
defaultRefs={spotEntryRefs}
targetName={
clusterServers
.filter((s) => s.enabled)
@@ -7226,6 +7436,7 @@ export default function App() {
freqKHz: q.freq_hz ? Math.round((q.freq_hz / 1000) * 10) / 10 : 0,
mode: q.mode ?? '',
band: q.band,
refs: spotRefList(parseAwardRefs(q.award_refs), awardFields),
}))}
onSend={async (call, freqKHz, comment) => {
await SendClusterSpot(call, freqKHz, comment);
@@ -7239,7 +7450,7 @@ export default function App() {
{showSettings && (
<SettingsModal
initialSection={settingsSection}
onClose={() => { setShowSettings(false); setSettingsSection(undefined); }}
onClose={() => { setShowSettings(false); setSettingsSection(undefined); refreshChaseNew(); }}
onSaved={() => {
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
// Drop the cached spot statuses. They are computed once per
+35 -3
View File
@@ -14,7 +14,7 @@ import { useI18n } from '@/lib/i18n';
import {
GetAwardDefs, SaveAwardDefs, ResetAwardDefs, AwardFields,
GetAwardReferenceMeta, UpdateAwardReferenceList,
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference,
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference, RenameAwardReference,
ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
ListCountries, DXCCForCountry, DXCCName,
PopulateBuiltinReferences, HasBuiltinReferences,
@@ -915,6 +915,10 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
const [refs, setRefs] = useState<AwardRef[]>([]);
const [q, setQ] = useState('');
const [selCode, setSelCode] = useState<string | null>(null);
// The code as TYPED. The list and every patch key off selCode, so editing the
// code in place would make the editor lose the reference mid-edit; the draft
// is applied as a rename when the operator saves.
const [codeDraft, setCodeDraft] = useState('');
const [busy, setBusy] = useState(false);
const [bulk, setBulk] = useState('');
const [showBulk, setShowBulk] = useState(false);
@@ -952,6 +956,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
}
const sel = refs.find((r) => r.code === selCode) || null;
useEffect(() => { setCodeDraft(selCode ?? ''); }, [selCode]);
// Large lists are already filtered by the server; small lists filter locally.
const filtered = useMemo(() => {
if (large) return refs;
@@ -965,6 +970,27 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
try { await SaveAwardReference(code, r as any); load(); onChanged(); }
catch (e: any) { setErr(String(e?.message ?? e)); }
}
// Save the selected reference, renumbering it first when the code was edited.
//
// The rename has to come first and has to be a rename: saving under the new
// code would simply create a second reference and leave the old one behind,
// which is how a list quietly grows duplicates.
async function saveSelected(r: AwardRef) {
const next = codeDraft.trim().toUpperCase();
if (!next) { setErr(t('awed.refCodeEmpty')); return; }
if (next !== r.code) {
try {
await RenameAwardReference(code, r.code, next);
} catch (e: any) {
// Most often the number is already taken by another reference. Said
// here rather than swallowed: the save has NOT happened.
setErr(String(e?.message ?? e));
return;
}
setSelCode(next);
}
await saveRef({ ...r, code: next });
}
async function addRef() {
const c = prompt(t('awed.newRefCodePrompt'))?.trim().toUpperCase();
if (!c) return;
@@ -1046,7 +1072,13 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
) : (
<div className="space-y-2">
<div className="flex items-center gap-2">
<Input className="h-8 w-28 font-mono font-semibold" value={sel.code} readOnly />
{/* Editable, because a shipped list can be wrong about it: WAJA
went out carrying Japan's civil prefecture numbers instead of
the JARL's, and correcting that meant deleting all 47
references and importing a new list. */}
<Input className="h-8 w-28 font-mono font-semibold" value={codeDraft}
title={t('awed.refCodeTip')}
onChange={(e) => setCodeDraft(e.target.value)} />
<label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={sel.valid} onCheckedChange={(c) => patchSel({ valid: !!c })} /> {t('awed.valid')}</label>
<div className="flex-1" />
<button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
@@ -1084,7 +1116,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
: t('awed.refValidHint')}
</p>
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveSelected(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
</div>
)}
</div>
+70 -13
View File
@@ -7,6 +7,7 @@ import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox';
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
import { cn } from '@/lib/utils';
import { isQSLConfirmed } from '@/lib/qsl';
import { AwardEditor } from '@/components/AwardEditor';
import { useI18n } from '@/lib/i18n';
import { writeUiPref } from '@/lib/uiPref';
@@ -63,7 +64,9 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
);
}
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[] };
// scoped: the award is limited to one or more DXCC entities. Missing-reference
// detection only means anything for those — see the Missing refs button.
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
const { t } = useI18n();
@@ -149,7 +152,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
]);
const follow = new Set(tracked);
let list: AwardListItem[] = defs
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [], scoped: (d.dxcc_filter ?? []).length > 0 }))
.sort((a, b) => a.code.localeCompare(b.code));
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
setAwardList(list);
@@ -426,13 +429,21 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
))}
</div>
<span className="text-xs text-muted-foreground">{filteredRefs.length} {t('awp.refs')}</span>
<button
onClick={() => setShowMissing(true)}
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
title={t('awp.missingRefsTitle')}
>
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
</button>
{/* Only for an award scoped to a DXCC entity. "In this award's
scope but with no reference" needs a scope to be in: on a
worldwide reference award — POTA, SOTA, IOTA, WWFF — every
contact anywhere would qualify, so the answer is always none.
The button used to be there regardless and could only ever
open a window saying it had found nothing. */}
{awardList.find((a) => a.code === selected)?.scoped && (
<button
onClick={() => setShowMissing(true)}
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
title={t('awp.missingRefsTitle')}
>
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
</button>
)}
<div className="flex-1" />
{/* Legend */}
<div className="flex items-center gap-2 text-[10px] text-muted-foreground">
@@ -607,6 +618,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
// the missing reference (e.g. a department for DDFM).
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
// How many references the assign dropdown will put in the DOM at once. Above
// this a search box appears beside it and the rest are held back, counted.
const REF_MENU_MAX = 300;
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
const { t } = useI18n();
const [qsos, setQsos] = useState<any[]>([]);
@@ -615,6 +630,7 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
const [refSearch, setRefSearch] = useState('');
const [assignRef, setAssignRef] = useState('');
const [busy, setBusy] = useState(false);
const [msg, setMsg] = useState('');
@@ -628,12 +644,38 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
.finally(() => setLoading(false));
};
useEffect(() => { load(); }, [code]);
// The award's reference list drives the "assign" dropdown (e.g. China provinces).
// The award's reference list drives the "assign" dropdown (e.g. China
// provinces) — fetched ONLY once there is something to assign it to.
//
// Missing-reference detection needs a DXCC scope, so a worldwide award like
// POTA always has zero rows here and says so. It was still loading every
// reference behind that message: on a log with the full POTA park list
// imported, tens of thousands of them, feeding a dropdown that could not be
// used for anything. That is the window freezing on a screen with nothing to
// offer.
useEffect(() => {
if (loading || qsos.length === 0) { setRefs([]); return; }
ListAwardReferences(code)
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
.catch(() => setRefs([]));
}, [code]);
}, [code, loading, qsos.length]);
// What the assign dropdown actually renders. Bounded, and it says how many it
// is holding back rather than silently showing the first few hundred.
const shownRefs = useMemo(() => {
const q = refSearch.trim().toUpperCase();
const rows = q
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q))
: refs;
return rows.slice(0, REF_MENU_MAX);
}, [refs, refSearch]);
const hiddenRefs = useMemo(() => {
const q = refSearch.trim().toUpperCase();
const total = q
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q)).length
: refs.length;
return Math.max(0, total - shownRefs.length);
}, [refs, refSearch, shownRefs.length]);
const qthOf = (q: any) => String(q.qth || q.notes || '');
const sorted = useMemo(() => {
@@ -710,14 +752,29 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
{/* Bulk-assign toolbar */}
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
<span className="text-xs text-muted-foreground">{t('awp.selectedArrow', { n: sel.size })}</span>
{/* A search box beside the dropdown, and a bounded list inside it.
A reference list can hold tens of thousands of entries (POTA
parks, Russian districts); every one of them as a menu item is
hundreds of thousands of DOM nodes and a window that stops
answering. Nobody scrolls to K-4521 anyway — they type it. */}
{refs.length > REF_MENU_MAX && (
<Input className="h-7 w-40 text-xs font-mono" value={refSearch}
placeholder={t('awp.filterReferences')}
onChange={(e) => setRefSearch(e.target.value)} />
)}
<Select value={assignRef} onValueChange={setAssignRef}>
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder={t('awp.chooseReference')} /></SelectTrigger>
<SelectContent className="max-h-72">
{refs.map((r) => (
{shownRefs.map((r) => (
<SelectItem key={r.code} value={r.code}>
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
</SelectItem>
))}
{hiddenRefs > 0 && (
<div className="px-2 py-1.5 text-[11px] text-muted-foreground">
{t('awp.refsNarrow', { n: hiddenRefs })}
</div>
)}
</SelectContent>
</Select>
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
@@ -818,7 +875,7 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
<td className="py-1 pr-2">{q.band}</td>
<td className="py-1 pr-2">{q.mode}</td>
<td className="py-1 pr-3 text-muted-foreground">{[q.lotw_rcvd === 'Y' && 'LoTW', q.qsl_rcvd === 'Y' && 'QSL', q.eqsl_rcvd === 'Y' && 'eQSL'].filter(Boolean).join(', ')}</td>
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
</tr>
))}
</tbody>
+2 -1
View File
@@ -3,6 +3,7 @@ import { Star, Radio, Sunrise, Sunset, X, Loader2 } from 'lucide-react';
import { Badge } from '@/components/ui/badge';
import { cn } from '@/lib/utils';
import { sunTimes } from '@/lib/sun';
import { isQSLConfirmed } from '@/lib/qsl';
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
import type { WorkedBeforeView } from '@/types';
@@ -426,7 +427,7 @@ function SlotQSOModal({ call, dxcc, entity, band, cls, onClose, onEdit }: {
</thead>
<tbody>
{rows.map((q, i) => {
const cfm = q.lotw_rcvd === 'Y' || q.eqsl_rcvd === 'Y' || q.qsl_rcvd === 'Y';
const cfm = isQSLConfirmed(q.lotw_rcvd) || isQSLConfirmed(q.eqsl_rcvd) || isQSLConfirmed(q.qsl_rcvd);
const mine = q.callsign === call;
return (
<tr key={q.id ?? i} className="border-t border-border/40 even:bg-muted/[0.06] hover:bg-primary/[0.06] transition-colors">
+3 -2
View File
@@ -1,6 +1,7 @@
import { Star } from 'lucide-react';
import { Badge } from '@/components/ui/badge';
import { useI18n } from '@/lib/i18n';
import { isQSLConfirmed } from '@/lib/qsl';
import type { WorkedBeforeView } from '@/types';
type WorkedBefore = WorkedBeforeView;
@@ -97,10 +98,10 @@ export function CallHistoryPanel({ wb, busy, currentCall }: Props) {
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_sent ?? ''}</td>
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_rcvd ?? ''}</td>
<td className="px-2 py-1 border-b border-border/40 whitespace-nowrap text-muted-foreground">
{e.lotw_rcvd === 'Y' && (
{isQSLConfirmed(e.lotw_rcvd) && (
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-info-foreground bg-info mr-0.5" title={t('chp.lotwRcvd')}>L</span>
)}
{e.qsl_rcvd === 'Y' && (
{isQSLConfirmed(e.qsl_rcvd) && (
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-success-foreground bg-success mr-0.5" title={t('chp.bureauRcvd')}>B</span>
)}
</td>
+217
View File
@@ -0,0 +1,217 @@
// ChaseNewPanel — the stations PSK Reporter is hearing NEAR HERE that are new
// against the log.
//
// A DX cluster tells you what somebody chose to spot. This tells you what is
// actually being decoded in your own region, which is a different and often
// larger set: nobody spots the FT8 caller running ten watts from a rare square.
//
// The one thing an operator has to know, and the reason for the line at the
// bottom: PSK Reporter carries DIGITAL MODES ONLY. An empty panel means nothing
// new is being decoded on FT8/FT4/JS8 near here — not that the band is dead.
import { useEffect, useMemo, useState } from 'react';
import { Radar, Loader2, X } from 'lucide-react';
import { useI18n } from '@/lib/i18n';
import { markerColour } from '@/lib/spotMarkers';
import { cn } from '@/lib/utils';
import { GetChaseNewSpots } from '../../wailsjs/go/main/App';
export interface ChaseNewSpot {
call: string;
band: string;
mode: string;
freq_hz?: number;
grid?: string;
country?: string;
cont?: string;
dist_km?: number;
bearing?: number;
status?: string;
new_pfx?: boolean;
new_grid?: boolean;
lotw?: boolean;
at: string;
}
interface Props {
// Tuning the rig to a row is the whole point — a station heard on 14.074 is
// only useful if you can get there in one click.
onPick?: (s: ChaseNewSpot) => void;
onClose?: () => void;
}
// The categories, in priority order. A station can be several at once — a new
// band AND a new prefix — but a row shows ONE, the first that matches here.
//
// The order is by what would make an operator leave what they are doing: a new
// entity beats a new band on it, which beats a new mode, which beats a new slot;
// a prefix or a square is worth knowing but never worth interrupting a QSO for.
// Two badges on one line also made the list unreadable at a glance, which is the
// only thing this panel is for.
type Category = 'dxcc' | 'band' | 'mode' | 'slot' | 'pfx' | 'grid';
const CATEGORIES: Array<{ key: Category; labelKey: string; colour: string }> = [
{ key: 'dxcc', labelKey: 'clg2.newDxcc', colour: 'var(--danger)' },
{ key: 'band', labelKey: 'clg2.newBand', colour: 'var(--danger)' },
{ key: 'mode', labelKey: 'clg2.newMode', colour: 'var(--danger)' },
{ key: 'slot', labelKey: 'clg2.newSlot', colour: 'var(--danger)' },
{ key: 'pfx', labelKey: 'clg2.newPfx', colour: markerColour('new_pfx') },
{ key: 'grid', labelKey: 'clg2.newGrid', colour: markerColour('new_grid') },
];
// categoryOf is the single thing a row says about a station.
function categoryOf(s: ChaseNewSpot): Category | null {
switch (s.status) {
case 'new': return 'dxcc';
case 'new-band': return 'band';
case 'new-mode': return 'mode';
case 'new-slot': return 'slot';
}
if (s.new_pfx) return 'pfx';
if (s.new_grid) return 'grid';
return null;
}
const FILTER_KEY = 'opslog.chaseNewFilters';
function loadFilters(): Set<Category> {
try {
const raw = localStorage.getItem(FILTER_KEY);
if (raw) {
const list = JSON.parse(raw) as Category[];
if (Array.isArray(list)) return new Set(list);
}
} catch { /* a corrupt preference is not worth a broken panel */ }
return new Set(CATEGORIES.map((c) => c.key));
}
export function ChaseNewPanel({ onPick, onClose }: Props) {
const { t } = useI18n();
const [spots, setSpots] = useState<ChaseNewSpot[]>([]);
const [loaded, setLoaded] = useState(false);
const [on, setOn] = useState<Set<Category>>(loadFilters);
// Polled rather than pushed: the feed can deliver several a second under an
// opening, and an event per row would be a redraw per row for a list nobody
// reads that fast.
useEffect(() => {
let alive = true;
const tick = async () => {
try {
const r = ((await GetChaseNewSpots()) ?? []) as ChaseNewSpot[];
if (alive) { setSpots(r); setLoaded(true); }
} catch { /* the feed may not be up yet */ }
};
tick();
const id = window.setInterval(tick, 5000);
return () => { alive = false; window.clearInterval(id); };
}, []);
function toggle(k: Category) {
setOn((prev) => {
const next = new Set(prev);
if (next.has(k)) next.delete(k); else next.add(k);
try { localStorage.setItem(FILTER_KEY, JSON.stringify([...next])); } catch { /* not worth failing over */ }
return next;
});
}
const shown = useMemo(() => {
return spots.filter((s) => {
const c = categoryOf(s);
return c !== null && on.has(c);
});
}, [spots, on]);
return (
<div className="flex h-full flex-col rounded-md border border-border bg-card overflow-hidden">
<div className="flex items-center gap-2 border-b border-border px-2 py-1.5">
<Radar className="size-3.5 shrink-0 text-primary" />
<span className="shrink-0 text-xs font-semibold">{t('chn.title')}</span>
{/* Filters, in the same order and colours as the badges they hide. */}
<div className="flex flex-1 flex-wrap items-center gap-1">
{CATEGORIES.map((c) => (
<button
key={c.key}
type="button"
onClick={() => toggle(c.key)}
title={t('chn.filterHint')}
className={cn(
'rounded border px-1 py-px text-[9px] font-bold uppercase tracking-wide transition-colors',
on.has(c.key) ? 'border-transparent' : 'border-border text-muted-foreground opacity-50',
)}
style={on.has(c.key) ? { color: c.colour, borderColor: c.colour } : undefined}
>
{t(c.labelKey).replace(/^(NEW|NOUV)\s+/i, '')}
</button>
))}
</div>
<span className="shrink-0 text-[10px] text-muted-foreground">
{loaded ? t('chn.count', { n: shown.length }) : ''}
</span>
{onClose && (
<button
type="button"
onClick={onClose}
title={t('chn.close')}
className="shrink-0 rounded p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground"
>
<X className="size-3.5" />
</button>
)}
</div>
<div className="flex-1 overflow-y-auto">
{!loaded ? (
<div className="flex items-center justify-center gap-2 p-3 text-[11px] text-muted-foreground">
<Loader2 className="size-3 animate-spin" /> {t('chn.loading')}
</div>
) : shown.length === 0 ? (
<p className="p-3 text-[11px] text-muted-foreground leading-relaxed">
{spots.length === 0 ? t('chn.empty') : t('chn.allFiltered')}
</p>
) : (
<div className="divide-y divide-border/60">
{shown.map((s, i) => {
const c = categoryOf(s);
const def = CATEGORIES.find((x) => x.key === c);
return (
<button
key={`${s.call}-${s.band}-${s.mode}-${i}`}
type="button"
onClick={() => onPick?.(s)}
className="flex w-full items-center gap-1.5 px-2 py-1 text-left text-[11px] hover:bg-accent/40"
title={[
s.country,
s.grid,
s.dist_km ? `${s.dist_km} km` : '',
s.freq_hz ? `${(s.freq_hz / 1000).toFixed(1)} kHz` : '',
].filter(Boolean).join(' · ')}
>
<span className="w-[84px] shrink-0 truncate font-mono font-bold">{s.call}</span>
<span className="w-9 shrink-0 font-mono text-muted-foreground">{s.band}</span>
<span className="w-10 shrink-0 truncate text-muted-foreground">{s.mode}</span>
{/* No frequency column: clicking the row tunes the rig to it,
so the number was a thing to read and never to use. It is
still carried on the spot — the click is what needs it —
and shows in the row's tooltip for anyone who wants it.
The country takes the space it freed. */}
<span className="min-w-0 flex-1 truncate text-muted-foreground">{s.country ?? ''}</span>
{def && (
<span className="shrink-0 text-[9px] font-bold" style={{ color: def.colour }}>
{t(def.labelKey)}
</span>
)}
{s.lotw && <span className="shrink-0 text-[9px] text-info" title="LoTW">L</span>}
</button>
);
})}
</div>
)}
</div>
<p className="border-t border-border px-2 py-1 text-[10px] text-muted-foreground">{t('chn.digitalOnly')}</p>
</div>
);
}
@@ -49,6 +49,7 @@ type QSOMenuHandlers = {
onUpdateFromCty?: (ids: number[]) => void;
onUpdateFromQRZ?: (ids: number[]) => void;
onUpdateFromClublog?: (ids: number[]) => void;
onUpdateCountyFromULS?: (ids: number[]) => void;
onSendTo?: (service: string, ids: number[]) => void;
onSendRecording?: (ids: number[]) => void;
onSendEQSL?: (ids: number[]) => void;
+18 -9
View File
@@ -54,7 +54,9 @@ const QSL_STATUSES = [
{ v: 'I', label: 'qslm.ignore' },
];
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
// QSL routing methods for the paper-QSL route dropdowns, one per direction.
// These are the ADIF QSL Via enumeration (B/D/E) and go to QSL_SENT_VIA and
// QSL_RCVD_VIA — NOT to QSL_VIA, which holds the manager's callsign.
const QSL_VIA_OPTIONS = [
{ v: '_', label: 'qslm.leave' },
{ v: 'B', label: 'qslm.viaBureau' },
@@ -149,7 +151,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
const [qslSent, setQslSent] = useState('_');
const [qslRcvdDate, setQslRcvdDate] = useState('');
const [qslSentDate, setQslSentDate] = useState('');
const [qslVia, setQslVia] = useState('_');
const [qslVia, setQslVia] = useState('_'); // how the card was SENT
const [qslRcvdVia, setQslRcvdVia] = useState('_'); // how it CAME BACK
const [qslNotes, setQslNotes] = useState('');
const [qslComment, setQslComment] = useState('');
@@ -181,6 +184,7 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
sent_date: ymd(qslSentDate),
rcvd_date: ymd(qslRcvdDate),
via: qslVia === '_' ? '' : qslVia,
rcvd_via: qslRcvdVia === '_' ? '' : qslRcvdVia,
notes: qslNotes,
comment: qslComment,
} as any);
@@ -553,6 +557,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
{/* Paper-QSL apply form */}
{service === 'paper' && (
<div className="flex items-end flex-wrap gap-3 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
{/* Each direction carries its own route, and each sits with the status
and date it belongs to. A stack confirmed in one go usually arrived
the same way — a bureau delivery is exactly that — which is why the
route belongs on this form and not one QSO at a time in the editor. */}
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.qslReceived')}</label>
<div className="flex gap-1.5">
@@ -561,6 +569,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
</Select>
<Input type="date" className="h-8 w-36" value={qslRcvdDate} onChange={(e) => setQslRcvdDate(e.target.value)} title={t('qslm.qslRcvdDateTitle')} />
<Select value={qslRcvdVia} onValueChange={setQslRcvdVia}>
<SelectTrigger className="h-8 w-32" title={t('qslm.rcvdViaTitle')}><SelectValue /></SelectTrigger>
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
</Select>
</div>
</div>
<div className="flex flex-col gap-1">
@@ -571,15 +583,12 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
</Select>
<Input type="date" className="h-8 w-36" value={qslSentDate} onChange={(e) => setQslSentDate(e.target.value)} title={t('qslm.qslSentDateTitle')} />
<Select value={qslVia} onValueChange={setQslVia}>
<SelectTrigger className="h-8 w-32" title={t('qslm.sentViaTitle')}><SelectValue /></SelectTrigger>
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
</Select>
</div>
</div>
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.via')}</label>
<Select value={qslVia} onValueChange={setQslVia}>
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
</Select>
</div>
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.notes')}</label>
<Input className="h-8 w-40" value={qslNotes} onChange={(e) => setQslNotes(e.target.value)} placeholder={t('qslm.notesPlaceholder')} />
+15 -2
View File
@@ -1,5 +1,5 @@
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown, PencilLine, Trash2 } from 'lucide-react';
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown, PencilLine, Trash2, MapPin } from 'lucide-react';
import { useI18n } from '@/lib/i18n';
export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
@@ -10,6 +10,9 @@ type Props = {
onUpdateFromCty: (ids: number[]) => void;
onUpdateFromQRZ: (ids: number[]) => void;
onUpdateFromClublog?: (ids: number[]) => void;
// Only passed once the offline US county database has been downloaded —
// an entry that can only ever answer "no database" is not worth a line here.
onUpdateCountyFromULS?: (ids: number[]) => void;
onSendTo?: (service: string, ids: number[]) => void;
onSendRecording?: (ids: number[]) => void;
onSendEQSL?: (ids: number[]) => void;
@@ -36,7 +39,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
// which used to dismiss the menu the instant it appeared.)
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
const { t } = useI18n();
const boxRef = useRef<HTMLDivElement>(null);
// Starts at the cursor; the layout effect corrects it once the real size is
@@ -118,6 +121,16 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
<span>{t('qctx.updateClublog')}</span>
</button>
)}
{onUpdateCountyFromULS && (
<button
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
onClick={() => { onUpdateCountyFromULS(menu.ids); onClose(); }}
title={t('qctx.updateUlsCountyTitle')}
>
<MapPin className="size-4 text-info" />
<span>{t('qctx.updateUlsCounty')}</span>
</button>
)}
{(onSendRecording || onSendEQSL) && (
<>
+16 -3
View File
@@ -41,9 +41,14 @@ function pfxOf(call: string): string {
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
const MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE','MFSK','OLIVIA','JS8','JT65','JT9'];
// label holds an i18n key (resolved with t() at render time).
// V is in the list because the log HOLDS it: a LoTW download writes "verified"
// rather than "yes". A dropdown without it renders a verified contact as blank,
// which reads as "nothing recorded" — and the operator's next click would replace
// the strongest confirmation they have with whatever they picked instead.
const QSL_STATUSES = [
{ value: '_', label: 'qedit.qslDash' },
{ value: 'Y', label: 'qedit.qslYes' },
{ value: 'V', label: 'qedit.qslVerified' },
{ value: 'N', label: 'qedit.qslNo' },
{ value: 'R', label: 'qedit.qslRequested' },
{ value: 'I', label: 'qedit.qslIgnore' },
@@ -99,9 +104,14 @@ function StatusCell({ value }: { value?: string }) {
// every row; painting that orange (as it used to be, in the
// same orange as Requested) made the table shout about a
// non-problem and told you nothing apart.
// Verified green — ADIF's V: confirmed AND validated by the awarding body.
// It is what a LoTW download writes, and this table used
// to fall through to "No" for it — reporting a verified
// contact as unconfirmed, in the one place an operator
// goes to check.
// Ignore dashed — deliberately excluded, on purpose.
const label = v === 'Y' ? t('qedit.qslYes') : v === 'R' ? t('qedit.qslRequested') : v === 'I' ? t('qedit.qslIgnore') : v === 'M' ? t('qedit.statusModified') : t('qedit.qslNo');
const cls = v === 'Y' ? 'bg-success text-success-foreground border border-success'
const label = v === 'Y' ? t('qedit.qslYes') : v === 'V' ? t('qedit.qslVerified') : v === 'R' ? t('qedit.qslRequested') : v === 'I' ? t('qedit.qslIgnore') : v === 'M' ? t('qedit.statusModified') : t('qedit.qslNo');
const cls = v === 'Y' || v === 'V' ? 'bg-success text-success-foreground border border-success'
: v === 'R' ? 'bg-info-muted text-info-muted-foreground border border-info-border'
: v === 'M' ? 'bg-warning text-warning-foreground border border-warning'
: v === 'I' ? 'bg-muted text-muted-foreground border border-dashed border-border italic'
@@ -364,7 +374,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
// refreshes it. A cached answer from a thinner QRZ subscription (or any
// stale row) otherwise stayed for its whole 30-day life and the button
// appeared to do nothing.
const r: any = await LookupCallsignFresh(call);
// The QSO's OWN date: a ClubLog exception is resolved as of when the
// contact happened, not as of today. Re-looking-up a DXpedition contact
// months later must not move it to whatever the prefix means now.
const r: any = await LookupCallsignFresh(call, (dateOn || '').slice(0, 10));
// The lookup WINS over what is in the record — that is the point of asking
// for it. But an EMPTY result must never blank a good value: `??` only
// guards against null, and Go marshals an unset string as "", so a QRZ
+3 -1
View File
@@ -64,6 +64,7 @@ type Props = {
onUpdateFromCty?: (ids: number[]) => void;
onUpdateFromQRZ?: (ids: number[]) => void;
onUpdateFromClublog?: (ids: number[]) => void;
onUpdateCountyFromULS?: (ids: number[]) => void;
onSendTo?: (service: string, ids: number[]) => void;
onSendRecording?: (ids: number[]) => void;
onSendEQSL?: (ids: number[]) => void;
@@ -308,7 +309,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
return rest;
});
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
const { t } = useI18n();
const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false);
@@ -716,6 +717,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
onUpdateFromClublog={onUpdateFromClublog}
onUpdateCountyFromULS={onUpdateCountyFromULS}
onSendTo={onSendTo}
onSendRecording={onSendRecording}
onSendEQSL={onSendEQSL}
+33 -4
View File
@@ -13,6 +13,32 @@ export interface RecentSpotQSO {
freqKHz: number;
mode: string;
band?: string;
// Award references logged for this QSO, each one complete and ready to read
// on a cluster line ("POTA FR-11553"). Empty for an ordinary contact.
refs?: string[];
}
// SPOT_COMMENT_MAX is the DX cluster comment field: 30 characters, and nodes
// truncate what does not fit without saying so. Only the comment BUILT here is
// held to it — whatever the operator types is their own business.
const SPOT_COMMENT_MAX = 30;
// spotComment puts the award references after the mode, the order a cluster
// line is read in: "CW POTA FR-11553".
//
// A reference goes in whole or not at all. Truncation would leave "CW POTA" or
// half a park number on the air, which is worse than saying nothing: a spot
// nobody can act on still costs everyone who reads it.
export function spotComment(mode: string, refs?: string[]): string {
let out = (mode || '').trim();
for (const ref of refs ?? []) {
const one = ref.trim();
if (!one) continue;
const next = out ? `${out} ${one}` : one;
if (next.length > SPOT_COMMENT_MAX) continue; // a shorter one may still fit
out = next;
}
return out;
}
interface Props {
@@ -23,6 +49,9 @@ interface Props {
defaultCall: string;
defaultFreqKHz: number;
defaultMode: string;
// Award references on the QSO being entered (or on the last logged one),
// appended to the comment after the mode.
defaultRefs?: string[];
// Master cluster name, shown so the user knows where the spot goes.
targetName?: string;
recent: RecentSpotQSO[];
@@ -33,7 +62,7 @@ interface Props {
// the master cluster: callsign + frequency (kHz) + a free message (defaults
// to the mode). A "Latest QSOs" list lets the operator one-click a recent
// contact into the form.
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, targetName, recent, onSend }: Props) {
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, defaultRefs, targetName, recent, onSend }: Props) {
const { t } = useI18n();
const [call, setCall] = useState('');
const [freqKHz, setFreqKHz] = useState('');
@@ -48,12 +77,12 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
if (!open) return;
setCall((defaultCall || '').toUpperCase());
setFreqKHz(defaultFreqKHz > 0 ? trimKHz(defaultFreqKHz) : '');
setMessage(defaultMode || '');
setMessage(spotComment(defaultMode, defaultRefs));
setError('');
setOk(false);
// Focus the freq if the call is already known, else the call.
setTimeout(() => callRef.current?.focus(), 50);
}, [open, defaultCall, defaultFreqKHz, defaultMode]);
}, [open, defaultCall, defaultFreqKHz, defaultMode, defaultRefs]);
async function send() {
const c = call.trim().toUpperCase();
@@ -77,7 +106,7 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
function pick(q: RecentSpotQSO) {
setCall(q.callsign.toUpperCase());
if (q.freqKHz > 0) setFreqKHz(trimKHz(q.freqKHz));
if (q.mode) setMessage(q.mode);
setMessage(spotComment(q.mode, q.refs));
setError('');
}
+348 -42
View File
@@ -14,6 +14,7 @@ import {
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
GetAntGeniusSettings, SaveAntGeniusSettings,
GetTunerGeniusSettings, SaveTunerGeniusSettings,
GetPSUSettings, SavePSUSettings,
GetAmplifiers, SaveAmplifiers, GetAmpStatuses, AmpOperate,
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts,
GetAudioSettings, SaveAudioSettings, AudioApplyLevels, ListAudioInputDevices, ListAudioOutputDevices, PickAudioFolder, TestPTT,
@@ -50,9 +51,10 @@ import {
GetUIPref, SetUIPref,
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
GetFolderSync, SaveFolderSync, PickFolderSyncFolder, GetFolderSyncStatus, SyncFolderNow,
GetRelayAuto, SaveRelayAuto, GetStationDevices,
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
} from '../../wailsjs/go/main/App';
import type { profile as profileModels } from '../../wailsjs/go/models';
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
@@ -109,6 +111,7 @@ const MODE_CATALOG: Array<{ name: string; sent: string; rcvd: string }> = [
{ name: 'DIGITALVOICE', sent: '59', rcvd: '59' },
{ name: 'FT8', sent: '-10', rcvd: '-10' },
{ name: 'FT4', sent: '-10', rcvd: '-10' },
{ name: 'FT2', sent: '-10', rcvd: '-10' },
{ name: 'JS8', sent: '-10', rcvd: '-10' },
{ name: 'MSK144', sent: '+00', rcvd: '+00' },
{ name: 'JT65', sent: '-15', rcvd: '-15' },
@@ -186,6 +189,7 @@ type SectionId =
| 'external-services'
| 'udp'
| 'adifmon'
| 'foldersync'
| 'webpublish'
| 'lookup'
| 'lists-bands'
@@ -202,6 +206,7 @@ type SectionId =
| 'antenna'
| 'antgenius'
| 'tunergenius'
| 'psu'
| 'pgxl'
| 'flex'
| 'relayauto'
@@ -239,6 +244,29 @@ function VendorMark({ vendor }: { vendor: 'o3a' }) {
);
}
// PanelHost renders the selected settings panel, and exists so a panel may hold
// hooks of its own.
//
// The panels are nested inside SettingsModal, closing over its state — so they
// cannot be rendered as <Panel />: a nested function is a NEW component type on
// every parent render, which would unmount and remount the panel on each
// keystroke. They were therefore CALLED, `PANELS[selected]()`, and a call runs
// any hook inside them in SettingsModal's own hook list — conditionally, since
// only the open section is called. React counts those, and the window stopped
// drawing the moment such a section was opened (error #310, "rendered more
// hooks than during the previous render"). It had happened once and was headed
// off by a comment; the comment did not survive contact with the next panel.
//
// This host is module-scope, so its identity is stable and calling `render()`
// inside it puts those hooks in a component context that persists. `key` is the
// section, so switching sections REMOUNTS it — a fresh, consistent hook list per
// section, and no panel state leaking into the next one. Within a section the
// render prop is a new closure each parent render, which is how the panel keeps
// seeing current values.
function PanelHost({ render }: { render?: () => JSX.Element }) {
return render ? render() : null;
}
// buildTree returns the settings sidebar. The FlexRadio item only appears when
// the active CAT backend is a Flex (per-band antenna config is Flex-specific).
function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[] {
@@ -250,6 +278,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
{ kind: 'item', label: t('sec.antgenius'), id: 'antgenius', vendor: 'o3a' },
{ kind: 'item', label: t('sec.tunergenius'), id: 'tunergenius', vendor: 'o3a' },
{ kind: 'item', label: t('sec.pgxl'), id: 'pgxl' },
{ kind: 'item', label: t('sec.psu'), id: 'psu' },
...(flexAvailable ? [{ kind: 'item', label: t('sec.flex'), id: 'flex' } as TreeNode] : []),
{ kind: 'item', label: t('sec.relayauto'), id: 'relayauto' },
{ kind: 'item', label: t('sec.audio'), id: 'audio' },
@@ -278,6 +307,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
{ kind: 'item', label: t('sec.foldersync'), id: 'foldersync' },
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
{ kind: 'item', label: t('sec.database'), id: 'database' },
@@ -296,6 +326,7 @@ const SECTION_KEY: Partial<Record<SectionId, string>> = {
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
adifmon: 'sec.adifmon',
foldersync: 'sec.foldersync',
webpublish: 'sec.webpublish',
uscounties: 'sec.uscounties',
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
@@ -412,7 +443,7 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
'sahara': { bg: '#dcceab', card: '#faf6eb', accent: '#a55f14' },
'sahara': { bg: '#e6ded0', card: '#f3eee2', accent: '#c4501e' },
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
@@ -678,6 +709,120 @@ function ADIFMonitorPanel() {
);
}
// FolderSyncPanel: one operator, several PCs, one logbook through a folder they
// already synchronise (Seafile, OneDrive, Dropbox, a NAS share).
//
// The status half is the point of the panel. Every part of this runs on someone
// else's machine and on a sync client OpsLog cannot see, so "it is not working"
// has to be answerable from here: which other PCs have written to the folder,
// when each last did, and whether anything is sitting there unread.
function FolderSyncPanel() {
const { t } = useI18n();
const [cfg, setCfg] = useState<{ enabled: boolean; folder: string; machine: string }>({ enabled: false, folder: '', machine: '' });
const [st, setSt] = useState<any>(null);
const [loaded, setLoaded] = useState(false);
const [err, setErr] = useState('');
const [msg, setMsg] = useState('');
const [busy, setBusy] = useState(false);
useEffect(() => {
GetFolderSync()
.then((c: any) => { if (c) setCfg({ enabled: !!c.enabled, folder: c.folder ?? '', machine: c.machine ?? '' }); })
.catch(() => {})
.finally(() => setLoaded(true));
}, []);
// Polled while the panel is open: a first setup is verified by watching the
// other PC appear in this list, and that happens on the sync client's clock,
// not on any action taken here.
useEffect(() => {
let alive = true;
const tick = () => GetFolderSyncStatus().then((s: any) => { if (alive) setSt(s); }).catch(() => {});
tick();
const h = window.setInterval(tick, 3000);
return () => { alive = false; window.clearInterval(h); };
}, []);
const save = async (next: typeof cfg) => {
setCfg(next);
setErr(''); setMsg('');
try {
await SaveFolderSync(next as any);
setMsg(t('sync.saved'));
GetFolderSyncStatus().then(setSt).catch(() => {});
} catch (e: any) {
setErr(String(e?.message ?? e));
// The switch goes back off rather than sitting on while nothing is
// written: a folder that refused the write test would lose every contact
// in silence, which is the one outcome this feature must never have.
setCfg({ ...next, enabled: false });
}
};
const pick = async () => {
try {
const p = await PickFolderSyncFolder();
if (p) save({ ...cfg, folder: p });
} catch { /* dialog cancelled */ }
};
const syncNow = async () => {
setBusy(true); setErr(''); setMsg('');
try {
const n = await SyncFolderNow();
setMsg(t('sync.applied').replace('{n}', String(n)));
GetFolderSyncStatus().then(setSt).catch(() => {});
} catch (e: any) {
setErr(String(e?.message ?? e));
} finally { setBusy(false); }
};
const when = (iso: string) => (iso ? new Date(iso).toLocaleString() : t('sync.never'));
return (
<div className="space-y-4 max-w-2xl">
<p className="text-xs text-muted-foreground">{t('sync.hint')}</p>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={cfg.enabled} disabled={!loaded} onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
{t('sync.enable')}
</label>
<div className="grid grid-cols-[130px_1fr] items-center gap-2">
<span className="text-sm">{t('sync.machine')}</span>
<Input value={cfg.machine} placeholder="shack" className="h-8"
onChange={(e) => setCfg({ ...cfg, machine: e.target.value })}
onBlur={() => save(cfg)} />
<span className="text-sm">{t('sync.folder')}</span>
<div className="flex items-center gap-2 min-w-0">
<span className="flex-1 font-mono text-xs truncate" title={cfg.folder}>{cfg.folder || '—'}</span>
<Button variant="outline" size="sm" onClick={pick}><FolderOpen className="size-3.5 mr-1" /> {t('sync.choose')}</Button>
</div>
</div>
{err && <p className="text-xs text-destructive">{err}</p>}
{msg && <p className="text-xs text-success">{msg}</p>}
<SectionHeader title={t('sync.state')} />
<div className="rounded-md border border-border bg-muted/20 p-3 space-y-2 text-xs">
<div className="flex flex-wrap gap-x-6 gap-y-1 text-muted-foreground">
<span>{t('sync.thisPc')}: <span className="font-mono text-foreground">{st?.machine_id || '—'}</span></span>
<span>{t('sync.lastSync')}: <span className="text-foreground">{when(st?.last_sync ?? '')}</span></span>
<span>{t('sync.sent')}: <span className="text-foreground">{st?.sent ?? 0}</span></span>
<span>{t('sync.received')}: <span className="text-foreground">{st?.received ?? 0}</span></span>
</div>
{st?.error && <p className="text-destructive">{st.error}</p>}
<div className="space-y-1">
{(st?.peers ?? []).length === 0 && <p className="italic text-muted-foreground">{t('sync.noPeers')}</p>}
{(st?.peers ?? []).map((p: any) => (
<div key={p.machine} className="flex items-center gap-2">
<span className="font-mono truncate">{p.machine}</span>
<span className="text-muted-foreground">{when(p.last_change)}</span>
{p.behind > 0 && <span className="text-warning">{t('sync.behind')}</span>}
</div>
))}
</div>
</div>
<Button variant="outline" size="sm" onClick={syncNow} disabled={busy || !cfg.enabled}>
{busy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
{t('sync.now')}
</Button>
</div>
);
}
// AmpUI mirrors the backend AmpConfig — one configured amplifier.
type AmpUI = { id: string; name: string; enabled: boolean; type: string; transport: string; host: string; port: number; com_port: string; baud: number;
// Band-follow (ACOM): a SECOND serial port on which OpsLog answers the amp's
@@ -700,7 +845,13 @@ const MOTOR_BAND_DEFAULT_KHZ: Record<string, number> = {
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
};
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
// Fallback only: the rule editor sizes itself from the device's labels, which
// SaveStationDevices already normalises to the real relay count. This is what it
// falls back to when a device somehow has none, so it only needs to be in the
// right neighbourhood — but it is the third place that counts relays, and the
// first two disagreeing is what pinned the HTTP board at four.
const relayCountUI = (type: string) =>
type === 'kmtronic' || type === 'denkovi' ? 8 : type === 'httpgen' ? 4 : 5;
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
// id) — SPE / ACOM / PGXL alike. Module-scoped (not a nested component) so it
@@ -1252,7 +1403,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
digital_default: 'FT8', share_enabled: false, share_port: 4532,
digital_default: 'FT8', share_enabled: false, share_port: 4532, share_proto: 'rigctl', share_tci_port: 40001,
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
});
// While true, the next key press is captured as the PTT hotkey.
@@ -1271,6 +1422,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// Antenna Genius (4O3A) switch settings — TCP port is fixed at 9007.
const [antgenius, setAntgenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
const [tunergenius, setTunergenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
const [psuCfg, setPsuCfg] = useState<{ enabled: boolean; com_port: string; baud: number; address: number }>({ enabled: false, com_port: '', baud: 9600, address: 1 });
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
// each with its own connection. Saved as a whole via SaveAmplifiers.
@@ -1523,8 +1675,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [eqslTest, setEqslTest] = useState<{ ok: boolean; msg: string } | null>(null);
const [eqslTesting, setEqslTesting] = useState(false);
const [stationLocations, setStationLocations] = useState<string[]>([]);
// Active tab in the External Services panel — lifted here because
// PANELS[selected]() is called as a function, so panels can't hold hooks.
// Active tab in the External Services panel. Lifted here back when a panel
// could not hold hooks at all; PanelHost lifted that restriction, and this
// stays put because moving it down would reset the tab on every reopen —
// a choice now, not a workaround.
const [extSvcTab, setExtSvcTab] = useState<'qrz' | 'clublog' | 'hrdlog' | 'eqsl' | 'lotw' | 'cloudlog' | 'pota'>('qrz');
// POTA hunter-log sync (stamps pota_ref on local QSOs from your pota.app log).
const [potaToken, setPotaToken] = useState('');
@@ -1561,6 +1715,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// feed up or down — so the write has to go where those live.
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
const [chaseGrids, setChaseGrids] = useState(false);
const [chaseNew, setChaseNew] = useState(false);
const [spotTTL, setSpotTTL] = useState(0);
const [spotTTLText, setSpotTTLText] = useState('0');
const [gridStat, setGridStat] = useState<any>(null);
@@ -1573,6 +1728,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
(async () => {
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
try { setChaseNew(await GetChaseNew()); } catch { /* defaults stand */ }
try { setLinkedAmps((await GetLinkedAmps()) ?? []); } catch { /* defaults stand */ }
try { const n = await GetSpotTTLMinutes(); setSpotTTL(n); setSpotTTLText(String(n)); } catch { /* defaults stand */ }
})();
@@ -1619,9 +1775,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
return () => { unsub?.(); };
}, []);
const [profiles, setProfiles] = useState<Profile[]>([]);
// State for ProfilesPanel — lifted here because PANELS[selected]() calls
// the panel as a plain function, not as a JSX element, so any useState
// inside the panel function would violate the Rules of Hooks.
// State for ProfilesPanel. Lifted here back when a panel could not hold hooks
// — PanelHost lifted that restriction — and left here because the selection
// then survives switching sections, which is what an operator expects of it.
const [profileSelectedId, setProfileSelectedId] = useState<number>(0);
const [profileNameDraft, setProfileNameDraft] = useState<string>('');
@@ -1672,6 +1828,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
try { setPsuCfg(await GetPSUSettings() as any); } catch {}
try { setAmps(((await GetAmplifiers()) ?? []) as AmpUI[]); } catch {}
setBackupCfg(b as any);
setQslDefaults(qd as any);
@@ -1714,6 +1871,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
try { setPsuCfg(await GetPSUSettings() as any); } catch {}
try { setAmps(((await GetAmplifiers()) ?? []) as AmpUI[]); } catch {}
try { setBackupCfg(await GetBackupSettings() as any); } catch {}
try { setQslDefaults(await GetQSLDefaults() as any); } catch {}
@@ -1907,6 +2065,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
await SaveUltrabeamSettings(ultrabeam as any);
await SaveAntGeniusSettings(antgenius as any);
await SaveTunerGeniusSettings(tunergenius as any);
await SavePSUSettings(psuCfg as any);
await SaveAmplifiers(amps as any);
await SaveWinkeyerSettings(wk as any);
await SaveAudioSettings(audioCfg as any);
@@ -2209,6 +2368,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}
function LookupPanel() {
// The cache lifetime as TYPED, so the box can be emptied and re-filled.
// Re-seeded when the settings arrive from the backend — which is after the
// first render, so it cannot simply be the initial value.
const [ttlText, setTtlText] = useState(String(lookup.cache_ttl_days));
useEffect(() => { setTtlText(String(lookup.cache_ttl_days)); }, [lookup.cache_ttl_days]);
// Per-row provider editor — kept inline because it's only used twice
// and needs closure access to the parent state.
const row = (
@@ -2345,16 +2509,31 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="flex gap-3 items-end">
<div className="space-y-1 w-40">
<Label>{t('lk.ttl')}</Label>
{/* Raw text, not the stored number. Deriving the value from the
number on every keystroke made the box impossible to empty
and "0" itself unreachable, since parseInt('0') || 30 is 30.
Zero is now a real setting, so it has to be typeable. */}
<Input
type="number" min={1} max={3650}
value={lookup.cache_ttl_days}
onChange={(e) => setLookup((s) => ({ ...s, cache_ttl_days: parseInt(e.target.value) || 30 }))}
type="number" min={0} max={3650}
value={ttlText}
onChange={(e) => {
const raw = e.target.value;
setTtlText(raw);
const n = parseInt(raw, 10);
if (Number.isFinite(n) && n >= 0) {
setLookup((s) => ({ ...s, cache_ttl_days: Math.min(n, 3650) }));
}
}}
onBlur={() => setTtlText(String(lookup.cache_ttl_days))}
/>
</div>
<Button variant="outline" onClick={clearCache} disabled={clearing}>
{clearing ? t('lk.clearing') : t('lk.clearCache')}
</Button>
</div>
{lookup.cache_ttl_days === 0 && (
<p className="text-[11px] text-warning mt-2">{t('lk.cacheOff')}</p>
)}
</div>
</>
);
@@ -2990,15 +3169,47 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</label>
<p className="text-[11px] text-muted-foreground">{t('cat.shareHint')}</p>
{catCfg.share_enabled && (
<div className="space-y-1 max-w-[200px]">
<Label>{t('cat.sharePort')}</Label>
<PortInput
value={catCfg.share_port || 4532}
fallback={4532}
onChange={(n) => setCatCfg((s) => ({ ...s, share_port: n }))}
/>
<div className="flex flex-wrap items-end gap-4">
{/* One protocol or the other. They answer the same questions about
the same radio, and no program speaks both so this is a
choice, not two switches. */}
<div className="space-y-1">
<Label>{t('cat.shareProto')}</Label>
<Select
value={(catCfg as any).share_proto === 'tci' ? 'tci' : 'rigctl'}
onValueChange={(v) => setCatCfg((s) => ({ ...s, share_proto: v } as any))}
>
<SelectTrigger className="h-8 w-[240px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="rigctl">{t('cat.shareRigctl')}</SelectItem>
<SelectItem value="tci">{t('cat.shareTci')}</SelectItem>
</SelectContent>
</Select>
</div>
<div className="space-y-1 max-w-[200px]">
<Label>{t('cat.sharePort')}</Label>
{(catCfg as any).share_proto === 'tci' ? (
<PortInput
value={(catCfg as any).share_tci_port || 40001}
fallback={40001}
onChange={(n) => setCatCfg((s) => ({ ...s, share_tci_port: n } as any))}
/>
) : (
<PortInput
value={catCfg.share_port || 4532}
fallback={4532}
onChange={(n) => setCatCfg((s) => ({ ...s, share_port: n }))}
/>
)}
</div>
</div>
)}
{catCfg.share_enabled && (catCfg as any).share_proto === 'tci' && catCfg.backend === 'tci' && (
// Both ends TCI: ExpertSDR is almost certainly already holding
// 40001 on this machine, and our server would fail to bind. Worth
// saying here rather than leaving it in the log.
<p className="text-[11px] text-warning">{t('cat.shareTciClash')}</p>
)}
</div>
{/* PTT hotkey a keyboard key that keys the rig while OpsLog is focused.
Uses the Audio PTT method (CAT / RTS / DTR), falling back to CAT. */}
@@ -3070,7 +3281,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
setRotatorTest(null);
try {
await TestRotatorDevice(dev as any, sub);
setRotatorTest({ ok: true, msg: (dev as any).type === 'rotgenius' ? t('rot.testOkRG') : t('cat.rotatorOk') });
// Say what the test ACTUALLY did, which is not the same on every backend.
//
// PstRotator and a Rotator Genius are sent a move to 0°; a SPID, an ARCO
// and a DCU-1 are asked their heading and nothing turns. They all used to
// report "Packet sent — the antenna should swing to north. If it didn't,
// check PstRotator's UDP listener" — which named a program that is not in
// the path, for a move that was never commanded. An operator on a tower
// read that as the test having failed.
const type = (dev as any).type;
const msg = type === 'rotgenius' ? t('rot.testOkRG')
: (type === 'spid' || type === 'arco' || type === 'dcu1') ? t('rot.testOkRead')
: t('cat.rotatorOk');
setRotatorTest({ ok: true, msg });
} catch (e: any) {
setRotatorTest({ ok: false, msg: String(e?.message ?? e) });
} finally {
@@ -3374,6 +3597,58 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
);
}
// Bench power supply over Modbus RTU. OpsLog reads everything and writes one
// register — the output on/off. The voltage and current SET points are shown
// because they are worth seeing, and are not editable here: they belong to the
// supply's front panel, and a logbook that can set them can set them wrong.
// The COM ports come from the list SettingsModal already loads for the
// Winkeyer panel — one machine, one set of serial ports, fetched once. A hook
// of its own would be legal now (see PanelHost) and would fetch them twice.
function PSUPanelSettings() {
const ports = wkPorts;
const setPorts = setWkPorts;
return (
<>
<SectionHeader title={t('psu.title')} hint={t('psu.hint')} />
<div className="space-y-4 max-w-xl">
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={psuCfg.enabled} onCheckedChange={(c) => setPsuCfg((s) => ({ ...s, enabled: !!c }))} />
{t('psu.enable')}
</label>
<div className="grid grid-cols-3 gap-3">
<div className="space-y-1">
<Label>{t('psu.port')}</Label>
<div className="flex items-center gap-2">
<Select value={psuCfg.com_port || '_'} onValueChange={(v) => setPsuCfg((s) => ({ ...s, com_port: v === '_' ? '' : v }))}>
<SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger>
<SelectContent>
{ports.length === 0 && <SelectItem value="_" disabled>{t('station.noPorts')}</SelectItem>}
{ports.map((p) => <SelectItem key={p} value={p}>{p}</SelectItem>)}
</SelectContent>
</Select>
<Button size="sm" variant="outline" onClick={() => ListSerialPorts().then((p) => setPorts((p ?? []) as string[])).catch(() => {})}>
</Button>
</div>
</div>
<div className="space-y-1">
<Label>{t('psu.baud')}</Label>
<Input className="font-mono" value={String(psuCfg.baud ?? 9600)}
onChange={(e) => setPsuCfg((s) => ({ ...s, baud: parseInt(e.target.value.replace(/[^0-9]/g, ''), 10) || 0 }))} />
</div>
<div className="space-y-1">
<Label>{t('psu.address')}</Label>
<Input className="font-mono" value={String(psuCfg.address ?? 1)}
onChange={(e) => setPsuCfg((s) => ({ ...s, address: parseInt(e.target.value.replace(/[^0-9]/g, ''), 10) || 0 }))} />
</div>
</div>
<p className="text-xs text-muted-foreground">{t('psu.wireHint')}</p>
<p className="text-xs text-warning">{t('psu.writeScope')}</p>
</div>
</>
);
}
function PGXLPanelSettings() {
// The stored `type` stays a flat value ("spe13", "acom700", "pgxl"); the UI
// presents it as brand + model.
@@ -3665,7 +3940,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const isRG = dev.type === 'rotgenius';
const isARCO = dev.type === 'arco';
const isDCU1 = dev.type === 'dcu1';
const isSerialCap = isARCO || isDCU1; // COM-port or serial-over-IP controllers
// A SPID has a COM port and nothing else — no network transport to
// offer, which is the whole point of driving it without PstRotator.
const isSPID = dev.type === 'spid';
const isSerialCap = isARCO || isDCU1 || isSPID; // COM-port or serial-over-IP controllers
const transport = dev.transport ?? 'tcp';
return (
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
@@ -3684,13 +3962,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
(placeholder must match the ARCO's LAN menu), PstRotator 12000. */}
<Select value={dev.type ?? 'pst'}
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' ? { transport: 'serial' } : {}) })}>
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' || v === 'spid' ? { transport: 'serial' } : {}), ...(v === 'spid' ? { baud: 600, spid_model: 'rot2prog' } : {}) })}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC)</SelectItem>
<SelectItem value="dcu1">Hy-Gain DCU-1 (RotorCard DXA, Rotor-EZ, Green Heron)</SelectItem>
<SelectItem value="spid">SPID / AlfaSpid (RAS, BIG-RAS, MD-01, MD-02)</SelectItem>
</SelectContent>
</Select>
</div>
@@ -3707,8 +3986,24 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</Select>
</div>
)}
{/* SPID: pick the dialect. They differ in reply length AND baud
rate, so this cannot be detected a wrong choice is a
controller that never answers. */}
{isSPID && (
<div className="space-y-1">
<Label>{t('rot.spidModel')}</Label>
<Select value={dev.spid_model || 'rot2prog'}
onValueChange={(v) => patch(i, { spid_model: v as any, baud: v === 'rot1prog' ? 1200 : 600 })}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="rot2prog">Rot2Prog (RAS, BIG-RAS/HR, MD-01, MD-02)</SelectItem>
<SelectItem value="rot1prog">Rot1Prog (azimuth only)</SelectItem>
</SelectContent>
</Select>
</div>
)}
{/* ARCO and DCU-1 controllers reach over the LAN (TCP) or a serial COM. */}
{isSerialCap && (
{isSerialCap && !isSPID && (
<div className="space-y-1">
<Label>Connection</Label>
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
@@ -3742,10 +4037,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Button size="sm" variant="outline" className="h-9" onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>
<ArrowDown className="size-3.5 rotate-90" />
</Button>
<Select value={String(dev.baud || 9600)} onValueChange={(v) => patch(i, { baud: Number(v) })}>
{/* A SPID runs at 600 or 1200 baud not a typo, a pulse
controller has nothing to say quickly. Offering only the
usual rates would have left it permanently mute. */}
<Select value={String(dev.baud || (isSPID ? 600 : 9600))} onValueChange={(v) => patch(i, { baud: Number(v) })}>
<SelectTrigger className="h-9 w-28"><SelectValue /></SelectTrigger>
<SelectContent>
{[4800, 9600, 19200, 38400, 57600].map((b) => (
{(isSPID ? [600, 1200, 2400, 4800, 9600] : [4800, 9600, 19200, 38400, 57600]).map((b) => (
<SelectItem key={b} value={String(b)}>{b} baud</SelectItem>
))}
</SelectContent>
@@ -3775,6 +4073,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
{isDCU1 && <p className="text-xs text-muted-foreground">{t('rot.dcu1Hint')}</p>}
{isSPID && <p className="text-xs text-muted-foreground">{t('rot.spidHint')}</p>}
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
{multi && (
<div className="space-y-1 max-w-xs">
@@ -4338,6 +4637,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
)}
</div>
{/* Chase new its own option, NOT nested under grid chasing. Chasing
squares and chasing entities are different wants; they only share
the PSK Reporter feed, which either one brings up. */}
<div className="border-t border-border/60 pt-3 space-y-2">
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={chaseNew} className="mt-0.5"
onCheckedChange={(c) => { setChaseNew(!!c); SetChaseNew(!!c).catch(() => {}); }} />
<span>{t('chn.option')} <span className="text-xs text-muted-foreground">{t('chn.optionHelp')}</span></span>
</label>
</div>
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
switching it on adds two of them the operator should see that
happen where it happens rather than find nodes they did not add. */}
@@ -4601,10 +4911,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}
return (
<>
<SectionHeader
title={t('sec.backup')}
hint={mysqlCfg.enabled ? t('bk.hintMysql') : t('bk.hint')}
/>
{/* No hint: everyone knows what a backup is. */}
<SectionHeader title={t('sec.backup')} />
<div className="space-y-5 max-w-2xl">
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox
@@ -5522,7 +5830,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Button variant="outline" size="sm" onClick={openExisting}><Database className="size-3.5" /> {t('db.openExisting')}</Button>
<Button variant="outline" size="sm" onClick={saveCopy}><Copy className="size-3.5" /> {t('db.saveCopy')}</Button>
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
{/* Pushed right: these two act on the file that is already there,
while the four on the left change WHICH file is in use. */}
<Button variant="outline" size="sm" className="ml-auto" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
</div>
{/* The DB pointer is only read at startup, so offer the restart inline. */}
@@ -5555,7 +5865,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</SelectContent>
</Select>
</div>
<p className="text-[11px] text-muted-foreground max-w-2xl mb-3">{t('db.profileHint')}</p>
{/* Compact active-backend confirmation / MySQL-fallback warning. */}
{backendStatus && (
@@ -5596,7 +5905,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{/* MySQL: shared logbook connection (multi-operator) */}
{mysqlCfg.enabled && (
<div className="space-y-3 max-w-2xl">
<div className="text-[11px] text-muted-foreground leading-relaxed">{t('db.mysqlHint')}</div>
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
<Label className="text-sm">{t('db.host')}</Label>
<Input className="h-8" placeholder="192.168.1.10 or db.example.com" value={mysqlCfg.host} onChange={(e) => setMysqlField({ host: e.target.value })} />
@@ -6087,12 +6395,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}}
className="mt-0.5"
/>
<span>
{t('gen.mwShow')}
<span className="block text-xs text-muted-foreground mt-0.5">
{t('gen.mwDesc')}
</span>
</span>
{/* No explanatory line: every operator knows what Most Wanted is. */}
<span>{t('gen.mwShow')}</span>
</label>
<div className="flex items-center gap-3 pl-6">
<Button variant="outline" size="sm" className="h-8" disabled={mwBusy}
@@ -6288,10 +6592,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
'lists-modes': ModesPanel,
cluster: ClusterPanel,
udp: UDPIntegrationsPanelWrapper,
// Rendered as a real element (not called as a bare function) so its own hooks
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
// is a plain call and hook-holding panels must go through JSX like this.
// Module-scope components, wrapped so their props can be passed. The nested
// panels below go through PanelHost instead — which is what now lets either
// kind hold hooks.
adifmon: () => <ADIFMonitorPanel />,
foldersync: () => <FolderSyncPanel />,
webpublish: () => <WebPublishPanel />,
relayauto: () => <RelayAutoPanel />,
backup: BackupPanel,
@@ -6305,6 +6610,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
antenna: UltrabeamPanel,
antgenius: AntGeniusPanelSettings,
tunergenius: TunerGeniusPanelSettings,
psu: PSUPanelSettings,
pgxl: PGXLPanelSettings,
flex: () => <FlexBandPanel bands={lists.bands ?? []} />,
audio: AudioPanel,
@@ -6332,7 +6638,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-3 font-semibold">
{breadcrumb}
</div>
{PANELS[selected]?.()}
<PanelHost key={selected} render={PANELS[selected]} />
{err && (
<div className="mt-6 text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded-md px-3 py-2 max-w-2xl">
+224 -23
View File
@@ -3,27 +3,88 @@ import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Squar
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Checkbox } from '@/components/ui/checkbox';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n';
import { writeUiPref } from '@/lib/uiPref';
import { subscribeRotorHeading, pokeRotorHeading } from '@/lib/rotorHeading';
import { RotorCompass } from '@/components/RotorCompass';
import { AmpCard } from '@/components/AmpCard';
import { TunerCard } from '@/components/TunerCard';
import type { TGStatus } from '@/components/TunerGeniusPanel';
import {
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
RotatorGoTo, RotatorStop, SetActiveRotor,
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
GetAmpStatuses, GetFlexState,
GetTunerGeniusStatus, GetTunerGeniusSettings,
GetPSUStatus, GetPSUSettings, SetPSUOutput,
} from '../../wailsjs/go/main/App';
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
type Device = { id: string; type: string; name: string; host: string; user?: string; pass?: string; channels?: number; labels: string[] };
type PSUState = { connected: boolean; on: boolean; volts: number; amps: number; watts: number; set_volts: number; set_amps: number; protected: number; error?: string };
// The bench supply. One button — the output — and the three numbers that say
// what it is actually delivering.
//
// The SET points are shown beside them, small, because "13.8 V set" next to
// "0.02 A out" is how an operator sees at a glance that the supply is on but
// the radio is not drawing. They are not editable: OpsLog reads them and never
// writes them, which is the whole safety story of this device.
function PSUCard({ st, busy, onToggle, t }: {
st: PSUState; busy: boolean; onToggle: (on: boolean) => void; t: (k: string, v?: any) => string;
}) {
const tripped = (st.protected ?? 0) !== 0;
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<Power className="size-4 text-primary" />
<div className="text-sm font-semibold truncate">{t('psu.title')}</div>
<span className={cn('ml-auto size-2 rounded-full shrink-0', st.connected ? 'bg-success' : 'bg-muted-foreground/40')}
title={st.connected ? t('station.online') : (st.error || t('psu.offline'))} />
</div>
<div className="p-3 space-y-2">
<div className="flex items-center gap-3">
<button type="button" disabled={!st.connected || busy}
onClick={() => onToggle(!st.on)}
className={cn('flex items-center gap-2 rounded-md border px-3 py-1.5 transition-colors disabled:opacity-40',
st.on ? 'bg-success/15 border-success/50' : 'bg-muted/30 border-border hover:bg-muted')}>
<span className={cn('flex items-center justify-center size-6 rounded shrink-0',
st.on ? 'bg-success text-success-foreground' : 'bg-muted-foreground/15 text-muted-foreground')}>
{busy ? <Loader2 className="size-3.5 animate-spin" /> : <Power className="size-3.5" />}
</span>
<span className="text-xs font-semibold">{t('psu.output')}</span>
<span className={cn('text-[10px] font-bold', st.on ? 'text-success' : 'text-muted-foreground/60')}>
{st.on ? t('station.on') : t('station.off')}
</span>
</button>
<div className="flex-1 min-w-0 font-mono tabular-nums text-right">
<span className="text-lg font-bold">{(st.volts ?? 0).toFixed(2)}</span><span className="text-xs text-muted-foreground"> V</span>
<span className="text-lg font-bold ml-3">{(st.amps ?? 0).toFixed(3)}</span><span className="text-xs text-muted-foreground"> A</span>
</div>
</div>
<div className="flex items-center justify-between text-[11px] text-muted-foreground font-mono">
<span>{(st.watts ?? 0).toFixed(1)} W</span>
<span>{t('psu.setTo')} {(st.set_volts ?? 0).toFixed(2)} V / {(st.set_amps ?? 0).toFixed(3)} A</span>
</div>
{tripped && (
<div className="text-[11px] font-bold text-danger">{t('psu.tripped')} (0x{(st.protected ?? 0).toString(16).toUpperCase()})</div>
)}
</div>
</div>
);
}
type Device = {
id: string; type: string; name: string; host: string;
user?: string; pass?: string; channels?: number; labels: string[];
// Generic HTTP board only. The per-relay URLs win over the patterns.
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string; insecure_tls?: boolean;
};
type Relay = { number: number; label: string; on: boolean };
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
@@ -34,15 +95,21 @@ type DevStatus = { id: string; name: string; type: string; connected: boolean; e
const CARD_MIN = 430; // narrowest a card may get before "Auto" drops a column
const GRID_GAP = 16; // px between cards, both axes
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2 };
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay' };
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2, httpgen: 4 };
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay', httpgen: 'HTTP relay' };
// Relay count for a configured device: fixed by type, except Denkovi (4/8) and
// the generic USB-serial board, whose channel count the user picks.
// chanCount is the relay count for a device. It MUST agree with
// deviceRelayCount in app.go: the two decide how many labels and URL rows the
// editor shows and how many relays the driver is built for, and a type known to
// one and not the other silently pins the count to its fixed default — which is
// exactly what happened when the HTTP board was added here and not below.
const chanCount = (d: Device): number =>
(d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8)
: d.type === 'dingtian' ? (d.channels && d.channels >= 1 ? d.channels : 2)
: (RELAY_COUNT[d.type] ?? 5);
: d.type === 'httpgen' ? (d.channels && d.channels >= 1 ? d.channels : 4)
: (RELAY_COUNT[d.type] ?? 5);
function blankDevice(): Device {
return { id: '', type: 'webswitch', name: '', host: '', user: '', pass: '', labels: Array(5).fill('') };
@@ -446,6 +513,32 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
return () => { alive = false; window.clearInterval(id); };
}, []);
// Bench power supply. Polled slower than the tuner: it has no meters that
// track a transmission, and every poll is three Modbus exchanges on a 9600
// baud line the operator may also be using to switch the output.
const [psu, setPsu] = useState<PSUState>({ connected: false, on: false, volts: 0, amps: 0, watts: 0, set_volts: 0, set_amps: 0, protected: 0 });
const [psuEnabled, setPsuEnabled] = useState(false);
const [psuBusy, setPsuBusy] = useState(false);
useEffect(() => {
let alive = true;
const load = async () => {
try { const en: any = await GetPSUSettings(); if (alive) setPsuEnabled(!!en?.enabled); } catch {}
try { const st: any = await GetPSUStatus(); if (alive && st) setPsu(st as PSUState); } catch {}
};
load();
const id = window.setInterval(load, 1500);
return () => { alive = false; window.clearInterval(id); };
}, []);
const togglePSU = useCallback(async (on: boolean) => {
setPsuBusy(true);
// No optimistic flip here, unlike the relays: the supply echoes the value it
// actually set, so showing ON before it confirms would be showing something
// OpsLog does not know. A power switch is the wrong place to guess.
try { await SetPSUOutput(on); const st: any = await GetPSUStatus(); if (st) setPsu(st as PSUState); }
catch { /* the poll will tell the truth */ }
finally { setPsuBusy(false); }
}, []);
const loadDevices = useCallback(async () => {
try { setDevices(((await GetStationDevices()) ?? []) as Device[]); } catch { /* db not ready */ }
}, []);
@@ -456,19 +549,21 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
setStatus(Object.fromEntries(s.map((d) => [d.id, d])));
} catch { /* ignore transient */ }
}, []);
const pollRot = useCallback(async () => {
try { setRot((await GetRotatorHeading()) as any); } catch { /* ignore */ }
}, []);
const pollAnt = useCallback(async () => {
try { setAnt((await GetUltrabeamStatus()) as any); } catch { /* ignore */ }
}, []);
useEffect(() => { loadDevices(); }, [loadDevices]);
// The heading comes from the shared poller: one loop for the whole app, fast
// while the antenna turns and slow while it is parked. Every poll opens and
// closes the controller's port, and this panel used to run its own alongside
// the status bar's — the same controller asked twice over.
useEffect(() => subscribeRotorHeading((h) => setRot(h as any)), []);
useEffect(() => {
poll(); pollRot(); pollAnt();
const id = window.setInterval(() => { poll(); pollRot(); pollAnt(); }, 3000);
poll(); pollAnt();
const id = window.setInterval(() => { poll(); pollAnt(); }, 3000);
return () => window.clearInterval(id);
}, [poll, pollRot, pollAnt, devices.length]);
}, [poll, pollAnt, devices.length]);
const persistOrder = (next: string[]) => { setOrder(next); writeUiPref('opslog.stationOrder', JSON.stringify(next)); };
// Reorder so `dragged` lands just before `target`.
@@ -516,16 +611,25 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
const deviceCard = (dev: Device) => {
const st = status[dev.id];
const relays = st?.relays ?? dev.labels.map((label, i) => ({ number: i + 1, label, on: false }));
// The generic HTTP board has no address of its own and nothing to poll: its
// relays can each live on a different box, and no status endpoint is read
// back. So no host under the name, no online dot, and the buttons are never
// greyed out waiting for a connection that is never made.
const fireAndForget = dev.type === 'httpgen';
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<PlugZap className="size-4 text-primary" />
<div className="min-w-0">
<div className="text-sm font-semibold truncate">{dev.name || TYPE_LABEL[dev.type]}</div>
<div className="text-[10px] text-muted-foreground font-mono truncate">{TYPE_LABEL[dev.type]} · {dev.host}</div>
<div className="text-[10px] text-muted-foreground font-mono truncate">
{TYPE_LABEL[dev.type]}{fireAndForget || !dev.host ? '' : ` · ${dev.host}`}
</div>
</div>
<span className={cn('ml-auto size-2 rounded-full shrink-0', st?.connected ? 'bg-success' : 'bg-muted-foreground/40')}
title={st?.connected ? t('station.online') : (st?.error || t('station.offline'))} />
{fireAndForget ? <span className="ml-auto" /> : (
<span className={cn('ml-auto size-2 rounded-full shrink-0', st?.connected ? 'bg-success' : 'bg-muted-foreground/40')}
title={st?.connected ? t('station.online') : (st?.error || t('station.offline'))} />
)}
<button className="text-muted-foreground hover:text-foreground" title={t('station.edit')}
onClick={() => setEditing({ ...dev, labels: [...dev.labels] })}><Pencil className="size-3.5" /></button>
<button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
@@ -538,7 +642,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
const key = `${dev.id}:${r.number}`;
const label = r.label || `${t('station.relay')} ${r.number}`;
return (
<button key={r.number} type="button" disabled={!st?.connected}
<button key={r.number} type="button" disabled={!fireAndForget && !st?.connected}
title={label}
onClick={() => toggle(dev, r.number, !r.on)}
className={cn('w-[150px] flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors disabled:opacity-40',
@@ -565,7 +669,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
// full-width, and they need that room here too.
const widgets: { id: string; node: React.ReactNode; wide?: boolean }[] = [];
if (rot.enabled) {
widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pollRot} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pokeRotorHeading} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
}
if (ant.enabled) {
widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
@@ -574,6 +678,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
for (const amp of amps) widgets.push({ id: `amp:${amp.id}`, node: <AmpCard amp={amp} flex={flexState} t={t} />, wide: true });
// Tuner Genius XL card (identical to the Flex panel's).
if (tgEnabled) widgets.push({ id: 'tuner', node: <TunerCard status={tg} t={t} />, wide: true });
if (psuEnabled) widgets.push({ id: 'psu', node: <PSUCard st={psu} busy={psuBusy} onToggle={togglePSU} t={t} /> });
for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) });
const rank = (id: string) => { const i = order.indexOf(id); return i < 0 ? 1e6 : i; };
@@ -675,6 +780,20 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
const isDingtian = device.type === 'dingtian';
const isDenkovi = device.type === 'denkovi';
const isUsbRelay = device.type === 'usbrelay';
const isHTTPGen = device.type === 'httpgen';
// {value} sends a relay's label, so a URL using it on an unnamed relay would
// go out with an empty parameter. Warn while it is being typed rather than at
// the moment an antenna fails to switch.
const valueNeedsLabels = isHTTPGen
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
.some((s) => (s ?? '').includes('{value}'))
&& device.labels.some((l) => !l.trim());
// Any https:// among this board's URLs. A relay box on the LAN signs its own
// certificate, so HTTPS to one cannot be verified — the operator has to say
// whether to accept that, and the question only arises once they type https.
const usesHTTPS = isHTTPGen
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
.some((u) => (u ?? '').trim().toLowerCase().startsWith('https://'));
// COM ports for the generic USB-serial relay picker.
const [serialPorts, setSerialPorts] = useState<string[]>([]);
useEffect(() => {
@@ -726,6 +845,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
<SelectItem value="dingtian">Dingtian IOT relay (LAN / WiFi)</SelectItem>
<SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
<SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
<SelectItem value="httpgen">{t('station.typeHttpGen')}</SelectItem>
</SelectContent>
</Select>
</div>
@@ -734,7 +854,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
<Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
</div>
</div>
{(isDenkovi || isUsbRelay || isDingtian) && (
{(isDenkovi || isUsbRelay || isDingtian || isHTTPGen) && (
<div className="space-y-1 max-w-[10rem]">
<Label>{t('station.channels')}</Label>
<Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
@@ -782,7 +902,12 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
</div>
<p className="text-[10px] text-muted-foreground">{t('station.usbRelayHint')}</p>
</div>
) : (
) : isHTTPGen ? null : (
/* No Host for the generic board: its driver never reads one. Each URL
below carries its own address, and they need not even share it — one
relay can sit on a different box from the next. A field that changes
nothing is worse than no field: it reads as the thing to fill in first,
and then the URLs look like they should be relative to it. */
<div className={cn('grid gap-3', (isKM || isDingtian) ? 'grid-cols-3' : 'grid-cols-1')}>
<div className={cn('space-y-1', (isKM || isDingtian) ? '' : 'max-w-xs')}>
<Label>{t('station.host')}</Label>
@@ -820,8 +945,76 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
)}
</div>
)}
{/* Generic HTTP board: a URL to switch each relay on and one to switch it
off. Two ways to fill it, and the per-relay one is why this type
exists — a hand-made switch often has URLs with nothing in common
between channels, which no pattern can express. */}
{isHTTPGen && (
<div className="space-y-3 rounded-md border border-border/60 p-3">
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label>{t('station.onPattern')}</Label>
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=on"
value={device.on_pattern ?? ''}
onChange={(e) => onChange({ ...device, on_pattern: e.target.value })} />
</div>
<div className="space-y-1">
<Label>{t('station.offPattern')}</Label>
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=off"
value={device.off_pattern ?? ''}
onChange={(e) => onChange({ ...device, off_pattern: e.target.value })} />
</div>
</div>
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
{/* Shown only once an https:// URL is actually in use. A board on
plain HTTP has no certificate to argue about, and an option that
cannot matter yet is one more thing to wonder about. */}
{usesHTTPS && (
<label className="flex items-start gap-2 text-xs cursor-pointer">
<Checkbox className="mt-0.5" checked={!!device.insecure_tls}
onCheckedChange={(c) => onChange({ ...device, insecure_tls: !!c })} />
<span>
{t('station.insecureTls')}
<span className="block text-[10px] text-muted-foreground">{t('station.insecureTlsHint')}</span>
</span>
</label>
)}
<div className="space-y-1">
<Label>{t('station.perRelayUrls')}</Label>
<div className="space-y-1">
{device.labels.map((_, i) => (
<div key={i} className="grid grid-cols-[2.5rem_1fr_1fr] items-center gap-2">
<span className="text-[11px] text-muted-foreground">{i + 1}</span>
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.onUrlPh')}
value={device.on_urls?.[i] ?? ''}
onChange={(e) => {
const on_urls = [...(device.on_urls ?? [])];
while (on_urls.length < device.labels.length) on_urls.push('');
on_urls[i] = e.target.value;
onChange({ ...device, on_urls });
}} />
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.offUrlPh')}
value={device.off_urls?.[i] ?? ''}
onChange={(e) => {
const off_urls = [...(device.off_urls ?? [])];
while (off_urls.length < device.labels.length) off_urls.push('');
off_urls[i] = e.target.value;
onChange({ ...device, off_urls });
}} />
</div>
))}
</div>
<div className="text-[10px] text-muted-foreground">{t('station.perRelayHint')}</div>
</div>
</div>
)}
<div className="space-y-1">
<Label>{t('station.labels')}</Label>
{/* {value} sends the label, so an unnamed relay would go out as "?on=".
Said here, beside the empty box, rather than when the antenna fails
to switch and the log is the only place that explains why. */}
{valueNeedsLabels && <p className="text-[10px] text-warning">{t('station.valueNeedsLabels')}</p>}
<div className="grid grid-cols-4 gap-2">
{device.labels.map((lab, i) => (
<Input key={i} value={lab} placeholder={`${t('station.relay')} ${i + 1}`} className="h-8 text-xs"
@@ -837,12 +1030,20 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
</span>
)}
<div className="ml-auto flex gap-2">
<Button size="sm" variant="outline" onClick={testDevice} disabled={testing || !device.host.trim()}>
{testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <PlugZap className="size-3.5 mr-1" />}
{t('station.test')}
</Button>
{/* No connection test for the generic board, and no host required to
save it. There is nothing to test: it has no address of its own and
no status to read — its URLs are fired and forgotten. A button that
can only ever say "OK, 4 relays" tests nothing, and a Save greyed
out for a missing host made a perfectly complete configuration —
four full URLs — impossible to store. */}
{!isHTTPGen && (
<Button size="sm" variant="outline" onClick={testDevice} disabled={testing || !device.host.trim()}>
{testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <PlugZap className="size-3.5 mr-1" />}
{t('station.test')}
</Button>
)}
<Button size="sm" variant="ghost" onClick={onCancel}><X className="size-3.5 mr-1" />{t('station.cancel')}</Button>
<Button size="sm" onClick={onSave} disabled={!device.host.trim()}><Check className="size-3.5 mr-1" />{t('station.save')}</Button>
<Button size="sm" onClick={onSave} disabled={!isHTTPGen && !device.host.trim()}><Check className="size-3.5 mr-1" />{t('station.save')}</Button>
</div>
</div>
</div>
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { Plus, Trash2, Edit2, RefreshCcw, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
import {
ListUDPIntegrations, SaveUDPIntegration, DeleteUDPIntegration, ReloadUDPIntegrations,
@@ -24,7 +24,13 @@ type UDPConfig = {
direction: 'inbound' | 'outbound';
name: string;
port: number;
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo';
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'custom';
// Custom rows only.
trigger?: string;
template?: string;
transport?: string;
url?: string;
line_end?: string;
multicast: boolean;
multicast_group: string;
destination_ip: string;
@@ -77,6 +83,28 @@ const SERVICE_TYPES: Array<{
hint: 'udpp.svcDbHint',
defaults: { port: 2333, destination_ip: '127.0.0.1' },
},
{
// Announces the QSO on the WSJT-X UDP interface instead of as plain text.
// Named for the protocol, not for one program: Logger32 is what it was
// built against, but anything listening on that interface takes it, and a
// label saying "Logger32" would have every other operator scroll past.
// 2250 is Logger32's first additional socket — a starting point, not a rule.
id: 'wsjt_log',
direction: 'outbound',
label: 'udpp.svcWsjtLogLabel',
hint: 'udpp.svcWsjtLogHint',
defaults: { port: 2250, destination_ip: '127.0.0.1' },
},
{
// The general case: the operator picks the moment and writes the message.
// Mainly for antenna switches, which are driven by a URL and want the band
// change — but nothing about it is specific to them.
id: 'custom',
direction: 'outbound',
label: 'udpp.svcCustomLabel',
hint: 'udpp.svcCustomHint',
defaults: { port: 12000, destination_ip: '127.0.0.1' },
},
{
id: 'pstrotator_freq',
direction: 'outbound',
@@ -93,6 +121,27 @@ const SERVICE_TYPES: Array<{
},
];
// The fields each trigger carries, and NOTHING else.
//
// This list is the point of the whole feature. A rotation has no frequency, a
// lookup has no report — and a placeholder the trigger cannot fill renders as
// nothing at all. Without seeing what is available, an operator writes {freq}
// on a band change, gets an empty string, and has no way to learn why. So the
// panel prints them under the box, for the trigger actually selected.
const TRIGGER_FIELDS: Record<string, string[]> = {
qso_logged: ['call', 'band', 'band_m', 'mode', 'freq_hz', 'freq_mhz', 'grid', 'name', 'country', 'dxcc', 'rst_s', 'rst_r', 'comment', 'date', 'time'],
rotator_goto: ['az', 'el', 'path'],
lookup_done: ['call', 'name', 'grid', 'country', 'qth', 'state', 'dxcc'],
band_change: ['band', 'band_m', 'freq_hz', 'freq_mhz', 'mode'],
};
const TRIGGERS = [
{ id: 'band_change', label: 'udpp.trgBand' },
{ id: 'qso_logged', label: 'udpp.trgQso' },
{ id: 'rotator_goto', label: 'udpp.trgRotator' },
{ id: 'lookup_done', label: 'udpp.trgLookup' },
];
type Props = { onError: (msg: string) => void };
export function UDPIntegrationsPanel({ onError }: Props) {
@@ -124,6 +173,7 @@ export function UDPIntegrationsPanel({ onError }: Props) {
destination_ip: preset.defaults.destination_ip ?? '',
enabled: true,
sort_order: items.filter((i) => i.direction === direction).length,
trigger: '', template: '', transport: 'udp', url: '', line_end: '',
});
}
@@ -376,7 +426,7 @@ function EditDialog({
</div>
)}
{draft.direction === 'outbound' && (
{draft.direction === 'outbound' && draft.service_type !== 'custom' && (
<div className="space-y-1">
<Label>{t('udpp.destinationIp')}</Label>
<Input
@@ -388,6 +438,10 @@ function EditDialog({
</div>
)}
{draft.service_type === 'custom' && (
<CustomFields draft={draft} setDraft={setDraft} />
)}
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox
checked={draft.enabled}
@@ -413,3 +467,108 @@ function EditDialog({
// silence unused-import for cn — kept for future styling tweaks
void cn;
// CustomFields is the editor for a custom outbound row: what fires it, how it
// leaves, and what it says.
function CustomFields({ draft, setDraft }: {
draft: UDPConfig;
setDraft: React.Dispatch<React.SetStateAction<UDPConfig>>;
}) {
const { t } = useI18n();
const fields = TRIGGER_FIELDS[draft.trigger ?? ''] ?? [];
const isURL = draft.transport === 'url';
return (
<div className="space-y-4 rounded-md border border-border/60 p-3">
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label>{t('udpp.trigger')}</Label>
<Select value={draft.trigger || 'band_change'} onValueChange={(v) => setDraft((d) => ({ ...d, trigger: v }))}>
<SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>
{TRIGGERS.map((x) => <SelectItem key={x.id} value={x.id}>{t(x.label)}</SelectItem>)}
</SelectContent>
</Select>
</div>
<div className="space-y-1">
<Label>{t('udpp.transport')}</Label>
<Select value={draft.transport || 'udp'} onValueChange={(v) => setDraft((d) => ({ ...d, transport: v }))}>
<SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="udp">{t('udpp.transportUdp')}</SelectItem>
<SelectItem value="url">{t('udpp.transportUrl')}</SelectItem>
</SelectContent>
</Select>
</div>
</div>
{/* The one place these two features overlap. A relay board is a STATE per
band, not an event: Station Control tracks it, reads the boards at
startup and does not re-switch while the VFO moves inside a band. A
URL fired on a band change has none of that, and building the mapping
by hand here is work that is already done there. */}
{draft.trigger === 'band_change' && isURL && (
<div className="rounded border border-warning-border bg-warning-muted px-2 py-1.5 text-[11px] text-warning-muted-foreground leading-relaxed">
{t('udpp.relayInstead')}
</div>
)}
{isURL ? (
<div className="space-y-1">
<Label>{t('udpp.url')}</Label>
<Input
className="font-mono text-xs"
placeholder="http://192.168.1.50/antenna?band={band}"
value={draft.url ?? ''}
onChange={(e) => setDraft((d) => ({ ...d, url: e.target.value }))}
/>
<div className="text-[10px] text-muted-foreground">{t('udpp.urlHint')}</div>
</div>
) : (
<>
<div className="grid grid-cols-[1fr_auto] gap-2">
<div className="space-y-1">
<Label>{t('udpp.destinationIp')}</Label>
<Input
className="font-mono"
placeholder="127.0.0.1"
value={draft.destination_ip}
onChange={(e) => setDraft((d) => ({ ...d, destination_ip: e.target.value }))}
/>
</div>
<div className="space-y-1">
<Label>{t('udpp.lineEnd')}</Label>
<Select value={draft.line_end || 'none'} onValueChange={(v) => setDraft((d) => ({ ...d, line_end: v === 'none' ? '' : v }))}>
<SelectTrigger className="w-28"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="none">{t('udpp.lineEndNone')}</SelectItem>
<SelectItem value="lf">LF</SelectItem>
<SelectItem value="crlf">CRLF</SelectItem>
</SelectContent>
</Select>
</div>
</div>
<div className="space-y-1">
<Label>{t('udpp.template')}</Label>
<textarea
className="w-full min-h-[64px] rounded-md border border-input bg-background px-2 py-1.5 font-mono text-xs"
placeholder="<AZIMUT>{az}</AZIMUT>"
value={draft.template ?? ''}
onChange={(e) => setDraft((d) => ({ ...d, template: e.target.value }))}
/>
</div>
</>
)}
{/* What this trigger can actually fill in. */}
<div className="space-y-1">
<div className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('udpp.fieldsAvailable')}</div>
<div className="flex flex-wrap gap-1">
{fields.map((f) => (
<code key={f} className="rounded bg-muted px-1 py-px text-[10px] text-muted-foreground">{`{${f}}`}</code>
))}
</div>
<div className="text-[10px] text-muted-foreground">{t('udpp.fieldsHint')}</div>
</div>
</div>
);
}
+3 -1
View File
@@ -35,6 +35,7 @@ type Props = {
onUpdateFromCty?: (ids: number[]) => void;
onUpdateFromQRZ?: (ids: number[]) => void;
onUpdateFromClublog?: (ids: number[]) => void;
onUpdateCountyFromULS?: (ids: number[]) => void;
onSendTo?: (service: string, ids: number[]) => void;
onSendRecording?: (ids: number[]) => void;
onSendEQSL?: (ids: number[]) => void;
@@ -57,7 +58,7 @@ function fmtDate(s: any): string {
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
}
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
const { t } = useI18n();
const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false);
@@ -272,6 +273,7 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
onUpdateFromClublog={onUpdateFromClublog}
onUpdateCountyFromULS={onUpdateCountyFromULS}
onSendTo={onSendTo}
onSendRecording={onSendRecording}
onSendEQSL={onSendEQSL}
+62
View File
@@ -154,3 +154,65 @@ export function buildAwardRefs(qso: any, pickable: Array<{ code: string; field:
}
return out.join(';');
}
// COMPUTED_AWARD_FIELDS mirrors isComputedAwardField in app.go: awards whose
// reference is derived from the callsign and cty.dat, never assigned by hand.
//
// State and county are deliberately absent, there as here — an operator sets
// those themselves and they drive real predefined-list awards (WAS, WAJA, JCC).
const COMPUTED_AWARD_FIELDS = new Set([
'dxcc', 'cqz', 'ituz', 'prefix', 'callsign', 'cont', 'country', 'grid', 'grid4',
]);
// spotRefList turns a QSO's code→ref map into the strings a DX-cluster comment
// wants: ["SOTA HA/KM-018"].
//
// COMPUTED awards are dropped. A QSO's materialised references hold both kinds,
// and the derived ones — DXCC, WAC, WAZ, WPX — are exactly what every reader of
// the spot works out from the callsign anyway. Announcing "WAC EU WAZ 15 WPX HA5"
// spends the whole 30-character comment saying nothing, and buries the one
// reference worth chasing. Same rule as the QSO editor, which is why these are
// the references it lists on the LEFT and not in its read-only panel.
//
// fieldOf is award code → scanned field (from GetAwardDefs). A code missing from
// it is dropped rather than guessed: showing a reference on the air matters more
// than showing all of them.
//
// A code carrying several references (a two-fer park) yields one entry each, so
// a spot can take the one that fits instead of emitting a truncated pair.
// Shortest first: when they cannot all fit, more references beat fewer.
export function spotRefList(byCode: Record<string, string>, fieldOf: Record<string, string>): string[] {
const out: string[] = [];
for (const [code, refs] of Object.entries(byCode ?? {})) {
const field = fieldOf?.[code.toUpperCase()];
if (!field || COMPUTED_AWARD_FIELDS.has(field)) continue;
for (const ref of String(refs).split(',').map((s) => s.trim()).filter(Boolean)) {
out.push(`${code.toUpperCase()} ${ref.toUpperCase()}`);
}
}
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
}
// withIOTARef adds an island reference from the callbook to an entry's award
// references, unless the operator has already set one.
//
// QRZ sends <iota> for an operator on an island and OpsLog used to read past it.
// It matters more here than it would for another award: unlike POTA there is no
// live "who is on an island right now" feed anywhere, so the callbook record is
// the practical source — and it is known before the contact is logged, which is
// when it is useful.
//
// A reference the operator typed or picked wins. A callbook entry can be years
// old, and the operator in front of the radio has just been told where the
// station is.
export function withIOTARef(awardRefs: string, iota: string): string {
const ref = (iota || '').trim().toUpperCase();
// EU-048: two letters, a hyphen, three digits. Anything else is not an IOTA
// reference, and writing it into the award would make a reference that no
// list contains — which counts for nothing and has to be found by hand later.
if (!/^[A-Z]{2}-\d{3}$/.test(ref)) return awardRefs;
const byCode = parseAwardRefs(awardRefs);
if ((byCode['IOTA'] ?? '').trim() !== '') return awardRefs; // already set: leave it
const sep = awardRefs.trim() === '' ? '' : ';';
return awardRefs + sep + 'IOTA@' + ref;
}
File diff suppressed because one or more lines are too long
+17
View File
@@ -0,0 +1,17 @@
// One answer to "is this QSL received".
//
// ADIF's QSL_Rcvd enumeration has BOTH Y and V: Y is "received", V is
// "verified" — and V is what a LoTW download writes for a confirmation the ARRL
// has validated. Testing for 'Y' alone therefore misses exactly the
// confirmations an operator cares most about.
//
// It showed on screen: the Awards panel had Morocco validated on five bands
// while the band/mode matrix beside it showed the entity as merely worked. The
// award engine accepted Y or V; every other test in the app accepted Y.
//
// The Go side has the same rule twice over — award.isYes and qso.ConfirmedValues
// — and all three have to agree. If you add a value here, add it there.
export function isQSLConfirmed(v: unknown): boolean {
const s = String(v ?? '').trim().toUpperCase();
return s === 'Y' || s === 'V';
}
+102
View File
@@ -0,0 +1,102 @@
import { GetRotatorHeading } from '../../wailsjs/go/main/App';
// One poll loop for the antenna heading, shared by everything that shows it.
//
// TWO PROBLEMS THIS FIXES, both of them invisible until you count.
//
// The status bar polled, and the Station Control compass polled, and they polled
// the SAME binding — so with that tab open the rotator was asked twice as often
// as either component believed. Every backend builds a fresh client per call
// (spid.New, gs232.NewSerial, dcu1.NewSerial, rotgenius.New…), so one poll is
// one OPEN and CLOSE of a serial port or a TCP connection, not a read on a link
// already up.
//
// And a fixed interval has no good value. Three seconds moved the needle in
// steps of about thirteen degrees on a turning antenna — a compass that jumps
// rather than sweeps. Seven hundred milliseconds sweeps beautifully and opens
// the controller's port about ten thousand times an hour to watch an antenna
// that has not moved since breakfast.
//
// So: fast while it is turning, slow while it is not. "Turning" is not something
// these controllers report — a SPID answers a position and nothing else — so it
// is inferred from the position changing, and held for a few seconds after the
// last change so the tail of a movement stays smooth.
export type RotorHeading = {
enabled: boolean; ok: boolean; azimuth: number;
rotors?: string[]; active?: number; motorized?: boolean; raw?: string;
};
const MOVING_MS = 500; // while the antenna is turning
const IDLE_MS = 3000; // while it is parked — the rate everything used before
const SETTLE_MS = 6000; // stay fast this long after the last movement
const subs = new Set<(h: RotorHeading) => void>();
let timer: number | undefined;
let inFlight = false;
let lastAz: number | null = null;
let lastMoveAt = 0;
// The last heading anyone received, replayed to whoever subscribes next.
//
// Without it, opening Station Control left the compass blank for one or two
// seconds while every other panel filled at once. Nothing was slow: the status
// bar already had the loop running with a tick pending, so a component mounting
// halfway through an idle interval simply waited out the rest of it. The
// heading was known the whole time — it just had nowhere to be read from.
let last: RotorHeading | null = null;
function schedule(delay: number) {
if (timer !== undefined) window.clearTimeout(timer);
timer = window.setTimeout(tick, delay);
}
async function tick() {
// A slow controller must not stack requests behind itself: at 600 baud a SPID
// reply takes a fifth of a second on the wire alone, and a port that is still
// open from the last poll cannot be opened again.
if (inFlight) { schedule(MOVING_MS); return; }
inFlight = true;
try {
const h = (await GetRotatorHeading()) as unknown as RotorHeading;
if (h?.ok && typeof h.azimuth === 'number') {
if (lastAz !== null && h.azimuth !== lastAz) lastMoveAt = Date.now();
lastAz = h.azimuth;
}
last = h;
subs.forEach((fn) => { try { fn(h); } catch { /* a subscriber must not stop the loop */ } });
} catch {
// Leave the last heading alone: a single failed poll on a shared serial port
// is not news, and blanking the compass on one would make it flicker.
} finally {
inFlight = false;
}
if (subs.size > 0) schedule(Date.now() - lastMoveAt < SETTLE_MS ? MOVING_MS : IDLE_MS);
else timer = undefined;
}
// subscribeRotorHeading starts the loop if it is not running and returns the
// unsubscribe. The loop stops when the last subscriber leaves.
export function subscribeRotorHeading(fn: (h: RotorHeading) => void): () => void {
subs.add(fn);
// Hand over what is already known, at once. An Alpha SPID poll is an open,
// a read at 600 baud and a close, so even an immediate one takes a moment —
// the cached heading is what makes the compass appear with the panel rather
// than after it. In a microtask, so a subscriber is never called back before
// subscribeRotorHeading has returned to it.
if (last) { const h = last; queueMicrotask(() => { if (subs.has(fn)) fn(h); }); }
if (timer === undefined && !inFlight) void tick();
return () => {
subs.delete(fn);
if (subs.size === 0 && timer !== undefined) { window.clearTimeout(timer); timer = undefined; }
};
}
// pokeRotorHeading polls at once and switches to the fast rate — call it after
// commanding a move, so the needle starts sweeping on the click rather than on
// whatever was left of a three-second tick.
export function pokeRotorHeading(): void {
lastMoveAt = Date.now();
if (timer !== undefined) window.clearTimeout(timer);
timer = undefined;
void tick();
}
+4 -1
View File
@@ -1,3 +1,4 @@
import { isQSLConfirmed } from '@/lib/qsl';
// Row colouring for the log grid, by QSL status.
//
// Four categories, each scoped to the channels the operator cares about —
@@ -32,7 +33,9 @@ const FIELDS: Record<string, { sent: string; rcvd: string }> = {
// ADIF QSL fields are single letters. Y is the only one that means "yes";
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
// and the one an operator looks for when deciding what to send.
const yes = (v: any) => String(v ?? '').trim().toUpperCase() === 'Y';
// Y or V — see lib/qsl. A LoTW-verified contact is confirmed, and colouring it
// as unconfirmed is the same bug the band/mode matrix had.
const yes = (v: any) => isQSLConfirmed(v);
const owed = (v: any) => {
const s = String(v ?? '').trim().toUpperCase();
return s === 'R' || s === 'Q';
+1
View File
@@ -17,6 +17,7 @@ const PORTABLE_KEYS = [
'opslog.autofocusWB', // auto-focus Worked-before
'hamlog.filterPresets', // Filter Builder saved presets
'opslog.showRotor', // rotor compass shown next to the keyers
'opslog.showChaseNew', // Chase New panel shown next to the keyers
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
'opslog.showBeamOnMap', // antenna beam lobe drawn on the Main map
+24 -24
View File
@@ -785,27 +785,27 @@
The accent moves from Warm light's burnt orange to ochre to keep the two
themes apart at a glance in the theme picker. ---------------------------- */
[data-theme="sahara"] {
--background: #dcceab; /* deep sand — the page */
--foreground: #2b2318; /* deep warm brown-ink */
--card: #faf6eb; /* lifted panel / entry strip — kept cream */
--card-foreground: #2b2318;
--popover: #faf6eb;
--popover-foreground: #2b2318;
--primary: #a55f14; /* ochre */
--primary-foreground: #fffbf2;
--secondary: #cdbb92;
--secondary-foreground: #2b2318;
--muted: #cdbb92; /* toolbars / tab bar / table headers */
--muted-foreground: #544731; /* readable on both sands */
--accent: #e9d3a6; /* warm highlight */
--accent-foreground: #6b3a06;
--destructive: #b91c1c;
--background: #e6ded0; /* parchment — the page */
--foreground: #3a3227; /* warm brown-ink */
--card: #f3eee2; /* panels, entry strip, log rows */
--card-foreground: #3a3227;
--popover: #f3eee2;
--popover-foreground: #3a3227;
--primary: #c4501e; /* terracotta — buttons and the frequency */
--primary-foreground: #fdf8f0;
--secondary: #ded5c4;
--secondary-foreground: #3a3227;
--muted: #ded5c4; /* toolbars / tab bar / table headers */
--muted-foreground: #6a5f4e; /* readable on both parchments */
--accent: #ecd9c0; /* warm highlight */
--accent-foreground: #7a3410;
--destructive: #b3401b;
--destructive-foreground: #ffffff;
--destructive-muted: #fdecec;
--destructive-muted-foreground: #b91c1c;
--border: #b6a179; /* sand a step down again, so edges read */
--input: #b6a179;
--ring: #c2760c; /* amber focus ring */
--destructive-muted: #f7e4da;
--destructive-muted-foreground: #8f3315;
--border: #cdc2ae; /* one step down, so edges read without lines */
--input: #cdc2ae;
--ring: #c4501e; /* the accent, so focus matches the buttons */
--success: #15803d;
--success-foreground: #ffffff;
@@ -843,11 +843,11 @@
--mx-call-work: #7fd6a4;
--mx-dx-conf: #3730a3;
--mx-dx-work: #a5b4fc;
--mx-none: #cdbb92;
--mx-none: #ded5c4;
--scrollbar-thumb: #ac9868;
--scrollbar-thumb-hover: #927d4e;
--card-shadow: 0 1px 2px rgba(43, 35, 24, 0.07), 0 0 0 1px rgba(43, 35, 24, 0.03);
--scrollbar-thumb: #c2b6a0;
--scrollbar-thumb-hover: #a5977e;
--card-shadow: 0 1px 2px rgba(58, 50, 39, 0.06), 0 0 0 1px rgba(58, 50, 39, 0.03);
color-scheme: light;
}
+1 -1
View File
@@ -1,6 +1,6 @@
// Single source of truth for the app version shown in the UI (header + About).
// Bump this on a release (the release script updates it alongside telemetry.go).
export const APP_VERSION = '0.25.1';
export const APP_VERSION = '0.25.8';
// Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO';
+35 -2
View File
@@ -15,6 +15,7 @@ import {cluster} from '../models';
import {extsvc} from '../models';
import {powergenius} from '../models';
import {pskr} from '../models';
import {psu} from '../models';
import {spe} from '../models';
import {solar} from '../models';
import {tunergenius} from '../models';
@@ -196,6 +197,8 @@ export function DownloadULSCounties():Promise<void>;
export function DuplicateProfile(arg1:number,arg2:string):Promise<profile.Profile>;
export function EntryBandChanged(arg1:string):Promise<void>;
export function ExplainAward(arg1:string,arg2:string):Promise<Array<main.AwardExplain>>;
export function ExportADIF(arg1:string,arg2:boolean,arg3:Array<string>):Promise<adif.ExportResult>;
@@ -406,8 +409,12 @@ export function GetCatalogCodes():Promise<Array<string>>;
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
export function GetChaseNew():Promise<boolean>;
export function GetChaseNewGrids():Promise<boolean>;
export function GetChaseNewSpots():Promise<Array<main.ChaseNewSpot>>;
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
@@ -444,6 +451,10 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
export function GetFlexState():Promise<cat.FlexTXState>;
export function GetFolderSync():Promise<main.FolderSyncConfig>;
export function GetFolderSyncStatus():Promise<main.FolderSyncStatus>;
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
export function GetIcomState():Promise<cat.IcomTXState>;
@@ -482,6 +493,10 @@ export function GetPOTAToken():Promise<string>;
export function GetPSKReporterStatus():Promise<pskr.Status>;
export function GetPSUSettings():Promise<main.PSUSettings>;
export function GetPSUStatus():Promise<psu.Status>;
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
export function GetQSLDefaults():Promise<main.QSLDefaults>;
@@ -692,9 +707,9 @@ export function LogUDPLoggedADIF(arg1:string):Promise<number>;
export function LogUIError(arg1:string,arg2:string,arg3:string):Promise<void>;
export function LookupCallsign(arg1:string):Promise<lookup.Result>;
export function LookupCallsign(arg1:string,arg2:string):Promise<lookup.Result>;
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
export function LookupCallsignFresh(arg1:string,arg2:string):Promise<lookup.Result>;
export function MotorNudgeKHz(arg1:number):Promise<void>;
@@ -764,6 +779,8 @@ export function PickAudioFolder():Promise<string>;
export function PickBackupFolder():Promise<string>;
export function PickFolderSyncFolder():Promise<string>;
export function PickOpenDatabase():Promise<string>;
export function PickSaveDatabase():Promise<string>;
@@ -844,6 +861,8 @@ export function ReloadUDPIntegrations():Promise<Array<string>>;
export function RemovePassphrase(arg1:string):Promise<void>;
export function RenameAwardReference(arg1:string,arg2:string,arg3:string):Promise<void>;
export function RenameDatabase(arg1:string):Promise<void>;
export function RenameLogbook(arg1:string):Promise<void>;
@@ -872,6 +891,8 @@ export function RevealDataFolder():Promise<void>;
export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
export function RotatorGoToPath(arg1:number,arg2:number,arg3:string):Promise<void>;
export function RotatorPark():Promise<void>;
export function RotatorStop():Promise<void>;
@@ -922,6 +943,8 @@ export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Prom
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
@@ -936,6 +959,8 @@ export function SavePGXLSettings(arg1:main.PGXLSettings):Promise<void>;
export function SavePOTAToken(arg1:string):Promise<void>;
export function SavePSUSettings(arg1:main.PSUSettings):Promise<void>;
export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
export function SaveQSLDefaults(arg1:main.QSLDefaults):Promise<void>;
@@ -992,6 +1017,8 @@ export function SetCIVTrace(arg1:boolean):Promise<void>;
export function SetCWDecoderPitch(arg1:number):Promise<void>;
export function SetChaseNew(arg1:boolean):Promise<void>;
export function SetChaseNewGrids(arg1:boolean):Promise<void>;
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
@@ -1014,6 +1041,8 @@ export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<voi
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
export function SetPSUOutput(arg1:boolean):Promise<void>;
export function SetPassphrase(arg1:string):Promise<void>;
export function SetScpEnabled(arg1:boolean):Promise<void>;
@@ -1076,6 +1105,8 @@ export function StopCWDecoder():Promise<void>;
export function SwitchCATRig(arg1:number):Promise<void>;
export function SyncFolderNow():Promise<number>;
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
export function TailLogFile(arg1:number):Promise<string>;
@@ -1130,6 +1161,8 @@ export function UpdateAwardReferenceList(arg1:string):Promise<main.AwardRefMeta>
export function UpdateQSO(arg1:qso.QSO):Promise<void>;
export function UpdateQSOsCountyFromULS(arg1:Array<number>):Promise<number>;
export function UpdateQSOsFromClublog(arg1:Array<number>):Promise<number>;
export function UpdateQSOsFromCty(arg1:Array<number>):Promise<number>;
+68 -4
View File
@@ -334,6 +334,10 @@ export function DuplicateProfile(arg1, arg2) {
return window['go']['main']['App']['DuplicateProfile'](arg1, arg2);
}
export function EntryBandChanged(arg1) {
return window['go']['main']['App']['EntryBandChanged'](arg1);
}
export function ExplainAward(arg1, arg2) {
return window['go']['main']['App']['ExplainAward'](arg1, arg2);
}
@@ -754,10 +758,18 @@ export function GetChangelog() {
return window['go']['main']['App']['GetChangelog']();
}
export function GetChaseNew() {
return window['go']['main']['App']['GetChaseNew']();
}
export function GetChaseNewGrids() {
return window['go']['main']['App']['GetChaseNewGrids']();
}
export function GetChaseNewSpots() {
return window['go']['main']['App']['GetChaseNewSpots']();
}
export function GetChatHistory(arg1) {
return window['go']['main']['App']['GetChatHistory'](arg1);
}
@@ -830,6 +842,14 @@ export function GetFlexState() {
return window['go']['main']['App']['GetFlexState']();
}
export function GetFolderSync() {
return window['go']['main']['App']['GetFolderSync']();
}
export function GetFolderSyncStatus() {
return window['go']['main']['App']['GetFolderSyncStatus']();
}
export function GetGridCacheStatus() {
return window['go']['main']['App']['GetGridCacheStatus']();
}
@@ -906,6 +926,14 @@ export function GetPSKReporterStatus() {
return window['go']['main']['App']['GetPSKReporterStatus']();
}
export function GetPSUSettings() {
return window['go']['main']['App']['GetPSUSettings']();
}
export function GetPSUStatus() {
return window['go']['main']['App']['GetPSUStatus']();
}
export function GetPendingQSOs() {
return window['go']['main']['App']['GetPendingQSOs']();
}
@@ -1326,12 +1354,12 @@ export function LogUIError(arg1, arg2, arg3) {
return window['go']['main']['App']['LogUIError'](arg1, arg2, arg3);
}
export function LookupCallsign(arg1) {
return window['go']['main']['App']['LookupCallsign'](arg1);
export function LookupCallsign(arg1, arg2) {
return window['go']['main']['App']['LookupCallsign'](arg1, arg2);
}
export function LookupCallsignFresh(arg1) {
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
export function LookupCallsignFresh(arg1, arg2) {
return window['go']['main']['App']['LookupCallsignFresh'](arg1, arg2);
}
export function MotorNudgeKHz(arg1) {
@@ -1470,6 +1498,10 @@ export function PickBackupFolder() {
return window['go']['main']['App']['PickBackupFolder']();
}
export function PickFolderSyncFolder() {
return window['go']['main']['App']['PickFolderSyncFolder']();
}
export function PickOpenDatabase() {
return window['go']['main']['App']['PickOpenDatabase']();
}
@@ -1630,6 +1662,10 @@ export function RemovePassphrase(arg1) {
return window['go']['main']['App']['RemovePassphrase'](arg1);
}
export function RenameAwardReference(arg1, arg2, arg3) {
return window['go']['main']['App']['RenameAwardReference'](arg1, arg2, arg3);
}
export function RenameDatabase(arg1) {
return window['go']['main']['App']['RenameDatabase'](arg1);
}
@@ -1686,6 +1722,10 @@ export function RotatorGoTo(arg1, arg2) {
return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
}
export function RotatorGoToPath(arg1, arg2, arg3) {
return window['go']['main']['App']['RotatorGoToPath'](arg1, arg2, arg3);
}
export function RotatorPark() {
return window['go']['main']['App']['RotatorPark']();
}
@@ -1786,6 +1826,10 @@ export function SaveFlexBandPower(arg1) {
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
}
export function SaveFolderSync(arg1) {
return window['go']['main']['App']['SaveFolderSync'](arg1);
}
export function SaveListsSettings(arg1) {
return window['go']['main']['App']['SaveListsSettings'](arg1);
}
@@ -1814,6 +1858,10 @@ export function SavePOTAToken(arg1) {
return window['go']['main']['App']['SavePOTAToken'](arg1);
}
export function SavePSUSettings(arg1) {
return window['go']['main']['App']['SavePSUSettings'](arg1);
}
export function SaveProfile(arg1) {
return window['go']['main']['App']['SaveProfile'](arg1);
}
@@ -1926,6 +1974,10 @@ export function SetCWDecoderPitch(arg1) {
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
}
export function SetChaseNew(arg1) {
return window['go']['main']['App']['SetChaseNew'](arg1);
}
export function SetChaseNewGrids(arg1) {
return window['go']['main']['App']['SetChaseNewGrids'](arg1);
}
@@ -1970,6 +2022,10 @@ export function SetOpsLogQSLReceived(arg1, arg2) {
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
}
export function SetPSUOutput(arg1) {
return window['go']['main']['App']['SetPSUOutput'](arg1);
}
export function SetPassphrase(arg1) {
return window['go']['main']['App']['SetPassphrase'](arg1);
}
@@ -2094,6 +2150,10 @@ export function SwitchCATRig(arg1) {
return window['go']['main']['App']['SwitchCATRig'](arg1);
}
export function SyncFolderNow() {
return window['go']['main']['App']['SyncFolderNow']();
}
export function SyncPOTAHunterLog(arg1, arg2) {
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
}
@@ -2202,6 +2262,10 @@ export function UpdateQSO(arg1) {
return window['go']['main']['App']['UpdateQSO'](arg1);
}
export function UpdateQSOsCountyFromULS(arg1) {
return window['go']['main']['App']['UpdateQSOsCountyFromULS'](arg1);
}
export function UpdateQSOsFromClublog(arg1) {
return window['go']['main']['App']['UpdateQSOsFromClublog'](arg1);
}
+197
View File
@@ -1444,6 +1444,7 @@ export namespace lookup {
email?: string;
qsl_via?: string;
web?: string;
iota?: string;
zip?: string;
image_url?: string;
source: string;
@@ -1473,6 +1474,7 @@ export namespace lookup {
this.email = source["email"];
this.qsl_via = source["qsl_via"];
this.web = source["web"];
this.iota = source["iota"];
this.zip = source["zip"];
this.image_url = source["image_url"];
this.source = source["source"];
@@ -2048,6 +2050,8 @@ export namespace main {
digital_default: string;
share_enabled: boolean;
share_port: number;
share_proto: string;
share_tci_port: number;
ptt_hotkey_enabled: boolean;
ptt_hotkey: string;
ptt_hotkey_toggle: boolean;
@@ -2094,6 +2098,8 @@ export namespace main {
this.digital_default = source["digital_default"];
this.share_enabled = source["share_enabled"];
this.share_port = source["share_port"];
this.share_proto = source["share_proto"];
this.share_tci_port = source["share_tci_port"];
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
this.ptt_hotkey = source["ptt_hotkey"];
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
@@ -2131,6 +2137,44 @@ export namespace main {
this.fr = source["fr"];
}
}
export class ChaseNewSpot {
call: string;
band: string;
mode: string;
freq_hz: number;
grid: string;
country?: string;
cont?: string;
dist_km: number;
bearing: number;
status?: string;
new_pfx?: boolean;
new_grid?: boolean;
lotw?: boolean;
at: string;
static createFrom(source: any = {}) {
return new ChaseNewSpot(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.call = source["call"];
this.band = source["band"];
this.mode = source["mode"];
this.freq_hz = source["freq_hz"];
this.grid = source["grid"];
this.country = source["country"];
this.cont = source["cont"];
this.dist_km = source["dist_km"];
this.bearing = source["bearing"];
this.status = source["status"];
this.new_pfx = source["new_pfx"];
this.new_grid = source["new_grid"];
this.lotw = source["lotw"];
this.at = source["at"];
}
}
export class ChatMessage {
id: number;
operator: string;
@@ -2425,6 +2469,82 @@ export namespace main {
this.body = source["body"];
}
}
export class FolderSyncConfig {
enabled: boolean;
folder: string;
machine: string;
static createFrom(source: any = {}) {
return new FolderSyncConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.folder = source["folder"];
this.machine = source["machine"];
}
}
export class FolderSyncPeer {
machine: string;
last_change: string;
behind: number;
static createFrom(source: any = {}) {
return new FolderSyncPeer(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.machine = source["machine"];
this.last_change = source["last_change"];
this.behind = source["behind"];
}
}
export class FolderSyncStatus {
enabled: boolean;
folder: string;
machine_id: string;
peers: FolderSyncPeer[];
last_sync: string;
sent: number;
received: number;
error: string;
static createFrom(source: any = {}) {
return new FolderSyncStatus(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.folder = source["folder"];
this.machine_id = source["machine_id"];
this.peers = this.convertValues(source["peers"], FolderSyncPeer);
this.last_sync = source["last_sync"];
this.sent = source["sent"];
this.received = source["received"];
this.error = source["error"];
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
}
if (a.slice && a.map) {
return (a as any[]).map(elem => this.convertValues(elem, classs));
} else if ("object" === typeof a) {
if (asMap) {
for (const key of Object.keys(a)) {
a[key] = new classs(a[key]);
}
return a;
}
return new classs(a);
}
return a;
}
}
export class GridCacheStatus {
enabled: boolean;
known: number;
@@ -2695,12 +2815,31 @@ export namespace main {
}
}
export class PSUSettings {
enabled: boolean;
com_port: string;
baud: number;
address: number;
static createFrom(source: any = {}) {
return new PSUSettings(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.com_port = source["com_port"];
this.baud = source["baud"];
this.address = source["address"];
}
}
export class QSLBulkUpdate {
sent_status: string;
rcvd_status: string;
sent_date: string;
rcvd_date: string;
via: string;
rcvd_via: string;
notes: string;
comment: string;
@@ -2715,6 +2854,7 @@ export namespace main {
this.sent_date = source["sent_date"];
this.rcvd_date = source["rcvd_date"];
this.via = source["via"];
this.rcvd_via = source["rcvd_via"];
this.notes = source["notes"];
this.comment = source["comment"];
}
@@ -2993,6 +3133,7 @@ export namespace main {
transport: string;
com_port: string;
baud: number;
spid_model?: string;
static createFrom(source: any = {}) {
return new RotatorDevice(source);
@@ -3014,6 +3155,7 @@ export namespace main {
this.transport = source["transport"];
this.com_port = source["com_port"];
this.baud = source["baud"];
this.spid_model = source["spid_model"];
}
}
export class RotatorHeading {
@@ -3233,6 +3375,11 @@ export namespace main {
pass?: string;
channels?: number;
labels: string[];
on_urls?: string[];
off_urls?: string[];
on_pattern?: string;
off_pattern?: string;
insecure_tls?: boolean;
static createFrom(source: any = {}) {
return new StationDevice(source);
@@ -3248,6 +3395,11 @@ export namespace main {
this.pass = source["pass"];
this.channels = source["channels"];
this.labels = source["labels"];
this.on_urls = source["on_urls"];
this.off_urls = source["off_urls"];
this.on_pattern = source["on_pattern"];
this.off_pattern = source["off_pattern"];
this.insecure_tls = source["insecure_tls"];
}
}
export class StationRelay {
@@ -4013,6 +4165,39 @@ export namespace pskr {
}
export namespace psu {
export class Status {
connected: boolean;
on: boolean;
volts: number;
amps: number;
watts: number;
set_volts: number;
set_amps: number;
protected: number;
error?: string;
static createFrom(source: any = {}) {
return new Status(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.connected = source["connected"];
this.on = source["on"];
this.volts = source["volts"];
this.amps = source["amps"];
this.watts = source["watts"];
this.set_volts = source["set_volts"];
this.set_amps = source["set_amps"];
this.protected = source["protected"];
this.error = source["error"];
}
}
}
export namespace qslcard {
export class Bevel {
@@ -4445,6 +4630,7 @@ export namespace qso {
my_vucc_grids?: string;
extras?: Record<string, string>;
award_refs?: string;
sync_uid?: string;
// Go type: time
created_at: any;
// Go type: time
@@ -4586,6 +4772,7 @@ export namespace qso {
this.my_vucc_grids = source["my_vucc_grids"];
this.extras = source["extras"];
this.award_refs = source["award_refs"];
this.sync_uid = source["sync_uid"];
this.created_at = this.convertValues(source["created_at"], null);
this.updated_at = this.convertValues(source["updated_at"], null);
}
@@ -5103,6 +5290,11 @@ export namespace udp {
destination_ip: string;
enabled: boolean;
sort_order: number;
trigger: string;
template: string;
transport: string;
url: string;
line_end: string;
static createFrom(source: any = {}) {
return new Config(source);
@@ -5120,6 +5312,11 @@ export namespace udp {
this.destination_ip = source["destination_ip"];
this.enabled = source["enabled"];
this.sort_order = source["sort_order"];
this.trigger = source["trigger"];
this.template = source["template"];
this.transport = source["transport"];
this.url = source["url"];
this.line_end = source["line_end"];
}
}
+59
View File
@@ -0,0 +1,59 @@
package main
import (
"os"
"regexp"
"strings"
"testing"
)
// Every user-visible string ships in BOTH languages. That is a project rule,
// and until now it was only a rule: seventeen keys had drifted into English
// only, among them the whole update panel and two DX-cluster settings, found by
// a French operator photographing his own screen.
//
// A key present in one dictionary and not the other falls back to the key
// itself, so the interface shows "clu.spotTtl" where a label belongs — or, as
// here, the English text, which reads as deliberate and is not.
func TestEveryStringIsInBothLanguages(t *testing.T) {
src, err := os.ReadFile("frontend/src/lib/i18n.tsx")
if err != nil {
t.Fatalf("read i18n.tsx: %v", err)
}
en := dictKeys(t, string(src), "const en: Dict = {")
fr := dictKeys(t, string(src), "const fr: Dict = {")
if len(en) == 0 || len(fr) == 0 {
t.Fatal("one of the dictionaries came back empty — this test has stopped checking anything")
}
for k := range en {
if !fr[k] {
t.Errorf("%q has no French — a French operator sees the English string, or the key itself", k)
}
}
for k := range fr {
if !en[k] {
t.Errorf("%q exists only in French — an English operator sees the key", k)
}
}
}
// dictKeys collects the keys of one dictionary literal: from its opening line
// to the closing brace in column 0.
func dictKeys(t *testing.T, src, opening string) map[string]bool {
t.Helper()
i := strings.Index(src, opening)
if i < 0 {
t.Fatalf("%q not found — the dictionaries have been renamed and this test needs updating", opening)
}
body := src[i+len(opening):]
if j := strings.Index(body, "\n};"); j >= 0 {
body = body[:j]
}
keyRe := regexp.MustCompile(`'([a-zA-Z0-9_.]+)'\s*:`)
out := map[string]bool{}
for _, m := range keyRe.FindAllStringSubmatch(body, -1) {
out[m[1]] = true
}
return out
}
+41
View File
@@ -0,0 +1,41 @@
package adif
import (
"strings"
"testing"
)
// An import must never INVENT a routing method. The two "via" fields carry what
// the file carries, and nothing at all when it carries nothing.
//
// This is worth pinning because the opposite is easy to reach for: a card that
// was confirmed electronically is the common case, and defaulting to E would
// quietly rewrite the operator's own record of how their cards actually
// travelled. Where an E does show up after an import, it came from the source
// file — Log4OM writes QSL_SENT_VIA:1>E on every record whether or not a card
// was ever sent, which is pinned by TestQSLSentViaDoesNotBecomeManager.
func TestImportInventsNoQSLRouting(t *testing.T) {
for name, rec := range map[string]string{
"absent": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<EOR>\n",
"empty": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:0><QSL_RCVD_VIA:0><EOR>\n",
"whitespace": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:1> <QSL_RCVD_VIA:1> <EOR>\n",
// Not in the enumeration: dropped rather than passed through, or the
// export would write a value no other logger can read.
"unknown": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:3>ZZZ<EOR>\n",
} {
var got Record
if err := Parse(strings.NewReader("<EOH>\n"+rec), func(r Record) error { got = r; return nil }); err != nil {
t.Fatalf("%s: parse: %v", name, err)
}
q, ok := recordToQSO(got)
if !ok {
t.Fatalf("%s: recordToQSO returned !ok", name)
}
if q.QSLSentVia != "" {
t.Errorf("%s: QSL_SENT_VIA = %q, want empty — the import made up a routing method", name, q.QSLSentVia)
}
if q.QSLRcvdVia != "" {
t.Errorf("%s: QSL_RCVD_VIA = %q, want empty — the import made up a routing method", name, q.QSLRcvdVia)
}
}
}
+145 -144
View File
@@ -46,11 +46,12 @@
"qsl"
],
"total": 0,
"builtin": true
"builtin": true,
"version": 2
},
"references": [
{
"code": "1",
"code": "01",
"name": "Hokkaido",
"dxcc": 0,
"group": "",
@@ -58,16 +59,81 @@
"valid": true
},
{
"code": "10",
"name": "Gunma",
"code": "02",
"name": "Aomori",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "03",
"name": "Iwate",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "04",
"name": "Akita",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "05",
"name": "Yamagata",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "06",
"name": "Miyagi",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "07",
"name": "Fukushima",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "08",
"name": "Niigata",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "09",
"name": "Nagano",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "10",
"name": "Tokyo",
"dxcc": 0,
"group": "",
"subgrp": "",
"pattern": "\\bTok[iy]o\\b",
"valid": true
},
{
"code": "11",
"name": "Saitama",
"name": "Kanagawa",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -83,16 +149,15 @@
},
{
"code": "13",
"name": "Tokyo",
"name": "Saitama",
"dxcc": 0,
"group": "",
"subgrp": "",
"pattern": "\\bTok[iy]o\\b",
"valid": true
},
{
"code": "14",
"name": "Kanagawa",
"name": "Ibaraki",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -100,7 +165,7 @@
},
{
"code": "15",
"name": "Niigata",
"name": "Tochigi",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -108,7 +173,7 @@
},
{
"code": "16",
"name": "Toyama",
"name": "Gunma",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -116,22 +181,6 @@
},
{
"code": "17",
"name": "Ishikawa",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "18",
"name": "Fukui",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "19",
"name": "Yamanashi",
"dxcc": 0,
"group": "",
@@ -139,31 +188,7 @@
"valid": true
},
{
"code": "2",
"name": "Aomori",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "20",
"name": "Nagano",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "21",
"name": "Gifu",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "22",
"code": "18",
"name": "Shizuoka",
"dxcc": 0,
"group": "",
@@ -171,7 +196,15 @@
"valid": true
},
{
"code": "23",
"code": "19",
"name": "Gifu",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "20",
"name": "Aichi",
"dxcc": 0,
"group": "",
@@ -179,7 +212,7 @@
"valid": true
},
{
"code": "24",
"code": "21",
"name": "Mie",
"dxcc": 0,
"group": "",
@@ -187,15 +220,7 @@
"valid": true
},
{
"code": "25",
"name": "Shiga",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "26",
"code": "22",
"name": "Kyoto",
"dxcc": 0,
"group": "",
@@ -203,23 +228,15 @@
"valid": true
},
{
"code": "27",
"name": "Osaka",
"code": "23",
"name": "Shiga",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "28",
"name": "Hyogo",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "29",
"code": "24",
"name": "Nara",
"dxcc": 0,
"group": "",
@@ -227,24 +244,56 @@
"valid": true
},
{
"code": "3",
"name": "Iwate",
"code": "25",
"name": "Osaka",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "30",
"code": "26",
"name": "Wakayama",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "27",
"name": "Hyogo",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "28",
"name": "Toyama",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "29",
"name": "Fukui",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "30",
"name": "Ishikawa",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "31",
"name": "Tottori",
"name": "Okayama",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -260,31 +309,31 @@
},
{
"code": "33",
"name": "Okayama",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "34",
"name": "Hiroshima",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "35",
"name": "Yamaguchi",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "34",
"name": "Tottori",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "35",
"name": "Hiroshima",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "36",
"name": "Tokushima",
"name": "Kagawa",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -292,7 +341,7 @@
},
{
"code": "37",
"name": "Kagawa",
"name": "Tokushima",
"dxcc": 0,
"group": "",
"subgrp": "",
@@ -314,14 +363,6 @@
"subgrp": "",
"valid": true
},
{
"code": "4",
"name": "Miyagi",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "40",
"name": "Fukuoka",
@@ -385,48 +426,8 @@
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "5",
"name": "Akita",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "6",
"name": "Yamagata",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "7",
"name": "Fukushima",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "8",
"name": "Ibaraki",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
},
{
"code": "9",
"name": "Tochigi",
"dxcc": 0,
"group": "",
"subgrp": "",
"valid": true
}
]
}
]
}
}
+101
View File
@@ -0,0 +1,101 @@
package award
import (
"encoding/json"
"testing"
)
// WAJA is numbered by the JARL, and the numbering is NOT Japan's ordinary
// prefecture code.
//
// The catalog shipped with the government's JIS numbering instead — 01
// Hokkaido, 02 Aomori, 03 Iwate, 04 Miyagi… — which agrees with the JARL's for
// the first three prefectures and then diverges for thirty-five of the
// remaining forty-four. The names were right throughout, so the award still
// counted the right contacts; every reference simply carried the wrong number,
// which is what an operator sends to the JARL when they claim it.
//
// The two schemes agree often enough to look correct at a glance, so this pins
// the places they differ rather than a count. Each pair below is one the old
// list got wrong, and the comment is what the old list said.
func TestCatalogWAJAUsesTheJARLNumbering(t *testing.T) {
raw, ok := CatalogRefs("WAJA")
if !ok {
t.Fatal("WAJA has no reference list in the embedded catalog")
}
var refs []struct {
Code string `json:"code"`
Name string `json:"name"`
Pattern string `json:"pattern"`
}
if err := json.Unmarshal(raw, &refs); err != nil {
t.Fatalf("WAJA references: %v", err)
}
if len(refs) != 47 {
t.Fatalf("WAJA has %d prefectures, want exactly 47", len(refs))
}
byName := map[string]string{}
byCode := map[string]string{}
for _, r := range refs {
byName[r.Name] = r.Code
if prev, dup := byCode[r.Code]; dup {
t.Errorf("number %s is on both %s and %s", r.Code, prev, r.Name)
}
byCode[r.Code] = r.Name
}
for _, c := range []struct{ name, code string }{
{"Hokkaido", "01"}, // the one both schemes agree on, and the anchor
{"Miyagi", "06"}, // was 04
{"Akita", "04"}, // was 05
{"Niigata", "08"}, // was 15 — the JIS number
{"Nagano", "09"}, // was 20
{"Tokyo", "10"}, // was 13, the JIS number everyone recognises
{"Kanagawa", "11"}, // was 14
{"Saitama", "13"}, // was 11
{"Ibaraki", "14"}, // was 8
{"Gunma", "16"}, // was 10
{"Yamanashi", "17"}, // was 19
{"Kyoto", "22"}, // was 26
{"Osaka", "25"}, // was 27
{"Toyama", "28"}, // was 16
{"Ishikawa", "30"}, // was 17
{"Okayama", "31"}, // was 33
{"Tottori", "34"}, // was 31
{"Kagawa", "36"}, // was 37
{"Tokushima", "37"}, // was 36
{"Okinawa", "47"}, // unchanged: the far end of the list was already right
} {
if got := byName[c.name]; got != c.code {
t.Errorf("%s is numbered %q, want %q on the JARL list", c.name, got, c.code)
}
}
// Two digits throughout, as the JARL prints them. Not cosmetic: the codes
// are strings, so "1" sorts between "09" and "10" and the panel showed the
// prefectures in an order no list anywhere uses.
for _, r := range refs {
if len(r.Code) != 2 {
t.Errorf("%s is numbered %q — the JARL list is two digits throughout", r.Name, r.Code)
}
}
// The Tokyo spelling rule has to sit on Tokyo, and Tokyo moved. Left behind
// on the old number it would be matching QTHs for Saitama.
for _, r := range refs {
if r.Pattern == "" {
continue
}
if r.Name != "Tokyo" {
t.Errorf("%s (%s) carries the pattern %q, which belongs to Tokyo", r.Name, r.Code, r.Pattern)
}
}
if byName["Tokyo"] != "" {
for _, r := range refs {
if r.Name == "Tokyo" && r.Pattern == "" {
t.Error("Tokyo lost its spelling pattern in the renumbering — Tokio would stop counting")
}
}
}
}
+42
View File
@@ -266,6 +266,48 @@ func (r *Repo) Upsert(ctx context.Context, awardCode string, ref Ref) error {
return err
}
// Rename changes a reference's CODE, keeping everything else about it.
//
// Wanted because a shipped list can simply be wrong: WAJA went out numbered by
// the Japanese state instead of by the JARL, and the only way to correct it was
// to delete all 47 references and import a new list — losing anything the
// operator had adjusted. The number is the one field an editor could not touch.
//
// A rename, not a delete plus an insert: everything the reference carries — its
// pattern, its DXCC list, its validity window — travels with it, which is the
// whole point of correcting a number rather than replacing an entry.
func (r *Repo) Rename(ctx context.Context, awardCode, oldCode, newCode string) error {
ac := strings.ToUpper(strings.TrimSpace(awardCode))
from := strings.ToUpper(strings.TrimSpace(oldCode))
to := strings.ToUpper(strings.TrimSpace(newCode))
if ac == "" || from == "" || to == "" {
return fmt.Errorf("empty award or reference code")
}
if from == to {
return nil
}
// A collision would REPLACE the other reference and take its name, pattern
// and dates with it — one silently swallowing another, discovered much later
// as a reference that has quietly gone missing.
var n int
if err := r.db.QueryRowContext(ctx,
`SELECT COUNT(*) FROM award_references WHERE award_code = ? AND ref_code = ?`, ac, to).Scan(&n); err != nil {
return err
}
if n > 0 {
return fmt.Errorf("%s already has a reference %s", ac, to)
}
res, err := r.db.ExecContext(ctx,
`UPDATE award_references SET ref_code = ? WHERE award_code = ? AND ref_code = ?`, to, ac, from)
if err != nil {
return err
}
if rows, _ := res.RowsAffected(); rows == 0 {
return fmt.Errorf("%s has no reference %s", ac, from)
}
return nil
}
// Delete removes one reference from an award.
func (r *Repo) Delete(ctx context.Context, awardCode, refCode string) error {
_, err := r.db.ExecContext(ctx,
+129
View File
@@ -0,0 +1,129 @@
package awardref
// One-IOTA DXCC entities: a table of the entities that ARE a single IOTA group.
//
// WHY IT EXISTS. QRZ.com carries <iota> for an operator who fills it in, and
// most do not. But for a great many entities the island reference follows from
// the entity alone — a station in Ascension Island is on AF-003, there is
// nothing else it could be — and the entity is known for every callsign, from
// cty.dat, without any callbook at all. So the reference can be filled for an
// operator with no QRZ subscription, on a station that has never touched a
// callbook, before the contact is logged.
//
// Only entities that map to EXACTLY ONE reference are here. France is not: a
// French station is usually on the mainland and on no island at all, and
// guessing would put a reference on hundreds of contacts that earn none.
//
// SOURCE: dxcc_matches_one_iota.json from the IOTA programme
// (www.iota-world.org/islands-on-the-air/downloads/), fetched 2026-08-17,
// 99 entities. It changes only when an entity appears or IOTA re-maps one, so
// it is a table here rather than a download: it then works offline, which is
// where a portable station usually is. To refresh, fetch that file again and
// re-emit this map, sorted by entity number.
//
// Entity names are comments only, joined from internal/dxcc for readability.
var iotaByDXCC = map[int]string{
5: "EU-002", // Aland Islands
10: "AF-002", // Amsterdam & St. Paul Is.
12: "NA-022", // Anguilla
17: "NA-020", // Aves Island
20: "OC-089", // Baker & Howland Islands
21: "EU-004", // Balearic Islands
24: "AN-002", // Bouvet
29: "AF-004", // Canary Islands
34: "OC-038", // Chatham Islands
35: "OC-002", // Christmas Island
36: "NA-011", // Clipperton Island
37: "NA-012", // Cocos Island
38: "OC-003", // Cocos (Keeling) Islands
41: "AF-008", // Crozet Island
43: "NA-095", // Desecheo Island
45: "EU-001", // Dodecanese
62: "NA-021", // Barbados
64: "NA-005", // Bermuda
65: "NA-023", // British Virgin Islands
69: "NA-016", // Cayman Islands
71: "SA-004", // Galapagos Islands
82: "NA-097", // Jamaica
84: "NA-107", // Martinique
91: "SA-036", // Aruba
94: "NA-100", // Antigua & Barbuda
95: "NA-101", // Dominica
96: "NA-103", // Montserrat
97: "NA-108", // St. Lucia
99: "AF-011", // Glorioso Islands
103: "OC-026", // Guam
105: "NA-015", // Guantanamo Bay
106: "EU-114", // Guernsey
111: "AN-003", // Heard Island
114: "EU-116", // Isle Of Man
118: "EU-022", // Jan Mayen
123: "OC-023", // Johnston Island
131: "AF-048", // Kerguelen Islands
133: "OC-039", // Kermadec Islands
138: "OC-020", // Kure Island
141: "SA-002", // Falkland Islands
147: "OC-004", // Lord Howe Island
153: "AN-005", // Macquarie Island
157: "OC-031", // Nauru
159: "AS-013", // Maldives
161: "SA-007", // Malpelo Island
165: "AF-049", // Mauritius
166: "OC-086", // Mariana Islands
167: "EU-053", // Market Reef
169: "AF-027", // Mayotte
171: "OC-072", // Mellish Reef
174: "OC-030", // Midway Island
177: "OC-073", // Minami Torishima
182: "NA-098", // Navassa Island
188: "OC-040", // Niue
189: "OC-005", // Norfolk Island
190: "OC-097", // Samoa
195: "AF-039", // Annobon Island
199: "AN-004", // Peter 1 Island
201: "AF-021", // Pr. Edward & Marion Is.
205: "AF-003", // Ascension Island
207: "AF-017", // Rodriguez Island
211: "NA-063", // Sable Island
217: "SA-013", // San Felix & San Ambrosio
222: "EU-018", // Faroe Islands
238: "AN-008", // South Orkney Islands
240: "AN-009", // South Sandwich Islands
241: "AN-010", // South Shetland Islands
247: "AS-051", // Spratly Islands
249: "NA-104", // St. Kitts & Nevis
250: "AF-022", // St. Helena
252: "NA-094", // St. Paul Island
253: "SA-014", // St. Peter & St. Paul
257: "EU-023", // Malta
270: "OC-048", // Tokelau Islands
273: "SA-010", // Trindade & Martim Vaz
276: "AF-031", // Tromelin Island
277: "NA-032", // St. Pierre & Miquelon
282: "OC-015", // Tuvalu
283: "AS-004", // Uk Base Areas On Cyprus
285: "NA-106", // Us Virgin Islands
297: "OC-053", // Wake Island
301: "OC-017", // Western Kiribati
303: "OC-007", // Willis Island
381: "AS-019", // Singapore
411: "AF-007", // Comoros
453: "AF-016", // Reunion Island
460: "OC-060", // Rotuma Island
489: "OC-112", // Conway Reef
490: "OC-018", // Banaba Island
505: "AS-110", // Pratas Island
506: "AS-116", // Scarborough Reef
509: "OC-027", // Marquesas Islands
512: "OC-176", // Chesterfield Islands
513: "OC-182", // Ducie Island
515: "OC-200", // Swains Island
516: "NA-146", // St. Barthelemy
517: "SA-099", // Curacao
519: "NA-145", // Saba & St. Eustatius
520: "SA-006", // Bonaire
}
// IOTAForDXCC returns the island reference of a DXCC entity that is a single
// IOTA group, or "" for an entity that holds several islands or none.
func IOTAForDXCC(dxcc int) string { return iotaByDXCC[dxcc] }
+51
View File
@@ -0,0 +1,51 @@
package awardref
import (
"regexp"
"testing"
)
// The entities an operator meets: an island group that is its own DXCC, and a
// mainland country that is not.
func TestIOTAForDXCC(t *testing.T) {
cases := []struct {
dxcc int
want string
why string
}{
{205, "AF-003", "Ascension Island is one island and one reference"},
{5, "EU-002", "Aland Islands"},
{12, "NA-022", "Anguilla"},
{24, "AN-002", "Bouvet — the entity whose entry is checked most often and worked least"},
// France holds hundreds of islands and, far more to the point, a
// mainland. Filling a reference here would earn nothing and would put
// one on nearly every European contact in the log.
{227, "", "France is not one IOTA"},
{291, "", "the United States is not one IOTA"},
{0, "", "no entity resolved"},
{99999, "", "not an entity at all"},
}
for _, c := range cases {
if got := IOTAForDXCC(c.dxcc); got != c.want {
t.Errorf("IOTAForDXCC(%d) = %q, want %q — %s", c.dxcc, got, c.want, c.why)
}
}
}
// Every reference in the table must be a well-formed IOTA reference, because
// one that is not would be written onto a contact's award references and count
// for nothing — and would then have to be found by hand, one QSO at a time.
func TestEveryOneIOTAEntryIsWellFormed(t *testing.T) {
ref := regexp.MustCompile(`^(AF|AN|AS|EU|NA|OC|SA)-\d{3}$`)
if len(iotaByDXCC) < 50 {
t.Fatalf("the table holds %d entities — it has been truncated", len(iotaByDXCC))
}
for dxcc, r := range iotaByDXCC {
if dxcc <= 0 {
t.Errorf("entity number %d is not a DXCC entity", dxcc)
}
if !ref.MatchString(r) {
t.Errorf("entity %d maps to %q, which is not an IOTA reference", dxcc, r)
}
}
}
+112
View File
@@ -0,0 +1,112 @@
package awardref
import (
"context"
"path/filepath"
"testing"
"hamlog/internal/db"
)
func renameRepo(t *testing.T) *Repo {
t.Helper()
conn, err := db.Open(filepath.Join(t.TempDir(), "a.db"))
if err != nil {
t.Fatalf("open: %v", err)
}
t.Cleanup(func() { conn.Close() })
return NewRepo(conn)
}
// Correcting a reference's number must keep the reference.
//
// WAJA shipped numbered by the Japanese state instead of by the JARL, and until
// now the only way to fix that was to delete all 47 references and import a new
// list — losing anything the operator had adjusted. A rename keeps the pattern,
// the entity list and the validity window, because a wrong NUMBER is all that
// was wrong.
func TestRenameKeepsEverythingButTheCode(t *testing.T) {
r := renameRepo(t)
ctx := context.Background()
if err := r.Upsert(ctx, "WAJA", Ref{
Code: "13", Name: "Tokyo", Pattern: `\bTok[iy]o\b`, Valid: true,
DXCCList: []int{339}, ValidFrom: "1970-01-01",
}); err != nil {
t.Fatalf("seed: %v", err)
}
if err := r.Rename(ctx, "WAJA", "13", "10"); err != nil {
t.Fatalf("rename: %v", err)
}
refs, err := r.List(ctx, "WAJA")
if err != nil {
t.Fatalf("list: %v", err)
}
if len(refs) != 1 {
t.Fatalf("WAJA holds %d references after a rename, want 1 — it was copied, not renamed", len(refs))
}
got := refs[0]
if got.Code != "10" {
t.Errorf("code = %q, want 10", got.Code)
}
if got.Name != "Tokyo" || got.Pattern != `\bTok[iy]o\b` {
t.Errorf("the reference lost what it carried: name=%q pattern=%q", got.Name, got.Pattern)
}
if len(got.DXCCList) != 1 || got.DXCCList[0] != 339 || got.ValidFrom != "1970-01-01" {
t.Errorf("the reference lost its entity list or dates: %+v", got)
}
}
// A number already in use must be refused. Left to REPLACE, the rename would
// take the other reference's name, pattern and dates with it — one entry
// silently swallowing another, found much later as a prefecture that has
// quietly gone missing from the list.
func TestRenameRefusesANumberAlreadyTaken(t *testing.T) {
r := renameRepo(t)
ctx := context.Background()
if err := r.Upsert(ctx, "WAJA", Ref{Code: "10", Name: "Gunma", Valid: true}); err != nil {
t.Fatalf("seed: %v", err)
}
if err := r.Upsert(ctx, "WAJA", Ref{Code: "13", Name: "Tokyo", Valid: true}); err != nil {
t.Fatalf("seed: %v", err)
}
if err := r.Rename(ctx, "WAJA", "13", "10"); err == nil {
t.Fatal("renaming onto an existing number was accepted — one reference would have eaten the other")
}
refs, _ := r.List(ctx, "WAJA")
if len(refs) != 2 {
t.Fatalf("WAJA holds %d references, want both still there", len(refs))
}
}
// Renaming something that is not there is an error, not a silent no-op: it
// means the editor and the store disagree about what the award holds.
func TestRenameAnUnknownReferenceFails(t *testing.T) {
r := renameRepo(t)
if err := r.Rename(context.Background(), "WAJA", "99", "10"); err == nil {
t.Error("renaming a reference the award does not have was accepted")
}
}
// Codes are stored upper-cased, so a rename must compare the same way — else
// "eu-048" onto "EU-048" looks like a move and is really the same reference,
// which the collision check has to catch.
func TestRenameIsCaseInsensitive(t *testing.T) {
r := renameRepo(t)
ctx := context.Background()
if err := r.Upsert(ctx, "IOTA", Ref{Code: "EU-048", Name: "Belle-Ile", Valid: true}); err != nil {
t.Fatalf("seed: %v", err)
}
if err := r.Rename(ctx, "iota", "eu-048", "eu-048"); err != nil {
t.Errorf("renaming a reference to itself in another case failed: %v", err)
}
if err := r.Rename(ctx, "IOTA", "eu-048", "eu-049"); err != nil {
t.Fatalf("rename: %v", err)
}
refs, _ := r.List(ctx, "IOTA")
if len(refs) != 1 || refs[0].Code != "EU-049" {
t.Errorf("references = %+v, want the one renamed to EU-049 and upper-cased", refs)
}
}
+27 -1
View File
@@ -1,6 +1,7 @@
package cat
import (
"errors"
"fmt"
"strings"
"sync"
@@ -535,11 +536,36 @@ func (b *IcomSerial) SetMode(mode string) error {
return nil
}
// errIcomAckLost is "the reply never came" — as opposed to a reply that said no
// (NG) or a dead port. Only this one is worth repeating: the command may well
// have been carried out and only its acknowledgement lost. Sentinel rather than
// a formatted string so callers can tell the two apart.
var errIcomAckLost = errors.New("icom: timeout waiting for response")
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00), retrying ONCE when the
// acknowledgement is lost.
//
// A missing FB is not a missing command — the rig acts on the frame as soon as it
// decodes it, and what expires is our wait for the answer on a bus shared with
// the rig's own transceive updates. JTDX in "Split Operating: Fake It" moves the
// dial immediately before every key-down, so the PTT ack queues behind that
// traffic, and one lost ack was fatal: rigctld answered RPRT -9, JTDX read that
// as losing rig control and tore the connection down mid-over, reopening it a
// moment later (an operator's log shows exactly that, twice, a new rigctld client
// within 300 ms of each failure). The same session over TCI never failed, because
// TCI carries no CI-V and needs no Fake It.
//
// Re-sending is safe: asking for a state the rig is already in changes nothing.
func (b *IcomSerial) SetPTT(on bool) error {
state := byte(0)
if on {
state = 1
}
err := b.exec(civ.CmdPTT, civ.SubPTT, state)
if err == nil || !errors.Is(err, errIcomAckLost) {
return err
}
applog.Printf("icom: PTT %v — no acknowledgement in %s, sending it once more", on, icomCmdTimeout)
return b.exec(civ.CmdPTT, civ.SubPTT, state)
}
@@ -619,7 +645,7 @@ func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (
case <-cancel:
return civ.Decoded{}, fmt.Errorf("icom: interrupted")
case <-deadline:
return civ.Decoded{}, fmt.Errorf("icom: timeout waiting for response")
return civ.Decoded{}, errIcomAckLost
}
}
}
+116 -2
View File
@@ -46,8 +46,33 @@ type TCI struct {
mode string
split bool
tx bool
// txAllowed is what the radio last said about TRANSMIT PERMISSION.
//
// TX_ENABLE is sent by ExpertSDR when a client connects and again whenever
// the band changes, "in case transmitter permission was changed" (§4.3). When
// it is false the radio silently ignores TRX — which is exactly what an
// operator sees as "PTT does nothing", with no error anywhere to explain it.
//
// txAllowedKnown keeps an OLDER ExpertSDR, or a TCI-compatible program that
// never sends TX_ENABLE at all, from being treated as refusing: without a
// word from the radio we key and let it decide.
txAllowed bool
txAllowedKnown bool
lastSig string // last logged state signature (log only on change)
// spotFreq is the frequency of the marker currently on the panorama for each
// callsign — the panadapter's own state, which TCI never reports back. It is
// what makes one spot per call possible: without it there is no way to know
// there is an older marker to delete.
spotFreq map[string]int64
}
func absInt64(v int64) int64 {
if v < 0 {
return -v
}
return v
}
const tciDefaultPort = 40001
@@ -96,18 +121,73 @@ func (t *TCI) Connect() error {
t.mu.Lock()
t.conn = conn
t.ready = false
// Forget the previous session's transmit permission: the radio announces it
// again on connect, and a refusal remembered from a band we have since left
// would block PTT until it did.
t.txAllowed, t.txAllowedKnown = false, false
t.mu.Unlock()
debugLog.Printf("TCI: connected to %s", url)
go t.reader(conn)
if t.spotsEnabled {
// Forget what we thought was on the panorama at the same moment the radio
// is told to drop it. Kept, the memory would suppress the next spot for
// each of those calls as "already drawn" onto a panorama now empty.
t.mu.Lock()
t.spotFreq = map[string]int64{}
t.mu.Unlock()
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
}
return nil
}
// spotFreqTolHz is how far a re-spot of the same callsign may sit from the one
// already on the panorama before it is treated as a move rather than the same
// spot said again.
//
// Two spotters hearing the same CW station rarely agree to better than a couple
// of hundred hertz, and every one of them produces a cluster line. Below this
// they are the same spot and nothing is sent at all; above it the marker is
// deleted and redrawn where the station now is.
const spotFreqTolHz = 500
// noteSpot records what the panorama is about to hold for a callsign and says
// what has to be sent: whether to draw at all, and whether an older marker for
// the same call must be deleted first.
//
// Separate from SendSpot so the rule can be tested without a radio — and
// because the lock must be released before anything is sent: t.send takes t.mu
// itself, Go mutexes are not reentrant, and sending while holding it would
// deadlock the backend and take the rig offline.
func (t *TCI) noteSpot(call string, freqHz int64) (draw, deletePrev bool) {
key := strings.ToUpper(strings.TrimSpace(call))
t.mu.Lock()
defer t.mu.Unlock()
prev, had := t.spotFreq[key]
if had && absInt64(prev-freqHz) <= spotFreqTolHz {
return false, false
}
if t.spotFreq == nil {
t.spotFreq = map[string]int64{}
}
if len(t.spotFreq) > 4000 {
t.spotFreq = map[string]int64{} // bound memory on a long session
had = false // forgotten: nothing left to delete by name
}
t.spotFreq[key] = freqHz
return true, had
}
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
// The radio replaces a spot that has the same callsign, so re-spotting updates
// it in place. No-op when spot mirroring is disabled.
// No-op when spot mirroring is disabled.
//
// ONE MARKER PER CALLSIGN. This code assumed the radio replaced a spot carrying
// a callsign it already had; it does not. ExpertSDR keys a spot on its
// frequency too, so a DX station spotted by three operators — 14025.00,
// 14025.12, 14024.90, which is an ordinary minute on a cluster — was drawn
// three times, a few pixels apart, and stayed that way.
//
// So the previous spot for the call is deleted before the new one is sent,
// which is what the FlexRadio backend has always done (spot remove / spot add).
func (t *TCI) SendSpot(s SpotInfo) error {
if !t.spotsEnabled {
return nil
@@ -116,6 +196,17 @@ func (t *TCI) SendSpot(s SpotInfo) error {
if call == "" || s.FreqHz <= 0 {
return nil
}
draw, deletePrev := t.noteSpot(call, s.FreqHz)
if !draw {
return nil // the same station said again by another spotter
}
if deletePrev {
// SPOT_DELETE takes the callsign alone. Not in the protocol PDF this
// backend was written from; confirmed against ars-ka0s/eesdr-tci, which
// lists SPOT (5 arguments), SPOT_DELETE (1) and SPOT_CLEAR (0) — the
// other two matching what already works here.
_ = t.send(fmt.Sprintf("spot_delete:%s;", call))
}
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
@@ -223,7 +314,22 @@ func (t *TCI) SetMode(mode string) error {
}
// SetPTT keys or unkeys the transmitter (VFO 0).
//
// A refusal by the radio is reported rather than swallowed. ExpertSDR announces
// transmit permission with TX_ENABLE and then simply IGNORES trx when it is
// false — out-of-band frequency, TX disabled in the program, no PA. The command
// went out, nothing happened, and nothing anywhere said why. Now the operator
// is told, and the message names the place to look.
func (t *TCI) SetPTT(on bool) error {
if on {
t.mu.Lock()
known, allowed := t.txAllowedKnown, t.txAllowed
t.mu.Unlock()
if known && !allowed {
return fmt.Errorf("the radio is refusing to transmit (TCI reports TX disabled) — " +
"check the frequency is inside a transmit band and that TX is enabled in ExpertSDR")
}
}
return t.send(fmt.Sprintf("trx:0,%t;", on))
}
@@ -317,6 +423,14 @@ func (t *TCI) handle(msg string) {
if get(0) == "0" {
t.tx = get(1) == "true"
}
case "tx_enable":
if get(0) == "0" {
allowed := get(1) == "true"
if !t.txAllowedKnown || t.txAllowed != allowed {
debugLog.Printf("TCI: the radio %s transmitting", map[bool]string{true: "allows", false: "REFUSES"}[allowed])
}
t.txAllowed, t.txAllowedKnown = allowed, true
}
default:
lname := strings.ToLower(name)
// A click on one of our panorama spots comes back as
+80
View File
@@ -0,0 +1,80 @@
//go:build windows
package cat
import "testing"
// feed pushes messages at the backend the way the radio would.
func feed(t *TCI, msgs ...string) {
for _, m := range msgs {
t.handle(m)
}
}
// "PTT via CAT does nothing on TCI."
//
// ExpertSDR announces transmit permission with TX_ENABLE — on connect, and
// again whenever the band changes "in case transmitter permission was changed"
// (§4.3 of the protocol document). When it is false the radio simply IGNORES
// trx. OpsLog sent the documented command, the radio discarded it, and nothing
// anywhere said why: the operator pressed a dead key.
func TestPTTIsRefusedOutLoudWhenTheRadioForbidsTransmitting(t *testing.T) {
tci := NewTCI("localhost", 40001, "FT8", false)
feed(tci, "tx_enable:0,false")
err := tci.SetPTT(true)
if err == nil {
t.Fatal("keying was accepted while the radio forbids transmitting — the operator gets no reason at all")
}
// The message has to name where to look; "PTT failed" sends nobody anywhere.
for _, want := range []string{"transmit", "ExpertSDR"} {
if !contains(err.Error(), want) {
t.Errorf("the refusal reads %q, which does not mention %q", err.Error(), want)
}
}
// Unkeying is never blocked. Whatever the radio thinks about permission, a
// request to STOP transmitting must always reach it.
if err := tci.SetPTT(false); err != nil && contains(err.Error(), "refusing") {
t.Errorf("unkeying was refused: %v", err)
}
}
// Permission comes back when the operator returns to a band they may use, and
// PTT has to come back with it — not stay blocked until OpsLog is restarted.
func TestPermissionGrantedAgainRestoresPTT(t *testing.T) {
tci := NewTCI("localhost", 40001, "FT8", false)
feed(tci, "tx_enable:0,false")
if err := tci.SetPTT(true); err == nil {
t.Fatal("keying was accepted while forbidden")
}
feed(tci, "tx_enable:0,true")
// No connection here, so the send fails — but it must fail as a TRANSPORT
// error, never as a refusal.
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
t.Errorf("still refusing after permission was granted: %v", err)
}
}
// A radio that never mentions TX_ENABLE — an older ExpertSDR, or one of the
// other programs that speak TCI — must not be treated as refusing. Silence is
// not a "no": we key, and let the radio decide.
func TestSilenceAboutPermissionIsNotARefusal(t *testing.T) {
tci := NewTCI("localhost", 40001, "FT8", false)
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
t.Errorf("a radio that never sent TX_ENABLE was treated as forbidding transmit: %v", err)
}
}
func contains(s, sub string) bool {
return len(sub) == 0 || (len(s) >= len(sub) && indexOf(s, sub) >= 0)
}
func indexOf(s, sub string) int {
for i := 0; i+len(sub) <= len(s); i++ {
if s[i:i+len(sub)] == sub {
return i
}
}
return -1
}
+87
View File
@@ -0,0 +1,87 @@
//go:build windows
package cat
import "testing"
// The reported symptom: with spot mirroring on, the same station appeared two
// or three times on the panorama.
//
// Its cause is not in OpsLog's spot pipeline — one cluster line produces one
// SendSpot. It is that a popular DX station IS spotted two or three times, by
// different operators within the same minute, and no two of them agree on the
// frequency to better than a few tens of hertz. The backend assumed ExpertSDR
// replaced a spot bearing a callsign it already had; it keys on the frequency
// too, so each of those became its own marker.
func TestSameStationSpottedBySeveralOperatorsIsDrawnOnce(t *testing.T) {
tci := &TCI{spotsEnabled: true}
draw, del := tci.noteSpot("UN7GK", 14025000)
if !draw || del {
t.Fatalf("first spot: draw=%v delete=%v, want draw and nothing to delete", draw, del)
}
// The same station, two more spotters, a few tens of hertz apart.
for _, hz := range []int64{14025120, 14024900} {
if draw, del := tci.noteSpot("UN7GK", hz); draw || del {
t.Errorf("re-spot at %d Hz: draw=%v delete=%v, want nothing sent — this is the duplicate marker", hz, draw, del)
}
}
}
// A station that really moves must still move on the panorama, and the marker
// left where it was must go. Deleting first is the whole difference between
// "the spot follows the station" and "the station collects markers".
func TestAStationThatMovesReplacesItsMarker(t *testing.T) {
tci := &TCI{spotsEnabled: true}
tci.noteSpot("UN7GK", 14025000)
draw, del := tci.noteSpot("UN7GK", 14032000) // 7 kHz up: a real QSY
if !draw || !del {
t.Fatalf("after a QSY: draw=%v delete=%v, want the old marker deleted and a new one drawn", draw, del)
}
// And the new position becomes the reference, so spotters agreeing with it
// are quiet again.
if draw, _ := tci.noteSpot("UN7GK", 14032100); draw {
t.Error("a spot at the station's new frequency was drawn again")
}
}
// Case matters nowhere in ham radio, and the cluster is not consistent about it.
func TestSpotMemoryIgnoresCase(t *testing.T) {
tci := &TCI{spotsEnabled: true}
tci.noteSpot("un7gk", 14025000)
if draw, _ := tci.noteSpot("UN7GK", 14025000); draw {
t.Error("the same call in another case was treated as a different station")
}
}
// Two different stations are two markers — the whole point of the panorama.
func TestDifferentStationsEachGetAMarker(t *testing.T) {
tci := &TCI{spotsEnabled: true}
tci.noteSpot("UN7GK", 14025000)
draw, del := tci.noteSpot("ZD7BG", 14025050) // 50 Hz away, a different operator
if !draw {
t.Error("a second station near the first was swallowed as a duplicate")
}
if del {
t.Error("deleting by callsign would have removed a spot this station never had")
}
}
// The connection drops and comes back: Connect sends spot_clear, so the
// panorama is empty. If the memory survived that, the next spot for each of
// those calls would be suppressed as "already drawn" onto an empty panorama —
// the operator's spots would simply stop appearing until they changed
// frequency.
func TestReconnectingForgetsWhatWasDrawn(t *testing.T) {
tci := &TCI{spotsEnabled: true}
tci.noteSpot("UN7GK", 14025000)
tci.mu.Lock()
tci.spotFreq = map[string]int64{} // what Connect does alongside spot_clear
tci.mu.Unlock()
if draw, del := tci.noteSpot("UN7GK", 14025000); !draw || del {
t.Errorf("after a reconnect: draw=%v delete=%v, want it drawn again and nothing deleted", draw, del)
}
}
+162 -23
View File
@@ -18,6 +18,7 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
"hamlog/internal/applog"
@@ -355,6 +356,18 @@ func (s *session) run() {
// that gets skipped.
var idleTick = 30 * time.Second
// promptTick is the read deadline used until the login handshake is finished.
// Short, because a node's "login:" / "password:" carries no newline and is only
// visible when the read times out — see the read loop. It costs a few wake-ups
// during the first seconds of a connection and nothing afterwards.
const promptTick = 700 * time.Millisecond
// handshakeWindow bounds how long the fast promptTick applies. A node that has
// a password configured but never asks for one would otherwise keep the loop
// waking every 700 ms for the life of the connection, for a prompt that is never
// coming. Any real login exchange is over in a second or two.
const handshakeWindow = 20 * time.Second
// quietNotice is the silence after which the log says so, once.
const quietNotice = 10 * time.Minute
@@ -369,10 +382,21 @@ func (s *session) runOnce() (time.Time, error) {
// failure surfaces as an error on Read — which is the only thing that ends
// a session below.
d := net.Dialer{Timeout: 10 * time.Second, KeepAlive: 30 * time.Second}
// TIMED, and reported. An operator sees "connected" and no spots for a
// minute on the first launch, then an instant connection when the program is
// restarted — which is the signature of a slow name resolution rather than a
// slow cluster (the OS caches the answer, so the second run skips it). The
// only way to tell that from a node that simply had nothing to say is to
// know how long the dial itself took.
dialStart := time.Now()
conn, err := d.Dial("tcp", addr)
if err != nil {
applog.Printf("cluster[%s] dial %s failed after %s: %v", s.cfg.Name, addr, time.Since(dialStart).Round(time.Millisecond), err)
return time.Time{}, fmt.Errorf("dial %s: %w", addr, err)
}
applog.Printf("cluster[%s] connected to %s in %s", s.cfg.Name, addr, time.Since(dialStart).Round(time.Millisecond))
linkUpAt := time.Now()
firstSpotLogged := false
s.mu.Lock()
s.conn = conn
s.mu.Unlock()
@@ -387,16 +411,37 @@ func (s *session) runOnce() (time.Time, error) {
// Login: send on first prompt OR blindly after 1.5s. Many DXSpider
// nodes accept the callsign without re-prompting.
loginSent := false
//
// Atomic because the blind-login timer below and the read loop both touch
// these. loginSent used to be a plain bool that the timer NEVER SET: the
// callsign went out and nothing recorded it, so the password branch — gated on
// loginSent — was dead code, and the session could only reach "connected" by
// recognising a welcome banner. On a node whose entire greeting is a bare
// "login:" and which then demands a password (f5mzn.org:9000), that left the
// server stuck at "connecting" for ever while telnet logged in by hand fine.
var loginSent, pwdSent atomic.Bool
// CompareAndSwap, not a plain store: the timer and the loop can reach these at
// the same moment, and the callsign must be written exactly once.
sendLogin := func() {
if s.login != "" && loginSent.CompareAndSwap(false, true) {
_, _ = conn.Write([]byte(s.login + "\r\n"))
}
}
// Sent ONCE per connection. A node that re-prompts is refusing the password,
// and answering with the same one again only loops — better to let the
// refusal show in the console than to hide it behind a retry.
sendPassword := func() {
if s.cfg.Password != "" && loginSent.Load() && pwdSent.CompareAndSwap(false, true) {
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
}
}
if s.login != "" {
go func() {
select {
case <-s.stopCh:
return
case <-time.After(1500 * time.Millisecond):
if !loginSent {
_, _ = conn.Write([]byte(s.login + "\r\n"))
}
sendLogin()
}
}()
}
@@ -442,7 +487,21 @@ func (s *session) runOnce() (time.Time, error) {
var connectedAt time.Time
var quiet time.Duration // how long the node has said nothing
var quietNoticed bool // the long-silence line is said once
var pending string // a line cut in half by a read deadline
markConnected := func() {
if s.snapshot().State == StateConnected {
return
}
connectedAt = time.Now()
s.mu.Lock()
s.status.State = StateConnected
s.status.ConnectedAt = connectedAt
s.status.Error = ""
s.mu.Unlock()
s.emitStatus()
fireInitCommands()
}
rd := bufio.NewReader(conn)
for {
select {
@@ -460,7 +519,21 @@ func (s *session) runOnce() (time.Time, error) {
// Only a REAL error ends the session. A dead peer still gets caught:
// TCP keepalive probes an idle connection and its failure arrives here
// as an error, not as a timeout.
_ = conn.SetReadDeadline(time.Now().Add(idleTick))
// SHORT deadline until the handshake is done, the long idle tick after.
//
// A cluster writes its prompts WITHOUT a trailing newline, and ReadString
// only returns on one — so a prompt is never a "line" at all, it is whatever
// is sitting in the buffer when the read deadline expires. At the ordinary
// 30 s tick that made a bare "login:" invisible for half a minute and a
// following "password:" invisible for another, which is long enough for the
// node to give up on us. Only the handshake needs the fast tick; once logged
// in, a long deadline is exactly what we want (see idleTick).
tick := idleTick
if time.Since(linkUpAt) < handshakeWindow &&
(!loginSent.Load() || (s.cfg.Password != "" && !pwdSent.Load())) {
tick = promptTick
}
_ = conn.SetReadDeadline(time.Now().Add(tick))
chunk, err := rd.ReadString('\n')
if err != nil {
var ne net.Error
@@ -469,16 +542,48 @@ func (s *session) runOnce() (time.Time, error) {
// Keep it: a spot line straddling the deadline would otherwise lose
// its first half and arrive as nonsense, or vanish entirely.
pending += chunk
quiet += idleTick
// …but a newline-less PROMPT is not half a line, it is a question,
// and this is the only place it can ever be seen. Answer it, show it
// in the console (an operator watching a stuck server has a right to
// see what the node actually asked), and drop it so it is not glued
// onto the front of the next real line.
if p := strings.TrimSpace(pending); p != "" {
switch {
case !loginSent.Load() && s.login != "" && isLoginPrompt(p):
s.emitLine(p, false)
pending = ""
sendLogin()
if s.cfg.Password == "" {
markConnected()
}
continue
case !pwdSent.Load() && isPasswordPrompt(p):
s.emitLine(p, false)
pending = ""
if s.cfg.Password == "" {
// Nothing to answer with. Shown in the console rather than
// swallowed: an unanswered "password:" sitting there IS the
// explanation for a server that never finishes connecting,
// and it is something the operator can act on.
continue
}
sendPassword()
markConnected()
continue
}
}
quiet += tick
// Said once at the first long silence, so a genuinely mute node is
// visible without a line every tick.
if quiet == quietNotice {
if !quietNoticed && quiet >= quietNotice {
quietNoticed = true
applog.Printf("cluster[%s] no traffic for %s — still connected", s.cfg.Name, quiet)
}
continue
}
return connectedAt, fmt.Errorf("read: %w", err)
}
quietNoticed = false
quiet = 0
line := pending + chunk
pending = ""
@@ -508,28 +613,23 @@ func (s *session) runOnce() (time.Time, error) {
}
}
// Login on explicit prompt.
if !loginSent && s.login != "" && isLoginPrompt(line) {
_, _ = conn.Write([]byte(s.login + "\r\n"))
loginSent = true
// Login on explicit prompt — the case where the node DID terminate it with
// a newline. The newline-less form is handled on the timeout path above.
if !loginSent.Load() && s.login != "" && isLoginPrompt(line) {
s.emitLine(line, false)
sendLogin()
continue
}
// Password on prompt (rare).
if loginSent && s.cfg.Password != "" && isPasswordPrompt(line) {
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
// Password on prompt.
if !pwdSent.Load() && isPasswordPrompt(line) {
s.emitLine(line, false)
sendPassword()
continue
}
// Mark connected once we've sent login OR seen a welcome banner.
if s.snapshot().State != StateConnected && (loginSent || isWelcome(line)) {
connectedAt = time.Now()
s.mu.Lock()
s.status.State = StateConnected
s.status.ConnectedAt = connectedAt
s.status.Error = ""
s.mu.Unlock()
s.emitStatus()
fireInitCommands()
if loginSent.Load() || isWelcome(line) {
markConnected()
}
// EVERY line goes to the console — spot or not. This is the whole point:
@@ -556,6 +656,13 @@ func (s *session) runOnce() (time.Time, error) {
}
s.mu.Unlock()
if s.onSpot != nil {
if !firstSpotLogged {
firstSpotLogged = true
// The gap between the socket opening and the first spot is the
// other half of the answer: a long dial is the network, a quick
// dial and a long silence is the node (or the login) instead.
applog.Printf("cluster[%s] first spot %s after connecting", s.cfg.Name, time.Since(linkUpAt).Round(time.Millisecond))
}
s.onSpot(spot)
}
}
@@ -683,6 +790,38 @@ func parseSpot(line string) (Spot, bool) {
}, true
}
// NewLocalSpot builds the Spot for a DX announcement WE just sent, so it lands
// in the operator's own list at once.
//
// A node does not necessarily broadcast a spot back to the station that sent it:
// DXSpider suppresses the echo to the originator, and a node-side filter can eat
// it too. So an operator spotted a station, watched their own spot list stay
// empty, and concluded the spot had never gone out — when it had. This is the
// spot the echo would have carried, built from what we sent, deliberately the
// same shape so the UI's call+band de-dupe folds the two into one row on the
// nodes that DO echo.
func NewLocalSpot(srv ServerConfig, spotter, dxCall string, freqKHz float64, comment string) Spot {
freqHz := int64(freqKHz*1000 + 0.5)
now := time.Now()
sp := Spot{
SourceID: srv.ID,
SourceName: srv.Name,
Spotter: strings.ToUpper(strings.TrimSpace(spotter)),
DXCall: strings.ToUpper(strings.TrimSpace(dxCall)),
FreqKHz: freqKHz,
FreqHz: freqHz,
Band: bandFromHz(freqHz),
Comment: strings.TrimSpace(comment),
TimeUTC: now.UTC().Format("1504") + "Z",
ReceivedAt: now,
}
// Raw reads like the node's own broadcast — it is what anything showing the
// source line expects, and it keeps a local spot legible in the log.
sp.Raw = fmt.Sprintf("DX de %s: %9.1f %-12s %-30s %s",
sp.Spotter, sp.FreqKHz, sp.DXCall, sp.Comment, sp.TimeUTC)
return sp
}
func isLoginPrompt(s string) bool {
low := strings.ToLower(s)
return strings.Contains(low, "login:") ||
+105
View File
@@ -0,0 +1,105 @@
package cluster
import (
"bufio"
"net"
"strconv"
"strings"
"testing"
"time"
)
// A node whose whole greeting is a bare "login:" — no newline, no banner — and
// which then demands a password must still log in.
//
// Reported on f5mzn.org:9000: telnet by hand worked, OpsLog sat at "connecting"
// for ever. Two faults met there. The prompts carry no newline, and the read
// loop only ever looked at complete LINES, so neither prompt was seen at all;
// and the blind 1.5 s login never recorded that it had sent the callsign, which
// left the password branch — gated on that flag — permanently switched off.
//
// The test speaks the node's side literally: "login:" with no newline, then
// "password:" with no newline, then a spot. It asserts both answers arrive and
// that the session reaches Connected without any welcome banner to lean on.
func TestBareLoginAndPasswordPromptsWithoutNewlines(t *testing.T) {
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
defer ln.Close()
host, portStr, _ := net.SplitHostPort(ln.Addr().String())
port, err := strconv.Atoi(portStr)
if err != nil {
t.Fatal(err)
}
type answers struct{ login, pwd string }
got := make(chan answers, 1)
go func() {
c, err := ln.Accept()
if err != nil {
return
}
defer c.Close()
rd := bufio.NewReader(c)
// No newline, exactly as the node sends it.
if _, err := c.Write([]byte("login: ")); err != nil {
return
}
call, err := rd.ReadString('\n')
if err != nil {
return
}
if _, err := c.Write([]byte("password: ")); err != nil {
return
}
pwd, err := rd.ReadString('\n')
if err != nil {
return
}
got <- answers{strings.TrimSpace(call), strings.TrimSpace(pwd)}
// Something to prove the link is live and parsing again afterwards.
_, _ = c.Write([]byte("DX de F4BPO: 14074.0 OY1CT FT8 1234Z\r\n"))
time.Sleep(time.Second)
}()
spots := make(chan Spot, 4)
s := &session{
cfg: ServerConfig{Name: "pwd node", Host: host, Port: port, Password: "s3cret"},
login: "F4BPO",
onSpot: func(sp Spot) { spots <- sp },
onLine: func(Line) {},
onStatus: func() {},
stopCh: make(chan struct{}),
}
done := make(chan error, 1)
go func() { _, err := s.runOnce(); done <- err }()
defer func() { close(s.stopCh); <-done }()
select {
case a := <-got:
if a.login != "F4BPO" {
t.Errorf("callsign sent = %q, want F4BPO", a.login)
}
if a.pwd != "s3cret" {
t.Errorf("password sent = %q, want s3cret — the prompt carried no newline", a.pwd)
}
case <-time.After(10 * time.Second):
t.Fatal("the node's newline-less prompts were never answered")
}
select {
case sp := <-spots:
if sp.DXCall != "OY1CT" {
t.Errorf("spot from the wrong station: %+v", sp)
}
case <-time.After(5 * time.Second):
t.Fatal("no spot after the login — the stream is not being parsed")
}
// Connected without a welcome banner: the handshake alone must be enough.
if st := s.snapshot().State; st != StateConnected {
t.Errorf("state = %q, want %q — the server would still show as connecting", st, StateConnected)
}
}
+87
View File
@@ -0,0 +1,87 @@
package db
import (
"regexp"
"strings"
"testing"
)
// A TEXT column that an index is built on must be listed in varcharColumns.
//
// MySQL cannot index a TEXT column without a prefix length: the migration dies
// with error 1170 — and it dies again on every startup afterwards, leaving the
// operator with a logbook that will not connect and no way forward from the
// interface. The translator only emits VARCHAR for the names in varcharColumns,
// and that list is maintained by hand.
//
// So: read the migrations, work out which columns are TEXT, find which are
// indexed, and insist the list covers the overlap. Integer columns are indexed
// perfectly well and are none of this test's business.
func TestIndexedTextColumnsAreVarchar(t *testing.T) {
files, err := migrationsFS.ReadDir("migrations")
if err != nil {
t.Fatalf("read migrations: %v", err)
}
// name → declared type, from "ADD COLUMN name TYPE" and from the column
// lines inside a CREATE TABLE body.
declared := map[string]string{}
reAdd := regexp.MustCompile(`(?i)ADD\s+COLUMN\s+` + "`" + `?(\w+)` + "`" + `?\s+(\w+)`)
reCol := regexp.MustCompile(`(?im)^\s*` + "`" + `?(\w+)` + "`" + `?\s+(TEXT|VARCHAR|INTEGER|INT|REAL|BLOB|DATETIME|BOOLEAN)\b`)
reIdx := regexp.MustCompile(`(?i)CREATE\s+INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?\S+\s+ON\s+\S+\s*\(([^)]*)\)`)
var indexed []struct{ file, col string }
for _, f := range files {
if f.IsDir() || !strings.HasSuffix(f.Name(), ".sql") {
continue
}
body, err := migrationsFS.ReadFile("migrations/" + f.Name())
if err != nil {
t.Fatalf("read %s: %v", f.Name(), err)
}
src := string(body)
for _, m := range reAdd.FindAllStringSubmatch(src, -1) {
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
}
for _, m := range reCol.FindAllStringSubmatch(src, -1) {
if _, seen := declared[strings.ToLower(m[1])]; !seen {
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
}
}
for _, m := range reIdx.FindAllStringSubmatch(src, -1) {
for _, col := range strings.Split(m[1], ",") {
col = strings.TrimSpace(col)
if col == "" || strings.Contains(col, "(") {
continue // a prefix length or an expression is MySQL-safe already
}
col = strings.Trim(col, "`\"")
if i := strings.IndexAny(col, " \t"); i > 0 {
col = col[:i] // "col DESC"
}
indexed = append(indexed, struct{ file, col string }{f.Name(), strings.ToLower(col)})
}
}
}
if len(indexed) == 0 || len(declared) == 0 {
t.Fatal("nothing parsed out of the migrations — this test has stopped checking anything")
}
textIndexed := 0
for _, ix := range indexed {
typ, known := declared[ix.col]
if !known || typ != "TEXT" {
continue // an integer index, or a column this test could not type
}
textIndexed++
if !varcharColumns[ix.col] {
t.Errorf("%s indexes the TEXT column %q, which is not in varcharColumns — "+
"on MySQL that migration fails with error 1170 and the logbook stops connecting for good",
ix.file, ix.col)
}
}
if textIndexed == 0 {
t.Fatal("no indexed TEXT column found — the parsing has drifted and this test checks nothing")
}
t.Logf("%d indexed TEXT column(s) checked against varcharColumns", textIndexed)
}
@@ -0,0 +1,17 @@
-- Custom outbound messages: a trigger, a template, and a transport.
--
-- Until now an outbound row was one of a handful of hard-coded emitters, each
-- with its own format and its own moment. This adds the general case: pick what
-- fires it, write what it says, and choose whether it leaves as a UDP datagram
-- or an HTTP request.
--
-- The HTTP half is what makes it useful for antenna switches — most of them are
-- driven by a URL like http://192.168.1.50/antenna?band=20m — and the band
-- change is the trigger they want, being rare by nature.
--
-- Empty on every existing row, which is what the hard-coded services expect.
ALTER TABLE integrations_udp ADD COLUMN trig TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN template TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN transport TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN url TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN line_end TEXT NOT NULL DEFAULT '';
+24
View File
@@ -0,0 +1,24 @@
-- A stable identity per contact, for folder-based synchronisation.
--
-- Two PCs exchanging changes through a shared folder need to name the SAME
-- contact in both logs. "the QSO with M0ABC at 14:32" is a guess, and the two
-- machines can disagree about which row that is — so an edit or a deletion
-- cannot be addressed at all without an identity that travels with the record.
--
-- A REAL COLUMN, indexed, rather than a key inside extras_json. The identity is
-- looked up once per incoming change, and on a 120 000-QSO logbook scanning
-- JSON for it would turn every sync into a full table read. A column costs one
-- migration; the JSON would cost a scan every time.
--
-- sync_uid is listed in varcharColumns (internal/db/mysql.go): MySQL cannot
-- index a TEXT column without a prefix length, and a migration that tries dies
-- with error 1170 on every startup thereafter, with no way out from the UI.
--
-- Empty on every existing row, and it STAYS empty on most of them. The change
-- log starts empty too, so contacts logged before synchronisation was switched
-- on are never exchanged: nothing has to be copied across, and an identity is
-- stamped only on a contact that is actually logged, edited or deleted from
-- then on. Seeding a second machine with the existing log is a one-time copy of
-- the database or an ADIF import, not something synchronisation does.
ALTER TABLE qso ADD COLUMN sync_uid TEXT NOT NULL DEFAULT '';
CREATE INDEX IF NOT EXISTS idx_qso_sync_uid ON qso (sync_uid);
@@ -0,0 +1,8 @@
-- The lookup cache gains the IOTA reference QRZ was already sending.
--
-- QRZ's XML carries <iota>EU-048</iota> for an operator on an island, and
-- nothing read it — so the one place an IOTA reference can be known BEFORE the
-- contact is logged was thrown away on every lookup. There is no live "who is
-- on an island right now" feed anywhere (unlike POTA), which makes the callbook
-- record the practical source.
ALTER TABLE callsign_cache ADD COLUMN iota TEXT;
+4
View File
@@ -67,6 +67,10 @@ var varcharColumns = map[string]bool{
"callsign": true, "qso_date": true, "band": true, "mode": true,
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
"sync_uid": true, // qso index (0029) — folder-sync identity, looked up per record
// A new indexed TEXT column MUST be added here. TestIndexedTextColumnsAreVarchar
// reads the migrations and fails if one is missing, because the alternative is
// a MySQL logbook that stops connecting for good on error 1170.
// integrations_udp index (0011)
"direction": true,
// award_references composite primary key (0017)
+7
View File
@@ -117,6 +117,13 @@ func UploadClublogADIF(ctx context.Context, client *http.Client, cfg ServiceConf
if api == "" {
api = clublogAppAPIKey
}
// putlogs.php reads the upload as an ADIF *file*, so it needs a header.
// Callers that already build a full document (the QSL Manager) pass one;
// callers that only have <EOR>-terminated records (the on-close flush) do
// not, and a headerless file is rejected. Same rule as the LoTW writer.
if !strings.Contains(strings.ToUpper(adifDoc), "<EOH>") {
adifDoc = "OpsLog Club Log upload\n<PROGRAMID:6>OpsLog <EOH>\n" + adifDoc
}
var buf bytes.Buffer
mw := multipart.NewWriter(&buf)
+72
View File
@@ -267,6 +267,78 @@ func UploadEQSL(ctx context.Context, client *http.Client, user, pswd, qthNick, a
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
}
// eqslBatchMax is the largest number of records eQSL asks a single upload to
// carry ("upload only files smaller than about 1000 records at a time", eQSL's
// own ImportADIF interface notes). Callers chunk to this.
const eqslBatchMax = 1000
// UploadEQSLBatch pushes MANY ADIF records to eQSL.cc in ONE request.
//
// ImportADIF.cfm is a file importer, not a per-QSO endpoint: it takes one *or
// more* QSOs and answers "Result: X out of Y records added" — the plural in its
// own reply. So an on-close sweep or a bulk upload is one request, not one per
// contact. No ADIF header is prepended: the single-record path has always posted
// bare <EOR> records and eQSL accepts them (per ADIF, a file starting with '<'
// has no header), and there is no reason to change what is known to work.
//
// A PARTIAL result ("97 out of 100") sets Ignored so the caller can say so.
// eQSL does not identify which records it left out, and in practice they are
// QSOs it already holds — the same duplicate that UploadEQSL reports as success.
func UploadEQSLBatch(ctx context.Context, client *http.Client, user, pswd, qthNick string, records []string) (UploadResult, error) {
user = strings.ToUpper(strings.TrimSpace(user))
if user == "" {
return UploadResult{}, fmt.Errorf("eqsl: username (callsign) not set")
}
if strings.TrimSpace(pswd) == "" {
return UploadResult{}, fmt.Errorf("eqsl: password not set")
}
docs := make([]string, 0, len(records))
for _, r := range records {
if strings.TrimSpace(r) == "" {
continue
}
docs = append(docs, eqslRecordWithNickname(strings.TrimRight(r, "\r\n"), qthNick))
}
if len(docs) == 0 {
return UploadResult{}, fmt.Errorf("eqsl: empty adif batch")
}
if len(docs) > eqslBatchMax {
return UploadResult{}, fmt.Errorf("eqsl: batch of %d exceeds the %d-record limit", len(docs), eqslBatchMax)
}
body, err := eqslPost(ctx, client, user, pswd, strings.Join(docs, "\n"))
if err != nil {
return UploadResult{OK: false, Message: body}, err
}
if reason := authErrEQSL(body); reason != "" {
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: %s", reason)
}
// The counted result is read FIRST here, unlike the single-record path: a
// batch reply routinely carries both "Result: 97 out of 100 records added"
// and a "Bad record: Duplicate" line for the other three, and matching the
// duplicate first would throw away the count that says the rest went in.
if m := eqslResultRe.FindStringSubmatch(body); m != nil {
added, _ := strconv.Atoi(m[1])
total, _ := strconv.Atoi(m[2])
if added >= 1 {
return UploadResult{OK: true, Message: strings.TrimSpace(m[0]), Ignored: added < total}, nil
}
// "0 out of N" — nothing added. A re-upload of QSOs eQSL already holds
// lands here, and that is not a failure.
if strings.Contains(strings.ToLower(body), "duplicate") {
return UploadResult{OK: true, Message: "already in logbook"}, nil
}
reason := eqslReason(body)
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
}
if strings.Contains(strings.ToLower(body), "duplicate") {
return UploadResult{OK: true, Message: "already in logbook"}, nil
}
reason := eqslReason(body)
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
}
// eqslReason trims an eQSL reply to a short human-readable reason: the first
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
// (capped), else a generic phrase.
+180 -30
View File
@@ -295,9 +295,10 @@ func (m *Manager) CloseUploadCount() int {
}
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
// logbook (not just this session). Called from the shutdown sequence. QRZ/Club
// Log go one-by-one (fast HTTP); LoTW is signed and uploaded as a single TQSL
// batch. Returns the number of QSOs uploaded successfully.
// logbook (not just this session). Called from the shutdown sequence. QRZ and
// the rest go one-by-one (fast HTTP, no batch API); LoTW is signed and uploaded
// as a single TQSL batch, and Club Log goes through its batch endpoint.
// Returns the number of QSOs uploaded successfully.
func (m *Manager) FlushOnClose() int {
if m.deps.CloseUploadIDs == nil {
return 0
@@ -312,41 +313,190 @@ func (m *Manager) FlushOnClose() int {
switch svc {
case ServiceLoTW:
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
case ServiceQRZ:
for _, id := range ids {
if ok, _ := m.upload(svc, id, cfg.QRZ); ok {
uploaded++
}
}
case ServiceClublog:
for _, id := range ids {
if ok, _ := m.upload(svc, id, cfg.Clublog); ok {
uploaded++
}
}
case ServiceHRDLog:
for _, id := range ids {
if ok, _ := m.upload(svc, id, cfg.HRDLog); ok {
uploaded++
}
}
uploaded += m.flushClublogBatch(ids, cfg.Clublog)
case ServiceEQSL:
for _, id := range ids {
if ok, _ := m.upload(svc, id, cfg.EQSL); ok {
uploaded++
}
}
uploaded += m.flushEQSLBatch(ids, cfg.EQSL)
case ServiceQRZ:
uploaded += m.flushOneByOne(svc, ids, cfg.QRZ)
case ServiceHRDLog:
uploaded += m.flushOneByOne(svc, ids, cfg.HRDLog)
case ServiceCloudlog:
for _, id := range ids {
if ok, _ := m.upload(svc, id, cfg.Cloudlog); ok {
uploaded++
}
}
uploaded += m.flushOneByOne(svc, ids, cfg.Cloudlog)
}
}
return uploaded
}
// uploadPace is the shortest gap between two consecutive single-QSO uploads in
// an on-close sweep. QRZ, HRDLog and Cloudlog have no batch endpoint — HRDLog's
// NewEntry.aspx keeps only the first record of a multi-record ADIF — so a sweep
// of a freshly imported log is unavoidably one request per contact. It does not
// have to arrive as fast as the link allows, though: that burst is what a
// service reads as a robot, and what got an operator's IP threatened at Club Log
// (see flushClublogBatch). The gap costs nothing in practice, since a round trip
// to any of these already takes longer than it.
const uploadPace = 200 * time.Millisecond
// flushOneByOne uploads ids one request at a time, paced. For the services that
// have no batch API; everything else has its own flush<Service>Batch.
func (m *Manager) flushOneByOne(svc Service, ids []int64, cfg ServiceConfig) int {
uploaded := 0
for i, id := range ids {
if i > 0 {
time.Sleep(uploadPace)
}
if ok, _ := m.upload(svc, id, cfg); ok {
uploaded++
}
}
return uploaded
}
// eqslBatchChunk is how many QSOs go into one ImportADIF.cfm request. eQSL's own
// limit is ten times this (eqslBatchMax); the smaller chunk keeps one refused
// record from taking a thousand others down with it, and keeps the form body
// small enough to be unremarkable.
const eqslBatchChunk = 100
// flushEQSLBatch uploads the on-close eQSL QSOs through ImportADIF.cfm in
// batches instead of one request per contact. Same reasoning as
// flushClublogBatch — eQSL's import endpoint has always taken a whole file, so
// the one-at-a-time loop was making hundreds of requests it never needed to.
func (m *Manager) flushEQSLBatch(ids []int64, cfg ServiceConfig) int {
uploaded := 0
var records []string
var kept []int64
send := func() {
if len(records) == 0 {
return
}
// nil client: UploadEQSLBatch then builds one with a 30 s timeout rather
// than reusing the 20 s budget of a single realtime QSO.
res, err := UploadEQSLBatch(context.Background(), nil, cfg.Username, cfg.Password, cfg.QTHNickname, records)
if err != nil || !res.OK {
if err == nil {
err = errFromResult(res)
}
m.logf("extsvc: eqsl batch upload (%d QSOs) failed: %v", len(kept), err)
if m.deps.NotifyError != nil {
m.deps.NotifyError(ServiceEQSL, 0, err)
}
} else {
// res.Ignored means eQSL took the file but left records out. Say the
// count out loud: the whole chunk is still marked sent (eQSL never
// says WHICH it dropped, and in practice they are QSOs it already
// had), so the log line is the only trace of the shortfall.
if res.Ignored {
m.logf("extsvc: eqsl batch upload PARTIAL (%d QSOs sent) %s", len(kept), res.Message)
} else {
m.logf("extsvc: eqsl batch upload OK (%d QSOs) %s", len(kept), res.Message)
}
if m.deps.MarkUploaded != nil {
for _, id := range kept {
m.deps.MarkUploaded(ServiceEQSL, id, res.LogID)
}
}
uploaded += len(kept)
}
records = records[:0]
kept = kept[:0]
}
for _, id := range ids {
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceEQSL, id) {
continue
}
// eQSL keeps the QSO's own station call; the account is identified by the
// credentials and the optional QTH nickname — as in upload().
rec, ok := m.deps.BuildADIF(id, "")
if !ok {
continue
}
records = append(records, rec)
kept = append(kept, id)
if len(records) >= eqslBatchChunk {
send()
}
}
send()
return uploaded
}
// clublogBatchChunk is how many QSOs go into one putlogs.php request. Club Log
// dedupes server-side, so chunking is not about correctness — it keeps a single
// malformed record from failing a whole ten-thousand-QSO document, and matches
// what the QSL Manager's bulk upload already uses.
const clublogBatchChunk = 100
// flushClublogBatch uploads the on-close Club Log QSOs through the BATCH
// endpoint (putlogs.php) rather than one realtime.php call each.
//
// It used to walk the ids and call UploadClublog per QSO. On-close upload sweeps
// the WHOLE logbook, so importing an ADIF — or simply switching Club Log on over
// an existing log — turned one app close into hundreds of realtime.php posts.
// That endpoint is reserved for an operator logging contacts as they work them,
// and Club Log blocks the IP of anything that batches through it: an OpsLog user
// was flagged by G7VJR for 185 QSOs in four minutes, which is this loop, not a
// pile-up. Batch upload is the mechanism Club Log provides for exactly this.
func (m *Manager) flushClublogBatch(ids []int64, cfg ServiceConfig) int {
uploaded := 0
var records []string
var kept []int64
send := func() {
if len(records) == 0 {
return
}
// nil client on purpose: UploadClublogADIF then builds one with a 120 s
// timeout. m.deps.Client is the 20 s budget of a single realtime QSO,
// which a hundred-QSO document on a slow link would blow through.
res, err := UploadClublogADIF(context.Background(), nil, cfg, strings.Join(records, "\n"))
if err != nil || !res.OK {
if err == nil {
err = errFromResult(res)
}
m.logf("extsvc: clublog batch upload (%d QSOs) failed: %v", len(kept), err)
if m.deps.NotifyError != nil {
m.deps.NotifyError(ServiceClublog, 0, err)
}
} else {
m.logf("extsvc: clublog batch upload OK (%d QSOs) %s", len(kept), res.Message)
if m.deps.MarkUploaded != nil {
for _, id := range kept {
m.deps.MarkUploaded(ServiceClublog, id, res.LogID)
}
}
uploaded += len(kept)
}
records = records[:0]
kept = kept[:0]
}
for _, id := range ids {
// Skip QSOs not eligible (already sent). The wrong-logbook guard that
// upload() applies per QSO is not repeated here: closeUploadIDs has
// already filtered the sweep down to this logbook's callsign.
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceClublog, id) {
continue
}
// Club Log takes the logbook callsign as its own form field, so the ADIF
// keeps the QSO's own station call (no override) — as in upload().
rec, ok := m.deps.BuildADIF(id, "")
if !ok {
continue
}
records = append(records, rec)
kept = append(kept, id)
if len(records) >= clublogBatchChunk {
send()
}
}
send()
return uploaded
}
// flushLoTWBatch signs+uploads all queued LoTW QSOs in one TQSL run, then
// stamps each as uploaded on success.
func (m *Manager) flushLoTWBatch(ids []int64, cfg ServiceConfig) int {
@@ -0,0 +1,40 @@
package udp
import (
"encoding/binary"
"testing"
)
// An operator's log arrived with four hundred identical "ADIF payload ignored"
// lines and nothing else legible: two inbound listeners were configured on the
// SAME multicast group and port, one WSJT and one ADIF, so every WSJT-X decode
// was delivered to both and the ADIF one rejected each in writing. An FT8 cycle
// is dozens of decodes every fifteen seconds.
//
// The listener has to recognise that traffic and say what it is — once.
func TestIgnoredADIFStaysBounded(t *testing.T) {
s := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
// A WSJT-X packet: magic first. One line is the whole diagnosis, so the
// counter is pushed past the cap immediately.
pkt := make([]byte, 16)
binary.BigEndian.PutUint32(pkt[:4], wsjtMagic)
s.noteIgnoredADIF(pkt)
if s.badPkts <= maxBadPktDumps {
t.Errorf("badPkts = %d — WSJT traffic should silence the listener at once", s.badPkts)
}
// Anything else is described a few times before going quiet, so an ordinary
// keep-alive does not get the same one-line treatment as a real diagnosis.
s2 := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
s2.noteIgnoredADIF([]byte("keep-alive"))
if s2.badPkts > maxBadPktDumps {
t.Errorf("one unusable payload silenced the listener (badPkts = %d)", s2.badPkts)
}
for i := 0; i < 50; i++ {
s2.noteIgnoredADIF([]byte("keep-alive"))
}
if s2.badPkts <= maxBadPktDumps {
t.Errorf("badPkts = %d — the throttle never engaged", s2.badPkts)
}
}
+47 -6
View File
@@ -37,6 +37,34 @@ const (
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
// discard a bare ADIF record without a word — so the two cannot be one row.
ServiceWSJTLog ServiceType = "wsjt_log"
// ServiceCustom is the general case: the operator picks the trigger, writes
// the message, and chooses UDP or HTTP. See Trigger and Config.Template.
ServiceCustom ServiceType = "custom"
)
// Trigger names the moment a custom outbound row fires.
type Trigger string
const (
TriggerQSOLogged Trigger = "qso_logged"
TriggerRotatorGo Trigger = "rotator_goto"
TriggerLookupDone Trigger = "lookup_done"
// TriggerBandChange is the RIG changing band, not the entry form: a switch
// follows the radio, not what is being typed. Rare by nature, so unlike a
// frequency trigger it needs no damping.
TriggerBandChange Trigger = "band_change"
)
// Transport is how a custom row leaves: a UDP datagram or an HTTP GET.
type Transport string
const (
TransportUDP Transport = "udp"
TransportURL Transport = "url"
)
// Config is one user-defined UDP connection.
@@ -51,6 +79,13 @@ type Config struct {
DestinationIP string `json:"destination_ip"` // outbound only
Enabled bool `json:"enabled"`
SortOrder int `json:"sort_order"`
// Custom rows only (ServiceCustom).
Trigger Trigger `json:"trigger"`
Template string `json:"template"` // message text with {fields}
Transport Transport `json:"transport"` // udp | url
URL string `json:"url"` // URL template, when transport is url
LineEnd string `json:"line_end"` // "" | lf | crlf — UDP only
}
// Repo is the persistence layer for UDP integration rows.
@@ -62,7 +97,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
rows, err := r.db.QueryContext(ctx, `
SELECT id, direction, name, port, service_type,
multicast, multicast_group, destination_ip,
enabled, sort_order
enabled, sort_order,
trig, template, transport, url, line_end
FROM integrations_udp
ORDER BY direction, sort_order, id`)
if err != nil {
@@ -74,7 +110,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
var c Config
var mc, en int
if err := rows.Scan(&c.ID, &c.Direction, &c.Name, &c.Port, &c.ServiceType,
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder); err != nil {
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder,
&c.Trigger, &c.Template, &c.Transport, &c.URL, &c.LineEnd); err != nil {
return nil, err
}
c.Multicast = mc != 0
@@ -101,10 +138,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
if c.ID == 0 {
res, err := r.db.ExecContext(ctx, `
INSERT INTO integrations_udp(direction, name, port, service_type,
multicast, multicast_group, destination_ip, enabled, sort_order)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)`,
multicast, multicast_group, destination_ip, enabled, sort_order,
trig, template, transport, url, line_end)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
c.Direction, c.Name, c.Port, c.ServiceType,
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder)
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd)
if err != nil {
return fmt.Errorf("insert udp: %w", err)
}
@@ -117,10 +156,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
direction = ?, name = ?, port = ?, service_type = ?,
multicast = ?, multicast_group = ?, destination_ip = ?,
enabled = ?, sort_order = ?,
trig = ?, template = ?, transport = ?, url = ?, line_end = ?,
updated_at = ?
WHERE id = ?`,
c.Direction, c.Name, c.Port, c.ServiceType,
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder, db.NowISO(), c.ID)
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd, db.NowISO(), c.ID)
if err != nil {
return fmt.Errorf("update udp: %w", err)
}
+205
View File
@@ -0,0 +1,205 @@
package udp
import (
"context"
"fmt"
"net/http"
"net/url"
"strings"
"time"
"hamlog/internal/applog"
)
// Custom outbound messages: a trigger, a template, a transport.
//
// The hard-coded emitters beside this one each speak a published format at a
// fixed moment. This is the escape hatch: the operator chooses when it fires and
// writes what it says. It exists mainly for antenna switches, which are driven
// by a URL — http://192.168.1.50/antenna?band=20m — and want the band change,
// but nothing here is specific to them.
//
// The presets are NOT reimplemented on top of this. PstRotator and N1MM
// RadioInfo are documented formats that work; a typo in a template would break
// them silently, and "it worked before I touched anything" is not a trade worth
// making for one less code path.
// httpTimeout bounds a request. A UDP datagram leaves and is forgotten; an HTTP
// call to a switch that has been unplugged will otherwise sit there for the
// operating system's own timeout — and this fires on a band change, which is
// exactly when nobody wants to wait.
const httpTimeout = 3 * time.Second
// customHTTP is the client for URL rows. One client, reused: a new one per
// request leaks connections on a switch that keeps them alive.
var customHTTP = &http.Client{Timeout: httpTimeout}
// Render substitutes {field} placeholders in tmpl.
//
// escape decides how a value is written, and it is not cosmetic: in a URL every
// value has to be percent-encoded, or the first portable callsign — F4BPO/P —
// puts a path separator in the middle of a query string, and a name with a
// space breaks the request outright. In a UDP payload the opposite holds: the
// receiver wants the text as typed.
//
// A placeholder with no value becomes empty rather than staying as "{freq}".
// Leaving the braces would send them down the wire, and a receiver would store
// the literal text as if it meant something.
func Render(tmpl string, fields map[string]string, escape bool) string {
var b strings.Builder
for {
i := strings.IndexByte(tmpl, '{')
if i < 0 {
b.WriteString(tmpl)
return b.String()
}
j := strings.IndexByte(tmpl[i:], '}')
if j < 0 {
b.WriteString(tmpl) // an unclosed brace is literal text
return b.String()
}
b.WriteString(tmpl[:i])
key := strings.ToLower(strings.TrimSpace(tmpl[i+1 : i+j]))
v := fields[key]
if escape {
v = url.QueryEscape(v)
}
b.WriteString(v)
tmpl = tmpl[i+j+1:]
}
}
// lineEnding turns the stored choice into the bytes appended to a UDP payload.
// Many receivers read a line at a time and wait for a terminator; a trailing
// space in a text box is invisible and lost on the first copy-paste, so this is
// a choice rather than something to type.
func lineEnding(s string) string {
switch strings.ToLower(strings.TrimSpace(s)) {
case "lf":
return "\n"
case "crlf":
return "\r\n"
}
return ""
}
// EmitTrigger fires every enabled custom row bound to this trigger.
//
// Runs the sends in the background: an HTTP request must never sit on the path
// of the thing that caused it — a band change waiting on an antenna switch is a
// band change the operator watches not happen.
func (m *Manager) EmitTrigger(t Trigger, fields map[string]string) {
var rows []Config
for _, c := range m.Outbound(ServiceCustom) {
if c.Trigger == t {
rows = append(rows, c)
}
}
if len(rows) == 0 {
return
}
for _, c := range rows {
go m.fireCustom(c, fields)
}
}
func (m *Manager) fireCustom(c Config, fields map[string]string) {
if c.Transport == TransportURL {
target := Render(c.URL, fields, true)
if strings.TrimSpace(target) == "" {
m.noteEmptyRender(c, c.URL)
return
}
m.getURL(c, target)
return
}
payload := Render(c.Template, fields, false) + lineEnding(c.LineEnd)
if strings.TrimSpace(payload) == "" {
m.noteEmptyRender(c, c.Template)
return
}
m.sendTo(c, []byte(payload))
}
// noteEmptyRender reports a template that produced nothing.
//
// Silence here was the worst of the lot: a row whose template is a single
// placeholder the trigger does not carry — {freq} on a band change — renders
// empty, sends nothing, and looked exactly like a row that had never fired. The
// operator has no way to tell a typo from a trigger that is not reaching them.
//
// Throttled with the same per-row timer as a failing URL: a template that is
// wrong stays wrong on every band change.
func (m *Manager) noteEmptyRender(c Config, tmpl string) {
m.noteCustomProblem(c, fmt.Sprintf(
"on %s the message came out empty — %q filled in nothing. Check the field names against the list under the box.",
c.Trigger, tmpl))
}
// getURL performs the request and reports what came back.
//
// The status code is logged, not just transport errors. A switch answering 404
// because a firmware update moved its endpoint is a total failure that looks
// exactly like success from here — the datagram equivalent does not exist, and
// an operator would have no way to tell.
func (m *Manager) getURL(c Config, target string) {
ctx, cancel := context.WithTimeout(context.Background(), httpTimeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, target, nil)
if err != nil {
applog.Printf("udp: [%s] bad URL %q: %v", c.Name, redactURL(target), err)
return
}
resp, err := customHTTP.Do(req)
if err != nil {
m.noteCustomProblem(c, fmt.Sprintf("%s failed: %v", redactURL(target), err))
return
}
defer resp.Body.Close()
if resp.StatusCode >= 400 {
m.noteCustomProblem(c, fmt.Sprintf("%s answered %s", redactURL(target), resp.Status))
return
}
applog.Printf("udp: [%s] on %s GET %s → %s", c.Name, c.Trigger, redactURL(target), resp.Status)
}
// redactURL hides the password in a URL before it reaches the log.
//
// The URL is what makes this feature debuggable, so it is logged in full — but
// an operator who put http://admin:secret@switch/ in the box is going to send
// that log to somebody when something goes wrong. Storing the password as typed
// was a deliberate choice for LAN gear; writing it into a file that travels is
// not the same choice, and was never made.
func redactURL(raw string) string {
u, err := url.Parse(raw)
if err != nil || u.User == nil {
return raw
}
if _, hasPass := u.User.Password(); !hasPass {
return raw
}
u.User = url.UserPassword(u.User.Username(), "***")
// Qt-style escaping of the placeholder would give %2A%2A%2A; put it back so
// the line stays readable.
return strings.ReplaceAll(u.String(), "%2A%2A%2A", "***")
}
// noteCustomProblem logs a failing URL row, throttled per row: a switch that is
// off answers the same way on every band change, and this fires on every one.
func (m *Manager) noteCustomProblem(c Config, msg string) {
m.httpFailMu.Lock()
if m.httpFailAt == nil {
m.httpFailAt = map[int64]time.Time{}
}
last := m.httpFailAt[c.ID]
now := time.Now()
quiet := now.Sub(last) < 5*time.Minute
if !quiet {
m.httpFailAt[c.ID] = now
}
m.httpFailMu.Unlock()
if quiet {
return
}
applog.Printf("udp: [%s] %s", c.Name, msg)
}
+108
View File
@@ -0,0 +1,108 @@
package udp
import (
"strings"
"testing"
)
// The escaping rule is the whole difference between a template that works on
// the bench and one that fails on the first portable callsign.
func TestRenderEscapesForURLsOnly(t *testing.T) {
fields := map[string]string{
"call": "F4BPO/P", "name": "Jean Pierre", "band": "20m", "az": "137",
}
// UDP: the receiver wants the text as typed.
if got := Render("<CALL>{call}</CALL>", fields, false); got != "<CALL>F4BPO/P</CALL>" {
t.Errorf("UDP render = %q", got)
}
// URL: a slash in a callsign is a path separator, a space breaks the request.
if got := Render("http://sw/a?c={call}&n={name}", fields, true); got != "http://sw/a?c=F4BPO%2FP&n=Jean+Pierre" {
t.Errorf("URL render = %q", got)
}
}
// A placeholder the trigger does not carry becomes empty, not the literal
// "{freq}" — otherwise the braces go down the wire and a receiver files them.
func TestRenderDropsUnknownFields(t *testing.T) {
if got := Render("<AZIMUT>{az}</AZIMUT>{freq}", map[string]string{"az": "137"}, false); got != "<AZIMUT>137</AZIMUT>" {
t.Errorf("got %q", got)
}
}
// Text that merely looks like a placeholder must survive: an unclosed brace is
// content, not a broken field.
func TestRenderLeavesLiteralBraces(t *testing.T) {
for _, c := range []struct{ in, want string }{
{"no fields here", "no fields here"},
{"{unclosed", "{unclosed"},
{"a } b", "a } b"},
} {
if got := Render(c.in, map[string]string{}, false); got != c.want {
t.Errorf("Render(%q) = %q, want %q", c.in, got, c.want)
}
}
}
// Field names are matched case- and space-insensitively: an operator typing
// {Band} or { band } means the band.
func TestRenderFieldNamesAreForgiving(t *testing.T) {
f := map[string]string{"band": "20m"}
for _, tmpl := range []string{"{band}", "{Band}", "{ BAND }"} {
if got := Render(tmpl, f, false); got != "20m" {
t.Errorf("Render(%q) = %q, want 20m", tmpl, got)
}
}
}
// Receivers that read a line at a time need a terminator, and a trailing space
// in a text box is invisible — hence a choice rather than something to type.
func TestLineEnding(t *testing.T) {
for in, want := range map[string]string{
"": "", "lf": "\n", "LF": "\n", "crlf": "\r\n", " CRLF ": "\r\n", "nonsense": "",
} {
if got := lineEnding(in); got != want {
t.Errorf("lineEnding(%q) = %q, want %q", in, got, want)
}
}
}
// These logs get sent to whoever is helping when something breaks. Storing a
// switch password as typed was a deliberate choice for LAN gear; putting it in
// a file that travels is a different one, and was never made.
func TestRedactURLHidesThePassword(t *testing.T) {
for in, want := range map[string]string{
"http://admin:[email protected]/ant?b=20m": "http://admin:***@192.168.1.50/ant?b=20m",
// No credentials, nothing to hide — and the URL must come back untouched,
// because it is the thing being debugged.
"http://192.168.1.50/ant?b=20m": "http://192.168.1.50/ant?b=20m",
// A username with no password is not a secret.
"http://[email protected]/ant": "http://[email protected]/ant",
// Not a URL at all: leave it, the operator needs to see what they typed.
"not a url {band}": "not a url {band}",
} {
if got := redactURL(in); got != want {
t.Errorf("redactURL(%q) = %q, want %q", in, got, want)
}
}
}
// "sent 18 bytes" says nothing about whether the substitution came out right.
// The payload is shown for custom rows and only those: an ADIF record or a
// binary WSJT frame on every QSO would bury the log.
func TestSentPreviewIsForCustomRowsOnly(t *testing.T) {
custom := Config{ServiceType: ServiceCustom, Trigger: TriggerBandChange}
got := sentPreview(custom, []byte("<BAND>20</BAND>\r\n"))
if got != ` on band_change: "<BAND>20</BAND>\r\n"` {
t.Errorf("custom preview = %q", got)
}
// A line ending is a choice the operator made — it has to be visible, and it
// must not break the log line in two.
if strings.ContainsAny(got, "\r\n") {
t.Error("the preview put a real newline in the log line")
}
for _, s := range []ServiceType{ServiceDBUpdated, ServiceWSJTLog, ServiceN1MMRadio} {
if p := sentPreview(Config{ServiceType: s}, []byte("<CALL:5>VK9XX<EOR>")); p != "" {
t.Errorf("%s should not dump its payload, got %q", s, p)
}
}
}
+84 -1
View File
@@ -86,12 +86,92 @@ func (m *Manager) EmitLoggedADIF(adif string) {
if strings.TrimSpace(adif) == "" {
return
}
for _, c := range m.Outbound(ServiceDBUpdated) {
rows := m.Outbound(ServiceDBUpdated)
if len(rows) == 0 {
// Said once per session, not per QSO. An operator who configured a second
// logger and sees nothing arrive needs to know the difference between "we
// sent it" and "there was nothing to send to" — and the usual cause is a
// row created as an inbound ADIF listener instead of an outbound message.
m.noADIFOnce.Do(func() {
applog.Printf("udp: a QSO was logged but no outbound \"ADIF message\" row is enabled — " +
"nothing is forwarded to another logger")
})
return
}
for _, c := range rows {
m.sendTo(c, []byte(adif))
}
}
// EmitLoggedQSOWSJT announces a logged contact on the WSJT-X interface, for
// receivers that speak it rather than plain text — Logger32's additional UDP
// sockets among them.
//
// BOTH messages go out, "QSO Logged" (5) then "Logged ADIF" (12), because that
// is exactly what WSJT-X does for every contact. Which one a receiver takes is
// its own business: MacLoggerDX reads the structured one by default and offers
// the ADIF as an option, and sending only the ADIF is why a QSO reached
// Logger32's socket and never reached its log. Anything built for WSJT-X
// already sees both from the real thing, so neither is a surprise and nothing
// logs the contact twice.
func (m *Manager) EmitLoggedQSOWSJT(q LoggedQSO, adifRec string) {
rows := m.Outbound(ServiceWSJTLog)
if len(rows) == 0 {
return
}
qsoPkt := BuildWSJTQSOLogged("OpsLog", q)
var adifPkt []byte
if strings.TrimSpace(adifRec) != "" {
adifPkt = BuildWSJTLoggedADIF("OpsLog", adifRec)
}
for _, c := range rows {
m.sendTo(c, qsoPkt)
if adifPkt != nil {
m.sendTo(c, adifPkt)
}
}
}
// sentPreview appends what was actually sent, for the rows where that is worth
// reading.
//
// Custom rows only, and deliberately: their payload is a template the operator
// wrote, and "sent 18 bytes" tells them nothing about whether the substitution
// came out as they meant. The ADIF and WSJT-X rows carry a whole record or a
// binary frame, and dumping either into the log on every QSO would bury it.
//
// The trigger is named too — a row that fires on the wrong moment looks exactly
// like a row that does not fire.
func sentPreview(c Config, payload []byte) string {
if c.ServiceType != ServiceCustom {
return ""
}
const maxShown = 200
s := string(payload)
if len(s) > maxShown {
s = s[:maxShown] + "…"
}
// %q below already renders a carriage return as \r rather than breaking the
// log line in two — and it is the line ending the operator chose, so it has
// to be visible. Escaping it by hand first would double every backslash.
if c.Trigger != "" {
return fmt.Sprintf(" on %s: %q", c.Trigger, s)
}
return fmt.Sprintf(": %q", s)
}
// sendTo resolves the row's destination (host:port) and fires one datagram.
//
// A successful send is logged, not just a failure. UDP has no delivery report:
// when an operator says "I set up an ADIF message to Logger32 on port 2250 and
// nothing arrives", the only thing that separates "OpsLog never sent it" from
// "the other program did not take it" is a line saying we sent. Without one,
// both look identical from here — and the first is far more common, because a
// row created as an INBOUND ADIF listener rather than an OUTBOUND ADIF message
// matches nothing and emits nothing, in silence.
//
// Rate is not a concern: these fire on a QSO being logged or a frequency
// change, not per packet on a socket.
func (m *Manager) sendTo(c Config, payload []byte) {
host := strings.TrimSpace(c.DestinationIP)
if host == "" {
@@ -100,5 +180,8 @@ func (m *Manager) sendTo(c Config, payload []byte) {
dst := fmt.Sprintf("%s:%d", host, c.Port)
if err := SendUDP(dst, payload); err != nil {
applog.Printf("udp: [%s] outbound send to %s failed: %v", c.Name, dst, err)
return
}
applog.Printf("udp: [%s] sent %d bytes to %s (%s)%s",
c.Name, len(payload), dst, c.ServiceType, sentPreview(c, payload))
}
@@ -0,0 +1,31 @@
package udp
import "testing"
// A remote-call <FREQ> arrives in whatever unit the sender happens to use, and
// the same sender uses more than one. Every form has to land on the same dial
// frequency, because the alternative is a rig sent to the wrong band.
func TestRemoteTuneUnits(t *testing.T) {
const m20 = 14_074_000
for _, c := range []struct {
in string
want int64
why string
}{
{"14.074", m20, "MHz, the documented DXHunter form"},
{"10.136", 10_136_000, "MHz, 30 m"},
{"14074", m20, "kHz"},
{"14074.0", m20, "kHz with a decimal point"},
{"1407400", m20, "tens of Hz — what N1MM RadioInfo publishes, echoed back"},
{"2107400", 21_074_000, "the value from the field log that failed every time"},
{"14074000", m20, "Hz"},
{"7000000", 7_000_000, "Hz on 40 m, not tens of Hz on 4 m"},
{"0", 0, "no frequency"},
{"999999999999", 0, "nothing plausible — tune nothing rather than guess"},
{"abc", 0, "not a number"},
} {
if got := remoteTuneHz(c.in); got != c.want {
t.Errorf("remoteTuneHz(%q) = %d, want %d (%s)", c.in, got, c.want, c.why)
}
}
}
@@ -0,0 +1,74 @@
package udp
import (
"net"
"testing"
"time"
)
// feed runs one datagram through a remote-call listener and returns the event
// it produced, or nil.
func feed(t *testing.T, pkt []byte) *Event {
t.Helper()
out := make(chan Event, 4)
s := &Server{
cfg: Config{ID: 1, Name: "DX HUNTER", ServiceType: ServiceRemoteCall, Port: 2241},
out: out,
}
s.handle(pkt, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2241})
select {
case ev := <-out:
return &ev
case <-time.After(200 * time.Millisecond):
return nil
}
}
// A RadioInfo datagram must never be read as a remote-call request.
//
// This is the loop from a reported session. An inbound remote-call row and an
// outbound RadioInfo row shared port 2241, so every datagram OpsLog sent came
// straight back on the loopback. The tag-stripping heuristic read its last
// token — <ActiveRadioNr>1</ActiveRadioNr> — as the callsign "1", and <Freq> as
// a tune request for the frequency the rig was already on.
//
// It stayed harmless only while <Freq> was misread as MHz: the tune failed "out
// of the CAT range" and the loop died there. Reading the unit correctly closed
// it, and with JTDX "Fake It" — which shifts the dial for every over — each
// transmission set off a burst of sets echoing between OpsLog and itself until
// the rig stopped answering IF; and the shared CAT link dropped.
func TestRadioInfoIsNotARemoteCall(t *testing.T) {
pkt := BuildN1MMRadioInfo("F5PHW", 24_915_000, 24_915_000, "FT8", "F5PHW")
// The trap this closes: the payload really does parse as a plausible dial
// frequency, so nothing downstream would have questioned it.
m := remoteFreqRe.FindStringSubmatch(string(pkt))
if m == nil {
t.Fatal("the RadioInfo no longer carries a <Freq> — this test is checking nothing")
}
if hz := remoteTuneHz(m[1]); hz != 24_915_000 {
t.Fatalf("remoteTuneHz(%q) = %d — the dial frequency back is what made the loop live", m[1], hz)
}
if ev := feed(t, pkt); ev != nil {
t.Errorf("a RadioInfo produced a remote-call event %+v — the rig would be re-tuned to where it already is", *ev)
}
}
// A callsign has a letter in it. Refusing by shape as well as by name means the
// next program to broadcast its state on this port cannot drive the rig either.
func TestRemoteCallNeedsALetter(t *testing.T) {
for _, body := range []string{"<CALLSIGN>1</CALLSIGN>", "<CALLSIGN>0</CALLSIGN>", "12345"} {
if ev := feed(t, []byte(body)); ev != nil {
t.Errorf("%q was accepted as a callsign: %+v", body, *ev)
}
}
// A genuine spot click still gets through, tune request and all.
ev := feed(t, []byte("<CALLSIGN>OJ0YL<FREQ>10.112<MODE>CW"))
if ev == nil {
t.Fatal("a genuine spot click produced no event")
}
if ev.DXCall != "OJ0YL" || ev.TuneFreqHz != 10_112_000 || ev.TuneMode != "CW" {
t.Errorf("spot click decoded as %+v, want OJ0YL / 10112000 Hz / CW", *ev)
}
}
+137 -5
View File
@@ -2,6 +2,7 @@ package udp
import (
"context"
"encoding/binary"
"fmt"
"net"
"regexp"
@@ -16,6 +17,38 @@ import (
"hamlog/internal/applog"
)
// remoteTuneHz turns a <FREQ> value from a remote-call packet into Hz.
//
// The field has NO agreed unit, and the same sender uses two of them. DXHunter
// documents "<FREQ>10.136" — MHz — but a log from a working station showed it
// echoing "<FREQ>2107400" straight back: the frequency OpsLog had just
// published to it in the N1MM RadioInfo broadcast, whose <Freq> is in units of
// 10 Hz. Read as MHz, that asked the rig for 2 107 400 MHz, and every tune
// request failed with "out of the 11-digit CAT range" from the first second
// after launch.
//
// So the unit is inferred: try each one and keep the first that lands on an
// amateur band. Anything a station is asked to tune to is, by definition, in
// one. Hz is tried before 10 Hz because the one overlap between them — a 40 m
// frequency in Hz reads as a 4 m one in tens of Hz — is far more likely to be
// 40 m. Nothing plausible means nothing is tuned: a wrong band is worse than a
// request that visibly did nothing.
func remoteTuneHz(s string) int64 {
v, err := strconv.ParseFloat(s, 64)
if err != nil || v <= 0 {
return 0
}
for _, hz := range []int64{int64(v * 1e6), int64(v * 1e3), int64(v), int64(v * 10)} {
if bandFromHz(hz) != "" {
return hz
}
}
// Refusing in silence is how the previous version's failure looked from the
// outside: a spot clicked in another program, and nothing happening here.
applog.Printf("udp: remote_call <FREQ>%s is not a frequency in any amateur band in MHz, kHz or Hz — not tuning\n", s)
return 0
}
// remoteFreqRe / remoteModeRe pull the optional tune request out of a
// ServiceRemoteCall packet: "<FREQ>10.136" (MHz) and "<MODE>FT8". Both accept
// an optional closing tag for proper-XML senders.
@@ -268,6 +301,44 @@ func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err
}
}
// noteIgnoredADIF reports a payload the ADIF listener could not use, ONCE per
// cause and then quietly.
//
// This used to log a line per datagram. An operator's log arrived with four
// hundred identical "ADIF payload ignored" lines and nothing else legible: two
// inbound listeners were configured on the SAME multicast group and port
// (239.255.0.1:2237, one WSJT and one ADIF), so every WSJT-X decode packet was
// delivered to both, and the ADIF one rejected each of them in writing. An FT8
// cycle is dozens of decodes every fifteen seconds.
//
// So the WSJT-X magic number is checked here. When it matches, the payload is
// not "chatter" — it is a specific, fixable misconfiguration, and saying which
// is the difference between a log the operator can act on and one they cannot.
func (s *Server) noteIgnoredADIF(pkt []byte) {
s.mu.Lock()
s.badPkts++
n := s.badPkts
s.mu.Unlock()
if n > maxBadPktDumps {
return
}
if len(pkt) >= 4 && binary.BigEndian.Uint32(pkt[:4]) == wsjtMagic {
applog.Printf("udp: [%s] this is WSJT-X traffic, not ADIF — port %d is shared with a WSJT source; "+
"give the ADIF forwarder (JTAlert / GridTracker) its own port, or set this listener's service to WSJT\n",
s.cfg.Name, s.cfg.Port)
// One line is the whole diagnosis: nothing is gained by counting to five.
s.mu.Lock()
s.badPkts = maxBadPktDumps + 1
s.mu.Unlock()
return
}
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>) — %s\n", s.cfg.Name, describePacket(pkt))
if n == maxBadPktDumps {
applog.Printf("udp: [%s] further unusable payloads on port %d will not be logged\n",
s.cfg.Name, s.cfg.Port)
}
}
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
switch s.cfg.ServiceType {
@@ -338,7 +409,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
text := string(pkt)
low := strings.ToLower(text)
if !strings.Contains(low, "<call:") || !strings.Contains(low, "<eor") {
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>)\n", s.cfg.Name)
s.noteIgnoredADIF(pkt)
return
}
ev.LoggedADIF = text
@@ -352,15 +423,32 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
// Strip every angle-bracket tag, normalise whitespace, take the
// last non-empty token. Upper-case for downstream consistency.
text := string(pkt)
// NEVER act on an N1MM RadioInfo datagram.
//
// It is not a spot click, it is a radio TELLING the world where it is —
// and on a station where an inbound remote-call row and an outbound
// RadioInfo row share a port, the one OpsLog just sent arrives straight
// back on the loopback. The tag-stripping below then reads its last token,
// <ActiveRadioNr>1</ActiveRadioNr>, as the callsign "1", and <Freq> as a
// tune request — for the frequency the rig is already on.
//
// That was harmless only for as long as <Freq> was misread: in tens of Hz
// it looks like a wild number, every tune failed "out of the CAT range",
// and the loop died there. Reading the unit correctly closed it. With
// WSJT-X/JTDX "Fake It", which shifts the dial for each over, every
// transmission then produced a burst of sets echoing between OpsLog and
// itself until the rig stopped answering IF; and the shared CAT link
// dropped. Reported as Fake It causing CAT disconnections.
if low := strings.ToLower(text); strings.Contains(low, "<radioinfo") {
return
}
// Optional tune request: <FREQ>MHz and <MODE>str ride along with the
// callsign so a DXHunter spot click can drive OpsLog's CAT. Extract
// (and cut) them BEFORE the generic tag-stripping below, which would
// otherwise leave their values as stray tokens and corrupt the
// "last token = callsign" heuristic.
if m := remoteFreqRe.FindStringSubmatch(text); m != nil {
if mhz, err := strconv.ParseFloat(m[1], 64); err == nil && mhz > 0 {
ev.TuneFreqHz = int64(mhz * 1e6)
}
ev.TuneFreqHz = remoteTuneHz(m[1])
text = strings.Replace(text, m[0], " ", 1)
}
if m := remoteModeRe.FindStringSubmatch(text); m != nil {
@@ -385,7 +473,16 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
if len(parts) == 0 {
return
}
ev.DXCall = strings.ToUpper(parts[len(parts)-1])
call := strings.ToUpper(parts[len(parts)-1])
// A callsign has a letter in it. Without this, any status XML that ends
// in a number is read as a station — the RadioInfo above was exactly
// that, and refusing it by shape as well as by name means the next
// program to broadcast its state on this port cannot drive the rig
// either.
if !strings.ContainsAny(call, "ABCDEFGHIJKLMNOPQRSTUVWXYZ") {
return
}
ev.DXCall = call
case ServiceN1MM:
adifText, ok, err := ParseN1MM(pkt)
if err != nil {
@@ -458,6 +555,15 @@ type Manager struct {
repo *Repo
out chan Event
// noADIFOnce keeps the "nothing to forward to" note to one line a session
// rather than one per QSO logged.
noADIFOnce sync.Once
// httpFailAt throttles the complaint from a custom URL row, per row: a
// switch that is off answers the same way on every band change.
httpFailMu sync.Mutex
httpFailAt map[int64]time.Time
mu sync.Mutex
inbound map[int64]*Server
outbound []Config
@@ -520,10 +626,36 @@ func (m *Manager) Reload(ctx context.Context) []string {
m.inbound[c.ID] = srv
m.mu.Unlock()
}
warnSharedPorts(cfgs)
applog.Printf("udp: Reload done — %d server(s) running, %d error(s)", len(m.inbound), len(errs))
return errs
}
// warnSharedPorts names an inbound and an outbound row sitting on the same
// port, because that is a loop: what OpsLog sends there, OpsLog receives.
//
// It is how a station ended up re-tuning its own rig from its own RadioInfo
// broadcasts. The parser refuses that particular payload now, but the
// arrangement stays wrong for anything else that lands on the port, and it is
// invisible in a settings panel that shows one row at a time.
func warnSharedPorts(cfgs []Config) {
in := map[int]string{}
for _, c := range cfgs {
if c.Enabled && c.Direction != Outbound {
in[c.Port] = c.Name
}
}
for _, c := range cfgs {
if !c.Enabled || c.Direction != Outbound {
continue
}
if name, ok := in[c.Port]; ok {
applog.Printf("udp: %q sends on port %d and %q listens on it — OpsLog will receive its own messages there; give one of the two another port",
c.Name, c.Port, name)
}
}
}
// Outbound returns the active outbound configs matching a service type.
// Used by the QSO save path to push notifications to listeners.
func (m *Manager) Outbound(service ServiceType) []Config {
+148
View File
@@ -0,0 +1,148 @@
package udp
import (
"bytes"
"encoding/binary"
"time"
)
// Sending WSJT-X UDP messages, as opposed to parsing them (wsjt.go).
//
// This exists for Logger32, and for anything else that listens on the WSJT-X
// interface rather than for plain text. Logger32's "additional WSJT/JTDX UDP
// sockets" receivers — ports 2250, 2251, 2252 — are documented as receiving
// "UDP logging packets": they speak the WSJT-X v2 protocol, and a raw ADIF
// record posted to them is discarded without a word.
//
// That is a real distinction and not a detail: an operator can watch OpsLog
// report "sent 1153 bytes to 127.0.0.1:2250" and see nothing whatsoever appear
// in Logger32, because both statements are true.
// buildQString encodes a Qt QString/QByteArray as QDataStream writes it: a
// big-endian int32 length followed by the UTF-8 bytes. A negative length means
// null, which is not what we ever want here — an empty string is length 0.
func buildQString(s string) []byte {
out := make([]byte, 4, 4+len(s))
binary.BigEndian.PutUint32(out, uint32(len(s)))
return append(out, s...)
}
// BuildWSJTLoggedADIF frames a WSJT-X "Logged ADIF" datagram (message type 12).
//
// uint32 magic 0xadbccbda
// uint32 schema 2
// uint32 type 12
// QString id the sending program's name
// QString adif the ADIF record
//
// id matters more than it looks: a receiver uses it to tell instances apart, and
// some show it in their log. "OpsLog" is honest — pretending to be WSJT-X would
// make a second instance of the real thing indistinguishable from us.
func BuildWSJTLoggedADIF(id, adif string) []byte {
var b bytes.Buffer
var hdr [12]byte
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
binary.BigEndian.PutUint32(hdr[4:8], 2) // schema 2 — what WSJT-X 2.x speaks
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgLoggedADIF)
b.Write(hdr[:])
b.Write(buildQString(id))
b.Write(buildQString(adif))
return b.Bytes()
}
// LoggedQSO is what a WSJT-X "QSO Logged" message carries. Declared here rather
// than taking a qso.QSO so this package stays free of the logbook — it speaks a
// wire protocol and nothing else.
type LoggedQSO struct {
DXCall string
DXGrid string
TxFreqHz uint64
Mode string
ReportSent string
ReportRcvd string
TxPower string
Comments string
Name string
TimeOn time.Time // UTC
TimeOff time.Time // UTC
OperatorCall string
MyCall string
MyGrid string
ExchangeSent string
ExchangeRcvd string
PropMode string
}
// BuildWSJTQSOLogged frames a WSJT-X "QSO Logged" datagram (message type 5).
//
// This is the message most loggers listen for — MacLoggerDX takes it by default
// and offers the ADIF one as an alternative, and WSJT-X itself sends BOTH for
// every contact. Sending only the ADIF form was the reason a QSO reached
// Logger32's socket and never reached its log.
//
// Field order is fixed by WSJT-X's NetworkMessage.hpp and cannot be rearranged:
// a receiver reads them positionally, so one field out of place shifts every
// one after it.
func BuildWSJTQSOLogged(id string, q LoggedQSO) []byte {
var b bytes.Buffer
var hdr [12]byte
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
binary.BigEndian.PutUint32(hdr[4:8], 2)
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgQSOLogged)
b.Write(hdr[:])
b.Write(buildQString(id))
b.Write(buildQDateTimeUTC(q.TimeOff))
b.Write(buildQString(q.DXCall))
b.Write(buildQString(q.DXGrid))
var f [8]byte
binary.BigEndian.PutUint64(f[:], q.TxFreqHz)
b.Write(f[:])
b.Write(buildQString(q.Mode))
b.Write(buildQString(q.ReportSent))
b.Write(buildQString(q.ReportRcvd))
b.Write(buildQString(q.TxPower))
b.Write(buildQString(q.Comments))
b.Write(buildQString(q.Name))
b.Write(buildQDateTimeUTC(q.TimeOn))
b.Write(buildQString(q.OperatorCall))
b.Write(buildQString(q.MyCall))
b.Write(buildQString(q.MyGrid))
b.Write(buildQString(q.ExchangeSent))
b.Write(buildQString(q.ExchangeRcvd))
b.Write(buildQString(q.PropMode))
return b.Bytes()
}
// buildQDateTimeUTC encodes a QDateTime the way QDataStream has since Qt 5:
//
// qint64 Julian day number
// quint32 milliseconds since midnight
// quint8 time spec — 1 is UTC, which is the only one we ever send
//
// Everything in the logbook is already UTC, and a receiver that guessed local
// time from a spec of 0 would file the contact in the wrong hour.
func buildQDateTimeUTC(t time.Time) []byte {
t = t.UTC()
out := make([]byte, 0, 13)
var jd [8]byte
binary.BigEndian.PutUint64(jd[:], uint64(julianDay(t)))
out = append(out, jd[:]...)
ms := uint32(t.Hour()*3600000 + t.Minute()*60000 + t.Second()*1000 + t.Nanosecond()/1e6)
var m [4]byte
binary.BigEndian.PutUint32(m[:], ms)
out = append(out, m[:]...)
return append(out, 1) // Qt::UTC
}
// julianDay is the standard Gregorian-to-JDN conversion. Integer division
// throughout — this is the arithmetic Qt uses, and a floating-point version
// lands a day out at the edges.
func julianDay(t time.Time) int64 {
y := int64(t.Year())
m := int64(t.Month())
d := int64(t.Day())
a := (14 - m) / 12
y2 := y + 4800 - a
m2 := m + 12*a - 3
return d + (153*m2+2)/5 + 365*y2 + y2/4 - y2/100 + y2/400 - 32045
}
+139
View File
@@ -0,0 +1,139 @@
package udp
import (
"bytes"
"encoding/binary"
"testing"
"time"
)
// What we send has to be what we can read back: Logger32 and the rest decode
// this with the same rules our own parser uses, so a round trip through
// ParseWSJT is the honest check.
//
// The case behind it: OpsLog reported "sent 1153 bytes to 127.0.0.1:2250" and
// Logger32 showed nothing. Both were true — its UDP sockets speak the WSJT-X
// protocol and discard a bare ADIF record without a word.
func TestWSJTLoggedADIFRoundTrips(t *testing.T) {
const rec = "<CALL:5>VK9XX<BAND:3>20m<MODE:3>FT8<QSO_DATE:8>20260814<TIME_ON:6>174433<EOR>"
pkt := BuildWSJTLoggedADIF("OpsLog", rec)
ev, ok, err := ParseWSJT(pkt)
if err != nil {
t.Fatalf("ParseWSJT: %v", err)
}
if !ok {
t.Fatal("our own parser did not recognise the datagram we build")
}
if ev.LoggedADIF != rec {
t.Errorf("ADIF = %q, want %q", ev.LoggedADIF, rec)
}
if ev.ProgramID != "OpsLog" {
t.Errorf("id = %q, want OpsLog — a receiver uses it to tell instances apart", ev.ProgramID)
}
}
// The header is fixed and other programs match on it byte for byte.
func TestWSJTLoggedADIFHeader(t *testing.T) {
pkt := BuildWSJTLoggedADIF("OpsLog", "<EOR>")
want := []byte{
0xad, 0xbc, 0xcb, 0xda, // magic
0x00, 0x00, 0x00, 0x02, // schema 2
0x00, 0x00, 0x00, 0x0c, // type 12 — Logged ADIF
0x00, 0x00, 0x00, 0x06, // len("OpsLog")
'O', 'p', 's', 'L', 'o', 'g',
0x00, 0x00, 0x00, 0x05, // len("<EOR>")
'<', 'E', 'O', 'R', '>',
}
if !bytes.Equal(pkt, want) {
t.Errorf("packet = % X\nwant % X", pkt, want)
}
}
// The julian day has to match Qt's, because the receiver turns it back into a
// date. A day out here files every contact on the wrong day.
func TestJulianDayMatchesKnownValues(t *testing.T) {
for _, c := range []struct {
date time.Time
want int64
}{
// Checked against the standard tables: JDN is the count at noon UTC.
{time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), 2451545},
{time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), 2440588},
{time.Date(2026, 8, 15, 0, 0, 0, 0, time.UTC), 2461268},
} {
if got := julianDay(c.date); got != c.want {
t.Errorf("julianDay(%s) = %d, want %d", c.date.Format("2006-01-02"), got, c.want)
}
}
}
// QDateTime is julian day, then milliseconds since midnight, then the time
// spec. A receiver reads them positionally, and a spec of 0 (local time) would
// have it re-interpret a UTC contact in its own zone.
func TestQDateTimeIsUTCAndPositional(t *testing.T) {
got := buildQDateTimeUTC(time.Date(2026, 8, 15, 17, 44, 33, 0, time.UTC))
if len(got) != 13 {
t.Fatalf("%d bytes, want 13", len(got))
}
if jd := int64(binary.BigEndian.Uint64(got[0:8])); jd != 2461268 {
t.Errorf("julian day = %d, want 2461268", jd)
}
wantMs := uint32((17*3600 + 44*60 + 33) * 1000)
if ms := binary.BigEndian.Uint32(got[8:12]); ms != wantMs {
t.Errorf("ms since midnight = %d, want %d", ms, wantMs)
}
if got[12] != 1 {
t.Errorf("time spec = %d, want 1 (UTC)", got[12])
}
}
// The QSO Logged message is read positionally: one field out of place shifts
// every one after it, and the receiver silently files nonsense. This pins the
// order against WSJT-X's NetworkMessage.hpp.
func TestWSJTQSOLoggedFieldOrder(t *testing.T) {
pkt := BuildWSJTQSOLogged("OpsLog", LoggedQSO{
DXCall: "VK9XX", DXGrid: "QH30", TxFreqHz: 14074000, Mode: "FT8",
ReportSent: "-12", ReportRcvd: "-08", TxPower: "50", Comments: "tnx",
Name: "Ken", TimeOn: time.Date(2026, 8, 15, 17, 44, 0, 0, time.UTC),
TimeOff: time.Date(2026, 8, 15, 17, 45, 0, 0, time.UTC),
MyCall: "F4BPO", MyGrid: "IN95", OperatorCall: "F4BPO",
PropMode: "",
})
r := bytes.NewReader(pkt)
var magic, schema, mtype uint32
binary.Read(r, binary.BigEndian, &magic)
binary.Read(r, binary.BigEndian, &schema)
binary.Read(r, binary.BigEndian, &mtype)
if magic != wsjtMagic || schema != 2 || mtype != wsjtMsgQSOLogged {
t.Fatalf("header magic=%08x schema=%d type=%d", magic, schema, mtype)
}
id, _ := readQString(r)
if id != "OpsLog" {
t.Errorf("id = %q", id)
}
r.Seek(13, 1) // QSO off
call, _ := readQString(r)
grid, _ := readQString(r)
var freq uint64
binary.Read(r, binary.BigEndian, &freq)
mode, _ := readQString(r)
sent, _ := readQString(r)
rcvd, _ := readQString(r)
if call != "VK9XX" || grid != "QH30" || freq != 14074000 || mode != "FT8" || sent != "-12" || rcvd != "-08" {
t.Errorf("got call=%q grid=%q freq=%d mode=%q sent=%q rcvd=%q", call, grid, freq, mode, sent, rcvd)
}
pwr, _ := readQString(r)
comments, _ := readQString(r)
name, _ := readQString(r)
if pwr != "50" || comments != "tnx" || name != "Ken" {
t.Errorf("got pwr=%q comments=%q name=%q", pwr, comments, name)
}
r.Seek(13, 1) // QSO on
op, _ := readQString(r)
myCall, _ := readQString(r)
myGrid, _ := readQString(r)
if op != "F4BPO" || myCall != "F4BPO" || myGrid != "IN95" {
t.Errorf("got op=%q myCall=%q myGrid=%q", op, myCall, myGrid)
}
}
+45
View File
@@ -46,6 +46,51 @@ street, no image.
</Callsign>
```
```
<QRZDatabase xmlns="http://xmldata.qrz.com" version="1.36">
<div id="in-page-channel-node-id" data-channel-name="in_page_channel_ogW01U"/>
<Callsign>
<call>F5IRH</call>
<dxcc>227</dxcc>
<fname>AVRILLON</fname>
<name>Max</name>
<addr1>La Grand Prairie</addr1>
<addr2>Le Palais BELLE-ILE-EN-MER</addr2>
<zip>56360</zip>
<country>France</country>
<lat>47.339686</lat>
<lon>-3.156500</lon>
<grid>IN87ki</grid>
<ccode>97</ccode>
<land>France</land>
<codes>TP</codes>
<qslmgr>VIA BURO</qslmgr>
<email>f5irh@free.fr</email>
<u_views>8005</u_views>
<bio>2463</bio>
<biodate>2015-07-16 00:29:49</biodate>
<image>https://cdn-xml.qrz.com/h/f5irh/qsl_F5IRH_111-3.JPG</image>
<imageinfo>518:799:105108</imageinfo>
<moddate>2010-08-05 01:05:37</moddate>
<eqsl>0</eqsl>
<mqsl>0</mqsl>
<cqzone>14</cqzone>
<iota>EU-048</iota>
<lotw>0</lotw>
<geoloc>user</geoloc>
<name_fmt>AVRILLON Max</name_fmt>
<serial>1570698</serial>
</Callsign>
<Session>
<Key>e5ca5b3e7f88d733408ab7677e605270</Key>
<Count>161639</Count>
<SubExp>Sat Jul 3 21:45:38 2027</SubExp>
<GMTime>Sun Aug 16 21:14:40 2026</GMTime>
<Remark>cpu: 0.073s</Remark>
</Session>
</QRZDatabase>
```
## Consequences
- **A free QRZ account can never fill the locator, the coordinates, the zones
+54
View File
@@ -0,0 +1,54 @@
package lookup
import (
"context"
"path/filepath"
"testing"
"hamlog/internal/db"
)
func testCache(t *testing.T) *Cache {
t.Helper()
conn, err := db.Open(filepath.Join(t.TempDir(), "c.db"))
if err != nil {
t.Fatalf("open: %v", err)
}
t.Cleanup(func() { conn.Close() })
return NewCache(conn, 0)
}
// Adding a field to the cache leaves every row already in it without that field,
// and the cache lasts thirty days. So a callsign looked up before the change
// would go a MONTH without its island reference — which is exactly what the
// first test of the feature ran into: a QRZ record plainly carrying
// <iota>EU-048</iota>, and no IOTA on the entry.
//
// A row that predates the column is therefore treated as stale and refetched
// once. NULL and "" mean different things here, and that is the whole mechanism.
func TestCacheRefetchesRowsWrittenBeforeTheIOTAColumn(t *testing.T) {
c := testCache(t)
ctx := context.Background()
// An operator with an island: stored and returned.
if err := c.Put(ctx, Result{Callsign: "F5IRH", Name: "Max", IOTA: "EU-048", Source: "qrz"}); err != nil {
t.Fatalf("put: %v", err)
}
got, ok := c.Get(ctx, "F5IRH")
if !ok || got.IOTA != "EU-048" {
t.Fatalf("Get = (%+v,%v), want the island back", got, ok)
}
// An operator with NO island: an empty string is stored, and the row stays
// usable. If this wrote NULL, every ordinary callsign would refetch for ever.
if err := c.Put(ctx, Result{Callsign: "M0ABC", Name: "Ann", Source: "qrz"}); err != nil {
t.Fatalf("put: %v", err)
}
got, ok = c.Get(ctx, "M0ABC")
if !ok {
t.Fatal("a callsign with no island was treated as stale — every lookup would repeat for ever")
}
if got.IOTA != "" {
t.Errorf("IOTA = %q for an operator with no island", got.IOTA)
}
}
+74
View File
@@ -0,0 +1,74 @@
package lookup
import (
"context"
"testing"
"time"
)
// A TTL of zero means no cache: nothing is read from it, and nothing is written
// to it either.
//
// It is a real thing to want. An operator correcting their own QRZ record — or
// chasing a DXpedition whose page changes during the operation — otherwise
// waits out thirty days before OpsLog will ask again. Clearing the cache by
// hand works once; switching it off is the setting for a session where the
// answers are moving.
func TestATTLOfZeroSwitchesTheCacheOff(t *testing.T) {
c := testCache(t)
ctx := context.Background()
if err := c.Put(ctx, Result{Callsign: "M0ABC", Name: "Ann", Source: "qrz"}); err != nil {
t.Fatalf("put: %v", err)
}
if _, ok := c.Get(ctx, "M0ABC"); !ok {
t.Fatal("the cache did not hold a fresh entry while switched on")
}
c.SetTTL(0)
if c.Enabled() {
t.Error("Enabled() is true with a zero TTL")
}
if _, ok := c.Get(ctx, "M0ABC"); ok {
t.Error("a cached entry was still returned with the cache off — the provider would never be asked again")
}
// And nothing new is stored: those rows would only sit there going stale,
// waiting for the day the cache is switched back on.
if err := c.Put(ctx, Result{Callsign: "M0XYZ", Name: "Bob", Source: "qrz"}); err != nil {
t.Fatalf("put with the cache off: %v", err)
}
c.SetTTL(30 * 24 * time.Hour)
if _, ok := c.Get(ctx, "M0XYZ"); ok {
t.Error("a lookup made while the cache was off was written to it anyway")
}
// The entry from before it was switched off is still there — switching off
// is not the same as clearing, and the Clear cache button remains the way to
// throw the contents away.
if _, ok := c.Get(ctx, "M0ABC"); !ok {
t.Error("switching the cache off discarded what it already held")
}
}
// A negative lifetime is meaningless, and rounding it into either "off" or a
// default would be a guess. It is ignored instead.
func TestANegativeTTLIsIgnored(t *testing.T) {
c := testCache(t)
c.SetTTL(7 * 24 * time.Hour)
c.SetTTL(-1)
if !c.Enabled() {
t.Fatal("a negative TTL switched the cache off")
}
if c.ttl != 7*24*time.Hour {
t.Errorf("ttl = %v after a negative value, want the 7 days it already had", c.ttl)
}
}
// The constructor's zero is the DEFAULT, not "off": at startup the settings
// have not been read, and beginning with no cache would hammer the provider for
// the first seconds of every launch.
func TestNewCacheWithZeroStillCaches(t *testing.T) {
c := testCache(t) // built with NewCache(conn, 0)
if !c.Enabled() {
t.Error("a cache built with a zero TTL started switched off")
}
}
+52 -8
View File
@@ -41,6 +41,10 @@ type Result struct {
// along and nothing ever filled it, because no provider mapping read the
// field.
Web string `json:"web,omitempty"`
// IOTA is the island reference (EU-048) for an operator on one. QRZ sends it
// and nothing used to read it — and since no live activation feed exists for
// IOTA the way it does for POTA, the callbook record is the practical source.
IOTA string `json:"iota,omitempty"`
// Zip is the postal code. HamQTH and QRZ both send one.
Zip string `json:"zip,omitempty"`
ImageURL string `json:"image_url,omitempty"` // profile picture URL
@@ -428,11 +432,21 @@ func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
// ----- Cache -----
// Cache is a SQLite-backed cache of lookup results with a TTL.
//
// A ttl of zero means NO CACHE: every lookup goes to the provider. That is a
// real thing to want — an operator correcting their own QRZ record, or chasing
// a DXpedition whose page changes during the operation, otherwise waits out the
// cache before OpsLog will look again.
type Cache struct {
db *sql.DB
ttl time.Duration
}
// NewCache builds the cache. A ttl of zero here is the CONSTRUCTOR default
// (thirty days), not "off": at startup the settings have not been read yet, and
// starting with no cache would hammer the provider for the first seconds of
// every launch. Switching it off is a decision the operator makes, through
// SetTTL, once their settings are known.
func NewCache(db *sql.DB, ttl time.Duration) *Cache {
if ttl <= 0 {
ttl = 30 * 24 * time.Hour
@@ -440,25 +454,35 @@ func NewCache(db *sql.DB, ttl time.Duration) *Cache {
return &Cache{db: db, ttl: ttl}
}
// SetTTL updates the cache TTL (e.g. when user changes settings).
// SetTTL updates the cache lifetime.
//
// ZERO switches the cache OFF — nothing is read from it and nothing is written
// to it. A NEGATIVE value is meaningless and is ignored, rather than being
// rounded into one of the two meanings above.
func (c *Cache) SetTTL(ttl time.Duration) {
if ttl > 0 {
if ttl >= 0 {
c.ttl = ttl
}
}
// Enabled reports whether anything is being cached at all.
func (c *Cache) Enabled() bool { return c != nil && c.ttl > 0 }
// Get returns the cached result if present and not expired.
func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
if !c.Enabled() {
return Result{}, false
}
row := c.db.QueryRowContext(ctx, `
SELECT callsign, name, qth, address, state, cnty, country, grid,
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
web, zip, source, fetched_at
web, zip, iota, source, fetched_at
FROM callsign_cache WHERE callsign = ?`, callsign)
var (
r Result
name, qth, addr, state, cnty sql.NullString
country, grid, cont, email, qslVia, image sql.NullString
web, zip sql.NullString
web, zip, iotaRef sql.NullString
src string
dxcc, cqz, ituz sql.NullInt64
lat, lon sql.NullFloat64
@@ -466,7 +490,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
)
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
&country, &grid, &lat, &lon,
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip,
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip, &iotaRef,
&src, &fetched); err != nil {
return Result{}, false
}
@@ -477,6 +501,17 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
if time.Since(t) > c.ttl {
return Result{}, false
}
// A row written before the iota column existed has NULL there, and the cache
// lasts thirty days — so without this every callsign already looked up would
// go a month without its island reference, which is exactly what the first
// test of the feature ran into.
//
// NULL and '' are deliberately different here: Put writes an empty string for
// an operator with no island, so only a row that predates the column reads as
// invalid. One refetch per such callsign, the next time it is used.
if !iotaRef.Valid {
return Result{}, false
}
r.Name = name.String
r.QTH = qth.String
r.Address = addr.String
@@ -490,6 +525,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
r.Email = email.String
r.Web = web.String
r.Zip = zip.String
r.IOTA = strings.ToUpper(iotaRef.String)
r.QSLVia = qslVia.String
r.ImageURL = image.String
r.DXCC = int(dxcc.Int64)
@@ -503,10 +539,15 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
// Put upserts a lookup result. fetched_at is generated in Go (NowISO) so the
// INSERT is backend-agnostic; the conflict tail is dialect-specific.
func (c *Cache) Put(ctx context.Context, r Result) error {
if !c.Enabled() {
// Nothing reads it, so writing would only grow the table — and leave
// stale rows waiting for the day the cache is switched back on.
return nil
}
updateCols := []string{
"name", "qth", "address", "state", "cnty",
"country", "grid", "lat", "lon",
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip",
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip", "iota",
"source", "fetched_at",
}
// The lookup cache always lives in the local SQLite database, so SQLite
@@ -519,8 +560,8 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
country, grid, lat, lon,
dxcc, cqz, ituz, cont, email, qsl_via, image_url,
web, zip, source, fetched_at)
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?, ?,?)
web, zip, iota, source, fetched_at)
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?,?, ?,?)
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
_, err := c.db.ExecContext(ctx, q,
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
@@ -530,6 +571,9 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
nullable(r.ImageURL), nullable(r.Web), nullable(r.Zip),
// NOT nullable(): an operator with no island must store '', so that a NULL
// keeps its one meaning — a row written before the column existed.
r.IOTA,
r.Source, db.NowISO(),
)
return err
+2
View File
@@ -134,6 +134,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
Email: c.Email,
QSLVia: c.QSLMgr,
ImageURL: strings.TrimSpace(c.Image),
IOTA: strings.ToUpper(strings.TrimSpace(c.IOTA)),
}
r.Lat, _ = strconv.ParseFloat(c.Lat, 64)
r.Lon, _ = strconv.ParseFloat(c.Lon, 64)
@@ -193,6 +194,7 @@ type qrzCallsign struct {
Email string `xml:"email"`
QSLMgr string `xml:"qslmgr"`
Image string `xml:"image"` // direct URL to the profile picture (subscribers only on QRZ)
IOTA string `xml:"iota"` // island reference for an operator on one, e.g. EU-048
}
// composeQRZAddress builds a multi-line postal address from QRZ's separate
+44
View File
@@ -0,0 +1,44 @@
package lookup
import (
"encoding/xml"
"strings"
"testing"
)
// QRZ sends the island reference and OpsLog read past it.
//
// It matters more for IOTA than it would for another award: unlike POTA there
// is no live "who is on an island right now" feed anywhere, so the callbook
// record is the practical source — and it is known BEFORE the contact is
// logged, which is when it is useful.
func TestQRZCallsignCarriesIOTA(t *testing.T) {
const body = `<?xml version="1.0" encoding="utf-8" ?>
<QRZDatabase version="1.34">
<Callsign>
<call>F5IRH</call>
<fname>Max</fname>
<country>France</country>
<grid>IN87ki</grid>
<cqzone>14</cqzone>
<iota>EU-048</iota>
</Callsign>
<Session><Key>abc</Key></Session>
</QRZDatabase>`
var resp qrzDB
if err := xml.Unmarshal([]byte(body), &resp); err != nil {
t.Fatalf("unmarshal: %v", err)
}
if resp.Callsign.IOTA != "EU-048" {
t.Fatalf("the <iota> tag decoded as %q — the field is not being read", resp.Callsign.IOTA)
}
// And a record with no island must not invent one.
var none qrzDB
if err := xml.Unmarshal([]byte(strings.Replace(body, "<iota>EU-048</iota>", "", 1)), &none); err != nil {
t.Fatalf("unmarshal: %v", err)
}
if none.Callsign.IOTA != "" {
t.Errorf("IOTA = %q for a record without one", none.Callsign.IOTA)
}
}
+10 -6
View File
@@ -50,12 +50,15 @@ var Bands = []string{"10m", "6m", "4m", "2m"}
// Spot is one decode, already reduced to what a detector needs.
type Spot struct {
Call string // the transmitting station
Band string
Mode string
Grid string // transmitter's grid, 4 characters
DistKm int // from the operator
Bearing int // degrees from the operator, short path
Call string // the transmitting station
Band string
Mode string
Grid string // transmitter's grid, 4 characters
// FreqHz is where the decode happened. The band alone is enough for an
// opening, but a station worth chasing has to be tuned to.
FreqHz int64
DistKm int // from the operator
Bearing int // degrees from the operator, short path
At time.Time
}
@@ -269,6 +272,7 @@ func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
s := Spot{
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
FreqHz: p.Freq,
DistKm: dist, Bearing: brg,
// Stamped on receipt: the broker's own timestamps vary between payload
// versions, and the window this feeds is measured in minutes.
+29
View File
@@ -0,0 +1,29 @@
package pskr
import (
"encoding/json"
"testing"
)
// The frequency has to survive from the payload to the Spot: the Chase New
// panel is only useful if a click can put the rig on the station, and a row
// showing "—" instead of 14074.0 is a row nobody can act on.
func TestWirePayloadCarriesFrequency(t *testing.T) {
const payload = `{"sq":1,"f":14074123,"md":"FT8","rp":-12,"sc":"VK9XX","sl":"QH30","rc":"F4BPO","rl":"IN95","b":"20m"}`
var p wire
if err := json.Unmarshal([]byte(payload), &p); err != nil {
t.Fatalf("unmarshal: %v", err)
}
if p.Freq != 14074123 {
t.Errorf("Freq = %d, want 14074123", p.Freq)
}
if p.TxCall != "VK9XX" || p.Band != "20m" || p.Mode != "FT8" {
t.Errorf("unexpected decode: %+v", p)
}
// And the Spot the watcher builds must carry it — this is the field that was
// declared, documented, and then never assigned.
s := Spot{Call: p.TxCall, Band: p.Band, Mode: p.Mode, FreqHz: p.Freq}
if s.FreqHz != p.Freq {
t.Errorf("Spot.FreqHz = %d, want %d", s.FreqHz, p.Freq)
}
}
+239
View File
@@ -0,0 +1,239 @@
// Package psu drives a bench power supply over Modbus RTU — the BSIDE / Wanptek
// family of programmable supplies that sit in a shack feeding the radios.
//
// The register map and the wire settings come from the manufacturer's own
// document ("This machine only support function code 03,06", version 20180611):
//
// 9600 baud, 8 data bits, no parity, 1 stop bit
// function 03 read holding registers
// function 06 write single register
// slave address 1…15, address 0 broadcast
//
// NOTHING ELSE IS WRITTEN. The map also carries the output voltage and current
// SET points, and the over-voltage, over-current and over-power trip levels, all
// read/write. This driver reads them and writes exactly one register: 0x0001,
// the output on/off. A wrong value in any of the others is not a wrong reading —
// it is 30 V where a radio expected 13.8, or a protection trip lifted on a
// supply feeding an amplifier. There is no reason for a logbook to set them, so
// it cannot.
package psu
import (
"encoding/binary"
"fmt"
"io"
"time"
)
// Registers, from the manufacturer's table. Addresses are as printed there.
const (
regOnOff = 0x0001 // output on/off — 1 or 0. The ONLY register written.
regProtect = 0x0002 // protection status word
regModel = 0x0003 // specification model
regDecimals = 0x0005 // "V_A_W number of digits" — see readDecimals
regVolts = 0x0010 // measured output voltage, 2 decimals
regAmps = 0x0011 // measured output current, 3 decimals
regWatts = 0x0012 // measured output power, 32-bit across 0x0012/0x0013, 3 decimals
regSetVolts = 0x0030 // voltage set point, 2 decimals
regSetAmps = 0x0031 // current set point, 3 decimals
)
const (
fnRead = 0x03
fnWrite = 0x06
)
// Fixed scaling from the manufacturer's "Decimal place" column. The supply also
// reports its own digit counts in 0x0005, but the document's "Note 2" that
// explains how to decode that word is not in the manual we have — so the
// documented per-register values are used, and the raw word is logged once at
// connect. If an operator ever reports readings out by a factor of ten, that
// line is what says how to decode it properly.
const (
voltScale = 100.0 // 2 decimals
ampScale = 1000.0 // 3 decimals
wattScale = 1000.0 // 3 decimals
)
// crc16 is the Modbus RTU frame check: CRC-16/MODBUS — reflected, polynomial
// 0xA001, initial value 0xFFFF, no final xor. Transmitted low byte first.
func crc16(b []byte) uint16 {
crc := uint16(0xFFFF)
for _, c := range b {
crc ^= uint16(c)
for i := 0; i < 8; i++ {
if crc&1 != 0 {
crc = (crc >> 1) ^ 0xA001
} else {
crc >>= 1
}
}
}
return crc
}
// appendCRC closes a frame: low byte first, as the manual states.
func appendCRC(f []byte) []byte {
c := crc16(f)
return append(f, byte(c&0xFF), byte(c>>8))
}
// buildRead frames a function 03 "read holding registers".
func buildRead(addr byte, reg uint16, count uint16) []byte {
f := []byte{addr, fnRead, byte(reg >> 8), byte(reg), byte(count >> 8), byte(count)}
return appendCRC(f)
}
// buildWrite frames a function 06 "write single register".
func buildWrite(addr byte, reg, val uint16) []byte {
f := []byte{addr, fnWrite, byte(reg >> 8), byte(reg), byte(val >> 8), byte(val)}
return appendCRC(f)
}
// modbusError is an exception response — the supply understood the frame and
// refused it. Kept distinct from a transport failure: one means "ask
// differently", the other means "the cable".
type modbusError struct {
fn byte
code byte
}
func (e modbusError) Error() string {
what := map[byte]string{
1: "illegal function",
2: "illegal data address",
3: "illegal data value",
4: "slave device failure",
6: "device busy",
}[e.code]
if what == "" {
what = fmt.Sprintf("exception %d", e.code)
}
return fmt.Sprintf("supply refused function 0x%02X: %s", e.fn, what)
}
// parseRead validates a function 03 reply and returns the register values.
func parseRead(addr byte, want uint16, frame []byte) ([]uint16, error) {
if err := checkFrame(addr, fnRead, frame, 5); err != nil {
return nil, err
}
n := int(frame[2])
if n != int(want)*2 {
return nil, fmt.Errorf("reply carries %d data byte(s), expected %d", n, want*2)
}
if len(frame) != 3+n+2 {
return nil, fmt.Errorf("reply is %d bytes, expected %d", len(frame), 3+n+2)
}
out := make([]uint16, want)
for i := range out {
out[i] = binary.BigEndian.Uint16(frame[3+i*2:])
}
return out, nil
}
// parseWriteEcho validates a function 06 reply, which echoes the request.
func parseWriteEcho(addr byte, reg, val uint16, frame []byte) error {
if err := checkFrame(addr, fnWrite, frame, 8); err != nil {
return err
}
if len(frame) != 8 {
return fmt.Errorf("write reply is %d bytes, expected 8", len(frame))
}
if got := binary.BigEndian.Uint16(frame[2:]); got != reg {
return fmt.Errorf("write reply is for register 0x%04X, not 0x%04X", got, reg)
}
// The echoed VALUE is the confirmation that the output actually changed.
// Accepting the frame without checking it would report an on/off that the
// supply never made.
if got := binary.BigEndian.Uint16(frame[4:]); got != val {
return fmt.Errorf("supply echoed value %d, not the %d it was sent", got, val)
}
return nil
}
// checkFrame covers what every reply must satisfy: our address, our function
// (or its exception), and a good CRC.
func checkFrame(addr, fn byte, frame []byte, min int) error {
if len(frame) < 4 {
return fmt.Errorf("short reply (%d bytes)", len(frame))
}
if frame[0] != addr {
return fmt.Errorf("reply from address %d, expected %d", frame[0], addr)
}
if frame[1] == fn|0x80 {
if len(frame) < 5 {
return fmt.Errorf("short exception reply (%d bytes)", len(frame))
}
if !crcOK(frame[:5]) {
return fmt.Errorf("exception reply failed its CRC")
}
return modbusError{fn: fn, code: frame[2]}
}
if frame[1] != fn {
return fmt.Errorf("reply to function 0x%02X, expected 0x%02X", frame[1], fn)
}
if len(frame) < min {
return fmt.Errorf("short reply (%d bytes, expected at least %d)", len(frame), min)
}
if !crcOK(frame) {
return fmt.Errorf("reply failed its CRC")
}
return nil
}
// crcOK checks a whole frame, trailing CRC included: the CRC of the entire
// frame is zero when it is intact.
func crcOK(frame []byte) bool {
if len(frame) < 3 {
return false
}
body := frame[:len(frame)-2]
want := uint16(frame[len(frame)-2]) | uint16(frame[len(frame)-1])<<8
return crc16(body) == want
}
// frameGap is the silence that separates two Modbus RTU frames: 3.5 character
// times, which at 9600 baud 8N1 (10 bits per character) is 3.65 ms. Rounded up,
// because the cost of waiting is nothing and the cost of being early is a
// supply that treats our request as the tail of the previous one.
const frameGap = 4 * time.Millisecond
// replyWait is how long a reply may take. The manual promises under 5 ms at
// 9600 baud or better; this is generous by two orders of magnitude so a USB
// serial bridge that buffers cannot be mistaken for a supply that is not there.
const replyWait = 500 * time.Millisecond
// readFrame collects a reply until it stops arriving.
//
// A serial read that times out returns (0, nil) on Windows — a timeout is not
// an error on this transport — so a loop that trusts an error to end it never
// ends. Modbus RTU has no terminator either: a frame is over when the line has
// been quiet for 3.5 character times. Both facts point at the same shape, a
// deadline and a quiet-time.
func readFrame(conn io.Reader, d time.Duration) ([]byte, error) {
deadline := time.Now().Add(d)
buf := make([]byte, 0, 64)
tmp := make([]byte, 64)
lastByte := time.Time{}
for {
n, err := conn.Read(tmp)
if err != nil {
return buf, err
}
if n > 0 {
buf = append(buf, tmp[:n]...)
lastByte = time.Now()
continue
}
// Nothing this time: either the frame has ended, or it never started.
if len(buf) > 0 && time.Since(lastByte) >= frameGap {
return buf, nil
}
if time.Now().After(deadline) {
if len(buf) > 0 {
return buf, nil // partial — let the parser say what is wrong with it
}
return nil, fmt.Errorf("no reply after %s", d)
}
}
}
+180
View File
@@ -0,0 +1,180 @@
package psu
import (
"errors"
"strings"
"testing"
"time"
)
// The CRC is the one thing here that cannot be checked by inspection, and every
// frame depends on it. CRC-16/MODBUS has a published check value: the CRC of
// the ASCII digits "123456789" is 0x4B37. If this passes, the polynomial, the
// initial value, the reflection and the absence of a final xor are all right.
func TestCRCMatchesTheStandardCheckValue(t *testing.T) {
if got := crc16([]byte("123456789")); got != 0x4B37 {
t.Fatalf("crc16(\"123456789\") = 0x%04X, want 0x4B37 — this is not CRC-16/MODBUS", got)
}
}
// A frame including its own CRC checks to zero. That property is what crcOK
// relies on, so it is worth pinning separately from the check value.
func TestAFrameVerifiesItself(t *testing.T) {
for _, f := range [][]byte{
buildRead(1, regVolts, 2),
buildWrite(1, regOnOff, 1),
buildWrite(15, regOnOff, 0),
} {
if !crcOK(f) {
t.Errorf("% X does not verify against its own CRC", f)
}
// And a single flipped bit must be caught.
bad := append([]byte(nil), f...)
bad[2] ^= 0x01
if crcOK(bad) {
t.Errorf("% X passed the CRC with a corrupted byte", bad)
}
}
}
// The frame layout, byte for byte against the manual: address, function,
// register high/low, count or value high/low, then CRC low byte first.
func TestFrameLayout(t *testing.T) {
r := buildRead(1, 0x0010, 2)
if len(r) != 8 {
t.Fatalf("read frame is %d bytes, want 8", len(r))
}
want := []byte{0x01, 0x03, 0x00, 0x10, 0x00, 0x02}
for i := range want {
if r[i] != want[i] {
t.Fatalf("read frame % X, want % X…", r, want)
}
}
w := buildWrite(1, regOnOff, 1)
want = []byte{0x01, 0x06, 0x00, 0x01, 0x00, 0x01}
for i := range want {
if w[i] != want[i] {
t.Fatalf("write frame % X, want % X…", w, want)
}
}
// The CRC goes out low byte first — the manual is explicit, and getting it
// backwards makes every frame be ignored in silence.
c := crc16(w[:6])
if w[6] != byte(c&0xFF) || w[7] != byte(c>>8) {
t.Errorf("CRC bytes % X, want %02X %02X (low first)", w[6:], byte(c&0xFF), byte(c>>8))
}
}
func TestParseRead(t *testing.T) {
// Two registers: 13.80 V (1380 at 2 decimals) and 2.500 A (2500 at 3).
frame := appendCRC([]byte{0x01, 0x03, 0x04, 0x05, 0x64, 0x09, 0xC4})
got, err := parseRead(1, 2, frame)
if err != nil {
t.Fatalf("parseRead: %v", err)
}
if len(got) != 2 || got[0] != 1380 || got[1] != 2500 {
t.Fatalf("got %v, want [1380 2500]", got)
}
if v := float64(got[0]) / voltScale; v != 13.80 {
t.Errorf("voltage scaled to %v, want 13.8", v)
}
}
// A reply from another slave on the same bus must not be read as ours.
func TestParseRejectsAnotherSlave(t *testing.T) {
frame := appendCRC([]byte{0x02, 0x03, 0x02, 0x05, 0x64})
if _, err := parseRead(1, 1, frame); err == nil {
t.Error("a reply from address 2 was accepted as address 1")
}
}
func TestParseRejectsABadCRC(t *testing.T) {
frame := appendCRC([]byte{0x01, 0x03, 0x02, 0x05, 0x64})
frame[3] ^= 0xFF
if _, err := parseRead(1, 1, frame); err == nil || !strings.Contains(err.Error(), "CRC") {
t.Errorf("err = %v, want a CRC complaint", err)
}
}
// An exception reply is the supply refusing, not the line failing, and the two
// need different answers from the operator.
func TestParseReportsAnException(t *testing.T) {
frame := appendCRC([]byte{0x01, 0x83, 0x02})
_, err := parseRead(1, 1, frame)
var me modbusError
if !errors.As(err, &me) {
t.Fatalf("err = %v, want a modbusError", err)
}
if me.code != 2 || !strings.Contains(err.Error(), "illegal data address") {
t.Errorf("exception decoded as %v", err)
}
}
// The echo is the ONLY confirmation that the output actually switched. A reply
// echoing a different value means the supply did something else, and reporting
// that as success is how a radio ends up with no power and a green light.
func TestWriteEchoMustMatch(t *testing.T) {
ok := appendCRC([]byte{0x01, 0x06, 0x00, 0x01, 0x00, 0x01})
if err := parseWriteEcho(1, regOnOff, 1, ok); err != nil {
t.Fatalf("a correct echo was rejected: %v", err)
}
wrongVal := appendCRC([]byte{0x01, 0x06, 0x00, 0x01, 0x00, 0x00})
if err := parseWriteEcho(1, regOnOff, 1, wrongVal); err == nil {
t.Error("an echo of 0 was accepted for a command of 1 — the output never switched")
}
wrongReg := appendCRC([]byte{0x01, 0x06, 0x00, 0x30, 0x00, 0x01})
if err := parseWriteEcho(1, regOnOff, 1, wrongReg); err == nil {
t.Error("an echo for register 0x0030 was accepted for a write to 0x0001")
}
}
// quietPort delivers a frame in pieces, then goes quiet — a serial port that
// reports a timeout as (0, nil), which is what Windows does.
type quietPort struct {
chunks [][]byte
i int
}
func (p *quietPort) Read(b []byte) (int, error) {
if p.i >= len(p.chunks) {
time.Sleep(2 * time.Millisecond)
return 0, nil // timeout, not an error
}
n := copy(b, p.chunks[p.i])
p.i++
return n, nil
}
// A Modbus RTU frame has no terminator: it ends when the line falls quiet. The
// reader must assemble a dribbled frame and then stop on its own.
func TestReadFrameAssemblesUntilQuiet(t *testing.T) {
want := appendCRC([]byte{0x01, 0x03, 0x04, 0x05, 0x64, 0x09, 0xC4})
p := &quietPort{chunks: [][]byte{want[:2], want[2:5], want[5:]}}
got, err := readFrame(p, time.Second)
if err != nil {
t.Fatalf("readFrame: %v", err)
}
if len(got) != len(want) {
t.Fatalf("read % X, want % X", got, want)
}
for i := range want {
if got[i] != want[i] {
t.Fatalf("read % X, want % X", got, want)
}
}
}
// A supply that is switched off, or not on this port, must produce an error
// rather than a wait that never ends.
func TestReadFrameGivesUpOnSilence(t *testing.T) {
done := make(chan error, 1)
go func() { _, err := readFrame(&quietPort{}, 80*time.Millisecond); done <- err }()
select {
case err := <-done:
if err == nil {
t.Error("silence was reported as a frame")
}
case <-time.After(3 * time.Second):
t.Fatal("readFrame never returned")
}
}
+262
View File
@@ -0,0 +1,262 @@
package psu
import (
"fmt"
"log"
"strings"
"sync"
"time"
"go.bug.st/serial"
)
// Config is one supply's serial link.
type Config struct {
ComPort string
Baud int // 9600 unless the supply has been reconfigured
Address byte // Modbus slave address, 1…15 on this family
}
// Status is what the UI shows. Everything here is READ from the supply — the
// set points included, which the operator sets on the front panel and OpsLog
// only reports.
type Status struct {
Connected bool `json:"connected"`
On bool `json:"on"` // output enabled
Volts float64 `json:"volts"` // measured output
Amps float64 `json:"amps"` // measured output
Watts float64 `json:"watts"` // measured output
SetVolts float64 `json:"set_volts"` // the voltage the supply is set to
SetAmps float64 `json:"set_amps"` // the current limit it is set to
Protected uint16 `json:"protected"` // protection status word, non-zero = tripped
Error string `json:"error,omitempty"`
}
const pollEvery = 1500 * time.Millisecond
// Client owns the serial link to one supply.
type Client struct {
cfg Config
connMu sync.Mutex
conn serial.Port
ioMu sync.Mutex // serialises a request/reply exchange on the shared port
statusMu sync.Mutex
last Status
stopChan chan struct{}
stopOnce sync.Once
lastErr string
}
// New builds a client. Nothing is opened until Start.
func New(cfg Config) *Client {
if cfg.Baud <= 0 {
cfg.Baud = 9600
}
if cfg.Address == 0 {
cfg.Address = 1
}
return &Client{cfg: cfg, stopChan: make(chan struct{})}
}
// Start begins the poll loop. It returns immediately: the supply may be off, and
// a shack comes up in whatever order it comes up in.
func (c *Client) Start() error {
go c.loop()
return nil
}
// Stop closes the link.
func (c *Client) Stop() {
c.stopOnce.Do(func() { close(c.stopChan) })
c.closeConn()
}
// GetStatus returns the last poll's answer.
func (c *Client) GetStatus() Status {
c.statusMu.Lock()
defer c.statusMu.Unlock()
return c.last
}
// SetOutput switches the supply's output on or off — the one thing this driver
// writes. The supply's echo is checked, so a false return of "done" is not
// possible: either it confirmed the value or this is an error.
func (c *Client) SetOutput(on bool) error {
val := uint16(0)
if on {
val = 1
}
if err := c.writeRegister(regOnOff, val); err != nil {
return err
}
// Report it at once rather than waiting for the next poll: the operator
// pressed a button and is looking at it.
c.statusMu.Lock()
c.last.On = on
c.statusMu.Unlock()
log.Printf("psu: output %s", map[bool]string{true: "ON", false: "OFF"}[on])
return nil
}
func (c *Client) loop() {
t := time.NewTicker(pollEvery)
defer t.Stop()
for {
select {
case <-c.stopChan:
return
case <-t.C:
if err := c.poll(); err != nil {
c.noteFailure(err)
continue
}
}
}
}
// poll reads everything the UI shows, in as few exchanges as the register map
// allows: the measurements are contiguous (0x0010…0x0013), the set points are
// contiguous (0x0030, 0x0031), and the on/off and protection words sit together
// at 0x0001/0x0002.
func (c *Client) poll() error {
if err := c.ensureConn(); err != nil {
return err
}
st := Status{Connected: true}
state, err := c.readRegisters(regOnOff, 2)
if err != nil {
return err
}
st.On = state[0] != 0
st.Protected = state[1]
meas, err := c.readRegisters(regVolts, 4) // U, I, P high, P low
if err != nil {
return err
}
st.Volts = float64(meas[0]) / voltScale
st.Amps = float64(meas[1]) / ampScale
st.Watts = float64(uint32(meas[2])<<16|uint32(meas[3])) / wattScale
set, err := c.readRegisters(regSetVolts, 2)
if err != nil {
return err
}
st.SetVolts = float64(set[0]) / voltScale
st.SetAmps = float64(set[1]) / ampScale
c.statusMu.Lock()
c.last = st
c.statusMu.Unlock()
if c.lastErr != "" {
log.Printf("psu: %s answering again", c.cfg.ComPort)
c.lastErr = ""
}
return nil
}
func (c *Client) readRegisters(reg, count uint16) ([]uint16, error) {
frame, err := c.exchange(buildRead(c.cfg.Address, reg, count))
if err != nil {
return nil, err
}
return parseRead(c.cfg.Address, count, frame)
}
func (c *Client) writeRegister(reg, val uint16) error {
if err := c.ensureConn(); err != nil {
return err
}
frame, err := c.exchange(buildWrite(c.cfg.Address, reg, val))
if err != nil {
return err
}
return parseWriteEcho(c.cfg.Address, reg, val, frame)
}
// exchange sends one frame and reads one reply, holding the port for the whole
// round trip. Modbus RTU has no way to match a reply to a request, so two
// exchanges in flight at once would read each other's answers.
func (c *Client) exchange(req []byte) ([]byte, error) {
c.connMu.Lock()
conn := c.conn
c.connMu.Unlock()
if conn == nil {
return nil, fmt.Errorf("psu: not connected")
}
c.ioMu.Lock()
defer c.ioMu.Unlock()
// The silence before a frame is part of the protocol, not politeness: it is
// how the supply knows this is a new message and not the tail of the last.
time.Sleep(frameGap)
if _, err := conn.Write(req); err != nil {
c.closeConn()
return nil, err
}
frame, err := readFrame(conn, replyWait)
if err != nil {
c.closeConn()
return nil, err
}
return frame, nil
}
func (c *Client) ensureConn() error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn != nil {
return nil
}
port := strings.TrimSpace(c.cfg.ComPort)
if port == "" {
return fmt.Errorf("psu: no serial port configured")
}
p, err := serial.Open(port, &serial.Mode{
BaudRate: c.cfg.Baud,
DataBits: 8,
Parity: serial.NoParity,
StopBits: serial.OneStopBit,
})
if err != nil {
return fmt.Errorf("psu: cannot open %s: %w", port, err)
}
// Short per-read timeout: readFrame decides when a frame has ended by the
// quiet between bytes, so each Read must come back promptly with whatever
// has arrived.
_ = p.SetReadTimeout(2 * time.Millisecond)
c.conn = p
log.Printf("psu: %s open at %d baud, Modbus address %d", port, c.cfg.Baud, c.cfg.Address)
return nil
}
func (c *Client) closeConn() {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn != nil {
_ = c.conn.Close()
c.conn = nil
}
}
// noteFailure records a poll failure and says so ONCE per distinct message.
//
// A supply that is switched off at the mains fails every poll, and a line per
// second and a half would be the whole log file — but saying nothing at all is
// how "it stopped working" arrives with no evidence.
func (c *Client) noteFailure(err error) {
msg := err.Error()
c.statusMu.Lock()
c.last = Status{Connected: false, Error: msg}
c.statusMu.Unlock()
if msg != c.lastErr {
c.lastErr = msg
log.Printf("psu: %v — retrying every %s, and this will not be logged again until it changes", err, pollEvery)
}
}
+77 -15
View File
@@ -2,6 +2,32 @@ package qso
import "testing"
// baseCall picks the operator's OWN callsign out of a portable form. The slash
// carries a qualifier on either side and which side depends on what it is, so
// this is the whole difficulty.
func TestBaseCall(t *testing.T) {
for in, want := range map[string]string{
"RK3DWA": "RK3DWA",
"RK3DWA/3": "RK3DWA", // call-area digit
"RK3DWA/P": "RK3DWA", // portable
"RK3DWA/QRP": "RK3DWA",
"RK3DWA/MM": "RK3DWA",
"ZA/OE8NDR": "OE8NDR", // an Austrian in Albania — the case that prompted this
"ZA/IZ2DPX": "IZ2DPX",
"F/DL1ABC": "DL1ABC",
"F/DL1ABC/P": "DL1ABC",
"KH6/K6ABC": "K6ABC",
"VP2E/W1ABC": "W1ABC",
"3DA0/ZS1ABC": "ZS1ABC",
"9A/S51AB": "S51AB",
"/RK3DWA": "RK3DWA",
} {
if got := baseCall(in); got != want {
t.Errorf("baseCall(%q) = %q, want %q", in, got, want)
}
}
}
// The predicate behind "Worked before". Exact when folding is off; with it on,
// a station's portable forms are one operator — and the fold has to work from
// either end, because you may type the base call or the portable one.
@@ -10,25 +36,61 @@ func TestCallMatch(t *testing.T) {
t.Errorf("exact: got %q %v", pred, args)
}
// Typing the base call: match it and everything suffixed off it.
pred, args := callMatch("RK3DWA", true)
if pred != "(callsign = ? OR callsign LIKE ?)" {
t.Errorf("variants predicate = %q", pred)
}
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
t.Errorf("variants args = %v, want [RK3DWA RK3DWA/%%]", args)
}
// Typing the base call: match it, everything suffixed off it, and every
// prefixed form of it.
_, args := callMatch("RK3DWA", true)
want := []any{"RK3DWA", "RK3DWA/%", "%/RK3DWA", "%/RK3DWA/%"}
assertArgs(t, "base call", args, want)
// Typing a portable form must reach the plain call too — the suffix is
// Typing a portable form must reach the plain call too — the qualifier is
// stripped from the INPUT, not just matched in the column.
_, args = callMatch("RK3DWA/3", true)
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
t.Errorf("portable input args = %v, want [RK3DWA RK3DWA/%%]", args)
assertArgs(t, "portable input", args, want)
}
// A prefixed call is the same operator, and NOT every other visitor to that
// country.
//
// Matching on the part before the slash made ZA/OE8NDR the station "ZA", so the
// worked-before list for one Austrian operating from Albania showed every other
// ZA/ guest — two Italians — and counted them as four contacts "with this
// call". Reported from a screenshot of exactly that.
func TestCallMatchPrefixedIsTheOperatorNotTheCountry(t *testing.T) {
_, args := callMatch("ZA/OE8NDR", true)
assertArgs(t, "ZA/OE8NDR", args, []any{"OE8NDR", "OE8NDR/%", "%/OE8NDR", "%/OE8NDR/%"})
for _, a := range args {
if s, _ := a.(string); s == "ZA" || s == "ZA/%" {
t.Fatalf("the country prefix is still being matched as a station: %v", args)
}
}
// A leading slash is not a suffix marker — dropping to "" there would match
// the entire logbook.
if _, args := callMatch("/RK3DWA", true); args[0] != "/RK3DWA" {
t.Errorf("leading slash: args[0] = %v, want the call unchanged", args[0])
// And the two are not each other: nothing in one operator's predicate can
// select the other's call.
_, other := callMatch("ZA/IZ2DPX", true)
assertArgs(t, "ZA/IZ2DPX", other, []any{"IZ2DPX", "IZ2DPX/%", "%/IZ2DPX", "%/IZ2DPX/%"})
}
// A base too short to be a callsign falls back to an exact match. "F/DL1ABC"
// resolves fine, but a malformed entry must never produce a LIKE that selects
// half the logbook.
func TestCallMatchRefusesAShortBase(t *testing.T) {
for _, call := range []string{"F/", "9A", "/P", "K/M"} {
pred, args := callMatch(call, true)
if pred != "callsign = ?" || len(args) != 1 {
t.Errorf("%q produced %q %v — want an exact match", call, pred, args)
}
}
}
func assertArgs(t *testing.T, what string, got, want []any) {
t.Helper()
if len(got) != len(want) {
t.Fatalf("%s: args %v, want %v", what, got, want)
}
for i := range want {
if got[i] != want[i] {
t.Fatalf("%s: args %v, want %v", what, got, want)
}
}
}
+65
View File
@@ -0,0 +1,65 @@
package qso
import (
"context"
"database/sql"
"testing"
_ "modernc.org/sqlite"
)
// A LoTW confirmation the ARRL has validated arrives as V, not Y — ADIF's
// QSL_Rcvd enumeration has both. Every SQL query here compared against 'Y'
// alone, so the band/mode matrix showed an entity as merely worked while the
// Awards panel beside it showed the same entity validated on five bands.
//
// This drives the real queries against a real database rather than asserting on
// the constant: the constant being right is not the point, the queries using it
// is.
func TestConfirmedCountsVerifiedNotJustYes(t *testing.T) {
db, err := sql.Open("sqlite", "file:confirmedvalues?mode=memory&cache=shared")
if err != nil {
t.Fatal(err)
}
defer db.Close()
if _, err := db.Exec(`CREATE TABLE qso (
id INTEGER PRIMARY KEY, callsign TEXT, dxcc INTEGER, band TEXT, mode TEXT,
lotw_rcvd TEXT, qsl_rcvd TEXT, eqsl_rcvd TEXT)`); err != nil {
t.Fatal(err)
}
// Two Morocco contacts: one verified through LoTW, one not confirmed at all.
if _, err := db.Exec(`INSERT INTO qso (callsign, dxcc, band, mode, lotw_rcvd, qsl_rcvd, eqsl_rcvd)
VALUES ('CN8ABC', 446, '30m', 'FT8', 'V', '', ''),
('CN8XYZ', 446, '20m', 'FT8', 'N', '', '')`); err != nil {
t.Fatal(err)
}
var confirmed30, confirmed20 int
q := `SELECT band, MAX(CASE WHEN lotw_rcvd IN ` + ConfirmedValues +
` OR qsl_rcvd IN ` + ConfirmedValues + ` OR eqsl_rcvd IN ` + ConfirmedValues +
` THEN 1 ELSE 0 END) FROM qso WHERE dxcc = 446 GROUP BY band`
rows, err := db.QueryContext(context.Background(), q)
if err != nil {
t.Fatal(err)
}
defer rows.Close()
for rows.Next() {
var band string
var c int
if err := rows.Scan(&band, &c); err != nil {
t.Fatal(err)
}
switch band {
case "30m":
confirmed30 = c
case "20m":
confirmed20 = c
}
}
if confirmed30 != 1 {
t.Error("a LoTW 'V' (verified) was not counted as confirmed — the matrix would show the entity as merely worked")
}
if confirmed20 != 0 {
t.Error("an 'N' was counted as confirmed")
}
}
+149 -11
View File
@@ -215,6 +215,12 @@ type QSO struct {
// that doesn't know about it can't clobber it.
AwardRefs string `json:"award_refs,omitempty"`
// SyncUID is this contact's stable identity for folder synchronisation —
// what lets another machine name the same QSO when it edits or deletes it.
// Like AwardRefs it is read here but NOT in columnList, so an ordinary edit
// can never clobber it; it is written only by SetSyncUID / BackfillSyncUIDs.
SyncUID string `json:"sync_uid,omitempty"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
@@ -271,7 +277,7 @@ const columnList = `callsign, qso_date, qso_date_off, band, band_rx, mode, submo
// award_refs is read here but is NOT part of columnList (the insert/update
// write path) — it is a derived cache written only via SetAwardRefs, so a
// normal QSO write can never clobber it.
const selectCols = `id, ` + columnList + `, award_refs, created_at, updated_at`
const selectCols = `id, ` + columnList + `, award_refs, sync_uid, created_at, updated_at`
// columnCount is derived from columnList at init so they can never drift.
var columnCount = countColumns(columnList)
@@ -1723,26 +1729,77 @@ type BandMode struct {
// rendering a recent-contacts mini-list.
const maxWorkedEntries = 50
// operatorSuffixes are the appendages that qualify a callsign without changing
// whose it is. A bare digit (RK3DWA/3) counts too, handled separately.
var operatorSuffixes = map[string]bool{
"P": true, "M": true, "MM": true, "AM": true, "QRP": true,
"A": true, "B": true, "J": true, "LH": true, "R": true, "T": true,
}
// baseCall extracts the operator's OWN callsign from a portable form.
//
// The slash carries the qualifier on either side, and which side depends on
// what it is: RK3DWA/3 and RK3DWA/P append to the call, while ZA/OE8NDR and
// F/DL1ABC put a country prefix in front of it. Taking the part before the
// slash — which is what this used to do — reads ZA/OE8NDR as the station "ZA".
//
// So: drop the known qualifiers, and of what is left take the longest part. A
// prefix is short by nature (ZA, F, KH6, VP2E) and a callsign is not.
func baseCall(call string) string {
if !strings.Contains(call, "/") {
return call
}
best := ""
for _, p := range strings.Split(call, "/") {
if p == "" || operatorSuffixes[p] {
continue
}
if len(p) == 1 && p[0] >= '0' && p[0] <= '9' {
continue // the call-area digit
}
if len(p) > len(best) {
best = p
}
}
if best == "" {
return call
}
return best
}
// callMatch builds the WHERE fragment that selects one station's QSOs.
//
// Exact by default. With variants on, an operator's portable forms count as the
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
// someone asking "have I worked RK3DWA?" means the person, not the string.
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
// behaviour this replaces. The suffix is stripped from what was TYPED too, so
// it matches both ways round — RK3DWA/3 also finds the plain RK3DWA contacts.
// behaviour this replaces.
//
// PREFIXED FORMS MATCH TOO, and getting that wrong is what prompted this.
// Matching on the part before the slash turned ZA/OE8NDR into the station "ZA",
// so the worked-before list for one Austrian operating from Albania showed
// every OTHER visitor to Albania — two Italians and himself — and counted them
// as four contacts "with this call".
//
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
// And the variant match is only used on a base of three characters or more —
// below that a prefix could match half the log.
func callMatch(call string, variants bool) (string, []any) {
if !variants {
return "callsign = ?", []any{call}
}
base := call
if i := strings.IndexByte(base, '/'); i > 0 {
base = base[:i]
base := baseCall(call)
if len(base) < 3 {
return "callsign = ?", []any{call}
}
return "(callsign = ? OR callsign LIKE ?)", []any{base, base + "/%"}
return "(callsign = ? OR callsign LIKE ? OR callsign LIKE ? OR callsign LIKE ?)",
[]any{
base, // OE8NDR
base + "/%", // OE8NDR/P
"%/" + base, // ZA/OE8NDR
"%/" + base + "/%", // ZA/OE8NDR/P
}
}
// WorkedBefore returns aggregated history at both callsign and DXCC level.
@@ -1907,9 +1964,9 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int,
SELECT band, mode,
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
MAX(CASE WHEN callsign = ?
AND (lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y')
AND (lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` OR eqsl_rcvd IN `+ConfirmedValues+`)
THEN 1 ELSE 0 END),
MAX(CASE WHEN lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y'
MAX(CASE WHEN lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` OR eqsl_rcvd IN `+ConfirmedValues+`
THEN 1 ELSE 0 END)
FROM qso
WHERE dxcc = ?
@@ -2792,12 +2849,27 @@ type SlotStats struct {
DIGConfirmed int `json:"dig_confirmed"`
}
// ConfirmedValues is what a QSL-received field holds when the contact IS
// confirmed, as an SQL list.
//
// Y AND V. ADIF's QSL_Rcvd enumeration has both: Y is "received", V is
// "verified" — and that is what a LoTW download writes for a confirmation the
// ARRL has validated. Testing only = 'Y' therefore misses exactly the
// confirmations an operator cares most about.
//
// This was visible on screen: the Awards panel showed Morocco validated on five
// bands while the band/mode matrix beside it showed the entity as merely worked,
// because the award engine's isYes accepts "Y" or "V" and every SQL query here
// compared against 'Y' alone. One definition of confirmed, in one place, is the
// only way those two agree.
const ConfirmedValues = "('Y','V')"
// GetSlotStats computes the worked/confirmed slot and DXCC tallies in one pass.
// "Confirmed" = LoTW or paper QSL received (the award-valid sources).
func (r *Repo) GetSlotStats(ctx context.Context) (SlotStats, error) {
rows, err := r.db.QueryContext(ctx, `
SELECT COALESCE(dxcc,0), LOWER(COALESCE(band,'')), UPPER(COALESCE(mode,'')),
CASE WHEN lotw_rcvd='Y' OR qsl_rcvd='Y' THEN 1 ELSE 0 END
CASE WHEN lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` THEN 1 ELSE 0 END
FROM qso`)
if err != nil {
return SlotStats{}, err
@@ -3010,6 +3082,7 @@ func scanQSO(s scanner) (QSO, error) {
myARRLSect, myVUCCGrids sql.NullString
extrasJSON sql.NullString
awardRefs sql.NullString
syncUID sql.NullString
createdStr, updatedStr string
)
if err := s.Scan(
@@ -3037,7 +3110,7 @@ func scanQSO(s scanner) (QSO, error) {
&skcc, &fists, &tenTen, &contactedOp, &eqCall, &pfx, &myName, &class,
&darcDOK, &myDarcDOK, &region, &silentKey, &swl, &qsoComplete, &qsoRandom,
&creditGranted, &creditSubmitted, &myARRLSect, &myVUCCGrids,
&extrasJSON, &awardRefs, &createdStr, &updatedStr,
&extrasJSON, &awardRefs, &syncUID, &createdStr, &updatedStr,
); err != nil {
return QSO{}, fmt.Errorf("scan qso: %w", err)
}
@@ -3237,6 +3310,7 @@ func scanQSO(s scanner) (QSO, error) {
q.MyVUCCGrids = myVUCCGrids.String
q.Extras = decodeExtras(extrasJSON.String)
q.AwardRefs = awardRefs.String
q.SyncUID = syncUID.String
return q, nil
}
@@ -3347,3 +3421,67 @@ func (r *Repo) OrderedIDs(ctx context.Context) ([]int64, time.Time, error) {
// Parsed once, for the newest row only — the ordering came from SQL.
return out, parseTimeLoose(lastDate), nil
}
// --- Folder synchronisation identity -----------------------------------------
// SetSyncUID stamps a contact's sync identity. Targeted UPDATE: it must never
// go through the normal write path, or an ordinary edit would clobber it.
func (r *Repo) SetSyncUID(ctx context.Context, id int64, uid string) error {
_, err := r.db.ExecContext(ctx, `UPDATE qso SET sync_uid = ? WHERE id = ?`, uid, id)
return err
}
// IDBySyncUID resolves an incoming change to a local row. Indexed, so this is
// the one lookup a sync performs per record and it stays a key hit rather than
// a scan — which is the whole reason sync_uid is a column and not a JSON key.
func (r *Repo) IDBySyncUID(ctx context.Context, uid string) (int64, bool, error) {
if uid == "" {
return 0, false, nil
}
var id int64
err := r.db.QueryRowContext(ctx, `SELECT id FROM qso WHERE sync_uid = ? LIMIT 1`, uid).Scan(&id)
if err == sql.ErrNoRows {
return 0, false, nil
}
if err != nil {
return 0, false, err
}
return id, true, nil
}
// IDByDedupeKey finds the local row a change refers to when its identity is
// unknown here.
//
// The change log starts EMPTY, so contacts logged before synchronisation was
// switched on are never exchanged — nothing has to be copied across, and
// identities are stamped lazily on the contacts that are actually touched.
//
// One case still needs this. Two machines can already hold the SAME old contact
// — the second was seeded by copying the database or importing an ADIF — with
// different row ids and no identity on either. The day one of them edits that
// contact, it stamps an identity and sends a change naming it; the other has
// never seen that identity and would insert a duplicate. Matching on the
// contact itself (callsign + minute + band + mode, the importer's own dedupe
// key) recognises it instead.
//
// Looked up only when an identity is unknown, which is rare, and it goes
// through idx_qso_callsign rather than scanning — a full map of every contact,
// rebuilt each pass, was the wrong shape for something this occasional.
func (r *Repo) IDByDedupeKey(ctx context.Context, callsign, qsoDateMinute, band, mode string) (id int64, uid string, found bool, err error) {
if callsign == "" || qsoDateMinute == "" {
return 0, "", false, nil
}
var u sql.NullString
err = r.db.QueryRowContext(ctx, `
SELECT id, sync_uid FROM qso
WHERE callsign = ? AND substr(qso_date, 1, 16) = ? AND band = ? AND mode = ?
LIMIT 1`,
strings.ToUpper(callsign), qsoDateMinute, band, mode).Scan(&id, &u)
if err == sql.ErrNoRows {
return 0, "", false, nil
}
if err != nil {
return 0, "", false, err
}
return id, u.String, true, nil
}
+8 -8
View File
@@ -70,12 +70,12 @@ func TestStatsNoNilSlices(t *testing.T) {
}
// Contest metrics over a window. The two traps:
// 1. "Best hour" must be the best ROLLING 60 minutes, not the best clock hour —
// a run straddling 13:4514:45 is invisible to clock-hour bucketing, and the
// rolling figure is the one contesters quote.
// 2. Both rates must be reported: QSOs ÷ whole window (honest, breaks included)
// AND QSOs ÷ hours actually operated. Quoting only the latter is how an
// 8-hour effort gets sold as a 48-hour score.
// 1. "Best hour" must be the best ROLLING 60 minutes, not the best clock hour —
// a run straddling 13:4514:45 is invisible to clock-hour bucketing, and the
// rolling figure is the one contesters quote.
// 2. Both rates must be reported: QSOs ÷ whole window (honest, breaks included)
// AND QSOs ÷ hours actually operated. Quoting only the latter is how an
// 8-hour effort gets sold as a 48-hour score.
func TestContestPeriodMetrics(t *testing.T) {
base := time.Date(2026, 5, 30, 12, 0, 0, 0, time.UTC)
at := func(min int) time.Time { return base.Add(time.Duration(min) * time.Minute) }
@@ -90,8 +90,8 @@ func TestContestPeriodMetrics(t *testing.T) {
times = append(times, entry{t: at(240 + i*5), op: "F5XYZ"}) // 16:00 …
}
from := base // 12:00
to := base.Add(6 * time.Hour) // 18:00 → a 6-hour window
from := base // 12:00
to := base.Add(6 * time.Hour) // 18:00 → a 6-hour window
var s Stats
s.periodMetrics(times, from, to, time.Time{}, time.Time{})
+145
View File
@@ -0,0 +1,145 @@
package qso
import (
"context"
"path/filepath"
"testing"
"time"
"hamlog/internal/db"
)
// openRepo gives a migrated, empty logbook on disk.
func openRepo(t *testing.T) *Repo {
t.Helper()
conn, err := db.Open(filepath.Join(t.TempDir(), "test.db"))
if err != nil {
t.Fatalf("open: %v", err)
}
t.Cleanup(func() { conn.Close() })
return NewRepo(conn)
}
func addQSO(t *testing.T, r *Repo, call string, when time.Time) int64 {
t.Helper()
id, err := r.Add(context.Background(), QSO{
Callsign: call, QSODate: when, Band: "20m", Mode: "CW",
})
if err != nil {
t.Fatalf("insert %s: %v", call, err)
}
return id
}
// A QSO written and read back must come out whole. selectCols and scanQSO are
// two hand-maintained lists that must line up column for column, and adding
// sync_uid touched both — a drift there fails every read at runtime, which no
// compiler catches.
func TestSyncUIDRoundTrips(t *testing.T) {
r := openRepo(t)
ctx := context.Background()
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
got, err := r.GetByID(ctx, id)
if err != nil {
t.Fatalf("read back: %v", err)
}
if got.Callsign != "M0ABC" {
t.Fatalf("read back %+v", got)
}
if got.SyncUID != "" {
t.Errorf("a fresh QSO has identity %q — it should have none until sync is switched on", got.SyncUID)
}
if err := r.SetSyncUID(ctx, id, "abc123"); err != nil {
t.Fatalf("SetSyncUID: %v", err)
}
got, _ = r.GetByID(ctx, id)
if got.SyncUID != "abc123" {
t.Errorf("SyncUID = %q after stamping", got.SyncUID)
}
}
// An ordinary edit must NEVER clobber the identity. sync_uid is deliberately
// outside columnList for this reason: another machine that has already seen the
// contact addresses it by that id, and losing it makes the same QSO arrive
// again as a new one.
func TestAnEditDoesNotClobberTheIdentity(t *testing.T) {
r := openRepo(t)
ctx := context.Background()
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
if err := r.SetSyncUID(ctx, id, "keepme"); err != nil {
t.Fatal(err)
}
q, _ := r.GetByID(ctx, id)
q.Name = "Edited"
q.SyncUID = "" // exactly what a caller that knows nothing about sync sends
if err := r.Update(ctx, q); err != nil {
t.Fatalf("update: %v", err)
}
got, _ := r.GetByID(ctx, id)
if got.Name != "Edited" {
t.Errorf("the edit did not take: %+v", got)
}
if got.SyncUID != "keepme" {
t.Errorf("SyncUID = %q — an edit wiped the sync identity", got.SyncUID)
}
}
// The lookup an incoming change performs, once per record.
func TestIDBySyncUID(t *testing.T) {
r := openRepo(t)
ctx := context.Background()
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
_ = r.SetSyncUID(ctx, id, "u-1")
got, ok, err := r.IDBySyncUID(ctx, "u-1")
if err != nil || !ok || got != id {
t.Fatalf("IDBySyncUID = (%d,%v,%v), want (%d,true,nil)", got, ok, err, id)
}
if _, ok, _ := r.IDBySyncUID(ctx, "nope"); ok {
t.Error("an unknown identity was resolved")
}
// An empty id must never match the rows that have none.
if _, ok, _ := r.IDBySyncUID(ctx, ""); ok {
t.Error("the empty identity matched a row — every un-stamped QSO would be that row")
}
}
// Two machines can already hold the SAME old contact — the second was seeded by
// copying the database or importing an ADIF — with different row ids and no
// identity on either. The day one of them edits it, it stamps an identity and
// sends a change naming it; the other has never seen that identity and would
// insert a duplicate. Matching on the contact itself recognises it instead.
func TestIDByDedupeKeyRecognisesTheSameContact(t *testing.T) {
r := openRepo(t)
ctx := context.Background()
when := time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC)
id := addQSO(t, r, "M0ABC", when)
minute := when.UTC().Format("2006-01-02T15:04")
gotID, uid, found, err := r.IDByDedupeKey(ctx, "M0ABC", minute, "20m", "CW")
if err != nil || !found {
t.Fatalf("IDByDedupeKey = (%d,%q,%v,%v), want it found", gotID, uid, found, err)
}
if gotID != id {
t.Errorf("resolved to id %d, want %d", gotID, id)
}
if uid != "" {
t.Errorf("uid = %q, want empty until something stamps it", uid)
}
// A contact this machine does not have must NOT match something else.
if _, _, found, _ := r.IDByDedupeKey(ctx, "M0ABC", minute, "40m", "CW"); found {
t.Error("a different band matched — the key must be all four parts")
}
if _, _, found, _ := r.IDByDedupeKey(ctx, "M0XYZ", minute, "20m", "CW"); found {
t.Error("a different callsign matched")
}
// An empty key must never match anything.
if _, _, found, _ := r.IDByDedupeKey(ctx, "", "", "", ""); found {
t.Error("an empty key matched a row")
}
}
+2 -2
View File
@@ -20,8 +20,8 @@ func NewDenkovi(serial string, count int) Device {
return denkoviStub{count: count}
}
func (s denkoviStub) Count() int { return s.count }
func (denkoviStub) Close() error { return nil }
func (s denkoviStub) Count() int { return s.count }
func (denkoviStub) Close() error { return nil }
func (denkoviStub) Status(context.Context) ([]bool, error) {
return nil, fmt.Errorf("Denkovi USB relay board is only supported on Windows")
}
+227
View File
@@ -0,0 +1,227 @@
package relaydev
import (
"context"
"fmt"
"net/url"
"regexp"
"strconv"
"strings"
"sync"
)
// A generic HTTP relay board: one URL to switch a relay on, one to switch it off.
//
// This is for the home-made switch — an ESP8266 with a web page, a Shelly, a
// Sonoff running third-party firmware, any of the boxes that answer a GET and
// have no protocol worth naming. The named drivers beside it exist because
// their boards need something specific; this one exists because most of them
// need nothing at all.
//
// TWO WAYS TO CONFIGURE IT, and the difference matters:
//
// - one URL pair with {relay} in it, used for every relay:
// http://192.168.1.9/relay?n={relay}&state=on
// - one pair per relay, when the box has no pattern to speak of:
// relay 1 → http://192.168.1.9/FF0101 , relay 2 → .../FF0201
//
// The second is the reason this driver exists. A hand-made switch often has
// URLs with nothing in common between channels, and a template with {relay}
// cannot express that.
//
// TWO SUBSTITUTIONS are available in either form:
//
// {relay} the relay number, 1-based. {relay-1} for a board that counts its
// channels from zero — otherwise the whole pattern has to be given
// up for eight hand-typed URLs over one missing offset.
// {value} that relay's LABEL, the name given to it in Relay labels. A switch
// addressed by antenna name rather than by channel number
// (…/relay?on=Ant1) is then one pattern instead of eight URLs, and
// renaming the antenna re-addresses it — the name the operator reads
// on the button and the name on the wire cannot drift apart because
// they are the same string.
//
// The label is percent-encoded, so a name with a space or an accent goes out as
// a valid URL rather than a request the board rejects without saying why.
//
// STATE IS REMEMBERED, NOT READ. Most of these boxes have no status endpoint,
// or answer with a web page nobody can parse reliably. Status therefore returns
// what we last commanded — see the method for what that costs.
type httpGen struct {
onURLs []string // index 0 = relay 1; "" falls back to the pattern
offURLs []string
onPat string // pattern with {relay}, used when the per-relay URL is empty
offPat string
labels []string // index 0 = relay 1; what {value} resolves to
user string
pass string
count int
// insecure accepts a certificate nothing can verify — the self-signed one a
// relay board on the LAN presents. Per board, and the operator's choice.
insecure bool
mu sync.Mutex
state []bool
}
// NewHTTPGeneric builds the driver. onURLs/offURLs are per relay (index 0 =
// relay 1) and may be short or hold empty entries; onPat/offPat are the
// fallback patterns; labels are the relay names {value} substitutes.
func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string, count int, labels []string, insecure bool) Device {
if count <= 0 {
count = len(onURLs)
}
if count <= 0 {
count = 1
}
return &httpGen{
onURLs: onURLs, offURLs: offURLs,
onPat: onPat, offPat: offPat, labels: labels,
user: user, pass: pass, count: count, insecure: insecure,
state: make([]bool, count),
}
}
func (h *httpGen) Count() int { return h.count }
func (h *httpGen) Close() error { return nil } // stateless HTTP, nothing to release
// patFor returns the pattern for a direction, trimmed.
func (h *httpGen) patFor(on bool) string {
if on {
return strings.TrimSpace(h.onPat)
}
return strings.TrimSpace(h.offPat)
}
// entryFor returns what was typed in the per-relay box for a direction.
func (h *httpGen) entryFor(relay int, on bool) string {
list := h.offURLs
if on {
list = h.onURLs
}
if i := relay - 1; i >= 0 && i < len(list) {
return strings.TrimSpace(list[i])
}
return ""
}
// labelFor returns the relay's name, as typed in Relay labels.
func (h *httpGen) labelFor(relay int) string {
if i := relay - 1; i >= 0 && i < len(h.labels) {
return strings.TrimSpace(h.labels[i])
}
return ""
}
// urlFor builds the request for one relay in one direction: the per-relay URL
// if there is one, the pattern otherwise, with both substitutions applied.
func (h *httpGen) urlFor(relay int, on bool) string {
u := h.entryFor(relay, on)
if u == "" {
u = h.patFor(on)
}
if u == "" {
return ""
}
return expand(u, relay, h.labelFor(relay))
}
// escapeValue percent-encodes a relay label for use anywhere in a URL.
//
// url.QueryEscape alone is wrong: it writes a space as "+", which is a space
// only in a query string and a literal plus sign in a path. Encoding it as %20
// instead is correct in both, and {value} may land in either.
func escapeValue(s string) string {
return strings.ReplaceAll(url.QueryEscape(s), "+", "%20")
}
// withScheme supplies http:// when none was typed, and leaves https:// alone.
//
// The same rule the named boards get from relayBase, and it has to be here too:
// this driver takes whole URLs rather than a host, and a line typed as
// "192.168.1.9/Set0/1" would otherwise fail with "unsupported protocol scheme"
// — an error about a scheme, for a field where nobody knew one was expected.
// An https:// board (a reverse proxy fronting the shack, most often) is passed
// through untouched and needs no other handling: it is the same HTTP client.
func withScheme(u string) string {
if u == "" {
return ""
}
if l := strings.ToLower(u); strings.HasPrefix(l, "http://") || strings.HasPrefix(l, "https://") {
return u
}
return "http://" + u
}
// relayToken matches {relay} and its offset forms, {relay-1} / {relay+2}.
var relayToken = regexp.MustCompile(`\{relay([+-]\d+)?\}`)
// expand substitutes {value} with the relay's label and {relay} with its
// number, honouring an offset. A board that numbers its channels from zero is
// written {relay-1}; without that the whole pattern has to be abandoned for
// four hand-typed URLs.
func expand(s string, relay int, label string) string {
s = strings.ReplaceAll(s, "{value}", escapeValue(label))
return relayToken.ReplaceAllStringFunc(s, func(m string) string {
n := relay
if i := strings.IndexAny(m, "+-"); i >= 0 {
if off, err := strconv.Atoi(m[i : len(m)-1]); err == nil {
n += off
}
}
return strconv.Itoa(n)
})
}
func (h *httpGen) Set(ctx context.Context, relay int, on bool) error {
if relay < 1 || relay > h.count {
return fmt.Errorf("relay %d out of range 1..%d", relay, h.count)
}
// Naming the direction matters: an operator who filled the ON URLs and left
// OFF empty gets a switch that latches, and "no URL configured" alone would
// not say which half is missing.
dir := "OFF"
if on {
dir = "ON"
}
tmpl := h.entryFor(relay, on)
if tmpl == "" {
tmpl = h.patFor(on)
}
if tmpl == "" {
return fmt.Errorf("no %s URL configured for relay %d", dir, relay)
}
// {value} with no label would send "?on=" — an empty parameter to an antenna
// switch, which most boards answer with a cheerful 200 and no movement. Say
// what is missing instead of firing it.
if strings.Contains(tmpl, "{value}") && h.labelFor(relay) == "" {
return fmt.Errorf("the %s URL for relay %d uses {value}, but relay %d has no label to put there", dir, relay, relay)
}
u := h.urlFor(relay, on)
u = withScheme(u)
if _, err := get(ctx, u, h.user, h.pass, h.insecure); err != nil {
return err
}
h.mu.Lock()
if i := relay - 1; i < len(h.state) {
h.state[i] = on
}
h.mu.Unlock()
return nil
}
// Status returns what was last commanded, not what the board is doing.
//
// These boxes rarely have a status endpoint worth trusting, so there is nothing
// to read. The cost is real and worth stating: after OpsLog restarts, every
// relay reads as off until something switches it, so the automatic control
// re-commands each one once. That is a harmless extra command on a board with
// no memory of its own — and far better than guessing a state and leaving an
// antenna disconnected because we assumed it was already selected.
func (h *httpGen) Status(ctx context.Context) ([]bool, error) {
h.mu.Lock()
defer h.mu.Unlock()
out := make([]bool, h.count)
copy(out, h.state)
return out, nil
}
+172
View File
@@ -0,0 +1,172 @@
package relaydev
import (
"context"
"net/http"
"net/http/httptest"
"strings"
"sync"
"testing"
)
// The pattern form: one URL pair for the whole board, {relay} substituted.
func TestHTTPGenericPattern(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.String())
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(nil, nil,
srv.URL+"/relay?n={relay}&state=on",
srv.URL+"/relay?n={relay}&state=off", "", "", 4, nil, false)
if err := d.Set(context.Background(), 2, true); err != nil {
t.Fatalf("Set on: %v", err)
}
if err := d.Set(context.Background(), 3, false); err != nil {
t.Fatalf("Set off: %v", err)
}
mu.Lock()
defer mu.Unlock()
want := []string{"/relay?n=2&state=on", "/relay?n=3&state=off"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// The per-relay form, which is the reason this driver exists: a hand-made
// switch often has URLs with nothing in common between channels, and no
// pattern can express that.
func TestHTTPGenericPerRelayURLsWinOverThePattern(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.Path)
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(
[]string{srv.URL + "/FF0101", "", srv.URL + "/weird/on"},
[]string{srv.URL + "/FF0100", "", ""},
srv.URL+"/pattern/on/{relay}", srv.URL+"/pattern/off/{relay}", "", "", 3, nil, false)
_ = d.Set(context.Background(), 1, true) // its own URL
_ = d.Set(context.Background(), 2, true) // empty → falls back to the pattern
_ = d.Set(context.Background(), 3, false) // no OFF of its own → pattern
mu.Lock()
defer mu.Unlock()
want := []string{"/FF0101", "/pattern/on/2", "/pattern/off/3"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// {value} is the relay's LABEL: a switch addressed by antenna name rather than
// by channel number is one pattern instead of eight URLs.
func TestHTTPGenericValueIsTheRelayLabel(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.String())
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(
[]string{srv.URL + "/relay?on={value}"}, // per-relay URL
nil,
"", srv.URL+"/relay?off={value}", // and the pattern, for the other direction
"", "", 3, []string{"Ant1", "Beam 20m", ""}, false)
_ = d.Set(context.Background(), 1, true)
_ = d.Set(context.Background(), 2, false)
mu.Lock()
defer mu.Unlock()
// The space in "Beam 20m" must go out as %20 — a "+" would be a literal plus
// in a path, and this substitution can land in either half of a URL.
want := []string{"/relay?on=Ant1", "/relay?off=Beam%2020m"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// {relay-1} for a board whose channels are numbered from zero.
func TestHTTPGenericRelayOffset(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.Path)
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(nil, nil,
srv.URL+"/set0/{relay-1}/1", srv.URL+"/set0/{relay-1}/0", "", "", 4, nil, false)
_ = d.Set(context.Background(), 1, true)
_ = d.Set(context.Background(), 4, false)
mu.Lock()
defer mu.Unlock()
want := []string{"/set0/0/1", "/set0/3/0"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// A URL that uses {value} on an unlabelled relay would go out as "?on=" — an
// empty parameter, which most boards answer with a cheerful 200 and no
// movement. It must be refused, and the message must say the label is what is
// missing.
func TestHTTPGenericRefusesValueWithoutALabel(t *testing.T) {
d := NewHTTPGeneric(nil, nil, "http://x/relay?on={value}", "", "", "", 2, []string{"", ""}, false)
err := d.Set(context.Background(), 1, true)
if err == nil || !strings.Contains(err.Error(), "label") {
t.Errorf("err = %v, want it to name the missing label", err)
}
}
// A URL typed without a scheme must still be sent — the named boards take a
// bare host and add http:// themselves, and this one has to behave the same.
// https:// is left exactly as typed.
func TestHTTPGenericSuppliesTheScheme(t *testing.T) {
for _, c := range []struct{ in, want string }{
{"192.168.1.9/Set0/1", "http://192.168.1.9/Set0/1"},
{"http://192.168.1.9/x", "http://192.168.1.9/x"},
{"https://relay.example.com/x", "https://relay.example.com/x"},
{"HTTPS://relay.example.com/x", "HTTPS://relay.example.com/x"},
} {
if got := withScheme(c.in); got != c.want {
t.Errorf("withScheme(%q) = %q, want %q", c.in, got, c.want)
}
}
}
// A switch with the ON URLs filled and OFF left empty latches. The error has to
// name the direction, or the operator cannot tell which half is missing.
func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
d := NewHTTPGeneric([]string{"http://x/on"}, nil, "", "", "", "", 1, nil, false)
err := d.Set(context.Background(), 1, false)
if err == nil || !strings.Contains(err.Error(), "OFF") {
t.Errorf("err = %v, want it to name the OFF direction", err)
}
}
// Status reports what was commanded: these boxes have nothing to read.
func TestHTTPGenericRemembersWhatItCommanded(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
defer srv.Close()
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 3, nil, false)
_ = d.Set(context.Background(), 2, true)
st, err := d.Status(context.Background())
if err != nil {
t.Fatalf("Status: %v", err)
}
if len(st) != 3 || st[0] || !st[1] || st[2] {
t.Errorf("state = %v, want only relay 2 on", st)
}
}
+80
View File
@@ -0,0 +1,80 @@
package relaydev
import (
"context"
"net/http"
"net/http/httptest"
"strings"
"sync"
"testing"
)
// A relay board on the LAN signs its own certificate — there is no authority
// anywhere that could have signed it. httptest.NewTLSServer presents exactly
// that: a certificate from an unknown issuer, which is what the hardware does.
func selfSignedRelay(t *testing.T) (*httptest.Server, func() []string) {
t.Helper()
var mu sync.Mutex
var got []string
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.Path)
mu.Unlock()
w.WriteHeader(http.StatusOK)
}))
t.Cleanup(srv.Close)
return srv, func() []string {
mu.Lock()
defer mu.Unlock()
return append([]string(nil), got...)
}
}
// With the box ticked, the board answers.
func TestHTTPSRelayWithASelfSignedCertificate(t *testing.T) {
srv, seen := selfSignedRelay(t)
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 2, nil, true)
if err := d.Set(context.Background(), 1, true); err != nil {
t.Fatalf("Set over HTTPS: %v", err)
}
if paths := seen(); len(paths) != 1 || paths[0] != "/on/1" {
t.Errorf("the board was asked for %v, want /on/1", paths)
}
}
// Without it, the request is refused — and the refusal has to name the box.
//
// Go's own message, "x509: certificate signed by unknown authority", is
// accurate and tells an operator nothing about what to do next. This is the
// difference between a dead end and an instruction, and it is the whole reason
// the default can safely stay OFF.
func TestARefusedCertificateNamesTheSetting(t *testing.T) {
srv, seen := selfSignedRelay(t)
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 2, nil, false)
err := d.Set(context.Background(), 1, true)
if err == nil {
t.Fatal("an unverifiable certificate was accepted with the box unticked")
}
if !strings.Contains(err.Error(), "self-signed") {
t.Errorf("the refusal reads %q — it does not say which setting to change", err)
}
if len(seen()) != 0 {
t.Error("the request reached the board despite the certificate being refused")
}
}
// The box belongs to ONE board. An operator with a self-signed switch on the
// LAN and a second board reached through a proper HTTPS proxy must keep real
// verification on the second — that link crosses the internet, and it commands
// an antenna.
func TestAcceptingOneBoardsCertificateDoesNotAffectAnother(t *testing.T) {
srv, _ := selfSignedRelay(t)
lan := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", "", "", "", 1, nil, true)
if err := lan.Set(context.Background(), 1, true); err != nil {
t.Fatalf("the LAN board: %v", err)
}
strict := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", "", "", "", 1, nil, false)
if err := strict.Set(context.Background(), 1, true); err == nil {
t.Error("the second board accepted the certificate too — the setting is not per board")
}
}
+57 -11
View File
@@ -17,7 +17,10 @@ package relaydev
import (
"context"
"crypto/tls"
"crypto/x509"
"encoding/xml"
"errors"
"fmt"
"io"
"net/http"
@@ -28,8 +31,8 @@ import (
// Device is one relay board.
type Device interface {
Count() int // number of user-controllable relays
Status(ctx context.Context) ([]bool, error) // state of each relay (index 0 = relay 1)
Count() int // number of user-controllable relays
Status(ctx context.Context) ([]bool, error) // state of each relay (index 0 = relay 1)
Set(ctx context.Context, relay int, on bool) error // relay is 1-based
// Close releases any OS handle the driver holds (serial port, FTDI handle).
// Network boards hold nothing and no-op. MUST be called when a cached driver is
@@ -40,8 +43,47 @@ type Device interface {
func httpClient() *http.Client { return &http.Client{Timeout: 5 * time.Second} }
// insecureClient talks to a board presenting a certificate nothing can verify.
//
// Which is nearly every board that offers HTTPS at all: a relay box on the LAN
// signs its own certificate, and there is no authority anywhere that could have
// signed it. Refusing that means refusing HTTPS on the hardware, which is not a
// security decision, only an outcome.
//
// So it is offered, per board, and OFF by default — because the other HTTPS
// case is real and opposite: a board reached from outside through a proxy with
// a genuine certificate, where verification is the only thing standing between
// an antenna switch and the internet. One box, on the board that needs it.
//
// Built once. A Transport per request would open a fresh TLS connection every
// time and never reuse one.
var insecureClient = &http.Client{
Timeout: 5 * time.Second,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, //nolint:gosec // the operator ticked the box for this board
},
}
// certError says which box to tick when TLS is what failed.
//
// Go's own message — "x509: certificate signed by unknown authority" — is
// accurate and tells an operator nothing about what to do next. Naming the
// setting turns a dead end into an instruction.
func certError(err error) error {
var unknown x509.UnknownAuthorityError
var host x509.HostnameError
var verify *tls.CertificateVerificationError
if errors.As(err, &unknown) || errors.As(err, &host) || errors.As(err, &verify) {
return fmt.Errorf("%w — the board's HTTPS certificate cannot be verified; "+
"tick \"Accept a self-signed certificate\" for this board if it is on your own network", err)
}
return err
}
// get issues a GET with optional basic auth and returns the body on 2xx.
func get(ctx context.Context, url, user, pass string) ([]byte, error) {
//
// insecure skips certificate verification, for a board that signs its own.
func get(ctx context.Context, url, user, pass string, insecure bool) ([]byte, error) {
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
@@ -49,9 +91,13 @@ func get(ctx context.Context, url, user, pass string) ([]byte, error) {
if user != "" || pass != "" {
req.SetBasicAuth(user, pass)
}
resp, err := httpClient().Do(req)
client := httpClient()
if insecure {
client = insecureClient
}
resp, err := client.Do(req)
if err != nil {
return nil, err
return nil, certError(err)
}
defer resp.Body.Close()
body, _ := io.ReadAll(resp.Body)
@@ -87,8 +133,8 @@ type webswitch struct {
// NewWebswitch builds a WebSwitch 1216H client (5 relays).
func NewWebswitch(host string) Device { return &webswitch{host: host, count: 5} }
func (w *webswitch) Count() int { return w.count }
func (w *webswitch) Close() error { return nil } // stateless HTTP, nothing to release
func (w *webswitch) Count() int { return w.count }
func (w *webswitch) Close() error { return nil } // stateless HTTP, nothing to release
func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
if relay < 1 || relay > w.count {
@@ -98,7 +144,7 @@ func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
if on {
action = "on"
}
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "")
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "", false)
return err
}
@@ -109,7 +155,7 @@ func (w *webswitch) Status(ctx context.Context) ([]bool, error) {
sel.WriteString(strconv.Itoa(i))
sel.WriteByte('$')
}
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "")
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "", false)
if err != nil {
return nil, err
}
@@ -156,7 +202,7 @@ func (k *kmtronic) Set(ctx context.Context, relay int, on bool) error {
state = "01"
}
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass)
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass, false)
return err
}
@@ -170,7 +216,7 @@ type kmStatus struct {
}
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass)
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass, false)
if err != nil {
return nil, err
}
+299
View File
@@ -0,0 +1,299 @@
// Package spid drives a SPID (AlfaSpid) rotator over its own serial protocol,
// Rot1Prog or Rot2Prog — the controllers sold as RAS, RAK, BIG-RAS/HR, MD-01
// and MD-02.
//
// It exists so an operator with SPID rotators does not need PstRotator running
// just to turn an antenna. Two towers with a controller each is the ordinary
// case; each one is a separate serial port and a separate rotor in OpsLog.
//
// # WIRE FORMAT
//
// Every command is 13 bytes:
//
// 0 1 2 3 4 5 6 7 8 9 10 11 12
// 0x57 H1 H2 H3 H4 PH V1 V2 V3 V4 PV K 0x20
//
// K is the command: 0x0F stop, 0x1F status, 0x2F set.
//
// The DIGITS ARE ASCII in a command ('0'+d) and RAW BYTES in a reply (0..9).
// That asymmetry is the whole trap in this protocol: send raw digits and the
// controller ignores you, read them as ASCII and every heading is 48 degrees
// times a hundred out. It is pinned by the tests beside this file.
//
// PH and PV are the resolution in pulses per degree — 1, 2 or 4 — and are raw
// in both directions. The target is scaled by it:
//
// u_az = PH × (360 + az) and the four decimal digits of u_az are sent
//
// A reply is 12 bytes for Rot2Prog (azimuth and elevation) or 5 for Rot1Prog
// (azimuth only, three digits):
//
// az = H1×100 + H2×10 + H3 + H4/10 360
//
// ROT1PROG IS THREE DIGITS IN BOTH DIRECTIONS. Its reply carries three, and so
// does its command — the controller reads the azimuth from offsets 1, 2 and 3,
// with no resolution scaling (it is one pulse per degree). Sending it the
// four-digit Rot2Prog form shifts every target by a decimal place: 90° goes out
// as "0450" and is read as 045, which is 315°, so every command turns the
// antenna nearly a full circle the wrong way. Found on a tower, not here.
//
// The 360 offset is what lets the controller report a rotator that has turned
// past north in either direction, which is the point of a pulse-counting
// rotator: 180…540 rather than 0…359.
//
// Serial is 8N1 at 600 baud for Rot2Prog and 1200 for Rot1Prog. Those are not
// typos — a pulse controller has nothing to say quickly.
//
// Verified against Hamlib's spid.c (rotators/spid/spid.c), which is the
// reference implementation, and SPID's published protocol note. NOT yet run
// against real hardware here; the tests pin the frames, the controller is the
// only thing that can confirm the rest.
package spid
import (
"fmt"
"strings"
"sync"
"time"
"go.bug.st/serial"
)
// Model selects the dialect.
type Model string
const (
Rot1Prog Model = "rot1prog" // azimuth only, 5-byte reply, 1200 baud
Rot2Prog Model = "rot2prog" // azimuth + elevation, 12-byte reply, 600 baud
)
const (
cmdStop = 0x0F
cmdStatus = 0x1F
cmdSet = 0x2F
frameStart = 0x57
frameEnd = 0x20
)
// Client is one controller on one serial port.
//
// The port is opened per exchange rather than held: a rotator is polled every
// few seconds at most, and holding a COM port open for the life of the program
// is what stops an operator from using their controller's own software
// alongside — which they will want while they are still trusting this.
type Client struct {
mu sync.Mutex
port string
baud int
model Model
// resolution is pulses per degree: 1, 2 or 4. The controller is configured
// for one of them and answers with it, so a wrong value here corrects itself
// on the first status read.
resolution byte
}
// New builds a client. baud 0 takes the model's documented default.
func New(comPort string, baud int, model Model) *Client {
if model != Rot1Prog {
model = Rot2Prog
}
if baud <= 0 {
baud = 600
if model == Rot1Prog {
baud = 1200
}
}
return &Client{port: strings.TrimSpace(comPort), baud: baud, model: model, resolution: 1}
}
// BuildStatus frames the "where are you" command.
func BuildStatus() []byte { return buildCmd(0, 0, 0, 0, cmdStatus) }
// BuildStop frames the "stop now" command.
func BuildStop() []byte { return buildCmd(0, 0, 0, 0, cmdStop) }
// BuildSet frames a target. resolution is the controller's pulses per degree.
//
// Azimuth is offset by 360 before scaling, so a target of 10° and one of 350°
// are different instructions: the first turns anticlockwise past north, the
// second does not. Feeding a 0…359 heading in is therefore always safe.
//
// ROT1PROG SENDS THREE DIGITS, NOT FOUR, and that is the whole reason this
// takes a model. Its reply is three digits — a 5-byte frame — and its command
// field matches: the controller reads the azimuth from offsets 1, 2 and 3.
//
// Sending the four-digit Rot2Prog form to one shifts every target by a decimal
// place. "0450" for 90° was read as 045, i.e. 45 360 = 315°, so every
// command became a near-full turn ANTICLOCKWISE whatever was asked for — 0°,
// 90°, 180°, all of them. That is exactly how it was reported from a tower:
// every heading wanted to go the wrong way round, and a "point to 0°" test that
// did nothing useful.
func BuildSet(az, el float64, resolution byte, model Model) []byte {
if model == Rot1Prog {
// No scaling: a Rot1Prog is one pulse per degree and reports resolution 1.
return buildCmd3(int(360+az+0.5), int(360+el+0.5))
}
if resolution == 0 {
resolution = 1
}
uaz := int(float64(resolution)*(360+az) + 0.5)
uel := int(float64(resolution)*(360+el) + 0.5)
return buildCmd(uaz, uel, resolution, resolution, cmdSet)
}
// buildCmd3 frames a Rot1Prog target: three ASCII digits per axis at the same
// offsets its replies use, the fourth digit position left as '0'.
func buildCmd3(uaz, uel int) []byte {
c := make([]byte, 13)
c[0] = frameStart
c[1] = '0' + byte(uaz/100%10)
c[2] = '0' + byte(uaz/10%10)
c[3] = '0' + byte(uaz%10)
c[4] = '0'
c[5] = 0x01
c[6] = '0' + byte(uel/100%10)
c[7] = '0' + byte(uel/10%10)
c[8] = '0' + byte(uel%10)
c[9] = '0'
c[10] = 0x01
c[11] = cmdSet
c[12] = frameEnd
return c
}
func buildCmd(uaz, uel int, ph, pv byte, k byte) []byte {
c := make([]byte, 13)
c[0] = frameStart
if k == cmdSet {
c[1] = '0' + byte(uaz/1000%10)
c[2] = '0' + byte(uaz/100%10)
c[3] = '0' + byte(uaz/10%10)
c[4] = '0' + byte(uaz%10)
c[5] = ph
c[6] = '0' + byte(uel/1000%10)
c[7] = '0' + byte(uel/100%10)
c[8] = '0' + byte(uel/10%10)
c[9] = '0' + byte(uel%10)
c[10] = pv
}
c[11] = k
c[12] = frameEnd
return c
}
// ParseStatus decodes a reply. Returns the azimuth, the elevation (0 for
// Rot1Prog) and the resolution the controller reported.
func ParseStatus(buf []byte, model Model) (az, el float64, resolution byte, err error) {
want := 12
if model == Rot1Prog {
want = 5
}
if len(buf) < want {
return 0, 0, 0, fmt.Errorf("spid: short reply (%d bytes, want %d)", len(buf), want)
}
if buf[0] != frameStart || buf[want-1] != frameEnd {
return 0, 0, 0, fmt.Errorf("spid: not a reply frame: % X", buf[:want])
}
az = float64(buf[1])*100 + float64(buf[2])*10 + float64(buf[3])
if model == Rot1Prog {
return az - 360, 0, 1, nil
}
az += float64(buf[4]) / 10
el = float64(buf[6])*100 + float64(buf[7])*10 + float64(buf[8]) + float64(buf[9])/10
resolution = buf[5]
if resolution == 0 {
resolution = 1
}
return az - 360, el - 360, resolution, nil
}
// GoTo points the rotator at az (and el, on a Rot2Prog with elevation).
func (c *Client) GoTo(az int, el int) error {
c.mu.Lock()
res := c.resolution
c.mu.Unlock()
e := 0.0
if el >= 0 && c.model == Rot2Prog {
e = float64(el)
}
_, err := c.exchange(BuildSet(float64(az), e, res, c.model), 0)
return err
}
// Stop interrupts a rotation in progress.
func (c *Client) Stop() error {
// The controller answers a stop with its position, like a status — read it
// so the reply does not sit in the buffer and get taken for the ANSWER to
// the next poll, which would report a heading one command stale for ever.
_, err := c.exchange(BuildStop(), c.replyLen())
return err
}
// Heading reads the current position.
func (c *Client) Heading() (az int, el int, err error) {
buf, err := c.exchange(BuildStatus(), c.replyLen())
if err != nil {
return 0, 0, err
}
a, e, res, err := ParseStatus(buf, c.model)
if err != nil {
return 0, 0, err
}
// Believe the controller about its own resolution: it is configured on the
// front panel, and a wrong guess here would scale every target we send.
c.mu.Lock()
c.resolution = res
c.mu.Unlock()
return int(a + 0.5), int(e + 0.5), nil
}
func (c *Client) replyLen() int {
if c.model == Rot1Prog {
return 5
}
return 12
}
// exchange opens the port, writes one frame and reads the expected reply.
func (c *Client) exchange(cmd []byte, wantBytes int) ([]byte, error) {
if c.port == "" {
return nil, fmt.Errorf("spid: no serial port configured")
}
c.mu.Lock()
defer c.mu.Unlock()
p, err := serial.Open(c.port, &serial.Mode{
BaudRate: c.baud, DataBits: 8, Parity: serial.NoParity, StopBits: serial.OneStopBit,
})
if err != nil {
return nil, fmt.Errorf("spid: open %s: %w", c.port, err)
}
defer p.Close()
// 600 baud is 60 bytes a second: a 12-byte reply takes a fifth of a second
// to arrive on the wire alone, before the controller has thought about it.
_ = p.SetReadTimeout(2 * time.Second)
if _, err := p.Write(cmd); err != nil {
return nil, fmt.Errorf("spid: write: %w", err)
}
if wantBytes == 0 {
return nil, nil
}
buf := make([]byte, 0, wantBytes)
tmp := make([]byte, wantBytes)
deadline := time.Now().Add(3 * time.Second)
for len(buf) < wantBytes && time.Now().Before(deadline) {
n, err := p.Read(tmp)
if n > 0 {
buf = append(buf, tmp[:n]...)
continue
}
if err != nil {
break
}
}
if len(buf) < wantBytes {
return nil, fmt.Errorf("spid: no reply from %s (%d of %d bytes) — check the port, the baud rate (%d) and that nothing else holds the controller",
c.port, len(buf), wantBytes, c.baud)
}
return buf, nil
}
+145
View File
@@ -0,0 +1,145 @@
package spid
import (
"math"
"testing"
)
// The frames are pinned against Hamlib's spid.c, the reference implementation.
// This protocol has one trap and it is here: digits go out as ASCII and come
// back RAW. Getting that backwards points an antenna at a heading nobody asked
// for, and nothing in the app would notice.
func TestSetFrameMatchesTheReference(t *testing.T) {
// Hamlib: u_az = PH × (360 + az), then the four decimal digits as ASCII;
// PH and PV raw; K = 0x2F.
got := BuildSet(0, 0, 1, Rot2Prog) // 360 → "0360"
want := []byte{0x57, '0', '3', '6', '0', 0x01, '0', '3', '6', '0', 0x01, 0x2F, 0x20}
assertBytes(t, "az 0 res 1", got, want)
// 90° at half-degree resolution: 2 × 450 = 900 → "0900".
got = BuildSet(90, 0, 2, Rot2Prog)
want = []byte{0x57, '0', '9', '0', '0', 0x02, '0', '7', '2', '0', 0x02, 0x2F, 0x20}
assertBytes(t, "az 90 res 2", got, want)
// A quarter-degree controller, 359°: 4 × 719 = 2876.
got = BuildSet(359, 0, 4, Rot2Prog)
want = []byte{0x57, '2', '8', '7', '6', 0x04, '1', '4', '4', '0', 0x04, 0x2F, 0x20}
assertBytes(t, "az 359 res 4", got, want)
}
// A Rot1Prog reads its azimuth from offsets 1, 2 and 3 — three digits, the same
// field its five-byte replies use.
//
// This is field evidence, not a reading of the reference: sending the
// four-digit Rot2Prog form to a RAK/RAU made every command turn the antenna
// nearly a full circle ANTICLOCKWISE. "0450" for 90° was read as 045, which is
// 45 360 = 315°, and the same shift made 0°, 180° and every other target go
// the wrong way round too. The three cases below are the ones that were tried
// on the tower.
func TestRot1ProgSetFrameIsThreeDigits(t *testing.T) {
// 0° → 360 → "360". The "point to 0°" test that did nothing.
assertBytes(t, "rot1prog az 0", BuildSet(0, 0, 1, Rot1Prog),
[]byte{0x57, '3', '6', '0', '0', 0x01, '3', '6', '0', '0', 0x01, 0x2F, 0x20})
// 90° → 450 → "450". Sent as "0450" it read as 45 360 = 315°, which from
// 45° is a full turn the wrong way.
assertBytes(t, "rot1prog az 90", BuildSet(90, 0, 1, Rot1Prog),
[]byte{0x57, '4', '5', '0', '0', 0x01, '3', '6', '0', '0', 0x01, 0x2F, 0x20})
// 359° → 719 → "719": three digits still, at the top of the range.
assertBytes(t, "rot1prog az 359", BuildSet(359, 0, 1, Rot1Prog),
[]byte{0x57, '7', '1', '9', '0', 0x01, '3', '6', '0', '0', 0x01, 0x2F, 0x20})
}
// What a Rot1Prog is SENT and what it REPORTS have to be the same number, or
// the antenna goes somewhere nobody asked for. Round-tripping every degree of
// the circle through the command builder and the reply parser is the cheapest
// way to say that, and it is the check that would have caught the four-digit
// frame before it reached a tower.
func TestRot1ProgCommandAndReplyAgree(t *testing.T) {
for deg := 0; deg < 360; deg++ {
cmd := BuildSet(float64(deg), 0, 1, Rot1Prog)
// The controller reads three ASCII digits and answers with the same value
// in raw bytes — the asymmetry this protocol is built on.
reply := []byte{0x57, cmd[1] - '0', cmd[2] - '0', cmd[3] - '0', 0x20}
az, _, _, err := ParseStatus(reply, Rot1Prog)
if err != nil {
t.Fatalf("%d°: %v", deg, err)
}
if int(az+0.5) != deg {
t.Fatalf("commanded %d°, the controller would report %v° — a %v° error",
deg, az, az-float64(deg))
}
}
}
// Status and stop carry no position: every data byte is zero, only K differs.
func TestStatusAndStopFrames(t *testing.T) {
assertBytes(t, "status", BuildStatus(),
[]byte{0x57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1F, 0x20})
assertBytes(t, "stop", BuildStop(),
[]byte{0x57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0F, 0x20})
}
// A reply's digits are RAW, and the 360 offset is what lets a pulse-counting
// controller report a rotator that has turned past north — the whole reason
// these rotators exist.
func TestParseStatusRot2Prog(t *testing.T) {
// 0x57 H1 H2 H3 H4 PH V1 V2 V3 V4 PV 0x20
// az digits 4,5,1,5 → 451.5 360 = 91.5
frame := []byte{0x57, 4, 5, 1, 5, 0x02, 3, 6, 0, 0, 0x02, 0x20}
az, el, res, err := ParseStatus(frame, Rot2Prog)
if err != nil {
t.Fatalf("ParseStatus: %v", err)
}
if math.Abs(az-91.5) > 0.001 {
t.Errorf("az = %v, want 91.5", az)
}
if math.Abs(el-0) > 0.001 {
t.Errorf("el = %v, want 0", el)
}
if res != 2 {
t.Errorf("resolution = %d, want 2 — the controller's own value must win", res)
}
}
// Rot1Prog: five bytes, three digits, no elevation.
func TestParseStatusRot1Prog(t *testing.T) {
az, el, res, err := ParseStatus([]byte{0x57, 4, 5, 1, 0x20}, Rot1Prog)
if err != nil {
t.Fatalf("ParseStatus: %v", err)
}
if math.Abs(az-91) > 0.001 {
t.Errorf("az = %v, want 91", az)
}
if el != 0 || res != 1 {
t.Errorf("el = %v, res = %d — Rot1Prog has neither", el, res)
}
}
// A truncated or foreign frame must be refused rather than decoded into a
// heading: half a reply read as a position turns an antenna somewhere real.
func TestParseStatusRefusesRubbish(t *testing.T) {
for name, frame := range map[string][]byte{
"short": {0x57, 4, 5, 1},
"no start": {0x00, 4, 5, 1, 5, 1, 3, 6, 0, 0, 1, 0x20},
"no end": {0x57, 4, 5, 1, 5, 1, 3, 6, 0, 0, 1, 0x00},
"empty": {},
} {
if _, _, _, err := ParseStatus(frame, Rot2Prog); err == nil {
t.Errorf("%s: decoded without complaint", name)
}
}
}
func assertBytes(t *testing.T, what string, got, want []byte) {
t.Helper()
if len(got) != len(want) {
t.Fatalf("%s: % X\nwant % X", what, got, want)
}
for i := range want {
if got[i] != want[i] {
t.Fatalf("%s: % X\nwant % X", what, got, want)
}
}
}
+50
View File
@@ -0,0 +1,50 @@
package steppir
import "testing"
// An operator's log read as "the antenna stops responding": every tune was
// commanded, acknowledged with the requested frequency on the next poll, then
// replaced on the poll after by a different one — 21075 asked, 21075 confirmed,
// 21050 reported — with the operator tuning again each time. Nothing in the log
// named that, so it looked like a dead link.
func TestCheckDriftReportsOnceAndRecovers(t *testing.T) {
c := &Client{}
c.lastSetKHz = 21075
// Where it was asked to go: nothing to say.
c.checkDrift(&Status{Frequency: 21075})
if c.lastDriftKHz != 0 {
t.Errorf("a controller on frequency was reported as drifting (%d)", c.lastDriftKHz)
}
// Its own grid is not a fault.
c.checkDrift(&Status{Frequency: 21070})
if c.lastDriftKHz != 0 {
t.Errorf("%d kHz is within tolerance and was reported", 21070)
}
// Somewhere else entirely: recorded, so it is said once.
c.checkDrift(&Status{Frequency: 21050})
if c.lastDriftKHz != 21050 {
t.Errorf("lastDriftKHz = %d, want 21050", c.lastDriftKHz)
}
// Still there on the next poll: nothing new to say, and the marker stands.
c.checkDrift(&Status{Frequency: 21050})
if c.lastDriftKHz != 21050 {
t.Errorf("lastDriftKHz = %d after a repeat, want it unchanged", c.lastDriftKHz)
}
// Back where it belongs: the marker clears, so the next divergence is said.
c.checkDrift(&Status{Frequency: 21075})
if c.lastDriftKHz != 0 {
t.Errorf("lastDriftKHz = %d after recovery, want 0", c.lastDriftKHz)
}
}
// A frequency read while the elements are travelling is not a disagreement, it
// is an antenna on its way — reporting it would cry wolf on every single tune.
func TestCheckDriftIgnoresMovingMotors(t *testing.T) {
c := &Client{}
c.lastSetKHz = 21075
c.checkDrift(&Status{Frequency: 21000, MotorsMoving: 1})
if c.lastDriftKHz != 0 {
t.Errorf("a moving antenna was reported as drifting (%d)", c.lastDriftKHz)
}
}
+113
View File
@@ -0,0 +1,113 @@
package steppir
import (
"errors"
"io"
"testing"
"time"
)
// silentPort is a serial port that has stopped answering: every read times out.
// On Windows that is reported as (0, nil) — a timeout is not an error on this
// transport — which is precisely what io.ReadFull cannot survive.
type silentPort struct{ reads int }
func (p *silentPort) Read(b []byte) (int, error) {
p.reads++
time.Sleep(5 * time.Millisecond) // stand in for the port's read timeout
return 0, nil
}
func (p *silentPort) Write(b []byte) (int, error) { return len(b), nil }
func (p *silentPort) Close() error { return nil }
// A controller that goes quiet must make the read FAIL, not hang. Hanging held
// the io mutex, so the poll loop never reported a fault and every operator
// command blocked behind it: the antenna stopped responding and the log had
// nothing in it.
func TestReadFrameGivesUpOnASilentController(t *testing.T) {
done := make(chan error, 1)
go func() {
done <- readFrame(&silentPort{}, make([]byte, 11), 100*time.Millisecond)
}()
select {
case err := <-done:
if err == nil {
t.Fatal("a silent controller was reported as a good frame")
}
case <-time.After(3 * time.Second):
t.Fatal("readFrame never returned — the driver is wedged exactly as it was in the field")
}
}
// dribblePort delivers the frame a few bytes at a time, with empty reads in
// between — a slow 4800-baud link, which must still assemble one frame.
type dribblePort struct {
data []byte
step int
idle int // empty reads before each chunk
n int
}
func (p *dribblePort) Read(b []byte) (int, error) {
if p.n < p.idle {
p.n++
return 0, nil
}
p.n = 0
if len(p.data) == 0 {
return 0, nil
}
k := p.step
if k > len(p.data) {
k = len(p.data)
}
if k > len(b) {
k = len(b)
}
copy(b, p.data[:k])
p.data = p.data[k:]
return k, nil
}
func (p *dribblePort) Write(b []byte) (int, error) { return len(b), nil }
func (p *dribblePort) Close() error { return nil }
func TestReadFrameAssemblesASlowFrame(t *testing.T) {
want := []byte{'@', 'A', 0x00, 0x20, 0x1E, 0xA8, 0x00, 0x05, 0x30, 0x37, 0x0D}
p := &dribblePort{data: append([]byte(nil), want...), step: 3, idle: 2}
buf := make([]byte, 11)
if err := readFrame(p, buf, time.Second); err != nil {
t.Fatalf("readFrame: %v", err)
}
for i := range want {
if buf[i] != want[i] {
t.Fatalf("read % X, want % X", buf, want)
}
}
}
// A truncated frame is a failure, not a frame. The controller sending 5 bytes
// and stopping used to spin forever on the missing 6.
func TestReadFrameRejectsATruncatedFrame(t *testing.T) {
p := &dribblePort{data: []byte{'@', 'A', 0x00, 0x20, 0x1E}, step: 5}
err := readFrame(p, make([]byte, 11), 100*time.Millisecond)
if err == nil {
t.Fatal("a 5-byte frame was accepted as 11")
}
}
// A real error still comes straight back.
func TestReadFrameReturnsPortErrors(t *testing.T) {
want := errors.New("port closed")
p := errPort{err: want}
if err := readFrame(p, make([]byte, 11), time.Second); !errors.Is(err, want) {
t.Fatalf("err = %v, want %v", err, want)
}
}
type errPort struct{ err error }
func (p errPort) Read([]byte) (int, error) { return 0, p.err }
func (p errPort) Write(b []byte) (int, error) { return len(b), nil }
func (p errPort) Close() error { return nil }
var _ io.ReadWriteCloser = errPort{}
+145 -2
View File
@@ -88,6 +88,10 @@ type Client struct {
connMu sync.Mutex
conn io.ReadWriteCloser
// openFails counts consecutive failures to reopen the port, so the retry
// reports the first one and the recovery, and stays quiet in between.
// Guarded by connMu.
openFails int
// ioMu serialises EVERY exchange on the shared connection — a status query
// (write "?A" then read 11 bytes) and a command write must never interleave,
@@ -98,6 +102,10 @@ type Client struct {
statusMu sync.RWMutex
lastStatus *Status
lastSetKHz int
// lastDriftKHz is the frequency last reported for a controller that had gone
// somewhere other than where it was told, so the disagreement is stated once
// and not on every poll. Zero when it is where it should be.
lastDriftKHz int
// lastRaw holds the previous raw status frame so we only log a status line
// when the controller's reply actually changes — enough to diagnose a stuck
@@ -187,6 +195,35 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
}
}
// openFailQuiet is how many consecutive failed reopens are reported before the
// loop goes quiet about them. A port that has gone (adapter unplugged, another
// program holding it) stays gone, and one line every two seconds would be the
// entire log.
const openFailQuiet = 3
// noteOpenFailure logs a failure to reopen the port, throttled. Caller must NOT
// hold connMu — it is taken here.
func (c *Client) noteOpenFailure(err error) {
c.connMu.Lock()
c.openFails++
n := c.openFails
c.connMu.Unlock()
switch {
case n <= openFailQuiet:
log.Printf("steppir: cannot open %s: %v (attempt %d)", c.target(), err, n)
case n == openFailQuiet+1:
log.Printf("steppir: still cannot open %s — retrying every 2 s, further attempts will not be logged until it comes back", c.target())
}
}
// target names what the client is trying to reach, for the log.
func (c *Client) target() string {
if c.tr.Mode == "serial" {
return fmt.Sprintf("%s @ %d baud", c.tr.COM, c.tr.Baud)
}
return fmt.Sprintf("%s:%d", c.tr.Host, c.tr.Port)
}
func (c *Client) pollLoop() {
ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
@@ -201,8 +238,19 @@ func (c *Client) pollLoop() {
if err != nil {
c.connMu.Unlock()
c.setDisconnected()
// SAY SO. This retried every two seconds in complete silence,
// so an antenna that lost its port stopped answering and the
// log had nothing at all after the disconnection — which is
// exactly what an operator reports as "it worked for a while
// and then it didn't". Throttled, because a port that is gone
// stays gone and this would otherwise be the whole log.
c.noteOpenFailure(err)
continue
}
if c.openFails > 0 {
log.Printf("steppir: reconnected after %d failed attempt(s)", c.openFails)
c.openFails = 0
}
c.conn = conn
}
c.connMu.Unlock()
@@ -225,10 +273,61 @@ func (c *Client) pollLoop() {
c.applyPendingDir(st)
c.lastStatus = st
c.statusMu.Unlock()
c.checkDrift(st)
}
}
}
// driftToleranceKHz is how far the controller's reported frequency may sit from
// the one we commanded before it is worth saying so. A SteppIR quantises to its
// own grid, so a few kHz is normal and must not be reported as a fault.
const driftToleranceKHz = 10
// checkDrift reports a controller that settled somewhere other than where it was
// told to go.
//
// This exists because of a log that read as "the antenna stops responding": every
// tune was commanded, acknowledged on the next poll with the requested frequency,
// and then REPLACED on the poll after by a different one — 21075 asked, 21075
// confirmed, 21050 reported, over and over, with the operator tuning again each
// time. Nothing in the log named that, so it looked like a dead link rather than
// a controller with a mind of its own (its own radio interface tracking the rig,
// or a front-panel mode that overrides the host).
//
// Only when the motors have stopped: a frequency read mid-travel is not a
// disagreement, it is an antenna on its way. And only when the value changes, so
// a controller parked somewhere else does not fill the log.
func (c *Client) checkDrift(st *Status) {
if st.MotorsMoving != 0 {
return
}
c.statusMu.Lock()
want := c.lastSetKHz
last := c.lastDriftKHz
if want <= 0 || st.Frequency <= 0 {
c.statusMu.Unlock()
return
}
diff := st.Frequency - want
if diff < 0 {
diff = -diff
}
if diff <= driftToleranceKHz {
c.lastDriftKHz = 0 // back where it was asked to be
c.statusMu.Unlock()
return
}
if last == st.Frequency {
c.statusMu.Unlock()
return // already said, and it has not moved since
}
c.lastDriftKHz = st.Frequency
c.statusMu.Unlock()
log.Printf("steppir: commanded %d kHz but the controller settled on %d kHz — "+
"something else is driving it (its own radio interface, or a front-panel mode overriding the host)",
want, st.Frequency)
}
// applyPendingDir replaces a freshly polled direction with the one the operator
// last commanded, until the controller confirms it (or the hold expires). The
// caller holds statusMu.
@@ -320,6 +419,45 @@ func drain(conn io.ReadWriteCloser) int {
return total
}
// frameTimeout bounds the wait for one 11-byte status reply. At 4800 baud the
// frame itself takes ~23 ms; three seconds is a controller that is not going to
// answer this query.
const frameTimeout = 3 * time.Second
// readFrame reads exactly len(buf) bytes, or gives up.
//
// io.ReadFull CANNOT be used on a serial port, and using it here is what made an
// antenna "stop responding after a while" with nothing whatsoever in the log.
//
// On Windows a serial read that times out returns (0, nil) — a timeout is not an
// error on this transport. io.ReadFull loops while err == nil, so a controller
// that goes quiet, or sends a truncated frame, spins it forever. It holds ioMu
// the whole time, and that is the part the operator sees: the poll goroutine
// never returns to report a fault, so the last status stays on screen and the
// link still looks connected — while every command blocks on the same mutex.
// The trace line used to sit AFTER that lock, so even the attempt went unlogged.
// One dropped reply on a 4800-baud link wedged the driver until OpsLog restarted.
//
// Giving up returns an error, which the poll loop already knows how to handle:
// it says so in the log and reconnects.
func readFrame(conn io.ReadWriteCloser, buf []byte, d time.Duration) error {
deadline := time.Now().Add(d)
for n := 0; n < len(buf); {
m, err := conn.Read(buf[n:])
if err != nil {
return err
}
n += m
if n >= len(buf) {
return nil
}
if time.Now().After(deadline) {
return fmt.Errorf("timed out after %s with %d of %d bytes", d, n, len(buf))
}
}
return nil
}
func (c *Client) queryStatus() (*Status, error) {
c.connMu.Lock()
conn := c.conn
@@ -339,7 +477,7 @@ func (c *Client) queryStatus() (*Status, error) {
return nil, fmt.Errorf("write status cmd: %w", err)
}
buf := make([]byte, 11)
if _, err := io.ReadFull(conn, buf); err != nil {
if err := readFrame(conn, buf, frameTimeout); err != nil {
return nil, fmt.Errorf("read status: %w", err)
}
// Reject anything that isn't a framed reply rather than decoding garbage into
@@ -424,9 +562,14 @@ func (c *Client) writeCmd(pkt []byte) error {
if conn == nil {
return fmt.Errorf("steppir: not connected")
}
// Traced BEFORE taking the lock, not after. A command waits here for the poll
// in flight, and when that wait was unbounded the log showed no sign the
// operator had asked for anything at all — the one fact that would have named
// the fault. The line now means "asked for"; a failure to write is reported
// by the caller.
log.Printf("steppir: → % X", pkt)
c.ioMu.Lock()
defer c.ioMu.Unlock()
log.Printf("steppir: → % X", pkt)
setDeadline(conn, 3*time.Second)
if _, err := conn.Write(pkt); err != nil {
c.closeConn()
+308
View File
@@ -0,0 +1,308 @@
// Package syncfolder keeps one operator's logbook in step across several PCs
// through a folder they already have — Seafile, OneDrive, Dropbox, a NAS share,
// a USB stick.
//
// WHY NOT THE DATABASE FILE ITSELF. Because it corrupts. SQLite relies on
// advisory file locks that SMB and NFS implement partially or cache, so two
// machines can both believe they hold the lock; and in WAL mode — which OpsLog
// uses — the shared-memory index (-shm) has no meaning across machines at all.
// A cloud folder is worse again: it replicates the file whole while it is open,
// and .db / .db-wal / .db-shm drift apart, giving a database that opens
// perfectly and is silently missing the last few hours.
//
// THE RULE THAT MAKES A SHARED FOLDER SAFE: one writer per file, append only.
// Each machine writes ONLY its own <machine>.ndjson and never touches another's.
// A sync tool that replicates whole files can therefore never merge two writers
// into one file, because there are never two writers. This is the exact opposite
// of putting the database there, and it is why it works.
//
// WHAT THIS IS NOT. Not live. Two operators logging the same contest second by
// second want the shared MySQL logbook, which OpsLog already does; that is a
// different need and it stays. This is for ONE operator with a shack PC, a
// laptop and a portable rig — the case where a server running day and night to
// serve forty QSOs a month is the wrong shape.
//
// It is the other half of internal/offlineq, whose own doc says it is
// "deliberately NOT a sync engine: no mirror, no pull, no merge, no tombstones".
// Those four are precisely what is here.
package syncfolder
import (
"crypto/rand"
"encoding/hex"
"encoding/json"
"fmt"
"os"
"path/filepath"
"strings"
"time"
)
// DirName is the sub-folder created inside whatever the operator picked. A
// dedicated folder, so pointing OpsLog at a documents directory by mistake does
// not scatter files through it.
const DirName = "opslog-sync"
// FormatVersion is stamped on every record. A future OpsLog that changes the
// shape can then recognise — and skip — what it does not understand, instead of
// misreading it. Records from the future are skipped, never guessed at.
const FormatVersion = 1
// Op is what happened to a contact.
type Op string
const (
OpAdd Op = "add"
OpUpdate Op = "update"
// OpDelete is a TOMBSTONE, and it is the reason this is a change log rather
// than a pile of ADIF. Without one, a QSO deleted on the laptop comes
// straight back on the next sync from the shack PC, for ever.
OpDelete Op = "delete"
)
// Record is one line of a machine's file. NDJSON: one object per line, appended,
// never rewritten — so a half-written line at the tail costs one record, not the
// file, and a reader can resume from a byte offset.
type Record struct {
V int `json:"v"`
Op Op `json:"op"`
UID string `json:"uid"` // the contact's stable identity
At time.Time `json:"at"` // when this CHANGE was made, UTC
Seq uint64 `json:"seq"` // this machine's own counter, monotonic
By string `json:"by"` // machine id that wrote it
Data json.RawMessage `json:"data,omitempty"`
}
// NewUID mints a contact's identity.
//
// A stable id per contact is what lets an edit or a deletion be addressed at
// all: "the QSO with M0ABC at 14:32" is a guess, and two machines can disagree
// about which row that is. OpsLog already mints one for the offline outbox
// (APP_OPSLOG_QUEUEID); this is the same idea, kept for the life of the record.
func NewUID() string {
var b [16]byte
if _, err := rand.Read(b[:]); err != nil {
return fmt.Sprintf("t%d", time.Now().UnixNano())
}
return hex.EncodeToString(b[:])
}
// NewMachineID mints this installation's id, once. The name is the operator's
// (they may call it "shack" or "portable"); the suffix keeps two machines named
// the same from writing to one file.
func NewMachineID(name string) string {
var b [4]byte
_, _ = rand.Read(b[:])
n := sanitiseName(name)
if n == "" {
n = "opslog"
}
return n + "-" + hex.EncodeToString(b[:])
}
// sanitiseName keeps a machine id usable as a FILENAME on every platform the
// folder may be synced across — a Windows name written to a Linux NAS and back.
func sanitiseName(s string) string {
s = strings.ToLower(strings.TrimSpace(s))
var b strings.Builder
for _, r := range s {
switch {
case r >= 'a' && r <= 'z', r >= '0' && r <= '9':
b.WriteRune(r)
case r == '-' || r == '_' || r == ' ':
b.WriteByte('-')
}
}
out := strings.Trim(b.String(), "-")
for strings.Contains(out, "--") {
out = strings.ReplaceAll(out, "--", "-")
}
if len(out) > 24 {
out = strings.Trim(out[:24], "-")
}
return out
}
// Wins decides between two changes to the same contact.
//
// Last writer wins, but ordered on (At, Seq, By) rather than on time alone.
// Two PCs' clocks are never exactly equal and one may be minutes out, so a bare
// timestamp comparison is not even deterministic: two machines merging the same
// pair in different orders could reach different answers and then disagree for
// ever. Adding the writer's own counter and finally its id makes the order
// total — every machine reaches the same conclusion from the same records,
// whatever sequence they arrive in.
//
// Clock skew still decides WHICH edit wins, and nothing here can fix that. What
// it guarantees is that all machines agree on the winner.
func Wins(a, b Record) bool {
if !a.At.Equal(b.At) {
return a.At.After(b.At)
}
if a.Seq != b.Seq {
return a.Seq > b.Seq
}
return a.By > b.By
}
// Store is one machine's view of the shared folder.
type Store struct {
root string // the folder the operator picked
machineID string
}
// New returns a store. root is the operator's chosen folder; the package
// creates and uses its own sub-folder inside it.
func New(root, machineID string) *Store {
return &Store{root: strings.TrimSpace(root), machineID: machineID}
}
// Dir is where the files live.
func (s *Store) Dir() string { return filepath.Join(s.root, DirName) }
// MyFile is the only file this machine ever writes.
func (s *Store) MyFile() string { return filepath.Join(s.Dir(), s.machineID+".ndjson") }
// Append adds one record to this machine's file.
//
// Opened, written and closed per call, with O_APPEND: a sync client that
// uploads the file between two contacts sees a complete file every time, and a
// process killed mid-write loses at most the line it was writing.
func (s *Store) Append(rec Record) error {
if s.root == "" {
return fmt.Errorf("syncfolder: no folder configured")
}
if err := os.MkdirAll(s.Dir(), 0o755); err != nil {
return fmt.Errorf("syncfolder: create %s: %w", s.Dir(), err)
}
rec.V = FormatVersion
rec.By = s.machineID
if rec.At.IsZero() {
rec.At = time.Now().UTC()
}
rec.At = rec.At.UTC()
line, err := json.Marshal(rec)
if err != nil {
return fmt.Errorf("syncfolder: encode: %w", err)
}
f, err := os.OpenFile(s.MyFile(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
if err != nil {
return fmt.Errorf("syncfolder: open %s: %w", s.MyFile(), err)
}
defer f.Close()
if _, err := f.Write(append(line, '\n')); err != nil {
return fmt.Errorf("syncfolder: write: %w", err)
}
return nil
}
// Peer is another machine's file and how far this one has read it.
type Peer struct {
MachineID string
Path string
Size int64
}
// Peers lists the other machines' files, skipping this machine's own.
func (s *Store) Peers() ([]Peer, error) {
if s.root == "" {
return nil, fmt.Errorf("syncfolder: no folder configured")
}
entries, err := os.ReadDir(s.Dir())
if err != nil {
if os.IsNotExist(err) {
return nil, nil // nobody has written anything yet
}
return nil, err
}
var out []Peer
for _, e := range entries {
if e.IsDir() || !strings.HasSuffix(e.Name(), ".ndjson") {
continue
}
id := strings.TrimSuffix(e.Name(), ".ndjson")
if id == s.machineID {
continue // never read our own back — that is how a loop starts
}
info, err := e.Info()
if err != nil {
continue
}
out = append(out, Peer{MachineID: id, Path: filepath.Join(s.Dir(), e.Name()), Size: info.Size()})
}
return out, nil
}
// ReadFrom returns the records in a peer's file after byte offset `from`, and
// the offset to resume at next time.
//
// Resuming by byte offset is what keeps a sync cheap: a file with 40 000
// contacts is read once, and thereafter only its tail. The returned offset
// advances ONLY past complete lines — a file caught mid-upload ends in a
// partial line, and stopping short of it means the next pass reads that record
// whole instead of discarding it.
func ReadFrom(path string, from int64) ([]Record, int64, error) {
data, err := os.ReadFile(path)
if err != nil {
return nil, from, err
}
// A file that SHRANK was replaced, not appended to — a sync conflict copy,
// a restore, a machine id reused. Start again rather than read from an
// offset that now points into the middle of a different record.
if int64(len(data)) < from {
from = 0
}
tail := data[from:]
var recs []Record
consumed := int64(0)
for {
i := indexByte(tail, '\n')
if i < 0 {
break // an incomplete final line: leave it for next time
}
line := tail[:i]
tail = tail[i+1:]
consumed += int64(i) + 1
if len(strings.TrimSpace(string(line))) == 0 {
continue
}
var rec Record
if err := json.Unmarshal(line, &rec); err != nil {
continue // one unreadable line must not stop the file
}
if rec.V > FormatVersion {
continue // written by a newer OpsLog: skip, never guess
}
if rec.UID == "" || rec.Op == "" {
continue
}
recs = append(recs, rec)
}
return recs, from + consumed, nil
}
func indexByte(b []byte, c byte) int {
for i := range b {
if b[i] == c {
return i
}
}
return -1
}
// Merge reduces a batch of records to ONE decision per contact — the winner.
//
// Applying every record in turn would work but would write the same row several
// times over, and on a first sync of a large log that is thousands of pointless
// updates. It also makes the result independent of the order the peers'
// files happened to be read in.
func Merge(recs []Record) map[string]Record {
out := make(map[string]Record, len(recs))
for _, r := range recs {
cur, seen := out[r.UID]
if !seen || Wins(r, cur) {
out[r.UID] = r
}
}
return out
}
+172
View File
@@ -0,0 +1,172 @@
package syncfolder
import (
"encoding/json"
"os"
"path/filepath"
"strings"
"testing"
"time"
)
func rec(uid string, op Op, at string, seq uint64, by string) Record {
t, _ := time.Parse(time.RFC3339, at)
return Record{V: FormatVersion, Op: op, UID: uid, At: t, Seq: seq, By: by}
}
// A machine must never read its own file back. That is how a change loops
// round the folder for ever, each pass re-applying what this machine wrote.
func TestPeersExcludesOurselves(t *testing.T) {
root := t.TempDir()
s := New(root, "shack-aabbccdd")
if err := s.Append(rec("u1", OpAdd, "2026-08-16T10:00:00Z", 1, "")); err != nil {
t.Fatalf("append: %v", err)
}
must(t, os.WriteFile(filepath.Join(s.Dir(), "laptop-11223344.ndjson"), []byte("{}\n"), 0o644))
peers, err := s.Peers()
if err != nil {
t.Fatalf("peers: %v", err)
}
if len(peers) != 1 || peers[0].MachineID != "laptop-11223344" {
t.Fatalf("peers = %+v — our own file must not be among them", peers)
}
}
// Reading resumes from a byte offset, and only ever advances past COMPLETE
// lines. A folder sync catches a file mid-upload sooner or later, and the
// partial last line must be read whole on the next pass, not thrown away.
func TestReadFromStopsAtAnIncompleteLine(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "peer.ndjson")
full, _ := json.Marshal(rec("u1", OpAdd, "2026-08-16T10:00:00Z", 1, "peer"))
partial, _ := json.Marshal(rec("u2", OpAdd, "2026-08-16T10:01:00Z", 2, "peer"))
must(t, os.WriteFile(path, append(append(full, '\n'), partial[:len(partial)/2]...), 0o644))
recs, off, err := ReadFrom(path, 0)
if err != nil {
t.Fatalf("ReadFrom: %v", err)
}
if len(recs) != 1 || recs[0].UID != "u1" {
t.Fatalf("got %d record(s) %+v, want just u1", len(recs), recs)
}
if off != int64(len(full))+1 {
t.Fatalf("offset %d, want %d — it must stop before the partial line", off, len(full)+1)
}
// The upload completes; the second record is now read whole.
must(t, os.WriteFile(path, append(append(append(full, '\n'), partial...), '\n'), 0o644))
recs, off2, err := ReadFrom(path, off)
if err != nil {
t.Fatalf("ReadFrom 2: %v", err)
}
if len(recs) != 1 || recs[0].UID != "u2" {
t.Fatalf("resumed with %+v, want just u2", recs)
}
if off2 <= off {
t.Errorf("offset did not advance: %d → %d", off, off2)
}
}
// A file that shrank was replaced, not appended to — a sync conflict copy, a
// restore. Resuming at the old offset would read from the middle of a record.
func TestReadFromRestartsIfTheFileShrank(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "peer.ndjson")
line, _ := json.Marshal(rec("u1", OpAdd, "2026-08-16T10:00:00Z", 1, "peer"))
must(t, os.WriteFile(path, append(line, '\n'), 0o644))
recs, _, err := ReadFrom(path, 999999)
if err != nil {
t.Fatalf("ReadFrom: %v", err)
}
if len(recs) != 1 {
t.Errorf("got %d record(s) — a shrunken file must be re-read from the start", len(recs))
}
}
// One unreadable line must not cost the rest of the file, and a record from a
// FUTURE format must be skipped rather than guessed at.
func TestReadFromSurvivesRubbish(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "peer.ndjson")
good, _ := json.Marshal(rec("u1", OpAdd, "2026-08-16T10:00:00Z", 1, "peer"))
future, _ := json.Marshal(Record{V: FormatVersion + 1, Op: OpAdd, UID: "u9", At: time.Now().UTC()})
body := append([]byte("this is not json\n"), append(good, '\n')...)
body = append(body, append(future, '\n')...)
body = append(body, []byte("\n")...) // a blank line
must(t, os.WriteFile(path, body, 0o644))
recs, _, err := ReadFrom(path, 0)
if err != nil {
t.Fatalf("ReadFrom: %v", err)
}
if len(recs) != 1 || recs[0].UID != "u1" {
t.Fatalf("got %+v, want only the one readable current-format record", recs)
}
}
// Every machine must reach the SAME winner from the same records, whatever
// order they arrive in. Ordering on time alone is not even deterministic: two
// PCs' clocks are never equal, and a tie would be resolved differently on each
// machine, which is how two logs disagree for ever.
func TestMergeIsOrderIndependent(t *testing.T) {
a := rec("u1", OpUpdate, "2026-08-16T10:00:00Z", 5, "shack")
b := rec("u1", OpDelete, "2026-08-16T10:00:00Z", 5, "laptop") // same time AND seq
c := rec("u1", OpUpdate, "2026-08-16T09:00:00Z", 9, "shack") // older, higher seq
forward := Merge([]Record{a, b, c})
reverse := Merge([]Record{c, b, a})
if forward["u1"].By != reverse["u1"].By || forward["u1"].Op != reverse["u1"].Op {
t.Fatalf("order changed the winner: %+v vs %+v", forward["u1"], reverse["u1"])
}
// Time beats sequence: c is an hour older whatever its counter says.
if forward["u1"].At.Equal(c.At) {
t.Error("an older change won on its counter — time is the first key")
}
}
// A delete is a record like any other, and it must be able to WIN. Without
// tombstones a QSO removed on one machine returns on the next sync from
// another, for ever.
func TestATombstoneCanWin(t *testing.T) {
add := rec("u1", OpAdd, "2026-08-16T10:00:00Z", 1, "shack")
del := rec("u1", OpDelete, "2026-08-16T11:00:00Z", 1, "laptop")
if got := Merge([]Record{add, del})["u1"]; got.Op != OpDelete {
t.Errorf("winner is %q — a later deletion must beat an earlier add", got.Op)
}
// …and an add made AFTER a deletion wins, so re-logging a contact works.
readd := rec("u1", OpAdd, "2026-08-16T12:00:00Z", 2, "laptop")
if got := Merge([]Record{add, del, readd})["u1"]; got.Op != OpAdd {
t.Errorf("winner is %q — a contact logged again after a deletion must come back", got.Op)
}
}
// The machine id becomes a FILENAME, on a folder that may be synced between
// Windows, Linux and macOS. Anything that cannot be a filename everywhere has
// to go.
func TestMachineIDIsAUsableFilename(t *testing.T) {
for _, name := range []string{"Shack PC", "portable/rig", "Café ☕", "", " ", "a::b*c?", strings.Repeat("x", 60)} {
id := NewMachineID(name)
for _, bad := range []string{"/", "\\", ":", "*", "?", "\"", "<", ">", "|", " "} {
if strings.Contains(id, bad) {
t.Errorf("NewMachineID(%q) = %q contains %q", name, id, bad)
}
}
if id == "" || strings.HasPrefix(id, "-") || strings.HasSuffix(id, "-") {
t.Errorf("NewMachineID(%q) = %q", name, id)
}
}
// Two machines the operator called the same must not share a file.
if NewMachineID("shack") == NewMachineID("shack") {
t.Error("two installations named alike produced the same id — they would write to one file")
}
}
func must(t *testing.T, err error) {
t.Helper()
if err != nil {
t.Fatal(err)
}
}
+620
View File
@@ -0,0 +1,620 @@
// Package tciserver shares OpsLog's CAT link with programs that speak TCI.
//
// It is the second half of internal/rigctld, and exists for the same reason:
// Windows gives a COM port to ONE process, so the moment OpsLog talks to the
// radio directly nothing else can. rigctld answers the programs that speak
// Hamlib NET rigctl (WSJT-X, JTDX, MSHV, Log4OM); this answers the ones built
// around Expert Electronics' TCI instead — and it answers them whatever radio
// is actually connected, because it sits on the same backend-agnostic
// interface. An operator with an Icom or a Yaesu can hand a TCI-only program a
// working rig.
//
// ── The protocol ──────────────────────────────────────────────────────────
// Text commands over a WebSocket, "name:arg,arg;", the same syntax in both
// directions. On connection the server sends a block of initialisation
// commands describing the device, ending with ready; and start;. Thereafter
// either side may send a control command, and the server echoes every change
// to all connected clients so they stay in step with each other.
//
// vfo:0,0,14074000; receiver 0, channel A (RX), Hz
// vfo:0,1,14080000; channel B — the TX frequency when split is on
// modulation:0,usb; mode
// trx:0,true; PTT
// split_enable:0,true; split
// vfo:0,0; a READ: the reply is the three-argument form
//
// Written against the official TCI Protocol document (ExpertSDR3/TCI, 12
// January 2024, MIT) — the initialisation set and the argument order of every
// command below are from §4.1 and §4.2, not from guesswork about what a client
// might accept.
package tciserver
import (
"fmt"
"net"
"net/http"
"strconv"
"strings"
"sync"
"time"
"github.com/gorilla/websocket"
)
// Rig is what the server needs from OpsLog's CAT manager. An interface, so this
// package stays testable without a radio and without importing internal/cat —
// which also keeps it building on every platform.
type Rig interface {
Freq() int64 // TX frequency in Hz (ADIF sense), 0 if unknown
RxFreq() int64 // RX frequency in Hz; equals Freq when not split
Mode() string // ADIF mode (SSB, CW, FT8…)
Split() (bool, int64) // split on?, and the TX frequency
SetFreq(hz int64) error
SetMode(mode string) error
SetPTT(on bool) error
SetSplit(on bool, txHz int64) error
}
// DefaultPort is TCI's own default, which is what a client offers first.
const DefaultPort = 40001
// pollInterval is how often the rig is compared with what the clients were last
// told. TCI is an event protocol — a client is entitled to sit silent and be
// told when something moves — so this is the rate at which a knob turned on the
// radio reaches it.
const pollInterval = 250 * time.Millisecond
type Server struct {
port int
rig Rig
log func(string, ...any)
mu sync.Mutex
ln net.Listener
http *http.Server
conns map[*client]struct{}
closed bool
// pendingTxHz is a transmit frequency a client set on channel B while the rig
// was still simplex.
//
// It must be REMEMBERED, not discarded. A client working split sends two
// commands and is free to send them in either order; when the frequency comes
// first, throwing it away means the split is then armed on whatever the
// transmit VFO happened to hold — the receive frequency — and the operator
// transmits straight onto the DX while their software shows exactly what they
// asked for. rigctld learned this the same way, and pairs set_split_vfo with
// set_split_freq for the same reason.
pendingTxHz int64
// ptt mirrors the last PTT state a client commanded, so a repeat can be
// recognised. A client is free to restate PTT as often as it likes, and one
// does: through the rigctl server Nexus sent set_ptt 0 about sixteen times a
// second, and the Flex's own "xmit 1" landed between two of them and was
// overwritten inside a millisecond — a transmit request that simply did
// nothing. The same radio sits behind this server.
ptt bool
pttKnown bool
// last is what the clients have been told, so only changes are sent. TCI
// clients redraw on every command they receive; re-sending an unchanged
// frequency four times a second makes a VFO readout flicker and, in some
// clients, fights the operator's own tuning.
last state
}
// state is the part of the rig the clients are kept in step with.
type state struct {
rxHz int64
txHz int64
mode string
split bool
valid bool
}
// clientLogCap bounds how many of one client's commands reach the log.
const clientLogCap = 200
// client is one connected program.
type client struct {
conn *websocket.Conn
mu sync.Mutex // one writer at a time: gorilla panics on concurrent writes
// logged counts what has been written to the log for this connection. Only
// the reader goroutine touches it, so it needs no lock of its own.
logged int
}
func (c *client) send(s string) error {
c.mu.Lock()
defer c.mu.Unlock()
if c.conn == nil {
return nil // a client with no socket: the tests exercise the protocol, not the transport
}
_ = c.conn.SetWriteDeadline(time.Now().Add(3 * time.Second))
return c.conn.WriteMessage(websocket.TextMessage, []byte(s))
}
func New(port int, rig Rig, logf func(string, ...any)) *Server {
if port <= 0 || port > 65535 {
port = DefaultPort
}
if logf == nil {
logf = func(string, ...any) {}
}
return &Server{port: port, rig: rig, log: logf, conns: map[*client]struct{}{}}
}
// Start binds the port and serves until Stop.
func (s *Server) Start() error {
ln, err := net.Listen("tcp", fmt.Sprintf(":%d", s.port))
if err != nil {
return fmt.Errorf("tci server: port %d: %w", s.port, err)
}
up := websocket.Upgrader{
// Any origin: the clients are desktop programs on the same machine or
// LAN, and they send whatever Origin their toolkit happens to set. This
// is the same trust boundary as the rigctl server on 4532 — a plain TCP
// port with no authentication, which is what every logger expects.
CheckOrigin: func(*http.Request) bool { return true },
}
mux := http.NewServeMux()
// Any path: clients connect to ws://host:port/ but some append a name.
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
conn, err := up.Upgrade(w, r, nil)
if err != nil {
s.log("tci server: upgrade from %s failed: %v", r.RemoteAddr, err)
return
}
s.serve(&client{conn: conn}, r.RemoteAddr)
})
srv := &http.Server{Handler: mux}
s.mu.Lock()
s.ln, s.http, s.closed = ln, srv, false
s.mu.Unlock()
go func() { _ = srv.Serve(ln) }()
go s.pushLoop()
s.log("tci server: listening on :%d", s.port)
return nil
}
// Stop closes the listener and every client.
func (s *Server) Stop() {
s.mu.Lock()
if s.closed {
s.mu.Unlock()
return
}
s.closed = true
ln, srv := s.ln, s.http
conns := make([]*client, 0, len(s.conns))
for c := range s.conns {
conns = append(conns, c)
}
s.conns = map[*client]struct{}{}
s.last = state{}
s.mu.Unlock()
for _, c := range conns {
_ = c.conn.Close()
}
if srv != nil {
_ = srv.Close()
}
if ln != nil {
_ = ln.Close()
}
s.log("tci server: stopped")
}
// Clients reports how many programs are connected — the one thing an operator
// wants to know when a client says it cannot find the rig.
func (s *Server) Clients() int {
s.mu.Lock()
defer s.mu.Unlock()
return len(s.conns)
}
// serve runs one connection: the initialisation block, then commands until it
// closes.
func (s *Server) serve(c *client, remote string) {
s.mu.Lock()
if s.closed {
s.mu.Unlock()
_ = c.conn.Close()
return
}
s.conns[c] = struct{}{}
s.mu.Unlock()
s.log("tci server: %s connected", remote)
for _, line := range s.initBlock() {
if err := c.send(line); err != nil {
break
}
}
for {
_, data, err := c.conn.ReadMessage()
if err != nil {
break
}
// One frame may carry several ";"-terminated commands.
for _, cmd := range strings.Split(string(data), ";") {
if cmd = strings.TrimSpace(cmd); cmd == "" {
continue
}
// Every command the client sends, in the log.
//
// This is the only evidence there will ever be about a program on
// someone else's machine: "MSHV's PTT test does nothing" is
// unanswerable without knowing whether MSHV sent trx at all, and if
// so in what form. Cheap, because TCI is event-driven — a client
// speaks when the operator does something, not on a timer.
//
// Capped so a client that DOES poll cannot quietly fill the
// operator's log; the cap says so once and then stays quiet.
if c.logged < clientLogCap {
c.logged++
s.log("tci server: ← %s;", cmd)
} else if c.logged == clientLogCap {
c.logged++
s.log("tci server: (further commands from this client are not logged)")
}
s.handle(c, cmd)
}
}
s.mu.Lock()
delete(s.conns, c)
s.mu.Unlock()
_ = c.conn.Close()
s.log("tci server: %s disconnected", remote)
}
// initBlock is the initialisation set from §4.1 of the protocol document, in
// the documented order, followed by the current state so a client that has just
// connected shows the right frequency instead of waiting for the first change.
//
// A client will not proceed without these: they are how it learns the device
// exists, what it can do, and that the server has finished setting up.
func (s *Server) initBlock() []string {
rx, tx, mode, split := s.read()
return []string{
"protocol:ExpertSDR3,1.9;",
"device:OpsLog;",
"receive_only:false;",
"trx_count:1;",
"channel_count:2;",
// The whole HF/VHF/UHF span OpsLog itself works over. A client uses this
// to bound its own tuning; too narrow a range and it refuses to follow the
// rig onto 2 m.
"vfo_limits:10000,470000000;",
"if_limits:-48000,48000;",
"modulations_list:am,sam,dsb,lsb,usb,cw,nfm,digl,digu;",
"ready;",
"start;",
fmt.Sprintf("vfo:0,0,%d;", rx),
fmt.Sprintf("vfo:0,1,%d;", tx),
fmt.Sprintf("modulation:0,%s;", mode),
fmt.Sprintf("split_enable:0,%t;", split),
"trx:0,false;",
// TRANSMIT PERMISSION, and it is not optional in practice.
//
// The document files TX_ENABLE under unidirectional control rather than
// initialisation, but its own note says it is "sent to the client when
// connected". A client that models permission — and one written for
// ExpertSDR users has every reason to — starts out assuming it may NOT
// transmit, and without this it never even tries: PTT does nothing and
// the server never sees a trx command to refuse.
//
// Always true. OpsLog is not the thing that decides: the radio behind
// whichever backend is connected does, and its refusal comes back through
// SetPTT and into the log.
"tx_enable:0,true;",
fmt.Sprintf("tx_frequency:%d;", tx),
}
}
// read takes one consistent snapshot of the rig in TCI's terms: channel A is
// where we LISTEN and channel B where we transmit, which is the opposite way
// round from ADIF's RigState and the one mistake here that would make a client
// transmit on the DX's frequency.
func (s *Server) read() (rxHz, txHz int64, mode string, split bool) {
split, txHz = s.rig.Split()
rxHz = s.rig.RxFreq()
if !split {
txHz = s.rig.Freq()
if rxHz == 0 {
rxHz = txHz
}
}
if rxHz == 0 {
rxHz = s.rig.Freq()
}
if txHz == 0 {
txHz = rxHz
}
mode = adifToTCIMode(s.rig.Mode(), rxHz)
return rxHz, txHz, mode, split
}
// pushLoop tells the clients what has changed on the radio.
func (s *Server) pushLoop() {
t := time.NewTicker(pollInterval)
defer t.Stop()
for range t.C {
s.mu.Lock()
done := s.closed
s.mu.Unlock()
if done {
return
}
s.publish()
}
}
// publish sends only what moved. Returns the lines sent, for the tests.
func (s *Server) publish() []string {
rx, tx, mode, split := s.read()
cur := state{rxHz: rx, txHz: tx, mode: mode, split: split, valid: true}
s.mu.Lock()
prev := s.last
s.last = cur
s.mu.Unlock()
var lines []string
if !prev.valid || prev.rxHz != cur.rxHz {
lines = append(lines, fmt.Sprintf("vfo:0,0,%d;", cur.rxHz))
}
if !prev.valid || prev.txHz != cur.txHz {
lines = append(lines, fmt.Sprintf("vfo:0,1,%d;", cur.txHz))
// The transmit frequency has its own command, which is what a client
// showing "TX 14.080" reads. Channel B alone leaves that stale.
lines = append(lines, fmt.Sprintf("tx_frequency:%d;", cur.txHz))
}
if (!prev.valid || prev.mode != cur.mode) && cur.mode != "" {
lines = append(lines, fmt.Sprintf("modulation:0,%s;", cur.mode))
}
if !prev.valid || prev.split != cur.split {
lines = append(lines, fmt.Sprintf("split_enable:0,%t;", cur.split))
}
for _, l := range lines {
s.broadcast(l)
}
return lines
}
func (s *Server) broadcast(line string) {
s.mu.Lock()
conns := make([]*client, 0, len(s.conns))
for c := range s.conns {
conns = append(conns, c)
}
s.mu.Unlock()
for _, c := range conns {
_ = c.send(line)
}
}
// handle answers one command from a client. Returns what was sent back, which
// is "" for a command that only acts on the radio.
//
// A command that SETS something is echoed to every client, not just answered to
// the one that sent it: the protocol document is explicit that the server
// synchronises all connected clients, and two loggers that disagree about the
// frequency are worse than one that is merely slow.
func (s *Server) handle(c *client, cmd string) string {
name, args := cmd, ""
if i := strings.IndexByte(cmd, ':'); i >= 0 {
name, args = cmd[:i], cmd[i+1:]
}
f := strings.Split(args, ",")
arg := func(i int) string {
if i < len(f) {
return strings.TrimSpace(f[i])
}
return ""
}
num := func(i int) int64 {
v, _ := strconv.ParseInt(arg(i), 10, 64)
return v
}
reply := func(line string) string {
_ = c.send(line)
return line
}
rx, tx, mode, split := s.read()
switch strings.ToLower(strings.TrimSpace(name)) {
case "vfo":
// Read form: two arguments. Set form: three.
if len(f) < 3 || arg(2) == "" {
if arg(1) == "1" {
return reply(fmt.Sprintf("vfo:0,1,%d;", tx))
}
return reply(fmt.Sprintf("vfo:0,0,%d;", rx))
}
hz := num(2)
if hz <= 0 {
return ""
}
if arg(1) == "1" {
// Channel B is the transmit frequency. Setting it while simplex must
// not move the rig's only VFO — the client asked to prepare a split
// transmit frequency, not to QSY — but it must not be thrown away
// either: it is where the split will be armed a moment from now.
s.mu.Lock()
s.pendingTxHz = hz
s.mu.Unlock()
if !split {
s.broadcast(fmt.Sprintf("vfo:0,1,%d;", hz))
return ""
}
if err := s.rig.SetSplit(true, hz); err != nil {
s.log("tci server: split TX %d Hz refused: %v", hz, err)
return ""
}
} else if err := s.rig.SetFreq(hz); err != nil {
s.log("tci server: tune to %d Hz refused: %v", hz, err)
return ""
}
s.broadcast(fmt.Sprintf("vfo:0,%s,%d;", orZero(arg(1)), hz))
return ""
case "modulation":
if len(f) < 2 || arg(1) == "" {
return reply(fmt.Sprintf("modulation:0,%s;", mode))
}
m := tciModeToADIF(arg(1))
if m == "" {
return ""
}
if err := s.rig.SetMode(m); err != nil {
s.log("tci server: mode %s refused: %v", m, err)
return ""
}
s.broadcast(fmt.Sprintf("modulation:0,%s;", strings.ToLower(arg(1))))
return ""
case "trx":
if len(f) < 2 || arg(1) == "" {
return reply("trx:0,false;")
}
on := strings.EqualFold(arg(1), "true")
// Only touch the radio on a CHANGE — restating a state is not a request
// to change it. The first command always goes through, since there is no
// knowing how the radio was left.
s.mu.Lock()
known, prev := s.pttKnown, s.ptt
s.ptt, s.pttKnown = on, true
s.mu.Unlock()
if known && prev == on {
s.broadcast(fmt.Sprintf("trx:0,%t;", on))
return ""
}
if err := s.rig.SetPTT(on); err != nil {
s.log("tci server: PTT %v refused: %v", on, err)
return ""
}
s.log("tci server: PTT %s", map[bool]string{true: "ON", false: "off"}[on])
s.broadcast(fmt.Sprintf("trx:0,%t;", on))
return ""
case "split_enable":
if len(f) < 2 || arg(1) == "" {
return reply(fmt.Sprintf("split_enable:0,%t;", split))
}
on := strings.EqualFold(arg(1), "true")
// Already in the state asked for? Then it is done, and nothing goes to
// the radio. This is the lesson the rigctl server paid for: JTDX in "Fake
// It" uses no split but still says so to be sure, and a backend that
// cannot set split answered an error to a request that was already true.
// JTDX read that as rig control failing and abandoned the transmission a
// second into the frame. A refusal is only honest when something actually
// needed doing.
if on == split {
s.broadcast(fmt.Sprintf("split_enable:0,%t;", on))
return ""
}
// Arm on the frequency the client gave for channel B, which it is free to
// have sent before this command rather than after.
s.mu.Lock()
pending := s.pendingTxHz
s.mu.Unlock()
txHz := tx
if on && pending > 0 {
txHz = pending
}
if err := s.rig.SetSplit(on, txHz); err != nil {
// The refusal is the useful part: a backend that cannot split says
// so, and the client can tell the operator instead of transmitting
// on the wrong frequency believing all is well.
s.log("tci server: split %v refused: %v", on, err)
return ""
}
s.log("tci server: split %s, TX %d Hz", map[bool]string{true: "ON", false: "off"}[on], txHz)
s.broadcast(fmt.Sprintf("split_enable:0,%t;", on))
return ""
case "dds":
// The panorama's centre frequency. OpsLog has no panorama, so it answers
// with the receive frequency — which is where a client draws its own.
return reply(fmt.Sprintf("dds:0,%d;", rx))
case "if":
// Offset of the tuning filter inside the panorama: zero, since our "dds"
// is the receive frequency itself.
return reply("if:0,0,0;")
case "start", "stop", "ready":
return ""
default:
// Everything else — audio streams, CW macros, the E-Coder, the
// panorama's own settings — belongs to a radio, not to a CAT link.
// Silence rather than an error: a client sends these hopefully at
// connect, and a refusal it did not ask for reads as a fault.
return ""
}
}
func orZero(s string) string {
if s == "" {
return "0"
}
return s
}
// adifToTCIMode maps an ADIF mode to a TCI modulation.
//
// SSB carries no sideband, so it is resolved from the frequency the way every
// operator does: below 10 MHz lower, above it upper. A client told "ssb" would
// not recognise it — the modulation list is the vocabulary.
func adifToTCIMode(mode string, hz int64) string {
switch strings.ToUpper(strings.TrimSpace(mode)) {
case "":
return ""
case "CW", "CWR":
return "cw"
case "USB":
return "usb"
case "LSB":
return "lsb"
case "SSB":
if hz > 0 && hz < 10_000_000 {
return "lsb"
}
return "usb"
case "AM":
return "am"
case "FM", "NFM":
return "nfm"
case "RTTY":
return "digl"
}
// Everything else is a data mode: FT8, FT4, JT65, PSK31, MSK144, VARA…
// TCI has one pair for the whole family, and the sideband follows the same
// rule the data modes themselves use — upper, but for the few HF corners
// where LSB is conventional the radio is already there.
return "digu"
}
// tciModeToADIF maps a TCI modulation back to an ADIF mode.
func tciModeToADIF(m string) string {
switch strings.ToLower(strings.TrimSpace(m)) {
case "cw":
return "CW"
case "usb":
return "USB"
case "lsb":
return "LSB"
case "am", "sam":
return "AM"
case "nfm", "fm", "wfm":
return "FM"
case "digl", "digu", "dsb", "drm":
// The data family: the mode the operator is actually running (FT8, RTTY)
// is chosen in OpsLog, and a client switching to "digital" must not
// overwrite it with a guess. DATA is the honest ADIF answer.
return "DATA"
}
return ""
}
+330
View File
@@ -0,0 +1,330 @@
package tciserver
import (
"fmt"
"strings"
"testing"
)
// fakeRig is a radio that remembers what it was told. Everything here is about
// what OpsLog does with a client's command, so the rig only has to answer and
// record.
type fakeRig struct {
freq, rxFreq int64
mode string
split bool
txHz int64
ptt bool
splitErr error
calls []string
}
func (r *fakeRig) Freq() int64 { return r.freq }
func (r *fakeRig) RxFreq() int64 { return r.rxFreq }
func (r *fakeRig) Mode() string { return r.mode }
func (r *fakeRig) Split() (bool, int64) { return r.split, r.txHz }
func (r *fakeRig) SetFreq(hz int64) error {
r.calls = append(r.calls, fmt.Sprintf("freq=%d", hz))
r.freq, r.rxFreq = hz, hz
return nil
}
func (r *fakeRig) SetMode(m string) error {
r.calls = append(r.calls, "mode="+m)
r.mode = m
return nil
}
func (r *fakeRig) SetPTT(on bool) error {
r.calls = append(r.calls, fmt.Sprintf("ptt=%v", on))
r.ptt = on
return nil
}
func (r *fakeRig) SetSplit(on bool, txHz int64) error {
if r.splitErr != nil {
return r.splitErr
}
r.calls = append(r.calls, fmt.Sprintf("split=%v,%d", on, txHz))
r.split, r.txHz = on, txHz
return nil
}
// srv builds a server with no listener — handle() and publish() are the whole
// protocol, and neither needs a socket.
func srv(r *fakeRig) *Server { return New(0, r, nil) }
// A client with no connection: send() would need one, so reads are checked
// through the returned line instead. This is why handle returns what it sent.
func ask(t *testing.T, s *Server, cmd string) string {
t.Helper()
return s.handle(&client{}, cmd)
}
// The initialisation block is what a client needs before it will believe there
// is a radio at all. Its contents come from §4.1 of the protocol document, and
// a client that does not see ready; simply waits for ever.
func TestInitBlockCarriesTheDocumentedInitialisationSet(t *testing.T) {
s := srv(&fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"})
block := strings.Join(s.initBlock(), "")
for _, want := range []string{
"protocol:ExpertSDR3,", "device:", "receive_only:false;", "trx_count:1;",
"channel_count:2;", "vfo_limits:", "if_limits:", "modulations_list:",
"ready;", "start;",
// Transmit permission. A client that models it starts out assuming it
// may NOT transmit, and without this never even tries — PTT does
// nothing and the server never sees a trx command at all.
"tx_enable:0,true;",
} {
if !strings.Contains(block, want) {
t.Errorf("the initialisation block is missing %q — a client would not proceed past connect", want)
}
}
// And the current state, so a client that connects mid-session shows the
// right frequency instead of waiting for the operator to touch something.
if !strings.Contains(block, "vfo:0,0,14074000;") {
t.Errorf("no current frequency in the block:\n%s", block)
}
if !strings.Contains(block, "modulation:0,usb;") {
t.Errorf("no current mode in the block:\n%s", block)
}
}
// Channel A is where we LISTEN, channel B where we transmit. Handing these to a
// client the wrong way round is the one mistake here that puts a station on the
// DX's own frequency, so it is pinned in both directions.
func TestSplitPutsTheListeningFrequencyOnChannelA(t *testing.T) {
// OpsLog's RigState is ADIF: Freq is the TRANSMIT frequency, RxFreq where we
// listen. A DX transmitting on 14025 and listening up 2.
r := &fakeRig{freq: 14027000, rxFreq: 14025000, mode: "CW", split: true, txHz: 14027000}
s := srv(r)
block := strings.Join(s.initBlock(), "")
if !strings.Contains(block, "vfo:0,0,14025000;") {
t.Errorf("channel A is not the receive frequency:\n%s", block)
}
if !strings.Contains(block, "vfo:0,1,14027000;") {
t.Errorf("channel B is not the transmit frequency:\n%s", block)
}
if !strings.Contains(block, "split_enable:0,true;") {
t.Errorf("split was not announced:\n%s", block)
}
}
// Simplex: both channels report the one frequency, so a client reading either
// gets the right answer.
func TestSimplexReportsTheSameFrequencyOnBothChannels(t *testing.T) {
s := srv(&fakeRig{freq: 7100000, rxFreq: 7100000, mode: "SSB"})
if got := ask(t, s, "vfo:0,0"); got != "vfo:0,0,7100000;" {
t.Errorf("read of channel A = %q", got)
}
if got := ask(t, s, "vfo:0,1"); got != "vfo:0,1,7100000;" {
t.Errorf("read of channel B = %q", got)
}
// 7 MHz is below 10, so SSB is lower sideband — a client told "ssb" would
// not recognise it at all, the modulation list is the vocabulary.
if got := ask(t, s, "modulation:0"); got != "modulation:0,lsb;" {
t.Errorf("read of the mode = %q, want lsb below 10 MHz", got)
}
}
// The client tunes the radio.
func TestAClientCanTuneAndSetModeAndKey(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"}
s := srv(r)
ask(t, s, "vfo:0,0,14200000")
ask(t, s, "modulation:0,cw")
ask(t, s, "trx:0,true")
ask(t, s, "trx:0,false")
want := []string{"freq=14200000", "mode=CW", "ptt=true", "ptt=false"}
if strings.Join(r.calls, " ") != strings.Join(want, " ") {
t.Errorf("the radio was told %v, want %v", r.calls, want)
}
}
// Channel B is the SPLIT transmit frequency. Writing it while the rig is
// simplex must not move the only VFO there is: the client asked to prepare a
// transmit frequency, not to QSY — and a logger that did this on every spot
// click would drag the operator off the station they were listening to.
func TestWritingChannelBWhileSimplexLeavesTheRigAlone(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"}
s := srv(r)
ask(t, s, "vfo:0,1,14080000")
if len(r.calls) != 0 {
t.Errorf("the radio was told %v — a split TX frequency moved a simplex rig", r.calls)
}
// With split armed it means what it says.
r.split, r.txHz = true, 14074000
ask(t, s, "vfo:0,1,14080000")
if len(r.calls) != 1 || r.calls[0] != "split=true,14080000" {
t.Errorf("with split on the radio was told %v, want the new transmit frequency", r.calls)
}
}
// A backend that cannot split says so, and the refusal must not be dressed up
// as success: the client can then tell the operator to use Fake It, where
// before it would transmit on the receive frequency believing all was well.
func TestARefusedSplitIsNotAnnouncedAsDone(t *testing.T) {
r := &fakeRig{freq: 14025000, rxFreq: 14025000, mode: "CW", splitErr: fmt.Errorf("this backend cannot split")}
s := srv(r)
if got := ask(t, s, "split_enable:0,true"); got != "" {
t.Errorf("a refused split answered %q", got)
}
if r.split {
t.Error("the rig was recorded as split after the backend refused")
}
}
// Only what moved is sent. TCI clients redraw on every command they receive, so
// re-sending an unchanged frequency four times a second makes a VFO readout
// flicker and, in some clients, fights the operator's own tuning.
func TestOnlyChangesAreSent(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"}
s := srv(r)
first := s.publish()
if len(first) == 0 {
t.Fatal("the first pass sent nothing — a client would never learn the state")
}
if got := s.publish(); len(got) != 0 {
t.Errorf("an unchanged radio produced %v", got)
}
r.freq, r.rxFreq = 14200000, 14200000
got := strings.Join(s.publish(), "")
// Both channels move together on a simplex rig, and the transmit frequency
// has its own command besides — a client showing "TX 14.200" reads that one,
// and channel B alone leaves it stale.
for _, want := range []string{"vfo:0,0,14200000;", "vfo:0,1,14200000;", "tx_frequency:14200000;"} {
if !strings.Contains(got, want) {
t.Errorf("after a QSY the clients were not told %q — got %q", want, got)
}
}
if got := s.publish(); len(got) != 0 {
t.Errorf("the QSY was re-sent: %v", got)
}
}
// Modes travel both ways, and the data family is the interesting half: a client
// switching to "digital" must not overwrite the mode the operator chose in
// OpsLog with a guess at which data mode it was.
func TestModeMapping(t *testing.T) {
up := []struct {
adif string
hz int64
want string
}{
{"CW", 14025000, "cw"},
{"SSB", 14200000, "usb"},
{"SSB", 7100000, "lsb"},
{"USB", 7100000, "usb"}, // an explicit sideband is never second-guessed
{"FT8", 14074000, "digu"},
{"RTTY", 14080000, "digl"},
{"AM", 3700000, "am"},
{"FM", 145500000, "nfm"},
{"", 14074000, ""},
}
for _, c := range up {
if got := adifToTCIMode(c.adif, c.hz); got != c.want {
t.Errorf("adifToTCIMode(%q, %d) = %q, want %q", c.adif, c.hz, got, c.want)
}
}
down := map[string]string{
"cw": "CW", "usb": "USB", "lsb": "LSB", "am": "AM", "sam": "AM",
"nfm": "FM", "digu": "DATA", "digl": "DATA", "": "",
}
for in, want := range down {
if got := tciModeToADIF(in); got != want {
t.Errorf("tciModeToADIF(%q) = %q, want %q", in, got, want)
}
}
}
// A command for something OpsLog is not — audio streams, CW macros, the
// panorama's settings — is met with silence rather than an error. A client
// sends these hopefully at connect, and a refusal it did not ask for reads as a
// fault with the rig.
func TestUnknownCommandsAreQuiet(t *testing.T) {
s := srv(&fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"})
for _, cmd := range []string{"audio_start:0", "cw_macros_speed:25", "rx_filter_band:0,-2700,-100", "iq_start:0"} {
if got := ask(t, s, cmd); got != "" {
t.Errorf("%q answered %q", cmd, got)
}
}
}
// Split, with the client sending the two commands in the order it prefers.
//
// A client working split has to say two things: where to transmit, and that
// split is on. Nothing obliges it to say them in that order, and the frequency
// arriving first is the dangerous case: discarding it and then arming split
// leaves the transmit VFO on whatever it held — the RECEIVE frequency — so the
// operator transmits straight onto the DX while their software shows exactly
// what they asked for.
func TestSplitIsArmedOnTheFrequencyTheClientGaveWhicheverOrderItCame(t *testing.T) {
// Frequency first, then split — the order that used to lose the frequency.
r := &fakeRig{freq: 14025000, rxFreq: 14025000, mode: "CW"}
s := srv(r)
ask(t, s, "vfo:0,1,14027000")
ask(t, s, "split_enable:0,true")
if len(r.calls) != 1 || r.calls[0] != "split=true,14027000" {
t.Errorf("frequency first: the radio was told %v, want split armed on 14027000", r.calls)
}
// Split first, then the frequency — the order that always worked.
r2 := &fakeRig{freq: 14025000, rxFreq: 14025000, mode: "CW"}
s2 := srv(r2)
ask(t, s2, "split_enable:0,true")
ask(t, s2, "vfo:0,1,14027000")
if len(r2.calls) == 0 || r2.calls[len(r2.calls)-1] != "split=true,14027000" {
t.Errorf("split first: the radio was told %v, want it to end on 14027000", r2.calls)
}
}
// "Fake It" uses no split at all: the client shifts the DIAL at the start of
// transmit and shifts it back at the end. All it needs is channel A, and it
// must reach the radio both ways.
func TestFakeItIsJustTheDialMoving(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"}
s := srv(r)
ask(t, s, "vfo:0,0,14075300") // up for the over
ask(t, s, "vfo:0,0,14074000") // and back
want := []string{"freq=14075300", "freq=14074000"}
if strings.Join(r.calls, " ") != strings.Join(want, " ") {
t.Errorf("the radio was told %v, want %v", r.calls, want)
}
}
// A client in Fake It still says "split off" to be sure. The rig is already
// simplex, so there is nothing to do — and saying so beats asking a backend
// that may not be able to set split at all.
//
// This is what broke JTDX through the rigctl server: an error answered to a
// request that was already true, read as rig control failing, and the
// transmission abandoned a second into the frame.
func TestSayingSplitOffWhenAlreadySimplexTouchesNothing(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB",
splitErr: fmt.Errorf("this backend cannot split")}
s := srv(r)
ask(t, s, "split_enable:0,false")
if len(r.calls) != 0 {
t.Errorf("the radio was told %v for a state it was already in", r.calls)
}
}
// A client restating PTT must not re-command the radio. Through the rigctl
// server, one sent set_ptt 0 sixteen times a second and the Flex's own transmit
// request was overwritten between two of them inside a millisecond.
func TestRepeatedPTTIsNotResentToTheRadio(t *testing.T) {
r := &fakeRig{freq: 14074000, rxFreq: 14074000, mode: "USB"}
s := srv(r)
for i := 0; i < 5; i++ {
ask(t, s, "trx:0,false")
}
if len(r.calls) != 1 || r.calls[0] != "ptt=false" {
// The FIRST one always goes through: there is no knowing how the radio
// was left.
t.Errorf("the radio was told %v, want one unkey and no repeats", r.calls)
}
ask(t, s, "trx:0,true")
ask(t, s, "trx:0,true")
if len(r.calls) != 2 || r.calls[1] != "ptt=true" {
t.Errorf("the radio was told %v, want the change through and the repeat dropped", r.calls)
}
}
+42 -14
View File
@@ -30,10 +30,10 @@ import (
// the one to fail on: everything after it assumes a listener.
// open 0x00 0x02, and the keyer returns its firmware version.
const (
cmdNull = 0x13
cmdAdmin = 0x00
adminOpen = 0x02
adminEcho = 0x04
cmdNull = 0x13
cmdAdmin = 0x00
adminOpen = 0x02
adminEcho = 0x04
echoProbe = 0x55 // K1EL's own choice; any byte works, this one is 0b01010101
bootDelay = 400 * time.Millisecond
echoTimeout = 2 * time.Second // K1EL: "if a WK doesn't respond within 2 seconds abort"
@@ -95,18 +95,25 @@ func hostOpenOnce(p serial.Port, boot time.Duration) (int, error) {
time.Sleep(boot)
drain(p)
// Resync the command parser before asking it anything.
if _, err := p.Write([]byte{cmdNull, cmdNull, cmdNull}); err != nil {
return 0, fmt.Errorf("resync: %w", err)
}
time.Sleep(50 * time.Millisecond)
drain(p)
// Is anything actually there?
if _, err := p.Write([]byte{cmdAdmin, adminEcho, echoProbe}); err != nil {
// The resync nulls and the echo probe go out as ONE write.
//
// Copied byte for byte from a Logger32 capture against the K3NG keyer that
// would not answer OpsLog: "Sent: 13 13 13 00 04 55 / Rcvd: 55". Same keyer,
// same port, same six bytes — the only difference was that we sent them as
// two writes with a pause and a buffer purge in between, and Logger32 sends
// them as one. On a keyer that reboots when the port opens, that pause is a
// window for it to come up mid-sequence and swallow half of it.
//
// There is nothing to wait for between the two halves anyway: a null produces
// no reply, so the pause was only ever giving the keyer a chance to change
// its mind.
probe := []byte{cmdNull, cmdNull, cmdNull, cmdAdmin, adminEcho, echoProbe}
traceHandshake("TX", probe, 0, false)
if _, err := p.Write(probe); err != nil {
return 0, fmt.Errorf("echo test: %w", err)
}
b, ok := readByte(p, echoTimeout)
traceHandshake("RX", nil, b, ok)
if !ok {
return 0, errNoKeyer
}
@@ -116,16 +123,37 @@ func hostOpenOnce(p serial.Port, boot time.Duration) (int, error) {
return 0, fmt.Errorf("echo test: expected 0x%02X, got 0x%02X — is this the keyer's port?", echoProbe, b)
}
if _, err := p.Write([]byte{cmdAdmin, adminOpen}); err != nil {
open := []byte{cmdAdmin, adminOpen}
traceHandshake("TX", open, 0, false)
if _, err := p.Write(open); err != nil {
return 0, fmt.Errorf("host open: %w", err)
}
ver, ok := readByte(p, openTimeout)
traceHandshake("RX", nil, ver, ok)
if !ok {
return 0, errors.New("host open: the keyer echoed but did not return its firmware version")
}
return int(ver), nil
}
// traceHandshake puts the opening exchange in the log, ALWAYS — unlike the
// running trace beside it, which is behind the diagnostic option.
//
// A failure that says only "no WinKeyer answered" cannot be told apart from a
// wrong port, a wrong baud rate, a keyer still rebooting, or another program
// holding the line. The bytes can. It is four lines per connect, and only when
// the connect is attempted.
func traceHandshake(dir string, b []byte, got byte, ok bool) {
switch {
case dir == "TX":
applog.Printf("winkeyer: handshake TX % 02X", b)
case ok:
applog.Printf("winkeyer: handshake RX %02X", got)
default:
applog.Printf("winkeyer: handshake RX — nothing came back")
}
}
// readByte waits up to d for one byte. The serial read timeout is per-call and
// can return 0 bytes without an error, so this loops until the deadline rather
// than trusting a single Read.
+2
View File
@@ -102,6 +102,8 @@ func TestHostOpenFollowsK1ELSequence(t *testing.T) {
if ver != 23 {
t.Errorf("version = %d, want 23", ver)
}
// One write for the six probe bytes, then Host Open — the order and the
// grouping of a Logger32 capture against a real K3NG.
want := []byte{
cmdNull, cmdNull, cmdNull,
cmdAdmin, adminEcho, echoProbe,

Some files were not shown because too many files have changed in this diff Show More