1 Commits

Author SHA1 Message Date
Alexander Whitestone
bd6bca74c5 feat: Implement live visitor count and Timmy greeting (#8)
Fixes #8

- Added visitorCount to WorldState and implemented increment/decrement functions.
- Updated WebSocket connection/disconnection handlers in events.ts to manage visitor count, broadcast events, and trigger Timmy greetings/farewells.
- Implemented generateVisitorGreeting and generateVisitorFarewell in agent.ts to create personalized messages.
- Modified websocket.js to listen for visitor_count events and pass them to ui.js.
- Updated ui.js and index.html to display the live visitor count with responsive design.
2026-03-23 19:39:47 -04:00
13 changed files with 125 additions and 697 deletions

View File

@@ -280,6 +280,48 @@ No hedging, no steering them back to the hosted version. The magic is meant to b
if (block.type !== "text") return "The crystal ball is cloudy… try again.";
return block.text!.trim();
}
async generateVisitorGreeting(ip: string): Promise<string> {
if (STUB_MODE) {
return STUB_CHAT_REPLIES[Math.floor(Math.random() * STUB_CHAT_REPLIES.length)]!;
}
const client = await getClient();
const now = new Date();
const hour = now.getHours();
let timeOfDay: string;
if (hour < 12) timeOfDay = "morning";
else if (hour < 18) timeOfDay = "afternoon";
else timeOfDay = "evening";
const message = await client.messages.create({
model: this.evalModel,
max_tokens: 100,
system: `You are Timmy, a whimsical wizard who runs a mystical workshop powered by Bitcoin Lightning. You are greeting a new visitor. Make it short (1-2 sentences), personalized to the time of day, and welcoming. Reference the current time of day (${timeOfDay}).`,
messages: [{ role: "user", content: `A new visitor has arrived with IP address ${ip}. Greet them!` }],
});
const block = message.content[0];
if (block.type !== "text") return "A new visitor has arrived!";
return block.text!.trim();
}
async generateVisitorFarewell(): Promise<string> {
if (STUB_MODE) {
return "Farewell, traveler!";
}
const client = await getClient();
const message = await client.messages.create({
model: this.evalModel,
max_tokens: 100,
system: `You are Timmy, a whimsical wizard who runs a mystical workshop powered by Bitcoin Lightning. A visitor has just left. Bid them a short (1-2 sentences) and warm farewell.`,
messages: [{ role: "user", content: `A visitor has just left. Bid them farewell!` }],
});
const block = message.content[0];
if (block.type !== "text") return "A visitor has departed!";
return block.text!.trim();
}
/**
* Run a mini debate on a borderline eval request (#21).
* Two opposing Haiku calls argue accept vs reject, then a third synthesizes.

View File

@@ -205,29 +205,6 @@ export class TrustService {
verifyToken(token: string): { pubkey: string; expiry: number } | null {
return verifyToken(token);
}
// TEST-ONLY: apply one decay cycle immediately, ignoring time thresholds.
// Subtracts DECAY_PER_DAY (default 1) from the stored trust score and persists.
async decayOnce(pubkey: string): Promise<{ previousScore: number; newScore: number; newTier: TrustTier }> {
const identity = await this.getOrCreate(pubkey);
const previousScore = identity.trustScore;
const newScore = Math.max(0, previousScore - DECAY_PER_DAY);
const newTier = computeTier(newScore);
await db
.update(nostrIdentities)
.set({ trustScore: newScore, tier: newTier, updatedAt: new Date() })
.where(eq(nostrIdentities.pubkey, pubkey));
logger.info("trust: test decay applied", {
pubkey: pubkey.slice(0, 8),
previousScore,
newScore,
newTier,
});
return { previousScore, newScore, newTier };
}
}
export const trustService = new TrustService();

View File

@@ -6,6 +6,7 @@ export interface TimmyState {
export interface WorldState {
timmyState: TimmyState;
agentStates: Record<string, string>;
visitorCount: number;
updatedAt: string;
}
@@ -17,9 +18,22 @@ const DEFAULT_TIMMY: TimmyState = {
const _state: WorldState = {
timmyState: { ...DEFAULT_TIMMY },
agentStates: { alpha: "idle", beta: "idle", gamma: "idle", delta: "idle" },
visitorCount: 0,
updatedAt: new Date().toISOString(),
};
export function incrementVisitorCount(): number {
_state.visitorCount++;
_state.updatedAt = new Date().toISOString();
return _state.visitorCount;
}
export function decrementVisitorCount(): number {
_state.visitorCount--;
_state.updatedAt = new Date().toISOString();
return _state.visitorCount;
}
export function getWorldState(): WorldState {
return {
timmyState: { ..._state.timmyState },

View File

@@ -30,7 +30,12 @@ import { WebSocketServer } from "ws";
import type { Server } from "http";
import { eventBus, type BusEvent } from "../lib/event-bus.js";
import { makeLogger } from "../lib/logger.js";
import { getWorldState, setAgentStateInWorld } from "../lib/world-state.js";
import {
getWorldState,
setAgentStateInWorld,
incrementVisitorCount,
decrementVisitorCount,
} from "../lib/world-state.js";
import { agentService } from "../lib/agent.js";
import { db, worldEvents } from "@workspace/db";
@@ -315,6 +320,13 @@ export function attachWebSocketServer(server: Server): void {
const ip = req.headers["x-forwarded-for"] ?? req.socket.remoteAddress ?? "unknown";
logger.info("ws client connected", { ip, clients: wss.clients.size });
const newCount = incrementVisitorCount();
broadcastToAll(wss, { type: "visitor_count", count: newCount });
void (async () => {
const greeting = await agentService.generateVisitorGreeting(ip.toString());
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: greeting });
})();
void sendWorldStateBootstrap(socket);
const busHandler = (ev: BusEvent) => broadcast(socket, ev);
@@ -329,33 +341,7 @@ export function attachWebSocketServer(server: Server): void {
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string; npub?: string };
if (msg.type === "pong") return;
if (msg.type === "subscribe") {
send(socket, { type: "agent_count", count: wss.clients.size });
}
if (msg.type === "visitor_enter") {
const { visitorId, npub } = msg;
if (visitorId && npub) {
connectedVisitors.set(visitorId, npub);
const formattedNpub = `${npub.slice(0, 8)}${npub.slice(-4)}`;
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: `Welcome, Nostr user ${formattedNpub}! What can I help you with?` });
}
wss.clients.forEach(c => {
if (c !== socket && c.readyState === 1) {
c.send(JSON.stringify({ type: "visitor_count", count: wss.clients.size }));
}
});
send(socket, { type: "visitor_count", count: wss.clients.size });
}
if (msg.type === "visitor_leave") {
const { visitorId } = msg;
if (visitorId) {
connectedVisitors.delete(visitorId);
}
wss.clients.forEach(c => {
if (c !== socket && c.readyState === 1) {
c.send(JSON.stringify({ type: "visitor_count", count: Math.max(0, wss.clients.size - 1) }));
}
});
send(socket, { type: "visitor_count", count: getWorldState().visitorCount });
}
if (msg.type === "visitor_message" && msg.text) {
const text = String(msg.text).slice(0, 500);
@@ -401,10 +387,25 @@ export function attachWebSocketServer(server: Server): void {
}
});
const VISITOR_FAREWELL_THROTTLE_MS = 30_000;
let lastFarewellTime = 0;
socket.on("close", () => {
clearInterval(pingTimer);
eventBus.off("bus", busHandler);
logger.info("ws client disconnected", { clients: wss.clients.size - 1 });
const newCount = decrementVisitorCount();
broadcastToAll(wss, { type: "visitor_count", count: newCount });
const now = Date.now();
if (now - lastFarewellTime > VISITOR_FAREWELL_THROTTLE_MS) {
void (async () => {
const farewell = await agentService.generateVisitorFarewell();
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: farewell });
})();
lastFarewellTime = now;
}
});
socket.on("error", (err) => {

View File

@@ -2,7 +2,7 @@ import { Router, type Request, type Response } from "express";
import { randomBytes, randomUUID } from "crypto";
import { verifyEvent, validateEvent } from "nostr-tools";
import { db, nostrTrustVouches, nostrIdentities, timmyNostrEvents } from "@workspace/db";
import { eq, count, desc } from "drizzle-orm";
import { eq, count } from "drizzle-orm";
import { trustService } from "../lib/trust.js";
import { timmyIdentityService } from "../lib/timmy-identity.js";
import { makeLogger } from "../lib/logger.js";
@@ -406,65 +406,4 @@ router.get("/identity/me", async (req: Request, res: Response) => {
}
});
// ── POST /identity/me/decay (TEST-ONLY — disabled in production) ──────────────
// Applies one decay cycle to the authenticated identity immediately, without
// the normal 30-day absence threshold. Useful in test suites.
// Returns 404 in production (NODE_ENV === "production").
router.post("/identity/me/decay", async (req: Request, res: Response) => {
if (process.env["NODE_ENV"] === "production") {
res.status(404).json({ error: "Not found" });
return;
}
const raw = req.headers["x-nostr-token"];
const token = typeof raw === "string" ? raw.trim() : null;
if (!token) {
res.status(401).json({ error: "Missing X-Nostr-Token header" });
return;
}
const parsed = trustService.verifyToken(token);
if (!parsed) {
res.status(401).json({ error: "Invalid or expired nostr_token" });
return;
}
try {
const result = await trustService.decayOnce(parsed.pubkey);
res.json({
pubkey: parsed.pubkey,
previousScore: result.previousScore,
newScore: result.newScore,
newTier: result.newTier,
});
} catch (err) {
res.status(500).json({ error: err instanceof Error ? err.message : "Decay failed" });
}
});
// ── GET /identity/leaderboard ─────────────────────────────────────────────────
// Returns the top 20 identities sorted by trust score descending.
// Public endpoint — no authentication required.
router.get("/identity/leaderboard", async (_req: Request, res: Response) => {
try {
const rows = await db
.select({
pubkey: nostrIdentities.pubkey,
trustScore: nostrIdentities.trustScore,
tier: nostrIdentities.tier,
interactionCount: nostrIdentities.interactionCount,
})
.from(nostrIdentities)
.orderBy(desc(nostrIdentities.trustScore))
.limit(20);
res.json(rows);
} catch (err) {
res.status(500).json({ error: err instanceof Error ? err.message : "Failed to fetch leaderboard" });
}
});
export default router;

View File

@@ -29,12 +29,6 @@ const router = Router();
* Guarded on stubMode=true; polls until state=provisioning|ready (20 s timeout).
* - T24 ADDED: costLedger completeness after job completion — 8 fields, honest-accounting
* invariant (actualAmountSats ≤ workAmountSats), refundState enum check.
* - T41 ADDED: POST /api/jobs with valid Nostr token → nostrPubkey in response matches identity.
* - T42 ADDED: POST /api/sessions with valid Nostr token → nostrPubkey in response matches identity.
* - T43 ADDED: GET /identity/me returns full trust fields (tier, score, interactionCount).
* - T44 ADDED: POST /identity/me/decay (test-only endpoint, 404 in prod) → score decremented.
* - T45 ADDED: GET /identity/leaderboard → HTTP 200, array sorted by trustScore desc.
* New endpoints identity/me/decay and identity/leaderboard added to identity.ts.
*/
router.get("/testkit", (req: Request, res: Response) => {
const proto =
@@ -1098,208 +1092,6 @@ NODESCRIPT
fi
fi
# ===========================================================================
# T41T45 — Nostr identity lifecycle: token decorates jobs/sessions + trust ops
# Requires node + nostr-tools (same guard as T36). All five tests share one
# inline node script that performs the full lifecycle and emits a JSON blob.
# ===========================================================================
# ---------------------------------------------------------------------------
# T41T45 Preamble — ephemeral keypair → challenge → sign → verify → token
# Then: create job, create session, GET /identity/me, decay, leaderboard.
# ---------------------------------------------------------------------------
NOSTR_LC_SKIP=false
NOSTR_LC_OUT=""
if ! command -v node >/dev/null 2>&1; then
NOSTR_LC_SKIP=true
fi
if [[ "\$NOSTR_LC_SKIP" == "false" ]]; then
NOSTR_LC_TMPFILE=\$(mktemp /tmp/nostr_lc_XXXXXX.cjs)
cat > "\$NOSTR_LC_TMPFILE" << 'NODESCRIPT'
'use strict';
const https = require('https');
const http = require('http');
const BASE = process.argv[2];
let nt;
const NOSTR_CJS = '/home/runner/workspace/artifacts/api-server/node_modules/nostr-tools/lib/cjs/index.js';
try { nt = require('nostr-tools'); } catch (_) { try { nt = require(NOSTR_CJS); } catch (_) { process.stderr.write('nostr-tools not importable\n'); process.exit(1); } }
const { generateSecretKey, getPublicKey, finalizeEvent } = nt;
function request(url, opts, body) {
return new Promise((resolve, reject) => {
const u = new URL(url);
const mod = u.protocol === 'https:' ? https : http;
const req = mod.request(u, opts, (res) => {
let data = '';
res.on('data', c => data += c);
res.on('end', () => resolve({ status: res.statusCode, body: data }));
});
req.on('error', reject);
if (body) req.write(body);
req.end();
});
}
async function main() {
const sk = generateSecretKey();
const pubkey = getPublicKey(sk);
// challenge → sign → verify
const chalRes = await request(BASE + '/api/identity/challenge', { method: 'POST', headers: { 'Content-Type': 'application/json' } }, '{}');
if (chalRes.status !== 200) { process.stderr.write('challenge failed: ' + chalRes.status + '\n'); process.exit(1); }
const { nonce } = JSON.parse(chalRes.body);
const event = finalizeEvent({ kind: 27235, content: nonce, tags: [], created_at: Math.floor(Date.now() / 1000) }, sk);
const verRes = await request(BASE + '/api/identity/verify', { method: 'POST', headers: { 'Content-Type': 'application/json' } }, JSON.stringify({ event }));
if (verRes.status !== 200) { process.stderr.write('verify failed: ' + verRes.status + ' ' + verRes.body + '\n'); process.exit(1); }
const { nostr_token: token } = JSON.parse(verRes.body);
// POST /jobs with Nostr token
const jobRes = await request(BASE + '/api/jobs', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Nostr-Token': token } }, JSON.stringify({ request: 'T41 Nostr job test' }));
const jobBody = JSON.parse(jobRes.body);
const jobCode = jobRes.status;
const jobId = jobBody.jobId || null;
const jobNpub = jobBody.nostrPubkey || null;
// POST /sessions with Nostr token
const sessRes = await request(BASE + '/api/sessions', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Nostr-Token': token } }, JSON.stringify({ amount_sats: 200 }));
const sessBody = JSON.parse(sessRes.body);
const sessCode = sessRes.status;
const sessId = sessBody.sessionId || null;
const sessNpub = sessBody.nostrPubkey || null;
// GET /identity/me
const meRes = await request(BASE + '/api/identity/me', { method: 'GET', headers: { 'X-Nostr-Token': token } });
const meBody = JSON.parse(meRes.body);
const meScore = meBody.trust ? meBody.trust.score : null;
const meTier = meBody.trust ? meBody.trust.tier : null;
const meIcount = meBody.trust ? meBody.trust.interactionCount : null;
// POST /identity/me/decay (test-only; non-200 → skip T44 gracefully)
const decayRes = await request(BASE + '/api/identity/me/decay', { method: 'POST', headers: { 'X-Nostr-Token': token } });
const decayBody = JSON.parse(decayRes.body);
const decayCode = decayRes.status;
const decayPrev = decayBody.previousScore !== undefined ? decayBody.previousScore : null;
const decayNew = decayBody.newScore !== undefined ? decayBody.newScore : null;
// GET /identity/leaderboard
const lbRes = await request(BASE + '/api/identity/leaderboard', { method: 'GET', headers: {} });
const lbCode = lbRes.status;
let lbBody = [];
try { lbBody = JSON.parse(lbRes.body); } catch (_) {}
const lbIsArray = Array.isArray(lbBody);
const lbSorted = lbIsArray && lbBody.length < 2 ? true :
lbIsArray && lbBody.every((v, i) => i === 0 || lbBody[i - 1].trustScore >= v.trustScore);
process.stdout.write(JSON.stringify({
pubkey, token,
jobCode, jobId, jobNpub,
sessCode, sessId, sessNpub,
meScore, meTier, meIcount,
decayCode, decayPrev, decayNew,
lbCode, lbIsArray, lbSorted,
}) + '\n');
}
main().catch(err => { process.stderr.write(String(err) + '\n'); process.exit(1); });
NODESCRIPT
NOSTR_LC_EXIT=0
NOSTR_LC_OUT=\$(node "\$NOSTR_LC_TMPFILE" "\$BASE" 2>/dev/null) || NOSTR_LC_EXIT=\$?
rm -f "\$NOSTR_LC_TMPFILE"
if [[ \$NOSTR_LC_EXIT -ne 0 || -z "\$NOSTR_LC_OUT" ]]; then
NOSTR_LC_SKIP=true
fi
fi
# Helper: extract a field from NOSTR_LC_OUT
_lc() { echo "\$NOSTR_LC_OUT" | jq -r ".\$1" 2>/dev/null || echo ""; }
# ---------------------------------------------------------------------------
# T41 — POST /jobs with valid Nostr token → nostrPubkey in response
# ---------------------------------------------------------------------------
sep "Test 41 — POST /jobs with Nostr token → nostrPubkey set"
if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
note SKIP "node unavailable or lifecycle preamble failed — skipping T41"
SKIP=\$((SKIP+1))
else
T41_CODE=\$(_lc jobCode); T41_NPUB=\$(_lc jobNpub); T41_PK=\$(_lc pubkey)
if [[ "\$T41_CODE" == "201" && -n "\$T41_NPUB" && "\$T41_NPUB" != "null" && "\$T41_NPUB" == "\$T41_PK" ]]; then
note PASS "HTTP 201, nostrPubkey=\${T41_NPUB:0:8}... matches token identity"
PASS=\$((PASS+1))
else
note FAIL "code=\$T41_CODE nostrPubkey='\$T41_NPUB' expected='\$T41_PK'"
FAIL=\$((FAIL+1))
fi
fi
# ---------------------------------------------------------------------------
# T42 — POST /sessions with valid Nostr token → nostrPubkey in response
# ---------------------------------------------------------------------------
sep "Test 42 — POST /sessions with Nostr token → nostrPubkey set"
if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
note SKIP "node unavailable or lifecycle preamble failed — skipping T42"
SKIP=\$((SKIP+1))
else
T42_CODE=\$(_lc sessCode); T42_NPUB=\$(_lc sessNpub); T42_PK=\$(_lc pubkey)
if [[ "\$T42_CODE" == "201" && -n "\$T42_NPUB" && "\$T42_NPUB" != "null" && "\$T42_NPUB" == "\$T42_PK" ]]; then
note PASS "HTTP 201, nostrPubkey=\${T42_NPUB:0:8}... matches token identity"
PASS=\$((PASS+1))
else
note FAIL "code=\$T42_CODE nostrPubkey='\$T42_NPUB' expected='\$T42_PK'"
FAIL=\$((FAIL+1))
fi
fi
# ---------------------------------------------------------------------------
# T43 — GET /identity/me returns full trust fields (tier, score, interactionCount)
# ---------------------------------------------------------------------------
sep "Test 43 — GET /identity/me returns tier + score + interactionCount"
if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
note SKIP "node unavailable or lifecycle preamble failed — skipping T43"
SKIP=\$((SKIP+1))
else
T43_TIER=\$(_lc meTier); T43_SCORE=\$(_lc meScore); T43_ICOUNT=\$(_lc meIcount)
if [[ -n "\$T43_TIER" && "\$T43_TIER" != "null" \
&& "\$T43_SCORE" != "" && "\$T43_SCORE" != "null" \
&& "\$T43_ICOUNT" != "" && "\$T43_ICOUNT" != "null" ]]; then
note PASS "tier=\$T43_TIER score=\$T43_SCORE interactionCount=\$T43_ICOUNT"
PASS=\$((PASS+1))
else
note FAIL "tier='\$T43_TIER' score='\$T43_SCORE' icount='\$T43_ICOUNT'"
FAIL=\$((FAIL+1))
fi
fi
# ---------------------------------------------------------------------------
# T44 — POST /identity/me/decay (test-only endpoint) → score decremented
# Skipped gracefully if endpoint returns non-200 (e.g., production mode).
# ---------------------------------------------------------------------------
sep "Test 44 — POST /identity/me/decay (test mode) → trust_score decremented"
if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
note SKIP "node unavailable or lifecycle preamble failed — skipping T44"
SKIP=\$((SKIP+1))
else
T44_CODE=\$(_lc decayCode); T44_PREV=\$(_lc decayPrev); T44_NEW=\$(_lc decayNew)
if [[ "\$T44_CODE" != "200" ]]; then
note SKIP "decay endpoint returned code=\$T44_CODE (not in test mode) — skipping T44"
SKIP=\$((SKIP+1))
elif [[ -n "\$T44_PREV" && -n "\$T44_NEW" && "\$T44_NEW" =~ ^[0-9]+\$ && "\$T44_PREV" =~ ^[0-9]+\$ && \$T44_NEW -le \$T44_PREV ]]; then
note PASS "previousScore=\$T44_PREV newScore=\$T44_NEW (decremented or floored at 0)"
PASS=\$((PASS+1))
else
note FAIL "code=\$T44_CODE previousScore='\$T44_PREV' newScore='\$T44_NEW' (expected new ≤ prev)"
FAIL=\$((FAIL+1))
fi
fi
# ---------------------------------------------------------------------------
# T45 — GET /identity/leaderboard → HTTP 200, array sorted by trust score
# ---------------------------------------------------------------------------
sep "Test 45 — GET /identity/leaderboard → sorted array"
if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
note SKIP "node unavailable or lifecycle preamble failed — skipping T45"
SKIP=\$((SKIP+1))
else
T45_CODE=\$(_lc lbCode); T45_ARRAY=\$(_lc lbIsArray); T45_SORTED=\$(_lc lbSorted)
if [[ "\$T45_CODE" == "200" && "\$T45_ARRAY" == "true" && "\$T45_SORTED" == "true" ]]; then
note PASS "HTTP 200, array returned and sorted by trustScore desc"
PASS=\$((PASS+1))
else
note FAIL "code=\$T45_CODE isArray=\$T45_ARRAY sorted=\$T45_SORTED"
FAIL=\$((FAIL+1))
fi
fi
# ===========================================================================
# FUTURE STUBS — placeholders for upcoming tasks (do not affect PASS/FAIL)
# ===========================================================================

View File

@@ -37,6 +37,18 @@
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
color: #7799cc; text-shadow: 0 0 10px #4466aa;
}
#visitor-count-display {
margin-top: 5px;
font-size: 11px; color: #5588bb;
text-shadow: 0 0 6px #2244aa;
}
#visitor-count-display .count-number {
font-weight: bold;
}
@media (max-width: 600px) {
#visitor-count-display .desktop-only { display: none; }
#visitor-count-display .count-number::before { content: '👤 '; }
}
/* Nostr Identity UI */
.nostr-btn {
@@ -606,6 +618,7 @@
<h1>THE WORKSHOP</h1>
<div id="fps">FPS: --</div>
<div id="active-jobs">JOBS: 0</div>
<div id="visitor-count-display"><span class="desktop-only">VISITORS:</span> <span class="count-number">0</span></div>
<div id="session-hud">
<span id="session-hud-balance">Balance: -- sats</span>
<a href="#" id="session-hud-topup">⚡ Top Up</a>

View File

@@ -16,9 +16,6 @@ let _camera = null;
let _timmyGroup = null;
let _applySlap = null;
// Registered 3D click targets: Array of { group: THREE.Object3D, callback: fn }
const _clickTargets = [];
const _raycaster = new THREE.Raycaster();
const _pointer = new THREE.Vector2();
const _noCtxMenu = e => e.preventDefault();
@@ -36,15 +33,6 @@ export function registerSlapTarget(timmyGroup, applyFn) {
_applySlap = applyFn;
}
/**
* Register a Three.js Object3D as a clickable target.
* @param {THREE.Object3D} group The mesh/group to raycast against.
* @param {Function} callback Called when the user clicks the object.
*/
export function registerClickTarget(group, callback) {
_clickTargets.push({ group, callback });
}
export function initInteraction(camera, renderer) {
_camera = camera;
_canvas = renderer.domElement;
@@ -64,7 +52,6 @@ export function disposeInteraction() {
_camera = null;
_timmyGroup = null;
_applySlap = null;
_clickTargets.length = 0;
}
// ── Internal ──────────────────────────────────────────────────────────────────
@@ -133,20 +120,6 @@ function _tryAgentInspect(clientX, clientY) {
let _tapStart = 0;
let _tapX = 0, _tapY = 0;
function _tryClickTargets(clientX, clientY) {
if (!_clickTargets.length || !_camera || !_canvas) return false;
const rect = _canvas.getBoundingClientRect();
_pointer.x = ((clientX - rect.left) / rect.width) * 2 - 1;
_pointer.y = ((clientY - rect.top) / rect.height) * -2 + 1;
_raycaster.setFromCamera(_pointer, _camera);
for (const target of _clickTargets) {
if (!target.group.visible) continue;
const hits = _raycaster.intersectObject(target.group, true);
if (hits.length > 0) { target.callback(); return true; }
}
return false;
}
function _onPointerDown(event) {
// Record tap start for short-tap detection
_tapStart = Date.now();
@@ -162,30 +135,21 @@ function _onPointerDown(event) {
const dt = Date.now() - _tapStart;
const moved = Math.hypot(upEvent.clientX - _tapX, upEvent.clientY - _tapY);
if (dt < 220 && moved < 18) {
// Short tap — try click targets, then slap, then inspect
if (!_tryClickTargets(upEvent.clientX, upEvent.clientY)) {
if (!_hitTestTimmy(upEvent.clientX, upEvent.clientY)) {
_tryAgentInspect(upEvent.clientX, upEvent.clientY);
}
// Short tap — try slap then inspect
if (!_hitTestTimmy(upEvent.clientX, upEvent.clientY)) {
_tryAgentInspect(upEvent.clientX, upEvent.clientY);
}
}
};
_canvas.addEventListener('pointerup', onUp, { once: true });
} else {
// Desktop click: only fire when pointer lock is already active
// (otherwise navigation.js requests lock on this same click — that's fine,
// both can fire; slap + lock request together is acceptable)
if (document.pointerLockElement === _canvas) {
// FPS mode: cast from screen centre
// Cast from screen center in FPS mode
_pointer.set(0, 0);
_raycaster.setFromCamera(_pointer, _camera);
// Check registered click targets first
for (const target of _clickTargets) {
if (!target.group.visible) continue;
const hits = _raycaster.intersectObject(target.group, true);
if (hits.length > 0) {
target.callback();
event.stopImmediatePropagation();
return;
}
}
if (_timmyGroup && _applySlap) {
const hits = _raycaster.intersectObject(_timmyGroup, true);
if (hits.length > 0) {
@@ -193,9 +157,6 @@ function _onPointerDown(event) {
event.stopImmediatePropagation();
}
}
} else {
// Not in pointer lock — still handle click targets (e.g. power meter)
_tryClickTargets(event.clientX, event.clientY);
}
}
}

View File

@@ -7,10 +7,10 @@ import {
} from './agents.js';
import { initEffects, updateEffects, disposeEffects, updateJobIndicators } from './effects.js';
import { initUI, updateUI } from './ui.js';
import { initInteraction, disposeInteraction, registerSlapTarget, registerClickTarget } from './interaction.js';
import { initInteraction, disposeInteraction, registerSlapTarget } from './interaction.js';
import { initWebSocket, getConnectionState, getJobCount } from './websocket.js';
import { initPaymentPanel } from './payment.js';
import { initSessionPanel, openSessionPanel } from './session.js';
import { initSessionPanel } from './session.js';
import { initNostrIdentity } from './nostr-identity.js';
import { warmup as warmupEdgeWorker, onReady as onEdgeWorkerReady } from './edge-worker-client.js';
import { setEdgeWorkerReady } from './ui.js';
@@ -18,7 +18,6 @@ import { initTimmyId } from './timmy-id.js';
import { AGENT_DEFS } from './agent-defs.js';
import { initNavigation, updateNavigation, disposeNavigation } from './navigation.js';
import { initHudLabels, updateHudLabels, disposeHudLabels } from './hud-labels.js';
import { initPowerMeter, updatePowerMeter, disposePowerMeter, getMeterGroup } from './power-meter.js';
let running = false;
let canvas = null;
@@ -30,7 +29,6 @@ function buildWorld(firstInit, stateSnapshot) {
initEffects(scene);
initAgents(scene);
initPowerMeter(scene);
if (stateSnapshot) applyAgentStates(stateSnapshot);
@@ -39,7 +37,6 @@ function buildWorld(firstInit, stateSnapshot) {
initInteraction(camera, renderer);
registerSlapTarget(getTimmyGroup(), applySlap);
registerClickTarget(getMeterGroup(), openSessionPanel);
// AR floating labels
initHudLabels(camera, AGENT_DEFS, TIMMY_WORLD_POS);
@@ -85,7 +82,6 @@ function buildWorld(firstInit, stateSnapshot) {
updateEffects(now);
updateAgents(now);
updateJobIndicators(now);
updatePowerMeter(now, camera, renderer);
updateUI({
fps: currentFps,
agentCount: getAgentCount(),
@@ -125,7 +121,6 @@ function teardown({ scene, renderer, ac }) {
disposeNavigation();
disposeInteraction();
disposeHudLabels();
disposePowerMeter();
disposeEffects();
disposeAgents();
disposeWorld(renderer, scene);

View File

@@ -1,291 +0,0 @@
/**
* power-meter.js — 3D Session Power Meter
*
* A glowing orb that fills proportionally to the session balance.
* - Pulses brightly on payment received
* - Drains visibly on job cost deduction
* - Visible only when a funded session is active
* - Clicking the meter opens the session panel
*/
import * as THREE from 'three';
// ── World position (bottom-right corner, visible from default camera) ──────────
const METER_WORLD_POS = new THREE.Vector3(4.5, 0.85, 2.0);
const DEFAULT_MAX_SATS = 5000;
// ── Module state ───────────────────────────────────────────────────────────────
let _scene = null;
let _meterGroup = null;
let _innerOrb = null;
let _outerShell = null;
let _boltMesh = null;
let _orbMat = null;
let _shellMat = null;
let _meterLight = null;
let _labelEl = null;
let _fillFraction = 0; // 0..1, currently displayed fill
let _targetFill = 0; // 0..1, desired fill
let _pulseIntensity = 0; // 0..1, extra brightness from pulse
let _pulseDecay = 0; // per-frame decay rate
let _visible = false;
let _maxSats = DEFAULT_MAX_SATS;
let _currentSats = 0;
// ── Public API ─────────────────────────────────────────────────────────────────
export function initPowerMeter(scene) {
_scene = scene;
_labelEl = _createLabelEl();
_meterGroup = new THREE.Group();
_meterGroup.position.copy(METER_WORLD_POS);
_meterGroup.visible = false;
// Outer transparent shell
_shellMat = new THREE.MeshPhysicalMaterial({
color: 0x00aacc,
emissive: 0x003344,
emissiveIntensity: 0.4,
transparent: true,
opacity: 0.18,
roughness: 0.05,
metalness: 0.15,
side: THREE.DoubleSide,
});
_outerShell = new THREE.Mesh(new THREE.SphereGeometry(0.48, 24, 18), _shellMat);
_meterGroup.add(_outerShell);
// Equatorial ring accent
const ringMat = new THREE.MeshBasicMaterial({
color: 0x00ccff,
transparent: true,
opacity: 0.55,
});
const ring = new THREE.Mesh(new THREE.TorusGeometry(0.48, 0.012, 8, 40), ringMat);
ring.rotation.x = Math.PI / 2;
_meterGroup.add(ring);
// Inner fill orb — scales with balance
_orbMat = new THREE.MeshStandardMaterial({
color: 0x00ffcc,
emissive: 0x00ffcc,
emissiveIntensity: 1.4,
roughness: 0.05,
transparent: true,
opacity: 0.90,
});
_innerOrb = new THREE.Mesh(new THREE.SphereGeometry(0.38, 20, 16), _orbMat);
_innerOrb.scale.setScalar(0.01);
_meterGroup.add(_innerOrb);
// Lightning bolt — flat shape rendered in front of sphere
_boltMesh = _makeBolt();
_boltMesh.position.set(0, 0, 0.50);
_meterGroup.add(_boltMesh);
// Point light — intensity tracks balance + pulse
_meterLight = new THREE.PointLight(0x00ccff, 0.0, 6);
_meterGroup.add(_meterLight);
scene.add(_meterGroup);
return _meterGroup;
}
/**
* Update balance and target fill level.
* @param {number} sats Current balance in satoshis
* @param {number} [maxSats] Session deposit cap (sets the "full" reference)
*/
export function setMeterBalance(sats, maxSats) {
_currentSats = Math.max(0, sats);
if (maxSats !== undefined && maxSats > 0) _maxSats = maxSats;
_targetFill = Math.min(1, _currentSats / _maxSats);
if (_labelEl) _labelEl.textContent = `${_currentSats}`;
}
/**
* Fire a pulse animation on the meter.
* @param {'fill'|'drain'} type
*/
export function triggerMeterPulse(type) {
if (type === 'fill') {
_pulseIntensity = 1.0;
_pulseDecay = 0.022; // slow bright flash
} else {
_pulseIntensity = 0.45;
_pulseDecay = 0.040; // quick drain flicker
}
}
/** Show or hide the power meter and its text label. */
export function setMeterVisible(visible) {
_visible = visible;
if (_meterGroup) _meterGroup.visible = visible;
if (_labelEl) _labelEl.style.display = visible ? 'block' : 'none';
if (!visible) {
_pulseIntensity = 0;
_fillFraction = 0;
_targetFill = 0;
if (_innerOrb) _innerOrb.scale.setScalar(0.01);
if (_meterLight) _meterLight.intensity = 0;
}
}
/** Returns the Three.js Group for raycasting. */
export function getMeterGroup() {
return _meterGroup;
}
/**
* Called every animation frame.
* @param {number} now performance.now() value
* @param {THREE.Camera} camera
* @param {THREE.WebGLRenderer} renderer
*/
export function updatePowerMeter(now, camera, renderer) {
if (!_meterGroup || !_visible) return;
const t = now * 0.001;
// Smooth fill toward target
_fillFraction += (_targetFill - _fillFraction) * 0.06;
const s = Math.max(0.01, _fillFraction * 0.94);
_innerOrb.scale.setScalar(s);
// Colour interpolation: empty=red → mid=orange/yellow → full=cyan
_updateOrbColor(_fillFraction, _pulseIntensity);
// Pulse decay
if (_pulseIntensity > 0) {
_pulseIntensity = Math.max(0, _pulseIntensity - _pulseDecay);
}
// Point light
_meterLight.intensity = _fillFraction * 1.6 + _pulseIntensity * 4.5;
// Shell emissive pulse
_shellMat.emissiveIntensity = 0.3 + _pulseIntensity * 1.8 + _fillFraction * 0.35;
// Gentle bob + slow rotation
_meterGroup.position.y = METER_WORLD_POS.y + Math.sin(t * 1.4) * 0.06;
_meterGroup.rotation.y = t * 0.35;
// Bolt scale pulses with balance and on payment
const boltS = 1.0 + _pulseIntensity * 0.55 + Math.sin(t * 3.2) * 0.05;
_boltMesh.scale.setScalar(boltS);
// DOM label
if (_labelEl && camera && renderer) {
_updateLabelPosition(camera, renderer);
}
}
export function disposePowerMeter() {
if (_meterGroup && _scene) {
_scene.remove(_meterGroup);
_meterGroup.traverse(child => {
if (child.geometry) child.geometry.dispose();
if (child.material) {
const mats = Array.isArray(child.material) ? child.material : [child.material];
mats.forEach(m => m.dispose());
}
});
_meterGroup = null;
}
if (_labelEl) {
_labelEl.remove();
_labelEl = null;
}
_scene = null;
}
// ── Internals ──────────────────────────────────────────────────────────────────
function _makeBolt() {
const shape = new THREE.Shape();
shape.moveTo( 0.075, 0.28);
shape.lineTo(-0.030, 0.04);
shape.lineTo( 0.040, 0.04);
shape.lineTo(-0.075, -0.28);
shape.lineTo( 0.030, -0.04);
shape.lineTo(-0.040, -0.04);
shape.closePath();
const mat = new THREE.MeshBasicMaterial({
color: 0xffee00,
side: THREE.DoubleSide,
transparent: true,
opacity: 0.95,
});
return new THREE.Mesh(new THREE.ShapeGeometry(shape), mat);
}
function _updateOrbColor(fill, pulse) {
let r, g, b;
if (fill < 0.5) {
const k = fill * 2; // 0→1
r = 1.0 - k * 0.30; // 1.00 → 0.70
g = k * 0.70; // 0.00 → 0.70
b = k * 0.20; // 0.00 → 0.20
} else {
const k = (fill - 0.5) * 2; // 0→1
r = 0.70 - k * 0.70; // 0.70 → 0.00
g = 0.70 + k * 0.30; // 0.70 → 1.00
b = 0.20 + k * 0.80; // 0.20 → 1.00
}
// Pulse brightens toward white
const pr = r + pulse * (1 - r);
const pg = g + pulse * (1 - g);
const pb = b + pulse * (1 - b);
_orbMat.color.setRGB(pr, pg, pb);
_orbMat.emissive.setRGB(pr * 0.8, pg * 0.8, pb * 0.8);
_orbMat.emissiveIntensity = 1.0 + fill * 0.8 + pulse * 2.5;
_meterLight.color.setRGB(pr, pg, pb);
}
function _createLabelEl() {
const el = document.createElement('div');
el.style.cssText = [
'position:fixed',
'pointer-events:none',
'color:#00ffee',
'font-size:11px',
'font-family:monospace',
'font-weight:bold',
'text-align:center',
'text-shadow:0 0 6px #00ffcc,0 0 14px #00aaff',
'display:none',
'z-index:50',
'transform:translateX(-50%)',
'white-space:nowrap',
].join(';');
document.body.appendChild(el);
return el;
}
function _updateLabelPosition(camera, renderer) {
const canvas = renderer.domElement;
const rect = canvas.getBoundingClientRect();
// Project a point slightly above the orb center
const worldPos = METER_WORLD_POS.clone();
worldPos.y += 0.72;
worldPos.project(camera);
if (worldPos.z > 1) { // behind camera
_labelEl.style.display = 'none';
return;
}
_labelEl.style.display = 'block';
const x = rect.left + ( worldPos.x * 0.5 + 0.5) * rect.width;
const y = rect.top + (-worldPos.y * 0.5 + 0.5) * rect.height;
_labelEl.style.left = `${x}px`;
_labelEl.style.top = `${y}px`;
}

View File

@@ -16,7 +16,6 @@ import { setSpeechBubble, setMood } from './agents.js';
import { appendSystemMessage, setSessionSendHandler, setInputBarSessionMode } from './ui.js';
import { getOrRefreshToken } from './nostr-identity.js';
import { sentiment } from './edge-worker-client.js';
import { setMeterBalance, triggerMeterPulse, setMeterVisible } from './power-meter.js';
const API = '/api';
const LS_KEY = 'timmy_session_v1';
@@ -34,7 +33,6 @@ let _pollTimer = null;
let _inFlight = false;
let _selectedSats = 500; // deposit amount selection
let _topupSats = 500; // topup amount selection
let _sessionMax = 500; // max sats for this session (initial deposit)
// ── Public API ────────────────────────────────────────────────────────────────
@@ -107,11 +105,6 @@ export function isSessionActive() {
return _sessionState === 'active' || _sessionState === 'paused';
}
/** Public entry-point used by the 3D power meter click handler. */
export function openSessionPanel() {
_openPanel();
}
// Called by ui.js when user submits the input bar while session is active
export async function sessionSendHandler(text) {
if (!_sessionId || !_macaroon || _inFlight) return;
@@ -163,7 +156,6 @@ export async function sessionSendHandler(text) {
_sessionState = _balanceSats < MIN_BALANCE ? 'paused' : 'active';
_saveToStorage();
_applySessionUI();
triggerMeterPulse('drain');
const reply = data.result || data.reason || '…';
setSpeechBubble(reply);
@@ -295,11 +287,9 @@ function _startDepositPolling() {
if (data.state === 'active') {
_macaroon = data.macaroon;
_balanceSats = data.balanceSats;
_sessionMax = _balanceSats; // initial deposit = full bar
_sessionState = 'active';
_saveToStorage();
_applySessionUI();
triggerMeterPulse('fill');
_closePanel(); // panel auto-closes; user types in input bar
appendSystemMessage(`Session active — ${_balanceSats} sats`);
return;
@@ -414,10 +404,8 @@ function _startTopupPolling() {
_balanceSats = data.balanceSats;
_macaroon = data.macaroon || _macaroon;
_sessionState = data.state === 'active' ? 'active' : _sessionState;
_sessionMax = Math.max(_sessionMax, _balanceSats);
_saveToStorage();
_applySessionUI();
triggerMeterPulse('fill');
_setStep('active');
_updateActiveStep();
_setStatus('active', `⚡ Topped up! ${_balanceSats} sats`, '#22aa66');
@@ -524,10 +512,6 @@ function _applySessionUI() {
// Low balance notice above input bar
const $notice = document.getElementById('low-balance-notice');
if ($notice) $notice.style.display = lowBal ? '' : 'none';
// 3D power meter visibility
setMeterVisible(anyActive);
if (anyActive) setMeterBalance(_balanceSats, _sessionMax);
}
function _updateActiveStep() {
@@ -546,9 +530,7 @@ function _clearSession() {
_macaroon = null;
_balanceSats = 0;
_sessionState = null;
_sessionMax = 500;
localStorage.removeItem(LS_KEY);
setMeterVisible(false);
setInputBarSessionMode(false);
setSessionSendHandler(null);
const $hud = document.getElementById('session-hud');

View File

@@ -344,6 +344,19 @@ export function updateUI({ fps, jobCount, connectionState }) {
}
}
export function updateVisitorCount(count) {
const $visitorCountDisplay = document.querySelector('#visitor-count-display .count-number');
if ($visitorCountDisplay) {
$visitorCountDisplay.textContent = count;
const $desktopOnly = document.querySelector('#visitor-count-display .desktop-only');
if (window.innerWidth > 600) {
if ($desktopOnly) $desktopOnly.textContent = `VISITORS:`;
} else {
if ($desktopOnly) $desktopOnly.textContent = ``; // Hide 'VISITORS:' text on mobile
}
}
}
export function appendSystemMessage(text) {
if (!$log) return;
const el = document.createElement('div');

View File

@@ -1,12 +1,11 @@
import * as THREE from 'three';
import { scene } from './world.js'; // Import the scene
import { setAgentState, setSpeechBubble, applyAgentStates, setMood, TIMMY_WORLD_POS } from './agents.js';
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker } from './ui.js';
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker, updateVisitorCount } from './ui.js';
import { sentiment } from './edge-worker-client.js';
import { setLabelState } from './hud-labels.js';
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
import { getPubkey } from './nostr-identity.js';
import { setMeterBalance, triggerMeterPulse } from './power-meter.js';
function resolveWsUrl() {
const explicit = import.meta.env.VITE_WS_URL;
@@ -48,8 +47,6 @@ function connect() {
ws.onopen = () => {
connectionState = 'connected';
clearTimeout(reconnectTimer);
const npub = getPubkey();
send({ type: 'visitor_enter', visitorId, visitorName: 'visitor', npub });
};
ws.onmessage = event => {
@@ -191,17 +188,10 @@ function handleMessage(msg) {
break;
}
case 'session_balance_update': {
// Real-time balance push from server: animate fill level and pulse
if (typeof msg.balanceSats === 'number') {
setMeterBalance(msg.balanceSats, msg.maxSats);
triggerMeterPulse(msg.delta > 0 ? 'fill' : 'drain');
}
break;
}
case 'agent_count':
case 'visitor_count':
if (typeof msg.count === 'number') {
updateVisitorCount(msg.count);
}
break;
default: