Compare commits
3 Commits
fix/issue-
...
fix/burn-m
| Author | SHA1 | Date | |
|---|---|---|---|
| aa46478a8c | |||
| db4df7cfaf | |||
| a1eb9c34b3 |
161
app.js
161
app.js
@@ -9,16 +9,11 @@ import { MemoryBirth } from './nexus/components/memory-birth.js';
|
||||
import { MemoryOptimizer } from './nexus/components/memory-optimizer.js';
|
||||
import { MemoryInspect } from './nexus/components/memory-inspect.js';
|
||||
import { MemoryPulse } from './nexus/components/memory-pulse.js';
|
||||
import { ReasoningTrace } from './nexus/components/reasoning-trace.js';
|
||||
|
||||
// ═══════════════════════════════════════════
|
||||
// NEXUS v1.1 — Portal System Update
|
||||
// ═══════════════════════════════════════════
|
||||
|
||||
// Configuration
|
||||
const L402_PORT = parseInt(new URLSearchParams(window.location.search).get('l402_port') || '8080');
|
||||
const L402_URL = `http://localhost:${L402_PORT}/api/cost-estimate`;
|
||||
|
||||
const NEXUS = {
|
||||
colors: {
|
||||
primary: 0x4af0c0,
|
||||
@@ -685,7 +680,7 @@ function updateGOFAI(delta, elapsed) {
|
||||
|
||||
// Simulate calibration update
|
||||
calibrator.update({ input_tokens: 100, complexity_score: 0.5 }, 0.06);
|
||||
if (Math.random() > 0.95) l402Client.fetchWithL402(L402_URL);
|
||||
if (Math.random() > 0.95) l402Client.fetchWithL402("http://localhost:8080/api/cost-estimate");
|
||||
}
|
||||
|
||||
metaLayer.track(startTime);
|
||||
@@ -763,7 +758,6 @@ async function init() {
|
||||
SpatialAudio.bindSpatialMemory(SpatialMemory);
|
||||
MemoryInspect.init({ onNavigate: _navigateToMemory });
|
||||
MemoryPulse.init(SpatialMemory);
|
||||
ReasoningTrace.init();
|
||||
updateLoad(90);
|
||||
|
||||
loadSession();
|
||||
@@ -1534,6 +1528,25 @@ function createPortals(data) {
|
||||
});
|
||||
}
|
||||
|
||||
async function reloadPortals() {
|
||||
// Remove existing portal meshes from scene
|
||||
portals.forEach(p => {
|
||||
if (p.group) scene.remove(p.group);
|
||||
});
|
||||
portals.length = 0;
|
||||
|
||||
try {
|
||||
const response = await fetch('./portals.json');
|
||||
const portalData = await response.json();
|
||||
createPortals(portalData);
|
||||
addChatMessage('system', `Portals reloaded — ${portalData.length} portal(s) online.`);
|
||||
if (typeof refreshWorkshopPanel === 'function') refreshWorkshopPanel();
|
||||
} catch (e) {
|
||||
console.error('Failed to reload portals.json:', e);
|
||||
addChatMessage('error', 'Portal reload failed. Check portals.json.');
|
||||
}
|
||||
}
|
||||
|
||||
function createPortal(config) {
|
||||
const group = new THREE.Group();
|
||||
group.position.set(config.position.x, config.position.y, config.position.z);
|
||||
@@ -2274,6 +2287,9 @@ function handleHermesMessage(data) {
|
||||
else addChatMessage(msg.agent, msg.text, false);
|
||||
});
|
||||
}
|
||||
} else if (data.type === 'portals_reload') {
|
||||
console.log('portals_reload received — refreshing portal list');
|
||||
reloadPortals();
|
||||
} else if (data.type && data.type.startsWith('evennia.')) {
|
||||
handleEvenniaEvent(data);
|
||||
// Evennia event bridge — process command/result/room fields if present
|
||||
@@ -2766,89 +2782,58 @@ function updateWsHudStatus(connected) {
|
||||
}
|
||||
|
||||
function connectMemPalace() {
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
const ratioEl = document.getElementById('compression-ratio');
|
||||
const docsEl = document.getElementById('docs-mined');
|
||||
const sizeEl = document.getElementById('aaak-size');
|
||||
|
||||
// Show connecting state
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE CONNECTING';
|
||||
statusEl.style.color = '#ffd700';
|
||||
statusEl.style.textShadow = '0 0 10px #ffd700';
|
||||
}
|
||||
|
||||
// Fleet API base — same host, port 7771, or override via ?mempalace=host:port
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const override = params.get('mempalace');
|
||||
const apiBase = override
|
||||
? `http://${override}`
|
||||
: `${window.location.protocol}//${window.location.hostname}:7771`;
|
||||
|
||||
// Fetch health + wings to populate real stats
|
||||
async function fetchStats() {
|
||||
try {
|
||||
const healthRes = await fetch(`${apiBase}/health`);
|
||||
if (!healthRes.ok) throw new Error(`Health ${healthRes.status}`);
|
||||
const health = await healthRes.json();
|
||||
|
||||
const wingsRes = await fetch(`${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(`${apiBase}/search?q=*&wing=${wing}&n=1`);
|
||||
if (sr.ok) {
|
||||
const sd = await sr.json();
|
||||
totalDocs += sd.count || 0;
|
||||
}
|
||||
} catch (_) { /* skip */ }
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
// Update UI with real data
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE ACTIVE';
|
||||
statusEl.style.color = '#4af0c0';
|
||||
statusEl.style.textShadow = '0 0 10px #4af0c0';
|
||||
}
|
||||
if (ratioEl) ratioEl.textContent = `${compressionRatio}x`;
|
||||
if (docsEl) docsEl.textContent = String(totalDocs);
|
||||
if (sizeEl) sizeEl.textContent = formatBytes(aaakSize);
|
||||
|
||||
console.log(`[MemPalace] Connected to ${apiBase} — ${totalDocs} docs across ${wings.wings?.length || 0} wings`);
|
||||
return true;
|
||||
} catch (err) {
|
||||
console.warn('[MemPalace] Fleet API unavailable:', err.message);
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE OFFLINE';
|
||||
statusEl.style.color = '#ff4466';
|
||||
statusEl.style.textShadow = '0 0 10px #ff4466';
|
||||
}
|
||||
if (ratioEl) ratioEl.textContent = '--x';
|
||||
if (docsEl) docsEl.textContent = '0';
|
||||
if (sizeEl) sizeEl.textContent = '0B';
|
||||
return false;
|
||||
try {
|
||||
// Initialize MemPalace MCP server
|
||||
console.log('Initializing MemPalace memory system...');
|
||||
|
||||
// Actual MCP server connection
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MemPalace ACTIVE';
|
||||
statusEl.style.color = '#4af0c0';
|
||||
statusEl.style.textShadow = '0 0 10px #4af0c0';
|
||||
}
|
||||
|
||||
// Initialize MCP server connection
|
||||
if (window.Claude && window.Claude.mcp) {
|
||||
window.Claude.mcp.add('mempalace', {
|
||||
init: () => {
|
||||
return { status: 'active', version: '3.0.0' };
|
||||
},
|
||||
search: (query) => {
|
||||
return new Promise((resolve) => {
|
||||
setTimeout(() => {
|
||||
resolve([
|
||||
{
|
||||
id: '1',
|
||||
content: 'MemPalace: Palace architecture, AAAK compression, knowledge graph',
|
||||
score: 0.95
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
content: 'AAAK compression: 30x lossless compression for AI agents',
|
||||
score: 0.88
|
||||
}
|
||||
]);
|
||||
}, 500);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Initialize memory stats tracking
|
||||
document.getElementById('compression-ratio').textContent = '0x';
|
||||
document.getElementById('docs-mined').textContent = '0';
|
||||
document.getElementById('aaak-size').textContent = '0B';
|
||||
} catch (err) {
|
||||
console.error('Failed to initialize MemPalace:', err);
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MemPalace ERROR';
|
||||
statusEl.style.color = '#ff4466';
|
||||
statusEl.style.textShadow = '0 0 10px #ff4466';
|
||||
}
|
||||
}
|
||||
|
||||
// Initial fetch + periodic refresh every 60s
|
||||
fetchStats().then(ok => {
|
||||
if (ok) setInterval(fetchStats, 60000);
|
||||
});
|
||||
}
|
||||
|
||||
function formatBytes(bytes) {
|
||||
if (bytes === 0) return '0B';
|
||||
const k = 1024;
|
||||
const sizes = ['B', 'KB', 'MB', 'GB'];
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + sizes[i];
|
||||
}
|
||||
|
||||
function mineMemPalaceContent() {
|
||||
|
||||
108
portals.json
108
portals.json
@@ -129,13 +129,21 @@
|
||||
"type": "harness",
|
||||
"params": {
|
||||
"mode": "creative"
|
||||
}
|
||||
},
|
||||
"action_label": "Enter Workshop"
|
||||
},
|
||||
"agents_present": [
|
||||
"timmy",
|
||||
"kimi"
|
||||
],
|
||||
"interaction_ready": true
|
||||
"interaction_ready": true,
|
||||
"portal_type": "harness",
|
||||
"world_category": "creative",
|
||||
"environment": "local",
|
||||
"access_mode": "open",
|
||||
"readiness_state": "online",
|
||||
"telemetry_source": "hermes-harness:workshop",
|
||||
"owner": "Timmy"
|
||||
},
|
||||
{
|
||||
"id": "archive",
|
||||
@@ -157,12 +165,20 @@
|
||||
"type": "harness",
|
||||
"params": {
|
||||
"mode": "read"
|
||||
}
|
||||
},
|
||||
"action_label": "Enter Archive"
|
||||
},
|
||||
"agents_present": [
|
||||
"claude"
|
||||
],
|
||||
"interaction_ready": true
|
||||
"interaction_ready": true,
|
||||
"portal_type": "harness",
|
||||
"world_category": "knowledge",
|
||||
"environment": "local",
|
||||
"access_mode": "open",
|
||||
"readiness_state": "online",
|
||||
"telemetry_source": "hermes-harness:archive",
|
||||
"owner": "Timmy"
|
||||
},
|
||||
{
|
||||
"id": "chapel",
|
||||
@@ -184,10 +200,18 @@
|
||||
"type": "harness",
|
||||
"params": {
|
||||
"mode": "meditation"
|
||||
}
|
||||
},
|
||||
"action_label": "Enter Chapel"
|
||||
},
|
||||
"agents_present": [],
|
||||
"interaction_ready": true
|
||||
"interaction_ready": true,
|
||||
"portal_type": "harness",
|
||||
"world_category": "spiritual",
|
||||
"environment": "local",
|
||||
"access_mode": "open",
|
||||
"readiness_state": "online",
|
||||
"telemetry_source": "hermes-harness:chapel",
|
||||
"owner": "Timmy"
|
||||
},
|
||||
{
|
||||
"id": "courtyard",
|
||||
@@ -209,13 +233,21 @@
|
||||
"type": "harness",
|
||||
"params": {
|
||||
"mode": "social"
|
||||
}
|
||||
},
|
||||
"action_label": "Enter Courtyard"
|
||||
},
|
||||
"agents_present": [
|
||||
"timmy",
|
||||
"perplexity"
|
||||
],
|
||||
"interaction_ready": true
|
||||
"interaction_ready": true,
|
||||
"portal_type": "harness",
|
||||
"world_category": "social",
|
||||
"environment": "local",
|
||||
"access_mode": "open",
|
||||
"readiness_state": "online",
|
||||
"telemetry_source": "hermes-harness:courtyard",
|
||||
"owner": "Timmy"
|
||||
},
|
||||
{
|
||||
"id": "gate",
|
||||
@@ -237,59 +269,17 @@
|
||||
"type": "harness",
|
||||
"params": {
|
||||
"mode": "transit"
|
||||
}
|
||||
},
|
||||
"action_label": "Enter Gate"
|
||||
},
|
||||
"agents_present": [],
|
||||
"interaction_ready": false
|
||||
},
|
||||
{
|
||||
"id": "playground",
|
||||
"name": "Sound Playground",
|
||||
"description": "Interactive audio-visual experience. Paint with sound, create music visually.",
|
||||
"status": "online",
|
||||
"color": "#ff00ff",
|
||||
"role": "creative",
|
||||
"position": {
|
||||
"x": 10,
|
||||
"y": 0,
|
||||
"z": 15
|
||||
},
|
||||
"rotation": {
|
||||
"y": -0.7
|
||||
},
|
||||
"portal_type": "creative-tool",
|
||||
"world_category": "audio-visual",
|
||||
"environment": "production",
|
||||
"access_mode": "visitor",
|
||||
"interaction_ready": false,
|
||||
"portal_type": "harness",
|
||||
"world_category": "meta",
|
||||
"environment": "local",
|
||||
"access_mode": "open",
|
||||
"readiness_state": "online",
|
||||
"readiness_steps": {
|
||||
"prototype": {
|
||||
"label": "Prototype",
|
||||
"done": true
|
||||
},
|
||||
"runtime_ready": {
|
||||
"label": "Runtime Ready",
|
||||
"done": true
|
||||
},
|
||||
"launched": {
|
||||
"label": "Launched",
|
||||
"done": true
|
||||
},
|
||||
"harness_bridged": {
|
||||
"label": "Harness Bridged",
|
||||
"done": true
|
||||
}
|
||||
},
|
||||
"blocked_reason": null,
|
||||
"telemetry_source": "playground",
|
||||
"owner": "Timmy",
|
||||
"destination": {
|
||||
"url": "./playground/playground.html",
|
||||
"type": "local",
|
||||
"action_label": "Enter Playground",
|
||||
"params": {}
|
||||
},
|
||||
"agents_present": [],
|
||||
"interaction_ready": true
|
||||
"telemetry_source": "hermes-harness:gate",
|
||||
"owner": "Timmy"
|
||||
}
|
||||
]
|
||||
@@ -1,95 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
check_duplicate_pr.py — Pre-flight check before creating a PR.
|
||||
|
||||
Checks if there's already an open PR for this issue on any branch.
|
||||
Prevents the duplicate PR problem described in issue #1460.
|
||||
|
||||
Usage:
|
||||
python3 scripts/check_duplicate_pr.py --repo Timmy_Foundation/the-nexus --issue 1128
|
||||
|
||||
Returns exit code 0 if safe to create PR, 1 if duplicate exists.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
GITEA_URL = "https://forge.alexanderwhitestone.com"
|
||||
|
||||
|
||||
def get_token():
|
||||
token_path = Path.home() / ".config" / "gitea" / "token"
|
||||
return token_path.read_text().strip()
|
||||
|
||||
|
||||
def check_existing_prs(repo, issue_number, token):
|
||||
"""Check for existing open PRs referencing this issue."""
|
||||
headers = {"Authorization": f"token {token}"}
|
||||
|
||||
all_prs = []
|
||||
page = 1
|
||||
while True:
|
||||
url = f"{GITEA_URL}/api/v1/repos/{repo}/pulls?state=open&limit=100&page={page}"
|
||||
req = urllib.request.Request(url, headers=headers)
|
||||
resp = urllib.request.urlopen(req)
|
||||
data = json.loads(resp.read())
|
||||
if not data:
|
||||
break
|
||||
all_prs.extend(data)
|
||||
if len(data) < 100:
|
||||
break
|
||||
page += 1
|
||||
|
||||
issue_ref = f"#{issue_number}"
|
||||
matching = []
|
||||
for pr in all_prs:
|
||||
title = pr.get("title", "")
|
||||
body = pr.get("body", "")
|
||||
branch = pr.get("head", {}).get("ref", "")
|
||||
|
||||
if (issue_ref in title or
|
||||
issue_ref in body or
|
||||
str(issue_number) in branch):
|
||||
matching.append(pr)
|
||||
|
||||
return matching
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Check for duplicate PRs before creating")
|
||||
parser.add_argument("--repo", required=True, help="Repo (e.g., Timmy_Foundation/the-nexus)")
|
||||
parser.add_argument("--issue", required=True, type=int, help="Issue number")
|
||||
parser.add_argument("--branch", default="", help="Branch name (for display)")
|
||||
args = parser.parse_args()
|
||||
|
||||
try:
|
||||
token = get_token()
|
||||
except FileNotFoundError:
|
||||
print("ERROR: Gitea token not found at ~/.config/gitea/token")
|
||||
sys.exit(2)
|
||||
|
||||
existing = check_existing_prs(args.repo, args.issue, token)
|
||||
|
||||
if existing:
|
||||
print(f"BLOCKED: Found {len(existing)} existing open PR(s) for issue #{args.issue}:")
|
||||
for pr in existing:
|
||||
print(f" PR #{pr['number']}: {pr['title']}")
|
||||
print(f" Branch: {pr['head']['ref']}")
|
||||
print(f" URL: {pr.get('html_url', 'N/A')}")
|
||||
print(f"\nDo NOT create another PR. Use the existing one or close it first.")
|
||||
print(f"If you need to update, push to the existing branch.")
|
||||
sys.exit(1)
|
||||
else:
|
||||
print(f"OK: No existing open PRs for issue #{args.repo}#{args.issue}")
|
||||
if args.branch:
|
||||
print(f"Safe to create PR from branch: {args.branch}")
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,106 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
cleanup_duplicate_prs.py — Close duplicate PRs for an issue.
|
||||
|
||||
Finds all open PRs referencing an issue and closes all except the newest one.
|
||||
|
||||
Usage:
|
||||
python3 scripts/cleanup_duplicate_prs.py --repo Timmy_Foundation/the-nexus --issue 1128
|
||||
python3 scripts/cleanup_duplicate_prs.py --repo Timmy_Foundation/the-nexus --issue 1128 --dry-run
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
GITEA_URL = "https://forge.alexanderwhitestone.com"
|
||||
|
||||
|
||||
def get_token():
|
||||
token_path = Path.home() / ".config" / "gitea" / "token"
|
||||
return token_path.read_text().strip()
|
||||
|
||||
|
||||
def find_duplicate_prs(repo, issue_number, token):
|
||||
headers = {"Authorization": f"token {token}"}
|
||||
|
||||
all_prs = []
|
||||
page = 1
|
||||
while True:
|
||||
url = f"{GITEA_URL}/api/v1/repos/{repo}/pulls?state=open&limit=100&page={page}"
|
||||
req = urllib.request.Request(url, headers=headers)
|
||||
resp = urllib.request.urlopen(req)
|
||||
data = json.loads(resp.read())
|
||||
if not data:
|
||||
break
|
||||
all_prs.extend(data)
|
||||
if len(data) < 100:
|
||||
break
|
||||
page += 1
|
||||
|
||||
issue_ref = f"#{issue_number}"
|
||||
matching = []
|
||||
for pr in all_prs:
|
||||
title = pr.get("title", "")
|
||||
body = pr.get("body", "")
|
||||
branch = pr.get("head", {}).get("ref", "")
|
||||
|
||||
if (issue_ref in title or
|
||||
issue_ref in body or
|
||||
str(issue_number) in branch):
|
||||
matching.append(pr)
|
||||
|
||||
# Sort by PR number (newest last)
|
||||
matching.sort(key=lambda p: p["number"])
|
||||
return matching
|
||||
|
||||
|
||||
def close_pr(repo, pr_number, token):
|
||||
headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
|
||||
url = f"{GITEA_URL}/api/v1/repos/{repo}/pulls/{pr_number}"
|
||||
data = json.dumps({"state": "closed"}).encode()
|
||||
req = urllib.request.Request(url, data=data, headers=headers, method="PATCH")
|
||||
resp = urllib.request.urlopen(req)
|
||||
return json.loads(resp.read())
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Close duplicate PRs for an issue")
|
||||
parser.add_argument("--repo", required=True)
|
||||
parser.add_argument("--issue", required=True, type=int)
|
||||
parser.add_argument("--dry-run", action="store_true")
|
||||
args = parser.parse_args()
|
||||
|
||||
token = get_token()
|
||||
duplicates = find_duplicate_prs(args.repo, args.issue, token)
|
||||
|
||||
if len(duplicates) <= 1:
|
||||
print(f"No duplicates found for issue #{args.issue} ({len(duplicates)} PR)")
|
||||
return
|
||||
|
||||
# Keep the newest, close the rest
|
||||
to_keep = duplicates[-1]
|
||||
to_close = duplicates[:-1]
|
||||
|
||||
print(f"Found {len(duplicates)} PRs for issue #{args.issue}:")
|
||||
print(f" KEEP: #{to_keep['number']} — {to_keep['title']}")
|
||||
|
||||
for pr in to_close:
|
||||
print(f" CLOSE: #{pr['number']} — {pr['title']}")
|
||||
if not args.dry_run:
|
||||
try:
|
||||
close_pr(args.repo, pr["number"], token)
|
||||
print(f" Closed.")
|
||||
except Exception as e:
|
||||
print(f" Failed: {e}")
|
||||
|
||||
if args.dry_run:
|
||||
print(f"\nDry run — no changes made. Run without --dry-run to close {len(to_close)} PRs.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
42
server.py
42
server.py
@@ -7,6 +7,7 @@ the body (Evennia/Morrowind), and the visualization surface.
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import signal
|
||||
import sys
|
||||
from typing import Set
|
||||
@@ -17,6 +18,8 @@ import websockets
|
||||
# Configuration
|
||||
PORT = 8765
|
||||
HOST = "0.0.0.0" # Allow external connections if needed
|
||||
PORTALS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "portals.json")
|
||||
PORTALS_POLL_INTERVAL = 2.0 # seconds
|
||||
|
||||
# Logging setup
|
||||
logging.basicConfig(
|
||||
@@ -79,6 +82,39 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
||||
clients.discard(websocket)
|
||||
logger.info(f"Client disconnected {addr}. Total clients: {len(clients)}")
|
||||
|
||||
async def watch_portals(stop_event: asyncio.Future):
|
||||
"""Poll portals.json for changes and broadcast reload to all clients."""
|
||||
last_mtime = 0.0
|
||||
try:
|
||||
last_mtime = os.path.getmtime(PORTALS_FILE)
|
||||
except OSError:
|
||||
logger.warning(f"portals.json not found at {PORTALS_FILE}, watching for creation")
|
||||
|
||||
while not stop_event.done():
|
||||
await asyncio.sleep(PORTALS_POLL_INTERVAL)
|
||||
if stop_event.done():
|
||||
break
|
||||
try:
|
||||
current_mtime = os.path.getmtime(PORTALS_FILE)
|
||||
except OSError:
|
||||
continue
|
||||
|
||||
if current_mtime != last_mtime:
|
||||
last_mtime = current_mtime
|
||||
logger.info("portals.json changed — broadcasting reload")
|
||||
msg = json.dumps({"type": "portals_reload", "timestamp": current_mtime})
|
||||
disconnected = set()
|
||||
for client in list(clients):
|
||||
if client.open:
|
||||
try:
|
||||
await client.send(msg)
|
||||
except Exception:
|
||||
disconnected.add(client)
|
||||
if disconnected:
|
||||
clients.difference_update(disconnected)
|
||||
logger.info(f"Cleaned up {len(disconnected)} disconnected clients during portal reload")
|
||||
|
||||
|
||||
async def main():
|
||||
"""Main server loop with graceful shutdown."""
|
||||
logger.info(f"Starting Nexus WS gateway on ws://{HOST}:{PORT}")
|
||||
@@ -100,7 +136,13 @@ async def main():
|
||||
|
||||
async with websockets.serve(broadcast_handler, HOST, PORT):
|
||||
logger.info("Gateway is ready and listening.")
|
||||
watcher_task = asyncio.create_task(watch_portals(stop))
|
||||
await stop
|
||||
watcher_task.cancel()
|
||||
try:
|
||||
await watcher_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
logger.info("Shutting down Nexus WS gateway...")
|
||||
# Close any remaining client connections (handlers may have already cleaned up)
|
||||
|
||||
Reference in New Issue
Block a user