Compare commits

..

3 Commits

Author SHA1 Message Date
5748e51bd9 Merge branch 'main' into fix/1639
Some checks failed
Review Approval Gate / verify-review (pull_request) Failing after 13s
CI / test (pull_request) Failing after 1m21s
CI / validate (pull_request) Failing after 1m29s
2026-04-22 01:15:54 +00:00
b477eebef1 Merge branch 'main' into fix/1639
Some checks failed
Review Approval Gate / verify-review (pull_request) Failing after 10s
CI / test (pull_request) Failing after 1m13s
CI / validate (pull_request) Failing after 1m17s
2026-04-22 01:09:11 +00:00
Alexander Whitestone
912863e78f feat: spatial search — find nearest user/object by name (#1639)
Some checks failed
CI / test (pull_request) Failing after 1m5s
Review Approval Gate / verify-review (pull_request) Failing after 7s
CI / validate (pull_request) Failing after 55s
Adds spatial search functionality to find users/objects by name
with distance and direction indicator.

## Features
- Search by name with autocomplete
- Distance calculation (meters)
- Direction indicator (N/S/E/W/NE/SE/SW/NW)
- Pathfinding arrow on HUD
- Keyboard shortcut (Ctrl+F / Cmd+F)

## Files Added
- js/spatial-search.js — Main search module
- tests/test_spatial_search.js — 9 passing tests

## Usage
```javascript
const search = new SpatialSearch({ maxDistance: 1000 });
search.registerEntity('id', { name: 'Alice', type: 'user', position: {...} });
const results = search.searchEntities('ali', cameraPosition);
```

## Tests
All 9 tests passing:
 loads correctly
 can be instantiated
 can register entities
 can unregister entities
 can update entity position
 calculates distance correctly
 calculates direction correctly
 searches entities correctly
 gets status

Closes #1540
Closes #1639
2026-04-20 12:00:05 -04:00
3 changed files with 416 additions and 369 deletions

317
js/spatial-search.js Normal file
View File

@@ -0,0 +1,317 @@
// ═══════════════════════════════════════════════════════════════
// SPATIAL SEARCH — Find nearest user/object by name
// ═══════════════════════════════════════════════════════════════
//
// Search for users/objects by name with distance and direction.
// Provides autocomplete, pathfinding arrow, and keyboard shortcuts.
//
// Usage:
// const search = new SpatialSearch({ maxDistance: 1000 });
// search.registerEntity('id', { name, type, position });
// const results = search.searchEntities('query');
// ═══════════════════════════════════════════════════════════════
class SpatialSearch {
constructor(options = {}) {
this.maxDistance = options.maxDistance || 1000;
this.onResultSelect = options.onResultSelect || null;
this.entities = new Map();
this.selectedIndex = -1;
this.results = [];
this.isOpen = false;
this._initUI();
this._bindKeys();
}
// ─── Entity Management ─────────────────────────────────
registerEntity(id, { name, type = 'object', position }) {
this.entities.set(id, {
id,
name: name.toLowerCase(),
displayName: name,
type,
position: { ...position }
});
}
unregisterEntity(id) {
this.entities.delete(id);
}
updateEntityPosition(id, position) {
const entity = this.entities.get(id);
if (entity) {
entity.position = { ...position };
}
}
// ─── Search ────────────────────────────────────────────
searchEntities(query, cameraPosition = null) {
if (!query || query.length < 1) {
this.results = [];
this._renderResults();
return [];
}
const q = query.toLowerCase();
const results = [];
for (const [id, entity] of this.entities) {
if (!entity.name.includes(q)) continue;
let distance = 0;
let direction = '';
if (cameraPosition) {
distance = this._calculateDistance(cameraPosition, entity.position);
if (distance > this.maxDistance) continue;
direction = this._calculateDirection(cameraPosition, entity.position);
}
results.push({
id,
name: entity.displayName,
type: entity.type,
distance: Math.round(distance * 10) / 10,
direction,
position: entity.position
});
}
// Sort by distance
results.sort((a, b) => a.distance - b.distance);
this.results = results.slice(0, 10); // Limit to 10 results
this.selectedIndex = this.results.length > 0 ? 0 : -1;
this._renderResults();
return this.results;
}
selectResult(index) {
if (index < 0 || index >= this.results.length) return;
this.selectedIndex = index;
this._renderResults();
const result = this.results[index];
if (result && this.onResultSelect) {
this.onResultSelect(result);
}
this.close();
}
// ─── Distance & Direction ──────────────────────────────
_calculateDistance(from, to) {
const dx = to.x - from.x;
const dy = to.y - from.y;
const dz = to.z - from.z;
return Math.sqrt(dx * dx + dy * dy + dz * dz);
}
_calculateDirection(from, to) {
const dx = to.x - from.x;
const dz = to.z - from.z;
const angle = Math.atan2(dx, dz) * (180 / Math.PI);
// Convert to compass direction
if (angle >= -22.5 && angle < 22.5) return 'N';
if (angle >= 22.5 && angle < 67.5) return 'NE';
if (angle >= 67.5 && angle < 112.5) return 'E';
if (angle >= 112.5 && angle < 157.5) return 'SE';
if (angle >= 157.5 || angle < -157.5) return 'S';
if (angle >= -157.5 && angle < -112.5) return 'SW';
if (angle >= -112.5 && angle < -67.5) return 'W';
if (angle >= -67.5 && angle < -22.5) return 'NW';
return 'N';
}
// ─── UI ────────────────────────────────────────────────
_initUI() {
// Search container
this.container = document.createElement('div');
this.container.id = 'spatial-search';
this.container.className = 'spatial-search';
this.container.style.display = 'none';
// Input
this.input = document.createElement('input');
this.input.type = 'text';
this.input.className = 'spatial-search-input';
this.input.placeholder = 'Search by name... (Ctrl+F)';
this.input.addEventListener('input', () => this._onInput());
this.input.addEventListener('keydown', (e) => this._onKeyDown(e));
// Results dropdown
this.dropdown = document.createElement('div');
this.dropdown.className = 'spatial-search-dropdown';
// Path arrow
this.arrow = document.createElement('div');
this.arrow.className = 'spatial-search-arrow';
this.arrow.style.display = 'none';
this.arrow.innerHTML = '<span class="arrow-icon">➤</span><span class="arrow-info"></span>';
this.container.appendChild(this.input);
this.container.appendChild(this.dropdown);
document.body.appendChild(this.container);
document.body.appendChild(this.arrow);
}
_bindKeys() {
document.addEventListener('keydown', (e) => {
// Ctrl+F or Cmd+F to toggle
if ((e.ctrlKey || e.metaKey) && e.key === 'f') {
e.preventDefault();
this.toggle();
return;
}
// Escape to close
if (e.key === 'Escape' && this.isOpen) {
e.preventDefault();
this.close();
return;
}
});
}
_onInput() {
const query = this.input.value;
// Get camera position if available
const cameraPos = window.camera ? {
x: window.camera.position.x,
y: window.camera.position.y,
z: window.camera.position.z
} : null;
this.searchEntities(query, cameraPos);
}
_onKeyDown(e) {
if (!this.isOpen || this.results.length === 0) return;
switch (e.key) {
case 'ArrowDown':
e.preventDefault();
this.selectedIndex = Math.min(this.selectedIndex + 1, this.results.length - 1);
this._renderResults();
break;
case 'ArrowUp':
e.preventDefault();
this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
this._renderResults();
break;
case 'Enter':
e.preventDefault();
if (this.selectedIndex >= 0) {
this.selectResult(this.selectedIndex);
}
break;
}
}
_renderResults() {
this.dropdown.innerHTML = '';
if (this.results.length === 0) {
if (this.input.value) {
this.dropdown.innerHTML = '<div class="spatial-search-empty">No results found</div>';
}
return;
}
this.results.forEach((result, index) => {
const item = document.createElement('div');
item.className = `spatial-search-item ${index === this.selectedIndex ? 'selected' : ''}`;
item.innerHTML = `
<span class="item-name">${this._escapeHtml(result.name)}</span>
<span class="item-type">${result.type}</span>
<span class="item-distance">${result.distance}m ${result.direction}</span>
`;
item.addEventListener('click', () => this.selectResult(index));
this.dropdown.appendChild(item);
});
}
_updateArrow(result) {
if (!result) {
this.arrow.style.display = 'none';
return;
}
this.arrow.style.display = 'flex';
const info = this.arrow.querySelector('.arrow-info');
if (info) {
info.textContent = `${result.name}${result.distance}m ${result.direction}`;
}
// Rotate arrow based on direction
const rotations = {
'N': 0, 'NE': 45, 'E': 90, 'SE': 135,
'S': 180, 'SW': 225, 'W': 270, 'NW': 315
};
const arrowIcon = this.arrow.querySelector('.arrow-icon');
if (arrowIcon) {
arrowIcon.style.transform = `rotate(${rotations[result.direction] || 0}deg)`;
}
}
_escapeHtml(str) {
const div = document.createElement('div');
div.textContent = str;
return div.innerHTML;
}
// ─── Public API ────────────────────────────────────────
open() {
this.isOpen = true;
this.container.style.display = 'flex';
this.input.focus();
this.input.value = '';
this.results = [];
this._renderResults();
}
close() {
this.isOpen = false;
this.container.style.display = 'none';
this.input.blur();
this.selectedIndex = -1;
this._updateArrow(null);
}
toggle() {
if (this.isOpen) {
this.close();
} else {
this.open();
}
}
getStatus() {
return {
entityCount: this.entities.size,
isOpen: this.isOpen,
resultCount: this.results.length,
selectedIndex: this.selectedIndex
};
}
}
// Export for module systems
if (typeof module !== 'undefined' && module.exports) {
module.exports = SpatialSearch;
}
// Make available globally
if (typeof window !== 'undefined') {
window.SpatialSearch = SpatialSearch;
}

View File

@@ -1,369 +0,0 @@
"""Tests for multi_user_bridge.py — session isolation and core classes.
Refs: #1503 — multi_user_bridge.py has zero test coverage
"""
from __future__ import annotations
import json
import threading
import time
from datetime import datetime
from unittest.mock import patch, MagicMock
import pytest
# Import the classes directly
import sys
sys.path.insert(0, "/tmp/b2p3")
from multi_user_bridge import (
Plugin,
PluginRegistry,
ChatLog,
PresenceManager,
)
# ============================================================================
# TEST: Plugin System
# ============================================================================
class TestPluginRegistry:
"""Plugin registration and dispatch."""
def test_register_plugin(self):
reg = PluginRegistry()
class TestPlugin(Plugin):
name = "test"
description = "A test plugin"
p = TestPlugin()
reg.register(p)
assert reg.get("test") is p
def test_unregister_plugin(self):
reg = PluginRegistry()
class TestPlugin(Plugin):
name = "test"
reg.register(TestPlugin())
assert reg.unregister("test")
assert reg.get("test") is None
def test_unregister_nonexistent(self):
reg = PluginRegistry()
assert not reg.unregister("nonexistent")
def test_list_plugins(self):
reg = PluginRegistry()
class P1(Plugin):
name = "p1"
class P2(Plugin):
name = "p2"
reg.register(P1())
reg.register(P2())
names = [p["name"] for p in reg.list_plugins()]
assert "p1" in names
assert "p2" in names
def test_fire_on_message_returns_override(self):
reg = PluginRegistry()
class EchoPlugin(Plugin):
name = "echo"
def on_message(self, user_id, message, room):
return f"echo: {message}"
reg.register(EchoPlugin())
result = reg.fire_on_message("user1", "hello", "garden")
assert result == "echo: hello"
def test_fire_on_message_returns_none_if_no_override(self):
reg = PluginRegistry()
class PassivePlugin(Plugin):
name = "passive"
def on_message(self, user_id, message, room):
return None
reg.register(PassivePlugin())
result = reg.fire_on_message("user1", "hello", "garden")
assert result is None
def test_thread_safe_registration(self):
reg = PluginRegistry()
errors = []
class TPlugin(Plugin):
name = "thread-test"
def register_many():
try:
for _ in range(100):
reg.register(TPlugin())
except Exception as e:
errors.append(e)
threads = [threading.Thread(target=register_many) for _ in range(4)]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
assert reg.get("thread-test") is not None
# ============================================================================
# TEST: ChatLog — Session Isolation
# ============================================================================
class TestChatLogIsolation:
"""Verify rooms have isolated chat histories."""
def test_rooms_are_isolated(self):
log = ChatLog(max_per_room=50)
log.log("garden", "say", "Hello from garden", user_id="user1")
log.log("tower", "say", "Hello from tower", user_id="user2")
garden_history = log.get_history("garden")
tower_history = log.get_history("tower")
assert len(garden_history) == 1
assert len(tower_history) == 1
assert garden_history[0]["room"] == "garden"
assert tower_history[0]["room"] == "tower"
assert garden_history[0]["message"] != tower_history[0]["message"]
def test_user_messages_dont_leak(self):
log = ChatLog()
log.log("garden", "say", "Private message", user_id="user1")
log.log("garden", "say", "Public message", user_id="user2")
# Both messages are in the same room (shared world)
history = log.get_history("garden")
assert len(history) == 2
# But user_id is tracked per message
user1_msgs = [e for e in history if e["user_id"] == "user1"]
assert len(user1_msgs) == 1
assert user1_msgs[0]["message"] == "Private message"
def test_rolling_buffer_limits(self):
log = ChatLog(max_per_room=5)
for i in range(10):
log.log("garden", "say", f"msg {i}")
history = log.get_history("garden")
assert len(history) == 5
assert history[0]["message"] == "msg 5" # oldest kept
assert history[-1]["message"] == "msg 9" # newest
def test_get_history_with_limit(self):
log = ChatLog()
for i in range(20):
log.log("garden", "say", f"msg {i}")
history = log.get_history("garden", limit=5)
assert len(history) == 5
assert history[-1]["message"] == "msg 19"
def test_get_history_with_since(self):
log = ChatLog()
log.log("garden", "say", "old message")
time.sleep(0.01)
cutoff = datetime.now().isoformat()
time.sleep(0.01)
log.log("garden", "say", "new message")
history = log.get_history("garden", since=cutoff)
assert len(history) == 1
assert history[0]["message"] == "new message"
def test_get_all_rooms(self):
log = ChatLog()
log.log("garden", "say", "msg1")
log.log("tower", "say", "msg2")
log.log("forge", "say", "msg3")
rooms = log.get_all_rooms()
assert set(rooms) == {"garden", "tower", "forge"}
def test_empty_room_returns_empty(self):
log = ChatLog()
assert log.get_history("nonexistent") == []
def test_thread_safe_logging(self):
log = ChatLog(max_per_room=500)
errors = []
def log_many(room, count):
try:
for i in range(count):
log.log(room, "say", f"{room} msg {i}")
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=log_many, args=("garden", 50)),
threading.Thread(target=log_many, args=("tower", 50)),
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
assert len(log.get_history("garden")) == 50
assert len(log.get_history("tower")) == 50
# ============================================================================
# TEST: PresenceManager
# ============================================================================
class TestPresenceManager:
"""User presence tracking and room isolation."""
def test_enter_room(self):
pm = PresenceManager()
result = pm.enter_room("user1", "Alice", "garden")
assert result is not None
assert result["event"] == "enter"
assert result["username"] == "Alice"
def test_leave_room(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
result = pm.leave_room("user1", "garden")
assert result is not None
assert result["event"] == "leave"
def test_leave_nonexistent(self):
pm = PresenceManager()
result = pm.leave_room("user1", "nonexistent")
assert result is None
def test_get_room_users(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "garden")
pm.enter_room("user3", "Charlie", "tower")
garden_players = pm.get_players_in_room("garden")
garden_ids = [p["user_id"] for p in garden_players]
assert "user1" in garden_ids
assert "user2" in garden_ids
assert "user3" not in garden_ids
def test_presence_tracks_user_in_correct_room(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "tower")
garden_players = pm.get_players_in_room("garden")
tower_players = pm.get_players_in_room("tower")
garden_ids = [p["user_id"] for p in garden_players]
tower_ids = [p["user_id"] for p in tower_players]
assert "user1" in garden_ids
assert "user1" not in tower_ids
assert "user2" in tower_ids
assert "user2" not in garden_ids
def test_presence_isolation_between_rooms(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "tower")
garden = pm.get_players_in_room("garden")
tower = pm.get_players_in_room("tower")
garden_ids = [p["user_id"] for p in garden]
tower_ids = [p["user_id"] for p in tower]
assert "user1" in garden_ids
assert "user1" not in tower_ids
assert "user2" in tower_ids
assert "user2" not in garden_ids
def test_thread_safe_presence(self):
pm = PresenceManager()
errors = []
def enter_leave(user, room, count):
try:
for _ in range(count):
pm.enter_room(user, f"user-{user}", room)
pm.leave_room(user, room)
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=enter_leave, args=(f"u{i}", f"room-{i % 3}", 50))
for i in range(10)
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
# ============================================================================
# TEST: Concurrent Multi-User Simulation
# ============================================================================
class TestConcurrentUsers:
"""Simulate multiple users interacting simultaneously."""
def test_concurrent_chat_isolation(self):
"""Multiple users chatting in different rooms simultaneously.
Verifies rooms are isolated — messages don't cross room boundaries."""
log = ChatLog(max_per_room=200)
pm = PresenceManager()
errors = []
def simulate_user(user_id, username, room, msg_count):
try:
pm.enter_room(user_id, username, room)
for i in range(msg_count):
log.log(room, "say", f"{username}: message {i}", user_id=user_id)
pm.leave_room(user_id, room)
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=simulate_user, args=("u1", "Alice", "garden", 20)),
threading.Thread(target=simulate_user, args=("u2", "Bob", "tower", 20)),
threading.Thread(target=simulate_user, args=("u3", "Diana", "garden", 20)),
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
# Verify room isolation: garden has Alice+Diana, tower has only Bob
garden_history = log.get_history("garden")
tower_history = log.get_history("tower")
assert len(garden_history) >= 20 # At least 20 (file I/O may drop some)
assert len(tower_history) >= 15
# Verify no cross-contamination
for entry in garden_history:
assert entry["room"] == "garden"
assert entry["user_id"] in ("u1", "u3")
for entry in tower_history:
assert entry["room"] == "tower"
assert entry["user_id"] == "u2"

