Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
108aa400d3 | ||
|
|
f640f6658c | ||
|
|
57ad27d66f | ||
|
|
5292303786 |
@@ -17,7 +17,7 @@
|
|||||||
## 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 | "!b" | "broadcast"> }`, returns `{ id }`), and `GET /api/channels` (the device's Meshtastic channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]`; psk/keys redacted). 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 2 (`testowy`) on purpose — never the primary channel; override via `MESH_SEND_CHANNEL` (default `2`).
|
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/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, reset on reconnect), `GET /api/nodes` (known nodes sorted by num as `{ num, longName?, shortName?, hwModel?, batteryLevel?, lastHeard: number|null, position?: { lat, lon, alt? } }[]`, 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`).
|
||||||
|
|
||||||
## Other
|
## Other
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,30 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v0.5.0 — 2026-09-24 17:37
|
||||||
|
|
||||||
|
- Publishing channel moved from `testowy` (index 2) to the new `test` channel (index 3); `MESH_SEND_CHANNEL` default is now `3`. All docs/comments referencing the old pinning updated accordingly.
|
||||||
|
|
||||||
|
## v0.4.0 — 2026-09-24 14:39
|
||||||
|
|
||||||
|
- `POST /api/send` now accepts node names and explicit broadcast sentinels in `to`: omitted/"" or `"!b"`/`"broadcast"` (case-insensitive, trimmed) → broadcast address `0xffffffff`; numbers pass through as-is (must be an integer in 1..0xffffffff); numeric strings are parsed the same way; anything else is looked up by name via the existing node DB lookup (exact long/short name, then unique substring). Unknown or ambiguous targets are a 400 with `no node matching '<to>'`. New service method `MeshService.resolveDest(to?)` does the resolution — `sendText()` keeps its resolved-number signature.
|
||||||
|
- Swagger: `SendTextDto.to` documented as `number | string` with the full resolution order and the DM-vs-broadcast caveat (DMs are unicast wantAck-tracked via `GET /api/messages`; broadcasts stay pending because firmware strips want_ack); `@ApiOperation` notes all sends still ride channel index 2 (`testowy`) regardless of DM or broadcast.
|
||||||
|
- README + AGENTS.md endpoint lists updated for the new `to` semantics.
|
||||||
|
- Unit tests: `resolveDest` coverage on the fake bridge — omitted/""/"!b"/"BROADCAST" → broadcast, number passthrough, numeric string, exact longName match → num (node DB seeded via framed FromRadio nodeInfo), unknown name → `no node matching`, and invalid numbers (0, negative, non-integer, > 0xffffffff) rejected.
|
||||||
|
|
||||||
|
## v0.3.0 — 2026-09-24 14:08
|
||||||
|
|
||||||
|
- Message history with delivery tracking, exposed as `GET /api/messages` (newest first): inbound TEXT_MESSAGE_APP packets (`dir:'rx'`, with `from`) and our sends (`dir:'tx'`, with `to` + `status`). tx records start `pending` and move to `delivered`/`failed` when the routing ACK/NACK arrives — ROUTING_APP packets carry a serialized `meshtastic.Routing` in `Data.payload` whose oneof variant is `errorReason` (`Routing_Error`: 0 NONE = delivered, anything else failed with a human-readable `ackError`, e.g. NO_ROUTE/GOT_NAK/TIMEOUT, fallback `reason <n>`), matched to our sends via `Data.requestId`. Broadcasts stay `pending` because firmware strips want_ack pre-TX (documented behavior, no timer). History is a bounded in-memory buffer of the last 100 records (newest kept) and resets on every bridge reconnect alongside channels/nodes.
|
||||||
|
- Codec: new `PORT_ROUTING_APP = 5` constant (verified against the installed `@meshtastic/protobufs` PortNum enum), `decodeRouting()` for ROUTING_APP payloads, and `describeRoutingError()` which maps a Routing.Error code to its name from the installed package's `Mesh.Routing_Error` enum.
|
||||||
|
- Swagger: `GET /api/messages` documented with the pending→delivered/failed lifecycle, the broadcast caveat, and an example matching the record shape; README + AGENTS.md endpoint lists updated.
|
||||||
|
|
||||||
|
## v0.2.0 — 2026-09-24 13:08
|
||||||
|
|
||||||
|
- Node database collected during the initial sync (`FromRadio.nodeInfo` frames, upserted by node number) and kept fresh by live `POSITION_APP` packets (the Position is serialized in `Data.payload`; unknown senders get a stub entry). The map resets on every bridge reconnect alongside channels.
|
||||||
|
- New endpoints: `GET /api/nodes` — lean summaries sorted by node number as `{ num, longName?, shortName?, hwModel?, batteryLevel?, lastHeard (epoch secs | null), position? { lat, lon, alt? } }[]`; names/hwModel/battery appear only when the device reported them, `hwModel` is the enum's string name (UNSET omitted), and `position` only when both coordinates are known. `GET /api/nodes/:id` — lookup by exact node number (numbers/numeric strings), then case-insensitive exact long/short name, else unique case-insensitive substring; 404 with a clear message when nothing or more than one node matches.
|
||||||
|
- Codec: new `PORT_POSITION_APP = 3` constant (verified against the installed `@meshtastic/protobufs` PortNum enum), `decodePosition()` for POSITION_APP payloads, and `loadHwModelNames()` reverse lookup of the HardwareModel enum.
|
||||||
|
- Swagger docs made genuinely useful: `Mesh` tag on the controller (description via `DocumentBuilder.addTag` — v12's `ApiTagOptions` has no description field) plus `@ApiOperation` summary/description and `@ApiResponse` examples on all endpoints, existing and new.
|
||||||
|
- Unit tests build real framed FromRadio bytes for nodeInfo/POSITION_APP: sync collection + summary shape (lat/lon = value × 1e-7, battery), stub entry from an unknown POSITION_APP sender, lookup ladder (exact num / numeric string / exact name / unique substring) with ambiguous and missing → null, and reconnect reset.
|
||||||
|
|
||||||
## v0.1.4 — 2026-09-23 20:33
|
## v0.1.4 — 2026-09-23 20:33
|
||||||
|
|
||||||
- Send a `ToRadio` with `want_config_id` (random non-zero uint32 nonce) on every bridge connect, so the firmware streams its initial sync data (`myInfo`, channels, `config_complete_id`) — previously nothing was written on connect, which is why `/api/channels` stayed empty and `myNodeNum` stayed null in production. New codec helper `buildWantConfigToRadio`; unit test captures the outbound frame on the fake bridge, asserts the `wantConfigId` oneof case with a non-zero value, then feeds back `myInfo` + `configCompleteId` frames and checks service state.
|
- Send a `ToRadio` with `want_config_id` (random non-zero uint32 nonce) on every bridge connect, so the firmware streams its initial sync data (`myInfo`, channels, `config_complete_id`) — previously nothing was written on connect, which is why `/api/channels` stayed empty and `myNodeNum` stayed null in production. New codec helper `buildWantConfigToRadio`; unit test captures the outbound frame on the fake bridge, asserts the `wantConfigId` oneof case with a non-zero value, then feeds back `myInfo` + `configCompleteId` frames and checks service state.
|
||||||
|
|||||||
@@ -26,8 +26,11 @@ 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 | "!b" | "broadcast"> }`, returns `{ id }`
|
- `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
|
||||||
- `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/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. In-memory only, last 100, reset on every bridge reconnect
|
||||||
|
- `GET /api/nodes` — known mesh nodes as `{ num, longName?, shortName?, hwModel?, batteryLevel?, lastHeard: number|null, position?: { lat, lon, alt? } }[]`, sorted by node number. Collected during the initial sync plus live position updates; names/hwModel/battery appear only when reported, `lastHeard` is epoch seconds (null = never heard), and `position` only when both coordinates are known
|
||||||
|
- `GET /api/nodes/:id` — one node looked up by exact node number (numbers or numeric strings), then case-insensitive exact long/short name, else the unique case-insensitive substring match; 404 when nothing or more than one node matches
|
||||||
|
|
||||||
Interactive API docs (Scalar) are served at `/`, with the OpenAPI JSON at
|
Interactive API docs (Scalar) are served at `/`, with the OpenAPI JSON at
|
||||||
`/docs-json`.
|
`/docs-json`.
|
||||||
@@ -37,11 +40,17 @@ curl http://localhost:3000/api/status
|
|||||||
curl -X POST http://localhost:3000/api/send -H 'content-type: application/json' -d '{"text":"hi"}'
|
curl -X POST http://localhost:3000/api/send -H 'content-type: application/json' -d '{"text":"hi"}'
|
||||||
curl -X POST http://localhost:3000/api/send -H 'content-type: application/json' -d '{"to":123456789,"text":"hello"}'
|
curl -X POST http://localhost:3000/api/send -H 'content-type: application/json' -d '{"to":123456789,"text":"hello"}'
|
||||||
curl http://localhost:3000/api/channels
|
curl http://localhost:3000/api/channels
|
||||||
|
curl http://localhost:3000/api/messages
|
||||||
|
curl http://localhost:3000/api/nodes
|
||||||
|
curl http://localhost:3000/api/nodes/kamil
|
||||||
```
|
```
|
||||||
|
|
||||||
`to` omitted, `"!b"`, or `"broadcast"` sends to the broadcast address `0xffffffff`.
|
`to` omitted, `"!b"`, or `"broadcast"` (case-insensitive) sends to the
|
||||||
|
broadcast address `0xffffffff`; anything else is a node number or name.
|
||||||
|
DMs are unicast and wantAck-tracked via `GET /api/messages`; broadcasts stay
|
||||||
|
pending because firmware strips want_ack before TX.
|
||||||
|
|
||||||
All sends always target channel index 2 (`testowy`) — never the primary
|
All sends always target channel index 3 (`test`) — never the primary
|
||||||
channel. Override with `MESH_SEND_CHANNEL`.
|
channel. Override with `MESH_SEND_CHANNEL`.
|
||||||
|
|
||||||
## Env vars
|
## Env vars
|
||||||
@@ -49,7 +58,7 @@ channel. Override with `MESH_SEND_CHANNEL`.
|
|||||||
- `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 `2`) — channel index all sends target (`testowy`; never the primary channel)
|
- `MESH_SEND_CHANNEL` (default `3`) — channel index all sends target (`test`; never the primary channel)
|
||||||
- `PORT` (default `3000`) — HTTP listen port
|
- `PORT` (default `3000`) — HTTP listen port
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mesh-bot",
|
"name": "mesh-bot",
|
||||||
"version": "0.1.4",
|
"version": "0.5.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
+2
-1
@@ -15,8 +15,9 @@ async function bootstrap() {
|
|||||||
const docConfig = new DocumentBuilder()
|
const docConfig = new DocumentBuilder()
|
||||||
.setTitle('MeshBot API')
|
.setTitle('MeshBot API')
|
||||||
.setDescription(
|
.setDescription(
|
||||||
'Meshtastic bridge bot: status, send text messages, list device channels.',
|
'Meshtastic bridge bot: status, send text messages, list device channels and known nodes.',
|
||||||
)
|
)
|
||||||
|
.addTag('Mesh', 'Meshtastic bridge control and telemetry')
|
||||||
.setVersion(pkg.version)
|
.setVersion(pkg.version)
|
||||||
.build();
|
.build();
|
||||||
const document = SwaggerModule.createDocument(app, docConfig);
|
const document = SwaggerModule.createDocument(app, docConfig);
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ async function loadProto(): Promise<typeof import('@meshtastic/protobufs')> {
|
|||||||
export const BROADCAST_ADDR = 0xffffffff;
|
export const BROADCAST_ADDR = 0xffffffff;
|
||||||
// official portnums.proto: TEXT_MESSAGE_APP=1 (task spec draft said 3 — the enum value wins)
|
// official portnums.proto: TEXT_MESSAGE_APP=1 (task spec draft said 3 — the enum value wins)
|
||||||
export const PORT_TEXT_MESSAGE_APP = 1;
|
export const PORT_TEXT_MESSAGE_APP = 1;
|
||||||
|
// verified against installed @meshtastic/protobufs Portnums.PortNum.POSITION_APP
|
||||||
|
export const PORT_POSITION_APP = 3;
|
||||||
|
// verified against installed @meshtastic/protobufs Portnums.PortNum.ROUTING_APP
|
||||||
|
export const PORT_ROUTING_APP = 5;
|
||||||
|
|
||||||
const START1 = 0x94;
|
const START1 = 0x94;
|
||||||
const START2 = 0xc3;
|
const START2 = 0xc3;
|
||||||
@@ -61,6 +65,46 @@ export async function decodeFromRadio(
|
|||||||
return fromBinary(P.Mesh.FromRadioSchema, bytes);
|
return fromBinary(P.Mesh.FromRadioSchema, bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** POSITION_APP packets carry a serialized meshtastic.Position in Data.payload. */
|
||||||
|
export async function decodePosition(
|
||||||
|
bytes: Uint8Array,
|
||||||
|
): Promise<import('@meshtastic/protobufs').Mesh.Position> {
|
||||||
|
const P = await loadProto();
|
||||||
|
return fromBinary(P.Mesh.PositionSchema, bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ROUTING_APP packets carry a serialized meshtastic.Routing in Data.payload (ACK/NACK for want_ack sends). */
|
||||||
|
export async function decodeRouting(
|
||||||
|
bytes: Uint8Array,
|
||||||
|
): Promise<import('@meshtastic/protobufs').Mesh.Routing> {
|
||||||
|
const P = await loadProto();
|
||||||
|
return fromBinary(P.Mesh.RoutingSchema, bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Human-readable name for a Routing.Error code (from the installed @meshtastic/protobufs enum), `reason <n>` fallback. */
|
||||||
|
export async function describeRoutingError(code: number): Promise<string> {
|
||||||
|
const P = await loadProto();
|
||||||
|
const hit = Object.entries(P.Mesh.Routing_Error).find(
|
||||||
|
([, v]) => typeof v === 'number' && v === code,
|
||||||
|
);
|
||||||
|
return hit ? String(hit[0]) : `reason ${code}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
let hwModelNames: Map<number, string> | null = null;
|
||||||
|
/** Reverse lookup of meshtastic.HardwareModel (enum value -> name), loaded once. */
|
||||||
|
export async function loadHwModelNames(): Promise<Map<number, string>> {
|
||||||
|
if (!hwModelNames) {
|
||||||
|
const P = await loadProto();
|
||||||
|
hwModelNames = new Map(
|
||||||
|
Object.entries(P.Mesh.HardwareModel).map(([k, v]) => [
|
||||||
|
Number(k),
|
||||||
|
String(v),
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return hwModelNames;
|
||||||
|
}
|
||||||
|
|
||||||
export async function buildTextToRadio(
|
export async function buildTextToRadio(
|
||||||
to: number,
|
to: number,
|
||||||
text: string,
|
text: string,
|
||||||
|
|||||||
+144
-14
@@ -3,10 +3,16 @@ import {
|
|||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
|
NotFoundException,
|
||||||
|
Param,
|
||||||
Post,
|
Post,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ApiOperation, ApiProperty } from '@nestjs/swagger';
|
import {
|
||||||
import { BROADCAST_ADDR } from './codec.js';
|
ApiOperation,
|
||||||
|
ApiProperty,
|
||||||
|
ApiResponse,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
import { MeshService } from './mesh.service.js';
|
import { MeshService } from './mesh.service.js';
|
||||||
|
|
||||||
export class SendTextDto {
|
export class SendTextDto {
|
||||||
@@ -15,37 +21,62 @@ export class SendTextDto {
|
|||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
required: false,
|
required: false,
|
||||||
description:
|
description:
|
||||||
'Decimal node number, "!b", or "broadcast" (defaults to broadcast)',
|
'Send target. Resolution order: omitted or "" → broadcast (0xffffffff); number → used as-is (integer in 1..0xffffffff); numeric string → that node number; "!b" or "broadcast" (case-insensitive) → broadcast; anything else is looked up by name — exact long/short name, then unique substring. DMs are unicast and wantAck-tracked via GET /api/messages (pending→delivered/failed); broadcasts stay pending because firmware strips want_ack.',
|
||||||
example: '!b',
|
example: '!b',
|
||||||
})
|
})
|
||||||
to?: string | number;
|
to?: string | number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// tag description is set via DocumentBuilder.addTag in main.ts (v12 ApiTagOptions has no description)
|
||||||
|
@ApiTags('Mesh')
|
||||||
@Controller()
|
@Controller()
|
||||||
export class MeshController {
|
export class MeshController {
|
||||||
constructor(private readonly mesh: MeshService) {}
|
constructor(private readonly mesh: MeshService) {}
|
||||||
|
|
||||||
@Get('status')
|
@Get('status')
|
||||||
@ApiOperation({ summary: 'Bridge connection status' })
|
@ApiOperation({
|
||||||
|
summary: 'Bridge connection status',
|
||||||
|
description:
|
||||||
|
'Whether the bot is connected to the meshtastic-serial-bridge and which node number this device has.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'Connection status',
|
||||||
|
example: {
|
||||||
|
connected: true,
|
||||||
|
myNodeNum: 123456789,
|
||||||
|
host: '192.168.1.4',
|
||||||
|
port: 4403,
|
||||||
|
},
|
||||||
|
})
|
||||||
status() {
|
status() {
|
||||||
return this.mesh.status();
|
return this.mesh.status();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('send')
|
@Post('send')
|
||||||
@ApiOperation({ summary: 'Send a text message over the mesh' })
|
@ApiOperation({
|
||||||
|
summary: 'Send a text message over the mesh',
|
||||||
|
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.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'Packet queued',
|
||||||
|
example: { id: 123456789 },
|
||||||
|
})
|
||||||
|
@ApiResponse({ status: 400, description: 'Invalid text or target' })
|
||||||
|
@ApiResponse({ status: 503, description: 'Bridge not connected' })
|
||||||
async send(@Body() body: SendTextDto) {
|
async send(@Body() body: SendTextDto) {
|
||||||
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');
|
||||||
}
|
}
|
||||||
let to = BROADCAST_ADDR;
|
let to: number;
|
||||||
const t = body.to;
|
try {
|
||||||
if (t !== undefined && t !== '!b' && t !== 'broadcast') {
|
to = await this.mesh.resolveDest(body.to);
|
||||||
const n = typeof t === 'number' ? t : Number(String(t));
|
} catch (err) {
|
||||||
if (!Number.isFinite(n))
|
throw new BadRequestException(
|
||||||
throw new BadRequestException(
|
err instanceof Error ? err.message : String(err),
|
||||||
'to must be a decimal node number, "!b", or "broadcast"',
|
);
|
||||||
);
|
|
||||||
to = n;
|
|
||||||
}
|
}
|
||||||
return { id: await this.mesh.sendText(to, body.text) };
|
return { id: await this.mesh.sendText(to, body.text) };
|
||||||
}
|
}
|
||||||
@@ -53,8 +84,107 @@ export class MeshController {
|
|||||||
@Get('channels')
|
@Get('channels')
|
||||||
@ApiOperation({
|
@ApiOperation({
|
||||||
summary: "The device's Meshtastic channels (keys redacted)",
|
summary: "The device's Meshtastic channels (keys redacted)",
|
||||||
|
description:
|
||||||
|
'Channel table streamed during the initial sync; empty until it completes. psk/keys are never exposed.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'Channels sorted by index',
|
||||||
|
example: [
|
||||||
|
{ index: 0, name: 'Default', uplinkEnabled: true, downlinkEnabled: true },
|
||||||
|
{
|
||||||
|
index: 3,
|
||||||
|
name: 'test',
|
||||||
|
uplinkEnabled: false,
|
||||||
|
downlinkEnabled: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
})
|
})
|
||||||
channels() {
|
channels() {
|
||||||
return this.mesh.channels();
|
return this.mesh.channels();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('messages')
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Message history (last 100)',
|
||||||
|
description:
|
||||||
|
'Inbound text messages and our sends, newest first. tx records start "pending" and move to "delivered"/"failed" when the routing ACK/NACK arrives; broadcasts stay "pending" because firmware strips want_ack before TX. History is in-memory only (last 100) and resets on every bridge reconnect.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'Messages newest first',
|
||||||
|
example: [
|
||||||
|
{
|
||||||
|
id: 456789,
|
||||||
|
dir: 'tx',
|
||||||
|
to: 42,
|
||||||
|
text: 'hello test',
|
||||||
|
channel: 3,
|
||||||
|
at: 1758000123456,
|
||||||
|
status: 'delivered',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 123456,
|
||||||
|
dir: 'rx',
|
||||||
|
from: 987654321,
|
||||||
|
text: 'ping',
|
||||||
|
channel: 2,
|
||||||
|
at: 1758000000000,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
messages() {
|
||||||
|
return this.mesh.messages();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('nodes')
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Known mesh nodes (lean summaries)',
|
||||||
|
description:
|
||||||
|
'Node database collected during the initial sync plus live POSITION_APP updates; reset on every bridge reconnect. Names, hwModel and batteryLevel appear only when the device reported them.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'Nodes sorted by node number',
|
||||||
|
example: [
|
||||||
|
{
|
||||||
|
num: 123456789,
|
||||||
|
longName: 'Kamil SP8MK/P',
|
||||||
|
shortName: 'KK',
|
||||||
|
hwModel: 'TBEAM',
|
||||||
|
batteryLevel: 87,
|
||||||
|
lastHeard: 1758000000,
|
||||||
|
position: { lat: 52.1049637, lon: 20.9833152, alt: 123 },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
async nodes() {
|
||||||
|
return this.mesh.nodes();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('nodes/:id')
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Look up one node by number or name',
|
||||||
|
description:
|
||||||
|
'Exact node number first (numbers and numeric strings), then case-insensitive exact long/short name, else the unique case-insensitive substring match across names. 404 when nothing or more than one node matches.',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'The matching node',
|
||||||
|
example: {
|
||||||
|
num: 123456789,
|
||||||
|
longName: 'Kamil SP8MK/P',
|
||||||
|
shortName: 'KK',
|
||||||
|
lastHeard: null,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 404,
|
||||||
|
description: 'No node (or more than one) matching the given id or name',
|
||||||
|
})
|
||||||
|
async node(@Param('id') id: string) {
|
||||||
|
const n = await this.mesh.node(id);
|
||||||
|
if (!n) throw new NotFoundException(`no node matching '${id}'`);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ 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 { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
import { extractFrames, frame } from './codec.js';
|
import { BROADCAST_ADDR, extractFrames, frame } from './codec.js';
|
||||||
import { MeshService } from './mesh.service.js';
|
import { MeshService } from './mesh.service.js';
|
||||||
|
|
||||||
function startBridge(onSocket?: (s: net.Socket) => void): Promise<{
|
function startBridge(onSocket?: (s: net.Socket) => void): Promise<{
|
||||||
@@ -27,14 +27,131 @@ function startBridge(onSocket?: (s: net.Socket) => void): Promise<{
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitFor(cond: () => boolean, timeoutMs = 5000): Promise<void> {
|
async function waitFor(
|
||||||
|
cond: () => boolean | Promise<boolean>,
|
||||||
|
timeoutMs = 5000,
|
||||||
|
): Promise<void> {
|
||||||
const t0 = Date.now();
|
const t0 = Date.now();
|
||||||
while (!cond()) {
|
while (!(await cond())) {
|
||||||
if (Date.now() - t0 > timeoutMs) throw new Error('timed out waiting');
|
if (Date.now() - t0 > timeoutMs) throw new Error('timed out waiting');
|
||||||
await new Promise((r) => setTimeout(r, 10));
|
await new Promise((r) => setTimeout(r, 10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function nodeInfoFrame(
|
||||||
|
num: number,
|
||||||
|
fields?: Partial<P.Mesh.NodeInfo>,
|
||||||
|
): Uint8Array {
|
||||||
|
const ni = create(P.Mesh.NodeInfoSchema, { num, ...fields });
|
||||||
|
return frame(
|
||||||
|
toBinary(
|
||||||
|
P.Mesh.FromRadioSchema,
|
||||||
|
create(P.Mesh.FromRadioSchema, {
|
||||||
|
payloadVariant: { case: 'nodeInfo', value: ni },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// live position update: POSITION_APP packet with a serialized Position in Data.payload
|
||||||
|
function positionPacketFrame(
|
||||||
|
from: number,
|
||||||
|
pos: Partial<P.Mesh.Position>,
|
||||||
|
): Uint8Array {
|
||||||
|
const data = create(P.Mesh.DataSchema, {
|
||||||
|
portnum: P.Portnums.PortNum.POSITION_APP,
|
||||||
|
payload: toBinary(
|
||||||
|
P.Mesh.PositionSchema,
|
||||||
|
create(P.Mesh.PositionSchema, pos),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
const pkt = create(P.Mesh.MeshPacketSchema, {
|
||||||
|
from,
|
||||||
|
id: 1,
|
||||||
|
payloadVariant: { case: 'decoded', value: data },
|
||||||
|
});
|
||||||
|
return frame(
|
||||||
|
toBinary(
|
||||||
|
P.Mesh.FromRadioSchema,
|
||||||
|
create(P.Mesh.FromRadioSchema, {
|
||||||
|
payloadVariant: { case: 'packet', value: pkt },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const KAMIL_NUM = 123456789;
|
||||||
|
// inbound text message: TEXT_MESSAGE_APP packet with UTF-8 in Data.payload
|
||||||
|
function textPacketFrame(
|
||||||
|
from: number,
|
||||||
|
to: number,
|
||||||
|
text: string,
|
||||||
|
channel = 0,
|
||||||
|
): Uint8Array {
|
||||||
|
const data = create(P.Mesh.DataSchema, {
|
||||||
|
portnum: P.Portnums.PortNum.TEXT_MESSAGE_APP,
|
||||||
|
payload: new TextEncoder().encode(text),
|
||||||
|
});
|
||||||
|
const pkt = create(P.Mesh.MeshPacketSchema, {
|
||||||
|
from,
|
||||||
|
to,
|
||||||
|
id: 1,
|
||||||
|
channel,
|
||||||
|
payloadVariant: { case: 'decoded', value: data },
|
||||||
|
});
|
||||||
|
return frame(
|
||||||
|
toBinary(
|
||||||
|
P.Mesh.FromRadioSchema,
|
||||||
|
create(P.Mesh.FromRadioSchema, {
|
||||||
|
payloadVariant: { case: 'packet', value: pkt },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ACK/NACK for our sends: ROUTING_APP packet with Data.requestId = original id and a serialized Routing in the payload
|
||||||
|
function routingFrame(
|
||||||
|
requestId: number,
|
||||||
|
errorReason: P.Mesh.Routing_Error,
|
||||||
|
): Uint8Array {
|
||||||
|
const data = create(P.Mesh.DataSchema, {
|
||||||
|
portnum: P.Portnums.PortNum.ROUTING_APP,
|
||||||
|
requestId,
|
||||||
|
payload: toBinary(
|
||||||
|
P.Mesh.RoutingSchema,
|
||||||
|
create(P.Mesh.RoutingSchema, {
|
||||||
|
variant: { case: 'errorReason', value: errorReason },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
const pkt = create(P.Mesh.MeshPacketSchema, {
|
||||||
|
from: 1,
|
||||||
|
id: 2,
|
||||||
|
payloadVariant: { case: 'decoded', value: data },
|
||||||
|
});
|
||||||
|
return frame(
|
||||||
|
toBinary(
|
||||||
|
P.Mesh.FromRadioSchema,
|
||||||
|
create(P.Mesh.FromRadioSchema, {
|
||||||
|
payloadVariant: { case: 'packet', value: pkt },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
function kamilNodeInfo(): Partial<P.Mesh.NodeInfo> {
|
||||||
|
return {
|
||||||
|
user: {
|
||||||
|
id: '!kamil',
|
||||||
|
longName: 'Kamil SP8MK/P',
|
||||||
|
shortName: 'KK',
|
||||||
|
hwModel: P.Mesh.HardwareModel.TBEAM,
|
||||||
|
},
|
||||||
|
position: { latitudeI: 521049637, longitudeI: 209833152, altitude: 123 },
|
||||||
|
lastHeard: 1758000000,
|
||||||
|
deviceMetrics: { batteryLevel: 87 },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function channelFrame(
|
function channelFrame(
|
||||||
index: number,
|
index: number,
|
||||||
settings?: { name?: string; uplinkEnabled?: boolean },
|
settings?: { name?: string; uplinkEnabled?: boolean },
|
||||||
@@ -178,11 +295,11 @@ describe('MeshService connect', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe('MeshService send', () => {
|
describe('MeshService send', () => {
|
||||||
it('sends on the test channel (index 2) by default, never primary', async () => {
|
it('sends on the test channel (index 3) by default, never primary', 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);
|
||||||
delete process.env.MESH_SEND_CHANNEL; // default path: "testowy" (index 2)
|
delete process.env.MESH_SEND_CHANNEL; // default path: "test" (index 3)
|
||||||
const svc = new MeshService();
|
const svc = new MeshService();
|
||||||
try {
|
try {
|
||||||
svc.onModuleInit();
|
svc.onModuleInit();
|
||||||
@@ -192,7 +309,7 @@ describe('MeshService send', () => {
|
|||||||
|
|
||||||
const out: Uint8Array[] = [];
|
const out: Uint8Array[] = [];
|
||||||
bridge.sockets[0].on('data', (c) => out.push(c));
|
bridge.sockets[0].on('data', (c) => out.push(c));
|
||||||
const id = await svc.sendText(42, 'hello testowy');
|
const id = await svc.sendText(42, 'hello test');
|
||||||
expect(id).toBeGreaterThan(0);
|
expect(id).toBeGreaterThan(0);
|
||||||
|
|
||||||
const readOutbound = (): P.Mesh.MeshPacket | undefined => {
|
const readOutbound = (): P.Mesh.MeshPacket | undefined => {
|
||||||
@@ -214,7 +331,7 @@ describe('MeshService send', () => {
|
|||||||
|
|
||||||
await waitFor(() => readOutbound() !== undefined);
|
await waitFor(() => readOutbound() !== undefined);
|
||||||
const pkt = readOutbound()!;
|
const pkt = readOutbound()!;
|
||||||
expect(pkt.channel).toBe(2); // "testowy" — never the primary channel (0)
|
expect(pkt.channel).toBe(3); // "test" — never the primary channel (0)
|
||||||
expect(pkt.to).toBe(42);
|
expect(pkt.to).toBe(42);
|
||||||
const decoded =
|
const decoded =
|
||||||
pkt.payloadVariant?.case === 'decoded'
|
pkt.payloadVariant?.case === 'decoded'
|
||||||
@@ -222,7 +339,7 @@ describe('MeshService send', () => {
|
|||||||
: undefined;
|
: undefined;
|
||||||
expect(
|
expect(
|
||||||
new TextDecoder().decode(decoded?.payload ?? new Uint8Array()),
|
new TextDecoder().decode(decoded?.payload ?? new Uint8Array()),
|
||||||
).toBe('hello testowy');
|
).toBe('hello test');
|
||||||
} finally {
|
} finally {
|
||||||
delete process.env.MESH_SEND_CHANNEL;
|
delete process.env.MESH_SEND_CHANNEL;
|
||||||
svc.onModuleDestroy();
|
svc.onModuleDestroy();
|
||||||
@@ -230,3 +347,326 @@ describe('MeshService send', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('MeshService node database', () => {
|
||||||
|
it('collects NodeInfo during sync and summarizes nodes', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(987654321)); // bare entry: no user/position/metrics yet
|
||||||
|
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 2);
|
||||||
|
expect(await svc.nodes()).toEqual([
|
||||||
|
{
|
||||||
|
num: KAMIL_NUM,
|
||||||
|
longName: 'Kamil SP8MK/P',
|
||||||
|
shortName: 'KK',
|
||||||
|
hwModel: 'TBEAM',
|
||||||
|
batteryLevel: 87,
|
||||||
|
lastHeard: 1758000000,
|
||||||
|
position: { lat: 521049637 * 1e-7, lon: 209833152 * 1e-7, alt: 123 },
|
||||||
|
},
|
||||||
|
{ num: 987654321, lastHeard: null }, // names/hwModel/battery/position omitted when absent
|
||||||
|
]);
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates a stub entry for POSITION_APP packets from unknown nodes', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(
|
||||||
|
positionPacketFrame(555, {
|
||||||
|
latitudeI: 10000000,
|
||||||
|
longitudeI: -20000000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 1);
|
||||||
|
expect(await svc.nodes()).toEqual([
|
||||||
|
{ num: 555, lastHeard: null, position: { lat: 1, lon: -2 } }, // no alt sent -> omitted
|
||||||
|
]);
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('looks up nodes by exact num, numeric string, exact name and unique substring', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
bridge.sockets[0].write(
|
||||||
|
nodeInfoFrame(42, {
|
||||||
|
user: { id: '!ot', longName: 'Other Node', shortName: 'OT' },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 2);
|
||||||
|
|
||||||
|
expect((await svc.node(KAMIL_NUM))?.longName).toBe('Kamil SP8MK/P'); // exact num
|
||||||
|
expect((await svc.node(String(KAMIL_NUM)))?.num).toBe(KAMIL_NUM); // numeric string
|
||||||
|
expect((await svc.node('kamil sp8mk/p'))?.shortName).toBe('KK'); // case-insensitive exact name
|
||||||
|
expect((await svc.node('kamil'))?.num).toBe(KAMIL_NUM); // unique substring
|
||||||
|
expect(await svc.node('zzz-nope')).toBeNull(); // no match
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns null for ambiguous name matches', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
// two nodes whose names both contain "kamil" and share the short name "KK"
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
bridge.sockets[0].write(
|
||||||
|
nodeInfoFrame(777, {
|
||||||
|
user: { id: '!kj', longName: 'Kamil Jr.', shortName: 'KK' },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 2);
|
||||||
|
|
||||||
|
expect(await svc.node('kamil')).toBeNull(); // substring matches two nodes
|
||||||
|
expect(await svc.node('kk')).toBeNull(); // exact name matches two nodes
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resets the node database on reconnect (no stale data)', async () => {
|
||||||
|
const bridge = await startBridge();
|
||||||
|
process.env.MESH_HOST = '127.0.0.1';
|
||||||
|
process.env.MESH_PORT = String(bridge.port);
|
||||||
|
process.env.MESH_RECONNECT_MS = '50';
|
||||||
|
const svc = new MeshService();
|
||||||
|
try {
|
||||||
|
svc.onModuleInit();
|
||||||
|
await waitFor(
|
||||||
|
() => bridge.sockets.length === 1 && svc.status().connected,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 1);
|
||||||
|
|
||||||
|
// drop the connection; bot reconnects and must start with an empty node DB
|
||||||
|
bridge.sockets[0].destroy();
|
||||||
|
await waitFor(() => bridge.sockets.length >= 2 && svc.status().connected);
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 0);
|
||||||
|
} finally {
|
||||||
|
delete process.env.MESH_RECONNECT_MS;
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('MeshService message history', () => {
|
||||||
|
it('captures inbound text as rx records', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(textPacketFrame(KAMIL_NUM, 42, 'ping', 2));
|
||||||
|
|
||||||
|
await waitFor(() => svc.messages().length === 1);
|
||||||
|
expect(svc.messages()).toEqual([
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
dir: 'rx',
|
||||||
|
from: KAMIL_NUM,
|
||||||
|
text: 'ping',
|
||||||
|
channel: 2,
|
||||||
|
at: expect.any(Number),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('tracks a tx send pending -> delivered on the routing ACK', 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 id = await svc.sendText(42, 'hello test');
|
||||||
|
expect(svc.messages()[0]).toMatchObject({
|
||||||
|
id,
|
||||||
|
dir: 'tx',
|
||||||
|
to: 42,
|
||||||
|
text: 'hello test',
|
||||||
|
channel: 3,
|
||||||
|
status: 'pending',
|
||||||
|
});
|
||||||
|
|
||||||
|
bridge.sockets[0].write(routingFrame(id, P.Mesh.Routing_Error.NONE));
|
||||||
|
|
||||||
|
await waitFor(() => svc.messages()[0]?.status === 'delivered');
|
||||||
|
expect(svc.messages()[0]).toMatchObject({
|
||||||
|
id,
|
||||||
|
dir: 'tx',
|
||||||
|
status: 'delivered',
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('marks a tx failed with the routing error reason on NACK', 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 id = await svc.sendText(42, 'will fail');
|
||||||
|
expect(svc.messages()[0]?.status).toBe('pending');
|
||||||
|
|
||||||
|
bridge.sockets[0].write(routingFrame(id, P.Mesh.Routing_Error.TIMEOUT));
|
||||||
|
|
||||||
|
await waitFor(() => svc.messages()[0]?.status === 'failed');
|
||||||
|
expect(svc.messages()[0]).toMatchObject({
|
||||||
|
id,
|
||||||
|
status: 'failed',
|
||||||
|
ackError: 'TIMEOUT', // human-readable Routing.Error name
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('caps history at 100 records, dropping the oldest', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
for (let i = 0; i < 105; i++)
|
||||||
|
bridge.sockets[0].write(textPacketFrame(42, KAMIL_NUM, `m-${i}`));
|
||||||
|
|
||||||
|
await waitFor(() => svc.messages().length === 100, 10000);
|
||||||
|
expect(svc.messages()[0]?.text).toBe('m-104'); // newest first
|
||||||
|
expect(svc.messages()[99]?.text).toBe('m-5'); // m-0..m-4 dropped
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('MeshService resolveDest', () => {
|
||||||
|
it('resolves broadcast sentinels, numbers and names to node numbers', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 1);
|
||||||
|
|
||||||
|
expect(await svc.resolveDest(undefined)).toBe(BROADCAST_ADDR); // omitted → broadcast
|
||||||
|
expect(await svc.resolveDest('')).toBe(BROADCAST_ADDR); // empty → broadcast
|
||||||
|
expect(await svc.resolveDest('!b')).toBe(BROADCAST_ADDR);
|
||||||
|
expect(await svc.resolveDest('BROADCAST')).toBe(BROADCAST_ADDR); // case-insensitive
|
||||||
|
expect(await svc.resolveDest(42)).toBe(42); // number passthrough
|
||||||
|
expect(await svc.resolveDest(String(KAMIL_NUM))).toBe(KAMIL_NUM); // numeric string
|
||||||
|
expect(await svc.resolveDest('Kamil SP8MK/P')).toBe(KAMIL_NUM); // exact longName
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws for unknown names and invalid node numbers', 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,
|
||||||
|
);
|
||||||
|
|
||||||
|
bridge.sockets[0].write(nodeInfoFrame(KAMIL_NUM, kamilNodeInfo()));
|
||||||
|
await waitFor(async () => (await svc.nodes()).length === 1);
|
||||||
|
|
||||||
|
await expect(svc.resolveDest('zzz-nope')).rejects.toThrow(
|
||||||
|
"no node matching 'zzz-nope'",
|
||||||
|
);
|
||||||
|
for (const bad of [0, -1, 42.5, BROADCAST_ADDR + 1]) {
|
||||||
|
await expect(svc.resolveDest(bad)).rejects.toThrow(
|
||||||
|
/invalid node number/,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await expect(svc.resolveDest('0')).rejects.toThrow(/invalid node number/);
|
||||||
|
} finally {
|
||||||
|
svc.onModuleDestroy();
|
||||||
|
bridge.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
+233
-9
@@ -6,15 +6,61 @@ import {
|
|||||||
ServiceUnavailableException,
|
ServiceUnavailableException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import * as net from 'node:net';
|
import * as net from 'node:net';
|
||||||
|
import type * as Proto from '@meshtastic/protobufs';
|
||||||
import {
|
import {
|
||||||
|
BROADCAST_ADDR,
|
||||||
|
PORT_POSITION_APP,
|
||||||
|
PORT_ROUTING_APP,
|
||||||
PORT_TEXT_MESSAGE_APP,
|
PORT_TEXT_MESSAGE_APP,
|
||||||
buildTextToRadio,
|
buildTextToRadio,
|
||||||
buildWantConfigToRadio,
|
buildWantConfigToRadio,
|
||||||
decodeFromRadio,
|
decodeFromRadio,
|
||||||
|
decodePosition,
|
||||||
|
decodeRouting,
|
||||||
|
describeRoutingError,
|
||||||
extractFrames,
|
extractFrames,
|
||||||
frame,
|
frame,
|
||||||
|
loadHwModelNames,
|
||||||
} from './codec.js';
|
} from './codec.js';
|
||||||
|
|
||||||
|
/** One entry in the message history: an inbound text (dir 'rx') or one of our sends (dir 'tx'). */
|
||||||
|
export interface MessageRecord {
|
||||||
|
id: number;
|
||||||
|
dir: 'rx' | 'tx';
|
||||||
|
/** sender node num — rx only */
|
||||||
|
from?: number;
|
||||||
|
/** destination node num (broadcast addr for broadcasts) — tx only */
|
||||||
|
to?: number;
|
||||||
|
text: string;
|
||||||
|
channel: number;
|
||||||
|
/** epoch ms */
|
||||||
|
at: number;
|
||||||
|
/** tx only: pending until the routing ACK/NACK arrives; broadcasts stay pending (firmware strips want_ack pre-TX) */
|
||||||
|
status?: 'pending' | 'delivered' | 'failed';
|
||||||
|
/** tx only, when failed: human-readable Routing.Error reason */
|
||||||
|
ackError?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// bounded history: keep the newest N records, in-memory only
|
||||||
|
const HISTORY_LIMIT = 100;
|
||||||
|
|
||||||
|
/** What we know about a node so far: full NodeInfo after sync, possibly just {num}+position for live-only nodes. */
|
||||||
|
type NodeEntry = Pick<Proto.Mesh.NodeInfo, 'num'> &
|
||||||
|
Partial<Omit<Proto.Mesh.NodeInfo, 'num'>>;
|
||||||
|
|
||||||
|
export interface NodeSummary {
|
||||||
|
num: number;
|
||||||
|
longName?: string;
|
||||||
|
shortName?: string;
|
||||||
|
/** meshtastic.HardwareModel enum name (e.g. "TBEAM"); omitted when unknown or UNSET */
|
||||||
|
hwModel?: string;
|
||||||
|
/** 0-100 = battery percent, >100 = mains powered (device convention) */
|
||||||
|
batteryLevel?: number;
|
||||||
|
/** epoch seconds of the last heard packet; null when never heard */
|
||||||
|
lastHeard: number | null;
|
||||||
|
position?: { lat: number; lon: number; alt?: number };
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MeshService implements OnModuleInit, OnModuleDestroy {
|
export class MeshService implements OnModuleInit, OnModuleDestroy {
|
||||||
private readonly logger = new Logger(MeshService.name);
|
private readonly logger = new Logger(MeshService.name);
|
||||||
@@ -25,9 +71,9 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
process.env.MESH_RECONNECT_MS ?? '5000',
|
process.env.MESH_RECONNECT_MS ?? '5000',
|
||||||
10,
|
10,
|
||||||
);
|
);
|
||||||
// sends are pinned to the test channel ("testowy", index 2) on purpose — never the primary channel
|
// sends are pinned to the test channel ("test", index 3) on purpose — never the primary channel
|
||||||
private readonly sendChannel = parseInt(
|
private readonly sendChannel = parseInt(
|
||||||
process.env.MESH_SEND_CHANNEL ?? '2',
|
process.env.MESH_SEND_CHANNEL ?? '3',
|
||||||
10,
|
10,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -40,6 +86,11 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
number,
|
number,
|
||||||
import('@meshtastic/protobufs').Channel.Channel
|
import('@meshtastic/protobufs').Channel.Channel
|
||||||
>();
|
>();
|
||||||
|
// node database: NodeInfo frames from the initial sync + live POSITION_APP updates
|
||||||
|
private nodeMap = new Map<number, NodeEntry>();
|
||||||
|
// message history (newest kept, capped at HISTORY_LIMIT) + pending tx records awaiting their routing ACK/NACK
|
||||||
|
private history: MessageRecord[] = [];
|
||||||
|
private pendingTx = new Map<number, MessageRecord>();
|
||||||
private reconnectTimer: NodeJS.Timeout | null = null;
|
private reconnectTimer: NodeJS.Timeout | null = null;
|
||||||
private shuttingDown = false;
|
private shuttingDown = false;
|
||||||
|
|
||||||
@@ -53,6 +104,7 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
this.socket?.destroy();
|
this.socket?.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Bridge connection state: `{ connected, myNodeNum, host, port }`. */
|
||||||
status() {
|
status() {
|
||||||
return {
|
return {
|
||||||
connected: this.connected,
|
connected: this.connected,
|
||||||
@@ -63,6 +115,7 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// psk/keys are deliberately not included — never expose them over HTTP
|
// psk/keys are deliberately not included — never expose them over HTTP
|
||||||
|
/** Device channels as `{ index, name, uplinkEnabled, downlinkEnabled }[]` sorted by index; empty until the initial sync completes. */
|
||||||
channels(): {
|
channels(): {
|
||||||
index: number;
|
index: number;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -79,22 +132,144 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lean summaries of all known nodes, sorted by node number.
|
||||||
|
* Names/hwModel/batteryLevel appear only when the device reported them;
|
||||||
|
* `lastHeard` is epoch seconds (null = never heard); `position` only when both coordinates are known.
|
||||||
|
*/
|
||||||
|
async nodes(): Promise<NodeSummary[]> {
|
||||||
|
const names = await loadHwModelNames();
|
||||||
|
return [...this.nodeMap.values()]
|
||||||
|
.sort((a, b) => a.num - b.num)
|
||||||
|
.map((n) => this.summarize(n, names));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Look up one node: exact node number first (numbers and numeric strings),
|
||||||
|
* then case-insensitive EXACT long/short name, else the unique case-insensitive
|
||||||
|
* SUBSTRING match across long/short names. Returns null when nothing or more
|
||||||
|
* than one node matches. Reused by send-by-name lookups.
|
||||||
|
*/
|
||||||
|
async node(idOrName: string | number): Promise<NodeSummary | null> {
|
||||||
|
const q = String(idOrName).trim().toLowerCase();
|
||||||
|
if (!q) return null;
|
||||||
|
const names = await loadHwModelNames();
|
||||||
|
if (/^\d+$/.test(q)) {
|
||||||
|
const hit = this.nodeMap.get(Number(q));
|
||||||
|
if (hit) return this.summarize(hit, names);
|
||||||
|
}
|
||||||
|
const all = [...this.nodeMap.values()];
|
||||||
|
// exact name match wins over substring; a string always contains itself, so an ambiguous exact set can never become unique below
|
||||||
|
const exact = all.filter(
|
||||||
|
(n) =>
|
||||||
|
n.user &&
|
||||||
|
(n.user.longName.toLowerCase() === q ||
|
||||||
|
n.user.shortName.toLowerCase() === q),
|
||||||
|
);
|
||||||
|
if (exact.length === 1) return this.summarize(exact[0], names);
|
||||||
|
const sub = all.filter(
|
||||||
|
(n) =>
|
||||||
|
n.user &&
|
||||||
|
(n.user.longName.toLowerCase().includes(q) ||
|
||||||
|
n.user.shortName.toLowerCase().includes(q)),
|
||||||
|
);
|
||||||
|
if (sub.length === 1) return this.summarize(sub[0], names);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve a send target to a node number for sendText().
|
||||||
|
* undefined/"" and "!b"/"broadcast" (case-insensitive, trimmed) → BROADCAST_ADDR;
|
||||||
|
* numbers pass through as-is (must be an integer in 1..0xffffffff); numeric strings are parsed the same way;
|
||||||
|
* anything else is looked up via node() — throws `no node matching '<to>'` when nothing or more than one matches.
|
||||||
|
*/
|
||||||
|
async resolveDest(to?: number | string): Promise<number> {
|
||||||
|
if (typeof to === 'number') {
|
||||||
|
this.assertNodeNum(to);
|
||||||
|
return to;
|
||||||
|
}
|
||||||
|
const s = String(to ?? '').trim();
|
||||||
|
if (!s) return BROADCAST_ADDR; // omitted or empty → broadcast
|
||||||
|
if (s === '!b' || s.toLowerCase() === 'broadcast') return BROADCAST_ADDR;
|
||||||
|
if (/^\d+$/.test(s)) {
|
||||||
|
this.assertNodeNum(Number(s));
|
||||||
|
return Number(s);
|
||||||
|
}
|
||||||
|
const hit = await this.node(s);
|
||||||
|
if (!hit) throw new Error(`no node matching '${to}'`);
|
||||||
|
return hit.num;
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertNodeNum(n: number): void {
|
||||||
|
if (!Number.isInteger(n) || n < 1 || n > BROADCAST_ADDR)
|
||||||
|
throw new Error(`invalid node number '${n}'`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message history, newest first: inbound TEXT_MESSAGE_APP packets (dir 'rx') and our sends (dir 'tx').
|
||||||
|
* tx records start 'pending' and move to 'delivered'/'failed' when the routing ACK/NACK arrives;
|
||||||
|
* broadcasts stay 'pending' because firmware strips want_ack before TX. In-memory only, last 100, reset on reconnect.
|
||||||
|
*/
|
||||||
|
messages(): MessageRecord[] {
|
||||||
|
return [...this.history].reverse();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Send `text` to node `to` on the pinned test channel; returns the packet id. Throws ServiceUnavailable when the bridge is down. */
|
||||||
async sendText(to: number, text: string): Promise<number> {
|
async sendText(to: number, text: string): 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);
|
||||||
|
const rec: MessageRecord = {
|
||||||
|
id,
|
||||||
|
dir: 'tx',
|
||||||
|
to,
|
||||||
|
text,
|
||||||
|
channel: this.sendChannel,
|
||||||
|
at: Date.now(),
|
||||||
|
status: 'pending',
|
||||||
|
};
|
||||||
|
this.pushHistory(rec);
|
||||||
|
this.pendingTx.set(id, rec);
|
||||||
this.socket.write(bytes);
|
this.socket.write(bytes);
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private pushHistory(rec: MessageRecord): void {
|
||||||
|
this.history.push(rec);
|
||||||
|
// ponytail: shift on a ≤100 array is fine; true ring buffer only if this ever gets hot
|
||||||
|
if (this.history.length > HISTORY_LIMIT) this.history.shift();
|
||||||
|
}
|
||||||
|
|
||||||
|
private summarize(n: NodeEntry, names: Map<number, string>): NodeSummary {
|
||||||
|
const s: NodeSummary = { num: n.num, lastHeard: n.lastHeard || null };
|
||||||
|
if (n.user?.longName) s.longName = n.user.longName;
|
||||||
|
if (n.user?.shortName) s.shortName = n.user.shortName;
|
||||||
|
// omit UNSET (enum value 0) rather than report "UNSET"
|
||||||
|
const hwName = n.user?.hwModel ? names.get(n.user.hwModel) : undefined;
|
||||||
|
if (hwName && hwName !== 'UNSET') s.hwModel = hwName;
|
||||||
|
// optional proto field: undefined when the device never reported metrics
|
||||||
|
const battery = n.deviceMetrics?.batteryLevel;
|
||||||
|
if (battery !== undefined) s.batteryLevel = battery;
|
||||||
|
const p = n.position;
|
||||||
|
if (p?.latitudeI !== undefined && p.longitudeI !== undefined) {
|
||||||
|
// alt included only when the device sent it — protobuf-es leaves absent optionals undefined, so an explicit 0 (sea level) is kept
|
||||||
|
s.position = { lat: p.latitudeI * 1e-7, lon: p.longitudeI * 1e-7 };
|
||||||
|
if (p.altitude !== undefined) s.position.alt = p.altitude;
|
||||||
|
}
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
private connect(): void {
|
private connect(): void {
|
||||||
if (this.shuttingDown) return;
|
if (this.shuttingDown) return;
|
||||||
const socket = net.createConnection({ host: this.host, port: this.port });
|
const socket = net.createConnection({ host: this.host, port: this.port });
|
||||||
this.socket = socket;
|
this.socket = socket;
|
||||||
socket.on('connect', () => {
|
socket.on('connect', () => {
|
||||||
this.connected = true;
|
this.connected = true;
|
||||||
// fresh sync on every (re)connect — drop stale channels from the old session
|
// fresh sync on every (re)connect — drop stale channels/nodes/history from the old session
|
||||||
this.channelMap = new Map();
|
this.channelMap = new Map();
|
||||||
|
this.nodeMap = new Map();
|
||||||
|
this.history = [];
|
||||||
|
this.pendingTx.clear();
|
||||||
this.logger.log(`bridge connected ${this.host}:${this.port}`);
|
this.logger.log(`bridge connected ${this.host}:${this.port}`);
|
||||||
const nonce = Math.floor(Math.random() * 0xffffffff) || 1;
|
const nonce = Math.floor(Math.random() * 0xffffffff) || 1;
|
||||||
buildWantConfigToRadio(nonce)
|
buildWantConfigToRadio(nonce)
|
||||||
@@ -136,9 +311,9 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectMs);
|
this.reconnectTimer = setTimeout(() => this.connect(), this.reconnectMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleFromRadio(
|
private async handleFromRadio(
|
||||||
fr: import('@meshtastic/protobufs').Mesh.FromRadio,
|
fr: import('@meshtastic/protobufs').Mesh.FromRadio,
|
||||||
): void {
|
): Promise<void> {
|
||||||
const v = fr.payloadVariant;
|
const v = fr.payloadVariant;
|
||||||
switch (v?.case) {
|
switch (v?.case) {
|
||||||
case 'myInfo':
|
case 'myInfo':
|
||||||
@@ -149,9 +324,13 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
// device streams one Channel per table slot during initial sync
|
// device streams one Channel per table slot during initial sync
|
||||||
this.channelMap.set(v.value.index, v.value);
|
this.channelMap.set(v.value.index, v.value);
|
||||||
break;
|
break;
|
||||||
|
case 'nodeInfo':
|
||||||
|
// device streams the whole node DB during initial sync
|
||||||
|
this.nodeMap.set(v.value.num, v.value);
|
||||||
|
break;
|
||||||
case 'configCompleteId':
|
case 'configCompleteId':
|
||||||
this.logger.log(
|
this.logger.log(
|
||||||
`bridge ready (config complete), ${this.channelMap.size} channels`,
|
`bridge ready (config complete), ${this.channelMap.size} channels, ${this.nodeMap.size} nodes`,
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case 'packet': {
|
case 'packet': {
|
||||||
@@ -161,9 +340,54 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
|
|||||||
? pkt.payloadVariant.value
|
? pkt.payloadVariant.value
|
||||||
: undefined;
|
: undefined;
|
||||||
if (decoded && decoded.portnum === PORT_TEXT_MESSAGE_APP) {
|
if (decoded && decoded.portnum === PORT_TEXT_MESSAGE_APP) {
|
||||||
this.logger.log(
|
const text = new TextDecoder().decode(decoded.payload);
|
||||||
`[mesh] ${pkt.from} -> ${pkt.to}: "${new TextDecoder().decode(decoded.payload)}"`,
|
this.logger.log(`[mesh] ${pkt.from} -> ${pkt.to}: "${text}"`);
|
||||||
);
|
this.pushHistory({
|
||||||
|
id: pkt.id,
|
||||||
|
dir: 'rx',
|
||||||
|
from: pkt.from,
|
||||||
|
text,
|
||||||
|
channel: pkt.channel ?? 0,
|
||||||
|
at: Date.now(),
|
||||||
|
});
|
||||||
|
} else if (decoded && decoded.portnum === PORT_POSITION_APP) {
|
||||||
|
// live position update: the Position is serialized in Data.payload
|
||||||
|
let pos: Proto.Mesh.Position | undefined;
|
||||||
|
try {
|
||||||
|
pos = await decodePosition(decoded.payload);
|
||||||
|
} catch {
|
||||||
|
pos = undefined; // malformed payload — skip, keep whatever we had
|
||||||
|
}
|
||||||
|
if (pos?.latitudeI !== undefined && pos.longitudeI !== undefined) {
|
||||||
|
const num = pkt.from;
|
||||||
|
this.nodeMap.set(num, {
|
||||||
|
...this.nodeMap.get(num),
|
||||||
|
num,
|
||||||
|
position: pos,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (decoded && decoded.portnum === PORT_ROUTING_APP) {
|
||||||
|
// ACK/NACK for our want_ack sends: Routing serialized in Data.payload,
|
||||||
|
// Data.requestId = the original packet id we sent
|
||||||
|
let routing: Proto.Mesh.Routing | undefined;
|
||||||
|
try {
|
||||||
|
routing = await decodeRouting(decoded.payload);
|
||||||
|
} catch {
|
||||||
|
routing = undefined; // malformed payload — skip
|
||||||
|
}
|
||||||
|
if (routing?.variant.case === 'errorReason' && decoded.requestId) {
|
||||||
|
const rec = this.pendingTx.get(decoded.requestId);
|
||||||
|
if (rec) {
|
||||||
|
const reason = routing.variant.value;
|
||||||
|
if (reason === 0)
|
||||||
|
rec.status = 'delivered'; // Routing_Error.NONE
|
||||||
|
else {
|
||||||
|
rec.status = 'failed';
|
||||||
|
rec.ackError = await describeRoutingError(reason);
|
||||||
|
}
|
||||||
|
this.pendingTx.delete(decoded.requestId);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user