Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ce0b1ae7b | ||
|
|
15d93ec2a4 | ||
|
|
0909fbc6e2 | ||
|
|
b8ae5d39f7 | ||
|
|
5999159e17 | ||
|
|
36021ec2e8 | ||
|
|
dca0dfa894 | ||
|
|
5e03546f40 |
@@ -17,8 +17,8 @@
|
|||||||
## API
|
## API
|
||||||
|
|
||||||
1. **Live base URL** — `http://bot.dev.kkhost.pl` (Traefik → docker-compose stack on this host; container port 3000 via external network dev_net, no published ports).
|
1. **Live base URL** — `http://bot.dev.kkhost.pl` (Traefik → docker-compose stack on this host; container port 3000 via external network dev_net, no published ports).
|
||||||
2. **Endpoints** — all under the `/api` global prefix: `GET /api/status` (`{ connected, myNodeNum, host, port }`), `POST /api/send` (body `{ "text": "...", "to"?: <node number | node name | "!b" | "broadcast"> }` — numbers pass through as-is (integer 1..0xffffffff), names resolve like `GET /api/nodes/:id`, omitted/""/"!b"/"broadcast" → broadcast; unknown or ambiguous targets are a 400. Returns `{ id }`), `GET /api/channels` (the device's Meshtastic channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]`; psk/keys redacted), `GET /api/device` (device info captured during the initial sync: `{ myNodeNum, firmwareVersion?, metadata?, localConfig: {<section>: ...}, moduleConfig: {<module>: ...} }` — DeviceMetadata as-is plus per-section Config/ModuleConfig messages; security publicKey/privateKey/adminKey and network wifiPsk redacted to `"REDACTED"`; in-memory, reset on reconnect), `GET /api/messages` (message history newest first: rx text with `from`, tx sends with `to` + `status` pending→delivered/failed via routing ACKs — broadcasts stay pending because firmware strips want_ack; last 100 in memory (seeded from SQLite on startup) — backed by SQLite: re-upserted every MESH_POLL_MS and pruned to the newest 1000 rows, so it survives process restarts and bridge reconnects), `POST /api/messages` (body `{ "text": "...", "from"?: <node number> }`, returns `{ id }`; synthetic inbox injection for external triggers — records an rx entry in the history as if received on the mesh (channel 0) so external systems can push messages to trigger communication later; NOT transmitted over RF, nothing goes to the bridge or air; appears in `GET /api/messages` like any other rx message), `GET /api/telemetry` (telemetry history newest first as `{ from, at /* epoch ms */, kind, data }[]`: live TELEMETRY_APP packets — device metrics and environment sensor readings where nodes have them; kind is the meshtastic.Telemetry oneof case name (deviceMetrics/environmentMetrics/airQualityMetrics/powerMetrics/localStats/healthMetrics/hostMetrics/trafficManagementStats), data that variant's payload with proto uint64 fields as decimal strings; last 100, in-memory, reset on reconnect), `GET /api/nodes` (known nodes sorted by num as `{ num, longName?, shortName?, hwModel?, batteryLevel?, lastHeard: number|null, position?: { lat, lon, alt? }, snr?, hopsAway?, viaMqtt? }[]`, from the initial sync plus live POSITION_APP updates; reset on reconnect) and `GET /api/nodes/:id` (lookup by exact node number/numeric string, then case-insensitive exact long/short name, else unique substring; 404 when ambiguous or missing). Scalar API docs are served at `/` (OpenAPI JSON at `/docs-json`). Keep this list in sync with the controller. All `POST /api/send` traffic targets channel index 3 (`test`) on purpose — never the primary channel; override via `MESH_SEND_CHANNEL` (default `3`). Message history is persisted to SQLite: file path from `MESH_DB_PATH` (default `./data/mesh-bot.db`, parent dir auto-created), poller re-upserts every `MESH_POLL_MS` ms (default 1000) and prunes the table to the newest 1000 rows. Outbound notification webhook: when an RX text arrives on channel `MESH_NOTIFY_CHANNEL` (default `3`), a fire-and-forget HTTP POST of `{text, from}` (`from` omitted when absent) goes to `MESH_NOTIFY_URL` — unset/empty disables it entirely; no retries, no response handling. Injected messages (`POST /api/messages`, channel 0) trigger it too when the notify channel is set to match. Messages from our own node are never notified (self-echo filter).
|
2. **Endpoints** — all under the `/api` global prefix: `GET /api/status` (`{ connected, myNodeNum, host, port }`), `POST /api/send` (body `{ "text": "...", "to"?: <node number | node name | "!b" | "broadcast">, "replyId"?: <packet id> }` — numbers pass through as-is (integer 1..0xffffffff), names resolve like `GET /api/nodes/:id`, omitted/""/"!b"/"broadcast" → broadcast; unknown or ambiguous targets are a 400. Optional `replyId` (integer in 1..0xffffffff, else 400) references an earlier message's packet id from `GET /api/messages` — when set, the recipient app renders the text as a threaded reply/quote of that packet (`Data.reply_id`, field 7). Returns `{ id }`), `GET /api/channels` (the device's Meshtastic channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]`; psk/keys redacted), `GET /api/device` (device info captured during the initial sync: `{ myNodeNum, firmwareVersion?, metadata?, localConfig: {<section>: ...}, moduleConfig: {<module>: ...} }` — DeviceMetadata as-is plus per-section Config/ModuleConfig messages; security publicKey/privateKey/adminKey and network wifiPsk redacted to `"REDACTED"`; in-memory, reset on reconnect), `GET /api/messages` (message history newest first: rx text with `from`, tx sends with `to` + `status` pending→delivered/failed via routing ACKs — broadcasts stay pending because firmware strips want_ack; last 100 in memory (seeded from SQLite on startup) — backed by SQLite: re-upserted every MESH_POLL_MS and pruned to the newest 1000 rows, so it survives process restarts and bridge reconnects), `POST /api/messages` (body `{ "text": "...", "from"?: <node number> }`, returns `{ id }`; synthetic inbox injection for external triggers — records an rx entry in the history as if received on the mesh (channel 0) so external systems can push messages to trigger communication later; NOT transmitted over RF, nothing goes to the bridge or air; appears in `GET /api/messages` like any other rx message), `GET /api/telemetry` (telemetry history newest first as `{ from, at /* epoch ms */, kind, data }[]`: live TELEMETRY_APP packets — device metrics and environment sensor readings where nodes have them; kind is the meshtastic.Telemetry oneof case name (deviceMetrics/environmentMetrics/airQualityMetrics/powerMetrics/localStats/healthMetrics/hostMetrics/trafficManagementStats), data that variant's payload with proto uint64 fields as decimal strings; last 100, in-memory, reset on reconnect), `GET /api/nodes` (known nodes sorted by num as `{ num, longName?, shortName?, hwModel?, batteryLevel?, lastHeard: number|null, position?: { lat, lon, alt? }, snr?, hopsAway?, viaMqtt? }[]`, from the initial sync plus live POSITION_APP updates; reset on reconnect) and `GET /api/nodes/:id` (lookup by exact node number/numeric string, then case-insensitive exact long/short name, else unique substring; 404 when ambiguous or missing). Scalar API docs are served at `/` (OpenAPI JSON at `/docs-json`). Keep this list in sync with the controller. All `POST /api/send` traffic targets channel index 3 (`test`) on purpose — never the primary channel; override via `MESH_SEND_CHANNEL` (default `3`). Message history is persisted to SQLite: file path from `MESH_DB_PATH` (default `./data/mesh-bot.db`, parent dir auto-created), poller re-upserts every `MESH_POLL_MS` ms (default 1000) and prunes the table to the newest 1000 rows. Outbound notification webhook: when an RX text arrives on channel `MESH_NOTIFY_CHANNEL` (default `3`), a fire-and-forget HTTP POST of `{text, from}` (`from` omitted when absent) goes to `MESH_NOTIFY_URL` — unset/empty disables it entirely; failed POSTs are retried up to 3 times with backoff (2 s / 10 s / 30 s) before being dropped; no response handling. Injected messages (`POST /api/messages`, channel 0) trigger it too when the notify channel is set to match. Messages from our own node are never notified (self-echo filter). The forwarder resolves the mesh-bot workspace/session dynamically from the opencode API per request (`FORWARDER_API`/`FORWARDER_WORKSPACE_PATH`; `FORWARDER_SESSION` pins a session when set).
|
||||||
3. **MCP endpoint** — `POST /mcp` (excluded from the `/api` prefix in main.ts, like Scalar at `/`): an in-process MCP server over the official SDK's Streamable HTTP transport in stateless mode (`sessionIdGenerator: undefined`, fresh `McpServer` + transport per request). Tools map 1:1 to MeshService methods: `mesh_status`, `send_message(text, to?)` (same resolution as `POST /api/send`; errors surface as tool errors with the same messages), `list_channels`, `list_nodes`, `get_node(id)` (tool error when missing/ambiguous), `get_messages`, `inject_message(text, from?)` (synthetic inbox injection for external triggers — records an rx entry in the history as if received on the mesh; NOT sent over RF; same validation as `POST /api/messages`), `get_telemetry` (same bounded recent window as `GET /api/telemetry`), `device_info` (same redaction as `GET /api/device`). Results are JSON in a text content block; sends ride channel index 3 like everything else. Note: the SDK's root entry is broken upstream (#2273) — import via subpaths (`@modelcontextprotocol/sdk/server/mcp.js` etc.).
|
3. **MCP endpoint** — `POST /mcp` (excluded from the `/api` prefix in main.ts, like Scalar at `/`): an in-process MCP server over the official SDK's Streamable HTTP transport in stateless mode (`sessionIdGenerator: undefined`, fresh `McpServer` + transport per request). Tools map 1:1 to MeshService methods: `mesh_status`, `send_message(text, to?, replyId?)` (`to` resolves like `POST /api/send`; optional `replyId` integer in 1..0xffffffff makes the message render as a threaded reply/quote of that packet id from `GET /api/messages` or `get_messages`; errors surface as tool errors with the same messages), `list_channels`, `list_nodes`, `get_node(id)` (tool error when missing/ambiguous), `get_messages`, `inject_message(text, from?)` (synthetic inbox injection for external triggers — records an rx entry in the history as if received on the mesh; NOT sent over RF; same validation as `POST /api/messages`), `get_telemetry` (same bounded recent window as `GET /api/telemetry`), `device_info` (same redaction as `GET /api/device`). Results are JSON in a text content block; sends ride channel index 3 like everything else. Note: the SDK's root entry is broken upstream (#2273) — import via subpaths (`@modelcontextprotocol/sdk/server/mcp.js` etc.).
|
||||||
|
|
||||||
## Other
|
## Other
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,53 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v0.12.8 — 2026-09-25 12:04
|
||||||
|
|
||||||
|
- Docs (MESHTASTIC.md response protocol): new standing rule per owner request ("remember to always replay on reply on channel when question is send here") — questions received via mesh are **answered on the channel**: every question sent via mesh gets its actual answer broadcast back on the same channel when work completes; an acknowledgement alone is not sufficient, and the answer must not stay only in the private agent session. All existing bullets (always-respond-first, channel-only/no DMs, owner authority 2594370888, language, NO_RESPONSE quirk, self-echo note) unchanged. No code changes — all 64 tests untouched and green.
|
||||||
|
|
||||||
|
## v0.12.7 — 2026-09-25 11:40
|
||||||
|
|
||||||
|
- `POST /api/send` and the MCP `send_message` tool now accept an optional `replyId` (integer in 1..0xffffffff) referencing an earlier message's packet id from `GET /api/messages` / `get_messages`. When set, the recipient app renders the sent text as a threaded reply/quote of that packet. The value rides Meshtastic's protocol-level reply mechanism: `Data.reply_id` (field 7) on the TEXT_MESSAGE_APP payload.
|
||||||
|
- `buildTextToRadio(to, text, channelIndex, replyId?)` in `src/mesh/codec.ts` gained the optional param and sets **camelCase** `replyId` on the Data value (`replyId ?? 0`). The JS protobufs package silently drops snake_case `reply_id`, so camelCase is mandatory; a byte-level spec asserts wire tag `0x3d` (field 7, fixed32) appears iff `replyId` was given.
|
||||||
|
- `MeshService.sendText(to, text, replyId?)` passes the value through to the codec. REST validation rejects non-integers and out-of-range values with a 400; MCP validates via zod (`z.number().int().min(1).max(0xffffffff)`). Omitting it leaves the field unset (proto3 default 0, not serialized) — existing callers are unaffected.
|
||||||
|
- New specs: codec byte-level `0x3d` presence/absence check and a service outbound-capture case asserting `Data.replyId === <id>` when given and `0` when omitted. All 62 pre-existing tests stay green (64 total).
|
||||||
|
- Docs: README endpoint + MCP tool lines, AGENTS.md API section, and the controller's `@ApiOperation` description now document the optional `replyId`.
|
||||||
|
|
||||||
|
## v0.12.6 — 2026-09-25 10:55
|
||||||
|
|
||||||
|
- Docs (MESHTASTIC.md response protocol): reverted the v0.12.5 reply rule per owner preference ("we will talk on that channel") — replies to messages from a specific node now go back **on the same channel as a broadcast** (no `to`), no direct messages; broadcasts are used for both replies and general announcements such as the hourly weather report. The always-respond-first bullet (**ALWAYS respond ... BEFORE starting any work it triggers**) and every other rule are unchanged. No code changes — `POST /api/send` and the MCP send tool already accept an omitted `to` (broadcast).
|
||||||
|
|
||||||
|
## v0.12.5 — 2026-09-25 10:45
|
||||||
|
|
||||||
|
- Docs (MESHTASTIC.md response protocol): replies to messages from a specific node now go back **as a direct message to that sender's node number** (`to` = the sender's node num), so they surface in the direct conversation thread ("flagged as reply") instead of as new channel posts. Broadcasts (no `to`) are reserved for general announcements such as the hourly weather report. No code changes — `POST /api/send` and the MCP send tool already accept a `to` target; all other rules (owner authority 2594370888, language, confirm-first-then-work, channel pinning, self-echo note, NO_RESPONSE quirk) unchanged.
|
||||||
|
- MESHTASTIC.md confirm-first rule made explicit and mandatory: **ALWAYS respond to a received mesh message on the Meshtastic BEFORE starting any work it triggers** (acknowledge first, then work) — the previous "first respond/confirm, then start the actual work" wording was not explicit enough and got violated in practice.
|
||||||
|
|
||||||
|
## v0.12.4 — 2026-09-25 10:17
|
||||||
|
|
||||||
|
- Notify forwarder (`ops/forwarder`) now resolves the opencode workspace + session dynamically per request instead of hardcoding them as env defaults: `GET {FORWARDER_API}/api/workspaces` → match by `path == FORWARDER_WORKSPACE_PATH` (fallback `name == "mesh-bot"`, status `ready` preferred when several match) → `GET {proxyPath}/session` → most recently updated session (`time.updated`; first entry if absent). No caching — messages are rare. Fixes lost user messages after an opencode host restart regenerated the workspace UUID (the old hardcoded base URL 404'd on every notify POST).
|
||||||
|
- New env config replaces `FORWARDER_BASE`: `FORWARDER_API` (default `http://127.0.0.1:9898`) and `FORWARDER_WORKSPACE_PATH` (default `/home/krzyw/projects/sandbox/mesh-bot`); `FORWARDER_SESSION` is now an optional pin — when set, session discovery is skipped; empty/unset discovers dynamically. `FORWARDER_USER` / `FORWARDER_PASS` stay required. Each failure mode gets a clear 502 + log line: API unreachable, workspace not found, no sessions in workspace. The message POST itself (endpoint under `{proxyPath}/session/{sid}`, body and auth), timeout=15 semantics, 202-on-timeout and the `_reply` BrokenPipe guard are unchanged.
|
||||||
|
- `docker-compose.yml`: forwarder environment block now passes `FORWARDER_API` / `FORWARDER_WORKSPACE_PATH` / `FORWARDER_SESSION` (empty default) — old `FORWARDER_BASE` line removed; bot service untouched.
|
||||||
|
- `MeshService.postNotify()`: after `await fetch(...)`, checks `res.ok` and throws `Error('HTTP <status>')` when not ok, so a forwarder 5xx during an opencode restart is retried with the same backoff as network failures (the `res &&` guard keeps specs that stub fetch to resolve `undefined` green). One new spec: fetch resolves status 502 twice then 200 → exactly 3 attempts, success path. All 61 pre-existing tests stay green (62 total).
|
||||||
|
- Docs: README "Notify forwarder" section rewritten for dynamic resolution + the new env vars; AGENTS.md webhook note gains a clause that the forwarder resolves the mesh-bot workspace/session from the opencode API per request (`FORWARDER_SESSION` pins a session when set).
|
||||||
|
|
||||||
|
## v0.12.3 — 2026-09-25 09:40
|
||||||
|
|
||||||
|
- Notify webhook POSTs are now retried instead of dropped on the first failure: `notifyRx`'s fire-and-forget POST runs through a retry loop with up to 4 attempts total (initial + 3 retries) and backoff delays `[2 s, 10 s, 30 s]` (~45 s window). Each failed attempt logs WARN with the attempt number and error; after the final failure it logs WARN `notify dropped after N attempts: ...` and stops. Success on any attempt ends the loop (unchanged success behavior/logging). Fire-and-forget semantics preserved — the RX handler never awaits the loop, which runs as an un-awaited async IIFE exactly like today's single POST. Self-echo filter and channel-match logic unchanged; backoff is hardcoded (no new env vars).
|
||||||
|
- New private `MeshService.postNotify()` retry helper + injectable `sleep()` so specs can skip the delays without fake timers. Two new specs: fetch fails twice then succeeds → exactly 3 attempts, no dropped log, success path taken; fetch always fails → exactly 4 attempts, final WARN `notify dropped after 4 attempts`, nothing thrown. All 59 pre-existing tests stay green (61 total).
|
||||||
|
- Docs: README `MESH_NOTIFY_URL` bullet and AGENTS.md webhook note now state failed POSTs are retried up to 3 times with backoff (2 s / 10 s / 30 s) before being dropped.
|
||||||
|
|
||||||
|
## v0.12.2 — 2026-09-25 08:44
|
||||||
|
|
||||||
|
- New compose service `forwarder` (`ops/forwarder`, `python:3.12-slim`, stdlib only, no pip installs): runs the notify forwarder that was previously a host-side `nohup` python script — receives the bot's outbound notify webhook POSTs (`{text, from?}` on `MESH_NOTIFY_URL`) and forwards each one as a message to an opencode API session (Basic auth).
|
||||||
|
- `network_mode: host` → listens on the host's `0.0.0.0:4097`, so `MESH_NOTIFY_URL=http://172.24.0.1:4097/notify` keeps working unchanged from the bot container, and it reaches opencode at `127.0.0.1:9898`. No `networks:` key (host mode), no Traefik labels; `restart: unless-stopped`.
|
||||||
|
- Config moves out of the script into compose environment from `.env` (gitignored): `FORWARDER_BASE` / `FORWARDER_SESSION` keep their current values as defaults, `FORWARDER_USER` / `FORWARDER_PASS` are required — the container exits on startup if either is missing. The real credentials are no longer hardcoded anywhere in the repo; nothing sensitive committed.
|
||||||
|
- No app code changes — existing 59 tests stay green.
|
||||||
|
|
||||||
|
## v0.12.1 — 2026-09-25 07:57
|
||||||
|
|
||||||
|
- Hotfix for the v0.12.0 bootstrap crash (`UnknownDependenciesException`): `MeshModule` now exports `MeshService`, and `WeatherService`'s `import type { MeshService }` became a value import — with `emitDecoratorMetadata` the type-only import is erased, so the constructor's DI token was `undefined` at runtime even with the export (the unit suite instantiates services directly and never booted the module graph, which is why 58 green tests still shipped a broken app).
|
||||||
|
- `docker-compose.yml`: `WEATHER_CRON` passthrough (`${WEATHER_CRON:-}`) mirroring the existing notify-var pattern — empty/unset falls back to the service default `'0 * * * *'`. No LAT/LON/CITY passthroughs (service-side defaults suffice).
|
||||||
|
- New DI smoke spec `src/weather/di.spec.ts`: compiles `WeatherModule` with Nest's `Test.createTestingModule().compile()` (no `app.init()`, so no TCP connection) and asserts `WeatherService` resolves its `MeshService` from `MeshModule` — fails if the export regresses.
|
||||||
|
|
||||||
## v0.12.0 — 2026-09-25 07:42
|
## v0.12.0 — 2026-09-25 07:42
|
||||||
|
|
||||||
- New `src/weather` module: hourly cron-triggered weather report for Lublin, broadcast on the mesh (pinned send channel). `WeatherService.fetchWeather()` GETs Open-Meteo current conditions (`temperature_2m`, `apparent_temperature`, `relative_humidity_2m`, `wind_speed_10m`, `weather_code` — free API, no key) via global fetch; `formatReport()` renders one short line (e.g. `Lublin weather: 18°C (feels 17), partly cloudy, humidity 65%, wind 12 km/h`) with a WMO weather-code → description map (~19 common codes, unknown → `code <n>`). The `@Cron` handler fetches, formats and broadcasts via `MeshService.sendText(BROADCAST_ADDR, report)`; any error logs `[weather] report failed: ...` and is swallowed — the cron never crashes the app.
|
- New `src/weather` module: hourly cron-triggered weather report for Lublin, broadcast on the mesh (pinned send channel). `WeatherService.fetchWeather()` GETs Open-Meteo current conditions (`temperature_2m`, `apparent_temperature`, `relative_humidity_2m`, `wind_speed_10m`, `weather_code` — free API, no key) via global fetch; `formatReport()` renders one short line (e.g. `Lublin weather: 18°C (feels 17), partly cloudy, humidity 65%, wind 12 km/h`) with a WMO weather-code → description map (~19 common codes, unknown → `code <n>`). The `@Cron` handler fetches, formats and broadcasts via `MeshService.sendText(BROADCAST_ADDR, report)`; any error logs `[weather] report failed: ...` and is swallowed — the cron never crashes the app.
|
||||||
|
|||||||
+3
-2
@@ -14,8 +14,9 @@ Rules for how mesh-bot communicates over Meshtastic and how the agent should rea
|
|||||||
|
|
||||||
## Response protocol
|
## Response protocol
|
||||||
|
|
||||||
- When doing any action triggered by a chat message: **first respond/confirm on the channel, then start the actual work** — so the user gets the fastest possible response.
|
- **ALWAYS respond to a received mesh message on the Meshtastic BEFORE starting any work it triggers** — acknowledge first, then work. This is mandatory for every action triggered by a chat message; the confirmation goes out before you start (so the user gets the fastest possible response).
|
||||||
- Replies to messages received on a channel go back **on that same channel as a broadcast** (no `to`), not as a DM — unless the sender explicitly asks for a private reply.
|
- Replies to messages from a specific node go back **on the same channel as a broadcast** (no `to`) — do not send direct messages; per owner preference, all conversation happens on the channel. Broadcasts are used for both replies and general announcements such as the hourly weather report.
|
||||||
|
- **Questions are answered on the channel** — every question sent via mesh gets its actual answer broadcast back on the same channel when work completes; an acknowledgement alone is not sufficient, and the answer must not stay only in the private agent session.
|
||||||
|
|
||||||
## Channels & sending
|
## Channels & sending
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ Exposed via Traefik only (no published ports) at `http://bot.dev.kkhost.pl`.
|
|||||||
All API endpoints live under the `/api` prefix:
|
All API endpoints live under the `/api` prefix:
|
||||||
|
|
||||||
- `GET /api/status` — `{ connected, myNodeNum, host, port }`
|
- `GET /api/status` — `{ connected, myNodeNum, host, port }`
|
||||||
- `POST /api/send` — body `{ "text": "...", "to"?: <node number | node name | "!b" | "broadcast"> }`, returns `{ id }`. Numbers pass through as-is (integer in 1..0xffffffff); names resolve like `GET /api/nodes/:id` (exact long/short name, then unique substring) — unknown or ambiguous targets are a 400
|
- `POST /api/send` — body `{ "text": "...", "to"?: <node number | node name | "!b" | "broadcast">, "replyId"?: <packet id> }`, returns `{ id }`. Numbers pass through as-is (integer in 1..0xffffffff); names resolve like `GET /api/nodes/:id` (exact long/short name, then unique substring) — unknown or ambiguous targets are a 400. Optional `replyId` (integer in 1..0xffffffff) references an earlier message's packet id from `GET /api/messages` — when set, the recipient app renders the text as a threaded reply/quote of that packet
|
||||||
- `GET /api/channels` — the device's Meshtastic channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]` (psk/keys are redacted; empty until the initial sync completes)
|
- `GET /api/channels` — the device's Meshtastic channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]` (psk/keys are redacted; empty until the initial sync completes)
|
||||||
- `GET /api/device` — device info captured during the initial sync: `{ myNodeNum, firmwareVersion?, metadata?, localConfig: {<section>: ...}, moduleConfig: {<module>: ...} }`. Key material is never exposed (security publicKey/privateKey/adminKey and network wifiPsk are replaced with `"REDACTED"`); in-memory only, reset on every bridge reconnect
|
- `GET /api/device` — device info captured during the initial sync: `{ myNodeNum, firmwareVersion?, metadata?, localConfig: {<section>: ...}, moduleConfig: {<module>: ...} }`. Key material is never exposed (security publicKey/privateKey/adminKey and network wifiPsk are replaced with `"REDACTED"`); in-memory only, reset on every bridge reconnect
|
||||||
- `GET /api/messages` — message history, newest first: inbound text (`dir:'rx'`, with `from`) and our sends (`dir:'tx'`, with `to` + `status`). tx records start `pending` and move to `delivered`/`failed` (with human-readable `ackError`) when the routing ACK/NACK arrives; broadcasts stay `pending` because firmware strips want_ack before TX. Backed by SQLite: the in-memory buffer (last 100) is seeded from the database on startup and re-upserted every second, so history survives process restarts and bridge reconnects; the database keeps the newest 1000 rows
|
- `GET /api/messages` — message history, newest first: inbound text (`dir:'rx'`, with `from`) and our sends (`dir:'tx'`, with `to` + `status`). tx records start `pending` and move to `delivered`/`failed` (with human-readable `ackError`) when the routing ACK/NACK arrives; broadcasts stay `pending` because firmware strips want_ack before TX. Backed by SQLite: the in-memory buffer (last 100) is seeded from the database on startup and re-upserted every second, so history survives process restarts and bridge reconnects; the database keeps the newest 1000 rows
|
||||||
@@ -67,7 +67,7 @@ Streamable HTTP transport in stateless mode. It maps 1:1 to the REST
|
|||||||
endpoints — no new logic, same channel pinning:
|
endpoints — no new logic, same channel pinning:
|
||||||
|
|
||||||
- `mesh_status` — bridge connection state (`{ connected, myNodeNum, host, port }`)
|
- `mesh_status` — bridge connection state (`{ connected, myNodeNum, host, port }`)
|
||||||
- `send_message(text, to?)` — send a text message; `to` resolves like `POST /api/send` (omitted/""/"!b"/"broadcast" → broadcast, number or numeric string → node number, else name lookup); returns `{ id }`; unknown/ambiguous targets are tool errors
|
- `send_message(text, to?, replyId?)` — send a text message; `to` resolves like `POST /api/send` (omitted/""/"!b"/"broadcast" → broadcast, number or numeric string → node number, else name lookup); optional `replyId` makes the message render as a threaded reply/quote of that packet id from `get_messages`; returns `{ id }`; unknown/ambiguous targets are tool errors
|
||||||
- `list_channels` — device channels (keys redacted)
|
- `list_channels` — device channels (keys redacted)
|
||||||
- `list_nodes` — known nodes as lean summaries
|
- `list_nodes` — known nodes as lean summaries
|
||||||
- `get_node(id)` — one node by number or name; tool error when missing/ambiguous
|
- `get_node(id)` — one node by number or name; tool error when missing/ambiguous
|
||||||
@@ -97,13 +97,24 @@ Hourly cron job (`src/weather`): fetches current conditions for Lublin from [Ope
|
|||||||
- `WEATHER_LAT` (default `51.2465`) / `WEATHER_LON` (default `22.5684`) — coordinates queried from Open-Meteo
|
- `WEATHER_LAT` (default `51.2465`) / `WEATHER_LON` (default `22.5684`) — coordinates queried from Open-Meteo
|
||||||
- `WEATHER_CITY` (default `"Lublin"`) — city name in the report line
|
- `WEATHER_CITY` (default `"Lublin"`) — city name in the report line
|
||||||
|
|
||||||
|
## Notify forwarder
|
||||||
|
|
||||||
|
Second compose service (`ops/forwarder`, `python:3.12-slim`, stdlib only): receives the bot's outbound notify webhook POSTs (`{text, from?}` on `MESH_NOTIFY_URL`) and forwards each one as a message to the mesh-bot folder's live opencode session (Basic auth). The opencode workspace UUID is regenerated on host restarts, so the forwarder resolves it dynamically per request via the opencode API: `GET /api/workspaces` → match by `path == FORWARDER_WORKSPACE_PATH` (fallback name `mesh-bot`, status `ready` preferred when several match) → `GET {proxyPath}/session` → most recently updated session (`time.updated`; first entry if absent). No caching — messages are rare. Runs with `network_mode: host` — it listens on the host's `0.0.0.0:4097`, which is why `MESH_NOTIFY_URL=http://172.24.0.1:4097/notify` works from the bot container, and reaches opencode at `127.0.0.1:9898`. `restart: unless-stopped`; no Traefik labels (host networking).
|
||||||
|
|
||||||
|
Config lives in `.env` (gitignored) and is passed via compose environment — credentials are never committed to the repo:
|
||||||
|
|
||||||
|
- `FORWARDER_API` (default `http://127.0.0.1:9898`) — opencode API base URL
|
||||||
|
- `FORWARDER_WORKSPACE_PATH` (default `/home/krzyw/projects/sandbox/mesh-bot`) — workspace matched by its `path` field (fallback name `mesh-bot`; status `ready` preferred when several match)
|
||||||
|
- `FORWARDER_SESSION` (optional, default empty) — pins a session ID; when set, session discovery is skipped. Empty/unset → the most recently updated session of the resolved workspace is used per request
|
||||||
|
- `FORWARDER_USER` / `FORWARDER_PASS` — Basic auth credentials; **required**, the container exits on startup if either is missing
|
||||||
|
|
||||||
## Env vars
|
## Env vars
|
||||||
|
|
||||||
- `MESH_HOST` (default `192.168.1.4`) — bridge host
|
- `MESH_HOST` (default `192.168.1.4`) — bridge host
|
||||||
- `MESH_PORT` (default `4403`) — bridge port
|
- `MESH_PORT` (default `4403`) — bridge port
|
||||||
- `MESH_RECONNECT_MS` (default `5000`) — reconnect interval in ms
|
- `MESH_RECONNECT_MS` (default `5000`) — reconnect interval in ms
|
||||||
- `MESH_SEND_CHANNEL` (default `3`) — channel index all sends target (`test`; never the primary channel)
|
- `MESH_SEND_CHANNEL` (default `3`) — channel index all sends target (`test`; never the primary channel)
|
||||||
- `MESH_NOTIFY_URL` — outbound notification webhook URL; when set (non-empty), an inbound rx text message arriving on channel `MESH_NOTIFY_CHANNEL` fires a fire-and-forget HTTP POST with JSON body `{text, from}` (`from` omitted when absent). Synthetic injected messages (`POST /api/messages`, channel 0) trigger it too when the notify channel is set to match. Messages from our own node are never notified (self-echo filter). Unset or empty = disabled (no fetch at all)
|
- `MESH_NOTIFY_URL` — outbound notification webhook URL; when set (non-empty), an inbound rx text message arriving on channel `MESH_NOTIFY_CHANNEL` fires a fire-and-forget HTTP POST with JSON body `{text, from}` (`from` omitted when absent). Failed POSTs are retried up to 3 times with backoff (2 s / 10 s / 30 s) before being dropped. Synthetic injected messages (`POST /api/messages`, channel 0) trigger it too when the notify channel is set to match. Messages from our own node are never notified (self-echo filter). Unset or empty = disabled (no fetch at all)
|
||||||
- `MESH_NOTIFY_CHANNEL` (default `3`) — channel index that triggers the notify webhook
|
- `MESH_NOTIFY_CHANNEL` (default `3`) — channel index that triggers the notify webhook
|
||||||
- `MESH_DB_PATH` (default `./data/mesh-bot.db`) — SQLite file backing the message history (parent dir created if missing; in Docker, mounted at `/app/data` via a named volume so it survives container recreation)
|
- `MESH_DB_PATH` (default `./data/mesh-bot.db`) — SQLite file backing the message history (parent dir created if missing; in Docker, mounted at `/app/data` via a named volume so it survives container recreation)
|
||||||
- `MESH_POLL_MS` (default `1000`) — how often the poller re-upserts the message history into SQLite and prunes rows beyond the newest 1000
|
- `MESH_POLL_MS` (default `1000`) — how often the poller re-upserts the message history into SQLite and prunes rows beyond the newest 1000
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ services:
|
|||||||
MESH_POLL_MS: '1000'
|
MESH_POLL_MS: '1000'
|
||||||
MESH_NOTIFY_URL: ${MESH_NOTIFY_URL:-}
|
MESH_NOTIFY_URL: ${MESH_NOTIFY_URL:-}
|
||||||
MESH_NOTIFY_CHANNEL: '${MESH_NOTIFY_CHANNEL:-3}'
|
MESH_NOTIFY_CHANNEL: '${MESH_NOTIFY_CHANNEL:-3}'
|
||||||
|
WEATHER_CRON: ${WEATHER_CRON:-}
|
||||||
volumes:
|
volumes:
|
||||||
- mesh_data:/app/data
|
- mesh_data:/app/data
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@@ -18,6 +19,16 @@ services:
|
|||||||
- 'traefik.http.routers.mesh-bot.rule=Host(`bot.dev.kkhost.pl`)'
|
- 'traefik.http.routers.mesh-bot.rule=Host(`bot.dev.kkhost.pl`)'
|
||||||
- 'traefik.http.routers.mesh-bot.entrypoints=web'
|
- 'traefik.http.routers.mesh-bot.entrypoints=web'
|
||||||
- 'traefik.http.services.mesh-bot.loadbalancer.server.port=3000'
|
- 'traefik.http.services.mesh-bot.loadbalancer.server.port=3000'
|
||||||
|
forwarder:
|
||||||
|
build: ./ops/forwarder
|
||||||
|
network_mode: host
|
||||||
|
environment:
|
||||||
|
FORWARDER_API: ${FORWARDER_API:-http://127.0.0.1:9898}
|
||||||
|
FORWARDER_WORKSPACE_PATH: ${FORWARDER_WORKSPACE_PATH:-/home/krzyw/projects/sandbox/mesh-bot}
|
||||||
|
FORWARDER_SESSION: ${FORWARDER_SESSION:-}
|
||||||
|
FORWARDER_USER: ${FORWARDER_USER:-}
|
||||||
|
FORWARDER_PASS: ${FORWARDER_PASS:-}
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mesh_data:
|
mesh_data:
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
FROM python:3.12-slim
|
||||||
|
WORKDIR /app
|
||||||
|
COPY forwarder.py .
|
||||||
|
CMD ["python3", "forwarder.py"]
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""mesh-bot notify forwarder: POST /notify {text, from?} -> opencode session message (basic auth).
|
||||||
|
|
||||||
|
The opencode workspace UUID is regenerated on host restarts, so the target workspace + session are
|
||||||
|
resolved dynamically per request via the opencode API (no caching — messages are rare): list
|
||||||
|
workspaces, pick the mesh-bot one by path (fallback: name), then its most recently updated session.
|
||||||
|
|
||||||
|
Note on semantics: the opencode API accepts a session message immediately but holds the HTTP
|
||||||
|
response until the agent turn completes — so a read timeout here means DELIVERED, not failed.
|
||||||
|
"""
|
||||||
|
import json, base64, urllib.request
|
||||||
|
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||||
|
import os
|
||||||
|
|
||||||
|
API = os.environ.get("FORWARDER_API", "http://127.0.0.1:9898")
|
||||||
|
WORKSPACE_PATH = os.environ.get("FORWARDER_WORKSPACE_PATH", "/home/krzyw/projects/sandbox/mesh-bot")
|
||||||
|
SESSION_OVERRIDE = os.environ.get("FORWARDER_SESSION", "") # when set, skips session discovery
|
||||||
|
USER = os.environ["FORWARDER_USER"] # required; fail fast if missing
|
||||||
|
PASS = os.environ["FORWARDER_PASS"] # required; fail fast if missing
|
||||||
|
|
||||||
|
def _auth_headers():
|
||||||
|
return {"Authorization": "Basic " + base64.b64encode(f"{USER}:{PASS}".encode()).decode()}
|
||||||
|
|
||||||
|
def _get_json(url):
|
||||||
|
req = urllib.request.Request(url, headers=_auth_headers())
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req, timeout=15) as r:
|
||||||
|
return json.loads(r.read().decode())
|
||||||
|
except Exception as e:
|
||||||
|
raise RuntimeError(f"opencode API unreachable at {url}: {e!r}") from None
|
||||||
|
|
||||||
|
def resolve_target():
|
||||||
|
"""Resolve (base_url, session_id) fresh per request; raises RuntimeError with a clear reason."""
|
||||||
|
workspaces = _get_json(API + "/api/workspaces")
|
||||||
|
matches = [w for w in workspaces if w.get("path") == WORKSPACE_PATH] or \
|
||||||
|
[w for w in workspaces if w.get("name") == "mesh-bot"]
|
||||||
|
pool = [w for w in matches if w.get("status") == "ready"] or matches
|
||||||
|
if not pool:
|
||||||
|
raise RuntimeError(f"workspace not found: path={WORKSPACE_PATH} name=mesh-bot")
|
||||||
|
base = API + pool[0]["proxyPath"]
|
||||||
|
sid = SESSION_OVERRIDE
|
||||||
|
if not sid:
|
||||||
|
sessions = _get_json(base + "/session")
|
||||||
|
if not sessions:
|
||||||
|
raise RuntimeError(f"no sessions in workspace {pool[0]['id']} ({WORKSPACE_PATH})")
|
||||||
|
|
||||||
|
def updated(s):
|
||||||
|
return (s.get("time") or {}).get("updated") or 0
|
||||||
|
sid = max(sessions, key=updated)["id"] if any(updated(s) for s in sessions) else sessions[0]["id"]
|
||||||
|
return base, sid
|
||||||
|
|
||||||
|
class H(BaseHTTPRequestHandler):
|
||||||
|
def do_POST(self):
|
||||||
|
if self.path != "/notify":
|
||||||
|
self.send_response(404); self.end_headers(); return
|
||||||
|
n = int(self.headers.get("Content-Length", 0))
|
||||||
|
try:
|
||||||
|
body = json.loads(self.rfile.read(n) or b"{}")
|
||||||
|
text, frm = body.get("text"), body.get("from")
|
||||||
|
msg = 'New mesh message' + (f' from node {frm}' if frm is not None else '') + f': "{text}" — please react to it.'
|
||||||
|
base, sid = resolve_target() # fresh per request; RuntimeError on API/workspace/session failure
|
||||||
|
req = urllib.request.Request(
|
||||||
|
f"{base}/session/{sid}/message",
|
||||||
|
data=json.dumps({"parts": [{"type": "text", "text": msg}]}).encode(),
|
||||||
|
headers={"Content-Type": "application/json", **_auth_headers()},
|
||||||
|
method="POST")
|
||||||
|
try:
|
||||||
|
r = urllib.request.urlopen(req, timeout=15)
|
||||||
|
code = r.status # headers received => opencode accepted the message
|
||||||
|
try: out = r.read(200).decode(errors='replace')
|
||||||
|
except Exception as e2: out = f'(body read failed after delivery: {e2!r})'
|
||||||
|
print(f"forwarded to opencode session {sid}: HTTP {code} {out[:150]!r}", flush=True)
|
||||||
|
self._reply(code if 200 <= code < 300 else 502, b'{"ok":true}' if 200 <= code < 300 else str(code).encode())
|
||||||
|
except TimeoutError:
|
||||||
|
# request was sent; opencode holds the response until the agent turn finishes => delivered
|
||||||
|
print(f"forwarded to opencode session {sid}: accepted (response still pending after 15 s)", flush=True)
|
||||||
|
self._reply(202, b'{"ok":true,"note":"accepted; opencode response pending"}')
|
||||||
|
except RuntimeError as e:
|
||||||
|
# resolve_target() failure modes: API unreachable / workspace not found / no sessions in workspace
|
||||||
|
print(f"target resolution failed: {e!r}", flush=True)
|
||||||
|
self._reply(502, repr(e).encode())
|
||||||
|
except Exception as e:
|
||||||
|
print(f"opencode call failed: {e!r}", flush=True)
|
||||||
|
self._reply(502, repr(e).encode())
|
||||||
|
|
||||||
|
def _reply(self, code, payload):
|
||||||
|
try:
|
||||||
|
self.send_response(code); self.end_headers(); self.wfile.write(payload)
|
||||||
|
except (BrokenPipeError, ConnectionResetError):
|
||||||
|
pass # client went away; delivery state already logged above
|
||||||
|
|
||||||
|
def log_message(self, fmt, *args):
|
||||||
|
print("forwarder:", fmt % args, flush=True)
|
||||||
|
|
||||||
|
HTTPServer(("0.0.0.0", 4097), H).serve_forever()
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mesh-bot",
|
"name": "mesh-bot",
|
||||||
"version": "0.12.0",
|
"version": "0.12.8",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
+25
-1
@@ -1,5 +1,7 @@
|
|||||||
|
import { fromBinary, toBinary } from '@bufbuild/protobuf';
|
||||||
|
import * as P from '@meshtastic/protobufs';
|
||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
import { extractFrames, frame } from './codec.js';
|
import { buildTextToRadio, extractFrames, frame } from './codec.js';
|
||||||
|
|
||||||
const F = (payload: number[]) => [
|
const F = (payload: number[]) => [
|
||||||
0x94,
|
0x94,
|
||||||
@@ -78,3 +80,25 @@ describe('frame', () => {
|
|||||||
expect(rest.length).toBe(0);
|
expect(rest.length).toBe(0);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// re-serialize just the nested Data message so its wire bytes are inspectable without the random packet id interfering
|
||||||
|
function dataBytes(framed: Uint8Array): Uint8Array {
|
||||||
|
const { packets } = extractFrames(framed); // buildTextToRadio returns framed bytes
|
||||||
|
expect(packets).toHaveLength(1);
|
||||||
|
const tr = fromBinary(P.Mesh.ToRadioSchema, packets[0]);
|
||||||
|
if (tr.payloadVariant?.case !== 'packet') throw new Error('not a packet');
|
||||||
|
const pv = tr.payloadVariant.value.payloadVariant;
|
||||||
|
if (pv?.case !== 'decoded') throw new Error('not decoded');
|
||||||
|
return toBinary(P.Mesh.DataSchema, pv.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('buildTextToRadio', () => {
|
||||||
|
it('writes wire tag 0x3d (Data.reply_id, field 7) iff replyId is given', async () => {
|
||||||
|
const withReply = await buildTextToRadio(42, 'hi', 3, 42);
|
||||||
|
expect(Array.from(dataBytes(withReply.bytes))).toContain(0x3d);
|
||||||
|
|
||||||
|
// omitting it must leave the field off the wire (proto3 default 0) — snake_case reply_id would be silently dropped here
|
||||||
|
const plain = await buildTextToRadio(42, 'hi', 3);
|
||||||
|
expect(Array.from(dataBytes(plain.bytes))).not.toContain(0x3d);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -126,6 +126,7 @@ export async function buildTextToRadio(
|
|||||||
to: number,
|
to: number,
|
||||||
text: string,
|
text: string,
|
||||||
channelIndex: number,
|
channelIndex: number,
|
||||||
|
replyId?: number,
|
||||||
): Promise<{ bytes: Uint8Array; id: number }> {
|
): Promise<{ bytes: Uint8Array; id: number }> {
|
||||||
const P = await loadProto();
|
const P = await loadProto();
|
||||||
const id = randomPacketId();
|
const id = randomPacketId();
|
||||||
@@ -140,6 +141,8 @@ export async function buildTextToRadio(
|
|||||||
portnum: P.Portnums.PortNum.TEXT_MESSAGE_APP,
|
portnum: P.Portnums.PortNum.TEXT_MESSAGE_APP,
|
||||||
payload: new TextEncoder().encode(text),
|
payload: new TextEncoder().encode(text),
|
||||||
wantResponse: true,
|
wantResponse: true,
|
||||||
|
// camelCase on purpose — the JS protobufs package silently drops snake_case reply_id; 0 = not a reply (proto3 default, omitted from wire)
|
||||||
|
replyId: replyId ?? 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ describe('MCP server tools', () => {
|
|||||||
expect(Object.keys(send.inputSchema.properties ?? {})).toEqual([
|
expect(Object.keys(send.inputSchema.properties ?? {})).toEqual([
|
||||||
'text',
|
'text',
|
||||||
'to',
|
'to',
|
||||||
|
'replyId',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const inject = tools.find((t) => t.name === 'inject_message')!;
|
const inject = tools.find((t) => t.name === 'inject_message')!;
|
||||||
|
|||||||
@@ -33,11 +33,17 @@ export function createMeshMcpServer(mesh: MeshService): McpServer {
|
|||||||
server.registerTool(
|
server.registerTool(
|
||||||
'send_message',
|
'send_message',
|
||||||
{
|
{
|
||||||
description: `Send a text message over the mesh; returns { id } — the Meshtastic packet id. to: omitted/"" or "!b"/"broadcast" (case-insensitive) → broadcast; number or numeric string → that node number (integer in 1..0xffffffff); anything else is looked up by name (exact long/short name, then unique substring). Unknown or ambiguous targets are an error.${CHANNEL_NOTE}`,
|
description: `Send a text message over the mesh; returns { id } — the Meshtastic packet id. to: omitted/"" or "!b"/"broadcast" (case-insensitive) → broadcast; number or numeric string → that node number (integer in 1..0xffffffff); anything else is looked up by name (exact long/short name, then unique substring). Unknown or ambiguous targets are an error. replyId (optional, integer in 1..0xffffffff): the packet id of an earlier message from GET /api/messages or get_messages — when set, the recipient app renders this message as a threaded reply/quote of that packet.${CHANNEL_NOTE}`,
|
||||||
inputSchema: { text: z.string(), to: z.string().optional() },
|
inputSchema: {
|
||||||
|
text: z.string(),
|
||||||
|
to: z.string().optional(),
|
||||||
|
replyId: z.number().int().min(1).max(0xffffffff).optional(),
|
||||||
},
|
},
|
||||||
async ({ text, to }) =>
|
},
|
||||||
jsonResult({ id: await mesh.sendText(await mesh.resolveDest(to), text) }),
|
async ({ text, to, replyId }) =>
|
||||||
|
jsonResult({
|
||||||
|
id: await mesh.sendText(await mesh.resolveDest(to), text, replyId),
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
server.registerTool(
|
server.registerTool(
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import {
|
|||||||
ApiResponse,
|
ApiResponse,
|
||||||
ApiTags,
|
ApiTags,
|
||||||
} from '@nestjs/swagger';
|
} from '@nestjs/swagger';
|
||||||
|
import { BROADCAST_ADDR } from './codec.js';
|
||||||
import type { DeviceInfo } from './mesh.service.js';
|
import type { DeviceInfo } from './mesh.service.js';
|
||||||
import { MeshService } from './mesh.service.js';
|
import { MeshService } from './mesh.service.js';
|
||||||
|
|
||||||
@@ -38,6 +39,13 @@ export class SendTextDto {
|
|||||||
example: '!b',
|
example: '!b',
|
||||||
})
|
})
|
||||||
to?: string | number;
|
to?: string | number;
|
||||||
|
@ApiProperty({
|
||||||
|
required: false,
|
||||||
|
description:
|
||||||
|
'Packet id of an earlier message (from GET /api/messages) that this one replies to — the recipient app renders it as a threaded reply/quote. Integer in 1..0xffffffff.',
|
||||||
|
example: 456789,
|
||||||
|
})
|
||||||
|
replyId?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
// tag description is set via DocumentBuilder.addTag in main.ts (v12 ApiTagOptions has no description)
|
// tag description is set via DocumentBuilder.addTag in main.ts (v12 ApiTagOptions has no description)
|
||||||
@@ -70,7 +78,7 @@ export class MeshController {
|
|||||||
@ApiOperation({
|
@ApiOperation({
|
||||||
summary: 'Send a text message over the mesh',
|
summary: 'Send a text message over the mesh',
|
||||||
description:
|
description:
|
||||||
'Queues a TEXT_MESSAGE_APP packet to the resolved target (node number, node name, or broadcast). DMs are unicast and wantAck-tracked via GET /api/messages; broadcasts stay pending because firmware strips want_ack. All sends ride the pinned test channel (index 3, "test" — never the primary channel) regardless of DM or broadcast, since modern firmware PKI handles unicast encryption/channel anyway. Returns the Meshtastic packet id.',
|
'Queues a TEXT_MESSAGE_APP packet to the resolved target (node number, node name, or broadcast). Optional replyId (integer in 1..0xffffffff) references an earlier message\'s packet id from GET /api/messages — when set, the recipient app renders this message as a threaded reply/quote of that packet. DMs are unicast and wantAck-tracked via GET /api/messages; broadcasts stay pending because firmware strips want_ack. All sends ride the pinned test channel (index 3, "test" — never the primary channel) regardless of DM or broadcast, since modern firmware PKI handles unicast encryption/channel anyway. Returns the Meshtastic packet id.',
|
||||||
})
|
})
|
||||||
@ApiResponse({
|
@ApiResponse({
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -83,6 +91,15 @@ export class MeshController {
|
|||||||
if (typeof body?.text !== 'string' || body.text.length === 0) {
|
if (typeof body?.text !== 'string' || body.text.length === 0) {
|
||||||
throw new BadRequestException('text must be a non-empty string');
|
throw new BadRequestException('text must be a non-empty string');
|
||||||
}
|
}
|
||||||
|
const replyId = body.replyId;
|
||||||
|
if (
|
||||||
|
replyId !== undefined &&
|
||||||
|
(!Number.isInteger(replyId) || replyId < 1 || replyId > BROADCAST_ADDR)
|
||||||
|
) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'replyId must be an integer in 1..0xffffffff',
|
||||||
|
);
|
||||||
|
}
|
||||||
let to: number;
|
let to: number;
|
||||||
try {
|
try {
|
||||||
to = await this.mesh.resolveDest(body.to);
|
to = await this.mesh.resolveDest(body.to);
|
||||||
@@ -91,7 +108,7 @@ export class MeshController {
|
|||||||
err instanceof Error ? err.message : String(err),
|
err instanceof Error ? err.message : String(err),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return { id: await this.mesh.sendText(to, body.text) };
|
return { id: await this.mesh.sendText(to, body.text, replyId) };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('channels')
|
@Get('channels')
|
||||||
|
|||||||
@@ -23,5 +23,6 @@ function openMessageDb(): DatabaseSync {
|
|||||||
useFactory: () => new MeshService(openMessageDb()),
|
useFactory: () => new MeshService(openMessageDb()),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
exports: [MeshService],
|
||||||
})
|
})
|
||||||
export class MeshModule {}
|
export class MeshModule {}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
|
import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
|
||||||
|
import { Logger } from '@nestjs/common';
|
||||||
import * as P from '@meshtastic/protobufs';
|
import * as P from '@meshtastic/protobufs';
|
||||||
import { DatabaseSync } from 'node:sqlite';
|
import { DatabaseSync } from 'node:sqlite';
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
@@ -295,6 +296,64 @@ describe('MeshService send', () => {
|
|||||||
bridge.close();
|
bridge.close();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('sets Data.reply_id when replyId is given and leaves it unset otherwise', async () => {
|
||||||
|
const bridge = await startBridge();
|
||||||
|
process.env.MESH_HOST = '127.0.0.1';
|
||||||
|
process.env.MESH_PORT = String(bridge.port);
|
||||||
|
const svc = new MeshService();
|
||||||
|
try {
|
||||||
|
svc.onModuleInit();
|
||||||
|
await waitFor(
|
||||||
|
() => bridge.sockets.length === 1 && svc.status().connected,
|
||||||
|
);
|
||||||
|
|
||||||
|
const out: Uint8Array[] = [];
|
||||||
|
bridge.sockets[0].on('data', (c) => out.push(c));
|
||||||
|
await svc.sendText(42, 'reply send', 42); // replyId = 42
|
||||||
|
await svc.sendText(43, 'plain send');
|
||||||
|
|
||||||
|
const readOutbound = (): P.Mesh.MeshPacket[] => {
|
||||||
|
const merged = new Uint8Array(out.reduce((n, c) => n + c.length, 0));
|
||||||
|
let off = 0;
|
||||||
|
for (const c of out) {
|
||||||
|
merged.set(c, off);
|
||||||
|
off += c.length;
|
||||||
|
}
|
||||||
|
const { packets } = extractFrames(merged);
|
||||||
|
// outbound starts with the want_config_id frame — collect only text packets, in order
|
||||||
|
return packets.flatMap((p) => {
|
||||||
|
const tr = fromBinary(P.Mesh.ToRadioSchema, p);
|
||||||
|
if (tr.payloadVariant?.case === 'packet')
|
||||||
|
return [tr.payloadVariant.value];
|
||||||
|
return [];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
await waitFor(() => readOutbound().length === 2);
|
||||||
|
const [replyPkt, plainPkt] = readOutbound();
|
||||||
|
const replyData =
|
||||||
|
replyPkt.payloadVariant?.case === 'decoded'
|
||||||
|
? replyPkt.payloadVariant.value
|
||||||
|
: undefined;
|
||||||
|
expect(
|
||||||
|
new TextDecoder().decode(replyData?.payload ?? new Uint8Array()),
|
||||||
|
).toBe('reply send');
|
||||||
|
expect(replyData?.replyId).toBe(42); // threaded reply to packet 42
|
||||||
|
|
||||||
|
const plainData =
|
||||||
|
plainPkt.payloadVariant?.case === 'decoded'
|
||||||
|
? plainPkt.payloadVariant.value
|
||||||
|
: undefined;
|
||||||
|
expect(
|
||||||
|
new TextDecoder().decode(plainData?.payload ?? new Uint8Array()),
|
||||||
|
).toBe('plain send');
|
||||||
|
expect(plainData?.replyId).toBe(0); // omitted → proto3 default, not a reply
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('MeshService node database', () => {
|
describe('MeshService node database', () => {
|
||||||
@@ -789,6 +848,100 @@ describe('MeshService notify webhook', () => {
|
|||||||
bridge.close();
|
bridge.close();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('retries a failed webhook POST with backoff and stops on success', async () => {
|
||||||
|
process.env.MESH_NOTIFY_URL = 'http://notify.example/hook';
|
||||||
|
process.env.MESH_NOTIFY_CHANNEL = '0';
|
||||||
|
const fetchMock = vi
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValueOnce(new Error('boom 1'))
|
||||||
|
.mockRejectedValueOnce(new Error('boom 2'))
|
||||||
|
.mockResolvedValueOnce(undefined);
|
||||||
|
vi.stubGlobal('fetch', fetchMock);
|
||||||
|
const warnSpy = vi.spyOn(Logger.prototype, 'warn');
|
||||||
|
const sleep = vi.fn(async (_ms: number) => {});
|
||||||
|
const svc = new MeshService();
|
||||||
|
(svc as unknown as { sleep(ms: number): Promise<void> }).sleep = sleep;
|
||||||
|
try {
|
||||||
|
expect(() => svc.injectMessage('hi', 42)).not.toThrow();
|
||||||
|
|
||||||
|
await waitFor(() => fetchMock.mock.calls.length === 3);
|
||||||
|
// success on the third attempt: exactly 3 POSTs, no dropped log
|
||||||
|
expect(fetchMock).toHaveBeenCalledTimes(3);
|
||||||
|
expect(sleep).toHaveBeenNthCalledWith(1, 2_000);
|
||||||
|
expect(sleep).toHaveBeenNthCalledWith(2, 10_000);
|
||||||
|
const warns = warnSpy.mock.calls.map((c) => String(c[0]));
|
||||||
|
expect(warns.some((w) => w.includes('attempt 1/4'))).toBe(true);
|
||||||
|
expect(warns.some((w) => w.includes('attempt 2/4'))).toBe(true);
|
||||||
|
expect(warns.some((w) => w.includes('notify dropped'))).toBe(false);
|
||||||
|
} finally {
|
||||||
|
warnSpy.mockRestore();
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
delete process.env.MESH_NOTIFY_URL;
|
||||||
|
delete process.env.MESH_NOTIFY_CHANNEL;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries a webhook POST that answers with an HTTP error status and stops on success', async () => {
|
||||||
|
process.env.MESH_NOTIFY_URL = 'http://notify.example/hook';
|
||||||
|
process.env.MESH_NOTIFY_CHANNEL = '0';
|
||||||
|
const fetchMock = vi
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce({ ok: false, status: 502 })
|
||||||
|
.mockResolvedValueOnce({ ok: false, status: 502 })
|
||||||
|
.mockResolvedValueOnce({ ok: true, status: 200 });
|
||||||
|
vi.stubGlobal('fetch', fetchMock);
|
||||||
|
const warnSpy = vi.spyOn(Logger.prototype, 'warn');
|
||||||
|
const sleep = vi.fn(async (_ms: number) => {});
|
||||||
|
const svc = new MeshService();
|
||||||
|
(svc as unknown as { sleep(ms: number): Promise<void> }).sleep = sleep;
|
||||||
|
try {
|
||||||
|
expect(() => svc.injectMessage('hi', 42)).not.toThrow();
|
||||||
|
|
||||||
|
await waitFor(() => fetchMock.mock.calls.length === 3);
|
||||||
|
// HTTP 502 twice, then 200: exactly 3 POSTs, no dropped log
|
||||||
|
expect(fetchMock).toHaveBeenCalledTimes(3);
|
||||||
|
const warns = warnSpy.mock.calls.map((c) => String(c[0]));
|
||||||
|
expect(warns.some((w) => w.includes('attempt 1/4'))).toBe(true);
|
||||||
|
expect(warns.some((w) => w.includes('HTTP 502'))).toBe(true);
|
||||||
|
expect(warns.some((w) => w.includes('notify dropped'))).toBe(false);
|
||||||
|
} finally {
|
||||||
|
warnSpy.mockRestore();
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
delete process.env.MESH_NOTIFY_URL;
|
||||||
|
delete process.env.MESH_NOTIFY_CHANNEL;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives up after 4 attempts and logs notify dropped', async () => {
|
||||||
|
process.env.MESH_NOTIFY_URL = 'http://notify.example/hook';
|
||||||
|
process.env.MESH_NOTIFY_CHANNEL = '0';
|
||||||
|
const fetchMock = vi.fn().mockRejectedValue(new Error('down'));
|
||||||
|
vi.stubGlobal('fetch', fetchMock);
|
||||||
|
const warnSpy = vi.spyOn(Logger.prototype, 'warn');
|
||||||
|
const sleep = vi.fn(async (_ms: number) => {});
|
||||||
|
const svc = new MeshService();
|
||||||
|
(svc as unknown as { sleep(ms: number): Promise<void> }).sleep = sleep;
|
||||||
|
try {
|
||||||
|
expect(() => svc.injectMessage('hi', 42)).not.toThrow();
|
||||||
|
|
||||||
|
await waitFor(() =>
|
||||||
|
warnSpy.mock.calls.some((c) =>
|
||||||
|
String(c[0]).includes('notify dropped after 4 attempts'),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
// exactly 4 attempts, final WARN with the exact message, nothing thrown
|
||||||
|
expect(fetchMock).toHaveBeenCalledTimes(4);
|
||||||
|
const warns = warnSpy.mock.calls.map((c) => String(c[0]));
|
||||||
|
expect(warns).toContain('notify dropped after 4 attempts: down');
|
||||||
|
expect(sleep).toHaveBeenNthCalledWith(3, 30_000);
|
||||||
|
} finally {
|
||||||
|
warnSpy.mockRestore();
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
delete process.env.MESH_NOTIFY_URL;
|
||||||
|
delete process.env.MESH_NOTIFY_CHANNEL;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('MeshService injectMessage', () => {
|
describe('MeshService injectMessage', () => {
|
||||||
|
|||||||
@@ -130,6 +130,8 @@ function jsonSafe<T>(value: T): T {
|
|||||||
|
|
||||||
// key material must never leave the process — replaced with a marker so callers can see the field exists
|
// key material must never leave the process — replaced with a marker so callers can see the field exists
|
||||||
const REDACTED = 'REDACTED';
|
const REDACTED = 'REDACTED';
|
||||||
|
// ponytail: hardcoded notify-webhook backoff [2s, 10s, 30s] (~45 s window) — no env knob; tune here if outages run longer
|
||||||
|
const NOTIFY_RETRY_DELAYS_MS = [2_000, 10_000, 30_000];
|
||||||
/** Config sections that carry secrets: security (PKI keys) and network (wifi psk). */
|
/** Config sections that carry secrets: security (PKI keys) and network (wifi psk). */
|
||||||
function redactSection(
|
function redactSection(
|
||||||
name: string,
|
name: string,
|
||||||
@@ -441,14 +443,39 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}
|
}
|
||||||
const body: Record<string, unknown> = { text };
|
const body: Record<string, unknown> = { text };
|
||||||
if (from !== undefined) body.from = from;
|
if (from !== undefined) body.from = from;
|
||||||
void fetch(this.notifyUrl, {
|
void this.postNotify(body);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** POST the webhook with retries: up to NOTIFY_RETRY_DELAYS_MS.length + 1 attempts total. */
|
||||||
|
private async postNotify(body: Record<string, unknown>): Promise<void> {
|
||||||
|
const maxAttempts = NOTIFY_RETRY_DELAYS_MS.length + 1;
|
||||||
|
for (let attempt = 1; ; attempt++) {
|
||||||
|
try {
|
||||||
|
const res = await fetch(this.notifyUrl, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'content-type': 'application/json' },
|
headers: { 'content-type': 'application/json' },
|
||||||
body: JSON.stringify(body),
|
body: JSON.stringify(body),
|
||||||
}).catch((err: unknown) =>
|
});
|
||||||
this.logger.warn('notify webhook failed: ' + (err as Error).message),
|
if (res && !res.ok) throw new Error('HTTP ' + res.status); // HTTP errors retry like network failures
|
||||||
|
return; // success on any attempt — same as today's single POST
|
||||||
|
} catch (err: unknown) {
|
||||||
|
const msg = (err as Error).message;
|
||||||
|
this.logger.warn(
|
||||||
|
`notify webhook failed (attempt ${attempt}/${maxAttempts}): ${msg}`,
|
||||||
);
|
);
|
||||||
|
if (attempt === maxAttempts) {
|
||||||
|
this.logger.warn(`notify dropped after ${attempt} attempts: ${msg}`);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
await this.sleep(NOTIFY_RETRY_DELAYS_MS[attempt - 1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Injectable so specs can skip the backoff delays. */
|
||||||
|
private sleep(ms: number): Promise<void> {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -461,11 +488,16 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
return [...this.telemetryHistory].reverse();
|
return [...this.telemetryHistory].reverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Send `text` to node `to` on the pinned test channel; returns the packet id. Throws ServiceUnavailable when the bridge is down. */
|
/** Send `text` to node `to` on the pinned test channel; returns the packet id. Optional `replyId` marks the message as a reply to an earlier packet (the recipient app renders it as a threaded quote). Throws ServiceUnavailable when the bridge is down. */
|
||||||
async sendText(to: number, text: string): Promise<number> {
|
async sendText(to: number, text: string, replyId?: number): Promise<number> {
|
||||||
if (!this.connected || !this.socket)
|
if (!this.connected || !this.socket)
|
||||||
throw new ServiceUnavailableException('bridge not connected');
|
throw new ServiceUnavailableException('bridge not connected');
|
||||||
const { bytes, id } = await buildTextToRadio(to, text, this.sendChannel);
|
const { bytes, id } = await buildTextToRadio(
|
||||||
|
to,
|
||||||
|
text,
|
||||||
|
this.sendChannel,
|
||||||
|
replyId,
|
||||||
|
);
|
||||||
const rec: MessageRecord = {
|
const rec: MessageRecord = {
|
||||||
id,
|
id,
|
||||||
dir: 'tx',
|
dir: 'tx',
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { Test } from '@nestjs/testing';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
import { MeshService } from '../mesh/mesh.service.js';
|
||||||
|
import { WeatherModule } from './weather.module.js';
|
||||||
|
import { WeatherService } from './weather.service.js';
|
||||||
|
|
||||||
|
describe('DI wiring (module graph)', () => {
|
||||||
|
// compile() instantiates providers but does not run lifecycle hooks, so no TCP connection is opened.
|
||||||
|
it('resolves WeatherService with MeshService provided by MeshModule', async () => {
|
||||||
|
process.env.MESH_DB_PATH = ':memory:'; // keep openMessageDb from touching the repo's ./data
|
||||||
|
const moduleRef = await Test.createTestingModule({
|
||||||
|
imports: [WeatherModule],
|
||||||
|
}).compile();
|
||||||
|
expect(moduleRef.get(WeatherService)).toBeInstanceOf(WeatherService);
|
||||||
|
expect(moduleRef.get(MeshService)).toBeInstanceOf(MeshService);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import { Cron } from '@nestjs/schedule';
|
import { Cron } from '@nestjs/schedule';
|
||||||
import { BROADCAST_ADDR } from '../mesh/codec.js';
|
import { BROADCAST_ADDR } from '../mesh/codec.js';
|
||||||
import type { MeshService } from '../mesh/mesh.service.js';
|
import { MeshService } from '../mesh/mesh.service.js';
|
||||||
|
|
||||||
/** Open-Meteo `current` block fields we use (free API, no key). */
|
/** Open-Meteo `current` block fields we use (free API, no key). */
|
||||||
export interface CurrentWeather {
|
export interface CurrentWeather {
|
||||||
|
|||||||
Reference in New Issue
Block a user