diff --git a/prisma/migrations/20240416014304_add_new_traceroute_columns_and_remove_node_id_column/migration.sql b/prisma/migrations/20240416014304_add_new_traceroute_columns_and_remove_node_id_column/migration.sql
new file mode 100644
index 0000000..4f71d48
--- /dev/null
+++ b/prisma/migrations/20240416014304_add_new_traceroute_columns_and_remove_node_id_column/migration.sql
@@ -0,0 +1,27 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `node_id` on the `traceroutes` table. All the data in the column will be lost.
+ - Added the required column `from` to the `traceroutes` table without a default value. This is not possible if the table is not empty.
+ - Added the required column `to` to the `traceroutes` table without a default value. This is not possible if the table is not empty.
+ - Added the required column `want_response` to the `traceroutes` table without a default value. This is not possible if the table is not empty.
+
+*/
+
+-- NOTE: manually added query, to drop existing traceroutes before adding required columns
+TRUNCATE table `traceroutes`;
+
+-- DropIndex
+DROP INDEX `traceroutes_node_id_idx` ON `traceroutes`;
+
+-- AlterTable
+ALTER TABLE `traceroutes` DROP COLUMN `node_id`,
+ ADD COLUMN `from` BIGINT NOT NULL,
+ ADD COLUMN `to` BIGINT NOT NULL,
+ ADD COLUMN `want_response` BOOLEAN NOT NULL;
+
+-- CreateIndex
+CREATE INDEX `traceroutes_to_idx` ON `traceroutes`(`to`);
+
+-- CreateIndex
+CREATE INDEX `traceroutes_from_idx` ON `traceroutes`(`from`);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6fcaa8e..3686ae6 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -162,9 +162,11 @@ model TextMessage {
}
model TraceRoute {
- id BigInt @id @default(autoincrement())
- node_id BigInt
- route Json
+ id BigInt @id @default(autoincrement())
+ to BigInt
+ from BigInt
+ want_response Boolean
+ route Json
channel Int?
packet_id BigInt?
@@ -176,7 +178,8 @@ model TraceRoute {
@@index(created_at)
@@index(updated_at)
- @@index(node_id)
+ @@index(to)
+ @@index(from)
@@map("traceroutes")
}
diff --git a/src/index.js b/src/index.js
index 894998b..79ff34c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -282,7 +282,9 @@ app.get('/api/v1/nodes/:nodeId/traceroutes', async (req, res) => {
}
// get latest traceroutes
- const traceroutes = await prisma.$queryRaw`SELECT * FROM traceroutes WHERE node_id = ${node.node_id} and JSON_LENGTH(route) > 0 and gateway_id is not null order by id desc limit ${count}`;
+ // We want replies where want_response is false and it will be "to" the
+ // requester.
+ const traceroutes = await prisma.$queryRaw`SELECT * FROM traceroutes WHERE want_response = false and \`to\` = ${node.node_id} and gateway_id is not null order by id desc limit ${count}`;
res.json({
traceroutes: traceroutes,
diff --git a/src/mqtt.js b/src/mqtt.js
index a07c975..2525ee0 100644
--- a/src/mqtt.js
+++ b/src/mqtt.js
@@ -579,7 +579,9 @@ client.on("message", async (topic, message) => {
if(logKnownPacketTypes) {
console.log("TRACEROUTE_APP", {
+ to: envelope.packet.to.toString(16),
from: envelope.packet.from.toString(16),
+ want_response: envelope.packet.decoded.wantResponse,
route_discovery: routeDiscovery,
});
}
@@ -587,7 +589,9 @@ client.on("message", async (topic, message) => {
try {
await prisma.traceRoute.create({
data: {
- node_id: envelope.packet.from,
+ to: envelope.packet.to,
+ from: envelope.packet.from,
+ want_response: envelope.packet.decoded.wantResponse,
route: routeDiscovery.route,
channel: envelope.packet.channel,
packet_id: envelope.packet.id,
diff --git a/src/public/index.html b/src/public/index.html
index 62b5d76..b3919dc 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -894,8 +894,8 @@