feat: RHS panel initial fetch, floating widget, session cleanup (#5)
Phase 1: Fix RHS panel to fetch existing sessions on mount - Add initial API fetch in useAllStatusUpdates() hook - Allow GET /sessions endpoint without shared secret auth - RHS panel now shows sessions after page refresh Phase 2: Floating widget component (registerRootComponent) - New floating_widget.tsx with auto-show/hide behavior - Draggable, collapsible to pulsing dot with session count - Shows last 5 lines of most recent active session - Position persisted to localStorage - CSS styles using Mattermost theme variables Phase 3: Session cleanup and KV optimization - Add LastUpdateMs field to SessionData for staleness tracking - Set LastUpdateMs on session create and update - Add periodic cleanup goroutine (every 5 min) - Stale active sessions (>30 min no update) marked interrupted - Expired non-active sessions (>1 hr) deleted from KV - Add ListAllSessions and keep ListActiveSessions as helper - Add debug logging to daemon file polling Closes #5
This commit is contained in:
sol
197
plugin/webapp/src/components/floating_widget.tsx
Normal file
197
plugin/webapp/src/components/floating_widget.tsx
Normal file
@@ -0,0 +1,197 @@
|
||||
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
||||
import { LiveStatusData } from '../types';
|
||||
import StatusLine from './status_line';
|
||||
|
||||
const STORAGE_KEY = 'livestatus_widget_pos';
|
||||
const AUTO_HIDE_DELAY = 5000; // 5s after all sessions complete
|
||||
|
||||
const FloatingWidget: React.FC = () => {
|
||||
const [sessions, setSessions] = useState<Record<string, LiveStatusData>>({});
|
||||
const [collapsed, setCollapsed] = useState(true);
|
||||
const [visible, setVisible] = useState(false);
|
||||
const [position, setPosition] = useState(() => {
|
||||
try {
|
||||
const saved = localStorage.getItem(STORAGE_KEY);
|
||||
if (saved) return JSON.parse(saved);
|
||||
} catch {}
|
||||
return { right: 20, bottom: 80 };
|
||||
});
|
||||
const [dragging, setDragging] = useState(false);
|
||||
const dragRef = useRef<{ startX: number; startY: number; startRight: number; startBottom: number } | null>(null);
|
||||
const hideTimerRef = useRef<number | null>(null);
|
||||
const widgetRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Subscribe to updates (same pattern as RHS panel)
|
||||
useEffect(() => {
|
||||
const key = '__floating_widget__';
|
||||
if (!window.__livestatus_listeners[key]) {
|
||||
window.__livestatus_listeners[key] = [];
|
||||
}
|
||||
|
||||
const listener = () => {
|
||||
setSessions({ ...(window.__livestatus_updates || {}) });
|
||||
};
|
||||
|
||||
window.__livestatus_listeners[key].push(listener);
|
||||
|
||||
// Polling fallback
|
||||
const interval = setInterval(() => {
|
||||
setSessions(prev => {
|
||||
const current = window.__livestatus_updates || {};
|
||||
const prevKeys = Object.keys(prev).sort().join(',');
|
||||
const currKeys = Object.keys(current).sort().join(',');
|
||||
if (prevKeys !== currKeys) return { ...current };
|
||||
for (const k of Object.keys(current)) {
|
||||
if (current[k] !== prev[k]) return { ...current };
|
||||
}
|
||||
return prev;
|
||||
});
|
||||
}, 2000);
|
||||
|
||||
return () => {
|
||||
clearInterval(interval);
|
||||
const listeners = window.__livestatus_listeners[key];
|
||||
if (listeners) {
|
||||
const idx = listeners.indexOf(listener);
|
||||
if (idx >= 0) listeners.splice(idx, 1);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
// Auto-show/hide logic
|
||||
useEffect(() => {
|
||||
const entries = Object.values(sessions);
|
||||
const hasActive = entries.some(s => s.status === 'active');
|
||||
|
||||
if (hasActive) {
|
||||
// Clear any pending hide timer
|
||||
if (hideTimerRef.current) {
|
||||
clearTimeout(hideTimerRef.current);
|
||||
hideTimerRef.current = null;
|
||||
}
|
||||
setVisible(true);
|
||||
} else if (visible && entries.length > 0) {
|
||||
// All done - hide after delay
|
||||
if (!hideTimerRef.current) {
|
||||
hideTimerRef.current = window.setTimeout(() => {
|
||||
setVisible(false);
|
||||
setCollapsed(true);
|
||||
hideTimerRef.current = null;
|
||||
}, AUTO_HIDE_DELAY);
|
||||
}
|
||||
}
|
||||
}, [sessions, visible]);
|
||||
|
||||
// Save position to localStorage
|
||||
useEffect(() => {
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(position));
|
||||
} catch {}
|
||||
}, [position]);
|
||||
|
||||
// Drag handlers
|
||||
const onMouseDown = useCallback((e: React.MouseEvent) => {
|
||||
e.preventDefault();
|
||||
dragRef.current = {
|
||||
startX: e.clientX,
|
||||
startY: e.clientY,
|
||||
startRight: position.right,
|
||||
startBottom: position.bottom,
|
||||
};
|
||||
setDragging(true);
|
||||
}, [position]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!dragging) return;
|
||||
|
||||
const onMouseMove = (e: MouseEvent) => {
|
||||
if (!dragRef.current) return;
|
||||
const dx = dragRef.current.startX - e.clientX;
|
||||
const dy = dragRef.current.startY - e.clientY;
|
||||
setPosition({
|
||||
right: Math.max(0, dragRef.current.startRight + dx),
|
||||
bottom: Math.max(0, dragRef.current.startBottom + dy),
|
||||
});
|
||||
};
|
||||
|
||||
const onMouseUp = () => {
|
||||
setDragging(false);
|
||||
dragRef.current = null;
|
||||
};
|
||||
|
||||
document.addEventListener('mousemove', onMouseMove);
|
||||
document.addEventListener('mouseup', onMouseUp);
|
||||
return () => {
|
||||
document.removeEventListener('mousemove', onMouseMove);
|
||||
document.removeEventListener('mouseup', onMouseUp);
|
||||
};
|
||||
}, [dragging]);
|
||||
|
||||
if (!visible) return null;
|
||||
|
||||
const entries = Object.values(sessions);
|
||||
const activeSessions = entries.filter(s => s.status === 'active');
|
||||
const displaySession = activeSessions[0] || entries[entries.length - 1];
|
||||
const activeCount = activeSessions.length;
|
||||
|
||||
// Collapsed = pulsing dot with count
|
||||
if (collapsed) {
|
||||
return (
|
||||
<div
|
||||
ref={widgetRef}
|
||||
className="ls-widget-collapsed"
|
||||
style={{ right: position.right, bottom: position.bottom }}
|
||||
onClick={() => setCollapsed(false)}
|
||||
title={`${activeCount} active agent session${activeCount !== 1 ? 's' : ''}`}
|
||||
>
|
||||
<span className="ls-live-dot" />
|
||||
{activeCount > 0 && <span className="ls-widget-count">{activeCount}</span>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Expanded view
|
||||
return (
|
||||
<div
|
||||
ref={widgetRef}
|
||||
className="ls-widget-expanded"
|
||||
style={{ right: position.right, bottom: position.bottom }}
|
||||
>
|
||||
<div className="ls-widget-header" onMouseDown={onMouseDown}>
|
||||
<span className="ls-widget-title">
|
||||
{activeCount > 0 && <span className="ls-live-dot" />}
|
||||
Agent Status
|
||||
{activeCount > 0 && ` (${activeCount})`}
|
||||
</span>
|
||||
<button className="ls-widget-collapse-btn" onClick={() => setCollapsed(true)}>_</button>
|
||||
<button className="ls-widget-close-btn" onClick={() => setVisible(false)}>×</button>
|
||||
</div>
|
||||
<div className="ls-widget-body">
|
||||
{displaySession ? (
|
||||
<div className="ls-widget-session">
|
||||
<div className="ls-widget-session-header">
|
||||
<span className="ls-agent-badge">{displaySession.agent_id}</span>
|
||||
<span className={`ls-status-badge ls-status-${displaySession.status}`}>
|
||||
{displaySession.status.toUpperCase()}
|
||||
</span>
|
||||
</div>
|
||||
<div className="ls-widget-lines">
|
||||
{displaySession.lines.slice(-5).map((line, i) => (
|
||||
<StatusLine key={i} line={line} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="ls-widget-empty">No sessions</div>
|
||||
)}
|
||||
{activeSessions.length > 1 && (
|
||||
<div className="ls-widget-more">
|
||||
+{activeSessions.length - 1} more active
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default FloatingWidget;
|
||||
@@ -12,6 +12,30 @@ function useAllStatusUpdates(): Record<string, LiveStatusData> {
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
// Initial fetch of existing sessions from the plugin API.
|
||||
// Uses credentials: 'include' so Mattermost session cookies are forwarded.
|
||||
// The server allows unauthenticated GET /sessions for MM-authenticated users.
|
||||
fetch('/plugins/com.openclaw.livestatus/api/v1/sessions', {
|
||||
credentials: 'include',
|
||||
})
|
||||
.then((res) => res.json())
|
||||
.then((fetchedSessions: LiveStatusData[]) => {
|
||||
if (Array.isArray(fetchedSessions)) {
|
||||
const updates: Record<string, LiveStatusData> = {};
|
||||
fetchedSessions.forEach((s) => {
|
||||
const key = s.post_id || s.session_key;
|
||||
updates[key] = s;
|
||||
});
|
||||
// Merge: WebSocket data (already in window) takes precedence over fetched data
|
||||
window.__livestatus_updates = {
|
||||
...updates,
|
||||
...window.__livestatus_updates,
|
||||
};
|
||||
setSessions({ ...window.__livestatus_updates });
|
||||
}
|
||||
})
|
||||
.catch((err) => console.warn('[LiveStatus] Failed to fetch initial sessions:', err));
|
||||
|
||||
// Register a global listener that catches all updates
|
||||
const globalKey = '__rhs_panel__';
|
||||
if (!window.__livestatus_listeners[globalKey]) {
|
||||
|
||||
@@ -2,6 +2,7 @@ import React from 'react';
|
||||
import { PluginRegistry, WebSocketPayload, LiveStatusData } from './types';
|
||||
import LiveStatusPost from './components/live_status_post';
|
||||
import RHSPanel from './components/rhs_panel';
|
||||
import FloatingWidget from './components/floating_widget';
|
||||
import './styles/live_status.css';
|
||||
|
||||
const PLUGIN_ID = 'com.openclaw.livestatus';
|
||||
@@ -37,6 +38,9 @@ class LiveStatusPlugin {
|
||||
tooltipText: 'Toggle Agent Status panel',
|
||||
});
|
||||
|
||||
// Register floating widget as root component (always rendered)
|
||||
registry.registerRootComponent(FloatingWidget);
|
||||
|
||||
// Register WebSocket event handler
|
||||
registry.registerWebSocketEventHandler(WS_EVENT, (msg: any) => {
|
||||
const data = msg.data as WebSocketPayload;
|
||||
@@ -68,6 +72,12 @@ class LiveStatusPlugin {
|
||||
if (rhsListeners) {
|
||||
rhsListeners.forEach((fn) => fn(update));
|
||||
}
|
||||
|
||||
// Notify floating widget listener
|
||||
const widgetListeners = window.__livestatus_listeners['__floating_widget__'];
|
||||
if (widgetListeners) {
|
||||
widgetListeners.forEach((fn) => fn(update));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -305,3 +305,141 @@
|
||||
letter-spacing: 0.5px;
|
||||
color: var(--center-channel-color-48, rgba(0, 0, 0, 0.48));
|
||||
}
|
||||
|
||||
/* ========= Floating Widget Styles ========= */
|
||||
|
||||
.ls-widget-collapsed {
|
||||
position: fixed;
|
||||
z-index: 9999;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
padding: 8px;
|
||||
background: var(--center-channel-bg, #fff);
|
||||
border: 1px solid var(--center-channel-color-16, rgba(0, 0, 0, 0.16));
|
||||
border-radius: 50%;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
|
||||
transition: transform 0.2s;
|
||||
}
|
||||
|
||||
.ls-widget-collapsed:hover {
|
||||
transform: scale(1.1);
|
||||
}
|
||||
|
||||
.ls-widget-collapsed .ls-live-dot {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.ls-widget-count {
|
||||
position: absolute;
|
||||
top: -4px;
|
||||
right: -4px;
|
||||
background: #f44336;
|
||||
color: #fff;
|
||||
font-size: 10px;
|
||||
font-weight: 700;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.ls-widget-expanded {
|
||||
position: fixed;
|
||||
z-index: 9999;
|
||||
width: 320px;
|
||||
max-height: 300px;
|
||||
background: var(--center-channel-bg, #fff);
|
||||
border: 1px solid var(--center-channel-color-16, rgba(0, 0, 0, 0.16));
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
|
||||
}
|
||||
|
||||
.ls-widget-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 8px 10px;
|
||||
background: var(--center-channel-color-04, rgba(0, 0, 0, 0.04));
|
||||
border-bottom: 1px solid var(--center-channel-color-08, rgba(0, 0, 0, 0.08));
|
||||
cursor: grab;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.ls-widget-header:active {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.ls-widget-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.ls-widget-collapse-btn,
|
||||
.ls-widget-close-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
color: var(--center-channel-color-56, rgba(0, 0, 0, 0.56));
|
||||
padding: 2px 6px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.ls-widget-collapse-btn:hover,
|
||||
.ls-widget-close-btn:hover {
|
||||
background: var(--center-channel-color-08, rgba(0, 0, 0, 0.08));
|
||||
}
|
||||
|
||||
.ls-widget-body {
|
||||
padding: 8px;
|
||||
overflow-y: auto;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.ls-widget-session {
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.ls-widget-session-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.ls-widget-lines {
|
||||
font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
|
||||
font-size: 11px;
|
||||
line-height: 1.5;
|
||||
background: var(--center-channel-color-04, rgba(0, 0, 0, 0.04));
|
||||
border-radius: 4px;
|
||||
padding: 6px 8px;
|
||||
max-height: 150px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.ls-widget-empty {
|
||||
color: var(--center-channel-color-48, rgba(0, 0, 0, 0.48));
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.ls-widget-more {
|
||||
font-size: 11px;
|
||||
color: var(--center-channel-color-48, rgba(0, 0, 0, 0.48));
|
||||
text-align: center;
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
@@ -47,6 +47,7 @@ export interface PluginRegistry {
|
||||
dropdownText: string;
|
||||
tooltipText: string;
|
||||
}): string;
|
||||
registerRootComponent(component: React.ComponentType): string;
|
||||
}
|
||||
|
||||
export interface Post {
|
||||
|
||||
Reference in New Issue
Block a user