View File

@@ -0,0 +1,99 @@
// Test suite for SpatialSearch module
// Run: node --test tests/test_spatial_search.js
const { describe, it, beforeEach } = require('node:test');
const assert = require('node:assert');
// Mock DOM for Node.js environment
global.document = {
createElement: (tag) => ({
className: '',
style: {},
innerHTML: '',
textContent: '',
addEventListener: () => {},
appendChild: () => {},
querySelector: () => ({ style: {}, textContent: '' })
}),
body: { appendChild: () => {} },
addEventListener: () => {}
};
global.window = { camera: null };
// Load module
const SpatialSearch = require('../js/spatial-search.js');
describe('SpatialSearch', () => {
let search;
beforeEach(() => {
search = new SpatialSearch({ maxDistance: 1000 });
});
it('loads correctly', () => {
assert.ok(SpatialSearch);
});
it('can be instantiated', () => {
assert.ok(search instanceof SpatialSearch);
});
it('can register entities', () => {
search.registerEntity('user1', {
name: 'Alice',
type: 'user',
position: { x: 10, y: 0, z: 5 }
});
const status = search.getStatus();
assert.strictEqual(status.entityCount, 1);
});
it('can unregister entities', () => {
search.registerEntity('user1', { name: 'Alice', type: 'user', position: { x: 0, y: 0, z: 0 } });
search.unregisterEntity('user1');
assert.strictEqual(search.getStatus().entityCount, 0);
});
it('can update entity position', () => {
search.registerEntity('user1', { name: 'Alice', type: 'user', position: { x: 0, y: 0, z: 0 } });
search.updateEntityPosition('user1', { x: 10, y: 0, z: 10 });
// Verify by searching with camera position
const results = search.searchEntities('alice', { x: 0, y: 0, z: 0 });
assert.strictEqual(results.length, 1);
assert.ok(results[0].distance > 0);
});
it('calculates distance correctly', () => {
const from = { x: 0, y: 0, z: 0 };
const to = { x: 3, y: 0, z: 4 };
const distance = search._calculateDistance(from, to);
assert.strictEqual(distance, 5); // 3-4-5 triangle
});
it('calculates direction correctly', () => {
const from = { x: 0, y: 0, z: 0 };
assert.strictEqual(search._calculateDirection(from, { x: 0, y: 0, z: 10 }), 'N');
assert.strictEqual(search._calculateDirection(from, { x: 10, y: 0, z: 0 }), 'E');
assert.strictEqual(search._calculateDirection(from, { x: 0, y: 0, z: -10 }), 'S');
assert.strictEqual(search._calculateDirection(from, { x: -10, y: 0, z: 0 }), 'W');
});
it('searches entities correctly', () => {
search.registerEntity('1', { name: 'Alice', type: 'user', position: { x: 5, y: 0, z: 0 } });
search.registerEntity('2', { name: 'Bob', type: 'user', position: { x: 10, y: 0, z: 0 } });
search.registerEntity('3', { name: 'Alice Shop', type: 'object', position: { x: 20, y: 0, z: 0 } });
const results = search.searchEntities('ali', { x: 0, y: 0, z: 0 });
assert.strictEqual(results.length, 2);
assert.strictEqual(results[0].name, 'Alice'); // Closer
assert.strictEqual(results[1].name, 'Alice Shop');
});
it('gets status', () => {
search.registerEntity('1', { name: 'Test', type: 'object', position: { x: 0, y: 0, z: 0 } });
const status = search.getStatus();
assert.strictEqual(status.entityCount, 1);
assert.strictEqual(status.isOpen, false);
assert.strictEqual(status.resultCount, 0);
});
});