windsor-bot 0.2.9 → 0.2.11

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

@@ -106,12 +106,22 @@ async function updateGlobalBot() {
     logEvent('info', `Update requested; checking ${npmCandidates.length} npm candidate(s) (node=${process.execPath}, cwd=${process.cwd()})`);
     let npmCommand;
     for (const candidate of npmCandidates) {
-        const command = candidate.endsWith('.js')
-            ? { path: process.execPath, args: [candidate] }
-            : { path: candidate, args: [] };
+        const nvmBin = candidate.match(/(\/\.nvm\/versions\/node\/[^/]+\/bin)\/npm$/)?.[1];
+        const command = nvmBin
+            ? {
+                path: join(nvmBin, 'node'),
+                args: [join(nvmBin, '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js')],
+            }
+            : candidate.endsWith('.js')
+                ? { path: process.execPath, args: [candidate] }
+                : { path: candidate, args: [] };
         try {
             // Validate the script itself, not just the Node executable used to run it.
             await access(candidate, constants.R_OK | (candidate.endsWith('.js') ? 0 : constants.X_OK));
+            if (nvmBin) {
+                await access(command.path, constants.X_OK);
+                await access(command.args[0], constants.R_OK);
+            }
             npmCommand = command;
             logEvent('info', `Using npm candidate ${candidate}${command.args.length > 0 ? ` via ${command.path}` : ''}`);
             break;
@@ -127,11 +137,15 @@ async function updateGlobalBot() {
         throw new Error('Unable to locate an executable npm; see diagnostics');
     }
     const npm = npmCommand;
+    const nvmPrefix = npm.path.match(/(\/\.nvm\/versions\/node\/[^/]+)\/bin\/node$/)?.[1];
+    const npmEnv = nvmPrefix
+        ? { ...process.env, NPM_CONFIG_PREFIX: nvmPrefix }
+        : process.env;
     const runNpm = async (args) => {
         const commandArgs = [...npm.args, ...args];
         logEvent('info', `Running npm: ${npm.path} ${commandArgs.join(' ')}`);
         try {
-            const result = await execFileAsync(npm.path, commandArgs, { env: process.env });
+            const result = await execFileAsync(npm.path, commandArgs, { env: npmEnv });
             logEvent('info', `npm completed successfully: ${args.join(' ')}`);
             return result;
         }

package/package.json

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