odelic 0.2.0 → 0.2.1

package/dist/server.js

@@ -0,0 +1,187 @@
+/**
+ * Tiny dependency-free HTTP/JSON API on top of Controller.
+ *
+ *     GET  /health
+ *     GET  /lights                      list lights (ping)
+ *     GET  /lights/<target>             state ("all" = every light)
+ *     POST /lights/<target>/on | off
+ *     POST /lights/<target>/light       {"color": 0..100, "brightness": 1..100}
+ *     POST /lights/<target>/night       {"level": 0..2}
+ *     POST /groups/<id>/on | off | light
+ *     POST /scenes/<index>/play | save
+ *
+ * Parameters may be sent as a JSON body or as query parameters. <target> is a light name, "all" or a vaddr.
+ * When a token is configured every request needs `Authorization: Bearer <token>` (or ?token=...).
+ */
+import { createHash, timingSafeEqual } from 'node:crypto';
+import http from 'node:http';
+import { InputError } from './errors.js';
+import { log } from './log.js';
+import { toInt } from './controller.js';
+export const LOOPBACK = ['127.0.0.1', 'localhost', '::1'];
+const MAX_BODY = 65536;
+export class HttpError extends Error {
+    status;
+    constructor(status, message) {
+        super(message);
+        this.name = 'HttpError';
+        this.status = status;
+    }
+}
+function need(method, expected) {
+    if (method !== expected)
+        throw new HttpError(405, `use ${expected}`);
+}
+const num = (v, def) => (v ?? def);
+/** Route one request to the controller. Returns the JSON-able result. */
+export async function dispatch(ctl, method, path, params) {
+    let parts;
+    try {
+        parts = path.replace(/^\/+|\/+$/g, '').split('/').filter(Boolean).map(decodeURIComponent);
+    }
+    catch {
+        throw new HttpError(400, 'bad URL encoding');
+    }
+    if (parts.length === 1 && parts[0] === 'health')
+        return { ok: true, ...ctl.info() };
+    if (!parts.length)
+        throw new HttpError(404, 'not found');
+    const [head] = parts;
+    if (head === 'lights') {
+        if (parts.length === 1) {
+            need(method, 'GET');
+            return ctl.lights();
+        }
+        const target = parts[1];
+        if (parts.length === 2) {
+            need(method, 'GET');
+            return ctl.status(target);
+        }
+        need(method, 'POST');
+        const act = parts[2];
+        if (act === 'on')
+            return ctl.on(target);
+        if (act === 'off')
+            return ctl.off(target);
+        if (act === 'light')
+            return ctl.setLight(target, num(params.color, 50), num(params.brightness, 100));
+        if (act === 'night')
+            return ctl.nightLight(target, num(params.level, 0));
+    }
+    else if (head === 'groups' && parts.length === 3) {
+        need(method, 'POST');
+        return ctl.group(toInt(parts[1], 'group id'), parts[2], num(params.color, 50), num(params.brightness, 100));
+    }
+    else if (head === 'scenes' && parts.length === 3 && (parts[2] === 'play' || parts[2] === 'save')) {
+        need(method, 'POST');
+        return ctl.scene(toInt(parts[1], 'scene index'), parts[2] === 'save');
+    }
+    throw new HttpError(404, 'not found');
+}
+function readBody(req) {
+    return new Promise((resolve, reject) => {
+        const declared = Number(req.headers['content-length'] || 0);
+        if (declared > MAX_BODY) {
+            reject(new HttpError(413, 'body too large'));
+            return;
+        }
+        const chunks = [];
+        let size = 0;
+        req.on('data', (c) => {
+            size += c.length;
+            if (size > MAX_BODY) {
+                reject(new HttpError(413, 'body too large'));
+                req.destroy();
+            }
+            else {
+                chunks.push(c);
+            }
+        });
+        req.on('end', () => resolve(Buffer.concat(chunks)));
+        req.on('error', reject);
+    });
+}
+const digest = (s) => createHash('sha256').update(String(s)).digest();
+/** A `(req, res)` handler for node:http. */
+export function makeHandler(ctl, token = null) {
+    return async (req, res) => {
+        let status = 200;
+        let payload;
+        try {
+            const url = new URL(req.url ?? '/', 'http://localhost');
+            const params = Object.fromEntries(url.searchParams);
+            const body = await readBody(req);
+            if (body.length) {
+                let data;
+                try {
+                    data = JSON.parse(body.toString('utf8'));
+                }
+                catch {
+                    throw new HttpError(400, 'body must be JSON');
+                }
+                if (data && typeof data === 'object' && !Array.isArray(data))
+                    Object.assign(params, data);
+            }
+            if (token) {
+                const auth = req.headers.authorization ?? '';
+                const given = auth.toLowerCase().startsWith('bearer ') ? auth.slice(7) : (params.token ?? '');
+                if (!timingSafeEqual(digest(given), digest(token)))
+                    throw new HttpError(401, 'bad or missing token');
+            }
+            delete params.token;
+            payload = await dispatch(ctl, (req.method ?? 'GET').toUpperCase(), url.pathname, params);
+        }
+        catch (e) {
+            const err = e;
+            if (err instanceof HttpError) {
+                status = err.status;
+            }
+            else if (err instanceof InputError) {
+                status = 400;
+            }
+            else { // BLE / login failures
+                status = 502;
+                log.error('request failed:', err);
+            }
+            payload = { ok: false, error: err instanceof HttpError || err instanceof InputError ? err.message : `${err.name}: ${err.message}` };
+        }
+        const data = Buffer.from(JSON.stringify(payload ?? null), 'utf8');
+        if (res.headersSent || res.destroyed)
+            return;
+        res.writeHead(status, {
+            'Content-Type': 'application/json; charset=utf-8',
+            'Content-Length': data.length,
+            Connection: 'close',
+        });
+        res.end(data);
+    };
+}
+/** Start the HTTP API. Resolves to the listening server; closing the server also closes the controller. */
+export async function serve(ctl, { host = '127.0.0.1', port = 8765, token = null } = {}) {
+    if (!LOOPBACK.includes(host) && !token) {
+        throw new InputError(`refusing to listen on ${host} without a token (use --token or ODELIC_HTTP_TOKEN)`);
+    }
+    const server = http.createServer(makeHandler(ctl, token));
+    server.headersTimeout = 10_000;
+    server.requestTimeout = 10_000 + 60_000; // BLE operations (scan + login) can take a while
+    await new Promise((resolve, reject) => {
+        server.once('error', reject);
+        server.listen(port, host, () => {
+            server.removeListener('error', reject);
+            resolve();
+        });
+    });
+    server.on('close', () => {
+        ctl.close().catch(() => { });
+    });
+    const addr = server.address();
+    log.warning(`HTTP API on http://${host}:${addr.port} (${ctl.keepConnected
+        ? 'keeping the BLE link open' : `idle disconnect after ${ctl.idleTimeout}s`})`);
+    if (ctl.keepConnected) {
+        ctl.connect()
+            .then(() => log.warning(`connected via ${ctl.mesh.nodeName}`))
+            .catch((e) => log.warning(`initial connect failed: ${e.message}`)); // the next request retries
+    }
+    return server;
+}
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -0,0 +1,2 @@
+export declare const VERSION = "0.2.1";
+//# sourceMappingURL=version.d.ts.map

