Notify webhook also fires for injected messages (channel match) + compose env passthroughs (#21)
CI / build + unit (push) Successful in 35s

This commit was merged in pull request #21.
This commit is contained in:
2026-09-25 03:56:53 +02:00
parent 024dabda97
commit 3d0e369230
7 changed files with 75 additions and 16 deletions
+45
View File
@@ -670,6 +670,51 @@ describe('MeshService notify webhook', () => {
bridge.close();
}
});
it('fires the webhook for an injected message when MESH_NOTIFY_CHANNEL matches its channel (0)', async () => {
process.env.MESH_NOTIFY_URL = 'http://notify.example/hook';
process.env.MESH_NOTIFY_CHANNEL = '0';
vi.stubGlobal('fetch', fetchMock);
const svc = new MeshService();
try {
svc.injectMessage('hi', 42);
expect(fetchMock).toHaveBeenCalledTimes(1);
const [url, init] = fetchMock.mock.calls[0];
expect(url).toBe('http://notify.example/hook');
const opts = init as {
method?: string;
headers?: Record<string, string>;
body?: string;
};
expect(opts.method).toBe('POST');
expect(opts.headers?.['content-type']).toBe('application/json');
expect(JSON.parse(String(opts.body))).toEqual({ text: 'hi', from: 42 });
} finally {
vi.unstubAllGlobals();
delete process.env.MESH_NOTIFY_URL;
delete process.env.MESH_NOTIFY_CHANNEL;
}
});
it('omits `from` in the webhook body when an injected message has no sender', async () => {
process.env.MESH_NOTIFY_URL = 'http://notify.example/hook';
process.env.MESH_NOTIFY_CHANNEL = '0';
vi.stubGlobal('fetch', fetchMock);
const svc = new MeshService();
try {
svc.injectMessage('hi');
expect(fetchMock).toHaveBeenCalledTimes(1);
const [, init] = fetchMock.mock.calls[0];
const opts = init as { body?: string };
expect(JSON.parse(String(opts.body))).toEqual({ text: 'hi' });
} finally {
vi.unstubAllGlobals();
delete process.env.MESH_NOTIFY_URL;
delete process.env.MESH_NOTIFY_CHANNEL;
}
});
});
describe('MeshService injectMessage', () => {
+18 -13
View File
@@ -426,9 +426,26 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
at: Date.now(),
};
this.pushHistory(rec);
// injected records ride channel 0 — the webhook fires only when MESH_NOTIFY_CHANNEL is set to match
this.notifyRx(0, text, from);
return { id: rec.id };
}
/** Fire-and-forget notify-webhook POST for an rx text on `channel` (no-op unless URL is set and channels match). */
private notifyRx(channel: number, text: string, from?: number): void {
if (this.notifyUrl && channel === this.notifyChannel) {
const body: Record<string, unknown> = { text };
if (from !== undefined) body.from = from;
void fetch(this.notifyUrl, {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify(body),
}).catch((err: unknown) =>
this.logger.warn('notify webhook failed: ' + (err as Error).message),
);
}
}
/**
* Telemetry records, newest first: TELEMETRY_APP packets from any node — device metrics
* (battery/voltage/uptime/channel+air utilization) and environment sensor readings where nodes have them.
@@ -605,19 +622,7 @@ export class MeshService implements OnModuleInit, OnModuleDestroy {
channel: pkt.channel ?? 0,
at: Date.now(),
});
if (this.notifyUrl && (pkt.channel ?? 0) === this.notifyChannel) {
const body: Record<string, unknown> = { text };
if (pkt.from !== undefined) body.from = pkt.from;
void fetch(this.notifyUrl, {
method: 'POST',
headers: { 'content-type': 'application/json' },
body: JSON.stringify(body),
}).catch((err: unknown) =>
this.logger.warn(
'notify webhook failed: ' + (err as Error).message,
),
);
}
this.notifyRx(pkt.channel ?? 0, text, pkt.from);
} else if (decoded && decoded.portnum === PORT_POSITION_APP) {
// live position update: the Position is serialized in Data.payload
let pos: Proto.Mesh.Position | undefined;