windsor-bot 0.2.11 → 0.2.13

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

@@ -87,8 +87,11 @@ async function updateGlobalBot() {
         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'));
+                if (version.isDirectory()) {
+                    const versionRoot = join(nvmDir, 'versions', 'node', version.name);
+                    nvmCandidates.push(join(versionRoot, 'bin', 'npm'));
+                    nvmCandidates.push(join(versionRoot, 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+                }
             }
             logEvent('info', `Found ${nvmCandidates.length} nvm npm candidate(s) under ${nvmDir}`);
         }
@@ -106,11 +109,11 @@ 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 nvmBin = candidate.match(/(\/\.nvm\/versions\/node\/[^/]+\/bin)\/npm$/)?.[1];
-        const command = nvmBin
+        const nvmRoot = candidate.match(/(\/\.nvm\/versions\/node\/[^/]+)(?:\/bin\/npm|\/lib\/node_modules\/npm\/bin\/npm-cli\.js)$/)?.[1];
+        const command = nvmRoot
             ? {
-                path: join(nvmBin, 'node'),
-                args: [join(nvmBin, '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js')],
+                path: join(nvmRoot, 'bin', 'node'),
+                args: [join(nvmRoot, 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js')],
             }
             : candidate.endsWith('.js')
                 ? { path: process.execPath, args: [candidate] }
@@ -118,7 +121,7 @@ async function updateGlobalBot() {
         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) {
+            if (nvmRoot) {
                 await access(command.path, constants.X_OK);
                 await access(command.args[0], constants.R_OK);
             }

package/package.json

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