windsor-bot 0.2.2 → 0.2.6

package/dist/printer.js

@@ -56,6 +56,9 @@ function chooseFontForLines(totalLines) {
         return { fontSize: FONT_NORMAL, charsPerLine: CHARS_NORMAL };
     }
 }
+function countLayoutLines(lines) {
+    return lines.length <= 2 ? 2 : lines.length;
+}
 export async function getConnectedPrinter() {
     // Try CUPS first
     try {
@@ -95,7 +98,7 @@ export async function formatPrintJob(job) {
     parts.push(INIT);
     // Determine content lines count for font sizing
     const rawLines = job.lines;
-    const previewFontLines = rawLines.length <= 2 ? 2 : rawLines.length;
+    const previewFontLines = countLayoutLines(rawLines);
     const { fontSize, charsPerLine } = chooseFontForLines(previewFontLines);
     // Header
     if (job.header) {

package/dist/printing/cups.js

@@ -14,6 +14,14 @@ function chooseFontSize(totalLines) {
         return FONT_BODY_LARGE;
     return FONT_BODY_NORMAL;
 }
+function countLayoutLines(lines) {
+    const longestLine = lines.reduce((max, line) => Math.max(max, line.length), 0);
+    return longestLine > 24
+        ? 9
+        : lines.length <= 2
+            ? 2
+            : lines.length;
+}
 export async function buildPdfBuffer(job, paperSize) {
     return new Promise((resolve, reject) => {
         const chunks = [];
@@ -26,7 +34,7 @@ export async function buildPdfBuffer(job, paperSize) {
         doc.on('data', (chunk) => chunks.push(chunk));
         doc.on('end', () => resolve(Buffer.concat(chunks)));
         doc.on('error', reject);
-        const bodyFontSize = chooseFontSize(job.lines.length <= 2 ? 2 : job.lines.length);
+        const bodyFontSize = chooseFontSize(countLayoutLines(job.lines));
         // Header
         if (job.header) {
             doc.fontSize(FONT_HEADER).font('Helvetica-Bold').text(job.header, { align: 'center', lineGap: LINE_GAP });

package/dist/printing/escp.js

@@ -34,10 +34,13 @@ function chooseFontForLines(totalLines) {
         return { fontSize: 'normal', cols: COLS_NORMAL };
     }
 }
+function countLayoutLines(lines) {
+    return lines.length <= 2 ? 2 : lines.length;
+}
 export async function buildEscpBuffer(job) {
     const conn = new InMemory();
     const printer = await Printer.CONNECT('TM-T20', conn);
-    const { fontSize, cols } = chooseFontForLines(job.lines.length <= 2 ? 2 : job.lines.length);
+    const { fontSize, cols } = chooseFontForLines(countLayoutLines(job.lines));
     // Header
     if (job.header) {
         const headerLines = wrapText(job.header, COLS_DOUBLE);

package/dist/printing/imagefeed.js

@@ -21,6 +21,9 @@ function chooseLineHeight(totalLines) {
         return { lineHeight: LINE_HEIGHT_LARGE, fontPath: FONT_32 };
     return { lineHeight: LINE_HEIGHT_NORMAL, fontPath: FONT_16 };
 }
+function countLayoutLines(lines) {
+    return lines.length <= 2 ? 2 : lines.length;
+}
 function wrapText(text, font, maxWidth) {
     if (!text)
         return [''];
@@ -48,7 +51,7 @@ async function renderQrCode(url) {
     return Jimp.fromBuffer(pngBuf);
 }
 export async function renderJobToPng(job) {
-    const totalLines = job.lines.length <= 2 ? 2 : job.lines.length;
+    const totalLines = countLayoutLines(job.lines);
     const { lineHeight, fontPath } = chooseLineHeight(totalLines);
     const fontNormal = await loadFont(FONT_16);
     const fontLarge = await loadFont(FONT_32);

package/dist/server.js

@@ -76,17 +76,21 @@ async function updateGlobalBot() {
         '/usr/local/bin/npm',
         '/opt/homebrew/bin/npm',
         '/usr/bin/npm',
+        'npm',
     ]
         .filter((candidate) => Boolean(candidate))
-        .map(candidate => ({
-        path: candidate.endsWith('.js') ? process.execPath : candidate,
-        args: candidate.endsWith('.js') ? [candidate] : [],
-    }));
+        .map(candidate => candidate.trim())
+        .filter((candidate, index, candidates) => candidates.indexOf(candidate) === index);
     let npmCommand;
     for (const candidate of npmCandidates) {
+        const command = candidate.endsWith('.js')
+            ? { path: process.execPath, args: [candidate] }
+            : { path: candidate, args: [] };
         try {
-            await access(candidate.path);
-            npmCommand = candidate;
+            // Validate the script itself, not just the Node executable used to run it.
+            if (candidate !== 'npm')
+                await access(candidate);
+            npmCommand = command;
             break;
         }
         catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windsor-bot",
-  "version": "0.2.2",
+  "version": "0.2.6",
   "description": "Self-hosted Discord bot automation for household list and todo printing",
   "type": "module",
   "main": "dist/index.js",
@@ -8,6 +8,7 @@
     "prepare": "npm run build",
     "build": "tsc && node scripts/build-web.mjs",
     "clean": "node scripts/clean.mjs",
+    "deploy": "git push origin 'refs/tags/v*:refs/tags/v*'",
     "dev": "node src/index.ts",
     "test": "node --test src/tests/*.test.ts",
     "generate-wordsearches": "node scripts/generate-wordsearches.mjs",