windsor-bot 0.2.0 → 0.2.2

package/dist/bot.js

@@ -94,7 +94,10 @@ async function removeReactionSafe(message, emoji) {
 }
 async function reactSafe(message, emoji, clearThinking = true) {
     try {
-        await message.react(emoji);
+        // Retries can encounter the same pending reaction repeatedly while offline.
+        if (!message.reactions.cache.get(emoji)?.me) {
+            await message.react(emoji);
+        }
         if (emoji !== Reaction.thinking && clearThinking) {
             await removeReactionSafe(message, Reaction.thinking);
         }

package/dist/server.js

@@ -65,27 +65,38 @@ async function readPackageVersion() {
     return packageJson.version;
 }
 async function updateGlobalBot() {
-    const npmCliCandidates = [
+    const npmCandidates = [
         process.env['npm_execpath'],
         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',
         '/opt/homebrew/lib/node_modules/npm/bin/npm-cli.js',
-    ].filter((candidate) => Boolean(candidate));
-    let npmCliPath;
-    for (const candidate of npmCliCandidates) {
+        '/usr/lib/node_modules/npm/bin/npm-cli.js',
+        '/usr/share/nodejs/npm/bin/npm-cli.js',
+        '/usr/local/bin/npm',
+        '/opt/homebrew/bin/npm',
+        '/usr/bin/npm',
+    ]
+        .filter((candidate) => Boolean(candidate))
+        .map(candidate => ({
+        path: candidate.endsWith('.js') ? process.execPath : candidate,
+        args: candidate.endsWith('.js') ? [candidate] : [],
+    }));
+    let npmCommand;
+    for (const candidate of npmCandidates) {
         try {
-            await access(candidate);
-            npmCliPath = candidate;
+            await access(candidate.path);
+            npmCommand = candidate;
             break;
         }
         catch {
             // Try the next known npm installation location.
         }
     }
-    if (!npmCliPath)
+    if (!npmCommand)
         throw new Error('Unable to locate npm');
-    const npmCli = npmCliPath;
-    const runNpm = (args) => execFileAsync(process.execPath, [npmCli, ...args]);
+    const npm = npmCommand;
+    const runNpm = (args) => execFileAsync(npm.path, [...npm.args, ...args], { env: process.env });
     await runNpm(['install', '-g', 'windsor-bot@latest']);
     const { stdout } = await runNpm(['root', '-g']);
     const packageJsonPath = join(stdout.trim(), 'windsor-bot', 'package.json');

package/package.json

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