wiki-plugin-allyabase 0.0.9 → 0.0.11

package/client/allyabase.js

@@ -405,8 +405,21 @@ function emit($item, item) {
   launchButton.style.padding = '10px 20px';
   launchButton.style.marginBottom = '15px';
   launchButton.style.cursor = 'pointer';
+  launchButton.style.marginRight = '10px';
   container.appendChild(launchButton);
 
+  // Add update button
+  const updateButton = document.createElement('button');
+  updateButton.textContent = 'Check for Updates';
+  updateButton.style.padding = '10px 20px';
+  updateButton.style.marginBottom = '15px';
+  updateButton.style.cursor = 'pointer';
+  updateButton.style.backgroundColor = '#0066cc';
+  updateButton.style.color = 'white';
+  updateButton.style.border = 'none';
+  updateButton.style.borderRadius = '4px';
+  container.appendChild(updateButton);
+
   // Add status container
   const statusContainer = document.createElement('div');
   statusContainer.id = 'allyabase-status';
@@ -652,6 +665,48 @@ function emit($item, item) {
     }
   });
 
+  // Update button click handler
+  updateButton.addEventListener('click', async () => {
+    updateButton.disabled = true;
+    updateButton.textContent = 'Updating...';
+
+    try {
+      const response = await post('/plugin/allyabase/update');
+      const result = await response.json();
+
+      const msg = document.createElement('div');
+      msg.style.marginTop = '10px';
+      msg.style.fontSize = '12px';
+      msg.style.fontFamily = 'monospace';
+
+      if (result.success) {
+        const failed = Object.entries(result.results).filter(([, v]) => v.startsWith('error'));
+        if (failed.length === 0) {
+          msg.style.color = 'green';
+          msg.textContent = '✓ All services updated and restarted.';
+        } else {
+          msg.style.color = 'orange';
+          msg.innerHTML = `⚠️ Updated with errors:<br>` +
+            failed.map(([svc, err]) => `${svc}: ${err}`).join('<br>');
+        }
+      } else {
+        msg.style.color = 'red';
+        msg.textContent = `✗ Update failed: ${result.error}`;
+      }
+
+      container.insertBefore(msg, statusContainer);
+      setTimeout(() => {
+        msg.remove();
+        updateStatus();
+      }, 5000);
+    } catch (err) {
+      console.error('[allyabase] update error:', err);
+    } finally {
+      updateButton.disabled = false;
+      updateButton.textContent = 'Check for Updates';
+    }
+  });
+
   // Initial status check
   updateStatus();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-allyabase",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Allyabase management plugin for the federated wiki",
   "keywords": [
     "wiki",

package/server/server.js

@@ -153,24 +153,28 @@ function killProcessByPort(port) {
   });
 }
 
-// Function to stop PM2-managed allyabase services (not the daemon itself,
-// since wiki may also be running under PM2)
+// Function to stop PM2-managed allyabase services by name only.
+// NEVER use "pm2 stop all" — that would kill wiki itself if it's running under PM2.
 async function stopPM2() {
   console.log('[wiki-plugin-allyabase] Stopping allyabase services...');
 
-  return new Promise((resolve) => {
-    exec('pm2 stop all', (err, stdout, stderr) => {
-      if (err) {
-        console.log(`[wiki-plugin-allyabase] pm2 stop all failed (might not be running): ${err.message}`);
-      } else {
-        console.log(`[wiki-plugin-allyabase] Allyabase services stopped`);
-      }
+  const serviceNames = Object.keys(SERVICE_PORTS);
 
-      // Clean up PID file
-      cleanupPidFile();
-      resolve();
-    });
-  });
+  await Promise.all(serviceNames.map(name =>
+    new Promise((resolve) => {
+      exec(`pm2 stop ${name}`, (err) => {
+        if (err) {
+          // Service wasn't running under PM2 — that's fine
+        } else {
+          console.log(`[wiki-plugin-allyabase] Stopped PM2 service: ${name}`);
+        }
+        resolve();
+      });
+    })
+  ));
+
+  console.log('[wiki-plugin-allyabase] Allyabase services stopped');
+  cleanupPidFile();
 }
 
 // Function to clean up orphaned processes from previous run
@@ -764,6 +768,57 @@ async function startServer(params) {
     }
   });
 
+  // Endpoint to update all allyabase services (git pull + npm install + pm2 restart)
+  app.post('/plugin/allyabase/update', owner, async function(req, res) {
+    const services = [
+      'addie', 'aretha', 'bdo', 'continuebee', 'covenant',
+      'dolores', 'fount', 'joan', 'julia', 'minnie', 'pref', 'prof', 'sanora'
+    ];
+    const buildDir = '/var/lib/allyabase';
+    const results = {};
+
+    for (const service of services) {
+      const serviceDir = `${buildDir}/${service}`;
+      try {
+        await new Promise((resolve, reject) => {
+          exec(
+            `git -C "${serviceDir}" pull --ff-only && npm install --prefix "${serviceDir}/src/server/node" --silent`,
+            { timeout: 60000 },
+            (err, stdout, stderr) => {
+              if (err) return reject(err);
+              resolve(stdout);
+            }
+          );
+        });
+        results[service] = 'updated';
+      } catch (err) {
+        results[service] = `error: ${err.message}`;
+        console.error(`[allyabase] update ${service}:`, err.message);
+      }
+    }
+
+    // Restart all services via pm2
+    let restartOutput = '';
+    try {
+      await new Promise((resolve, reject) => {
+        exec(
+          `cd "${buildDir}" && ./node_modules/.bin/pm2 restart ecosystem.config.js`,
+          { timeout: 30000 },
+          (err, stdout) => {
+            if (err) return reject(err);
+            restartOutput = stdout;
+            resolve();
+          }
+        );
+      });
+    } catch (err) {
+      console.error('[allyabase] pm2 restart error:', err.message);
+      restartOutput = `restart error: ${err.message}`;
+    }
+
+    res.send({ success: true, results, restart: restartOutput.trim() });
+  });
+
   // Endpoint to get healthcheck
   app.get('/plugin/allyabase/healthcheck', async function(req, res) {
     try {