wiki-plugin-allyabase 0.0.7 → 0.0.9

package/client/allyabase.js

@@ -139,6 +139,128 @@ function emit($item, item) {
     console.log('[allyabase] Fork detected from:', forkInfo);
   }
 
+  // Add configuration section
+  const configContainer = document.createElement('div');
+  configContainer.style.padding = '10px';
+  configContainer.style.marginBottom = '15px';
+  configContainer.style.backgroundColor = '#f0f8ff';
+  configContainer.style.borderRadius = '5px';
+  configContainer.style.border = '1px solid #cce5ff';
+
+  const configTitle = document.createElement('div');
+  configTitle.style.fontWeight = 'bold';
+  configTitle.style.marginBottom = '10px';
+  configTitle.textContent = '⚙️ Configuration';
+  configContainer.appendChild(configTitle);
+
+  // Location Emoji Input
+  const locationLabel = document.createElement('div');
+  locationLabel.style.fontSize = '12px';
+  locationLabel.style.marginBottom = '4px';
+  locationLabel.textContent = 'Location Emoji (3 emoji):';
+  configContainer.appendChild(locationLabel);
+
+  const locationInput = document.createElement('input');
+  locationInput.type = 'text';
+  locationInput.id = 'location-emoji-input';
+  locationInput.style.width = '200px';
+  locationInput.style.padding = '5px';
+  locationInput.style.fontSize = '16px';
+  locationInput.style.marginBottom = '10px';
+  locationInput.placeholder = 'e.g., 🔥💎🌟';
+  configContainer.appendChild(locationInput);
+
+  // Federation Emoji Input
+  const federationLabel = document.createElement('div');
+  federationLabel.style.fontSize = '12px';
+  federationLabel.style.marginBottom = '4px';
+  federationLabel.textContent = 'Federation Emoji (1 emoji):';
+  configContainer.appendChild(federationLabel);
+
+  const federationInput = document.createElement('input');
+  federationInput.type = 'text';
+  federationInput.id = 'federation-emoji-input';
+  federationInput.style.width = '200px';
+  federationInput.style.padding = '5px';
+  federationInput.style.fontSize = '16px';
+  federationInput.style.marginBottom = '10px';
+  federationInput.placeholder = 'e.g., 💚';
+  federationInput.value = '💚';
+  configContainer.appendChild(federationInput);
+
+  // Save button
+  const saveConfigBtn = document.createElement('button');
+  saveConfigBtn.textContent = 'Save Configuration';
+  saveConfigBtn.style.padding = '8px 15px';
+  saveConfigBtn.style.fontSize = '12px';
+  saveConfigBtn.style.cursor = 'pointer';
+  saveConfigBtn.style.marginTop = '5px';
+  saveConfigBtn.style.backgroundColor = '#4CAF50';
+  saveConfigBtn.style.color = 'white';
+  saveConfigBtn.style.border = 'none';
+  saveConfigBtn.style.borderRadius = '4px';
+  configContainer.appendChild(saveConfigBtn);
+
+  // Config status message
+  const configStatus = document.createElement('div');
+  configStatus.id = 'config-status';
+  configStatus.style.fontSize = '11px';
+  configStatus.style.marginTop = '8px';
+  configStatus.style.minHeight = '16px';
+  configContainer.appendChild(configStatus);
+
+  container.appendChild(configContainer);
+
+  // Load current configuration
+  async function loadConfig() {
+    try {
+      const response = await get('/plugin/allyabase/config');
+      const data = await response.json();
+      if (data.success && data.config) {
+        locationInput.value = data.config.locationEmoji || '';
+        federationInput.value = data.config.federationEmoji || '💚';
+      }
+    } catch (err) {
+      console.error('[allyabase] Error loading config:', err);
+    }
+  }
+
+  // Save configuration
+  saveConfigBtn.addEventListener('click', async () => {
+    try {
+      configStatus.textContent = 'Saving...';
+      configStatus.style.color = '#666';
+
+      const response = await post('/plugin/allyabase/config', {
+        locationEmoji: locationInput.value.trim(),
+        federationEmoji: federationInput.value.trim() || '💚'
+      });
+
+      const result = await response.json();
+
+      if (result.success) {
+        configStatus.textContent = '✓ Configuration saved successfully!';
+        configStatus.style.color = 'green';
+        // Reload base emoji display
+        loadBaseEmoji();
+      } else {
+        configStatus.textContent = `✗ Error: ${result.error}`;
+        configStatus.style.color = 'red';
+      }
+
+      setTimeout(() => {
+        configStatus.textContent = '';
+      }, 3000);
+    } catch (err) {
+      console.error('[allyabase] Error saving config:', err);
+      configStatus.textContent = `✗ Error: ${err.message}`;
+      configStatus.style.color = 'red';
+    }
+  });
+
+  // Load config on initialization
+  loadConfig();
+
   // Add base emoji identifier section
   const baseEmojiContainer = document.createElement('div');
   baseEmojiContainer.style.padding = '10px';

package/package.json

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

package/server/server.js

