Compare commits

..

3 Commits

Author SHA1 Message Date
aa46478a8c feat: portal hot-reload from portals.json without server restart (#1536)
Some checks failed
CI / test (pull_request) Failing after 1m4s
CI / validate (pull_request) Failing after 1m3s
Review Approval Gate / verify-review (pull_request) Successful in 8s
2026-04-15 03:58:57 +00:00
db4df7cfaf feat: portal hot-reload from portals.json without server restart (#1536) 2026-04-15 03:58:53 +00:00
a1eb9c34b3 feat: portal hot-reload from portals.json without server restart (#1536) 2026-04-15 03:58:49 +00:00
7 changed files with 164 additions and 576 deletions

161
app.js
View File

@@ -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() {

View File

@@ -1,143 +0,0 @@
# Duplicate PR Prevention System
Comprehensive system to prevent duplicate PRs from being created for the same issue.
## Problem
Despite having tools to detect and clean up duplicate PRs, agents were still creating duplicate PRs for the same issue. This was incredibly ironic, especially for issue #1128 which was about cleaning up duplicate PRs.
## Solution
### 1. Pre-flight Check Scripts
#### `scripts/check-existing-prs.sh` (Bash)
Check if an issue already has open PRs before creating a new one.
```bash
./scripts/check-existing-prs.sh 1524
```
**Exit codes:**
- `0`: No existing PRs found (safe to create new PR)
- `1`: Existing PRs found (do not create new PR)
- `2`: Error (API failure, missing parameters, etc.)
#### `scripts/check_existing_prs.py` (Python)
Python version of the check with more features:
```bash
python scripts/check_existing_prs.py 1524
python scripts/check_existing_prs.py --issue 1524
```
#### `scripts/pr-safe.sh` (User-friendly wrapper)
Guides you through safe PR creation:
```bash
./scripts/pr-safe.sh 1524
./scripts/pr-safe.sh 1524 fix/my-branch
```
### 2. Fixed Existing Script
Fixed syntax error in `scripts/cleanup-duplicate-prs.sh` (line 21) and AUTH header format.
### 3. Prevention Strategy
1. **Pre-flight Checks**: Always check before creating a PR
2. **Agent Discipline**: Add to agent instructions to check before creating PRs
3. **Tooling Integration**: Integrate into existing workflows
## Usage
### Before Creating a PR
```bash
# Check if issue already has PRs
./scripts/check-existing-prs.sh <issue_number>
# If exit code is 0, safe to proceed
# If exit code is 1, review existing PRs first
```
### In Agent Instructions
Add to your agent instructions:
```
Before creating a PR for any issue:
1. Run: ./scripts/check-existing-prs.sh <issue_number>
2. If exit code is 1, STOP and review existing PRs
3. Only proceed if exit code is 0
```
### Cleanup Existing Duplicates
```bash
# Show what would be done
./scripts/cleanup-duplicate-prs.sh --dry-run
# Actually close duplicates
./scripts/cleanup-duplicate-prs.sh --close
```
## Integration
### CI/CD
Add to your CI pipeline:
```yaml
- name: Check for duplicate PRs
run: ./scripts/check-existing-prs.sh ${{ github.event.pull_request.number }}
```
### Git Hooks
Add to `.git/hooks/pre-push`:
```bash
#!/bin/bash
# Extract issue number from branch name
ISSUE=$(git branch --show-current | grep -oE '[0-9]+$')
if [ -n "$ISSUE" ]; then
./scripts/check-existing-prs.sh "$ISSUE"
fi
```
## Best Practices
1. **Always check before creating PRs** — use the pre-flight check
2. **Close duplicates promptly** — don't let them accumulate
3. **Reference issues in PRs** — makes duplicate detection possible
4. **Use descriptive branch names** — helps identify purpose
5. **Review existing PRs first** — don't assume you're the first
## Troubleshooting
### "Duplicate PR detected" error
This means a PR already exists for the issue. Options:
1. Review the existing PR and contribute to it
2. Close your PR if it's truly a duplicate
3. Update your PR to address a different aspect
### Pre-flight check not working
Check that:
1. Gitea token is configured at `~/.config/gitea/token`
2. You have network access to the Gitea instance
3. The repository name is correct in the script
### False positives
The check looks for issue numbers in PR body. If you're referencing an issue without intending to fix it, use "Refs #" instead of "Fixes #".
## Related Issues
- #1474: [META] Still creating duplicate PRs for issue #1128 despite cleanup
- #1128: Original duplicate PR cleanup issue
- #1500: observation: #1474 already has 2 open PRs — prevented another duplicate

View File

@@ -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"
}
]

View File

@@ -1,95 +0,0 @@
#!/bin/bash
# check-existing-prs.sh — Pre-flight check for duplicate PRs
# Usage: ./scripts/check-existing-prs.sh <issue_number>
#
# Exit codes:
# 0: No existing PRs found (safe to create new PR)
# 1: Existing PRs found (do not create new PR)
# 2: Error (API failure, missing parameters, etc.)
set -euo pipefail
# Configuration
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
REPO="${GITEA_REPO:-Timmy_Foundation/the-nexus}"
TOKEN_FILE="${HOME}/.config/gitea/token"
# Colors
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
NC='\033[0m'
usage() {
echo "Usage: $0 <issue_number>"
echo ""
echo "Check if a Gitea issue already has open PRs before creating a new one."
echo ""
echo "Exit codes:"
echo " 0: No existing PRs found (safe to create new PR)"
echo " 1: Existing PRs found (do not create new PR)"
echo " 2: Error (API failure, missing parameters, etc.)"
exit 2
}
# Parse arguments
if [ $# -lt 1 ]; then
usage
fi
ISSUE_NUMBER="$1"
# Validate issue number
if ! [[ "$ISSUE_NUMBER" =~ ^[0-9]+$ ]]; then
echo -e "${RED}Error: Invalid issue number: $ISSUE_NUMBER${NC}" >&2
exit 2
fi
# Load token
if [ ! -f "$TOKEN_FILE" ]; then
echo -e "${RED}Error: Gitea token not found at $TOKEN_FILE${NC}" >&2
exit 2
fi
TOKEN=$(cat "$TOKEN_FILE" | tr -d '[:space:]')
# Fetch open PRs
echo -e "${YELLOW}Checking for existing PRs referencing issue #$ISSUE_NUMBER...${NC}"
RESPONSE=$(curl -s -w "\n%{http_code}" \
-H "Authorization: token $TOKEN" \
-H "Accept: application/json" \
"${GITEA_URL}/api/v1/repos/${REPO}/pulls?state=open" 2>/dev/null)
HTTP_CODE=$(echo "$RESPONSE" | tail -1)
BODY=$(echo "$RESPONSE" | sed '$d')
if [ "$HTTP_CODE" != "200" ]; then
echo -e "${RED}Error: API request failed with HTTP $HTTP_CODE${NC}" >&2
exit 2
fi
# Check for existing PRs referencing this issue
EXISTING_PRS=$(echo "$BODY" | python3 -c "
import json, sys
prs = json.load(sys.stdin)
issue = '#$ISSUE_NUMBER'
found = []
for pr in prs:
body = (pr.get('body') or '') + ' ' + (pr.get('title') or '')
if issue in body:
found.append(f\" #{pr['number']}: {pr['title']} ({pr['head']['ref']})\")
if found:
print('\\n'.join(found))
" 2>/dev/null)
if [ -n "$EXISTING_PRS" ]; then
echo -e "${RED}✗ Found existing PRs for issue #$ISSUE_NUMBER:${NC}"
echo "$EXISTING_PRS"
echo ""
echo -e "${YELLOW}Do not create another PR. Review existing PRs instead.${NC}"
exit 1
else
echo -e "${GREEN}✓ No existing PRs found for issue #$ISSUE_NUMBER${NC}"
echo -e "${GREEN}Safe to create new PR.${NC}"
exit 0
fi

View File

@@ -1,111 +0,0 @@
#!/usr/bin/env python3
"""
check_existing_prs.py — Pre-flight check for duplicate PRs (Python version)
Usage:
python scripts/check_existing_prs.py <issue_number>
python scripts/check_existing_prs.py --issue 1524
Exit codes:
0: No existing PRs found (safe to create new PR)
1: Existing PRs found (do not create new PR)
2: Error (API failure, missing parameters, etc.)
"""
import argparse
import json
import os
import sys
import urllib.request
import urllib.error
from pathlib import Path
# Configuration
GITEA_URL = os.environ.get("GITEA_URL", "https://forge.alexanderwhitestone.com")
REPO = os.environ.get("GITEA_REPO", "Timmy_Foundation/the-nexus")
TOKEN_PATH = Path.home() / ".config" / "gitea" / "token"
# ANSI colors
RED = "\033[0;31m"
GREEN = "\033[0;32m"
YELLOW = "\033[1;33m"
NC = "\033[0m"
def load_token() -> str:
"""Load Gitea API token."""
if TOKEN_PATH.exists():
return TOKEN_PATH.read_text().strip()
return os.environ.get("GITEA_TOKEN", "")
def check_existing_prs(issue_number: int, token: str) -> list:
"""Check if issue already has open PRs.
Returns list of existing PR dicts, or empty list if none found.
"""
url = f"{GITEA_URL}/api/v1/repos/{REPO}/pulls?state=open"
headers = {
"Authorization": f"token {token}",
"Accept": "application/json",
}
try:
req = urllib.request.Request(url, headers=headers)
with urllib.request.urlopen(req, timeout=30) as resp:
prs = json.loads(resp.read())
except urllib.error.HTTPError as e:
print(f"{RED}Error: API request failed with HTTP {e.code}{NC}", file=sys.stderr)
return []
except Exception as e:
print(f"{RED}Error: {e}{NC}", file=sys.stderr)
return []
# Find PRs referencing this issue
issue_ref = f"#{issue_number}"
existing = []
for pr in prs:
body = (pr.get("body") or "") + " " + (pr.get("title") or "")
if issue_ref in body:
existing.append(pr)
return existing
def main():
parser = argparse.ArgumentParser(description="Check for existing PRs before creating new one")
parser.add_argument("issue_number", nargs="?", type=int, help="Issue number to check")
parser.add_argument("--issue", "-i", type=int, help="Issue number (alternative syntax)")
args = parser.parse_args()
issue_number = args.issue_number or args.issue
if not issue_number:
print(f"{RED}Error: Issue number required{NC}", file=sys.stderr)
print("Usage: python check_existing_prs.py <issue_number>", file=sys.stderr)
sys.exit(2)
# Load token
token = load_token()
if not token:
print(f"{RED}Error: Gitea token not found{NC}", file=sys.stderr)
sys.exit(2)
# Check for existing PRs
print(f"{YELLOW}Checking for existing PRs referencing issue #{issue_number}...{NC}")
existing = check_existing_prs(issue_number, token)
if existing:
print(f"{RED}✗ Found existing PRs for issue #{issue_number}:{NC}")
for pr in existing:
print(f" #{pr['number']}: {pr['title']} ({pr['head']['ref']})")
print()
print(f"{YELLOW}Do not create another PR. Review existing PRs instead.{NC}")
sys.exit(1)
else:
print(f"{GREEN}✓ No existing PRs found for issue #{issue_number}{NC}")
print(f"{GREEN}Safe to create new PR.{NC}")
sys.exit(0)
if __name__ == "__main__":
main()

View File

@@ -1,80 +0,0 @@
#!/bin/bash
# pr-safe.sh — User-friendly wrapper for PR creation with duplicate prevention
# Usage: ./scripts/pr-safe.sh <issue_number> [branch_name]
#
# This script:
# 1. Checks for existing PRs
# 2. Guides you through safe PR creation
# 3. Prevents duplicate PRs
set -euo pipefail
# Colors
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m'
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
usage() {
echo "Usage: $0 <issue_number> [branch_name]"
echo ""
echo "Safe PR creation with duplicate prevention."
echo ""
echo "Examples:"
echo " $0 1524 # Create PR for issue #1524"
echo " $0 1524 fix/my-branch # Create PR with specific branch name"
echo ""
exit 1
}
# Parse arguments
if [ $# -lt 1 ]; then
usage
fi
ISSUE_NUMBER="$1"
BRANCH_NAME="${2:-fix/issue-${ISSUE_NUMBER}-$(date +%s)}"
echo -e "${BLUE}╔════════════════════════════════════════════════════════════╗${NC}"
echo -e "${BLUE}║ Safe PR Creation for Issue #${ISSUE_NUMBER}${NC}"
echo -e "${BLUE}╚════════════════════════════════════════════════════════════╝${NC}"
echo ""
# Step 1: Check for existing PRs
echo -e "${YELLOW}Step 1: Checking for existing PRs...${NC}"
if ! "${SCRIPT_DIR}/check-existing-prs.sh" "$ISSUE_NUMBER"; then
echo ""
echo -e "${RED}Cannot create PR — existing PRs found.${NC}"
echo -e "${YELLOW}Options:${NC}"
echo " 1. Review and contribute to existing PRs"
echo " 2. Close your local changes if truly duplicate"
echo " 3. Update your PR to address a different aspect"
exit 1
fi
echo ""
# Step 2: Create branch
echo -e "${YELLOW}Step 2: Creating branch ${BRANCH_NAME}...${NC}"
git checkout -b "$BRANCH_NAME" 2>/dev/null || {
echo -e "${YELLOW}Branch already exists, switching to it.${NC}"
git checkout "$BRANCH_NAME"
}
echo ""
# Step 3: Guide through commit
echo -e "${YELLOW}Step 3: Make your changes and commit.${NC}"
echo " git add -A"
echo " git commit -m 'fix: implementation for #${ISSUE_NUMBER}'"
echo ""
# Step 4: Push and create PR
echo -e "${YELLOW}Step 4: Push and create PR.${NC}"
echo " git push -u origin ${BRANCH_NAME}"
echo ""
echo -e "${GREEN}✓ Ready to create PR safely!${NC}"

View File

@@ -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)