ctmesh/map
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add migration to add columns and drop existing traceroutes, also updated ui

Browse Source
This commit is contained in:
liamcottle
2024-04-16 14:15:25 +12:00
parent 3c492f37aa
commit 1386ed78c4
5 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
prisma/migrations/20240416014304_add_new_traceroute_columns_and_remove_node_id_column/migration.sql Normal file
View File

@ -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`);

10
prisma/schema.prisma
View File

@ -163,9 +163,9 @@ model TextMessage {
model TraceRoute { model TraceRoute {
id BigInt @id @default(autoincrement()) id BigInt @id @default(autoincrement())
from_id BigInt @default(0) to BigInt
to_id BigInt @default(0) from BigInt
want_response Boolean @default(true) want_response Boolean
route Json route Json
channel Int? channel Int?
@ -178,8 +178,8 @@ model TraceRoute {
@@index(created_at) @@index(created_at)
@@index(updated_at) @@index(updated_at)
@@index(from_id) @@index(to)
@@index(to_id) @@index(from)
@@map("traceroutes") @@map("traceroutes")
} }

2
src/index.js
View File

@ -284,7 +284,7 @@ app.get('/api/v1/nodes/:nodeId/traceroutes', async (req, res) => {
// get latest traceroutes // get latest traceroutes
// We want replies where want_response is false and it will be "to" the // We want replies where want_response is false and it will be "to" the
// requester. // requester.
const traceroutes = await prisma.$queryRaw`SELECT * FROM traceroutes WHERE want_response = false and to_id = ${node.node_id} and gateway_id is not null order by id desc limit ${count}`; 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({ res.json({
traceroutes: traceroutes, traceroutes: traceroutes,

6
src/mqtt.js
View File

@ -579,7 +579,9 @@ client.on("message", async (topic, message) => {
if(logKnownPacketTypes) { if(logKnownPacketTypes) {
console.log("TRACEROUTE_APP", { console.log("TRACEROUTE_APP", {
to: envelope.packet.to.toString(16),
from: envelope.packet.from.toString(16), from: envelope.packet.from.toString(16),
want_response: envelope.packet.decoded.wantResponse,
route_discovery: routeDiscovery, route_discovery: routeDiscovery,
}); });
} }
@ -587,8 +589,8 @@ client.on("message", async (topic, message) => {
try { try {
await prisma.traceRoute.create({ await prisma.traceRoute.create({
data: { data: {
from_id: envelope.packet.from, to: envelope.packet.to,
to_id: envelope.packet.to, from: envelope.packet.from,
want_response: envelope.packet.decoded.wantResponse, want_response: envelope.packet.decoded.wantResponse,
route: routeDiscovery.route, route: routeDiscovery.route,
channel: envelope.packet.channel, channel: envelope.packet.channel,

24
src/public/index.html
View File

@ -894,8 +894,8 @@
<div class="block flex-1 px-4 py-2"> <div class="block flex-1 px-4 py-2">
<div class="relative flex min-w-0 flex-1 items-center"> <div class="relative flex min-w-0 flex-1 items-center">
<div> <div>
<p class="text-sm font-medium text-gray-900">{{ JSON.parse(traceroute.route).length }} hops {{ traceroute.channel_id ? `on ${traceroute.channel_id}` : '' }}</p> <p class="text-sm text-gray-900"><span class="font-medium">{{ findNodeById(traceroute.to)?.long_name || '???' }}</span> to <span class="font-medium">{{ findNodeById(traceroute.from)?.long_name || '???' }}</span></p>
<div class="text-sm text-gray-700">Gated {{ moment(new Date(traceroute.updated_at)).fromNow() }}</div> <div class="text-sm text-gray-700">{{ moment(new Date(traceroute.updated_at)).fromNow() }} - {{ traceroute.route.length }} hops {{ traceroute.channel_id ? `on ${traceroute.channel_id}` : '' }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -1075,7 +1075,7 @@
<div class="flex items-start justify-between"> <div class="flex items-start justify-between">
<div> <div>
<h2 class="font-bold">Traceroute #{{ selectedTraceRoute.id }}</h2> <h2 class="font-bold">Traceroute #{{ selectedTraceRoute.id }}</h2>
<h3 class="text-sm">{{ moment(new Date(selectedTraceRoute.updated_at)).fromNow() }}</h3> <h3 class="text-sm">{{ moment(new Date(selectedTraceRoute.updated_at)).fromNow() }} - {{ selectedTraceRoute.route.length }} hops {{ selectedTraceRoute.channel_id ? `on ${selectedTraceRoute.channel_id}` : '' }}</h3>
</div> </div>
<div class="my-auto ml-3 flex h-7 items-center"> <div class="my-auto ml-3 flex h-7 items-center">
<a href="javascript:void(0)" class="rounded-full" @click="selectedTraceRoute = null"> <a href="javascript:void(0)" class="rounded-full" @click="selectedTraceRoute = null">
@ -1098,7 +1098,7 @@
<ul role="list" class="space-y-6"> <ul role="list" class="space-y-6">
<!-- node that initiated traceroute --> <!-- node that initiated traceroute -->
<li :onclick="`goToNode(${selectedTraceRoute.node_id})`" class="relative flex gap-x-4"> <li :onclick="`goToNode(${selectedTraceRoute.to})`" class="relative flex gap-x-4">
<div class="absolute left-0 top-0 flex w-6 justify-center top-6 -bottom-6"> <div class="absolute left-0 top-0 flex w-6 justify-center top-6 -bottom-6">
<div class="w-px bg-gray-200"></div> <div class="w-px bg-gray-200"></div>
</div> </div>
@ -1106,14 +1106,14 @@
<div class="h-4 w-4 rounded-full bg-gray-100 ring-1 ring-gray-300"></div> <div class="h-4 w-4 rounded-full bg-gray-100 ring-1 ring-gray-300"></div>
</div> </div>
<div class="flex-auto py-0.5 text-sm leading-5 text-gray-500"> <div class="flex-auto py-0.5 text-sm leading-5 text-gray-500">
<div class="font-medium text-gray-900">{{ findNodeById(selectedTraceRoute.to_id)?.long_name || '???' }}</div> <div class="font-medium text-gray-900">{{ findNodeById(selectedTraceRoute.to)?.long_name || '???' }}</div>
<div>Hex ID: !{{ Number(selectedTraceRoute.to_id).toString(16) }}</div> <div>Hex ID: !{{ Number(selectedTraceRoute.to).toString(16) }}</div>
<div>Started the traceroute</div> <div>Started the traceroute</div>
</div> </div>
</li> </li>
<!-- middleman nodes --> <!-- middleman nodes -->
<li :onclick="`goToNode(${route})`" v-for="route of JSON.parse(selectedTraceRoute.route)" class="relative flex gap-x-4"> <li :onclick="`goToNode(${route})`" v-for="route of selectedTraceRoute.route" class="relative flex gap-x-4">
<div class="absolute left-0 top-0 flex w-6 justify-center -bottom-6"> <div class="absolute left-0 top-0 flex w-6 justify-center -bottom-6">
<div class="w-px bg-gray-200"></div> <div class="w-px bg-gray-200"></div>
</div> </div>
@ -1127,8 +1127,8 @@
</div> </div>
</li> </li>
<!-- Last node --> <!-- node that replied to traceroute -->
<li :onclick="`goToNode(${route})`" v-if="selectedTraceRoute.from_id" class="relative flex gap-x-4"> <li :onclick="`goToNode(${route})`" v-if="selectedTraceRoute.from" class="relative flex gap-x-4">
<div class="absolute left-0 top-0 flex w-6 justify-center -bottom-6"> <div class="absolute left-0 top-0 flex w-6 justify-center -bottom-6">
<div class="w-px bg-gray-200"></div> <div class="w-px bg-gray-200"></div>
</div> </div>
@ -1136,13 +1136,13 @@
<div class="h-4 w-4 rounded-full bg-gray-100 ring-1 ring-gray-300"></div> <div class="h-4 w-4 rounded-full bg-gray-100 ring-1 ring-gray-300"></div>
</div> </div>
<div class="flex-auto py-0.5 text-sm leading-5 text-gray-500"> <div class="flex-auto py-0.5 text-sm leading-5 text-gray-500">
<div class="font-medium text-gray-900">{{ findNodeById(selectedTraceRoute.from_id)?.long_name || '???' }}</div> <div class="font-medium text-gray-900">{{ findNodeById(selectedTraceRoute.from)?.long_name || '???' }}</div>
<div>Hex ID: !{{ Number(selectedTraceRoute.from_id).toString(16) }}</div> <div>Hex ID: !{{ Number(selectedTraceRoute.from).toString(16) }}</div>
<div>Replied to traceroute</div> <div>Replied to traceroute</div>
</div> </div>
</li> </li>
<!-- last node in route --> <!-- node that gated traceroute to mqtt -->
<li :onclick="`goToNode(${route})`" v-if="selectedTraceRoute.gateway_id" class="relative flex gap-x-4"> <li :onclick="`goToNode(${route})`" v-if="selectedTraceRoute.gateway_id" class="relative flex gap-x-4">
<div class="absolute left-0 top-0 flex w-6 justify-center h-6"> <div class="absolute left-0 top-0 flex w-6 justify-center h-6">
<div class="w-px bg-gray-200"></div> <div class="w-px bg-gray-200"></div>