Compare commits

...
6 Commits
Author SHA1 Message Date
kamilkrzywda a8ce04d3f8 Merge pull request 'Add #rss command family with LLM tags and summaries (v0.20.0)' (#41) from feat/rss-command into main
CI / build + unit (push) Successful in 40s
Add #rss command family with LLM tags and summaries (v0.20.0) (#41)
2026-09-25 20:46:56 +02:00
kamilkrzywda eda1cbd125 Add #rss command family with LLM tags and summaries (v0.20.0)
CI / build + unit (pull_request) Successful in 1m15s
#rss subcommands on the command channel: help / add <url> <name> /
remove <name> / tags / sources / get <name|#tag>. Sources are stored in
a new rss_sources table in the existing MESH_DB_PATH file (second
node:sqlite connection, case-insensitive names); feeds parsed with
fast-xml-parser (RSS 2.0 + Atom); AI tags and headline summaries via
injected LlmService.chat() with bounded maxTokens (50/200).

CommandService gains prefix registration so one handler owns the whole
#rss family while #ping stays an exact match; wired in CommandModule's
factory — still no constructor-level cycle, no forwardRef. One dead feed
does not sink a tag summary.
2026-09-25 18:44:06 +00:00
kamilkrzywda 023cd3eef3 Merge pull request 'Add OpenAI-compatible LLM client service (v0.19.0)' (#40) from feat/llm-client into main
CI / build + unit (push) Successful in 40s
Add OpenAI-compatible LLM client service (v0.19.0) (#40)
2026-09-25 20:09:32 +02:00
kamilkrzywda c5a2815c01 Add OpenAI-compatible LLM client service (v0.19.0)
CI / build + unit (pull_request) Successful in 1m14s
LlmService wraps the local OpenAI-compatible server (default
http://192.168.1.70:1111/v1, no auth) with native fetch only — no new
dependencies. listModels() -> data[].id; chat(messages, opts?) ->
choices[0].message.content (non-2xx throws with status + body snippet);
summarize(text) = chat() with a concise-summary system prompt.

Env: LLM_API_BASE / LLM_MODEL (qwen3.8-27b) / LLM_TIMEOUT_MS (60000,
AbortSignal.timeout). Plain feature module wired into app.module.ts;
docs synced (AGENTS.md, README env list).
2026-09-25 18:07:21 +00:00
kamilkrzywda 55e59d4963 Merge pull request 'Route command replies through respond() — same channel, threaded quote (v0.18.1)' (#39) from fix/command-replies-respond into main
CI / build + unit (push) Successful in 1m10s
2026-09-25 19:32:31 +02:00
kamilkrzywda 9d4c9594af Route command replies through MeshService.respond() — same channel, threaded quote (v0.18.1)
CI / build + unit (pull_request) Successful in 42s
2026-09-25 17:30:28 +00:00
22 changed files with 1332 additions and 52 deletions
+2 -1
View File
@@ -27,4 +27,5 @@
- MESHTASTIC.md — rules for Meshtastic communication (owner authority, language, response protocol); read before acting on mesh messages. - MESHTASTIC.md — rules for Meshtastic communication (owner authority, language, response protocol); read before acting on mesh messages.
- Hourly cron weather report job (`src/weather`): fetches Open-Meteo current conditions and broadcasts a one-line report to the mesh on the pinned send channel; env `WEATHER_CRON`/`WEATHER_LAT`/`WEATHER_LON`/`WEATHER_CITY`. - Hourly cron weather report job (`src/weather`): fetches Open-Meteo current conditions and broadcasts a one-line report to the mesh on the pinned send channel; env `WEATHER_CRON`/`WEATHER_LAT`/`WEATHER_LON`/`WEATHER_CITY`.
- Channel-2 auto-responder (`src/commands`): event-driven — `CommandService.onRx()` is called by `MeshService` for every decoded rx text (right after the notify gate) and dispatches exact, case-sensitive `#command` matches on `COMMAND_CHANNEL` (env, default 2) through a single-registration-point registry (handlers registered in the constructor via `register(name, fn)`; handler gets `{ text, from?, id? }`, returns reply string or void = no reply). First command: `#ping` → replies `#pong!`. Replies ride `COMMAND_CHANNEL`: directed DM back to the sender when present, else broadcast. A failing handler/send only logs a warn. DI: provided by `CommandModule`'s factory (injects `MeshService`, attaches itself via `attachCommands()`) — no constructor-level cycle; `forwardRef` was tried and left one side null in NestJS 12's injector. - Channel-2 auto-responder (`src/commands`): event-driven — `CommandService.onRx()` is called by `MeshService` for every decoded rx text (right after the notify gate) and dispatches exact, case-sensitive `#command` matches on `COMMAND_CHANNEL` (env, default 2) through a single-registration-point registry (handlers registered in the constructor via `register(name, fn)`; handler gets `{ text, from?, id? }`, returns reply string or void = no reply). First command: `#ping` → replies `#pong!`. Replies go through `MeshService.respond(id, reply)`: auto-routed (rx → DM back to the original sender unless the original was a broadcast; tx → its destination), riding the original record's channel with `replyId = id` so the recipient app renders it as a threaded quote — `COMMAND_CHANNEL` is only the trigger/listen gate. Only when the trigger has no packet id does it fall back to legacy sendText routing on `COMMAND_CHANNEL`. A failing handler/respond only logs a warn. DI: provided by `CommandModule`'s factory (injects `MeshService`, attaches itself via `attachCommands()`) — no constructor-level cycle; `forwardRef` was tried and left one side null in NestJS 12's injector. Prefix dispatch (`registerPrefix(name, fn)`) lets one handler own a whole family: the `#rss` subcommands live in `src/rss` (`RssService.handle`, registered as prefix `'rss'` from the CommandModule factory — exact matches still win over prefixes). Subcommands: `#rss help`; `#rss add <url> <name>` (validates URL, fetches with 15 s timeout, requires ≥1 titled item, rejects duplicate names case-insensitively; LLM generates 2-4 lowercase tags from up to 8 latest titles — on LLM failure the source is added with empty tags and the reply says so); `#rss remove <name>`; `#rss tags` (all distinct tags); `#rss sources`; `#rss get <name|#tag>` (LLM headline summary, maxTokens 200; `#tag` collects items across ALL sources carrying that tag — one dead feed does not sink the summary). Storage: `rss_sources(name TEXT PRIMARY KEY, url, tags, created_at)` table in the EXISTING MESH_DB_PATH file via a second node:sqlite connection (names matched case-insensitively); feed parsing via `fast-xml-parser` (RSS 2.0 + Atom; malformed/no-items → "not a valid feed"); LLM via injected `LlmService.chat()` with explicit maxTokens (50 tags / 200 summary) to keep mesh replies short.
- LLM client (`src/llm`): `LlmService` wraps the local OpenAI-compatible server (default `http://192.168.1.70:1111/v1`, no auth) with native fetch — plain feature module, no Mesh/Schedule dependency. Methods: `listModels()` → `data[].id`; `chat(messages, { maxTokens?, temperature? })` → `choices[0].message.content` (non-2xx throws with status + body snippet); `summarize(text)` = chat() with system prompt "Summarize the following text concisely." Env: `LLM_API_BASE`, `LLM_MODEL` (default `qwen3.8-27b`), `LLM_TIMEOUT_MS` (default 60000, via `AbortSignal.timeout`).
+24
View File
@@ -1,5 +1,29 @@
# Changelog # Changelog
## v0.20.0 — 2026-09-25 18:40
- New `#rss` command family on the command channel (ch2): `#rss help`, `#rss add <url> <name>` (validates URL + fetches with a 15 s timeout, requires ≥1 item with a non-empty title, rejects duplicate names case-insensitively; tags are generated by the LLM from up to 8 latest titles — on LLM failure the source is still added with empty tags and the reply says so), `#rss remove <name>`, `#rss tags` (all distinct tags), `#rss sources`, `#rss get <name>` and `#rss get #<tag>` (LLM headline summary, maxTokens 200; tag form collects items across ALL sources carrying the tag — one dead feed does not sink the summary). Bare `#rss` / unknown subcommand → help. All replies ride the existing respond() path like `#ping`.
- Storage: new `rss_sources(name TEXT PRIMARY KEY, url, tags, created_at)` table in the EXISTING MESH_DB_PATH file (default ./data/mesh-bot.db) via a second node:sqlite connection opened by `RssModule`'s factory — no new DB file. Names are matched case-insensitively everywhere (`COLLATE NOCASE`).
- Feed parsing: new dependency `fast-xml-parser` (the only one added for this feature) — RSS 2.0 (`<item><title>/<link>`) and Atom (`<entry><title>`, link as `href` attribute); CDATA titles supported; malformed input or no usable items → "not a valid feed".
- LLM: `RssService` injects `LlmService` (plain DI, one-way — `RssModule` imports `LlmModule`) and uses `chat()` directly with explicit maxTokens (50 for tags, 200 for summaries) to keep mesh replies short. Tag output is sanitized (lowercase, no #, whitespace → '-', deduped).
- Dispatch: `CommandService` gains prefix registration (`registerPrefix(name, fn)`) alongside exact matches — one handler owns the whole `#rss` family while `#ping` stays an untouched exact match; exact names win over prefixes, and a name merely starting with the prefix (e.g. `#rssfoo`) does not dispatch. Wired in `CommandModule`'s factory (`inject: [MeshService, RssService]`) — still no constructor-level cycle, no forwardRef.
- Tests: 128 → 153 specs — store CRUD against a real temp SQLite file (incl. second-connection persistence), feed parser fixtures (RSS 2.0 / Atom / malformed / empty titles), handler behavior with mocked LLM + fetch (help, add success/LLM-fail/invalid-url/duplicate/non-2xx/unparseable, remove found/missing, tags/sources empty+populated, get by name/by tag across sources/dead-feed resilience/unknown name+tag), and `#rss` prefix dispatch through respond().
## v0.19.0 — 2026-09-25 18:03
- New LLM client module (`src/llm`): `LlmService` speaks the OpenAI-compatible chat-completions API of the local server at `LLM_API_BASE` (default `http://192.168.1.70:1111/v1`, no auth) using native fetch only — no new dependencies. Plain feature module (`LlmModule`), wired into `app.module.ts`; no Mesh/Schedule dependency.
- Methods: `listModels()` (GET `/models` → `data[].id` strings), `chat(messages, opts?)` (POST `/chat/completions` with `{ model, messages, ...opts }` → `choices[0].message.content`; non-2xx throws an Error carrying the HTTP status and a short body snippet; malformed responses without content throw too), and `summarize(text)` — thin wrapper over `chat()` with system prompt "Summarize the following text concisely." (the stated primary use).
- Env: `LLM_API_BASE` (default `http://192.168.1.70:1111/v1`), `LLM_MODEL` (default `qwen3.8-27b`), `LLM_TIMEOUT_MS` (default `60000` — the local 27B model can be slow; applied via `AbortSignal.timeout`).
- Tests: +4 specs — listModels parses ids, chat passes model/messages/opts through and returns content, chat throws on non-2xx with status in the message, summarize sends system prompt + user text.
## v0.18.1 — 2026-09-25 17:30
- Command replies now ride `MeshService.respond(id, reply)` instead of direct `sendText` routing: when a handler returns a non-empty string and the trigger has a packet id, the reply is auto-routed (rx → DM back to the original sender unless the original was a broadcast; tx → its destination) on the **original message's channel** with `replyId = id`, so the recipient app renders it as a threaded quote of the triggering packet. `COMMAND_CHANNEL` is now only the trigger/listen gate — the reply channel comes from the record.
- Defensive fallback: when the trigger has no packet id (never happens in production — `MeshService` always passes `pkt.id`), the legacy sendText routing on `COMMAND_CHANNEL` (directed DM or broadcast) still sends the reply out. Failure handling unchanged: a failing handler or respond only logs a warn, never crashes.
- Tests: 121 → 124 specs — unit cases now mock `mesh.respond` (id present → `respond(id, reply)` with no sendText; id absent → legacy DM/broadcast fallback on the command channel), plus a failing-respond swallow case; e2e over the fake bridge asserts wire-level threading for both shapes: `#ping` broadcast on ch2 → `#pong!` broadcast on ch2 with `replyId` = ping packet id, and `#ping` DM → `#pong!` DM to the sender on ch2 with `replyId` set. All gate tests (case/whitespace/channel/env override) kept.
- The wire-decode test helper `outboundPackets()` moved from `mesh.service.spec.ts` into `fake-bridge.ts` so both specs share it.
- Docs: AGENTS.md "Other" bullet and MESHTASTIC.md describe the respond() auto-routing + threading; README env list unchanged (`COMMAND_CHANNEL` still exists, now meaning trigger channel only).
## v0.18.0 — 2026-09-25 17:08 ## v0.18.0 — 2026-09-25 17:08
- New channel-index-2 auto-responder (`src/commands`): an event-driven `CommandService` reacts to decoded rx text on `COMMAND_CHANNEL` (env, default `2`) and dispatches exact `#command` matches (case-sensitive, surrounding whitespace trimmed) through a single-registration-point registry — handlers registered in the constructor via `register(name, fn)` receive `{ text, from?, id? }` and return a reply string or void (= no reply). First command: `#ping` → replies `#pong!`. - New channel-index-2 auto-responder (`src/commands`): an event-driven `CommandService` reacts to decoded rx text on `COMMAND_CHANNEL` (env, default `2`) and dispatches exact `#command` matches (case-sensitive, surrounding whitespace trimmed) through a single-registration-point registry — handlers registered in the constructor via `register(name, fn)` receive `{ text, from?, id? }` and return a reply string or void (= no reply). First command: `#ping` → replies `#pong!`.
+1 -1
View File
@@ -22,7 +22,7 @@ Rules for how mesh-bot communicates over Meshtastic and how the agent should rea
- All bot sends ride channel index 3 ("test") by design (`MESH_SEND_CHANNEL`, default "3") — never the primary channel. - All bot sends ride channel index 3 ("test") by design (`MESH_SEND_CHANNEL`, default "3") — never the primary channel.
- Broadcasts show up in `/api/messages` as `failed` / `NO_RESPONSE` on this firmware — known quirk, not a real failure; the message was transmitted. - Broadcasts show up in `/api/messages` as `failed` / `NO_RESPONSE` on this firmware — known quirk, not a real failure; the message was transmitted.
- Channel index 2 carries the bot's auto-responder (`COMMAND_CHANNEL`, default 2): exact `#command` texts (case-sensitive) get an automatic reply on that channel — directed back to the sender when present, else broadcast. Currently only `#ping` → `#pong!`. This is a mechanical echo for testing the mesh path; it is not the agent and does not mean the owner has seen anything. - Channel index 2 carries the bot's auto-responder (`COMMAND_CHANNEL`, default 2): exact `#command` texts (case-sensitive) on that channel get an automatic reply routed through `MeshService.respond()` — DM back to the original sender, broadcast when the original was a broadcast — riding the original message's channel as a threaded quote (`replyId` = the trigger packet id). Currently only `#ping` → `#pong!`. This is a mechanical echo for testing the mesh path; it is not the agent and does not mean the owner has seen anything.
## Notifications (mesh → agent) ## Notifications (mesh → agent)
+3
View File
@@ -125,6 +125,9 @@ Config lives in `.env` (gitignored) and is passed via compose environment — cr
- `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
- `PORT` (default `3000`) — HTTP listen port - `PORT` (default `3000`) — HTTP listen port
- `LLM_API_BASE` (default `http://192.168.1.70:1111/v1`) — OpenAI-compatible LLM server base URL used by the in-process `LlmService` (`src/llm`; no auth)
- `LLM_MODEL` (default `qwen3.8-27b`) — model id sent to `/chat/completions`
- `LLM_TIMEOUT_MS` (default `60000`) — per-request timeout for LLM calls (the local 27B model can be slow)
Note: the serial bridge accepts only ONE client at a time — if another app is Note: the serial bridge accepts only ONE client at a time — if another app is
connected to the radio, this bot will not get a connection. connected to the radio, this bot will not get a connection.
+123 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "mesh-bot", "name": "mesh-bot",
"version": "0.11.3", "version": "0.19.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mesh-bot", "name": "mesh-bot",
"version": "0.11.3", "version": "0.19.0",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^2.15.0", "@bufbuild/protobuf": "^2.15.0",
@@ -18,6 +18,7 @@
"@nestjs/schedule": "^12.0.2", "@nestjs/schedule": "^12.0.2",
"@nestjs/swagger": "^12.0.2", "@nestjs/swagger": "^12.0.2",
"@scalar/nestjs-api-reference": "^1.2.21", "@scalar/nestjs-api-reference": "^1.2.21",
"fast-xml-parser": "^5.11.1",
"reflect-metadata": "^0.2.2", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1" "rxjs": "^7.8.1"
}, },
@@ -1148,6 +1149,18 @@
"url": "https://paulmillr.com/funding/" "url": "https://paulmillr.com/funding/"
} }
}, },
"node_modules/@nodable/entities": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-3.0.0.tgz",
"integrity": "sha512-8L9xFeTYKhm49xfIypoe2W5wV1m/3Z58kT+7kR9A8OyFxcPduI4VmxaUMQyKYrRjUoLLSXv6EKKID5Tvj9cUVw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/nodable"
}
],
"license": "MIT"
},
"node_modules/@oxc-project/types": { "node_modules/@oxc-project/types": {
"version": "0.151.0", "version": "0.151.0",
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.151.0.tgz", "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.151.0.tgz",
@@ -2336,6 +2349,18 @@
"node": ">=14" "node": ">=14"
} }
}, },
"node_modules/anynum": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/anynum/-/anynum-1.0.1.tgz",
"integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT"
},
"node_modules/append-field": { "node_modules/append-field": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
@@ -3279,6 +3304,45 @@
"fast-string-width": "^3.0.2" "fast-string-width": "^3.0.2"
} }
}, },
"node_modules/fast-xml-builder": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.3.1.tgz",
"integrity": "sha512-pIM/1n3ntFXKYrUZwW7QCK0gAW7XY+wzj1YMIV3tLDvPj/V+zTGJK5e3/4WJfwj0qWw2ElNXiTixda/R+3YSug==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"dependencies": {
"path-expression-matcher": "^1.6.2",
"xml-naming": "^0.3.0"
}
},
"node_modules/fast-xml-parser": {
"version": "5.11.1",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.11.1.tgz",
"integrity": "sha512-TBw6K/fxoQGGjCmZDw9w/ZwP3uDcnTM4YH/g+PFRWr8sbe5idXtxNN6vITh4+1ruCZaho6uBFurElsA7F0zzgw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"dependencies": {
"@nodable/entities": "^3.0.0",
"fast-xml-builder": "^1.2.0",
"is-unsafe": "^2.0.0",
"path-expression-matcher": "^1.6.2",
"strnum": "^2.4.2",
"xml-naming": "^0.3.0"
},
"bin": {
"fxparser": "src/cli/cli.js"
}
},
"node_modules/fdir": { "node_modules/fdir": {
"version": "6.5.0", "version": "6.5.0",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -3830,6 +3894,18 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/is-unsafe": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-2.0.2.tgz",
"integrity": "sha512-HgbIHPBH0KHHCcjLfGsCvhtPTVxjaAZlXjwdz7/GQC40SjSe4sfQsar8J5VFo8JOSbarkpV0OLG95bbaNd9aAQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT"
},
"node_modules/isexe": { "node_modules/isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -4848,6 +4924,21 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/path-expression-matcher": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.2.tgz",
"integrity": "sha512-enSlaiat05iasnzmgNxRj8reFdj3puY2QpNgP1aPIaVfT6nn9ICuPoFlKHk8EN22HcwewshO+mN2DGbkCEOtqQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/path-key": { "node_modules/path-key": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -5503,6 +5594,21 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/strnum": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/strnum/-/strnum-2.4.2.tgz",
"integrity": "sha512-rDG3Ah4TV0k1hWvLSzkZtMmLN9+eS+h3knq4MP6A42Y3Yh5qGNnOUs1jJkoSr8FG5dsL28c7KgkIBzSEykqtuw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"dependencies": {
"anynum": "^1.0.1"
}
},
"node_modules/strtok3": { "node_modules/strtok3": {
"version": "10.3.5", "version": "10.3.5",
"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.5.tgz", "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.5.tgz",
@@ -6147,6 +6253,21 @@
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
"license": "ISC" "license": "ISC"
}, },
"node_modules/xml-naming": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.3.0.tgz",
"integrity": "sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/NaturalIntelligence"
}
],
"license": "MIT",
"engines": {
"node": ">=16.0.0"
}
},
"node_modules/yoctocolors": { "node_modules/yoctocolors": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.2.0.tgz", "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.2.0.tgz",
+2 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "mesh-bot", "name": "mesh-bot",
"version": "0.18.0", "version": "0.20.0",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,
@@ -30,6 +30,7 @@
"@nestjs/schedule": "^12.0.2", "@nestjs/schedule": "^12.0.2",
"@nestjs/swagger": "^12.0.2", "@nestjs/swagger": "^12.0.2",
"@scalar/nestjs-api-reference": "^1.2.21", "@scalar/nestjs-api-reference": "^1.2.21",
"fast-xml-parser": "^5.11.1",
"reflect-metadata": "^0.2.2", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1" "rxjs": "^7.8.1"
}, },
+10 -1
View File
@@ -1,10 +1,19 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { BatteryAlertModule } from './battery/battery.module.js'; import { BatteryAlertModule } from './battery/battery.module.js';
import { CommandModule } from './commands/command.module.js'; import { CommandModule } from './commands/command.module.js';
import { LlmModule } from './llm/llm.module.js';
import { MeshModule } from './mesh/mesh.module.js'; import { MeshModule } from './mesh/mesh.module.js';
import { RssModule } from './rss/rss.module.js';
import { WeatherModule } from './weather/weather.module.js'; import { WeatherModule } from './weather/weather.module.js';
@Module({ @Module({
imports: [MeshModule, WeatherModule, BatteryAlertModule, CommandModule], imports: [
MeshModule,
WeatherModule,
BatteryAlertModule,
CommandModule,
LlmModule,
RssModule,
],
}) })
export class AppModule {} export class AppModule {}
+6 -4
View File
@@ -1,20 +1,22 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { MeshModule } from '../mesh/mesh.module.js'; import { MeshModule } from '../mesh/mesh.module.js';
import { MeshService } from '../mesh/mesh.service.js'; import { MeshService } from '../mesh/mesh.service.js';
import { RssModule } from '../rss/rss.module.js';
import { RssService } from '../rss/rss.service.js';
import { CommandService } from './command.service.js'; import { CommandService } from './command.service.js';
@Module({ @Module({
imports: [MeshModule], // one-way only — the reverse edge is wired in the factory below, not via DI imports: [MeshModule, RssModule], // one-way only — the MeshService reverse edge is wired in the factory below, not via DI
providers: [ providers: [
{ {
provide: CommandService, provide: CommandService,
useFactory: (mesh: MeshService) => { useFactory: (mesh: MeshService, rss: RssService) => {
const commands = new CommandService(mesh); const commands = new CommandService(mesh, rss);
// break the cycle: MeshService can't inject us (its own factory would deadlock on this edge), so attach ourselves once we exist — mesh is guaranteed created here because it's our injected dependency // break the cycle: MeshService can't inject us (its own factory would deadlock on this edge), so attach ourselves once we exist — mesh is guaranteed created here because it's our injected dependency
mesh.attachCommands(commands); mesh.attachCommands(commands);
return commands; return commands;
}, },
inject: [MeshService], inject: [MeshService, RssService],
}, },
], ],
exports: [CommandService], exports: [CommandService],
+170 -13
View File
@@ -1,19 +1,30 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'; import { mkdtempSync, rmSync } from 'node:fs';
import { BROADCAST_ADDR } from '../mesh/codec.js'; import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { DatabaseSync } from 'node:sqlite';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { LlmService } from '../llm/llm.service.js';
import { RssService } from '../rss/rss.service.js';
import { import {
startBridge, startBridge,
textPacketFrame, textPacketFrame,
waitFor, waitFor,
outboundPackets,
KAMIL_NUM, KAMIL_NUM,
} from '../mesh/fake-bridge.js'; } from '../mesh/fake-bridge.js';
import { BROADCAST_ADDR } from '../mesh/codec.js';
import type { MeshService } from '../mesh/mesh.service.js'; import type { MeshService } from '../mesh/mesh.service.js';
import { MeshService as RealMeshService } from '../mesh/mesh.service.js'; import { MeshService as RealMeshService } from '../mesh/mesh.service.js';
import { CommandService } from './command.service.js'; import { CommandService } from './command.service.js';
function makeService( function makeService(
sendText?: ReturnType<typeof vi.fn>, sendText?: ReturnType<typeof vi.fn>,
respond?: ReturnType<typeof vi.fn>,
): [CommandService, MeshService] { ): [CommandService, MeshService] {
const mesh = { sendText: sendText ?? vi.fn() } as unknown as MeshService; const mesh = {
sendText: sendText ?? vi.fn(),
respond: respond ?? vi.fn().mockResolvedValue({ id: 1 }),
} as unknown as MeshService;
return [new CommandService(mesh), mesh]; return [new CommandService(mesh), mesh];
} }
@@ -22,15 +33,24 @@ beforeEach(() => {
}); });
describe('CommandService.onRx', () => { describe('CommandService.onRx', () => {
it('answers #ping on the command channel with a directed DM back to the sender', async () => { it('replies #ping via respond() — threaded quote of the trigger packet, no direct sendText', async () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, '#ping', 42, 7); await svc.onRx(2, '#ping', 42, 7);
expect(mesh.respond).toHaveBeenCalledWith(7, '#pong!');
expect(mesh.sendText).not.toHaveBeenCalled();
});
it('falls back to a directed sendText on COMMAND_CHANNEL when the trigger has no packet id (DM)', async () => {
const [svc, mesh] = makeService();
await svc.onRx(2, '#ping', 42); // from present but no id — defensive path
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).toHaveBeenCalledWith(42, '#pong!', undefined, 2); expect(mesh.sendText).toHaveBeenCalledWith(42, '#pong!', undefined, 2);
}); });
it('broadcasts the reply when there is no sender', async () => { it('falls back to a broadcast sendText on COMMAND_CHANNEL when the trigger has no packet id (no sender)', async () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, '#ping'); await svc.onRx(2, '#ping'); // no from, no id — defensive path
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).toHaveBeenCalledWith( expect(mesh.sendText).toHaveBeenCalledWith(
BROADCAST_ADDR, BROADCAST_ADDR,
'#pong!', '#pong!',
@@ -43,6 +63,7 @@ describe('CommandService.onRx', () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(0, '#ping', 42); await svc.onRx(0, '#ping', 42);
await svc.onRx(3, '#ping', 42); await svc.onRx(3, '#ping', 42);
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
}); });
@@ -50,6 +71,7 @@ describe('CommandService.onRx', () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, 'hello there', 42); await svc.onRx(2, 'hello there', 42);
await svc.onRx(2, 'ping', 42); // no leading # — not a command trigger await svc.onRx(2, 'ping', 42); // no leading # — not a command trigger
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
}); });
@@ -57,28 +79,31 @@ describe('CommandService.onRx', () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, '#Ping', 42); await svc.onRx(2, '#Ping', 42);
await svc.onRx(2, '#ping!', 42); // extra char — no partial matches await svc.onRx(2, '#ping!', 42); // extra char — no partial matches
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
}); });
it('trims surrounding whitespace before matching', async () => { it('trims surrounding whitespace before matching', async () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, ' #ping ', 42); await svc.onRx(2, ' #ping ', 42, 9);
expect(mesh.sendText).toHaveBeenCalledWith(42, '#pong!', undefined, 2); expect(mesh.respond).toHaveBeenCalledWith(9, '#pong!');
}); });
it('honors the COMMAND_CHANNEL env override', async () => { it('honors the COMMAND_CHANNEL env override', async () => {
process.env.COMMAND_CHANNEL = '5'; process.env.COMMAND_CHANNEL = '5';
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
await svc.onRx(2, '#ping', 42); // old default no longer triggers await svc.onRx(2, '#ping', 42); // old default no longer triggers
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
await svc.onRx(5, '#ping', 42); await svc.onRx(5, '#ping', 42, 8);
expect(mesh.sendText).toHaveBeenCalledWith(42, '#pong!', undefined, 5); expect(mesh.respond).toHaveBeenCalledWith(8, '#pong!');
}); });
it('sends nothing when a handler returns void', async () => { it('sends nothing when a handler returns void', async () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
svc.register('silent', () => undefined); svc.register('silent', () => undefined);
await svc.onRx(2, '#silent', 42); await svc.onRx(2, '#silent', 42);
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
}); });
@@ -86,7 +111,7 @@ describe('CommandService.onRx', () => {
const [svc, mesh] = makeService(); const [svc, mesh] = makeService();
svc.register('status', (ctx) => `up from ${ctx.from ?? 'broadcast'}`); svc.register('status', (ctx) => `up from ${ctx.from ?? 'broadcast'}`);
await svc.onRx(2, '#status', 99, 5); await svc.onRx(2, '#status', 99, 5);
expect(mesh.sendText).toHaveBeenCalledWith(99, 'up from 99', undefined, 2); expect(mesh.respond).toHaveBeenCalledWith(5, 'up from 99');
}); });
it('swallows a failing handler (a bad command must not crash the app)', async () => { it('swallows a failing handler (a bad command must not crash the app)', async () => {
@@ -95,19 +120,93 @@ describe('CommandService.onRx', () => {
throw new Error('kaboom'); throw new Error('kaboom');
}); });
await expect(svc.onRx(2, '#boom', 42)).resolves.toBeUndefined(); await expect(svc.onRx(2, '#boom', 42)).resolves.toBeUndefined();
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled(); expect(mesh.sendText).not.toHaveBeenCalled();
}); });
it('swallows a failing respond (unknown id / bridge down) without throwing', async () => {
const [svc] = makeService(
undefined,
vi.fn().mockRejectedValue(new Error('no message with id 7')),
);
await expect(svc.onRx(2, '#ping', 42, 7)).resolves.toBeUndefined();
});
it('swallows a failing send (mesh down) without throwing', async () => { it('swallows a failing send (mesh down) without throwing', async () => {
const [svc] = makeService( const [svc] = makeService(
vi.fn().mockRejectedValue(new Error('no bridge')), vi.fn().mockRejectedValue(new Error('no bridge')),
); );
await expect(svc.onRx(2, '#ping', 42)).resolves.toBeUndefined(); await expect(svc.onRx(2, '#ping', 42)).resolves.toBeUndefined(); // no id → legacy path
});
});
describe('#rss prefix dispatch', () => {
let dir: string | undefined;
const makeRss = (): RssService => {
dir = mkdtempSync(join(tmpdir(), 'mesh-bot-cmd-rss-'));
return new RssService(
{ chat: vi.fn() } as unknown as LlmService,
new DatabaseSync(join(dir, 'test.db')),
);
};
afterEach(() => {
if (dir) rmSync(dir, { recursive: true, force: true });
dir = undefined;
});
it('routes #rss subcommands through respond() like any command reply', async () => {
const mesh = {
sendText: vi.fn(),
respond: vi.fn().mockResolvedValue({ id: 1 }),
} as unknown as MeshService;
const svc = new CommandService(mesh, makeRss());
await svc.onRx(2, '#rss sources', 42, 9);
expect(mesh.respond).toHaveBeenCalledWith(9, 'no sources yet');
expect(mesh.sendText).not.toHaveBeenCalled();
});
it('routes bare #rss to the help text via respond()', async () => {
const mesh = {
sendText: vi.fn(),
respond: vi.fn().mockResolvedValue({ id: 1 }),
} as unknown as MeshService;
const svc = new CommandService(mesh, makeRss());
await svc.onRx(2, '#rss', 42, 9);
expect(mesh.respond).toHaveBeenCalledTimes(1);
expect(String(mesh.respond.mock.calls[0][1])).toContain(
'#rss add <url> <name>',
);
});
it('leaves exact commands untouched and does not partial-match prefix names', async () => {
const mesh = {
sendText: vi.fn(),
respond: vi.fn().mockResolvedValue({ id: 1 }),
} as unknown as MeshService;
const svc = new CommandService(mesh, makeRss());
await svc.onRx(2, '#ping', 42, 3);
expect(mesh.respond).toHaveBeenCalledWith(3, '#pong!');
await svc.onRx(2, '#rssfoo', 42, 4); // starts with 'rss' but is not the family — no partial prefix match
expect(mesh.respond).toHaveBeenCalledTimes(1);
});
it('does nothing for #rss when no RssService was wired (legacy construction)', async () => {
const [svc, mesh] = makeService(); // rss omitted
await svc.onRx(2, '#rss sources', 42, 9);
expect(mesh.respond).not.toHaveBeenCalled();
expect(mesh.sendText).not.toHaveBeenCalled();
}); });
}); });
describe('MeshService wiring (event-driven trigger)', () => { describe('MeshService wiring (event-driven trigger)', () => {
it('calls onRx for decoded rx text and answers #ping over the wire', async () => { it('answers a #ping DM on ch2 with a directed #pong! back to the sender, same channel, threaded quote', async () => {
const bridge = await startBridge(); const bridge = await startBridge();
process.env.MESH_HOST = '127.0.0.1'; process.env.MESH_HOST = '127.0.0.1';
process.env.MESH_PORT = String(bridge.port); process.env.MESH_PORT = String(bridge.port);
@@ -120,6 +219,10 @@ describe('MeshService wiring (event-driven trigger)', () => {
() => bridge.sockets.length === 1 && svc.status().connected, () => bridge.sockets.length === 1 && svc.status().connected,
); );
const out: Uint8Array[] = [];
bridge.sockets[0].on('data', (c) => out.push(c));
// rx DM from KAMIL to node 42 on channel 2 (packet id 1)
bridge.sockets[0].write(textPacketFrame(KAMIL_NUM, 42, '#ping', 2)); bridge.sockets[0].write(textPacketFrame(KAMIL_NUM, 42, '#ping', 2));
// rx record + the directed #pong! reply on channel 2 (newest first — the reply is [0]) // rx record + the directed #pong! reply on channel 2 (newest first — the reply is [0])
@@ -130,6 +233,60 @@ describe('MeshService wiring (event-driven trigger)', () => {
text: '#pong!', text: '#pong!',
channel: 2, channel: 2,
}); });
// wire-level: DM back to the sender on ch2 with replyId = the ping packet id (threaded quote)
await waitFor(() => outboundPackets(out).length >= 1);
const pkt = outboundPackets(out)[0]!;
expect(pkt.to).toBe(KAMIL_NUM);
expect(pkt.channel).toBe(2);
const data =
pkt.payloadVariant?.case === 'decoded'
? pkt.payloadVariant.value
: undefined;
expect(data?.replyId).toBe(1);
} finally {
svc.onModuleDestroy();
bridge.close();
}
});
it('answers a #ping broadcast on ch2 with a #pong! broadcast, same channel, threaded quote', async () => {
const bridge = await startBridge();
process.env.MESH_HOST = '127.0.0.1';
process.env.MESH_PORT = String(bridge.port);
const svc = new RealMeshService();
try {
svc.attachCommands(new CommandService(svc));
svc.onModuleInit();
await waitFor(
() => bridge.sockets.length === 1 && svc.status().connected,
);
const out: Uint8Array[] = [];
bridge.sockets[0].on('data', (c) => out.push(c));
// rx broadcast from KAMIL on channel 2 (packet id 1)
bridge.sockets[0].write(
textPacketFrame(KAMIL_NUM, BROADCAST_ADDR, '#ping', 2),
);
await waitFor(() => svc.messages().length === 2);
expect(svc.messages()[0]).toMatchObject({
dir: 'tx',
to: BROADCAST_ADDR, // broadcast original → broadcast reply
text: '#pong!',
channel: 2,
});
await waitFor(() => outboundPackets(out).length >= 1);
const pkt = outboundPackets(out)[0]!;
expect(pkt.to).toBe(BROADCAST_ADDR);
expect(pkt.channel).toBe(2);
const data =
pkt.payloadVariant?.case === 'decoded'
? pkt.payloadVariant.value
: undefined;
expect(data?.replyId).toBe(1); // threaded quote of the ping packet (id 1)
} finally { } finally {
svc.onModuleDestroy(); svc.onModuleDestroy();
bridge.close(); bridge.close();
+36 -6
View File
@@ -1,7 +1,8 @@
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { BROADCAST_ADDR } from '../mesh/codec.js'; import { BROADCAST_ADDR } from '../mesh/codec.js';
// type-only: the instance comes from DI (command.module.ts factory) or direct construction in tests — no runtime import cycle with src/mesh // type-only: the instances come from DI (command.module.ts factory) or direct construction in tests — no runtime import cycles with src/mesh / src/rss
import type { MeshService } from '../mesh/mesh.service.js'; import type { MeshService } from '../mesh/mesh.service.js';
import type { RssService } from '../rss/rss.service.js';
/** Context handed to a command handler: the trimmed text plus sender/packet id when present. */ /** Context handed to a command handler: the trimmed text plus sender/packet id when present. */
export interface CommandContext { export interface CommandContext {
@@ -28,10 +29,16 @@ export class CommandService {
); );
// single registration point: the constructor registers every built-in command — add the next one there (or via register()) // single registration point: the constructor registers every built-in command — add the next one there (or via register())
private readonly commands = new Map<string, CommandHandler>(); private readonly commands = new Map<string, CommandHandler>();
// prefix handlers own a whole family (`#rss`, `#rss add ...`) instead of one exact name
private readonly prefixes = new Map<string, CommandHandler>();
/** mesh is optional so tests can construct without a bridge; production DI always passes one. */ /** mesh is optional so tests can construct without a bridge; production DI always passes one. */
constructor(private readonly mesh?: MeshService) { constructor(
private readonly mesh?: MeshService,
rss?: RssService,
) {
this.register('ping', () => '#pong!'); this.register('ping', () => '#pong!');
if (rss) this.registerPrefix('rss', (ctx) => rss.handle(ctx));
} }
/** Register a command handler (names are case-sensitive; the leading `#` is stripped before lookup). */ /** Register a command handler (names are case-sensitive; the leading `#` is stripped before lookup). */
@@ -39,11 +46,18 @@ export class CommandService {
this.commands.set(name, fn); this.commands.set(name, fn);
} }
/** Register a prefix handler: owns bare `#<name>` and everything starting with `#<name> `. Exact matches win over prefixes. */
registerPrefix(name: string, fn: CommandHandler): void {
this.prefixes.set(name, fn);
}
/** /**
* Event-driven entry point called by MeshService for every decoded rx text. * Event-driven entry point called by MeshService for every decoded rx text.
* No-op unless on COMMAND_CHANNEL with an exact `#command` match (case-sensitive). * No-op unless on COMMAND_CHANNEL with a case-sensitive `#command` match — exact name or registered prefix family (`#rss ...`).
* Replies ride COMMAND_CHANNEL: directed DM back to the sender when present, else broadcast. * Replies go through MeshService.respond(id, reply): auto-routed to the original message's
* Never throws — a failed command must not crash the app. * destination and channel as a threaded quote (replyId = id). Only when the trigger has no packet
* id does it fall back to legacy sendText routing on COMMAND_CHANNEL. Never throws — a failed
* command must not crash the app.
*/ */
async onRx( async onRx(
channel: number, channel: number,
@@ -54,17 +68,33 @@ export class CommandService {
if (channel !== this.commandChannel) return; if (channel !== this.commandChannel) return;
const trimmed = text.trim(); const trimmed = text.trim();
if (!trimmed.startsWith('#')) return; // only `#command` texts trigger handlers if (!trimmed.startsWith('#')) return; // only `#command` texts trigger handlers
const handler = this.commands.get(trimmed.slice(1)); const name = trimmed.slice(1);
let handler = this.commands.get(name);
if (!handler) {
for (const [prefix, fn] of this.prefixes) {
// a prefix owns bare `#<prefix>` and everything starting with `#<prefix> ` — e.g. 'rss' → #rss / #rss add ...
if (name === prefix || name.startsWith(prefix + ' ')) {
handler = fn;
break;
}
}
}
if (!handler) return; // exact, case-sensitive match — no partials if (!handler) return; // exact, case-sensitive match — no partials
try { try {
const reply = await handler({ text: trimmed, from, id }); const reply = await handler({ text: trimmed, from, id });
if (reply === undefined || reply === null) return; // void = no reply if (reply === undefined || reply === null) return; // void = no reply
if (id !== undefined && this.mesh) {
// respond() auto-routes the reply: rides the original record's channel with replyId = id (threaded quote)
await this.mesh.respond(id, reply);
} else {
// defensive fallback when the trigger has no packet id: legacy routing on COMMAND_CHANNEL
await this.mesh?.sendText( await this.mesh?.sendText(
from ?? BROADCAST_ADDR, from ?? BROADCAST_ADDR,
reply, reply,
undefined, undefined,
this.commandChannel, this.commandChannel,
); );
}
} catch (err) { } catch (err) {
this.logger.warn( this.logger.warn(
`[commands] '${trimmed}' failed: ${(err as Error).message}`, `[commands] '${trimmed}' failed: ${(err as Error).message}`,
+8
View File
@@ -0,0 +1,8 @@
import { Module } from '@nestjs/common';
import { LlmService } from './llm.service.js';
@Module({
providers: [LlmService],
exports: [LlmService],
})
export class LlmModule {}
+104
View File
@@ -0,0 +1,104 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ChatMessage } from './llm.service.js';
import { LlmService } from './llm.service.js';
const BASE = 'http://192.168.1.70:1111/v1';
function json(body: unknown): Response {
return { ok: true, status: 200, json: async () => body } as Response;
}
/** Fresh service with a clean env (explicit base/model/timeout). */
function makeService(): LlmService {
process.env.LLM_API_BASE = BASE;
process.env.LLM_MODEL = 'qwen3.8-27b';
process.env.LLM_TIMEOUT_MS = '60000';
return new LlmService();
}
describe('LlmService', () => {
let fetchMock: ReturnType<typeof vi.fn>;
beforeEach(() => {
fetchMock = vi.fn();
vi.stubGlobal('fetch', fetchMock);
});
afterEach(() => {
vi.unstubAllGlobals();
for (const k of ['LLM_API_BASE', 'LLM_MODEL', 'LLM_TIMEOUT_MS'])
delete process.env[k];
});
it('listModels returns the data[].id strings from GET /models', async () => {
const svc = makeService();
fetchMock.mockResolvedValueOnce(
json({
data: [
{ id: 'qwen3.8-27b' },
{ id: 'text-embedding-nomic-embed-text-v1.5' },
],
}),
);
await expect(svc.listModels()).resolves.toEqual([
'qwen3.8-27b',
'text-embedding-nomic-embed-text-v1.5',
]);
expect(fetchMock).toHaveBeenCalledTimes(1);
expect(fetchMock.mock.calls[0][0]).toBe(`${BASE}/models`);
});
it('chat posts model+messages and returns choices[0].message.content', async () => {
const svc = makeService();
fetchMock.mockResolvedValueOnce(
json({ choices: [{ message: { content: 'hello back' } }] }),
);
const messages: ChatMessage[] = [
{ role: 'system', content: 'be brief' },
{ role: 'user', content: 'hi' },
];
await expect(
svc.chat(messages, { maxTokens: 50, temperature: 0.2 }),
).resolves.toBe('hello back');
const [url, init] = fetchMock.mock.calls[0];
expect(url).toBe(`${BASE}/chat/completions`);
expect(init.method).toBe('POST');
expect(JSON.parse(init.body)).toEqual({
model: 'qwen3.8-27b',
messages,
maxTokens: 50,
temperature: 0.2,
});
});
it('chat throws on non-2xx with the HTTP status in the message', async () => {
const svc = makeService();
fetchMock.mockResolvedValueOnce({
ok: false,
status: 503,
text: async () => 'upstream down',
} as Response);
await expect(svc.chat([{ role: 'user', content: 'hi' }])).rejects.toThrow(
/HTTP 503.*upstream down/,
);
});
it('summarize calls chat with the system prompt plus the user text', async () => {
const svc = makeService();
fetchMock.mockResolvedValueOnce(
json({ choices: [{ message: { content: 'the summary' } }] }),
);
await expect(svc.summarize('a long text')).resolves.toBe('the summary');
const [, init] = fetchMock.mock.calls[0];
expect(JSON.parse(init.body).messages).toEqual([
{ role: 'system', content: 'Summarize the following text concisely.' },
{ role: 'user', content: 'a long text' },
]);
});
});
+68
View File
@@ -0,0 +1,68 @@
import { Injectable } from '@nestjs/common';
/** A single chat message in OpenAI chat-completions shape. */
export interface ChatMessage {
role: string;
content: string;
}
@Injectable()
export class LlmService {
// read at construction, like other services' env config
private readonly apiBase =
process.env.LLM_API_BASE ?? 'http://192.168.1.70:1111/v1';
private readonly model = process.env.LLM_MODEL ?? 'qwen3.8-27b';
// local 27B model can be slow — generous default
private readonly timeoutMs = parseInt(
process.env.LLM_TIMEOUT_MS ?? '60000',
10,
);
/** GET {base}/models → the `data[].id` strings. */
async listModels(): Promise<string[]> {
const res = await fetch(`${this.apiBase}/models`, {
signal: AbortSignal.timeout(this.timeoutMs),
});
if (!res.ok) {
throw new Error(
`listModels failed: HTTP ${res.status} ${(await res.text()).slice(0, 200)}`,
);
}
const body = (await res.json()) as { data?: { id: string }[] };
return (body.data ?? []).map((m) => m.id);
}
/** POST {base}/chat/completions → `choices[0].message.content`. */
async chat(
messages: ChatMessage[],
opts?: { maxTokens?: number; temperature?: number },
): Promise<string> {
const res = await fetch(`${this.apiBase}/chat/completions`, {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify({ model: this.model, messages, ...opts }),
signal: AbortSignal.timeout(this.timeoutMs),
});
if (!res.ok) {
throw new Error(
`chat failed: HTTP ${res.status} ${(await res.text()).slice(0, 200)}`,
);
}
const body = (await res.json()) as {
choices?: { message?: { content?: string } }[];
};
const content = body.choices?.[0]?.message?.content;
if (typeof content !== 'string') {
throw new Error('chat failed: no choices[0].message.content in response');
}
return content;
}
/** Thin wrapper over chat(): the stated primary use of this service. */
async summarize(text: string): Promise<string> {
return this.chat([
{ role: 'system', content: 'Summarize the following text concisely.' },
{ role: 'user', content: text },
]);
}
}
+17 -2
View File
@@ -1,8 +1,8 @@
import { create, toBinary } from '@bufbuild/protobuf'; import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
import * as P from '@meshtastic/protobufs'; import * as P from '@meshtastic/protobufs';
import * as net from 'node:net'; import * as net from 'node:net';
import type { AddressInfo } from 'node:net'; import type { AddressInfo } from 'node:net';
import { frame } from './codec.js'; import { extractFrames, frame } from './codec.js';
/** In-process TCP stand-in for the meshtastic-serial-bridge; hands out accepted sockets. */ /** In-process TCP stand-in for the meshtastic-serial-bridge; hands out accepted sockets. */
export function startBridge( export function startBridge(
@@ -176,6 +176,21 @@ export function textPacketFrame(
); );
} }
/** Outbound text packets written to the bridge, in order (want_config frames skipped). */
export function outboundPackets(out: Uint8Array[]): 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;
}
return extractFrames(merged).packets.flatMap((p) => {
const tr = fromBinary(P.Mesh.ToRadioSchema, p);
if (tr.payloadVariant?.case === 'packet') return [tr.payloadVariant.value];
return [];
});
}
export const KAMIL_NUM = 123456789; export const KAMIL_NUM = 123456789;
export function kamilNodeInfo(): NodeInfoFields { export function kamilNodeInfo(): NodeInfoFields {
+1 -15
View File
@@ -11,6 +11,7 @@ import {
metadataFrame, metadataFrame,
moduleConfigSectionFrame, moduleConfigSectionFrame,
nodeInfoFrame, nodeInfoFrame,
outboundPackets,
startBridge, startBridge,
telemetryPacketFrame, telemetryPacketFrame,
textPacketFrame, textPacketFrame,
@@ -667,21 +668,6 @@ describe('MeshService message history', () => {
}); });
}); });
// outbound text packets written to the bridge, in order (want_config frames skipped)
function outboundPackets(out: Uint8Array[]): 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;
}
return extractFrames(merged).packets.flatMap((p) => {
const tr = fromBinary(P.Mesh.ToRadioSchema, p);
if (tr.payloadVariant?.case === 'packet') return [tr.payloadVariant.value];
return [];
});
}
describe('MeshService respond', () => { describe('MeshService respond', () => {
it('replies to an rx DM as a directed send back to the sender on the original channel with replyId = messageId', async () => { it('replies to an rx DM as a directed send back to the sender on the original channel with replyId = messageId', async () => {
const bridge = await startBridge(); const bridge = await startBridge();
+64
View File
@@ -0,0 +1,64 @@
import { describe, expect, it } from 'vitest';
import { parseFeed } from './rss.feed.js';
const RSS2 = `<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0">
<channel>
<title>Some Feed</title>
<item>
<title>First headline</title>
<link>https://example.com/first</link>
</item>
<item>
<title><![CDATA[Second: with CDATA]]></title>
<description>ignored</description>
</item>
<item>
<title></title>
<link>https://example.com/empty-title</link>
</item>
</channel>
</rss>`;
const ATOM = `<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>An Atom feed</title>
<entry>
<title>Only entry</title>
<link rel="alternate" href="https://example.com/atom"/>
</entry>
</feed>`;
describe('parseFeed', () => {
it('parses RSS 2.0 items in document order, keeping links where present and skipping empty titles', () => {
expect(parseFeed(RSS2)).toEqual([
{ title: 'First headline', link: 'https://example.com/first' },
{ title: 'Second: with CDATA' },
]);
});
it('parses Atom entries (single entry object, link as href attribute)', () => {
expect(parseFeed(ATOM)).toEqual([
{ title: 'Only entry', link: 'https://example.com/atom' },
]);
});
it('returns [] for malformed XML', () => {
expect(parseFeed('this is not xml at all')).toEqual([]);
expect(parseFeed('<rss><channel><item><title>broken')).toEqual([]);
});
it('returns [] when there are no items or none with a usable title', () => {
expect(
parseFeed('<rss version="2.0"><channel><title>x</title></channel></rss>'),
).toEqual([]);
expect(
parseFeed('<feed xmlns="http://www.w3.org/2005/Atom"></feed>'),
).toEqual([]);
expect(
parseFeed(
'<rss version="2.0"><channel><item><title> </title></item></channel></rss>',
),
).toEqual([]);
});
});
+60
View File
@@ -0,0 +1,60 @@
import { XMLParser } from 'fast-xml-parser';
/** One feed item: title always present (non-empty), link where the feed provides one. */
export interface FeedItem {
title: string;
link?: string;
}
const parser = new XMLParser({ ignoreAttributes: false });
function asText(value: unknown): string | undefined {
if (typeof value === 'string') return value.trim() || undefined;
// element with attributes/CDATA parses to an object holding its text under #text
const t = (value as Record<string, unknown>)?.['#text'];
if (typeof t === 'string' && t.trim()) return t.trim();
return undefined;
}
function asLink(value: unknown): string | undefined {
const fromText = asText(value);
if (fromText) return fromText; // RSS 2.0 <link>url</link>
// Atom <link rel="alternate" href="..."/> — the URL is an attribute
const href = (value as Record<string, unknown>)?.['@_href'];
if (typeof href === 'string' && href.trim()) return href.trim();
return undefined;
}
function collect(value: unknown): Record<string, unknown>[] {
// a single item/entry parses to an object, several to an array
if (!value) return [];
const arr = Array.isArray(value) ? value : [value];
return arr.filter(
(v): v is Record<string, unknown> => !!v && typeof v === 'object',
);
}
/**
* Parse RSS 2.0 (`<item><title>/<link>`) or Atom (`<entry><title>`) XML into items with
* non-empty titles, in document order (feeds are newest-first). Returns [] for malformed
* input or feeds without usable items — that empty result IS the "not a valid feed" signal.
*/
export function parseFeed(xml: string): FeedItem[] {
let doc: unknown;
try {
doc = parser.parse(xml);
} catch {
return []; // fast-xml-parser is lenient, but a hard failure means no items either
}
const root = doc as Record<string, any>;
// coalesce the RAW values first — collect() always returns an array, so `collect(a) ?? collect(b)` could never fall through to b
const rawItems = collect(root?.rss?.channel?.item ?? root?.feed?.entry);
const items: FeedItem[] = [];
for (const item of rawItems) {
const title = asText(item?.title);
if (!title) continue; // skip entries without a usable title
const link = asLink(item.link);
items.push(link ? { title, link } : { title });
}
return items;
}
+28
View File
@@ -0,0 +1,28 @@
import { Module } from '@nestjs/common';
import { mkdirSync } from 'node:fs';
import { dirname } from 'node:path';
import { DatabaseSync } from 'node:sqlite';
import { LlmModule } from '../llm/llm.module.js';
import { LlmService } from '../llm/llm.service.js';
import { RssService } from './rss.service.js';
// The rss_sources table lives in the SAME file as the mesh message history (MESH_DB_PATH) — a second
// connection is fine, SQLite serializes writes. The service initializes its own table on construction.
function openRssDb(): DatabaseSync {
const path = process.env.MESH_DB_PATH ?? './data/mesh-bot.db';
mkdirSync(dirname(path), { recursive: true });
return new DatabaseSync(path);
}
@Module({
imports: [LlmModule], // one-way — LlmService has no dependencies of its own
providers: [
{
provide: RssService,
useFactory: (llm: LlmService) => new RssService(llm, openRssDb()),
inject: [LlmService],
},
],
exports: [RssService],
})
export class RssModule {}
+206
View File
@@ -0,0 +1,206 @@
import { mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { DatabaseSync } from 'node:sqlite';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { LlmService } from '../llm/llm.service.js';
import { RssStore } from './rss.store.js';
import { RssService } from './rss.service.js';
const FEED_A = `<rss version="2.0"><channel>
<item><title>Alpha headline</title></item>
<item><title>Beta headline</title></item>
</channel></rss>`;
const FEED_B = `<rss version="2.0"><channel>
<item><title>Gamma headline</title></item>
</channel></rss>`;
function feedResponse(xml: string): Response {
return { ok: true, status: 200, text: async () => xml } as Response;
}
describe('RssService.handle', () => {
let dir: string;
let dbFile: string;
let llm: { chat: ReturnType<typeof vi.fn> };
let svc: RssService;
let fetchMock: ReturnType<typeof vi.fn>;
beforeEach(() => {
dir = mkdtempSync(join(tmpdir(), 'mesh-bot-rss-svc-'));
dbFile = join(dir, 'test.db');
llm = { chat: vi.fn() };
svc = new RssService(
llm as unknown as LlmService,
new DatabaseSync(dbFile),
);
fetchMock = vi.fn();
vi.stubGlobal('fetch', fetchMock);
});
afterEach(() => {
vi.unstubAllGlobals();
rmSync(dir, { recursive: true, force: true });
});
const ctx = (text: string) => ({ text });
// second connection — the same shape production uses for a separate table in one file
const stored = () => new RssStore(new DatabaseSync(dbFile));
it('replies with usage on bare #rss and on unknown subcommands', async () => {
const help = await svc.handle(ctx('#rss'));
expect(help).toContain('#rss add <url> <name>');
expect(help).toContain('#rss get <name|#tag>');
expect(await svc.handle(ctx('#rss frobnicate'))).toBe(help);
});
it('add: validates the feed, stores source with LLM tags, replies added (tags: ...)', async () => {
fetchMock.mockResolvedValueOnce(feedResponse(FEED_A));
llm.chat.mockResolvedValueOnce('#AI, News');
const reply = await svc.handle(
ctx('#rss add https://a.example/rss my feed'),
);
expect(reply).toBe('added my feed (tags: ai, news)');
expect(stored().get('my feed')).toMatchObject({
url: 'https://a.example/rss',
tags: ['ai', 'news'],
});
const [messages, opts] = llm.chat.mock.calls[0];
expect(opts).toEqual({ maxTokens: 50 });
expect(messages[0].content).toContain('Alpha headline');
});
it('add: LLM failure still stores the source with empty tags and says so', async () => {
fetchMock.mockResolvedValueOnce(feedResponse(FEED_A));
llm.chat.mockRejectedValueOnce(new Error('llm down'));
const reply = await svc.handle(
ctx('#rss add https://a.example/rss myfeed'),
);
expect(reply).toBe('added myfeed (tag generation failed - no tags)');
expect(stored().get('myfeed')?.tags).toEqual([]);
});
it('add: rejects invalid urls without fetching or storing', async () => {
expect(await svc.handle(ctx('#rss add not a url x'))).toBe('invalid url');
expect(await svc.handle(ctx('#rss add ftp://a.example/rss x'))).toBe(
'invalid url',
);
expect(fetchMock).not.toHaveBeenCalled();
expect(stored().list()).toEqual([]);
});
it('add: rejects duplicate names case-insensitively without fetching', async () => {
stored().add({ name: 'MyFeed', url: 'https://old.example/rss', tags: [] });
const reply = await svc.handle(
ctx('#rss add https://a.example/rss myfeed'),
);
expect(reply).toBe('myfeed already exists - remove it first');
expect(fetchMock).not.toHaveBeenCalled();
expect(stored().get('myfeed')?.url).toBe('https://old.example/rss'); // untouched
});
it('add: reports non-2xx and unparseable feeds, stores nothing', async () => {
fetchMock.mockResolvedValueOnce({ ok: false, status: 404 } as Response);
expect(await svc.handle(ctx('#rss add https://a.example/rss x'))).toBe(
'feed fetch failed (HTTP 404)',
);
fetchMock.mockResolvedValueOnce(feedResponse('this is not xml'));
expect(await svc.handle(ctx('#rss add https://b.example/rss y'))).toBe(
'not a valid feed (no items)',
);
expect(stored().list()).toEqual([]);
});
it('remove: deletes case-insensitively, reports missing names', async () => {
stored().add({ name: 'Gone', url: 'https://g.example/rss', tags: [] });
expect(await svc.handle(ctx('#rss remove gone'))).toBe('removed gone');
expect(stored().list()).toEqual([]);
expect(await svc.handle(ctx('#rss remove nope'))).toBe(
'no source named nope',
);
});
it('tags: no tags yet when empty, distinct sorted list otherwise', async () => {
expect(await svc.handle(ctx('#rss tags'))).toBe('no tags yet');
stored().add({
name: 'A',
url: 'https://a.example/rss',
tags: ['zeta', 'alpha'],
});
stored().add({
name: 'B',
url: 'https://b.example/rss',
tags: ['beta', 'alpha'],
});
expect(await svc.handle(ctx('#rss tags'))).toBe('alpha, beta, zeta');
});
it('sources: no sources yet when empty, names otherwise', async () => {
expect(await svc.handle(ctx('#rss sources'))).toBe('no sources yet');
stored().add({ name: 'Bee', url: 'https://b.example/rss', tags: [] });
stored().add({ name: 'Aye', url: 'https://a.example/rss', tags: [] });
expect(await svc.handle(ctx('#rss sources'))).toBe('Aye, Bee');
});
it('get <name>: summarizes the latest titles via chat with a bounded maxTokens', async () => {
stored().add({ name: 'myfeed', url: 'https://a.example/rss', tags: [] });
fetchMock.mockResolvedValueOnce(feedResponse(FEED_A));
llm.chat.mockResolvedValueOnce('Alpha and beta happened.');
const reply = await svc.handle(ctx('#rss get myfeed'));
expect(reply).toBe('Alpha and beta happened.');
const [messages, opts] = llm.chat.mock.calls[0];
expect(opts).toEqual({ maxTokens: 200 });
expect(messages[0].content).toContain('Alpha headline');
expect(messages[0].content).toContain('Beta headline');
});
it('get #tag: collects items across all sources with the tag; one dead feed does not sink it', async () => {
stored().add({ name: 'A', url: 'https://a.example/rss', tags: ['tech'] });
stored().add({ name: 'B', url: 'https://b.example/rss', tags: ['tech'] });
stored().add({ name: 'C', url: 'https://c.example/rss', tags: ['other'] }); // not matched by #tech
fetchMock
.mockResolvedValueOnce(feedResponse(FEED_A)) // A answers (Alpha, Beta)
.mockRejectedValueOnce(new Error('down')); // B is dead
llm.chat.mockResolvedValueOnce('Only alpha survived.');
const reply = await svc.handle(ctx('#rss get #tech'));
// B's fetch rejected, yet the summary still went out from A's titles alone
expect(reply).toBe('Only alpha survived.');
expect(llm.chat).toHaveBeenCalledTimes(1);
const content = llm.chat.mock.calls[0][0][0].content;
expect(content).toContain('Alpha headline');
});
it('get #tag: merges titles from every source carrying the tag', async () => {
stored().add({ name: 'A', url: 'https://a.example/rss', tags: ['tech'] });
stored().add({ name: 'B', url: 'https://b.example/rss', tags: ['tech'] });
fetchMock
.mockResolvedValueOnce(feedResponse(FEED_A)) // A → Alpha, Beta
.mockResolvedValueOnce(feedResponse(FEED_B)); // B → Gamma
llm.chat.mockResolvedValueOnce('all three.');
await svc.handle(ctx('#rss get #tech'));
const content = llm.chat.mock.calls[0][0][0].content;
expect(content).toContain('Alpha headline');
expect(content).toContain('Gamma headline'); // proves B's feed was collected too
});
it('get: unknown name and tag get distinct error replies', async () => {
expect(await svc.handle(ctx('#rss get nope'))).toBe('no source named nope');
stored().add({ name: 'A', url: 'https://a.example/rss', tags: ['tech'] });
expect(await svc.handle(ctx('#rss get #nothing'))).toBe(
'no sources with tag nothing',
);
});
});
+205
View File
@@ -0,0 +1,205 @@
import { Injectable, Logger } from '@nestjs/common';
import { DatabaseSync } from 'node:sqlite';
// type-only both ways — no runtime import cycle between src/rss and src/commands
import type { CommandContext } from '../commands/command.service.js';
import { LlmService } from '../llm/llm.service.js';
import { parseFeed } from './rss.feed.js';
import { RssStore } from './rss.store.js';
// ponytail: hardcoded tunables, promote to env if the owner wants them adjustable
const FETCH_TIMEOUT_MS = 15000; // feed fetches — same budget as the opencode notifier's POSTs
const MAX_TITLES = 8; // "up to 8 latest item titles" per the design
const TAG_MAX_TOKENS = 50;
const SUMMARY_MAX_TOKENS = 200;
/**
* The `#rss` command family: stored RSS sources (SQLite, shared MESH_DB_PATH file) with
* LLM-generated tags and on-demand headline summaries. All replies are short strings —
* CommandService routes them through MeshService.respond() like any other command reply.
*/
@Injectable()
export class RssService {
private readonly logger = new Logger(RssService.name);
private readonly store: RssStore;
constructor(
private readonly llm: LlmService,
db: DatabaseSync,
) {
this.store = new RssStore(db);
}
/** Entry point for the `#rss` prefix — always replies (errors included). */
async handle(ctx: CommandContext): Promise<string> {
const words = ctx.text.trim().split(/\s+/);
switch (words[1]) {
case undefined: // bare `#rss`
case 'help':
return this.help();
case 'add':
return this.add(words.slice(2));
case 'remove':
return this.remove(words.slice(2).join(' '));
case 'tags':
return this.tags();
case 'sources':
return this.sources();
case 'get':
return this.get((words[2] ?? '').trim());
default:
return this.help(); // unknown subcommand → help
}
}
private help(): string {
return [
'#rss add <url> <name> - add source with AI tags',
'#rss remove <name> - delete a source',
'#rss get <name|#tag> - summarize latest items',
'#rss tags - all distinct tags',
'#rss sources - all source names',
].join('\n');
}
/** `#rss add <url> <name>` — name may contain spaces (everything after the url). */
private async add(args: string[]): Promise<string> {
const url = args[0];
const name = args.slice(1).join(' ').trim();
if (!url || !name) return 'usage: #rss add <url> <name>';
let parsedUrl: URL;
try {
parsedUrl = new URL(url);
} catch {
return 'invalid url';
}
if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:')
return 'invalid url';
if (this.store.exists(name))
return `${name} already exists - remove it first`;
let titles: string[];
try {
titles = await this.fetchLatestTitles(url);
} catch (err) {
const msg = (err as Error).message;
// fetchLatestTitles throws `HTTP <status>` on non-2xx, other errors carry their own message
return msg.startsWith('HTTP')
? `feed fetch failed (${msg})`
: 'not a valid feed';
}
if (!titles.length) return 'not a valid feed (no items)';
// AI tags — best effort: a source is still added when the LLM fails
let tags: string[] = [];
try {
const raw = await this.llm.chat(
[
{
role: 'user',
content: `Give 2-4 short lowercase tags for these RSS feed item titles. Reply with comma-separated tags only - no # symbols, no explanation:\n${titles.join('\n')}`,
},
],
{ maxTokens: TAG_MAX_TOKENS },
);
tags = sanitizeTags(raw);
} catch (err) {
this.logger.warn(
`[rss] tag generation failed for '${name}': ${(err as Error).message}`,
);
}
this.store.add({ name, url, tags });
return tags.length
? `added ${name} (tags: ${tags.join(', ')})`
: 'added ' + name + ' (tag generation failed - no tags)';
}
private remove(name: string): string {
if (!name) return 'usage: #rss remove <name>';
return this.store.remove(name)
? `removed ${name}`
: `no source named ${name}`;
}
private tags(): string {
const all = this.store.allTags();
return all.length ? all.join(', ') : 'no tags yet';
}
private sources(): string {
const names = this.store.list().map((s) => s.name);
return names.length ? names.join(', ') : 'no sources yet';
}
/** `#rss get <name>` or `#rss get #<tag>`. */
private async get(target: string): Promise<string> {
if (!target) return 'usage: #rss get <name|#tag>';
let urls: string[];
if (target.startsWith('#')) {
const tag = target.slice(1).toLowerCase();
if (!tag) return 'usage: #rss get <name|#tag>';
const matching = this.store.list().filter((s) => s.tags.includes(tag));
if (!matching.length) return `no sources with tag ${tag}`;
urls = matching.map((s) => s.url);
} else {
const source = this.store.get(target);
if (!source) return `no source named ${target}`;
urls = [source.url];
}
// one dead feed must not sink the whole summary — collect what answers
const results = await Promise.allSettled(
urls.map((u) => this.fetchLatestTitles(u)),
);
const titles: string[] = [];
for (const r of results) {
if (r.status === 'fulfilled') titles.push(...r.value);
else
this.logger.warn(
`[rss] feed fetch failed: ${(r.reason as Error).message}`,
);
}
if (!titles.length) return 'no items found';
try {
return await this.llm.chat(
[
{
role: 'user',
content: `Summarize these RSS headlines into a few short one-line highlights. Be concise:\n${titles.join('\n')}`,
},
],
{ maxTokens: SUMMARY_MAX_TOKENS },
);
} catch (err) {
this.logger.warn(`[rss] summary failed: ${(err as Error).message}`);
return 'summary failed';
}
}
/** Fetch a feed and return up to MAX_TITLES latest item titles; throws on non-2xx. */
private async fetchLatestTitles(url: string): Promise<string[]> {
const res = await fetch(url, {
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
});
if (!res.ok) throw new Error(`HTTP ${res.status}`);
return parseFeed(await res.text())
.slice(0, MAX_TITLES)
.map((i) => i.title);
}
}
/** Normalize LLM tag output: lowercase, no #, whitespace → '-', deduped. */
export function sanitizeTags(raw: string): string[] {
const seen = new Set<string>();
for (const part of raw.split(',')) {
const tag = part
.trim()
.toLowerCase()
.replace(/^#+/, '')
.replace(/\s+/g, '-');
if (tag) seen.add(tag);
}
return [...seen];
}
+80
View File
@@ -0,0 +1,80 @@
import { mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { DatabaseSync } from 'node:sqlite';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { RssStore } from './rss.store.js';
describe('RssStore (real SQLite file)', () => {
let dir: string;
let store: RssStore;
beforeEach(() => {
dir = mkdtempSync(join(tmpdir(), 'mesh-bot-rss-'));
const db = new DatabaseSync(join(dir, 'test.db'));
store = new RssStore(db);
});
afterEach(() => {
rmSync(dir, { recursive: true, force: true });
});
it('adds and lists sources with tags round-tripped through the comma string', () => {
store.add({
name: 'Hacker News',
url: 'https://news.ycombinator.com/rss',
tags: ['tech', 'news'],
});
store.add({ name: 'LWN', url: 'https://lwn.net/headlines.rss', tags: [] });
expect(store.list()).toEqual([
{
name: 'Hacker News',
url: 'https://news.ycombinator.com/rss',
tags: ['tech', 'news'],
createdAt: expect.any(Number),
},
{
name: 'LWN',
url: 'https://lwn.net/headlines.rss',
tags: [],
createdAt: expect.any(Number),
},
]);
});
it('looks up and checks existence case-insensitively', () => {
store.add({ name: 'My Feed', url: 'https://example.com/rss', tags: ['a'] });
expect(store.get('my feed')?.url).toBe('https://example.com/rss');
expect(store.get('MY FEED')).toBeDefined();
expect(store.exists('mY fEeD')).toBe(true);
expect(store.exists('other')).toBe(false);
});
it('removes case-insensitively and reports whether a row went', () => {
store.add({ name: 'Gone', url: 'https://example.com/gone', tags: [] });
expect(store.remove('gone')).toBe(true);
expect(store.list()).toEqual([]);
expect(store.remove('gone')).toBe(false);
});
it('collects all distinct tags across sources, sorted', () => {
store.add({
name: 'A',
url: 'https://a.example/rss',
tags: ['zeta', 'alpha'],
});
store.add({
name: 'B',
url: 'https://b.example/rss',
tags: ['beta', 'alpha'],
});
expect(store.allTags()).toEqual(['alpha', 'beta', 'zeta']);
});
it('persists across a second connection to the same file (the production shape)', () => {
store.add({ name: 'Durable', url: 'https://d.example/rss', tags: ['x'] });
const db2 = new DatabaseSync(join(dir, 'test.db'));
expect(new RssStore(db2).get('durable')?.tags).toEqual(['x']);
});
});
+108
View File
@@ -0,0 +1,108 @@
import { DatabaseSync } from 'node:sqlite';
/** A stored RSS source; tags are a comma-separated string in the DB, split here. */
export interface RssSource {
name: string;
url: string;
tags: string[];
createdAt: number;
}
/** Idempotent — safe to call on every open (the table lives in the shared MESH_DB_PATH file). */
export function initRssTable(db: DatabaseSync): void {
db.exec(`CREATE TABLE IF NOT EXISTS rss_sources (
name TEXT PRIMARY KEY,
url TEXT NOT NULL,
tags TEXT NOT NULL DEFAULT '',
created_at INTEGER
)`);
}
/** CRUD for the rss_sources table. Names are matched case-insensitively everywhere. */
export class RssStore {
constructor(private readonly db: DatabaseSync) {
initRssTable(db);
}
list(): RssSource[] {
const rows = this.db
.prepare(
'SELECT name, url, tags, created_at FROM rss_sources ORDER BY name',
)
.all() as {
name: string;
url: string;
tags: string;
created_at: number;
}[];
return rows.map((r) => ({
name: r.name,
url: r.url,
tags: splitTags(r.tags),
createdAt: r.created_at,
}));
}
/** Case-insensitive lookup by name. */
get(name: string): RssSource | undefined {
const row = this.db
.prepare(
'SELECT name, url, tags, created_at FROM rss_sources WHERE name = ? COLLATE NOCASE',
)
.get(name) as
| { name: string; url: string; tags: string; created_at: number }
| undefined;
return (
row && {
name: row.name,
url: row.url,
tags: splitTags(row.tags),
createdAt: row.created_at,
}
);
}
/** Case-insensitive duplicate check. */
exists(name: string): boolean {
const row = this.db
.prepare('SELECT 1 FROM rss_sources WHERE name = ? COLLATE NOCASE')
.get(name);
return row !== undefined;
}
add(source: { name: string; url: string; tags: string[] }): void {
this.db
.prepare(
'INSERT INTO rss_sources (name, url, tags, created_at) VALUES (?, ?, ?, ?)',
)
.run(source.name, source.url, joinTags(source.tags), Date.now());
}
/** Case-insensitive delete; true when a row was removed. */
remove(name: string): boolean {
const result = this.db
.prepare('DELETE FROM rss_sources WHERE name = ? COLLATE NOCASE')
.run(name);
return Number(result.changes) > 0;
}
/** All distinct tags across sources, sorted. */
allTags(): string[] {
const set = new Set<string>();
for (const source of this.list()) {
for (const tag of source.tags) set.add(tag);
}
return [...set].sort();
}
}
export function splitTags(raw: string): string[] {
return raw
.split(',')
.map((t) => t.trim())
.filter(Boolean);
}
export function joinTags(tags: string[]): string {
return tags.join(',');
}