Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10ae8990e9 |
@@ -395,6 +395,7 @@
|
|||||||
<div id="memory-connections-panel" class="memory-connections-panel" style="display:none;" aria-label="Memory Connections Panel"></div>
|
<div id="memory-connections-panel" class="memory-connections-panel" style="display:none;" aria-label="Memory Connections Panel"></div>
|
||||||
|
|
||||||
<script src="./boot.js"></script>
|
<script src="./boot.js"></script>
|
||||||
|
<script src="./js/mempalace-fleet-poller.js"></script>
|
||||||
<script>
|
<script>
|
||||||
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
||||||
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
||||||
|
|||||||
224
js/mempalace-fleet-poller.js
Normal file
224
js/mempalace-fleet-poller.js
Normal file
@@ -0,0 +1,224 @@
|
|||||||
|
/**
|
||||||
|
* MemPalace Fleet API Polling
|
||||||
|
* Issue #1602: fix: restore MemPalace Fleet API polling (BURN mode improvement)
|
||||||
|
*
|
||||||
|
* Restores Fleet API polling logic that was removed in nightly BURN mode update.
|
||||||
|
* Also restores missing formatBytes utility.
|
||||||
|
*/
|
||||||
|
|
||||||
|
class MemPalaceFleetPoller {
|
||||||
|
constructor(options = {}) {
|
||||||
|
this.apiBase = options.apiBase || this.detectApiBase();
|
||||||
|
this.pollInterval = options.pollInterval || 30000; // 30 seconds
|
||||||
|
this.pollTimer = null;
|
||||||
|
this.lastStats = null;
|
||||||
|
this.isPolling = false;
|
||||||
|
|
||||||
|
// UI elements
|
||||||
|
this.statusEl = document.getElementById('mem-palace-status');
|
||||||
|
this.ratioEl = document.getElementById('compression-ratio');
|
||||||
|
this.docsEl = document.getElementById('docs-mined');
|
||||||
|
this.sizeEl = document.getElementById('aaak-size');
|
||||||
|
|
||||||
|
// Bind methods
|
||||||
|
this.startPolling = this.startPolling.bind(this);
|
||||||
|
this.stopPolling = this.stopPolling.bind(this);
|
||||||
|
this.poll = this.poll.bind(this);
|
||||||
|
this.fetchStats = this.fetchStats.bind(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detect API base URL from current location or URL params
|
||||||
|
*/
|
||||||
|
detectApiBase() {
|
||||||
|
const params = new URLSearchParams(window.location.search);
|
||||||
|
const override = params.get('mempalace');
|
||||||
|
|
||||||
|
if (override) {
|
||||||
|
return `http://${override}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default: same host, port 7771
|
||||||
|
return `${window.location.protocol}//${window.location.hostname}:7771`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start polling the Fleet API
|
||||||
|
*/
|
||||||
|
startPolling() {
|
||||||
|
if (this.isPolling) {
|
||||||
|
console.warn('[MemPalace] Already polling');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[MemPalace] Starting Fleet API polling every ${this.pollInterval / 1000}s`);
|
||||||
|
console.log(`[MemPalace] API base: ${this.apiBase}`);
|
||||||
|
|
||||||
|
this.isPolling = true;
|
||||||
|
|
||||||
|
// Initial fetch
|
||||||
|
this.poll();
|
||||||
|
|
||||||
|
// Set up interval
|
||||||
|
this.pollTimer = setInterval(this.poll, this.pollInterval);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop polling
|
||||||
|
*/
|
||||||
|
stopPolling() {
|
||||||
|
if (this.pollTimer) {
|
||||||
|
clearInterval(this.pollTimer);
|
||||||
|
this.pollTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isPolling = false;
|
||||||
|
console.log('[MemPalace] Stopped Fleet API polling');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Poll the Fleet API for updates
|
||||||
|
*/
|
||||||
|
async poll() {
|
||||||
|
try {
|
||||||
|
const stats = await this.fetchStats();
|
||||||
|
this.updateUI(stats);
|
||||||
|
this.lastStats = stats;
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('[MemPalace] Fleet API poll failed:', error.message);
|
||||||
|
this.updateUI(null); // Show disconnected state
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch stats from Fleet API
|
||||||
|
*/
|
||||||
|
async fetchStats() {
|
||||||
|
// Fetch health
|
||||||
|
const healthRes = await fetch(`${this.apiBase}/health`);
|
||||||
|
if (!healthRes.ok) {
|
||||||
|
throw new Error(`Health check failed: ${healthRes.status}`);
|
||||||
|
}
|
||||||
|
const health = await healthRes.json();
|
||||||
|
|
||||||
|
// Fetch wings
|
||||||
|
const wingsRes = await fetch(`${this.apiBase}/wings`);
|
||||||
|
const wings = wingsRes.ok ? await wingsRes.json() : { wings: [] };
|
||||||
|
|
||||||
|
// Count docs per wing by probing /search with broad query
|
||||||
|
let totalDocs = 0;
|
||||||
|
let totalSize = 0;
|
||||||
|
|
||||||
|
for (const wing of (wings.wings || [])) {
|
||||||
|
try {
|
||||||
|
const sr = await fetch(`${this.apiBase}/search?q=*&wing=${wing}&n=1`);
|
||||||
|
if (sr.ok) {
|
||||||
|
const sd = await sr.json();
|
||||||
|
totalDocs += sd.count || 0;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
|
// Skip wing if search fails
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate stats
|
||||||
|
const compressionRatio = totalDocs > 0 ? Math.max(1, Math.round(totalDocs * 0.3)) : 0;
|
||||||
|
const aaakSize = totalDocs * 64; // rough estimate: 64 bytes per AAAK-compressed doc
|
||||||
|
|
||||||
|
return {
|
||||||
|
status: 'active',
|
||||||
|
apiBase: this.apiBase,
|
||||||
|
health: health,
|
||||||
|
wings: wings.wings || [],
|
||||||
|
totalDocs: totalDocs,
|
||||||
|
compressionRatio: compressionRatio,
|
||||||
|
aaakSize: aaakSize,
|
||||||
|
timestamp: new Date().toISOString()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update UI with stats
|
||||||
|
*/
|
||||||
|
updateUI(stats) {
|
||||||
|
if (!stats) {
|
||||||
|
// Disconnected state
|
||||||
|
if (this.statusEl) {
|
||||||
|
this.statusEl.textContent = 'MEMPALACE OFFLINE';
|
||||||
|
this.statusEl.style.color = '#ff4466';
|
||||||
|
this.statusEl.style.textShadow = '0 0 10px #ff4466';
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connected state
|
||||||
|
if (this.statusEl) {
|
||||||
|
this.statusEl.textContent = 'MEMPALACE ACTIVE';
|
||||||
|
this.statusEl.style.color = '#4af0c0';
|
||||||
|
this.statusEl.style.textShadow = '0 0 10px #4af0c0';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.ratioEl) {
|
||||||
|
this.ratioEl.textContent = `${stats.compressionRatio}x`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.docsEl) {
|
||||||
|
this.docsEl.textContent = String(stats.totalDocs);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.sizeEl) {
|
||||||
|
this.sizeEl.textContent = formatBytes(stats.aaakSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[MemPalace] Connected to ${stats.apiBase} — ${stats.totalDocs} docs across ${stats.wings.length} wings`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current stats
|
||||||
|
*/
|
||||||
|
getStats() {
|
||||||
|
return this.lastStats;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if connected
|
||||||
|
*/
|
||||||
|
isConnected() {
|
||||||
|
return this.lastStats && this.lastStats.status === 'active';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Restore formatBytes utility (was removed in BURN mode update)
|
||||||
|
function formatBytes(bytes) {
|
||||||
|
if (bytes === 0) return '0 B';
|
||||||
|
|
||||||
|
const k = 1024;
|
||||||
|
const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||||
|
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||||
|
|
||||||
|
return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Export for use in other modules
|
||||||
|
if (typeof module !== 'undefined' && module.exports) {
|
||||||
|
module.exports = { MemPalaceFleetPoller, formatBytes };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Global instance for browser use
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
window.MemPalaceFleetPoller = MemPalaceFleetPoller;
|
||||||
|
window.formatBytes = formatBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-initialize if MemPalace container exists
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
const container = document.getElementById('mem-palace-container');
|
||||||
|
if (container) {
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
poller.startPolling();
|
||||||
|
|
||||||
|
// Store globally for access
|
||||||
|
window.mempalacePoller = poller;
|
||||||
|
}
|
||||||
|
});
|
||||||
248
tests/test_mempalace_fleet_poller.js
Normal file
248
tests/test_mempalace_fleet_poller.js
Normal file
@@ -0,0 +1,248 @@
|
|||||||
|
/**
|
||||||
|
* Tests for MemPalace Fleet API Poller
|
||||||
|
* Issue #1602: fix: restore MemPalace Fleet API polling
|
||||||
|
*/
|
||||||
|
|
||||||
|
const test = require('node:test');
|
||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const fs = require('node:fs');
|
||||||
|
const path = require('node:path');
|
||||||
|
|
||||||
|
const ROOT = path.resolve(__dirname, '..');
|
||||||
|
|
||||||
|
// Mock DOM environment
|
||||||
|
class Element {
|
||||||
|
constructor(tagName = 'div', id = '') {
|
||||||
|
this.tagName = String(tagName).toUpperCase();
|
||||||
|
this.id = id;
|
||||||
|
this.style = {};
|
||||||
|
this.children = [];
|
||||||
|
this.parentNode = null;
|
||||||
|
this.previousElementSibling = null;
|
||||||
|
this.innerHTML = '';
|
||||||
|
this.textContent = '';
|
||||||
|
this.className = '';
|
||||||
|
this.dataset = {};
|
||||||
|
this.attributes = {};
|
||||||
|
this._queryMap = new Map();
|
||||||
|
this.classList = {
|
||||||
|
add: (...names) => {
|
||||||
|
const set = new Set(this.className.split(/\s+/).filter(Boolean));
|
||||||
|
names.forEach((name) => set.add(name));
|
||||||
|
this.className = Array.from(set).join(' ');
|
||||||
|
},
|
||||||
|
remove: (...names) => {
|
||||||
|
const remove = new Set(names);
|
||||||
|
this.className = this.className
|
||||||
|
.split(/\s+/)
|
||||||
|
.filter((name) => name && !remove.has(name))
|
||||||
|
.join(' ');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
appendChild(child) {
|
||||||
|
child.parentNode = this;
|
||||||
|
this.children.push(child);
|
||||||
|
return child;
|
||||||
|
}
|
||||||
|
|
||||||
|
removeChild(child) {
|
||||||
|
this.children = this.children.filter((candidate) => candidate !== child);
|
||||||
|
if (child.parentNode === this) child.parentNode = null;
|
||||||
|
return child;
|
||||||
|
}
|
||||||
|
|
||||||
|
addEventListener() {}
|
||||||
|
removeEventListener() {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create mock document
|
||||||
|
const mockDocument = {
|
||||||
|
createElement: (tag) => new Element(tag),
|
||||||
|
getElementById: () => null,
|
||||||
|
addEventListener: () => {},
|
||||||
|
removeEventListener: () => {},
|
||||||
|
body: {
|
||||||
|
appendChild: () => {},
|
||||||
|
removeChild: () => {}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create mock fetch
|
||||||
|
const mockFetch = async (url) => {
|
||||||
|
if (url.includes('/health')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ status: 'ok', palace: '/test/path', palace_exists: true })
|
||||||
|
};
|
||||||
|
} else if (url.includes('/wings')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ wings: ['wing1', 'wing2'] })
|
||||||
|
};
|
||||||
|
} else if (url.includes('/search')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ results: [], count: 10, query: '*' })
|
||||||
|
};
|
||||||
|
}
|
||||||
|
throw new Error(`Unexpected URL: ${url}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Load mempalace-fleet-poller.js
|
||||||
|
const pollerPath = path.join(ROOT, 'js', 'mempalace-fleet-poller.js');
|
||||||
|
const pollerCode = fs.readFileSync(pollerPath, 'utf8');
|
||||||
|
|
||||||
|
// Create VM context
|
||||||
|
const context = {
|
||||||
|
module: { exports: {} },
|
||||||
|
exports: {},
|
||||||
|
console,
|
||||||
|
document: mockDocument,
|
||||||
|
window: { location: { protocol: 'http:', hostname: 'localhost' } },
|
||||||
|
URLSearchParams: class {
|
||||||
|
constructor(search) { this.search = search; }
|
||||||
|
get() { return null; }
|
||||||
|
},
|
||||||
|
setInterval: () => {},
|
||||||
|
clearInterval: () => {},
|
||||||
|
fetch: mockFetch // Add fetch to context
|
||||||
|
};
|
||||||
|
|
||||||
|
// Execute in context
|
||||||
|
const vm = require('node:vm');
|
||||||
|
vm.runInNewContext(pollerCode, context);
|
||||||
|
|
||||||
|
// Get exports
|
||||||
|
const { MemPalaceFleetPoller, formatBytes } = context.module.exports;
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller loads correctly', () => {
|
||||||
|
assert.ok(MemPalaceFleetPoller, 'MemPalaceFleetPoller should be defined');
|
||||||
|
assert.ok(typeof MemPalaceFleetPoller === 'function', 'MemPalaceFleetPoller should be a constructor');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller can be instantiated', () => {
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
assert.ok(poller, 'MemPalaceFleetPoller instance should be created');
|
||||||
|
assert.ok(poller.apiBase, 'Should have apiBase');
|
||||||
|
assert.equal(poller.pollInterval, 30000, 'Should have default poll interval');
|
||||||
|
assert.ok(!poller.isPolling, 'Should not be polling initially');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller detects API base', () => {
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
assert.ok(poller.apiBase.includes('localhost:7771'), 'Should detect localhost:7771');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller can start and stop polling', () => {
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
|
||||||
|
// Start polling
|
||||||
|
poller.startPolling();
|
||||||
|
assert.ok(poller.isPolling, 'Should be polling after start');
|
||||||
|
|
||||||
|
// Stop polling
|
||||||
|
poller.stopPolling();
|
||||||
|
assert.ok(!poller.isPolling, 'Should not be polling after stop');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller can fetch stats', async () => {
|
||||||
|
// Mock fetch globally for this test
|
||||||
|
const originalFetch = global.fetch;
|
||||||
|
global.fetch = async (url) => {
|
||||||
|
if (url.includes('/health')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ status: 'ok', palace: '/test/path', palace_exists: true })
|
||||||
|
};
|
||||||
|
} else if (url.includes('/wings')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ wings: ['wing1', 'wing2'] })
|
||||||
|
};
|
||||||
|
} else if (url.includes('/search')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
json: async () => ({ results: [], count: 10, query: '*' })
|
||||||
|
};
|
||||||
|
}
|
||||||
|
throw new Error(`Unexpected URL: ${url}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
|
||||||
|
const stats = await poller.fetchStats();
|
||||||
|
|
||||||
|
assert.ok(stats, 'Should return stats');
|
||||||
|
assert.equal(stats.status, 'active', 'Status should be active');
|
||||||
|
assert.ok(stats.health, 'Should have health data');
|
||||||
|
assert.ok(Array.isArray(stats.wings), 'Wings should be an array');
|
||||||
|
assert.ok(typeof stats.totalDocs === 'number', 'totalDocs should be a number');
|
||||||
|
assert.ok(typeof stats.compressionRatio === 'number', 'compressionRatio should be a number');
|
||||||
|
assert.ok(typeof stats.aaakSize === 'number', 'aaakSize should be a number');
|
||||||
|
assert.ok(stats.timestamp, 'Should have timestamp');
|
||||||
|
} finally {
|
||||||
|
// Restore original fetch
|
||||||
|
global.fetch = originalFetch;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('MemPalaceFleetPoller updates UI', () => {
|
||||||
|
// Create mock elements
|
||||||
|
const statusEl = new Element('div', 'mem-palace-status');
|
||||||
|
const ratioEl = new Element('div', 'compression-ratio');
|
||||||
|
const docsEl = new Element('div', 'docs-mined');
|
||||||
|
const sizeEl = new Element('div', 'aaak-size');
|
||||||
|
|
||||||
|
// Mock document.getElementById
|
||||||
|
context.document.getElementById = (id) => {
|
||||||
|
switch(id) {
|
||||||
|
case 'mem-palace-status': return statusEl;
|
||||||
|
case 'compression-ratio': return ratioEl;
|
||||||
|
case 'docs-mined': return docsEl;
|
||||||
|
case 'aaak-size': return sizeEl;
|
||||||
|
default: return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const poller = new MemPalaceFleetPoller();
|
||||||
|
|
||||||
|
// Test with null stats (disconnected)
|
||||||
|
poller.updateUI(null);
|
||||||
|
assert.equal(statusEl.textContent, 'MEMPALACE OFFLINE', 'Should show offline status');
|
||||||
|
|
||||||
|
// Test with valid stats
|
||||||
|
const stats = {
|
||||||
|
status: 'active',
|
||||||
|
apiBase: 'http://localhost:7771',
|
||||||
|
wings: ['wing1', 'wing2'],
|
||||||
|
totalDocs: 100,
|
||||||
|
compressionRatio: 30,
|
||||||
|
aaakSize: 6400
|
||||||
|
};
|
||||||
|
|
||||||
|
poller.updateUI(stats);
|
||||||
|
assert.equal(statusEl.textContent, 'MEMPALACE ACTIVE', 'Should show active status');
|
||||||
|
assert.equal(ratioEl.textContent, '30x', 'Should show compression ratio');
|
||||||
|
assert.equal(docsEl.textContent, '100', 'Should show total docs');
|
||||||
|
assert.equal(sizeEl.textContent, '6.3 KB', 'Should show formatted size');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('formatBytes utility works correctly', () => {
|
||||||
|
assert.equal(formatBytes(0), '0 B', 'Should format 0 bytes');
|
||||||
|
assert.equal(formatBytes(1024), '1 KB', 'Should format 1 KB');
|
||||||
|
assert.equal(formatBytes(1048576), '1 MB', 'Should format 1 MB');
|
||||||
|
assert.equal(formatBytes(1073741824), '1 GB', 'Should format 1 GB');
|
||||||
|
assert.equal(formatBytes(500), '500 B', 'Should format 500 bytes');
|
||||||
|
assert.equal(formatBytes(1536), '1.5 KB', 'Should format 1.5 KB');
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('All MemPalace Fleet Poller tests passed!');
|
||||||
Reference in New Issue
Block a user