feat(gateway): add system.sessionAnalytics usage snapshot RPC
This commit is contained in:
@@ -327,6 +327,65 @@ describe('system.tokenUsage handler', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('system.sessionAnalytics handler', () => {
|
||||
it('returns empty analytics when callback is not provided', async () => {
|
||||
const handlers = createSystemHandlers({
|
||||
startTime: Date.now(),
|
||||
version: '0.1.0',
|
||||
getSessionCount: () => 0,
|
||||
getToolCount: () => 0,
|
||||
getConnectionCount: () => 0,
|
||||
});
|
||||
|
||||
const req: GatewayRequest = { id: 3, method: 'system.sessionAnalytics' };
|
||||
const result = await handlers['system.sessionAnalytics'](req) as GatewayResponse;
|
||||
|
||||
expect(result.id).toBe(3);
|
||||
const r = result.result as {
|
||||
daily: unknown[];
|
||||
topSessions: unknown[];
|
||||
averageMessagesPerSession: number;
|
||||
totalSessions: number;
|
||||
totalMessages: number;
|
||||
};
|
||||
expect(r.daily).toEqual([]);
|
||||
expect(r.topSessions).toEqual([]);
|
||||
expect(r.averageMessagesPerSession).toBe(0);
|
||||
expect(r.totalSessions).toBe(0);
|
||||
expect(r.totalMessages).toBe(0);
|
||||
});
|
||||
|
||||
it('returns analytics from callback', async () => {
|
||||
const getSessionAnalytics = vi.fn(() => ({
|
||||
daily: [{ day: '2026-02-16', sessions: 2, messages: 8 }],
|
||||
topSessions: [{ sessionId: 'telegram:1', messages: 5, lastActivity: 1708080000 }],
|
||||
averageMessagesPerSession: 4,
|
||||
totalSessions: 2,
|
||||
totalMessages: 8,
|
||||
}));
|
||||
|
||||
const handlers = createSystemHandlers({
|
||||
startTime: Date.now(),
|
||||
version: '0.1.0',
|
||||
getSessionCount: () => 2,
|
||||
getToolCount: () => 0,
|
||||
getConnectionCount: () => 1,
|
||||
getSessionAnalytics,
|
||||
});
|
||||
|
||||
const req: GatewayRequest = {
|
||||
id: 4,
|
||||
method: 'system.sessionAnalytics',
|
||||
params: { days: 7, topLimit: 5 },
|
||||
};
|
||||
const result = await handlers['system.sessionAnalytics'](req) as GatewayResponse;
|
||||
|
||||
expect(getSessionAnalytics).toHaveBeenCalledWith({ days: 7, topLimit: 5 });
|
||||
expect(getPath(result.result, 'totalSessions')).toBe(2);
|
||||
expect(getPath(result.result, 'daily')).toEqual([{ day: '2026-02-16', sessions: 2, messages: 8 }]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('session handlers', () => {
|
||||
const mockHistory = [
|
||||
{ role: 'user' as const, content: 'hello' },
|
||||
|
||||
@@ -3,6 +3,7 @@ import { makeResponse, makeError, ErrorCode } from '../protocol.js';
|
||||
import type { MetricsSnapshot, EventEntry, ActiveRequestInfo } from '../metrics.js';
|
||||
import type { ServiceInfo } from './services.js';
|
||||
import type { NodeLocation, NodeStatus, NodePushToken } from './node.js';
|
||||
import type { SessionAnalyticsSnapshot } from '../../session/index.js';
|
||||
|
||||
/** Per-session token usage report returned by system.tokenUsage. */
|
||||
export interface TokenUsageEntry {
|
||||
@@ -64,6 +65,8 @@ export interface SystemHandlerDeps {
|
||||
getTokenUsage?: () => TokenUsageEntry[];
|
||||
/** Optional callback to retrieve aggregated metrics snapshot. */
|
||||
getMetrics?: () => MetricsSnapshot;
|
||||
/** Optional callback to retrieve session analytics. */
|
||||
getSessionAnalytics?: (opts?: { days?: number; topLimit?: number }) => SessionAnalyticsSnapshot;
|
||||
/** Optional callback to retrieve recent events. */
|
||||
getEvents?: (opts?: { level?: string; limit?: number }) => EventEntry[];
|
||||
/** Optional callback to retrieve active requests. */
|
||||
@@ -206,6 +209,24 @@ export function createSystemHandlers(deps: SystemHandlerDeps) {
|
||||
return makeResponse(request.id, deps.getMetrics());
|
||||
},
|
||||
|
||||
'system.sessionAnalytics': async (request: GatewayRequest): Promise<OutboundMessage> => {
|
||||
if (!deps.getSessionAnalytics) {
|
||||
return makeResponse(request.id, {
|
||||
daily: [],
|
||||
topSessions: [],
|
||||
averageMessagesPerSession: 0,
|
||||
totalSessions: 0,
|
||||
totalMessages: 0,
|
||||
});
|
||||
}
|
||||
const params = request.params as { days?: number; topLimit?: number } | undefined;
|
||||
const snapshot = deps.getSessionAnalytics({
|
||||
days: params?.days,
|
||||
topLimit: params?.topLimit,
|
||||
});
|
||||
return makeResponse(request.id, snapshot);
|
||||
},
|
||||
|
||||
'system.events': async (request: GatewayRequest): Promise<OutboundMessage> => {
|
||||
if (!deps.getEvents) {
|
||||
return makeResponse(request.id, { events: [] });
|
||||
|
||||
@@ -190,6 +190,7 @@ export class GatewayServer {
|
||||
getSessionCount: () => this.sessionBridge.listSessions().length,
|
||||
getToolCount: () => this.config.toolRegistry.list().length,
|
||||
getConnectionCount: () => this.sessionBridge.connectionCount,
|
||||
getSessionAnalytics: ({ days, topLimit } = {}) => this.config.sessionManager.getSessionAnalytics({ days, topLimit }),
|
||||
restart: this.config.restart,
|
||||
getChannels: channelRegistry
|
||||
? () => channelRegistry.list().map(a => ({ name: a.name, status: a.status }))
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export { SessionStore, parseDuration } from './store.js';
|
||||
export type { SessionAnalyticsSnapshot, SessionDailyAnalyticsRow, SessionTopAnalyticsRow } from './store.js';
|
||||
export { SessionManager, ManagedSession, type Session } from './manager.js';
|
||||
export { SessionIndexer, tokenize } from './indexer.js';
|
||||
export type { HistoryMetadata, HistoryIndexerConfig } from './indexer.js';
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import type { Message } from '../models/types.js';
|
||||
import type { SessionStore } from './store.js';
|
||||
import type { SessionAnalyticsSnapshot } from './store.js';
|
||||
import { auditLogger } from '../audit/index.js';
|
||||
import { SessionIndexer } from './indexer.js';
|
||||
import { SessionSearch, type HistorySearchResult } from './search.js';
|
||||
@@ -206,4 +207,14 @@ export class SessionManager {
|
||||
}
|
||||
return rows.length;
|
||||
}
|
||||
|
||||
getSessionAnalytics(opts?: { days?: number; topLimit?: number; nowMs?: number }): SessionAnalyticsSnapshot {
|
||||
const nowMs = opts?.nowMs ?? Date.now();
|
||||
const days = opts?.days ?? 30;
|
||||
const sinceTimestamp = Math.floor((nowMs - (days * 86_400_000)) / 1000);
|
||||
return this.store.getSessionAnalytics({
|
||||
sinceTimestamp,
|
||||
topLimit: opts?.topLimit ?? 10,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,29 @@ describe('SessionStore', () => {
|
||||
expect(sessions).toContain('session-b');
|
||||
});
|
||||
|
||||
it('computes session analytics snapshot', () => {
|
||||
const nowMs = Date.parse('2026-02-16T12:00:00.000Z');
|
||||
const nowSec = Math.floor(nowMs / 1000);
|
||||
const yesterdaySec = nowSec - 86_400;
|
||||
|
||||
store.addMessage('session-a', { role: 'user', content: 'A1', timestamp: nowMs });
|
||||
store.addMessage('session-a', { role: 'assistant', content: 'A2', timestamp: nowMs + 1000 });
|
||||
store.addMessage('session-b', { role: 'user', content: 'B1', timestamp: nowMs });
|
||||
store.addMessage('session-c', { role: 'user', content: 'C1', timestamp: yesterdaySec * 1000 });
|
||||
|
||||
const snapshot = store.getSessionAnalytics({
|
||||
sinceTimestamp: yesterdaySec,
|
||||
topLimit: 2,
|
||||
});
|
||||
|
||||
expect(snapshot.totalSessions).toBe(3);
|
||||
expect(snapshot.totalMessages).toBe(4);
|
||||
expect(snapshot.averageMessagesPerSession).toBeCloseTo(1.33, 2);
|
||||
expect(snapshot.topSessions).toHaveLength(2);
|
||||
expect(snapshot.topSessions[0]?.sessionId).toBe('session-a');
|
||||
expect(snapshot.daily.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('stores and retrieves message metadata for indexed history', () => {
|
||||
const indexer = new SessionIndexer({ maxKeywords: 5 });
|
||||
const metadata = indexer.indexText('deploy backend release');
|
||||
|
||||
@@ -12,6 +12,26 @@ export function parseDuration(s: string): number | null {
|
||||
return unit === 'h' ? Number(n) * 3600_000 : Number(n) * 86_400_000;
|
||||
}
|
||||
|
||||
export interface SessionDailyAnalyticsRow {
|
||||
day: string;
|
||||
sessions: number;
|
||||
messages: number;
|
||||
}
|
||||
|
||||
export interface SessionTopAnalyticsRow {
|
||||
sessionId: string;
|
||||
messages: number;
|
||||
lastActivity: number;
|
||||
}
|
||||
|
||||
export interface SessionAnalyticsSnapshot {
|
||||
daily: SessionDailyAnalyticsRow[];
|
||||
topSessions: SessionTopAnalyticsRow[];
|
||||
averageMessagesPerSession: number;
|
||||
totalSessions: number;
|
||||
totalMessages: number;
|
||||
}
|
||||
|
||||
export class SessionStore {
|
||||
private db: Database.Database;
|
||||
|
||||
@@ -267,4 +287,66 @@ export class SessionStore {
|
||||
updateMessageMetadata(messageId: number, metadata: HistoryMetadata): void {
|
||||
this.db.prepare('UPDATE messages SET metadata = ? WHERE id = ?').run(JSON.stringify(metadata), messageId);
|
||||
}
|
||||
|
||||
getSessionAnalytics(opts: { sinceTimestamp: number; topLimit?: number }): SessionAnalyticsSnapshot {
|
||||
const since = opts.sinceTimestamp;
|
||||
const topLimit = opts.topLimit ?? 10;
|
||||
|
||||
const dailyRows = this.db.prepare(`
|
||||
SELECT
|
||||
date(created_at, 'unixepoch') AS day,
|
||||
COUNT(DISTINCT session_id) AS sessions,
|
||||
COUNT(*) AS messages
|
||||
FROM messages
|
||||
WHERE created_at >= ?
|
||||
GROUP BY day
|
||||
ORDER BY day DESC
|
||||
`).all(since) as Array<{ day: string; sessions: number; messages: number }>;
|
||||
|
||||
const topRows = this.db.prepare(`
|
||||
SELECT
|
||||
session_id,
|
||||
COUNT(*) AS messages,
|
||||
MAX(created_at) AS last_activity
|
||||
FROM messages
|
||||
WHERE created_at >= ?
|
||||
GROUP BY session_id
|
||||
ORDER BY messages DESC, last_activity DESC
|
||||
LIMIT ?
|
||||
`).all(since, topLimit) as Array<{ session_id: string; messages: number; last_activity: number }>;
|
||||
|
||||
const totalMessagesRow = this.db.prepare(`
|
||||
SELECT COUNT(*) AS total_messages
|
||||
FROM messages
|
||||
WHERE created_at >= ?
|
||||
`).get(since) as { total_messages: number };
|
||||
|
||||
const totalSessionsRow = this.db.prepare(`
|
||||
SELECT COUNT(DISTINCT session_id) AS total_sessions
|
||||
FROM messages
|
||||
WHERE created_at >= ?
|
||||
`).get(since) as { total_sessions: number };
|
||||
|
||||
const totalMessages = totalMessagesRow.total_messages ?? 0;
|
||||
const totalSessions = totalSessionsRow.total_sessions ?? 0;
|
||||
const averageMessagesPerSession = totalSessions > 0
|
||||
? Math.round((totalMessages / totalSessions) * 100) / 100
|
||||
: 0;
|
||||
|
||||
return {
|
||||
daily: dailyRows.map((row) => ({
|
||||
day: row.day,
|
||||
sessions: row.sessions,
|
||||
messages: row.messages,
|
||||
})),
|
||||
topSessions: topRows.map((row) => ({
|
||||
sessionId: row.session_id,
|
||||
messages: row.messages,
|
||||
lastActivity: row.last_activity,
|
||||
})),
|
||||
averageMessagesPerSession,
|
||||
totalSessions,
|
||||
totalMessages,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user