package/dist/version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC"}

package/dist/version.js

@@ -0,0 +1,2 @@
+export const VERSION = '0.2.1';
+//# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "odelic",
-  "version": "0.2.0",
-  "description": "Unofficial Node.js library for ODELIC Bluetooth lights (Pairlink connected-mesh)",
+  "version": "0.2.1",
+  "description": "Unofficial TypeScript/Node.js library for ODELIC Bluetooth lights (Pairlink connected-mesh)",
   "type": "module",
   "license": "MIT",
   "author": "rbstxt",
@@ -20,14 +20,22 @@
     "mesh",
     "lighting",
     "smart-home",
-    "mcp"
+    "mcp",
+    "typescript"
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
+  "types": "./dist/index.d.ts",
   "exports": {
-    ".": "./src/index.js",
-    "./mcp": "./src/mcp.js",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./mcp": {
+      "types": "./dist/mcp.d.ts",
+      "default": "./dist/mcp.js"
+    },
     "./package.json": "./package.json"
   },
   "bin": {
@@ -36,12 +44,16 @@
   },
   "files": [
     "bin",
+    "dist",
     "src",
     "LICENSE",
     "README.md"
   ],
   "scripts": {
-    "test": "node --test"
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.test.json",
+    "test": "node --test \"test/*.test.ts\"",
+    "prepack": "npm run build"
   },
   "dependencies": {
     "@stoprocent/noble": "^2.8.0"

package/src/{cli.js → cli.ts}

@@ -2,13 +2,13 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { parseArgs } from 'node:util';
 
-import { InputError, OdelicError } from './errors.js';
-import { log, setLogLevel } from './log.js';
-import { findNodes } from './client.js';
-import { Config, configPath, parseIdle } from './config.js';
-import { Controller } from './controller.js';
-import { parseAppId } from './protocol.js';
-import { VERSION } from './version.js';
+import { InputError, OdelicError } from './errors.ts';
+import { log, setLogLevel } from './log.ts';
+import { findNodes } from './client.ts';
+import { Config, configPath, parseIdle } from './config.ts';
+import { Controller } from './controller.ts';
+import { parseAppId } from './protocol.ts';
+import { VERSION } from './version.ts';
 
 const HELP = `usage: odelic [--id ID] [--node NODE] [-v] <command> [...]
 
@@ -59,10 +59,15 @@ const OPTIONS = {
   host: { type: 'string' },
   port: { type: 'string' },
   token: { type: 'string' },
+} as const;
+
+type OptionName = keyof typeof OPTIONS;
+export type CliOptions = {
+  [K in OptionName]?: (typeof OPTIONS)[K]['type'] extends 'boolean' ? boolean : string;
 };
 
 /** Which options each command accepts (besides the global ones). */
-const COMMAND_OPTIONS = {
+const COMMAND_OPTIONS: Record<string, readonly OptionName[]> = {
   setup: ['idle', 'keep-connected'],
   scan: [],
   lights: [],
@@ -78,53 +83,62 @@ const COMMAND_OPTIONS = {
   serve: ['host', 'port', 'token', 'idle', 'keep-connected'],
   mcp: [],
 };
-const GLOBAL = ['id', 'node', 'verbose', 'help', 'version'];
+const GLOBAL: readonly OptionName[] = ['id', 'node', 'verbose', 'help', 'version'];
+const MAX_ARGS: Record<string, number> = { on: 1, off: 1, light: 1, night: 1, status: 1, group: 2, scene: 2, name: 3 };
 
-function intArg(v, name, { min = -Infinity, max = Infinity, def } = {}) {
-  if (v === undefined) return def;
+function intArg(v: string | undefined, name: string, { min = -Infinity, max = Infinity } = {}): number | undefined {
+  if (v === undefined) return undefined;
   if (!/^-?\d+$/.test(v)) throw new InputError(`--${name}: invalid int value: '${v}'`);
   const n = Number(v);
   if (n < min || n > max) throw new InputError(`--${name}: must be between ${min} and ${max}`);
   return n;
 }
 
-function choice(v, name, choices) {
-  if (!choices.includes(v)) throw new InputError(`${name}: expected one of ${choices.join(', ')} (got ${v === undefined ? 'nothing' : `'${v}'`})`);
-  return v;
+function choice<T extends string>(v: string | undefined, name: string, choices: readonly T[]): T {
+  if (!choices.includes(v as T)) {
+    throw new InputError(`${name}: expected one of ${choices.join(', ')} (got ${v === undefined ? 'nothing' : `'${v}'`})`);
+  }
+  return v as T;
+}
+
+export interface ParsedCli {
+  cmd: string;
+  args: string[];
+  opts: CliOptions;
 }
 
-/** Parse argv into `{cmd, args, opts}`; throws InputError on bad usage. */
-export function parseCli(argv) {
+/** Parse argv; throws InputError on bad usage. */
+export function parseCli(argv: string[]): ParsedCli {
   let parsed;
   try {
     parsed = parseArgs({ args: argv, options: OPTIONS, allowPositionals: true, strict: true });
   } catch (e) {
-    throw new InputError(e.message);
+    throw new InputError((e as Error).message);
   }
-  const { values: o, positionals } = parsed;
+  const o = parsed.values as CliOptions;
   if (o.help || o.version) return { cmd: o.help ? 'help' : 'version', args: [], opts: o };
-  const [cmd, ...args] = positionals;
+  const [cmd, ...args] = parsed.positionals;
   if (!cmd) throw new InputError('missing command (see odelic --help)');
-  if (!(cmd in COMMAND_OPTIONS)) throw new InputError(`unknown command '${cmd}' (see odelic --help)`);
-  for (const k of Object.keys(o)) {
+  if (!Object.hasOwn(COMMAND_OPTIONS, cmd)) throw new InputError(`unknown command '${cmd}' (see odelic --help)`);
+  for (const k of Object.keys(o) as OptionName[]) {
     if (!GLOBAL.includes(k) && !COMMAND_OPTIONS[cmd].includes(k)) throw new InputError(`${cmd}: unrecognized option --${k}`);
   }
   if (o.idle !== undefined && o['keep-connected']) throw new InputError('--idle and --keep-connected are mutually exclusive');
   if (o.idle !== undefined) parseIdle(o.idle); // validate early
-  const maxArgs = { on: 1, off: 1, light: 1, night: 1, status: 1, group: 2, scene: 2, name: 3 }[cmd] ?? 0;
+  const maxArgs = MAX_ARGS[cmd] ?? 0;
   if (args.length > maxArgs) throw new InputError(`${cmd}: unexpected argument '${args[maxArgs]}'`);
   return { cmd, args, opts: o };
 }
 
-function idleValue(o) {
+function idleValue(o: CliOptions): number | null {
   return o['keep-connected'] ? 0 : parseIdle(o.idle);
 }
 
-function show(obj) {
+function show(obj: unknown): void {
   console.log(typeof obj === 'string' ? obj : JSON.stringify(obj, null, 2));
 }
 
-async function runBle(cmd, args, o, cfg) {
+async function runBle(cmd: string, args: string[], o: CliOptions, cfg: Config): Promise<void> {
   if (cmd === 'scan') {
     const aid = cfg.appId(o.id);
     const homeid = aid ? parseAppId(aid).homeid : null;
@@ -135,15 +149,15 @@ async function runBle(cmd, args, o, cfg) {
   }
 
   if (cmd === 'serve') {
-    const { serve } = await import('./server.js');
+    const { serve } = await import('./server.ts');
     const ctl = new Controller(o.id, { node: o.node, config: cfg, idleTimeout: idleValue(o) });
     const server = await serve(ctl, {
       host: o.host ?? '127.0.0.1',
-      port: intArg(o.port, 'port', { min: 0, max: 65535, def: 8765 }),
+      port: intArg(o.port, 'port', { min: 0, max: 65535 }) ?? 8765,
       token: o.token ?? process.env.ODELIC_HTTP_TOKEN ?? null,
     });
-    await new Promise((resolve) => {
-      const stop = () => server.close(resolve);
+    await new Promise<void>((resolve) => {
+      const stop = () => server.close(() => resolve());
       process.once('SIGINT', stop);
       process.once('SIGTERM', stop);
     });
@@ -152,28 +166,28 @@ async function runBle(cmd, args, o, cfg) {
   }
 
   const target = args[0] ?? 'all';
+  const color = () => intArg(o.color, 'color') ?? 50;
+  const brightness = () => intArg(o.brightness, 'brightness') ?? 100;
   const ctl = new Controller(o.id, { node: o.node, config: cfg, idleTimeout: 0 });
   try {
     if (cmd === 'lights' || cmd === 'devices') {
       for (const d of await ctl.lights()) {
         if (d.online) console.log(`${(d.name ?? '-').padEnd(12)} vaddr=${d.vaddr} mac=${d.mac} product=${d.product} ver=${d.version}`);
-        else console.log(`${d.name.padEnd(12)} vaddr=${d.vaddr} (offline)`);
+        else console.log(`${String(d.name).padEnd(12)} vaddr=${d.vaddr} (offline)`);
       }
       return;
     }
     if (cmd === 'on') show(await ctl.on(target));
     else if (cmd === 'off') show(await ctl.off(target));
-    else if (cmd === 'light') {
-      show(await ctl.setLight(target, intArg(o.color, 'color', { def: 50 }), intArg(o.brightness, 'brightness', { def: 100 })));
-    } else if (cmd === 'night') show(await ctl.nightLight(target, intArg(o.level, 'level', { min: 0, max: 2, def: 0 })));
+    else if (cmd === 'light') show(await ctl.setLight(target, color(), brightness()));
+    else if (cmd === 'night') show(await ctl.nightLight(target, intArg(o.level, 'level', { min: 0, max: 2 }) ?? 0));
     else if (cmd === 'status') show(await ctl.status(target));
     else if (cmd === 'group') {
       const id = intArg(args[0], 'group_id');
       if (id === undefined) throw new InputError('group: missing group id');
-      show(await ctl.group(id, choice(args[1], 'group action', ['on', 'off', 'light']),
-        intArg(o.color, 'color', { def: 50 }), intArg(o.brightness, 'brightness', { def: 100 })));
+      show(await ctl.group(id, choice(args[1], 'group action', ['on', 'off', 'light'] as const), color(), brightness()));
     } else if (cmd === 'scene') {
-      const action = choice(args[0], 'scene action', ['save', 'play']);
+      const action = choice(args[0], 'scene action', ['save', 'play'] as const);
       const index = intArg(args[1], 'index');
       if (index === undefined) throw new InputError('scene: missing index');
       show(await ctl.scene(index, action === 'save'));
@@ -184,17 +198,16 @@ async function runBle(cmd, args, o, cfg) {
   }
 }
 
-/** CLI entry point. Resolves to the process exit code. */
-export async function main(argv = process.argv.slice(2)) {
-  let cmd;
-  let args;
-  let o;
+/** CLI entry point. Resolves to the process exit code, or null for long-running commands (`mcp`). */
+export async function main(argv: string[] = process.argv.slice(2)): Promise<number | null> {
+  let parsed: ParsedCli;
   try {
-    ({ cmd, args, opts: o } = parseCli(argv));
+    parsed = parseCli(argv);
   } catch (e) {
-    console.error(`odelic: error: ${e.message}`);
+    console.error(`odelic: error: ${(e as Error).message}`);
     return 2;
   }
+  const { cmd, args, opts: o } = parsed;
   if (cmd === 'help') {
     console.log(HELP);
     return 0;
@@ -220,7 +233,7 @@ export async function main(argv = process.argv.slice(2)) {
       console.log(`saved to ${configPath()} (id: ${cfg.id ? 'set' : 'not set'}, connection: ${
         mode ? `disconnect after ${mode}s idle` : 'keep connected'})`);
     } else if (cmd === 'name') {
-      const sub = choice(args[0], 'name command', ['add', 'rm', 'list']);
+      const sub = choice(args[0], 'name command', ['add', 'rm', 'list'] as const);
       if (sub === 'add') {
         if (args.length !== 3) throw new InputError('usage: odelic name add NAME VADDR');
         cfg.setName(args[1], args[2]);
@@ -232,12 +245,12 @@ export async function main(argv = process.argv.slice(2)) {
       }
       for (const [name, v] of Object.entries(cfg.lights)) console.log(`${name.padEnd(12)} ${v}`);
     } else if (cmd === 'mcp') {
-      let mcp;
+      let mcp: typeof import('./mcp.ts');
       try {
-        mcp = await import('./mcp.js');
+        mcp = await import('./mcp.ts');
       } catch (e) {
-        if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e;
-        throw new OdelicError(`${e.message} (install with: npm install @modelcontextprotocol/sdk zod)`);
+        if ((e as NodeJS.ErrnoException).code !== 'ERR_MODULE_NOT_FOUND') throw e;
+        throw new OdelicError(`${(e as Error).message} (install with: npm install @modelcontextprotocol/sdk zod)`);
       }
       await mcp.main();
       return null; // keep running until stdin closes
@@ -246,8 +259,9 @@ export async function main(argv = process.argv.slice(2)) {
     }
     return 0;
   } catch (e) {
-    if (o.verbose || !(e instanceof OdelicError)) log.debug(e.stack);
-    console.error(`error: ${e.message}`);
+    const err = e as Error;
+    if (o.verbose || !(err instanceof OdelicError)) log.debug(err.stack);
+    console.error(`error: ${err.message}`);
     return 1;
   }
 }