nova-control-mcp-server 0.0.6 → 0.0.7

package/dist/nova-control-mcp-server.js

@@ -7,9 +7,239 @@ import { Server as i } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport as a } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { StreamableHTTPServerTransport as o } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { CallToolRequestSchema as s, ListToolsRequestSchema as c } from "@modelcontextprotocol/sdk/types.js";
-import { openNova as l, runScript as u } from "nova-control-node";
+import { SerialPort as l } from "serialport";
+//#region ../nova-control-node/dist/nova-control-node.js
+var u = 9600, d = Object.freeze({
+	s1: 90,
+	s2: 90,
+	s3: 110,
+	s4: 90,
+	s5: 95
+}), f = Object.freeze({
+	s1: [45, 135],
+	s2: [10, 170],
+	s3: [40, 150],
+	s4: [30, 180],
+	s5: [20, 150]
+}), p = Object.freeze({
+	s1: (f.s1[1] - f.s1[0]) / 1e3,
+	s2: (f.s2[1] - f.s2[0]) / 1e3,
+	s3: (f.s3[1] - f.s3[0]) / 1e3,
+	s4: (f.s4[1] - f.s4[0]) / 1e3,
+	s5: (f.s5[1] - f.s5[0]) / 1e3
+});
+function m(e, t) {
+	let [n, r] = f[t];
+	return Math.max(n, Math.min(r, Math.round(e)));
+}
+function h(e) {
+	return new Uint8Array([
+		m(e.s4, "s4"),
+		m(e.s3, "s3"),
+		m(e.s2, "s2"),
+		m(e.s1, "s1"),
+		m(e.s5, "s5")
+	]);
+}
+async function g(e, t) {
+	let n = new l({
+		path: e,
+		baudRate: t,
+		autoOpen: !1
+	});
+	return await new Promise((e, t) => {
+		n.open((n) => {
+			n == null ? e() : t(n);
+		});
+	}), await new Promise((e) => setTimeout(e, 2e3)), {
+		async write(e) {
+			await new Promise((t, r) => {
+				n.write(Buffer.from(e), (e) => {
+					e == null ? t() : r(e);
+				});
+			}), await new Promise((e, t) => {
+				n.drain((n) => {
+					n == null ? e() : t(n);
+				});
+			});
+		},
+		destroy() {
+			n.close();
+		}
+	};
+}
+function _(e, t) {
+	let n = Math.min(.499, Math.max(0, t)), r = 1 / (1 - n);
+	if (e <= n) return r * e * e / (2 * n);
+	if (e <= 1 - n) return r * (e - n / 2);
+	let i = 1 - e;
+	return 1 - r * i * i / (2 * n);
+}
+async function v(e, t = u, n) {
+	let r = n?.StepIntervalMs ?? 20, i = n?.RampRatio ?? .25, a = await g(e, t), o = { ...d }, s, c = Promise.resolve();
+	function l(e) {
+		s = {
+			...s ?? o,
+			...e
+		};
+	}
+	async function f() {
+		let e = c;
+		c = (async () => {
+			try {
+				await e;
+			} catch {}
+			for (; s != null;) {
+				let e = s, t = !0, n = { ...o };
+				for (let i of [
+					"s1",
+					"s2",
+					"s3",
+					"s4",
+					"s5"
+				]) {
+					let a = e[i] - o[i], s = r > 0 ? p[i] * r : Infinity;
+					Math.abs(a) > s ? (n[i] = o[i] + Math.sign(a) * s, t = !1) : n[i] = e[i];
+				}
+				t && (s = void 0), o = { ...n }, await a.write(h(n)), t || await new Promise((e) => setTimeout(e, r));
+			}
+		})(), await c;
+	}
+	async function m(e, t) {
+		let n = c;
+		c = (async () => {
+			try {
+				await n;
+			} catch {}
+			let c = { ...o }, l = r > 0 ? Math.max(1, Math.round(t / r)) : 1;
+			s = void 0;
+			for (let t = 1; t <= l; t++) {
+				let n = _(t / l, i), s = { ...o };
+				for (let t of Object.keys(e)) s[t] = Math.round(c[t] + (e[t] - c[t]) * n);
+				o = s, await a.write(h(s)), t < l && await new Promise((e) => setTimeout(e, r));
+			}
+		})(), await c;
+	}
+	return {
+		async home(e) {
+			e != null && e > 0 ? await m({ ...d }, e) : (l({ ...d }), await f());
+		},
+		async shiftHeadTo(e, t) {
+			t != null && t > 0 ? await m({ s1: e }, t) : (l({ s1: e }), await f());
+		},
+		async rollHeadTo(e, t) {
+			t != null && t > 0 ? await m({ s2: e }, t) : (l({ s2: e }), await f());
+		},
+		async pitchHeadTo(e, t) {
+			t != null && t > 0 ? await m({ s3: e }, t) : (l({ s3: e }), await f());
+		},
+		async liftHeadTo(e, t) {
+			t != null && t > 0 ? await m({ s5: e }, t) : (l({ s5: e }), await f());
+		},
+		async rotateBodyTo(e, t) {
+			t != null && t > 0 ? await m({ s4: e }, t) : (l({ s4: e }), await f());
+		},
+		async moveTo(e, t) {
+			t != null && t > 0 ? await m(e, t) : (l(e), await f());
+		},
+		get State() {
+			return structuredClone(s ?? o);
+		},
+		set State(e) {
+			s = {
+				...o,
+				...e
+			};
+		},
+		async sendServoState() {
+			await f();
+		},
+		destroy() {
+			a.destroy();
+		}
+	};
+}
+async function y(e, t) {
+	let n = t.split("\n");
+	for (let t = 0; t < n.length; t++) {
+		let r = n[t].trim(), i = t + 1;
+		if (r === "" || r.startsWith("#")) continue;
+		let a = r.split(/\s+/), o = a[0].toLowerCase();
+		switch (!0) {
+			case o === "home":
+				await e.home();
+				break;
+			case o === "shift-to": {
+				let t = Number(a[1]);
+				if (isNaN(t)) throw Error(`line ${i}: shift-to requires a numeric angle, got '${a[1]}'`);
+				await e.shiftHeadTo(t);
+				break;
+			}
+			case o === "roll-to": {
+				let t = Number(a[1]);
+				if (isNaN(t)) throw Error(`line ${i}: roll-to requires a numeric angle, got '${a[1]}'`);
+				await e.rollHeadTo(t);
+				break;
+			}
+			case o === "pitch-to": {
+				let t = Number(a[1]);
+				if (isNaN(t)) throw Error(`line ${i}: pitch-to requires a numeric angle, got '${a[1]}'`);
+				await e.pitchHeadTo(t);
+				break;
+			}
+			case o === "rotate-to": {
+				let t = Number(a[1]);
+				if (isNaN(t)) throw Error(`line ${i}: rotate-to requires a numeric angle, got '${a[1]}'`);
+				await e.rotateBodyTo(t);
+				break;
+			}
+			case o === "lift-to": {
+				let t = Number(a[1]);
+				if (isNaN(t)) throw Error(`line ${i}: lift-to requires a numeric angle, got '${a[1]}'`);
+				await e.liftHeadTo(t);
+				break;
+			}
+			case o === "move": {
+				let t = {};
+				for (let e = 1; e < a.length; e += 2) {
+					let n = a[e].toLowerCase(), r = Number(a[e + 1]);
+					if (isNaN(r)) throw Error(`line ${i}: '${n}' requires a numeric angle, got '${a[e + 1]}'`);
+					switch (n) {
+						case "shift-to":
+							t.s1 = r;
+							break;
+						case "roll-to":
+							t.s2 = r;
+							break;
+						case "pitch-to":
+							t.s3 = r;
+							break;
+						case "rotate-to":
+							t.s4 = r;
+							break;
+						case "lift-to":
+							t.s5 = r;
+							break;
+						default: throw Error(`line ${i}: unknown move argument '${n}'`);
+					}
+				}
+				if (Object.keys(t).length === 0) throw Error(`line ${i}: move requires at least one servo argument`);
+				e.State = t, await e.sendServoState();
+				break;
+			}
+			case o === "wait": {
+				let e = Number(a[1]);
+				if (isNaN(e) || e < 0) throw Error(`line ${i}: wait requires a non-negative number in ms, got '${a[1]}'`);
+				await new Promise((t) => setTimeout(t, e));
+				break;
+			}
+			default: throw Error(`line ${i}: unknown command '${o}'`);
+		}
+	}
+}
+//#endregion
 //#region src/nova-control-mcp-server.ts
