@bobfrankston/brother-label 1.0.14 → 1.1.2

package/cli.ts

@@ -1,344 +1,301 @@
-#!/usr/bin/env node
-/**
- * Brother Label Printer CLI
- * Thin wrapper around the API
- */
-
-import * as fs from "fs";
-import * as path from "path";
-import {
-    print,
-    render,
-    renderSegments,
-    printSegments,
-    getConfig,
-    setConfig,
-    getConfigPath,
-    listPrinters,
-    TapeSize,
-    PrintOptions,
-    Segment,
-} from "./api.js";
-
-const VERSION = "1.0.13";
-const VALID_TAPES: TapeSize[] = [6, 9, 12, 18, 24];
-
-function parseTape(value: string): TapeSize {
-    const num = parseInt(value.replace("mm", ""), 10) as TapeSize;
-    if (!VALID_TAPES.includes(num)) {
-        throw new Error(`Invalid tape size: ${value}. Valid: 6, 9, 12, 18, 24`);
-    }
-    return num;
-}
-
-// Detect content type from input string
-function buildPrintOptions(input: string, opts: { tape?: string; printer?: string; text?: boolean; html?: boolean; image?: boolean; aspect?: string; height?: string }): PrintOptions {
-    const options: PrintOptions = {};
-
-    // Parse tape option
-    if (opts.tape) {
-        options.tape = parseTape(opts.tape);
-    }
-    if (opts.printer) {
-        options.printer = opts.printer;
-    }
-    if (opts.aspect) {
-        options.aspect = opts.aspect;
-    }
-    if (opts.height) {
-        options.textHeight = opts.height;
-    }
-
-    // Explicit type flags override auto-detection
-    if (opts.text) {
-        options.text = input;
-        return options;
-    }
-    if (opts.html) {
-        options.htmlPath = path.resolve(input);
-        return options;
-    }
-    if (opts.image) {
-        options.imagePath = path.resolve(input);
-        return options;
-    }
-
-    // Auto-detect content type
-    const lower = input.toLowerCase();
-    if (lower.endsWith(".html") || lower.endsWith(".htm")) {
-        options.htmlPath = path.resolve(input);
-    } else if (lower.endsWith(".txt")) {
-        options.textFile = path.resolve(input);
-    } else if (lower.endsWith(".png") || lower.endsWith(".jpg") || lower.endsWith(".jpeg") || lower.endsWith(".bmp") || lower.endsWith(".gif")) {
-        options.imagePath = path.resolve(input);
-    } else if (fs.existsSync(input)) {
-        // Exists but unknown extension - try to detect
-        const ext = path.extname(lower);
-        if (ext === ".html" || ext === ".htm") {
-            options.htmlPath = path.resolve(input);
-        } else {
-            // Assume text file
-            options.textFile = path.resolve(input);
-        }
-    } else {
-        // Treat as literal text
-        options.text = input;
-    }
-
-    return options;
-}
-
-interface ParsedArgs {
-    command: string | null;
-    opts: Record<string, string | boolean>;
-    segments: Segment[];
-    input: string | null;
-}
-
-// Valued options: flag name(s) → canonical key
-const VALUED_OPTIONS: [string[], string][] = [
-    [["-tape"], "tape"],
-    [["-p", "-printer"], "printer"],
-    [["-o", "-output"], "output"],
-    [["-a", "-aspect"], "aspect"],
-    [["-H", "-height"], "height"],
-    [["-s", "-sp", "-space"], "space"],
-];
-
-// Boolean flags: flag name(s) → canonical key
-const BOOLEAN_FLAGS: [string[], string][] = [
-    [["-w", "-html"], "html"],
-    [["-i", "-image"], "image"],
-    [["-t"], "text"],
-    [["-help", "-h"], "help"],
-    [["-version", "-v"], "version"],
-];
-
-function parseArgs(argv: string[]): ParsedArgs {
-    const args = argv.slice(2).map(a => a.startsWith("--") ? a.slice(1) : a);
-    const command: string | null = null;
-    const opts: Record<string, string | boolean> = {};
-    const segments: Segment[] = [];
-    let input: string | null = null;
-    let i = 0;
-
-    while (i < args.length) {
-        const arg = args[i];
-
-        // Segment flags: -text <value>, -qr <value>
-        if ((arg === "-text" || arg === "-qr") && i + 1 < args.length) {
-            segments.push({ type: arg === "-text" ? "text" : "qr", value: args[i + 1] });
-            i += 2;
-            continue;
-        }
-
-        // Valued options
-        let matched = false;
-        for (const [names, key] of VALUED_OPTIONS) {
-            if (names.includes(arg) && i + 1 < args.length) {
-                opts[key] = args[i + 1];
-                i += 2;
-                matched = true;
-                break;
-            }
-        }
-        if (matched) continue;
-
-        // Boolean flags
-        for (const [names, key] of BOOLEAN_FLAGS) {
-            if (names.includes(arg)) {
-                opts[key] = true;
-                i++;
-                matched = true;
-                break;
-            }
-        }
-        if (matched) continue;
-
-        // Subcommands
-        if ((arg === "list" || arg === "config") && command === null && input === null) {
-            return { ...parseRest(args, i), command: arg };
-        }
-
-        // Bare string → positional input (first one wins)
-        if (input === null) {
-            input = arg;
-        }
-        i++;
-    }
-
-    return { command, opts, segments, input };
-}
-
-// After recognizing a subcommand, parse the rest for that subcommand's options
-function parseRest(args: string[], startIndex: number): ParsedArgs {
-    const opts: Record<string, string | boolean> = {};
-    const segments: Segment[] = [];
-    let input: string | null = null;
-    let i = startIndex + 1;
-
-    while (i < args.length) {
-        const arg = args[i];
-        let matched = false;
-        for (const [names, key] of VALUED_OPTIONS) {
-            if (names.includes(arg) && i + 1 < args.length) {
-                opts[key] = args[i + 1];
-                i += 2;
-                matched = true;
-                break;
-            }
-        }
-        if (matched) continue;
-
-        for (const [names, key] of BOOLEAN_FLAGS) {
-            if (names.includes(arg)) {
-                opts[key] = true;
-                i++;
-                matched = true;
-                break;
-            }
-        }
-        if (matched) continue;
-
-        if (input === null) input = arg;
-        i++;
-    }
-
-    return { command: null, opts, segments, input };
-}
-
-function showHelp(): void {
-    console.log(`Brother Label Printer CLI v${VERSION}
-
-Usage:
-  brother-print [options] <input>        Print text, file, or image
-  brother-print -text <v> -qr <v> ...    Print ordered segments
-  brother-print list                     List available printers
-  brother-print config                   Show/set configuration
-
-Options:
-  -tape <size>       Tape size: 6, 9, 12, 18, 24 (mm)
-  -p, -printer <n>   Printer name
-  -o, -output <file> Save to file instead of printing (png, jpg, bmp)
-  -a, -aspect <r>    Aspect ratio width:height for HTML (e.g., 3.5:2)
-  -H, -height <size> Text height: 12mm, .5in, or 50% (of tape height)
-  -s, -space <size>  Space between segments: 12px, 1mm, .2in
-  -t, -text          Force input as literal text (or -text <v> for segments)
-  -qr <data>         QR code segment
-  -w, -html          Force input as HTML file path
-  -i, -image         Force input as image file path
-  -help              Show this help
-  -version           Show version`);
-}
-
-// --- Main ---
-
-async function main(): Promise<void> {
-    const parsed = parseArgs(process.argv);
-
-    if (parsed.opts.help) {
-        showHelp();
-        return;
-    }
-    if (parsed.opts.version) {
-        console.log(VERSION);
-        return;
-    }
-
-    // Subcommands
-    if (parsed.command === "list") {
-        try {
-            const printers = await listPrinters();
-            if (printers.length === 0) {
-                console.log("No Brother printers found");
-            } else {
-                console.log("Brother printers:");
-                printers.forEach(p => console.log(`  ${p.name}`));
-            }
-        } catch (err) {
-            console.error(`Error: ${(err as Error).message}`);
-            process.exit(1);
-        }
-        return;
-    }
-
-    if (parsed.command === "config") {
-        try {
-            if (!parsed.opts.tape && !parsed.opts.printer) {
-                const config = getConfig();
-                console.log("Configuration:");
-                console.log(`  File: ${getConfigPath()}`);
-                console.log(`  Default tape: ${config.defaultTape ? config.defaultTape + "mm" : "(not set)"}`);
-                console.log(`  Default printer: ${config.defaultPrinter ?? "(not set)"}`);
-                console.log("\nValid tape sizes: 6, 9, 12, 18, 24");
-                return;
-            }
-            if (parsed.opts.tape) {
-                const tape = parseTape(parsed.opts.tape as string);
-                setConfig({ defaultTape: tape });
-                console.log(`Default tape set to: ${tape}mm`);
-            }
-            if (parsed.opts.printer) {
-                setConfig({ defaultPrinter: parsed.opts.printer as string });
-                console.log(`Default printer set to: ${parsed.opts.printer}`);
-            }
-        } catch (err) {
-            console.error(`Error: ${(err as Error).message}`);
-            process.exit(1);
-        }
-        return;
-    }
-
-    // Multi-segment mode
-    if (parsed.segments.length > 0) {
-        try {
-            const tape = parsed.opts.tape ? parseTape(parsed.opts.tape as string) : undefined;
-            if (parsed.opts.output) {
-                const buffer = await renderSegments(parsed.segments, tape, parsed.opts.height as string | undefined, parsed.opts.space as string | undefined);
-                fs.writeFileSync(parsed.opts.output as string, buffer);
-                console.log(`Saved to ${parsed.opts.output}`);
-            } else {
-                await printSegments(parsed.segments, { tape, printer: parsed.opts.printer as string | undefined, textHeight: parsed.opts.height as string | undefined, space: parsed.opts.space as string | undefined });
-                const effectiveTape = tape ?? getConfig().defaultTape ?? 24;
-                console.log(`Printed ${parsed.segments.length} segments on ${effectiveTape}mm tape`);
-            }
-        } catch (err) {
-            console.error(`Error: ${(err as Error).message}`);
-            process.exit(1);
-        }
-        return;
-    }
-
-    // Single input mode
-    if (!parsed.input) {
-        showHelp();
-        return;
-    }
-
-    try {
-        const options = buildPrintOptions(parsed.input, {
-            tape: parsed.opts.tape as string | undefined,
-            printer: parsed.opts.printer as string | undefined,
-            text: parsed.opts.text as boolean | undefined,
-            html: parsed.opts.html as boolean | undefined,
-            image: parsed.opts.image as boolean | undefined,
-            aspect: parsed.opts.aspect as string | undefined,
-            height: parsed.opts.height as string | undefined,
-        });
-
-        if (parsed.opts.output) {
-            const buffer = await render(options);
-            fs.writeFileSync(parsed.opts.output as string, buffer);
-            console.log(`Saved to ${parsed.opts.output}`);
-        } else {
-            await print(options);
-            const tape = options.tape ?? getConfig().defaultTape ?? 24;
-            console.log(`Printed on ${tape}mm tape`);
-        }
-    } catch (err) {
-        console.error(`Error: ${(err as Error).message}`);
-        process.exit(1);
-    }
-}
-
-main();
+#!/usr/bin/env node
+/**
+ * Brother Label Printer CLI
+ * Thin wrapper around api.ts using shared CLI primitives from label-core.
+ */
+
+import * as fs from "fs";
+import * as path from "path";
+import {
+    preprocessSingleQuotes,
+    parseArgs,
+} from "@bobfrankston/label-core";
+import type {
+    PrintOptions as CorePrintOptions,
+    PrinterStatus,
+    Segment,
+    ValuedOptionSpec,
+    BooleanFlagSpec,
+} from "@bobfrankston/label-core";
+import {
+    print,
+    render,
+    renderSegments,
+    printSegments,
+    getConfig,
+    setConfig,
+    getConfigPath,
+    listPrinters,
+    detectTapeSize,
+    brotherPrinter,
+} from "./api.js";
+import type { TapeSize, PrintOptions, SegmentOptions } from "./api.js";
+
+const VERSION = "1.1.0";
+const VALID_TAPES: TapeSize[] = [6, 9, 12, 18, 24];
+
+function parseTape(value: string): TapeSize {
+    const num = parseInt(value.replace("mm", ""), 10) as TapeSize;
+    if (!VALID_TAPES.includes(num)) {
+        throw new Error(`Invalid tape size: ${value}. Valid: ${VALID_TAPES.join(", ")}`);
+    }
+    return num;
+}
+
+const VALUED: ValuedOptionSpec[] = [
+    { names: ["-tape"],                key: "tape" },
+    { names: ["-p", "-printer"],       key: "printer" },
+    { names: ["-o", "-output"],        key: "output" },
+    { names: ["-a", "-aspect"],        key: "aspect" },
+    { names: ["-H", "-height"],        key: "height" },
+    { names: ["-s", "-space"],         key: "space" },
+    { names: ["-timeout"],             key: "timeout" },
+    { names: ["-interval"],            key: "interval" },
+];
+
+const BOOLEAN: BooleanFlagSpec[] = [
+    { names: ["-w", "-html"],          key: "html" },
+    { names: ["-i", "-image"],         key: "image" },
+    { names: ["-t"],                   key: "text" },
+    { names: ["-c", "-clip"],          key: "clip" },
+    { names: ["-no-wait", "-nowait"],  key: "nowait" },
+    { names: ["-help", "-h", "-?"],    key: "help" },
+    { names: ["-version", "-v"],       key: "version" },
+];
+
+const SUBCOMMANDS = ["list", "status", "config"];
+
+function showHelp(): void {
+    console.log(`Brother Label Printer CLI v${VERSION}
+
+Usage:
+  brother-print [options] <text>           Print text
+  brother-print [options] <file>           Print html/txt/image file (auto-detected)
+  brother-print -clip [options]            Print clipboard contents (image or text)
+  brother-print -text <v> -qr <v> ...      Print ordered text/qr segments
+  brother-print list                       List Brother printers and status
+  brother-print status [-p <name>]         Show printer status
+  brother-print config                     Show / set defaults
+
+Tape size is auto-detected from the printer. Use -tape to override.
+Single quotes can wrap arguments: '7"' 'line1\\nline2'
+
+Options:
+  -tape <size>         Tape size: 6, 9, 12, 18, 24 (mm) [auto-detected]
+  -p, -printer <name>  Printer queue name
+  -o, -output <file>   Save PNG to file instead of printing
+  -a, -aspect <r>      Aspect ratio width:height for HTML (e.g. 3.5:2)
+  -H, -height <size>   Text height: 12mm, .5in, or 50% (of tape height)
+  -s, -space <size>    Space between segments: 12px, 1mm, .2in
+  -t, -text            Force input as literal text (-text <v> for segments)
+  -qr <data>           QR code segment
+  -w, -html            Force input as HTML file path
+  -i, -image           Force input as image file path
+  -c, -clip            Read content from clipboard (image preferred, then text)
+  -no-wait             Fail immediately if printer is offline (default: wait)
+  -timeout <secs>      Max wait time when printer is offline
+  -interval <secs>     Polling interval while waiting (default 2)
+  -help                Show this help
+  -version             Show version`);
+}
+
+async function main(): Promise<void> {
+    const argv = preprocessSingleQuotes(process.argv.slice(2));
+    let parsed;
+    try {
+        parsed = parseArgs(argv, VALUED, BOOLEAN, SUBCOMMANDS);
+    } catch (e: any) {
+        console.error(`Error: ${e.message}`);
+        process.exit(1);
+    }
+
+    if (parsed.unknown.length > 0) {
+        console.error(`Unknown option(s): ${parsed.unknown.join(", ")}`);
+        console.error(`Run "brother-print -help" for usage.`);
+        process.exit(1);
+    }
+
+    if (parsed.opts.help) { showHelp(); return; }
+    if (parsed.opts.version) { console.log(VERSION); return; }
+
+    try {
+        switch (parsed.command) {
+            case "list":   await cmdList(); return;
+            case "status": await cmdStatus(parsed.opts); return;
+            case "config": await cmdConfig(parsed.opts); return;
+        }
+        await cmdPrint(parsed.opts, parsed.segments, parsed.inputs);
+    } catch (e: any) {
+        console.error(`Error: ${e.message}`);
+        process.exit(1);
+    }
+}
+
+async function cmdList(): Promise<void> {
+    const printers = await listPrinters();
+    if (printers.length === 0) {
+        console.log("No Brother printers found.");
+        return;
+    }
+    console.log(`Brother printers (${printers.length}):`);
+    for (const p of printers) {
+        let statusStr = "?";
+        try {
+            const s = await brotherPrinter.getStatus(p.name);
+            statusStr = s.online ? "online" : `offline (${s.statusText}${s.error ? ", " + s.error : ""})`;
+        } catch (e: any) {
+            statusStr = `status error: ${e.message}`;
+        }
+        console.log(`  ${p.name} — ${statusStr}`);
+    }
+}
+
+async function cmdStatus(opts: Record<string, string | boolean>): Promise<void> {
+    const name = (opts.printer as string) || undefined;
+    const s = await brotherPrinter.getStatus(name);
+    console.log(`Printer:   ${s.name}`);
+    console.log(`Online:    ${s.online ? "yes" : "no"}`);
+    console.log(`Status:    ${s.statusText}`);
+    if (s.error) console.log(`Error:     ${s.error}`);
+    console.log(`Queue:     ${s.queueLength} job(s)`);
+    if (s.workOffline) console.log(`Work offline flag: true`);
+}
+
+async function cmdConfig(opts: Record<string, string | boolean>): Promise<void> {
+    const hasUpdate = !!(opts.tape || opts.printer);
+    if (!hasUpdate) {
+        const cfg = getConfig();
+        console.log(`Configuration:`);
+        console.log(`  File:            ${getConfigPath()}`);
+        console.log(`  Default tape:    ${cfg.defaultTape ? cfg.defaultTape + "mm" : "(not set)"}`);
+        console.log(`  Default printer: ${cfg.defaultPrinter ?? "(not set)"}`);
+        console.log("\nValid tape sizes: 6, 9, 12, 18, 24");
+        return;
+    }
+    if (opts.tape) {
+        const t = parseTape(opts.tape as string);
+        setConfig({ defaultTape: t });
+        console.log(`Default tape set to: ${t}mm`);
+    }
+    if (opts.printer) {
+        setConfig({ defaultPrinter: opts.printer as string });
+        console.log(`Default printer set to: ${opts.printer}`);
+    }
+}
+
+async function resolveTape(opts: Record<string, string | boolean>): Promise<TapeSize> {
+    const explicit = opts.tape ? parseTape(opts.tape as string) : null;
+    const detected = await detectTapeSize(opts.printer as string | undefined);
+    if (explicit) {
+        if (detected && detected !== explicit) {
+            console.warn(`Warning: -tape ${explicit}mm specified but printer reports ${detected}mm tape loaded`);
+        }
+        return explicit;
+    }
+    if (detected) return detected;
+    return getConfig().defaultTape ?? 24;
+}
+
+async function cmdPrint(
+    opts: Record<string, string | boolean>,
+    segments: Segment[],
+    inputs: string[]
+): Promise<void> {
+    const tape = await resolveTape(opts);
+
+    // If there are 2+ positional inputs, treat each as a text segment.
+    // (A single positional input is handled below via classifyInput so it can
+    // auto-detect file paths.)
+    if (inputs.length > 1 || (inputs.length >= 1 && segments.length > 0)) {
+        for (const inp of inputs) {
+            segments.push({ type: "text", value: inp });
+        }
+        inputs.length = 0;
+    }
+
+    const baseOpts = {
+        printer: opts.printer as string | undefined,
+        wait: !opts.nowait,
+        waitTimeoutMs: opts.timeout ? Math.round(parseFloat(opts.timeout as string) * 1000) : undefined,
+        waitIntervalMs: opts.interval ? Math.round(parseFloat(opts.interval as string) * 1000) : undefined,
+        onWaiting: makeWaitCallback(),
+        log: (msg: string) => console.log(msg),
+    };
+
+    // Multi-segment mode: explicit -text/-qr (>=1 segment), with positional joined in
+    if (segments.length > 1 || (segments.length === 1 && inputs.length === 0)) {
+        const segOpts: SegmentOptions = {
+            ...baseOpts,
+            tape,
+            textHeight: opts.height as string | undefined,
+            space: opts.space as string | undefined,
+        };
+        if (opts.output) {
+            const buffer = await renderSegments(segments, tape, opts.height as string | undefined, opts.space as string | undefined);
+            fs.writeFileSync(opts.output as string, buffer);
+            console.log(`Saved to ${opts.output}`);
+        } else {
+            await printSegments(segments, segOpts);
+            console.log(`Printed ${segments.length} segment(s) on ${tape}mm tape`);
+        }
+        return;
+    }
+
+    // Single content op
+    const printOpts: PrintOptions = {
+        ...baseOpts,
+        tape,
+        aspect: opts.aspect as string | undefined,
+        textHeight: opts.height as string | undefined,
+    };
+
+    if (opts.clip) {
+        printOpts.clip = true;
+    } else if (inputs.length === 1) {
+        Object.assign(printOpts, classifyInput(inputs[0], opts));
+    } else if (inputs.length === 0 && segments.length === 0) {
+        showHelp();
+        return;
+    }
+
+    if (opts.output) {
+        const buffer = await render(printOpts);
+        fs.writeFileSync(opts.output as string, buffer);
+        console.log(`Saved to ${opts.output}`);
+        return;
+    }
+    await print(printOpts);
+    console.log(`Printed on ${tape}mm tape`);
+}
+
+function classifyInput(input: string, opts: Record<string, string | boolean>): Partial<CorePrintOptions> {
+    if (opts.text)  return { text: input };
+    if (opts.html)  return { htmlPath: path.resolve(input) };
+    if (opts.image) return { imagePath: path.resolve(input) };
+
+    const lower = input.toLowerCase();
+    if (lower.endsWith(".html") || lower.endsWith(".htm")) return { htmlPath: path.resolve(input) };
+    if (lower.endsWith(".txt"))  return { textFile: path.resolve(input) };
+    if (/\.(png|jpg|jpeg|bmp|gif)$/i.test(lower))          return { imagePath: path.resolve(input) };
+    if (fs.existsSync(input)) {
+        const ext = path.extname(lower);
+        if (ext === ".html" || ext === ".htm") return { htmlPath: path.resolve(input) };
+        return { textFile: path.resolve(input) };
+    }
+    return { text: input };
+}
+
+function makeWaitCallback() {
+    let lastReport = 0;
+    return (status: PrinterStatus, elapsedMs: number, alternatives: PrinterStatus[]) => {
+        const secs = Math.floor(elapsedMs / 1000);
+        if (secs - lastReport < 5) return;
+        lastReport = secs;
+        const altStr = alternatives.length > 0
+            ? `  (online alternatives: ${alternatives.map(a => a.name).join(", ")})`
+            : "";
+        console.log(`[brother-print] still waiting for ${status.name} (${status.statusText}${status.error ? ", " + status.error : ""}); ${secs}s elapsed${altStr}`);
+    };
+}
+
+main();