@@ -29,6 +29,9 @@ const SERVICE_PORTS = {
 // PID file for tracking PM2 process
 const PM2_PID_FILE = path.join(__dirname, 'allyabase-pm2.pid');
 
+// Plugin configuration file (stores locationEmoji, federationEmoji, etc.)
+const CONFIG_FILE = path.join(__dirname, 'plugin-config.json');
+
 let baseStatus = {
   running: false,
   services: {},
@@ -37,7 +40,38 @@ let baseStatus = {
 
 let allyabaseProcess = null;
 
-// Function to load wiki's owner.json for keypair and location emoji
+// Load plugin configuration (locationEmoji, federationEmoji, etc.)
+function loadPluginConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) {
+      return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    }
+    // Return defaults if no config file exists
+    return {
+      locationEmoji: null,
+      federationEmoji: '💚'
+    };
+  } catch (err) {
+    console.error('[wiki-plugin-allyabase] Error loading plugin config:', err);
+    return {
+      locationEmoji: null,
+      federationEmoji: '💚'
+    };
+  }
+}
+
+// Save plugin configuration
+function savePluginConfig(config) {
+  try {
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), 'utf8');
+    return true;
+  } catch (err) {
+    console.error('[wiki-plugin-allyabase] Error saving plugin config:', err);
+    return false;
+  }
+}
+
+// Function to load wiki's sessionless keys from owner.json (authentication only)
 function loadWikiKeypair() {
   try {
     const ownerPath = path.join(process.env.HOME || '/root', '.wiki/status/owner.json');
@@ -46,9 +80,7 @@ function loadWikiKeypair() {
       if (ownerData.sessionlessKeys) {
         return {
           pubKey: ownerData.sessionlessKeys.pubKey,
-          privateKey: ownerData.sessionlessKeys.privateKey,
-          locationEmoji: ownerData.locationEmoji,
-          federationEmoji: ownerData.federationEmoji
+          privateKey: ownerData.sessionlessKeys.privateKey
         };
       }
     }
@@ -121,17 +153,17 @@ function killProcessByPort(port) {
   });
 }
 
