windsor-bot 0.2.10 → 0.2.12

package/dist/printing/escp.js

@@ -3,6 +3,7 @@ import { SerialPort } from 'serialport';
 import { Jimp, ResizeStrategy } from 'jimp';
 const COLS_NORMAL = 48;
 const COLS_DOUBLE = 24;
+const PRINTER_INIT = '\x1B@\x1Bt\x02\x1BM\x00\x1DL\x00\x00\x1DW\x00\x02';
 function wrapText(text, width) {
     const words = text.split(' ');
     const lines = [];
@@ -24,8 +25,6 @@ function wrapText(text, width) {
     return lines.length > 0 ? lines : [''];
 }
 function chooseFontForLines(totalLines) {
-    // 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 };
     }
@@ -39,6 +38,8 @@ function countLayoutLines(lines) {
 export async function buildEscpBuffer(job) {
     const conn = new InMemory();
     const printer = await Printer.CONNECT('TM-T20', conn);
+    // Reset state that may persist between direct USB/serial jobs.
+    await conn.write(Buffer.from(PRINTER_INIT, 'ascii'));
     const { fontSize, cols } = chooseFontForLines(countLayoutLines(job.lines));
     // Header
     if (job.header) {

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.10",
+  "version": "0.2.12",
   "description": "Self-hosted Discord bot automation for household list and todo printing",
   "type": "module",
   "main": "dist/index.js",