v1.2.49 - Fix: MEM% bar format (bar then MB), move CPU Core row after CPU Usage

api/index.html

@@ -112,6 +112,10 @@
                             <td>Process ID</td>
                             <td id="process-id">-</td>
                         </tr>
+                        <tr>
+                            <td>WebSocket Connections</td>
+                            <td id="websocket-connections">-</td>
+                        </tr>
                         <tr>
                             <td>Active Subscriptions</td>
                             <td id="active-subscriptions">-</td>
@@ -120,14 +124,14 @@
                             <td>Memory Usage</td>
                             <td id="memory-usage">-</td>
                         </tr>
-                        <tr>
-                            <td>CPU Core</td>
-                            <td id="cpu-core">-</td>
-                        </tr>
                         <tr>
                             <td>CPU Usage</td>
                             <td id="cpu-usage">-</td>
                         </tr>
+                        <tr>
+                            <td>CPU Core</td>
+                            <td id="cpu-core">-</td>
+                        </tr>
                         <tr>
                             <td>Oldest Event</td>
                             <td id="oldest-event">-</td>

api/index.js

@@ -4492,20 +4492,38 @@ function updateStatsFromCpuMonitoringEvent(monitoringData) {
         if (monitoringData.process_id !== undefined) {
             updateStatsCell('process-id', monitoringData.process_id.toString());
         }
+        if (monitoringData.active_connections !== undefined) {
+            updateStatsCell('websocket-connections', monitoringData.active_connections.toString());
+        }
 
         if (monitoringData.memory_usage_mb !== undefined) {
             updateStatsCell('memory-usage', monitoringData.memory_usage_mb.toFixed(1) + ' MB');
         }
 
+        // MEM% bar using memory_percent from server
+        if (monitoringData.memory_percent !== undefined) {
+            const memPct = Math.min(100, Math.max(0, monitoringData.memory_percent));
+            updateStatsCell('memory-usage', makeAsciiBar(memPct) + '  ' + monitoringData.memory_usage_mb.toFixed(1) + ' MB');
+        }
+
         if (monitoringData.current_cpu_core !== undefined) {
             updateStatsCell('cpu-core', 'Core ' + monitoringData.current_cpu_core);
         }
 
-        // Calculate CPU usage percentage if we have the data
+        // CPU% using delta between samples
         if (monitoringData.process_cpu_time !== undefined && monitoringData.system_cpu_time !== undefined) {
-            // For now, just show the raw process CPU time (simplified)
-            // In a real implementation, you'd calculate deltas over time
-            updateStatsCell('cpu-usage', monitoringData.process_cpu_time + ' ticks');
+            if (window._prevCpuSample) {
+                const procDelta = monitoringData.process_cpu_time - window._prevCpuSample.proc;
+                const sysDelta = monitoringData.system_cpu_time - window._prevCpuSample.sys;
+                if (sysDelta > 0) {
+                    const cpuPct = Math.min(100, Math.max(0, (procDelta / sysDelta) * 100));
+                    updateStatsCell('cpu-usage', makeAsciiBar(cpuPct));
+                }
+            }
+            window._prevCpuSample = {
+                proc: monitoringData.process_cpu_time,
+                sys: monitoringData.system_cpu_time
+            };
         }
 
     } catch (error) {
@@ -4895,6 +4913,13 @@ function formatTimestamp(timestamp) {
     return date.toLocaleString();
 }
 
+// Generate ASCII progress bar: [###############.....] 75%
+function makeAsciiBar(pct) {
+    const filled = Math.round(pct / 5); // 20 chars = 100%
+    const empty = 20 - filled;
+    return '[' + '#'.repeat(filled) + '.'.repeat(empty) + '] ' + pct.toFixed(1) + '%';
+}
+
 // Update statistics cell with flash animation if value changed
 function updateStatsCell(cellId, newValue) {
     const cell = document.getElementById(cellId);

relay.pid

@@ -1 +1 @@
-2380224
+2391505

src/api.c

@@ -13,6 +13,7 @@ extern void log_query_execution(const char* query_type, const char* sub_id,
 #include <pthread.h>
 #include <libwebsockets.h>
 #include <cjson/cJSON.h>
+int get_active_connection_count(void);
 #include <sqlite3.h>
 #include <time.h>
 #include <sys/stat.h>
@@ -1291,13 +1292,16 @@ cJSON* query_cpu_metrics(void) {
     pid_t pid = getpid();
     cJSON_AddNumberToObject(cpu_stats, "process_id", (double)pid);
 
-    // Get memory usage from /proc/self/status
+    // Get active WebSocket connection count
+    cJSON_AddNumberToObject(cpu_stats, "active_connections", (double)get_active_connection_count());
+
+    // Get memory usage from /proc/self/status and calculate MEM%
+    unsigned long rss_kb = 0;
     FILE* mem_stat = fopen("/proc/self/status", "r");
     if (mem_stat) {
         char line[256];
         while (fgets(line, sizeof(line), mem_stat)) {
             if (strncmp(line, "VmRSS:", 6) == 0) {
-                unsigned long rss_kb;
                 if (sscanf(line, "VmRSS: %lu kB", &rss_kb) == 1) {
                     double rss_mb = rss_kb / 1024.0;
                     cJSON_AddNumberToObject(cpu_stats, "memory_usage_mb", rss_mb);
@@ -1308,6 +1312,25 @@ cJSON* query_cpu_metrics(void) {
         fclose(mem_stat);
     }
 
+    // Get total system memory from /proc/meminfo for MEM%
+    if (rss_kb > 0) {
+        FILE* meminfo = fopen("/proc/meminfo", "r");
+        if (meminfo) {
+            char line[256];
+            while (fgets(line, sizeof(line), meminfo)) {
+                if (strncmp(line, "MemTotal:", 9) == 0) {
+                    unsigned long total_kb;
+                    if (sscanf(line, "MemTotal: %lu kB", &total_kb) == 1 && total_kb > 0) {
+                        double mem_pct = (rss_kb * 100.0) / total_kb;
+                        cJSON_AddNumberToObject(cpu_stats, "memory_percent", mem_pct);
+                    }
+                    break;
+                }
+            }
+            fclose(meminfo);
+        }
+    }
+
     return cpu_stats;
 }
 

src/main.h

@@ -13,8 +13,8 @@
 // Using CRELAY_ prefix to avoid conflicts with nostr_core_lib VERSION macros
 #define CRELAY_VERSION_MAJOR 1
 #define CRELAY_VERSION_MINOR 2
-#define CRELAY_VERSION_PATCH 44
-#define CRELAY_VERSION "v1.2.44"
+#define CRELAY_VERSION_PATCH 49
+#define CRELAY_VERSION "v1.2.49"
 
 // Relay metadata (authoritative source for NIP-11 information)
 #define RELAY_NAME "C-Relay"

src/websockets.c

@@ -130,6 +130,8 @@ static tracked_connection_t g_connections[MAX_TRACKED_CONNECTIONS];
 static int g_connection_count = 0;
 static pthread_mutex_t g_connections_lock = PTHREAD_MUTEX_INITIALIZER;
 
+int get_active_connection_count(void) { return g_connection_count; }
+
 static void connection_list_add(struct lws* wsi, struct per_session_data* pss) {
     pthread_mutex_lock(&g_connections_lock);
     for (int i = 0; i < MAX_TRACKED_CONNECTIONS; i++) {

src/websockets.h

@@ -96,6 +96,9 @@ struct per_session_data {
     int is_websocket;                         // 1 if this is a WebSocket connection, 0 for HTTP
 };
 
+// Get current active WebSocket connection count
+int get_active_connection_count(void);
+
 // NIP-11 HTTP session data structure for managing buffer lifetime
 struct nip11_session_data {
     int type; // 0 for NIP-11