windsor-bot 0.2.12 → 0.2.14

package/dist/bot.js

@@ -471,6 +471,7 @@ export function createWindsorBot() {
         }
         const job = {
             lines: [textWithLinkLabels],
+            fontSize: 'double',
             urls,
         };
         if (config.header)
@@ -616,7 +617,7 @@ export function createWindsorBot() {
             await replySafe(message, '⁉️ This message is too long to print.');
             return;
         }
-        const job = { lines: [text], urls };
+        const job = { lines: [text], fontSize: 'double', urls };
         if (config.header)
             job.header = config.header;
         if (config.footer)

package/dist/printing/escp.js

@@ -24,23 +24,12 @@ function wrapText(text, width) {
         lines.push(current);
     return lines.length > 0 ? lines : [''];
 }
-function chooseFontForLines(totalLines) {
-    if (totalLines <= 8) {
-        return { fontSize: 'tall', cols: COLS_NORMAL };
-    }
-    else {
-        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);
     // 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));
+    const fontSize = job.fontSize ?? 'normal';
     // Header
     if (job.header) {
         const headerLines = wrapText(job.header, COLS_DOUBLE);
@@ -74,10 +63,7 @@ export async function buildEscpBuffer(job) {
                 ? Style.DoubleHeight
                 : 0;
         for (const line of job.lines) {
-            const wrapped = wrapText(line, cols);
-            for (const l of wrapped) {
-                await printer.writeln(l, widthStyle);
-            }
+            await printer.writeln(line, widthStyle);
         }
         await printer.feed(1);
     }

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