-// Function to stop PM2 and all managed services
+// Function to stop PM2-managed allyabase services (not the daemon itself,
+// since wiki may also be running under PM2)
 async function stopPM2() {
-  console.log('[wiki-plugin-allyabase] Stopping PM2 and all services...');
+  console.log('[wiki-plugin-allyabase] Stopping allyabase services...');
 
   return new Promise((resolve) => {
-    // Try to stop PM2 gracefully using pm2 kill
-    exec('pm2 kill', (err, stdout, stderr) => {
+    exec('pm2 stop all', (err, stdout, stderr) => {
       if (err) {
-        console.log(`[wiki-plugin-allyabase] PM2 kill failed (might not be running): ${err.message}`);
+        console.log(`[wiki-plugin-allyabase] pm2 stop all failed (might not be running): ${err.message}`);
       } else {
-        console.log(`[wiki-plugin-allyabase] PM2 killed successfully`);
+        console.log(`[wiki-plugin-allyabase] Allyabase services stopped`);
       }
 
       // Clean up PID file
@@ -521,8 +553,8 @@ async function startServer(params) {
       if (targetWikiUrls && targetWikiUrls.length > 0) {
         // This is a cross-wiki request - try all registered URLs
         const currentWikiUrl = `http://localhost:${req.socket.localPort}`;
-        const wikiInfo = loadWikiKeypair();
-        const thisWikiLocationEmoji = wikiInfo ? wikiInfo.locationEmoji : null;
+        const config = loadPluginConfig();
+        const thisWikiLocationEmoji = config.locationEmoji;
 
         console.log('[BDO EMOJI] Cross-wiki request detected');
         console.log('[BDO EMOJI] Target wikis (${targetWikiUrls.length}): ${targetWikiUrls.join(', ')}');
@@ -751,58 +783,122 @@ async function startServer(params) {
     res.send(baseStatus);
   });
 
-  // Endpoint to get wiki's base emoji identifier
+  // Endpoint to get wiki's base emoji identifier (from plugin config)
   app.get('/plugin/allyabase/base-emoji', function(req, res) {
     try {
-      const ownerPath = path.join(process.env.HOME || '/root', '.wiki/status/owner.json');
-      if (fs.existsSync(ownerPath)) {
-        const ownerData = JSON.parse(fs.readFileSync(ownerPath, 'utf8'));
-
-        const response = {
-          federationEmoji: ownerData.federationEmoji || '💚',
-          locationEmoji: ownerData.locationEmoji || null,
-          baseEmoji: (ownerData.federationEmoji || '💚') + (ownerData.locationEmoji || ''),
-          warnings: []
-        };
+      const config = loadPluginConfig();
+      const keypair = loadWikiKeypair();
 
-        // Validation warnings
-        if (!ownerData.locationEmoji) {
-          response.warnings.push({
-            severity: 'error',
-            message: 'Missing locationEmoji in owner.json',
-            fix: 'Add "locationEmoji": "🔥💎🌟" (3 emoji) to your owner.json'
-          });
-        } else if (!ownerData.federationEmoji) {
-          response.warnings.push({
-            severity: 'warning',
-            message: 'Missing federationEmoji in owner.json, using default 💚',
-            fix: 'Add "federationEmoji": "💚" to your owner.json'
+      const response = {
+        federationEmoji: config.federationEmoji || '💚',
+        locationEmoji: config.locationEmoji || null,
+        baseEmoji: (config.federationEmoji || '💚') + (config.locationEmoji || ''),
+        warnings: []
+      };
+
+      // Validation warnings
+      if (!config.locationEmoji) {
+        response.warnings.push({
+          severity: 'error',
+          message: 'Location emoji not configured',
+          fix: 'Set your 3-emoji location identifier in the plugin settings'
+        });
+      }
+
+      if (!keypair || !keypair.pubKey) {
+        response.warnings.push({
+          severity: 'error',
+          message: 'Missing sessionless keys in owner.json',
+          fix: 'BDO operations will fail without sessionless keys in ~/.wiki/status/owner.json'
+        });
+      }
+
+      res.send(response);
+    } catch (err) {
+      console.error('Error reading base emoji config:', err);
+      res.status(500).send({
+        error: 'Failed to load base emoji',
+        message: err.message
+      });
+    }
+  });
+
+  // Endpoint to get plugin configuration
+  app.get('/plugin/allyabase/config', function(req, res) {
+    try {
+      const config = loadPluginConfig();
+      res.send({
+        success: true,
+        config: config
+      });
+    } catch (err) {
+      console.error('Error loading plugin config:', err);
+      res.status(500).send({
+        success: false,
+        error: 'Failed to load configuration',
+        message: err.message
+      });
+    }
+  });
+
+  // Endpoint to save plugin configuration (requires owner auth)
+  app.post('/plugin/allyabase/config', owner, function(req, res) {
+    try {
+      const { locationEmoji, federationEmoji } = req.body;
+
+      // Validate locationEmoji (should be exactly 3 emoji)
+      if (locationEmoji) {
+        const emojiRegex = /[\u{1F1E6}-\u{1F1FF}]{2}|(?:[\u{1F3F4}\u{1F3F3}][\u{FE0F}]?(?:\u{200D}[\u{2620}\u{2695}\u{2696}\u{2708}\u{1F308}][\u{FE0F}]?)?)|(?:\p{Emoji_Presentation}|\p{Emoji}\uFE0F)(?:\u{200D}(?:\p{Emoji_Presentation}|\p{Emoji}\uFE0F))*/gu;
+        const emojis = locationEmoji.match(emojiRegex) || [];
+
+        if (emojis.length !== 3) {
+          return res.status(400).send({
+            success: false,
+            error: 'Location emoji must be exactly 3 emoji characters',
+            got: emojis.length
           });
         }
+      }
+
+      // Validate federationEmoji (should be exactly 1 emoji)
+      if (federationEmoji) {
+        const emojiRegex = /[\u{1F1E6}-\u{1F1FF}]{2}|(?:[\u{1F3F4}\u{1F3F3}][\u{FE0F}]?(?:\u{200D}[\u{2620}\u{2695}\u{2696}\u{2708}\u{1F308}][\u{FE0F}]?)?)|(?:\p{Emoji_Presentation}|\p{Emoji}\uFE0F)(?:\u{200D}(?:\p{Emoji_Presentation}|\p{Emoji}\uFE0F))*/gu;
+        const emojis = federationEmoji.match(emojiRegex) || [];
 
-        if (!ownerData.sessionlessKeys) {
-          response.warnings.push({
-            severity: 'error',
-            message: 'Missing sessionlessKeys in owner.json',
-            fix: 'BDO operations will fail without sessionless keys'
+        if (emojis.length !== 1) {
+          return res.status(400).send({
+            success: false,
+            error: 'Federation emoji must be exactly 1 emoji character',
+            got: emojis.length
           });
         }
+      }
+
+      const config = loadPluginConfig();
+
+      // Update config with provided values
+      if (locationEmoji !== undefined) config.locationEmoji = locationEmoji;
+      if (federationEmoji !== undefined) config.federationEmoji = federationEmoji;
 
-        res.send(response);
+      const saved = savePluginConfig(config);
+
+      if (saved) {
+        res.send({
+          success: true,
+          config: config,
+          message: 'Configuration saved successfully'
+        });
       } else {
-        res.status(404).send({
-          error: 'Owner configuration not found',
-          warnings: [{
-            severity: 'error',
-            message: 'owner.json file not found',
-            fix: 'Create ~/.wiki/status/owner.json with locationEmoji and sessionlessKeys'
-          }]
+        res.status(500).send({
+          success: false,
+          error: 'Failed to save configuration'
         });
       }
     } catch (err) {
-      console.error('Error reading owner.json:', err);
+      console.error('Error saving plugin config:', err);
       res.status(500).send({
-        error: 'Failed to load base emoji',
+        success: false,
+        error: 'Failed to save configuration',
         message: err.message
       });
     }