-function d() {
+function b() {
 	try {
 		let { values: e } = r({
 			args: process.argv.slice(2),
@@ -46,20 +276,20 @@ function d() {
 		process.stderr.write(`nova-control-mcp: ${e.message ?? e}\n`), process.exit(1);
 	}
 }
-var f = "", p = 9600, m;
-async function h() {
-	return m ??= await l(f, p), m;
+var x = "", S = 9600, C;
+async function w() {
+	return C ??= await v(x, S), C;
 }
-function g() {
-	m != null && (m.destroy(), m = void 0);
+function T() {
+	C != null && (C.destroy(), C = void 0);
 }
-function _(e, t = 9600) {
-	f = e, p = t;
+function E(e, t = 9600) {
+	x = e, S = t;
 }
-function v() {
-	g(), f = "", p = 9600;
+function D() {
+	T(), x = "", S = 9600;
 }
-var y = [
+var O = [
 	{
 		name: "home",
 		description: "send all servos to their home positions — pass within_ms for smooth, fluid motion with automatic velocity ramp-up and ramp-down; without within_ms the robot moves at constant maximum speed",
@@ -269,104 +499,104 @@ var y = [
 		}
 	}
 ];
-async function b(e) {
+async function k(e) {
 	let t = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).home(t), "all servos moved to home positions";
+	return await (await w()).home(t), "all servos moved to home positions";
 }
-async function x(e) {
+async function A(e) {
 	let t = {};
 	if (e.shift_to != null && (t.s1 = Number(e.shift_to)), e.roll_to != null && (t.s2 = Number(e.roll_to)), e.pitch_to != null && (t.s3 = Number(e.pitch_to)), e.rotate_to != null && (t.s4 = Number(e.rotate_to)), e.lift_to != null && (t.s5 = Number(e.lift_to)), Object.keys(t).length === 0) throw Error("move: at least one of shift_to, roll_to, pitch_to, rotate_to, lift_to is required");
 	let n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).moveTo(t, n), `servos updated: ${JSON.stringify(t)}`;
+	return await (await w()).moveTo(t, n), `servos updated: ${JSON.stringify(t)}`;
 }
-async function S(e) {
+async function j(e) {
 	let t = Number(e.angle), n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).shiftHeadTo(t, n), `s1 (shift) → ${t}°`;
+	return await (await w()).shiftHeadTo(t, n), `s1 (shift) → ${t}°`;
 }
-async function C(e) {
+async function M(e) {
 	let t = Number(e.angle), n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).rollHeadTo(t, n), `s2 (roll) → ${t}°`;
+	return await (await w()).rollHeadTo(t, n), `s2 (roll) → ${t}°`;
 }
-async function w(e) {
+async function N(e) {
 	let t = Number(e.angle), n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).pitchHeadTo(t, n), `s3 (pitch) → ${t}°`;
+	return await (await w()).pitchHeadTo(t, n), `s3 (pitch) → ${t}°`;
 }
-async function T(e) {
+async function P(e) {
 	let t = Number(e.angle), n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).rotateBodyTo(t, n), `s4 (rotate) → ${t}°`;
+	return await (await w()).rotateBodyTo(t, n), `s4 (rotate) → ${t}°`;
 }
-async function E(e) {
+async function F(e) {
 	let t = Number(e.angle), n = e.within_ms == null ? void 0 : Number(e.within_ms);
-	return await (await h()).liftHeadTo(t, n), `s5 (lift) → ${t}°`;
+	return await (await w()).liftHeadTo(t, n), `s5 (lift) → ${t}°`;
 }
-async function D() {
-	return m == null ? "not connected" : (g(), "disconnected");
+async function I() {
+	return C == null ? "not connected" : (T(), "disconnected");
 }
-async function O(e) {
+async function L(e) {
 	let t = Number(e.within_ms);
 	if (isNaN(t) || t <= 0) throw Error("move_to: within_ms must be a positive number");
 	let n = {};
 	if (e.s1 != null && (n.s1 = Number(e.s1)), e.s2 != null && (n.s2 = Number(e.s2)), e.s3 != null && (n.s3 = Number(e.s3)), e.s4 != null && (n.s4 = Number(e.s4)), e.s5 != null && (n.s5 = Number(e.s5)), Object.keys(n).length === 0) throw Error("move_to: at least one servo target (s1–s5) must be specified");
-	return await (await h()).moveTo(n, t), "move completed";
+	return await (await w()).moveTo(n, t), "move completed";
 }
-async function k(e) {
+async function R(e) {
 	let t = Number(e.ms);
 	if (isNaN(t) || t < 0) throw Error(`wait: invalid duration '${e.ms}' — expected a non-negative number`);
 	return await new Promise((e) => setTimeout(e, t)), `waited ${t} ms`;
 }
-async function A() {
-	let e = await h();
+async function z() {
+	let e = await w();
 	return JSON.stringify(e.State);
 }
-async function j(e) {
+async function B(e) {
 	let t = String(e.script ?? "");
-	return await u(await h(), t), "script executed successfully";
+	return await y(await w(), t), "script executed successfully";
 }
-function M() {
+function V() {
 	let e = new i({
 		name: "nova-control-mcp-server",
-		version: "0.0.6"
+		version: "0.0.7"
 	}, { capabilities: { tools: {} } });
-	return e.setRequestHandler(c, async () => ({ tools: y })), e.setRequestHandler(s, async (e) => {
+	return e.setRequestHandler(c, async () => ({ tools: O })), e.setRequestHandler(s, async (e) => {
 		let t = e.params.name, n = e.params.arguments ?? {};
 		try {
 			let e;
 			switch (t) {
 				case "home":
-					e = await b(n);
+					e = await k(n);
 					break;
 				case "move":
-					e = await x(n);
+					e = await A(n);
 					break;
 				case "shift_to":
-					e = await S(n);
+					e = await j(n);
 					break;
 				case "roll_to":
-					e = await C(n);
+					e = await M(n);
 					break;
 				case "pitch_to":
-					e = await w(n);
+					e = await N(n);
 					break;
 				case "rotate_to":
-					e = await T(n);
+					e = await P(n);
 					break;
 				case "lift_to":
-					e = await E(n);
+					e = await F(n);
 					break;
 				case "move_to":
-					e = await O(n);
+					e = await L(n);
 					break;
 				case "wait":
-					e = await k(n);
+					e = await R(n);
 					break;
 				case "get_state":
-					e = await A();
+					e = await z();
 					break;
 				case "run_script":
-					e = await j(n);
+					e = await B(n);
 					break;
 				case "disconnect":
-					e = await D();
+					e = await I();
 					break;
 				default: return {
 					content: [{
@@ -391,14 +621,14 @@ function M() {
 		}
 	}), e;
 }
-async function N(e) {
+async function H(e) {
 	let t = new a();
 	await e.connect(t);
 	for (let e of ["SIGINT", "SIGTERM"]) process.on(e, () => {
-		g(), process.exit(0);
+		T(), process.exit(0);
 	});
 }
-async function P(e, t) {
+async function U(e, t) {
 	let r = new o({ sessionIdGenerator: void 0 });
 	await e.connect(r);
 	let i = n(async (e, t) => {
@@ -410,17 +640,17 @@ async function P(e, t) {
 		}), i.once("error", n);
 	});
 	for (let e of ["SIGINT", "SIGTERM"]) process.on(e, async () => {
-		await r.close(), i.close(), g(), process.exit(0);
+		await r.close(), i.close(), T(), process.exit(0);
 	});
 }
-async function F() {
-	let { Port: e, BaudRate: t, Transport: n, ListenPort: r } = d();
-	f = e, p = t;
-	let i = M();
-	n === "http" ? await P(i, r) : await N(i);
+async function W() {
+	let { Port: e, BaudRate: t, Transport: n, ListenPort: r } = b();
+	x = e, S = t;
+	let i = V();
+	n === "http" ? await U(i, r) : await H(i);
 }
-t(process.argv[1]) === e(import.meta.url) && F().catch((e) => {
+t(process.argv[1]) === e(import.meta.url) && W().catch((e) => {
 	process.stderr.write(`nova-control-mcp: fatal: ${e.message ?? e}\n`), process.exit(1);
 });
 //#endregion
-export { v as _destroyForTests, _ as _setupForTests, M as createServer };
+export { D as _destroyForTests, E as _setupForTests, V as createServer };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nova-control-mcp-server",
   "description": "MCP server for controlling a NOVA DIY Artificial Intelligence Robot by Creoqode",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "keywords": [
     "nova",