superacli 1.1.21 → 1.1.23

package/server/services/pluginResourceService.js

@@ -0,0 +1,262 @@
+/**
+ * Plugin Resource Service
+ * Handles registration and cleanup of server resources (MCP/OpenAPI) from plugins
+ */
+const { getStorage } = require("../storage/adapter")
+
+async function registerPluginResources(pluginName, serverResources, origin = "cli", clientId = null) {
+  const storage = getStorage()
+  const results = { mcp: [], specs: [], errors: [] }
+  
+  try {
+    // Register MCP resources
+    if (serverResources.mcp && Array.isArray(serverResources.mcp)) {
+      for (const mcpResource of serverResources.mcp) {
+        try {
+          if (!mcpResource.name || (!mcpResource.url && !mcpResource.command)) {
+            results.errors.push(`Invalid MCP resource: missing name or url/command`)
+            continue
+          }
+          
+          // Build key with client_id if origin is cli
+          const key = origin === "cli" && clientId
+            ? `mcp:${origin}:${clientId}:${pluginName}:${mcpResource.name}`
+            : `mcp:${origin}:${pluginName}:${mcpResource.name}`
+          
+          const doc = {
+            _id: key,
+            name: key,
+            displayName: mcpResource.name,
+            pluginSource: pluginName,
+            origin: origin,
+            clientId: clientId || null,
+            createdAt: new Date()
+          }
+          
+          // Copy MCP properties
+          if (mcpResource.url) doc.url = mcpResource.url
+          if (mcpResource.command) doc.command = mcpResource.command
+          if (mcpResource.args) doc.args = mcpResource.args
+          if (mcpResource.headers) doc.headers = mcpResource.headers
+          if (mcpResource.env) doc.env = mcpResource.env
+          if (mcpResource.timeout_ms) doc.timeout_ms = mcpResource.timeout_ms
+          if (mcpResource.stateful) doc.stateful = true
+          
+          await storage.set(key, doc)
+          results.mcp.push(key)
+        } catch (err) {
+          results.errors.push(`Failed to register MCP ${mcpResource.name}: ${err.message}`)
+        }
+      }
+    }
+    
+    // Register OpenAPI spec resources
+    if (serverResources.specs && Array.isArray(serverResources.specs)) {
+      for (const specResource of serverResources.specs) {
+        try {
+          if (!specResource.name || !specResource.url) {
+            results.errors.push(`Invalid spec resource: missing name or url`)
+            continue
+          }
+          
+          // Build key with client_id if origin is cli
+          const key = origin === "cli" && clientId
+            ? `spec:${origin}:${clientId}:${pluginName}:${specResource.name}`
+            : `spec:${origin}:${pluginName}:${specResource.name}`
+          
+          const doc = {
+            _id: key,
+            name: key,
+            displayName: specResource.name,
+            url: specResource.url,
+            auth: specResource.auth || "none",
+            pluginSource: pluginName,
+            origin: origin,
+            clientId: clientId || null,
+            createdAt: new Date()
+          }
+          
+          await storage.set(key, doc)
+          results.specs.push(key)
+        } catch (err) {
+          results.errors.push(`Failed to register spec ${specResource.name}: ${err.message}`)
+        }
+      }
+    }
+  } catch (err) {
+    results.errors.push(`Resource registration failed: ${err.message}`)
+  }
+  
+  return results
+}
+
+async function unregisterPluginResources(pluginName, origin = "cli") {
+  const storage = getStorage()
+  const results = { mcp: [], specs: [], errors: [] }
+  
+  try {
+    // Remove MCP resources by origin prefix
+    const allMcpKeys = await storage.listKeys("mcp:")
+    const targetMcpKeys = allMcpKeys.filter(k => k.startsWith(`mcp:${origin}:${pluginName}:`))
+    for (const key of targetMcpKeys) {
+      try {
+        await storage.delete(key)
+        results.mcp.push(key)
+      } catch (err) {
+        results.errors.push(`Failed to remove MCP ${key}: ${err.message}`)
+      }
+    }
+    
+    // Remove spec resources by origin prefix
+    const allSpecKeys = await storage.listKeys("spec:")
+    const targetSpecKeys = allSpecKeys.filter(k => k.startsWith(`spec:${origin}:${pluginName}:`))
+    for (const key of targetSpecKeys) {
+      try {
+        await storage.delete(key)
+        results.specs.push(key)
+      } catch (err) {
+        results.errors.push(`Failed to remove spec ${key}: ${err.message}`)
+      }
+    }
+  } catch (err) {
+    results.errors.push(`Resource cleanup failed: ${err.message}`)
+  }
+  
+  return results
+}
+
+async function registerAllPluginResources() {
+  const storage = getStorage()
+  const results = { plugins: {}, totalErrors: 0, registeredMcp: 0, registeredSpecs: 0 }
+  
+  // Register resources from client plugins (plugin_client:{client-id}:*)
+  const clientPluginKeys = await storage.listKeys("plugin_client:")
+  for (const key of clientPluginKeys) {
+    try {
+      const plugin = await storage.get(key)
+      if (plugin && plugin.server_resources && plugin.client_id) {
+        const pluginResults = await registerPluginResources(plugin.name, plugin.server_resources, "cli", plugin.client_id)
+        results.plugins[plugin.name] = pluginResults
+        results.totalErrors += pluginResults.errors.length
+        results.registeredMcp += pluginResults.mcp.length
+        results.registeredSpecs += pluginResults.specs.length
+      }
+    } catch (err) {
+      results.totalErrors++
+    }
+  }
+  
+  // Register resources from server plugins (plugin_server:*)
+  const serverPluginKeys = await storage.listKeys("plugin_server:")
+  for (const key of serverPluginKeys) {
+    try {
+      const plugin = await storage.get(key)
+      if (plugin && plugin.manifest && plugin.manifest.server_resources) {
+        const pluginResults = await registerPluginResources(plugin.name, plugin.manifest.server_resources, "server")
+        results.plugins[plugin.name] = pluginResults
+        results.totalErrors += pluginResults.errors.length
+        results.registeredMcp += pluginResults.mcp.length
+        results.registeredSpecs += pluginResults.specs.length
+      }
+    } catch (err) {
+      results.totalErrors++
+    }
+  }
+  
+  return results
+}
+
+async function syncPluginResources() {
+  const storage = getStorage()
+  
+  // Get all currently registered plugin resources
+  const allMcpKeys = await storage.listKeys("mcp:")
+  const allSpecKeys = await storage.listKeys("spec:")
+  
+  // Filter for plugin resources (contain origin prefix)
+  const pluginMcpKeys = allMcpKeys.filter(k => k.split(':').length > 2)
+  const pluginSpecKeys = allSpecKeys.filter(k => k.split(':').length > 2)
+  
+  // Build set of expected resources from server storage (plugin_client:* and plugin_server:*)
+  const expectedMcpKeys = new Set()
+  const expectedSpecKeys = new Set()
+  
+  const clientPluginKeys = await storage.listKeys("plugin_client:")
+  const serverPluginKeys = await storage.listKeys("plugin_server:")
+  
+  // Read client plugins
+  for (const key of clientPluginKeys) {
+    try {
+      const plugin = await storage.get(key)
+      if (plugin && plugin.server_resources && plugin.client_id) {
+        if (plugin.server_resources.mcp) {
+          for (const mcp of plugin.server_resources.mcp) {
+            expectedMcpKeys.add(`mcp:cli:${plugin.client_id}:${plugin.name}:${mcp.name}`)
+          }
+        }
+        if (plugin.server_resources.specs) {
+          for (const spec of plugin.server_resources.specs) {
+            expectedSpecKeys.add(`spec:cli:${plugin.client_id}:${plugin.name}:${spec.name}`)
+          }
+        }
+      }
+    } catch (err) {
+      // Skip if plugin read fails
+    }
+  }
+  
+  // Read server plugins
+  for (const key of serverPluginKeys) {
+    try {
+      const plugin = await storage.get(key)
+      if (plugin && plugin.manifest && plugin.manifest.server_resources) {
+        if (plugin.manifest.server_resources.mcp) {
+          for (const mcp of plugin.manifest.server_resources.mcp) {
+            expectedMcpKeys.add(`mcp:server:${plugin.name}:${mcp.name}`)
+          }
+        }
+        if (plugin.manifest.server_resources.specs) {
+          for (const spec of plugin.manifest.server_resources.specs) {
+            expectedSpecKeys.add(`spec:server:${plugin.name}:${spec.name}`)
+          }
+        }
+      }
+    } catch (err) {
+      // Skip if plugin read fails
+    }
+  }
+  
+  // Remove orphaned resources (no longer in any installed plugin)
+  const cleanupResults = { removedMcp: [], removedSpecs: [], errors: [] }
+  
+  for (const key of pluginMcpKeys) {
+    if (!expectedMcpKeys.has(key)) {
+      try {
+        await storage.delete(key)
+        cleanupResults.removedMcp.push(key)
+      } catch (err) {
+        cleanupResults.errors.push(`Failed to remove orphaned MCP ${key}: ${err.message}`)
+      }
+    }
+  }
+  
+  for (const key of pluginSpecKeys) {
+    if (!expectedSpecKeys.has(key)) {
+      try {
+        await storage.delete(key)
+        cleanupResults.removedSpecs.push(key)
+      } catch (err) {
+        cleanupResults.errors.push(`Failed to remove orphaned spec ${key}: ${err.message}`)
+      }
+    }
+  }
+  
+  return cleanupResults
+}
+
+module.exports = {
+  registerPluginResources,
+  unregisterPluginResources,
+  registerAllPluginResources,
+  syncPluginResources
+}

