windsor-bot 0.2.8 → 0.2.10

package/dist/printing/escp.js

@@ -24,11 +24,10 @@ function wrapText(text, width) {
     return lines.length > 0 ? lines : [''];
 }
 function chooseFontForLines(totalLines) {
-    if (totalLines <= 4) {
-        return { fontSize: 'double', cols: COLS_DOUBLE };
-    }
-    else if (totalLines <= 8) {
-        return { fontSize: 'tall', cols: COLS_DOUBLE };
+    // Keep short messages large without relying on the printer's
+    // double-width glyph capacity, which varies by model and font.
+    if (totalLines <= 8) {
+        return { fontSize: 'tall', cols: COLS_NORMAL };
     }
     else {
         return { fontSize: 'normal', cols: COLS_NORMAL };

package/dist/server.js

@@ -1,7 +1,7 @@
 import { createServer } from 'http';
 import { execFile } from 'child_process';
 import { build } from 'esbuild';
-import { access, constants, readFile, stat } from 'fs/promises';
+import { access, constants, readFile, readdir, stat } from 'fs/promises';
 import { promisify } from 'util';
 import { spawn } from 'child_process';
 import { dirname, join } from 'path';
@@ -67,6 +67,7 @@ async function readPackageVersion() {
 async function updateGlobalBot() {
     const configuredCandidates = [
         process.env['npm_execpath'],
+        process.env['NVM_BIN'] ? join(process.env['NVM_BIN'], 'npm') : undefined,
         join(dirname(process.execPath), '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'),
         join(dirname(process.execPath), 'npm'),
         '/usr/local/lib/node_modules/npm/bin/npm-cli.js',
@@ -80,11 +81,27 @@ async function updateGlobalBot() {
         .filter((candidate) => Boolean(candidate))
         .map(candidate => candidate.trim())
         .filter((candidate, index, candidates) => candidates.indexOf(candidate) === index);
+    const nvmDir = process.env['NVM_DIR'] ?? (process.env['HOME'] ? join(process.env['HOME'], '.nvm') : undefined);
+    const nvmCandidates = [];
+    if (nvmDir) {
+        try {
+            const nodeVersions = await readdir(join(nvmDir, 'versions', 'node'), { withFileTypes: true });
+            for (const version of nodeVersions) {
+                if (version.isDirectory())
+                    nvmCandidates.push(join(nvmDir, 'versions', 'node', version.name, 'bin', 'npm'));
+            }
+            logEvent('info', `Found ${nvmCandidates.length} nvm npm candidate(s) under ${nvmDir}`);
+        }
+        catch (error) {
+            const code = error instanceof Error && 'code' in error ? String(error.code) : 'unknown';
+            logEvent('info', `Unable to inspect nvm npm locations under ${nvmDir} (${code})`);
+        }
+    }
     const pathCandidates = (process.env['PATH'] ?? '')
         .split(':')
         .filter(Boolean)
         .map(directory => join(directory, 'npm'));
-    const npmCandidates = [...configuredCandidates, ...pathCandidates]
+    const npmCandidates = [...configuredCandidates, ...nvmCandidates, ...pathCandidates]
         .filter((candidate, index, candidates) => candidates.indexOf(candidate) === index);
     logEvent('info', `Update requested; checking ${npmCandidates.length} npm candidate(s) (node=${process.execPath}, cwd=${process.cwd()})`);
     let npmCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windsor-bot",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Self-hosted Discord bot automation for household list and todo printing",
   "type": "module",
   "main": "dist/index.js",