From 7da9c1d0d8fd49969f5281fd45fba5cfcffef558 Mon Sep 17 00:00:00 2001 From: MayaTheShy Date: Fri, 20 Feb 2026 03:45:23 -0500 Subject: [PATCH] refactor: remove legacy turtleData getter and update command handling for eval commands --- server/server.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/server/server.js b/server/server.js index f11850d..a7f21e3 100644 --- a/server/server.js +++ b/server/server.js @@ -37,18 +37,6 @@ const worldBlocks = new Map(); // "x,y,z" -> {name, metadata, discoveredBy, time const turtleHomes = new Map(); // turtleID -> {x, y, z} home position const turtleConfig = new Map(); // turtleID -> {maxDistance, facing, etc} -// Legacy compat: turtleData getter (returns serialized Turtle data) -const turtleData = { - has(id) { return turtles.has(id); }, - get(id) { const t = turtles.get(id); return t ? t.toJSON() : undefined; }, - set(id, _val) { /* no-op, use getOrCreateTurtle */ }, - delete(id) { return turtles.delete(id); }, - get size() { return turtles.size; }, - entries() { return Array.from(turtles.entries()).map(([id, t]) => [id, t.toJSON()])[Symbol.iterator](); }, - values() { return Array.from(turtles.values()).map(t => t.toJSON())[Symbol.iterator](); }, - keys() { return turtles.keys(); }, -}; - // Load saved homes into memory for (const home of savedHomes) { turtleHomes.set(home.turtle_id, { x: home.x, y: home.y, z: home.z }); @@ -340,7 +328,7 @@ app.get('/api/turtle/:id/commands', (req, res) => { const turtle = turtles.get(turtleID); if (turtle) { - // Combine eval commands + legacy commands + // Get pending eval commands for webbridge const commands = turtle.pendingCommands || []; // Clean up old commands (older than 30 seconds) @@ -348,12 +336,10 @@ app.get('/api/turtle/:id/commands', (req, res) => { turtle.pendingCommands = commands.filter(cmd => (now - cmd.timestamp) < 30000); if (turtle.pendingCommands.length > 0) { - console.log(`📤 Sending ${turtle.pendingCommands.length} command(s) to turtle ${turtleID}`); + console.log(`📤 Sending ${turtle.pendingCommands.length} eval command(s) to turtle ${turtleID}`); turtle.pendingCommands.forEach(cmd => { if (cmd.type === 'eval') { console.log(` - EVAL ${(cmd.uuid || '').substring(0, 8)}`); - } else { - console.log(` - ${cmd.command}`, cmd.param ? `(${JSON.stringify(cmd.param)})` : ''); } }); }