npm - go-duck-cli - Versions diffs - 1.4.10 → 1.4.12 - Mend

go-duck-cli 1.4.10 → 1.4.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/templates/go/router.go.hbs +278 -35

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",

package/templates/go/router.go.hbs CHANGED Viewed

@@ -40,6 +40,227 @@ import (
     "{{app_name}}/internal/search"
 )
+const compactWidgetHTML = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Live Telemetry</title>
+<style>
+  html, body { margin: 0; padding: 0; width: 100%; height: 100%; background: #121212; color: #fff; font-family: system-ui, sans-serif; overflow: hidden; }
+  .bento-grid { display: grid; grid-template-columns: 1fr 1fr; grid-template-rows: 1fr; gap: 8px; width: 100%; height: 100%; padding: 8px; box-sizing: border-box; }
+  .bento-card { background: #1e1e1e; border-radius: 12px; display: flex; flex-direction: column; justify-content: center; align-items: center; position: relative; border: 1px solid #333; transition: all 0.2s; }
+  .bento-title { position: absolute; top: 10px; left: 10px; font-size: 0.75rem; color: #888; text-transform: uppercase; letter-spacing: 1px; }
+  .bento-badge { position: absolute; top: 10px; right: 10px; font-size: 0.6rem; padding: 2px 6px; border-radius: 4px; background: #e74c3c; color: #fff; display: none; }
+  .bento-value { font-size: 2.5rem; font-weight: 700; color: #fff; margin-top: 15px; display: flex; align-items: baseline; gap: 4px; }
+  .bento-unit { font-size: 1rem; color: #888; font-weight: normal; }
+  .bento-sub { font-size: 0.75rem; color: #666; margin-top: 5px; }
+  @keyframes alarmFlash {
+    0% { background: #1e1e1e; border-color: #333; }
+    50% { background: rgba(231, 76, 60, 0.2); border-color: #e74c3c; box-shadow: 0 0 15px rgba(231, 76, 60, 0.4); }
+    100% { background: #1e1e1e; border-color: #333; }
+  }
+  .alarm-active { animation: alarmFlash 1s infinite; }
+</style>
+</head>
+<body>
+<div class="bento-grid">
+  <div class="bento-card" id="card-cpu">
+    <div class="bento-title" id="cpu-title">CPU</div>
+    <div class="bento-badge" id="cpu-badge">QUOTA</div>
+    <div class="bento-value"><span id="cpu-val">0</span><span class="bento-unit">%</span></div>
+  </div>
+  <div class="bento-card" id="card-mem">
+    <div class="bento-title">RAM</div>
+    <div class="bento-value"><span id="mem-val">0</span><span class="bento-unit">%</span></div>
+    <div class="bento-sub"><span id="mem-raw">0 / 0 MB</span></div>
+  </div>
+</div>
+<script>
+  // Apply custom background color if provided by Mission Control grid
+  const bg = new URLSearchParams(window.location.search).get('bg');
+  if (bg) {
+    document.body.style.background = bg;
+    document.querySelectorAll('.bento-card').forEach(c => {
+      c.style.background = 'transparent';
+      c.style.borderColor = 'rgba(255,255,255,0.1)';
+    });
+  }
+  const evtSource = new EventSource('/api/system/stream');
+  evtSource.addEventListener('metrics', function(e) {
+    const data = JSON.parse(e.data);
+    const sys = data.system;
+    // CPU
+    let cpuPct = 0;
+    if (sys.is_pod_cpu_limited) {
+      document.getElementById('cpu-title').innerText = 'CPU';
+      document.getElementById('cpu-badge').style.display = 'block';
+      cpuPct = sys.pod_cpu_limit_pct;
+    } else {
+      document.getElementById('cpu-title').innerText = 'PROCESS CPU';
+      document.getElementById('cpu-badge').style.display = 'none';
+      cpuPct = sys.process_cpu_usage;
+    }
+    document.getElementById('cpu-val').innerText = cpuPct.toFixed(1);
+    if (cpuPct > 90) document.getElementById('card-cpu').classList.add('alarm-active');
+    else document.getElementById('card-cpu').classList.remove('alarm-active');
+    // Memory
+    let memPct = 0;
+    if (sys.total_mem_mb > 0) {
+      memPct = (sys.heap_alloc_mb / sys.total_mem_mb) * 100;
+    }
+    document.getElementById('mem-val').innerText = memPct.toFixed(1);
+    document.getElementById('mem-raw').innerText = sys.heap_alloc_mb + " / " + sys.total_mem_mb + " MB";
+    if (memPct > 90) document.getElementById('card-mem').classList.add('alarm-active');
+    else document.getElementById('card-mem').classList.remove('alarm-active');
+  });
+  evtSource.onerror = function() {
+    document.getElementById('cpu-val').innerText = "OFF";
+    document.getElementById('mem-val').innerText = "OFF";
+    document.getElementById('mem-raw').innerText = "Disconnected";
+  };
+</script>
+</body>
+</html>`
+const gridWidgetHTML = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Mission Control Grid</title>
+<style>
+  html, body { margin: 0; padding: 0; width: 100%; height: 100%; background: #000; font-family: system-ui, sans-serif; overflow: auto; }
+  .dashboard { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); grid-auto-rows: minmax(30vh, 1fr); gap: 15px; padding: 15px; box-sizing: border-box; }
+  .grid-item { position: relative; width: 100%; height: 100%; background: #1a1a1a; border-radius: 12px; border: 1px solid #333; overflow: hidden; display: flex; flex-direction: column; transition: background 0.3s; }
+  .grid-header { display: flex; justify-content: space-between; align-items: center; padding: 8px 12px; background: rgba(0,0,0,0.4); border-bottom: 1px solid rgba(255,255,255,0.1); }
+  .grid-title { font-size: 0.85rem; font-weight: bold; color: #fff; text-transform: uppercase; letter-spacing: 1px; }
+  .grid-actions { display: flex; gap: 8px; align-items: center; }
+  .color-picker { width: 20px; height: 20px; padding: 0; border: none; border-radius: 4px; cursor: pointer; background: transparent; }
+  .close-btn { background: transparent; color: #888; border: none; font-size: 1.2rem; cursor: pointer; line-height: 1; transition: color 0.2s; }
+  .close-btn:hover { color: #e74c3c; }
+  .grid-item iframe { width: 100%; flex: 1; border: none; }
+  .add-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; cursor: pointer; transition: background 0.2s; color: #888; border: 2px dashed #444; border-radius: 12px; }
+  .add-item:hover { background: #222; color: #fff; border-color: #666; }
+  .add-icon { font-size: 3rem; font-weight: 300; margin-bottom: 10px; }
+</style>
+</head>
+<body>
+<div class="dashboard" id="dashboard">
+  <div class="add-item" id="add-btn" onclick="promptAddService()">
+    <div class="add-icon">+</div>
+    <div>Add Service</div>
+  </div>
+</div>
+<script>
+  let gridState = JSON.parse(localStorage.getItem('goduck_mission_control')) || [];
+  function saveState() {
+    localStorage.setItem('goduck_mission_control', JSON.stringify(gridState));
+  }
+  function renderGrid() {
+    // Clear all grid items except add button
+    document.querySelectorAll('.grid-item').forEach(el => el.remove());
+    // Add default widget if state is completely empty
+    if (gridState.length === 0) {
+      gridState.push({ id: 'default', name: '{{app_name}} (Host)', url: '/api/system/widget', color: '#1a1a1a' });
+      saveState();
+    }
+    const dash = document.getElementById('dashboard');
+    const addBtn = document.getElementById('add-btn');
+    gridState.forEach(widget => {
+      const wrapper = document.createElement('div');
+      wrapper.className = 'grid-item';
+      wrapper.style.backgroundColor = widget.color;
+      const header = document.createElement('div');
+      header.className = 'grid-header';
+      const title = document.createElement('div');
+      title.className = 'grid-title';
+      title.innerText = widget.name;
+      const actions = document.createElement('div');
+      actions.className = 'grid-actions';
+      const colorPicker = document.createElement('input');
+      colorPicker.type = 'color';
+      colorPicker.className = 'color-picker';
+      colorPicker.value = widget.color || '#1a1a1a';
+      colorPicker.title = 'Change Widget Color';
+      colorPicker.onchange = (e) => {
+        widget.color = e.target.value;
+        saveState();
+        renderGrid(); // Re-render to pass new color to iframe
+      };
+      const closeBtn = document.createElement('button');
+      closeBtn.className = 'close-btn';
+      closeBtn.innerHTML = '×';
+      closeBtn.title = 'Remove Widget';
+      closeBtn.onclick = () => {
+        if(confirm("Remove " + widget.name + " from Mission Control?")) {
+          gridState = gridState.filter(w => w.id !== widget.id);
+          saveState();
+          renderGrid();
+        }
+      };
+      actions.appendChild(colorPicker);
+      actions.appendChild(closeBtn);
+      header.appendChild(title);
+      header.appendChild(actions);
+      const iframe = document.createElement('iframe');
+      // Append color parameter to URL to theme the iframe natively
+      try {
+        const urlObj = new URL(widget.url, window.location.origin);
+        urlObj.searchParams.set('bg', widget.color);
+        iframe.src = urlObj.toString();
+      } catch (e) {
+        iframe.src = widget.url; // Fallback if URL is invalid
+      }
+      wrapper.appendChild(header);
+      wrapper.appendChild(iframe);
+      dash.insertBefore(wrapper, addBtn);
+    });
+  }
+  function promptAddService() {
+    const name = prompt("Enter a Name for this Service (e.g., 'Auth Service'):");
+    if (!name) return;
+    const url = prompt("Enter the remote widget URL:\\n(e.g., http://localhost:8081/api/system/widget)");
+    if (!url) return;
+    gridState.push({
+      id: Date.now().toString(),
+      name: name,
+      url: url,
+      color: '#1a1a1a'
+    });
+    saveState();
+    renderGrid();
+  }
+  // Initial render
+  renderGrid();
+</script>
+</body>
+</html>`
 func SetupRouter(appConfig *config.Config) *gin.Engine {
     // 1. Initialize Logging & Observability
     logger.InitLogger(appConfig)
@@ -232,45 +453,39 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
             c.Header("Connection", "keep-alive")
             c.Header("Access-Control-Allow-Origin", "*")
-            interval := appConfig.GoDuck.Telemetry.Metrics.StreamInterval
-            if interval == 0 {
-                interval = time.Second
-            }
+            clientChan := make(chan telemetry.AppMetrics, 100)
+            telemetry.GlobalMetricsBroker.AddClient(clientChan)
-            ticker := time.NewTicker(interval)
-            defer ticker.Stop()
+            defer func() {
+                telemetry.GlobalMetricsBroker.RemoveClient(clientChan)
+            }()
             c.Stream(func(w io.Writer) bool {
                 select {
                 case <-c.Request.Context().Done():
                     return false
-                case <-ticker.C:
-                    cpuPercent, _ := cpu.Percent(0, false)
-                    memStats, _ := mem.VirtualMemory()
-                    var cpuUsage float64
-                    if len(cpuPercent) > 0 {
-                        cpuUsage = cpuPercent[0]
-                    }
-                    // Simple load calculation
-                    loadPct := (cpuUsage + memStats.UsedPercent) / 2.0
-                    payload := map[string]interface{}{
-                        "timestamp": time.Now().Format(time.RFC3339),
-                        "cpu_percent": cpuUsage,
-                        "mem_percent": memStats.UsedPercent,
-                        "mem_used_mb": memStats.Used / 1024 / 1024,
-                        "mem_total_mb": memStats.Total / 1024 / 1024,
-                        "load_percentage": loadPct,
-                    }
-                    data, _ := json.Marshal(payload)
-                    c.SSEvent("message", string(data))
+                case appMetrics := <-clientChan:
+                    sysMetrics := telemetry.CollectSystemMetrics()
+                    c.SSEvent("metrics", gin.H{
+                        "system": sysMetrics,
+                        "endpoints": appMetrics.Endpoints,
+                        "status_codes": appMetrics.StatusCodes,
+                        "failed_calls": appMetrics.FailedCalls,
+                    })
                     return true
                 }
             })
         })
+        // Compact Bento Telemetry Widget
+        r.GET("/api/system/widget", func(c *gin.Context) {
+            c.Data(200, "text/html; charset=utf-8", []byte(compactWidgetHTML))
+        })
+        // Mission Control Iframe Grid
+        r.GET("/api/system/grid", func(c *gin.Context) {
+            c.Data(200, "text/html; charset=utf-8", []byte(gridWidgetHTML))
+        })
     }
     // Swagger Docs & UI
@@ -293,6 +508,15 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
     *, *:before, *:after { box-sizing: inherit; }
     body { margin:0; background: #fafafa; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; }
+    .nav-trigger-zone {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      height: 30px;
+      z-index: 999;
+    }
     .top-nav {
       background: rgba(255, 255, 255, 0.8);
       backdrop-filter: blur(10px);
@@ -302,11 +526,20 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      position: sticky;
-      top: 0;
+      position: fixed;
+      width: 100%;
+      top: -100px;
+      opacity: 0;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
       z-index: 1000;
       box-shadow: 0 4px 6px -1px rgba(0,0,0,0.05);
     }
+    .nav-trigger-zone:hover + .top-nav,
+    .top-nav:hover {
+      top: 0;
+      opacity: 1;
+    }
     .nav-brand {
       font-weight: 700;
@@ -579,7 +812,8 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
     .log-line.hidden { display: none; }
   </style>
 </head>
-<body>
+<body id="swagger-body">
+  <div class="nav-trigger-zone"></div>
   <div class="top-nav">
     <div class="nav-brand">
       <img src="/logo.png" alt="GO-DUCK Logo" style="height: 32px; width: auto;" />
@@ -600,6 +834,7 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
       <button id="logout-btn" class="btn btn-logout">Logout</button>
       <button id="mqtt-btn" class="btn" style="background: #2c3e50; color: white;">MQTT Topics</button>
       <button id="sys-metrics-btn" class="btn" style="background: #8e44ad; color: white;">System Metrics</button>
+      <button id="compact-widget-btn" class="btn" style="background: #27ae60; color: white; margin-right: 5px;" title="Open Mission Control Grid">Mission Control</button>
       <button id="live-logs-btn" class="btn" style="background: #d35400; color: white;" title="Stream Server Console Logs">Live Logs</button>
     </div>
   </div>
@@ -1305,7 +1540,7 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
       }
       document.getElementById('live-logs-btn').onclick = () => {
-        if (!keycloak.authenticated) {
+        if (!keycloak.authenticated && {{appConfig.GoDuck.Security.OIDC.Enabled}}) {
           alert('Please login to view Server Logs');
           return;
         }
@@ -1317,13 +1552,13 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
         // Connect SSE
         logsEventSource = new EventSource('/api/system/logs/stream');
-        logsEventSource.onmessage = function(event) {
+        logsEventSource.addEventListener('log', function(event) {
           // Remove connecting message on first log
           if (logBody.children.length === 1 && logBody.firstChild.innerText.includes('Connecting')) {
             logBody.innerHTML = '';
           }
           appendLogLine(event.data);
-        };
+        });
         logsEventSource.onerror = function() {
           appendLogLine('[SSE Error] Disconnected from log stream.');
@@ -1331,6 +1566,14 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
         };
       };
+      document.getElementById('compact-widget-btn').onclick = () => {
+        if (!keycloak.authenticated && {{appConfig.GoDuck.Security.OIDC.Enabled}}) {
+          alert('Please login to view system telemetry.');
+          return;
+        }
+        window.open('/api/system/grid', 'MissionControlGrid', 'width=800,height=600,menubar=no,toolbar=no,location=no,status=no');
+      };
       document.getElementById('live-logs-close').onclick = () => {
         liveLogsModal.style.display = 'none';
         if (logsEventSource) {