package/server/services/pluginsService.js

@@ -1,6 +1,7 @@
 const crypto = require("crypto")
 const { getStorage } = require("../storage/adapter")
 const { bumpVersion } = require("./configService")
+const { registerPluginResources, unregisterPluginResources } = require("./pluginResourceService")
 
 const PLUGIN_PREFIX = "plugin_server:"
 const SETTINGS_KEY = "settings:plugins"
@@ -18,6 +19,8 @@ function defaultSettings() {
     max_zip_mb: 10,
     default_hooks_policy: "deny",
     admin_mode_enabled: false,
+    public_access: true,
+    api_keys: [],
   }
 }
 
@@ -119,6 +122,15 @@ async function updateSettings(patch = {}) {
   if (patch.admin_mode_enabled !== undefined) {
     next.admin_mode_enabled = patch.admin_mode_enabled === true || patch.admin_mode_enabled === "true"
   }
+  if (patch.public_access !== undefined) {
+    next.public_access = patch.public_access === true || patch.public_access === "true"
+  }
+  if (patch.api_keys !== undefined) {
+    if (!Array.isArray(patch.api_keys)) {
+      throw invalid("api_keys must be an array")
+    }
+    next.api_keys = patch.api_keys
+  }
   const storage = getStorage()
   await storage.set(SETTINGS_KEY, next)
   return next
@@ -194,6 +206,12 @@ async function upsertJsonPlugin(payload) {
   }
   const storage = getStorage()
   await storage.set(pluginKey(common.name), next)
+  
+  // Register server resources if present
+  if (manifest.server_resources) {
+    await registerPluginResources(common.name, manifest.server_resources, "server")
+  }
+  
   await bumpVersion()
   return toPublicPlugin(next)
 }
@@ -233,6 +251,12 @@ async function upsertZipPlugin(payload) {
   }
   const storage = getStorage()
   await storage.set(pluginKey(common.name), next)
+  
+  // Register server resources if present
+  if (manifest.server_resources) {
+    await registerPluginResources(common.name, manifest.server_resources, "server")
+  }
+  
   await bumpVersion()
   return toPublicPlugin(next)
 }

package/server/uploads/superbackend-openapi.json

@@ -0,0 +1,47 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Superbackend API",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "https://superbackend.coolify.intrane.fr"
+    }
+  ],
+  "paths": {
+    "/health": {
+      "get": {
+        "operationId": "getHealth",
+        "summary": "Health check endpoint",
+        "description": "Returns the health status of the backend service",
+        "responses": {
+          "200": {
+            "description": "Health status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "status": {
+                      "type": "string",
+                      "example": "ok"
+                    },
+                    "mode": {
+                      "type": "string",
+                      "example": "middleware"
+                    },
+                    "database": {
+                      "type": "string",
+                      "example": "connected"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/server/uploads/test-auth-openapi.json

@@ -0,0 +1,74 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Test Auth API",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost:3001"
+    }
+  ],
+  "paths": {
+    "/api/data": {
+      "get": {
+        "operationId": "getData",
+        "summary": "Get authenticated data",
+        "description": "Returns data when authenticated with Bearer token",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "type": "object"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "403": {
+            "description": "Forbidden"
+          }
+        }
+      }
+    },
+    "/api/key-data": {
+      "get": {
+        "operationId": "getKeyData",
+        "summary": "Get data with API key",
+        "description": "Returns data when authenticated with API key in X-Api-Key header",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    },
+                    "data": {
+                      "type": "object"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/server/uploads/test-auth-spec.json

@@ -0,0 +1,36 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Test Auth API",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "https://httpbin.org"
+    }
+  ],
+  "paths": {
+    "/bearer": {
+      "get": {
+        "operationId": "testBearerAuth",
+        "summary": "Test bearer auth",
+        "responses": {
+          "200": {
+            "description": "Returns authorization header"
+          }
+        }
+      }
+    },
+    "/headers": {
+      "get": {
+        "operationId": "testHeaderAuth",
+        "summary": "Returns request headers",
+        "responses": {
+          "200": {
+            "description": "Returns headers"
+          }
+        }
+      }
+    }
+  }
+}

package/server/views/adapters.ejs

@@ -25,6 +25,7 @@
         <tr><td colspan="5" class="px-6 py-12 text-center text-[#787774]">No adapters yet. Create one to get started.</td></tr>
       <% } %>
       <% adapters.forEach(a => { %>
+        <% if (!a.name) return; %>
         <tr class="border-b border-[#EAEAEA] hover:bg-[#F7F6F3] transition-colors">
           <td class="px-6 py-4">
             <div class="flex flex-col">

package/server/views/clients.ejs

@@ -0,0 +1,82 @@
+<%- include("partials/head", { title: "Clients" }) %>
+
+<div id="clients-app">
+  <div class="flex justify-between items-center mb-8">
+    <div>
+      <p class="text-xs uppercase tracking-[0.2em] text-[#787774] mb-1">Monitoring</p>
+      <h1 class="text-2xl editorial-heading text-[#111111]">Connected Clients</h1>
+      <p class="text-sm text-[#787774] mt-1">CLI clients that have synced plugin resources to this server</p>
+    </div>
+  </div>
+
+  <div class="bento-card">
+    <div v-if="clients.length === 0" class="p-12 text-center text-[#787774]">
+      No clients have synced yet.
+    </div>
+    
+    <table v-else class="min-w-full divide-y divide-[#EAEAEA]">
+      <thead class="bg-[#F7F6F3]">
+        <tr>
+          <th class="px-6 py-3 text-left text-xs font-semibold text-[#787774] uppercase tracking-wider">Client ID</th>
+          <th class="px-6 py-3 text-left text-xs font-semibold text-[#787774] uppercase tracking-wider">Last Seen</th>
+          <th class="px-6 py-3 text-left text-xs font-semibold text-[#787774] uppercase tracking-wider">Plugin Count</th>
+        </tr>
+      </thead>
+      <tbody class="bg-white divide-y divide-[#EAEAEA]">
+        <tr v-for="client in clients" :key="client.client_id" class="hover:bg-[#F7F6F3] transition-colors">
+          <td class="px-6 py-4">
+            <code class="mono-text text-sm text-[#1F6C9F]">{{ client.client_id.substring(0, 8) }}...</code>
+          </td>
+          <td class="px-6 py-4 text-sm text-[#2F3437]">
+            {{ formatLastSeen(client.last_seen) }}
+          </td>
+          <td class="px-6 py-4 text-sm text-[#2F3437]">
+            {{ client.plugin_count || 0 }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<script>
+  const { createApp } = Vue
+
+  createApp({
+    data() {
+      return {
+        clients: []
+      }
+    },
+    async mounted() {
+      await this.fetchClients()
+    },
+    methods: {
+      async fetchClients() {
+        try {
+          const r = await fetch('/api/plugins/clients?format=json')
+          const data = await r.json()
+          this.clients = data.clients || []
+        } catch (err) {
+          console.error('Failed to fetch clients:', err)
+        }
+      },
+      formatLastSeen(dateStr) {
+        if (!dateStr) return 'Never'
+        const date = new Date(dateStr)
+        const now = new Date()
+        const diffMs = now - date
+        const diffMins = Math.floor(diffMs / 60000)
+        const diffHours = Math.floor(diffMs / 3600000)
+        const diffDays = Math.floor(diffMs / 86400000)
+        
+        if (diffMins < 1) return 'Just now'
+        if (diffMins < 60) return `${diffMins} min ago`
+        if (diffHours < 24) return `${diffHours}h ago`
+        if (diffDays < 7) return `${diffDays}d ago`
+        return date.toLocaleDateString()
+      }
+    }
+  }).mount('#clients-app')
+</script>
+

package/server/views/docs.ejs

@@ -0,0 +1,7 @@
+<%- include("partials/head", { title: "Documentation" }) %>
+
+<div id="docs-container">
+  <%- bodyContent %>
+</div>
+
+<%- include("partials/foot") %>

package/server/views/jobs.ejs

@@ -34,10 +34,11 @@
           <th>Status</th>
           <th>Duration</th>
           <th>Timestamp</th>
+          <th>Client</th>
         </tr>
       </thead>
       <tbody>
-        <tr v-if="jobs.length===0"><td colspan="4" class="text-center opacity-60">No executions recorded yet.</td></tr>
+        <tr v-if="jobs.length===0"><td colspan="5" class="text-center opacity-60">No executions recorded yet.</td></tr>
         <tr v-for="j in jobs" :key="j._id">
           <td><code>{{ j.command }}</code></td>
           <td>
@@ -46,7 +47,15 @@
             </span>
           </td>
           <td>{{ j.duration_ms }}ms</td>
-          <td class="opacity-70">{{ new Date(j.timestamp).toLocaleString() }}</td>
+          <td class="opacity-70">
+            <span :title="new Date(j.timestamp).toLocaleString()" class="cursor-help">
+              {{ formatRelativeTime(j.timestamp) }}
+            </span>
+          </td>
+          <td class="opacity-70">
+            <code v-if="j.client_id" class="text-xs">{{ j.client_id.substring(0, 8) }}...</code>
+            <span v-else class="text-xs opacity-50">-</span>
+          </td>
         </tr>
       </tbody>
     </table>
@@ -64,6 +73,21 @@
       async loadStats() {
         const r = await fetch('/api/jobs/stats')
         this.stats = await r.json()
+      },
+      formatRelativeTime(dateStr) {
+        if (!dateStr) return 'Never'
+        const date = new Date(dateStr)
+        const now = new Date()
+        const diffMs = now - date
+        const diffMins = Math.floor(diffMs / 60000)
+        const diffHours = Math.floor(diffMs / 3600000)
+        const diffDays = Math.floor(diffMs / 86400000)
+
+        if (diffMins < 1) return 'Just now'
+        if (diffMins < 60) return `${diffMins}m ago`
+        if (diffHours < 24) return `${diffHours}h ago`
+        if (diffDays < 7) return `${diffDays}d ago`
+        return date.toLocaleDateString()
       }
     }
   }).mount('#jobs-app')

package/server/views/layout.ejs

@@ -88,29 +88,6 @@
 <body>
 
   <div class="flex min-h-screen">
-    <!-- Sidebar -->
-    <aside class="w-64 bg-white p-6 flex flex-col gap-2 border-r border-[#EAEAEA]">
-      <a href="/api/commands" class="text-xl editorial-heading px-3 py-2 mb-6 flex items-center gap-2">
-        <span>⚡</span> SUPERCLI
-      </a>
-      <a href="/" class="btn justify-start">Dashboard</a>
-      <a href="/api/commands" class="btn justify-start <%= typeof commands !== 'undefined' ? 'nav-active' : '' %>">
-        Commands
-      </a>
-      <a href="/api/specs" class="btn justify-start <%= typeof specs !== 'undefined' ? 'nav-active' : '' %>">
-        OpenAPI Specs
-      </a>
-      <a href="/api/mcp" class="btn justify-start <%= typeof servers !== 'undefined' ? 'nav-active' : '' %>">
-        MCP Servers
-      </a>
-      <a href="/api/jobs" class="btn justify-start <%= typeof jobs !== 'undefined' ? 'nav-active' : '' %>">
-        Jobs
-      </a>
-      <a href="/api/plugins" class="btn justify-start <%= typeof plugins !== 'undefined' ? 'nav-active' : '' %>">
-        Plugins
-      </a>
-    </aside>
-
     <!-- Main content -->
     <main class="flex-1 p-8 bg-[#FBFBFA]">
       <%- body %>