MrTalon63/NeoMap
1
0
Fork 0
mirror of https://github.com/MrTalon63/NeoMap.git synced 2026-01-11 03:49:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Deno KV cache to submit endpoint

Browse source
This commit is contained in:
Marcin Czop 2025-01-30 06:09:29 +01:00
parent aeda648869
commit 08424c7fdf
No known key found for this signature in database
GPG key ID: 44BCC84471234D0D
4 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -6,4 +6,4 @@ COPY public ./public
COPY src ./src COPY src ./src
RUN deno cache src/server.ts RUN deno cache src/server.ts
RUN deno eval --unstable-ffi "import '@db/sqlite'" RUN deno eval --unstable-ffi "import '@db/sqlite'"
CMD ["run", "-A", "src/server.ts"] CMD ["run", "-A", "--unstable-kv", "src/server.ts"]

2
deno.json
View file

@ -1,6 +1,6 @@
{ {
"tasks": { "tasks": {
"dev": "deno run --watch -A src/server.ts" "dev": "deno run --watch -A --unstable-kv src/server.ts"
}, },
"imports": { "imports": {
"@db/sqlite": "jsr:@db/sqlite@^0.12.0", "@db/sqlite": "jsr:@db/sqlite@^0.12.0",

1
src/kv.ts Normal file
View file

@ -0,0 +1 @@
export const kv = await Deno.openKv();

35
src/server.ts
View file

@ -5,6 +5,7 @@ import { serveStatic } from "hono/deno";
import { logger } from "hono/logger"; import { logger } from "hono/logger";
import { db } from "./db.ts"; import { db } from "./db.ts";
import { kv } from "./kv.ts";
import { Geosubmit } from "./types.d.ts"; import { Geosubmit } from "./types.d.ts";
const app = new Hono(); const app = new Hono();
@ -41,7 +42,7 @@ app.post("/api/v1/geosubmit", async (c) => {
return c.json({ status: ftch.status, message: "Bad Request" }, 400); return c.json({ status: ftch.status, message: "Bad Request" }, 400);
} }
json.items.forEach((item) => { json.items.forEach(async (item) => {
const timestamp = Math.floor(item.timestamp / 1000); const timestamp = Math.floor(item.timestamp / 1000);
const hex = h3.latLngToCell(item.position.latitude, item.position.longitude, 11); const hex = h3.latLngToCell(item.position.latitude, item.position.longitude, 11);
let hasGsm = false, let hasGsm = false,
@ -70,9 +71,14 @@ app.post("/api/v1/geosubmit", async (c) => {
}); });
} }
const hexInDb = db.prepare("SELECT * FROM hexes WHERE hex_id = ?").get(hex) as { hex_id: string; wifi: boolean; gsm: boolean; wcdma: boolean; lte: boolean; ble: boolean; last_update: number } | undefined; const hexInKv = await kv.get([hex]);
if (hexInKv.value) {
const { wifi, gsm, wcdma, lte, ble, last_update } = JSON.parse(hexInKv.value as string);
if (last_update > timestamp && wifi === hasWifi && gsm === hasGsm && wcdma === hasWcdma && lte === hasLte && ble === hasBle) {
return c.json({ status: 200, message: "OK" });
}
if (hexInDb) {
db.prepare( db.prepare(
` `
UPDATE hexes UPDATE hexes
@ -86,10 +92,31 @@ app.post("/api/v1/geosubmit", async (c) => {
WHERE hex_id = ? WHERE hex_id = ?
`, `,
).run(hasWifi, hasGsm, hasWcdma, hasLte, hasBle, timestamp, hex); ).run(hasWifi, hasGsm, hasWcdma, hasLte, hasBle, timestamp, hex);
kv.set([hex], JSON.stringify({ wifi: hasWifi, gsm: hasGsm, wcdma: hasWcdma, lte: hasLte, ble: hasBle, last_update: timestamp }));
} else { } else {
db.prepare("INSERT INTO hexes (hex_id, wifi, gsm, wcdma, lte, ble, last_update) VALUES (?, ?, ?, ?, ?, ?, ?)").run(hex, hasWifi, hasGsm, hasWcdma, hasLte, hasBle, timestamp); const hexInDb = db.prepare("SELECT * FROM hexes WHERE hex_id = ?").get(hex) as { hex_id: string; wifi: boolean; gsm: boolean; wcdma: boolean; lte: boolean; ble: boolean; last_update: number } | undefined;
if (hexInDb) {
db.prepare(
`
UPDATE hexes
SET
wifi = MAX(wifi, ?),
gsm = MAX(gsm, ?),
wcdma = MAX(wcdma, ?),
lte = MAX(lte, ?),
ble = MAX(ble, ?),
last_update = ?
WHERE hex_id = ?
`,
).run(hasWifi, hasGsm, hasWcdma, hasLte, hasBle, timestamp, hex);
kv.set([hex], JSON.stringify({ wifi: hasWifi, gsm: hasGsm, wcdma: hasWcdma, lte: hasLte, ble: hasBle, last_update: timestamp }));
} else {
db.prepare("INSERT INTO hexes (hex_id, wifi, gsm, wcdma, lte, ble, last_update) VALUES (?, ?, ?, ?, ?, ?, ?)").run(hex, hasWifi, hasGsm, hasWcdma, hasLte, hasBle, timestamp);
kv.set([hex], JSON.stringify({ wifi: hasWifi, gsm: hasGsm, wcdma: hasWcdma, lte: hasLte, ble: hasBle, last_update: timestamp }));
}
} }
}); });
//db.exec("PRAGMA wal_checkpoint(PASSIVE);");
return c.json({ status: 200, message: "OK" }); return c.json({ status: 200, message: "OK" });
}); });