Compare commits
1 Commits
main
...
gemini/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bff51ab44b |
@@ -38,6 +38,9 @@ const logger = makeLogger("ws-events");
|
|||||||
|
|
||||||
const PING_INTERVAL_MS = 30_000;
|
const PING_INTERVAL_MS = 30_000;
|
||||||
|
|
||||||
|
// Map to store visitorId -> npub mappings
|
||||||
|
const connectedVisitors = new Map<string, string>();
|
||||||
|
|
||||||
// ── Per-visitor rate limit (3 replies/minute) ─────────────────────────────────
|
// ── Per-visitor rate limit (3 replies/minute) ─────────────────────────────────
|
||||||
const CHAT_RATE_LIMIT = 3;
|
const CHAT_RATE_LIMIT = 3;
|
||||||
const CHAT_RATE_WINDOW_MS = 60_000;
|
const CHAT_RATE_WINDOW_MS = 60_000;
|
||||||
@@ -323,12 +326,19 @@ export function attachWebSocketServer(server: Server): void {
|
|||||||
|
|
||||||
socket.on("message", (raw) => {
|
socket.on("message", (raw) => {
|
||||||
try {
|
try {
|
||||||
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string };
|
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string; npub?: string };
|
||||||
if (msg.type === "pong") return;
|
if (msg.type === "pong") return;
|
||||||
if (msg.type === "subscribe") {
|
if (msg.type === "subscribe") {
|
||||||
send(socket, { type: "agent_count", count: wss.clients.size });
|
send(socket, { type: "agent_count", count: wss.clients.size });
|
||||||
}
|
}
|
||||||
if (msg.type === "visitor_enter") {
|
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 => {
|
wss.clients.forEach(c => {
|
||||||
if (c !== socket && c.readyState === 1) {
|
if (c !== socket && c.readyState === 1) {
|
||||||
c.send(JSON.stringify({ type: "visitor_count", count: wss.clients.size }));
|
c.send(JSON.stringify({ type: "visitor_count", count: wss.clients.size }));
|
||||||
@@ -337,6 +347,10 @@ export function attachWebSocketServer(server: Server): void {
|
|||||||
send(socket, { type: "visitor_count", count: wss.clients.size });
|
send(socket, { type: "visitor_count", count: wss.clients.size });
|
||||||
}
|
}
|
||||||
if (msg.type === "visitor_leave") {
|
if (msg.type === "visitor_leave") {
|
||||||
|
const { visitorId } = msg;
|
||||||
|
if (visitorId) {
|
||||||
|
connectedVisitors.delete(visitorId);
|
||||||
|
}
|
||||||
wss.clients.forEach(c => {
|
wss.clients.forEach(c => {
|
||||||
if (c !== socket && c.readyState === 1) {
|
if (c !== socket && c.readyState === 1) {
|
||||||
c.send(JSON.stringify({ type: "visitor_count", count: Math.max(0, wss.clients.size - 1) }));
|
c.send(JSON.stringify({ type: "visitor_count", count: Math.max(0, wss.clients.size - 1) }));
|
||||||
|
|||||||
@@ -37,6 +37,25 @@
|
|||||||
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
|
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
|
||||||
color: #7799cc; text-shadow: 0 0 10px #4466aa;
|
color: #7799cc; text-shadow: 0 0 10px #4466aa;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Nostr Identity UI */
|
||||||
|
.nostr-btn {
|
||||||
|
background: rgba(40, 30, 70, 0.9);
|
||||||
|
border: 1px solid #443377;
|
||||||
|
color: #aaddff; font-family: 'Courier New', monospace;
|
||||||
|
font-size: 11px; padding: 4px 10px; cursor: pointer;
|
||||||
|
border-radius: 3px; transition: background 0.15s, border-color 0.15s;
|
||||||
|
}
|
||||||
|
.nostr-btn:hover { background: rgba(60, 45, 100, 0.9); border-color: #665599; }
|
||||||
|
.nostr-btn-sm {
|
||||||
|
font-size: 9px; padding: 2px 6px; margin-left: 6px; opacity: 0.7;
|
||||||
|
}
|
||||||
|
.nostr-btn-sm:hover { opacity: 1; }
|
||||||
|
.nostr-pubkey {
|
||||||
|
font-size: 11px; color: #aaddff; margin-right: 6px;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
|
||||||
#session-hud {
|
#session-hud {
|
||||||
display: none;
|
display: none;
|
||||||
color: #22aa66;
|
color: #22aa66;
|
||||||
@@ -591,6 +610,8 @@
|
|||||||
<span id="session-hud-balance">Balance: -- sats</span>
|
<span id="session-hud-balance">Balance: -- sats</span>
|
||||||
<a href="#" id="session-hud-topup">⚡ Top Up</a>
|
<a href="#" id="session-hud-topup">⚡ Top Up</a>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- New: Nostr identity status -->
|
||||||
|
<div id="nostr-identity-status" style="margin-top: 10px; pointer-events: all;"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="connection-status">OFFLINE</div>
|
<div id="connection-status">OFFLINE</div>
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ export async function initNostrIdentity(apiBase = '/api') {
|
|||||||
_pubkey = await window.nostr.getPublicKey();
|
_pubkey = await window.nostr.getPublicKey();
|
||||||
_useNip07 = true;
|
_useNip07 = true;
|
||||||
_canSign = true;
|
_canSign = true;
|
||||||
|
_saveDiscoveredKeypair(_pubkey, null); // Store pubkey in LS even if NIP-07
|
||||||
console.info('[nostr] Using NIP-07 extension, pubkey:', _pubkey.slice(0, 8) + '…');
|
console.info('[nostr] Using NIP-07 extension, pubkey:', _pubkey.slice(0, 8) + '…');
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('[nostr] NIP-07 getPublicKey failed, will use local keypair', err);
|
console.warn('[nostr] NIP-07 getPublicKey failed, will use local keypair', err);
|
||||||
@@ -86,6 +87,18 @@ export function getPubkey() { return _pubkey; }
|
|||||||
export function getNostrToken() { return _isTokenValid() ? _token : null; }
|
export function getNostrToken() { return _isTokenValid() ? _token : null; }
|
||||||
export function hasIdentity() { return !!_pubkey; }
|
export function hasIdentity() { return !!_pubkey; }
|
||||||
|
|
||||||
|
export function disconnectNostrIdentity() {
|
||||||
|
_pubkey = null;
|
||||||
|
_token = null;
|
||||||
|
_tokenExp = 0;
|
||||||
|
_useNip07 = false;
|
||||||
|
_canSign = false;
|
||||||
|
localStorage.removeItem(LS_KEYPAIR_KEY);
|
||||||
|
localStorage.removeItem(LS_TOKEN_KEY);
|
||||||
|
window.dispatchEvent(new CustomEvent('nostr:identity-disconnected'));
|
||||||
|
console.info('[nostr] identity disconnected');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* getOrRefreshToken — returns a valid token, refreshing if necessary.
|
* getOrRefreshToken — returns a valid token, refreshing if necessary.
|
||||||
* Returns null if no identity is established.
|
* Returns null if no identity is established.
|
||||||
@@ -197,6 +210,7 @@ export function showIdentityPrompt(apiBase = '/api') {
|
|||||||
_pubkey = await window.nostr.getPublicKey();
|
_pubkey = await window.nostr.getPublicKey();
|
||||||
_useNip07 = true;
|
_useNip07 = true;
|
||||||
_canSign = true;
|
_canSign = true;
|
||||||
|
_saveDiscoveredKeypair(_pubkey, null); // Store pubkey in LS even if NIP-07
|
||||||
} catch { return; }
|
} catch { return; }
|
||||||
} else {
|
} else {
|
||||||
// Generate + store keypair (user consented by clicking)
|
// Generate + store keypair (user consented by clicking)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { sendVisitorMessage } from './websocket.js';
|
import { sendVisitorMessage } from './websocket.js';
|
||||||
import { classify } from './edge-worker-client.js';
|
import { classify } from './edge-worker-client.js';
|
||||||
import { setMood, setSpeechBubble } from './agents.js';
|
import { setMood, setSpeechBubble } from './agents.js';
|
||||||
import { getOrRefreshToken } from './nostr-identity.js';
|
import { getOrRefreshToken, getPubkey, disconnectNostrIdentity, showIdentityPrompt } from './nostr-identity.js';
|
||||||
|
|
||||||
const $fps = document.getElementById('fps');
|
const $fps = document.getElementById('fps');
|
||||||
const $activeJobs = document.getElementById('active-jobs');
|
const $activeJobs = document.getElementById('active-jobs');
|
||||||
@@ -180,6 +180,89 @@ export function hideCostTicker() {
|
|||||||
$costTicker.style.opacity = '0';
|
$costTicker.style.opacity = '0';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Nostr identity UI ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
let _nostrStatusEl = null;
|
||||||
|
let _connectNostrBtn = null;
|
||||||
|
let _disconnectNostrBtn = null;
|
||||||
|
let _nostrPubkeyDisplay = null;
|
||||||
|
let _getAlbyBtn = null;
|
||||||
|
|
||||||
|
export function initNostrIdentityUI() {
|
||||||
|
_nostrStatusEl = document.getElementById('nostr-identity-status');
|
||||||
|
if (!_nostrStatusEl) return;
|
||||||
|
|
||||||
|
_nostrStatusEl.innerHTML = `
|
||||||
|
<button id="connect-nostr-btn" class="nostr-btn">⚡ Connect Nostr</button>
|
||||||
|
<span id="nostr-pubkey-display" class="nostr-pubkey"></span>
|
||||||
|
<button id="disconnect-nostr-btn" class="nostr-btn nostr-btn-sm">Disconnect</button>
|
||||||
|
<button id="get-alby-btn" class="nostr-btn nostr-btn-sm">Get Alby</button>
|
||||||
|
`;
|
||||||
|
|
||||||
|
_connectNostrBtn = document.getElementById('connect-nostr-btn');
|
||||||
|
_disconnectNostrBtn = document.getElementById('disconnect-nostr-btn');
|
||||||
|
_nostrPubkeyDisplay = document.getElementById('nostr-pubkey-display');
|
||||||
|
_getAlbyBtn = document.getElementById('get-alby-btn');
|
||||||
|
|
||||||
|
if (_connectNostrBtn) {
|
||||||
|
_connectNostrBtn.addEventListener('click', () => {
|
||||||
|
showIdentityPrompt('/api');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_disconnectNostrBtn) {
|
||||||
|
_disconnectNostrBtn.addEventListener('click', () => {
|
||||||
|
disconnectNostrIdentity();
|
||||||
|
_updateNostrIdentityUI(null);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('nostr:identity-ready', e => {
|
||||||
|
_updateNostrIdentityUI(e.detail.pubkey);
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('nostr:identity-disconnected', () => {
|
||||||
|
_updateNostrIdentityUI(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
_updateNostrIdentityUI(getPubkey());
|
||||||
|
}
|
||||||
|
|
||||||
|
function _updateNostrIdentityUI(pubkey) {
|
||||||
|
const hasNip07 = typeof window !== 'undefined' && !!window.nostr;
|
||||||
|
|
||||||
|
if (pubkey) {
|
||||||
|
const formattedPubkey = pubkey.slice(0, 8) + '…' + pubkey.slice(-4);
|
||||||
|
if (_nostrPubkeyDisplay) {
|
||||||
|
_nostrPubkeyDisplay.textContent = `⚡ ${formattedPubkey}`;
|
||||||
|
_nostrPubkeyDisplay.style.display = 'inline-block';
|
||||||
|
}
|
||||||
|
if (_connectNostrBtn) _connectNostrBtn.style.display = 'none';
|
||||||
|
if (_disconnectNostrBtn) _disconnectNostrBtn.style.display = 'inline-block';
|
||||||
|
if (_getAlbyBtn) _getAlbyBtn.style.display = 'none';
|
||||||
|
} else {
|
||||||
|
if (_nostrPubkeyDisplay) _nostrPubkeyDisplay.style.display = 'none';
|
||||||
|
if (_disconnectNostrBtn) _disconnectNostrBtn.style.display = 'none';
|
||||||
|
|
||||||
|
if (hasNip07) {
|
||||||
|
if (_connectNostrBtn) {
|
||||||
|
_connectNostrBtn.textContent = '⚡ Connect Nostr';
|
||||||
|
_connectNostrBtn.style.display = 'inline-block';
|
||||||
|
}
|
||||||
|
if (_getAlbyBtn) _getAlbyBtn.style.display = 'none';
|
||||||
|
} else {
|
||||||
|
if (_connectNostrBtn) _connectNostrBtn.style.display = 'none';
|
||||||
|
if (_getAlbyBtn) {
|
||||||
|
_getAlbyBtn.textContent = 'Get Alby';
|
||||||
|
_getAlbyBtn.style.display = 'inline-block';
|
||||||
|
_getAlbyBtn.title = 'Install Alby or another NIP-07 extension to connect your Nostr identity';
|
||||||
|
_getAlbyBtn.onclick = () => window.open('https://getalby.com/', '_blank');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ── Input bar ─────────────────────────────────────────────────────────────────
|
// ── Input bar ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export function initUI() {
|
export function initUI() {
|
||||||
@@ -187,6 +270,7 @@ export function initUI() {
|
|||||||
uiInitialized = true;
|
uiInitialized = true;
|
||||||
initInputBar();
|
initInputBar();
|
||||||
initHeatmap();
|
initHeatmap();
|
||||||
|
initNostrIdentityUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
function initInputBar() {
|
function initInputBar() {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTic
|
|||||||
import { sentiment } from './edge-worker-client.js';
|
import { sentiment } from './edge-worker-client.js';
|
||||||
import { setLabelState } from './hud-labels.js';
|
import { setLabelState } from './hud-labels.js';
|
||||||
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
|
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
|
||||||
|
import { getPubkey } from './nostr-identity.js';
|
||||||
|
|
||||||
function resolveWsUrl() {
|
function resolveWsUrl() {
|
||||||
const explicit = import.meta.env.VITE_WS_URL;
|
const explicit = import.meta.env.VITE_WS_URL;
|
||||||
@@ -46,7 +47,8 @@ function connect() {
|
|||||||
ws.onopen = () => {
|
ws.onopen = () => {
|
||||||
connectionState = 'connected';
|
connectionState = 'connected';
|
||||||
clearTimeout(reconnectTimer);
|
clearTimeout(reconnectTimer);
|
||||||
send({ type: 'visitor_enter', visitorId, visitorName: 'visitor' });
|
const npub = getPubkey();
|
||||||
|
send({ type: 'visitor_enter', visitorId, visitorName: 'visitor', npub });
|
||||||
};
|
};
|
||||||
|
|
||||||
ws.onmessage = event => {
|
ws.onmessage = event => {
|
||||||
|
|||||||
Reference in New Issue
Block a user