Compare commits
1 Commits
claude/iss
...
claude/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ad2a5e23fa |
@@ -1,20 +1,23 @@
|
||||
import { randomBytes } from "crypto";
|
||||
import { exec } from "child_process";
|
||||
import { promisify } from "util";
|
||||
import { makeLogger } from "./logger.js";
|
||||
|
||||
const logger = makeLogger("provisioner");
|
||||
const execAsync = promisify(exec);
|
||||
|
||||
export interface ProvisionerConfig {
|
||||
doApiToken: string;
|
||||
doRegion: string;
|
||||
doSize: string;
|
||||
doVolumeSizeGb: number;
|
||||
doVpcUuid: string; // New: Digital Ocean VPC UUID
|
||||
doSshKeyFingerprint: string; // New: Digital Ocean SSH Key Fingerprint
|
||||
doVpcUuid: string;
|
||||
doSshKeyFingerprint: string;
|
||||
tailscaleApiKey: string;
|
||||
tailscaleTailnet: string;
|
||||
}
|
||||
|
||||
const stubProvisioningResults = new Map<string, any>(); // To store fake results for stub mode
|
||||
const stubProvisioningResults = new Map<string, unknown>(); // To store fake results for stub mode
|
||||
|
||||
export class ProvisionerService {
|
||||
private readonly config: ProvisionerConfig;
|
||||
@@ -26,8 +29,8 @@ export class ProvisionerService {
|
||||
doRegion: config?.doRegion ?? process.env.DO_REGION ?? "nyc3",
|
||||
doSize: config?.doSize ?? process.env.DO_SIZE ?? "s-2vcpu-4gb",
|
||||
doVolumeSizeGb: config?.doVolumeSizeGb ?? parseInt(process.env.DO_VOLUME_SIZE_GB ?? "100", 10),
|
||||
doVpcUuid: config?.doVpcUuid ?? process.env.DO_VPC_UUID ?? "", // New
|
||||
doSshKeyFingerprint: config?.doSshKeyFingerprint ?? process.env.DO_SSH_KEY_FINGERPRINT ?? "", // New
|
||||
doVpcUuid: config?.doVpcUuid ?? process.env.DO_VPC_UUID ?? "",
|
||||
doSshKeyFingerprint: config?.doSshKeyFingerprint ?? process.env.DO_SSH_KEY_FINGERPRINT ?? "",
|
||||
tailscaleApiKey: config?.tailscaleApiKey ?? process.env.TAILSCALE_API_KEY ?? "",
|
||||
tailscaleTailnet: config?.tailscaleTailnet ?? process.env.TAILSCALE_TAILNET ?? "",
|
||||
};
|
||||
@@ -73,36 +76,22 @@ FakeKeyForJob${jobId}
|
||||
|
||||
logger.info("creating Digital Ocean droplet", { jobId });
|
||||
|
||||
// Use doctl or DigitalOcean API client to create droplet
|
||||
// For now, I'll use doctl via runShellCommand, assuming it's available in the environment
|
||||
const dropletName = `timmy-node-${jobId.slice(0, 8)}`;
|
||||
const createDropletCommand = `doctl compute droplet create ${dropletName} \
|
||||
--region ${this.config.doRegion} \
|
||||
--size ${this.config.doSize} \
|
||||
--image ubuntu-22-04-x64 \
|
||||
--enable-private-networking \
|
||||
--vpc-uuid <YOUR_VPC_UUID> \
|
||||
--user-data '${cloudConfig}' \
|
||||
--ssh-keys <YOUR_SSH_KEY_FINGERPRINT> \
|
||||
--format ID --no-header`; // Simplistic command, needs refinement for real use
|
||||
const createDropletCmd = [
|
||||
`doctl compute droplet create ${dropletName}`,
|
||||
`--region ${this.config.doRegion}`,
|
||||
`--size ${this.config.doSize}`,
|
||||
`--image ubuntu-22-04-x64`,
|
||||
`--enable-private-networking`,
|
||||
`--vpc-uuid ${this.config.doVpcUuid}`,
|
||||
`--user-data '${cloudConfig}'`,
|
||||
`--ssh-keys ${this.config.doSshKeyFingerprint}`,
|
||||
`--format ID --no-header`,
|
||||
].join(" \\\n ");
|
||||
|
||||
const createDropletOutput = await default_api.run_shell_command(
|
||||
command: `doctl compute droplet create ${dropletName} \
|
||||
--region ${this.config.doRegion} \
|
||||
--size ${this.config.doSize} \
|
||||
--image ubuntu-22-04-x64 \
|
||||
--enable-private-networking \
|
||||
--vpc-uuid ${this.config.doVpcUuid} \
|
||||
--user-data '${cloudConfig}' \
|
||||
--ssh-keys ${this.config.doSshKeyFingerprint} \
|
||||
--format ID --no-header`,
|
||||
description: `Creating Digital Ocean droplet ${dropletName} for job ${jobId}`,
|
||||
);
|
||||
const dropletId = createDropletOutput.output.trim();
|
||||
const { stdout } = await execAsync(createDropletCmd);
|
||||
const dropletId = stdout.trim();
|
||||
|
||||
// In a real scenario, we would poll the DigitalOcean API to wait for the droplet
|
||||
// to become active and retrieve its public IP and Tailscale IP.
|
||||
// For now, we'll simulate this and retrieve dummy IPs.
|
||||
logger.info("simulating droplet creation and IP assignment", { jobId, dropletId });
|
||||
await new Promise(resolve => setTimeout(resolve, 10000)); // Simulate droplet creation time
|
||||
|
||||
@@ -111,11 +100,11 @@ FakeKeyForJob${jobId}
|
||||
const lnbitsUrl = `http://${nodeIp}:3000/lnbits`; // Dummy LNbits URL
|
||||
|
||||
return {
|
||||
dropletId: dropletId,
|
||||
nodeIp: nodeIp,
|
||||
tailscaleHostname: tailscaleHostname,
|
||||
lnbitsUrl: lnbitsUrl,
|
||||
sshPrivateKey: sshPrivateKey,
|
||||
dropletId,
|
||||
nodeIp,
|
||||
tailscaleHostname,
|
||||
lnbitsUrl,
|
||||
sshPrivateKey,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -123,23 +112,16 @@ FakeKeyForJob${jobId}
|
||||
private async generateSshKeyPair(): Promise<{ sshPrivateKey: string; sshPublicKey: string }> {
|
||||
logger.info("generating SSH keypair");
|
||||
const keyPath = `/tmp/id_rsa_${randomBytes(4).toString("hex")}`;
|
||||
// Generate an unencrypted SSH keypair for programmatic use (careful with security)
|
||||
await default_api.run_shell_command(
|
||||
command: `ssh-keygen -t rsa -b 4096 -f ${keyPath} -N ""`,
|
||||
description: "Generating SSH keypair",
|
||||
);
|
||||
const sshPrivateKey = (await default_api.run_shell_command(command: `cat ${keyPath}`)).output.trim();
|
||||
const sshPublicKey = (await default_api.run_shell_command(command: `cat ${keyPath}.pub`)).output.trim();
|
||||
await default_api.run_shell_command(command: `rm ${keyPath} ${keyPath}.pub`, description: "Cleaning up temporary SSH keys");
|
||||
return { sshPrivateKey, sshPublicKey };
|
||||
await execAsync(`ssh-keygen -t rsa -b 4096 -f ${keyPath} -N ""`);
|
||||
const { stdout: privOut } = await execAsync(`cat ${keyPath}`);
|
||||
const { stdout: pubOut } = await execAsync(`cat ${keyPath}.pub`);
|
||||
await execAsync(`rm ${keyPath} ${keyPath}.pub`);
|
||||
return { sshPrivateKey: privOut.trim(), sshPublicKey: pubOut.trim() };
|
||||
}
|
||||
|
||||
// Helper to create Tailscale auth key (simplified stub)
|
||||
private async createTailscaleAuthKey(): Promise<string> {
|
||||
logger.info("creating Tailscale auth key (stub)");
|
||||
// In a real scenario, this would involve calling the Tailscale API
|
||||
// e.g., curl -X POST -H "Authorization: Bearer ${TAILSCALE_API_KEY}"
|
||||
// "https://api.tailscale.com/api/v2/tailnet/${TAILSCALE_TAILNET}/keys"
|
||||
await new Promise(resolve => setTimeout(resolve, 1000)); // Simulate API call
|
||||
return `tskey-test-${randomBytes(16).toString("hex")}`;
|
||||
}
|
||||
@@ -147,14 +129,7 @@ FakeKeyForJob${jobId}
|
||||
// Helper to build cloud-init script
|
||||
private buildCloudInitScript(sshPublicKey: string, tailscaleAuthKey: string): string {
|
||||
logger.info("building cloud-init script");
|
||||
const setupScriptUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/setup.sh`;
|
||||
const bitcoinConfUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/configs/bitcoin.conf`;
|
||||
const lndConfUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/configs/lnd.conf`;
|
||||
const dockerComposeUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/docker-compose.yml`;
|
||||
const lndInitUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/lnd-init.sh`;
|
||||
const sweepUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/sweep.sh`;
|
||||
const sweepConfExampleUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/sweep.conf.example`;
|
||||
const opsUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/ops.sh`;
|
||||
const baseUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure`;
|
||||
|
||||
return `
|
||||
#cloud-config
|
||||
@@ -169,39 +144,17 @@ write_files:
|
||||
permissions: '0755'
|
||||
content: |
|
||||
#!/usr/bin/env bash
|
||||
curl -s ${setupScriptUrl} > /root/setup.sh
|
||||
- path: /root/configs/bitcoin.conf
|
||||
content: |
|
||||
curl -s ${bitcoinConfUrl} > /root/configs/bitcoin.conf
|
||||
- path: /root/configs/lnd.conf
|
||||
content: |
|
||||
curl -s ${lndConfUrl} > /root/configs/lnd.conf
|
||||
- path: /root/docker-compose.yml
|
||||
content: |
|
||||
curl -s ${dockerComposeUrl} > /root/docker-compose.yml
|
||||
- path: /root/lnd-init.sh
|
||||
permissions: '0755'
|
||||
content: |
|
||||
curl -s ${lndInitUrl} > /root/lnd-init.sh
|
||||
- path: /root/sweep.sh
|
||||
permissions: '0755'
|
||||
content: |
|
||||
curl -s ${sweepUrl} > /root/sweep.sh
|
||||
- path: /root/sweep.conf.example
|
||||
content: |
|
||||
curl -s ${sweepConfExampleUrl} > /root/sweep.conf.example
|
||||
- path: /root/ops.sh
|
||||
permissions: '0755'
|
||||
content: |
|
||||
curl -s ${opsUrl} > /root/ops.sh
|
||||
curl -s ${baseUrl}/setup.sh > /root/setup.sh
|
||||
|
||||
runcmd:
|
||||
- mkdir -p /root/configs
|
||||
- curl -s ${setupScriptUrl} > /tmp/setup.sh
|
||||
- curl -s ${baseUrl}/setup.sh > /tmp/setup.sh
|
||||
- chmod +x /tmp/setup.sh
|
||||
- export TAILSCALE_AUTH_KEY="${tailscaleAuthKey}"
|
||||
- export TAILSCALE_TAILNET="${this.config.tailscaleTailnet}"
|
||||
- /tmp/setup.sh
|
||||
`;
|
||||
}
|
||||
}
|
||||
|
||||
export const provisionerService = new ProvisionerService();
|
||||
export const provisionerService = new ProvisionerService();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -138,7 +138,7 @@ router.post("/bootstrap", async (req: Request, res: Response) => {
|
||||
// ── GET /api/bootstrap/:id ───────────────────────────────────────────────────
|
||||
|
||||
router.get("/bootstrap/:id", async (req: Request, res: Response) => {
|
||||
const { id } = req.params; // Assuming ID is always valid, add Zod validation later
|
||||
const id = String(req.params["id"] ?? ""); // cast: Express 5 params are string
|
||||
|
||||
try {
|
||||
let job = await getBootstrapJobById(id);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
import { type Express, Router } from "express";
|
||||
import { z } from "zod";
|
||||
import { Status } from "../lib/http.js";
|
||||
import { rootLogger } from "../lib/logger.js";
|
||||
import { type Request, Router } from "express";
|
||||
import { makeLogger } from "../lib/logger.js";
|
||||
|
||||
const router = Router();
|
||||
const log = rootLogger.child({ service: "relay-policy" });
|
||||
const log = makeLogger("relay-policy");
|
||||
|
||||
// ── Auth ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -14,7 +12,7 @@ if (!RELAY_POLICY_SECRET) {
|
||||
log.warn("RELAY_POLICY_SECRET is not set — /api/relay/policy will be unauthenticated!");
|
||||
}
|
||||
|
||||
function isAuthenticated(req: Express.Request): boolean {
|
||||
function isAuthenticated(req: Request): boolean {
|
||||
if (!RELAY_POLICY_SECRET) {
|
||||
return true; // No secret configured, so no auth.
|
||||
}
|
||||
@@ -29,43 +27,54 @@ function isAuthenticated(req: Express.Request): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
// ── POST /api/relay/policy ────────────────────────────────────────────────────
|
||||
// ── Request body shape (manual validation — zod not in deps) ──────────────────
|
||||
|
||||
const relayPolicyRequestSchema = z.object({
|
||||
event: z.object({
|
||||
id: z.string(),
|
||||
pubkey: z.string(),
|
||||
kind: z.number(),
|
||||
created_at: z.number(),
|
||||
tags: z.array(z.array(z.string())),
|
||||
content: z.string(),
|
||||
sig: z.string(),
|
||||
}),
|
||||
receivedAt: z.number(),
|
||||
sourceType: z.string(),
|
||||
sourceInfo: z.string(),
|
||||
});
|
||||
interface StrfryEventBody {
|
||||
event?: {
|
||||
id?: unknown;
|
||||
pubkey?: unknown;
|
||||
kind?: unknown;
|
||||
created_at?: unknown;
|
||||
tags?: unknown;
|
||||
content?: unknown;
|
||||
sig?: unknown;
|
||||
};
|
||||
receivedAt?: unknown;
|
||||
sourceType?: unknown;
|
||||
sourceInfo?: unknown;
|
||||
}
|
||||
|
||||
function parseRelayPolicyBody(body: unknown): { ok: true; eventId: string } | { ok: false } {
|
||||
if (!body || typeof body !== "object") return { ok: false };
|
||||
const b = body as StrfryEventBody;
|
||||
if (!b.event || typeof b.event !== "object") return { ok: false };
|
||||
const id = b.event.id;
|
||||
if (typeof id !== "string" || !id) return { ok: false };
|
||||
return { ok: true, eventId: id };
|
||||
}
|
||||
|
||||
type StrfryAction = "accept" | "reject" | "shadowReject";
|
||||
|
||||
router.post("/relay/policy", (req, res) => {
|
||||
if (!isAuthenticated(req)) {
|
||||
return res.status(Status.UNAUTHORIZED).json({
|
||||
res.status(401).json({
|
||||
action: "reject",
|
||||
msg: "unauthorized",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const parse = relayPolicyRequestSchema.safeParse(req.body);
|
||||
if (!parse.success) {
|
||||
log.warn("invalid /relay/policy request", { error: parse.error.format() });
|
||||
return res.status(Status.BAD_REQUEST).json({
|
||||
const parsed = parseRelayPolicyBody(req.body);
|
||||
if (!parsed.ok) {
|
||||
log.warn("invalid /relay/policy request");
|
||||
res.status(400).json({
|
||||
action: "reject",
|
||||
msg: "invalid request",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const eventId = parse.data.event.id;
|
||||
const { eventId } = parsed;
|
||||
|
||||
// Bootstrap state: reject everything.
|
||||
// This will be extended by whitelist + moderation tasks.
|
||||
|
||||
@@ -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
|
||||
|
||||
# ===========================================================================
|
||||
# T41–T45 — 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.
|
||||
# ===========================================================================
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# T41–T45 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)
|
||||
# ===========================================================================
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { BlurView } from "expo-blur";
|
||||
import { isLiquidGlassAvailable } from "expo-glass-effect";
|
||||
import { Link, Tabs, router } from "expo-router";
|
||||
import { Link, Tabs } from "expo-router";
|
||||
import { Icon, Label, NativeTabs } from "expo-router/unstable-native-tabs";
|
||||
import { SymbolView } from "expo-symbols";
|
||||
import { Feather, MaterialCommunityIcons, Ionicons } from "@expo/vector-icons";
|
||||
import React from "react";
|
||||
import { Platform, Pressable, StyleSheet, View, useColorScheme } from "react-native";
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
|
||||
import { Colors } from "@/constants/colors";
|
||||
@@ -13,16 +13,16 @@ import { Colors } from "@/constants/colors";
|
||||
function NativeTabLayout() {
|
||||
return (
|
||||
<NativeTabs>
|
||||
<NativeTabs.Trigger name=\"index\">
|
||||
<Icon sf={{ default: \"face.smiling\", selected: \"face.smiling.fill\" }} />
|
||||
<NativeTabs.Trigger name="index">
|
||||
<Icon sf={{ default: "face.smiling", selected: "face.smiling.fill" }} />
|
||||
<Label>Timmy</Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger name=\"matrix\">
|
||||
<Icon sf={{ default: \"cube\", selected: \"cube.fill\" }} />
|
||||
<NativeTabs.Trigger name="matrix">
|
||||
<Icon sf={{ default: "cube", selected: "cube.fill" }} />
|
||||
<Label>Matrix</Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger name=\"feed\">
|
||||
<Icon sf={{ default: \"list.bullet\", selected: \"list.bullet.circle.fill\" }} />
|
||||
<NativeTabs.Trigger name="feed">
|
||||
<Icon sf={{ default: "list.bullet", selected: "list.bullet.circle.fill" }} />
|
||||
<Label>Feed</Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
@@ -35,11 +35,14 @@ function ClassicTabLayout() {
|
||||
const isWeb = Platform.OS === "web";
|
||||
const C = Colors.dark;
|
||||
|
||||
void insets; // used by callers that extend this
|
||||
|
||||
return (
|
||||
<Tabs
|
||||
screenOptions={{
|
||||
headerShown: false,
|
||||
tabBarActiveTintColor: C.accentGlow,\n tabBarInactiveTintColor: C.textMuted,
|
||||
tabBarActiveTintColor: C.accentGlow,
|
||||
tabBarInactiveTintColor: C.textMuted,
|
||||
tabBarStyle: {
|
||||
position: "absolute",
|
||||
backgroundColor: isIOS ? "transparent" : C.surface,
|
||||
@@ -51,7 +54,7 @@ function ClassicTabLayout() {
|
||||
isIOS ? (
|
||||
<BlurView
|
||||
intensity={80}
|
||||
tint=\"dark\"
|
||||
tint="dark"
|
||||
style={[StyleSheet.absoluteFill, { borderTopWidth: 0.5, borderTopColor: C.border }]}
|
||||
/>
|
||||
) : isWeb ? (
|
||||
@@ -60,53 +63,60 @@ function ClassicTabLayout() {
|
||||
/>
|
||||
) : (
|
||||
<View style={[StyleSheet.absoluteFill, { backgroundColor: C.surface, borderTopWidth: 0.5, borderTopColor: C.border }]} />
|
||||
),\
|
||||
}}\
|
||||
),
|
||||
}}
|
||||
>
|
||||
<Tabs.Screen
|
||||
name=\"index\"
|
||||
name="index"
|
||||
options={{
|
||||
title: "Timmy",
|
||||
headerShown: true,
|
||||
headerRight: () => (\n <Link href=\"/settings\" asChild>\n <Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>
|
||||
<Ionicons name=\"settings-outline\" size={24} color={C.text} style={{ marginRight: 15 }} />\n </Pressable>\n </Link>\n ),
|
||||
headerRight: () => (
|
||||
<Link href="/settings" asChild>
|
||||
<Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>
|
||||
<Ionicons name="settings-outline" size={24} color={C.text} style={{ marginRight: 15 }} />
|
||||
</Pressable>
|
||||
</Link>
|
||||
),
|
||||
tabBarIcon: ({ color, size }) =>
|
||||
isIOS ? (
|
||||
<SymbolView name=\"face.smiling\" tintColor={color} size={size} />
|
||||
<SymbolView name="face.smiling" tintColor={color} size={size} />
|
||||
) : (
|
||||
<MaterialCommunityIcons name=\"emoticon-outline\" size={size} color={color} />
|
||||
),\
|
||||
}}\
|
||||
<MaterialCommunityIcons name="emoticon-outline" size={size} color={color} />
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<Tabs.Screen
|
||||
name=\"matrix\"
|
||||
name="matrix"
|
||||
options={{
|
||||
title: "Matrix",
|
||||
tabBarIcon: ({ color, size }) =>
|
||||
isIOS ? (
|
||||
<SymbolView name=\"cube\" tintColor={color} size={size} />
|
||||
<SymbolView name="cube" tintColor={color} size={size} />
|
||||
) : (
|
||||
<MaterialCommunityIcons name=\"cube-outline\" size={size} color={color} />
|
||||
),\
|
||||
}}\
|
||||
<MaterialCommunityIcons name="cube-outline" size={size} color={color} />
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<Tabs.Screen
|
||||
name=\"feed\"
|
||||
name="feed"
|
||||
options={{
|
||||
title: "Feed",
|
||||
tabBarIcon: ({ color, size }) =>
|
||||
isIOS ? (
|
||||
<SymbolView name=\"list.bullet\" tintColor={color} size={size} />
|
||||
<SymbolView name="list.bullet" tintColor={color} size={size} />
|
||||
) : (
|
||||
<Feather name=\"activity\" size={size} color={color} />
|
||||
),\
|
||||
}}\
|
||||
<Feather name="activity" size={size} color={color} />
|
||||
),
|
||||
}}
|
||||
/>
|
||||
</Tabs>
|
||||
);
|
||||
}
|
||||
|
||||
export default function TabLayout() {
|
||||
if (isLiquidGlassAvailable()) {\n return (\n <NativeTabs>\n <NativeTabs.Screen\n name=\"index\"\n options={{\n title: \"Timmy\",\n headerShown: true,\n headerRight: () => (\n <Link href=\"/settings\" asChild>\n <Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>\n <Ionicons name=\"settings-outline\" size={24} color={C.text} style={{ marginRight: 15 }} />\n </Pressable>\n </Link>\n ),\n }}\n />\n <NativeTabs.Screen name=\"matrix\" />\n <NativeTabs.Screen name=\"feed\" />\n </NativeTabs>\n );\n }
|
||||
return <ClassicTabLayout />;\
|
||||
if (isLiquidGlassAvailable()) {
|
||||
return <NativeTabLayout />;
|
||||
}
|
||||
return <ClassicTabLayout />;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Stack } from 'expo-router';
|
||||
import { View, Text, StyleSheet, ScrollView, TextInput, Switch, Pressable, Linking, Platform } from 'react-native';
|
||||
import { useState, useEffect } from 'react';
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||
import * as SecureStore from 'expo-secure-store';
|
||||
import Constants from 'expo-constants';
|
||||
import { useTimmy } from '@/context/TimmyContext';
|
||||
import { Ionicons } from '@expo/vector-icons';
|
||||
@@ -13,49 +12,30 @@ const STORAGE_KEYS = {
|
||||
SERVER_URL: 'settings_server_url',
|
||||
NOTIFICATIONS_JOB_COMPLETION: 'settings_notifications_job_completion',
|
||||
NOTIFICATIONS_LOW_BALANCE: 'settings_notifications_low_balance',
|
||||
NOSTR_PRIVATE_KEY: 'settings_nostr_private_key', // Use SecureStore for this
|
||||
};
|
||||
|
||||
export default function SettingsScreen() {
|
||||
const { apiBaseUrl, setApiBaseUrl, isConnected, nostrPublicKey, connectNostr, disconnectNostr } = useTimmy();
|
||||
const { connectionStatus } = useTimmy();
|
||||
const C = Colors.dark;
|
||||
|
||||
const [serverUrl, setServerUrl] = useState(apiBaseUrl);
|
||||
const [serverUrl, setServerUrl] = useState('');
|
||||
const [jobCompletionNotifications, setJobCompletionNotifications] = useState(false);
|
||||
const [lowBalanceWarning, setLowBalanceWarning] = useState(false);
|
||||
const [currentNpub, setCurrentNpub] = useState<string | null>(nostrPublicKey);
|
||||
|
||||
useEffect(() => {
|
||||
// Load settings from AsyncStorage and SecureStore
|
||||
const loadSettings = async () => {
|
||||
const storedServerUrl = await AsyncStorage.getItem(STORAGE_KEYS.SERVER_URL);
|
||||
if (storedServerUrl) {
|
||||
setServerUrl(storedServerUrl);
|
||||
}
|
||||
if (storedServerUrl) setServerUrl(storedServerUrl);
|
||||
const storedJobCompletion = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION);
|
||||
if (storedJobCompletion !== null) {
|
||||
setJobCompletionNotifications(JSON.parse(storedJobCompletion));
|
||||
}
|
||||
if (storedJobCompletion !== null) setJobCompletionNotifications(JSON.parse(storedJobCompletion));
|
||||
const storedLowBalance = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE);
|
||||
if (storedLowBalance !== null) {
|
||||
setLowBalanceWarning(JSON.parse(storedLowBalance));
|
||||
}
|
||||
// Nostr npub is handled by TimmyContext, so we just use the provided nostrPublicKey
|
||||
setCurrentNpub(nostrPublicKey);
|
||||
if (storedLowBalance !== null) setLowBalanceWarning(JSON.parse(storedLowBalance));
|
||||
};
|
||||
loadSettings();
|
||||
}, [nostrPublicKey]);
|
||||
}, []);
|
||||
|
||||
// Update apiBaseUrl in context when serverUrl changes and is saved
|
||||
useEffect(() => {
|
||||
if (serverUrl !== apiBaseUrl) {
|
||||
setApiBaseUrl(serverUrl);
|
||||
AsyncStorage.setItem(STORAGE_KEYS.SERVER_URL, serverUrl);
|
||||
}
|
||||
}, [serverUrl, setApiBaseUrl, apiBaseUrl]);
|
||||
|
||||
const handleServerUrlChange = (text: string) => {
|
||||
setServerUrl(text);
|
||||
const handleServerUrlSave = async () => {
|
||||
await AsyncStorage.setItem(STORAGE_KEYS.SERVER_URL, serverUrl);
|
||||
};
|
||||
|
||||
const toggleJobCompletionNotifications = async () => {
|
||||
@@ -70,32 +50,11 @@ export default function SettingsScreen() {
|
||||
await AsyncStorage.setItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE, JSON.stringify(newValue));
|
||||
};
|
||||
|
||||
const handleConnectNostr = async () => {
|
||||
// This will ideally link to a dedicated Nostr connection flow
|
||||
console.log('Connect Nostr button pressed');
|
||||
// For now, simulate connection if not connected
|
||||
if (!currentNpub) {
|
||||
// This is a placeholder. Real implementation would involve generating/importing keys.
|
||||
const simulatedNpub = 'npub1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
|
||||
connectNostr(simulatedNpub, 'private_key_placeholder'); // Pass a placeholder private key
|
||||
setCurrentNpub(simulatedNpub);
|
||||
// In a real app, the private key would be securely stored and managed by the context
|
||||
// For now, just a placeholder to show connected state
|
||||
}
|
||||
};
|
||||
|
||||
const handleDisconnectNostr = async () => {
|
||||
await disconnectNostr();
|
||||
setCurrentNpub(null);
|
||||
};
|
||||
|
||||
const appVersion = Constants.expoConfig?.version || 'N/A';
|
||||
const buildCommitHash = Constants.expoConfig?.extra?.gitCommitHash || 'N/A';
|
||||
const appVersion = Constants.expoConfig?.version ?? 'N/A';
|
||||
const buildCommitHash = (Constants.expoConfig?.extra as Record<string, string> | undefined)?.gitCommitHash ?? 'N/A';
|
||||
const giteaRepoUrl = 'http://143.198.27.163:3000/replit/timmy-tower';
|
||||
|
||||
const openGiteaLink = () => {
|
||||
Linking.openURL(giteaRepoUrl);
|
||||
};
|
||||
const openGiteaLink = () => { Linking.openURL(giteaRepoUrl); };
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
@@ -106,15 +65,16 @@ export default function SettingsScreen() {
|
||||
<Text style={styles.settingLabel}>Server URL</Text>
|
||||
<View style={styles.serverUrlContainer}>
|
||||
<TextInput
|
||||
style={[styles.input, { color: C.text, backgroundColor: C.field }]} // Apply text and background color from Colors
|
||||
style={[styles.input, { color: C.text, backgroundColor: C.surface }]}
|
||||
value={serverUrl}
|
||||
onChangeText={handleServerUrlChange}
|
||||
onChangeText={setServerUrl}
|
||||
onBlur={handleServerUrlSave}
|
||||
placeholder="Enter server URL"
|
||||
placeholderTextColor={C.textMuted}
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
/>
|
||||
<ConnectionBadge isConnected={isConnected} />
|
||||
<ConnectionBadge status={connectionStatus} />
|
||||
</View>
|
||||
</View>
|
||||
|
||||
@@ -124,7 +84,7 @@ export default function SettingsScreen() {
|
||||
<Switch
|
||||
trackColor={{ false: C.surface, true: C.accentGlow }}
|
||||
thumbColor={Platform.OS === 'android' ? C.text : ''}
|
||||
ios_backgroundColor={C.field}
|
||||
ios_backgroundColor={C.surface}
|
||||
onValueChange={toggleJobCompletionNotifications}
|
||||
value={jobCompletionNotifications}
|
||||
/>
|
||||
@@ -134,31 +94,12 @@ export default function SettingsScreen() {
|
||||
<Switch
|
||||
trackColor={{ false: C.surface, true: C.accentGlow }}
|
||||
thumbColor={Platform.OS === 'android' ? C.text : ''}
|
||||
ios_backgroundColor={C.field}
|
||||
ios_backgroundColor={C.surface}
|
||||
onValueChange={toggleLowBalanceWarning}
|
||||
value={lowBalanceWarning}
|
||||
/>
|
||||
</View>
|
||||
|
||||
<Text style={styles.sectionHeader}>Identity</Text>
|
||||
<View style={styles.settingItem}>
|
||||
<Text style={styles.settingLabel}>Nostr Public Key</Text>
|
||||
<Text style={[styles.settingValue, { color: C.textMuted }]}>
|
||||
{currentNpub ? `${currentNpub.substring(0, 10)}...${currentNpub.substring(currentNpub.length - 5)}` : 'Not connected'}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.buttonContainer}>
|
||||
{!currentNpub ? (
|
||||
<Pressable onPress={handleConnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.accent, opacity: pressed ? 0.8 : 1 }]}>
|
||||
<Text style={[styles.buttonText, { color: C.textInverted }]}>Connect Nostr</Text>
|
||||
</Pressable>
|
||||
) : (
|
||||
<Pressable onPress={handleDisconnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.destructive, opacity: pressed ? 0.8 : 1 }]}>
|
||||
<Text style={[styles.buttonText, { color: C.textInverted }]}>Disconnect Nostr</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
</View>
|
||||
|
||||
<Text style={styles.sectionHeader}>About</Text>
|
||||
<View style={styles.settingItem}>
|
||||
<Text style={styles.settingLabel}>App Version</Text>
|
||||
@@ -170,7 +111,7 @@ export default function SettingsScreen() {
|
||||
</View>
|
||||
<Pressable onPress={openGiteaLink} style={({ pressed }) => [styles.linkButton, { opacity: pressed ? 0.8 : 1 }]}>
|
||||
<Ionicons name="link" size={16} color={C.text} />
|
||||
<Text style={[styles.linkButtonText, { color: C.link }]}>View project on Gitea</Text>
|
||||
<Text style={[styles.linkButtonText, { color: C.accentGlow }]}>View project on Gitea</Text>
|
||||
</Pressable>
|
||||
</ScrollView>
|
||||
</View>
|
||||
@@ -180,7 +121,7 @@ export default function SettingsScreen() {
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: Colors.dark.background, // Use background color from Colors
|
||||
backgroundColor: Colors.dark.background,
|
||||
},
|
||||
scrollContent: {
|
||||
padding: 20,
|
||||
@@ -223,27 +164,13 @@ const styles = StyleSheet.create({
|
||||
fontSize: 14,
|
||||
marginRight: 10,
|
||||
},
|
||||
buttonContainer: {
|
||||
marginTop: 20,
|
||||
alignItems: 'flex-start',
|
||||
},
|
||||
button: {
|
||||
paddingVertical: 10,
|
||||
paddingHorizontal: 15,
|
||||
borderRadius: 8,
|
||||
},
|
||||
buttonText: {
|
||||
fontSize: 16,
|
||||
fontWeight: 'bold',
|
||||
},
|
||||
linkButton: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginTop: 15,
|
||||
paddingVertical: 8,
|
||||
gap: 6,
|
||||
paddingVertical: 12,
|
||||
},
|
||||
linkButtonText: {
|
||||
marginLeft: 5,
|
||||
fontSize: 16,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
* }>
|
||||
* sentiment(text) → Promise<{ label:'POSITIVE'|'NEGATIVE'|'NEUTRAL', score }>
|
||||
* onReady(fn) → register a callback fired when models finish loading
|
||||
* onError(fn) → register a callback fired if the worker fails to boot
|
||||
* isReady() → boolean — true once both models are warm
|
||||
* warmup() → start the worker early so first classify() is fast
|
||||
*
|
||||
@@ -23,8 +24,9 @@
|
||||
*/
|
||||
|
||||
let _worker = null;
|
||||
let _ready = false;
|
||||
let _ready = false;
|
||||
let _readyCb = null;
|
||||
let _errorCb = null;
|
||||
const _pending = new Map(); // id → { resolve, reject }
|
||||
let _nextId = 1;
|
||||
|
||||
@@ -45,6 +47,7 @@ function _init() {
|
||||
}
|
||||
if (data?.type === 'error') {
|
||||
console.warn('[edge-worker] worker boot error:', data.message);
|
||||
if (_errorCb) { _errorCb(data.message); _errorCb = null; }
|
||||
// Resolve all pending with fallback values
|
||||
for (const [, { resolve }] of _pending) resolve(_fallback(null));
|
||||
_pending.clear();
|
||||
@@ -103,6 +106,11 @@ export function onReady(fn) {
|
||||
_readyCb = fn;
|
||||
}
|
||||
|
||||
/** Register a callback fired if the worker fails to boot (model load error). */
|
||||
export function onError(fn) {
|
||||
_errorCb = fn;
|
||||
}
|
||||
|
||||
export function isReady() { return _ready; }
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,18 +7,17 @@ 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';
|
||||
import { warmup as warmupEdgeWorker, onReady as onEdgeWorkerReady, onError as onEdgeWorkerError } from './edge-worker-client.js';
|
||||
import { setEdgeWorkerReady, setEdgeWorkerLoading, setEdgeWorkerError } from './ui.js';
|
||||
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);
|
||||
@@ -50,8 +47,10 @@ function buildWorld(firstInit, stateSnapshot) {
|
||||
initPaymentPanel();
|
||||
initSessionPanel();
|
||||
void initNostrIdentity('/api');
|
||||
setEdgeWorkerLoading();
|
||||
warmupEdgeWorker();
|
||||
onEdgeWorkerReady(() => setEdgeWorkerReady());
|
||||
onEdgeWorkerError(() => setEdgeWorkerError());
|
||||
void initTimmyId();
|
||||
}
|
||||
|
||||
@@ -85,7 +84,6 @@ function buildWorld(firstInit, stateSnapshot) {
|
||||
updateEffects(now);
|
||||
updateAgents(now);
|
||||
updateJobIndicators(now);
|
||||
updatePowerMeter(now, camera, renderer);
|
||||
updateUI({
|
||||
fps: currentFps,
|
||||
agentCount: getAgentCount(),
|
||||
@@ -125,7 +123,6 @@ function teardown({ scene, renderer, ac }) {
|
||||
disposeNavigation();
|
||||
disposeInteraction();
|
||||
disposeHudLabels();
|
||||
disposePowerMeter();
|
||||
disposeEffects();
|
||||
disposeAgents();
|
||||
disposeWorld(renderer, scene);
|
||||
|
||||
@@ -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`;
|
||||
}
|
||||
@@ -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');
|
||||
|
||||
@@ -32,32 +32,48 @@ export function setInputBarSessionMode(active, placeholder) {
|
||||
}
|
||||
|
||||
// ── Model-ready indicator ─────────────────────────────────────────────────────
|
||||
// A small badge on the input bar showing when local AI is warm and ready.
|
||||
// Hidden until the first `ready` event from the edge worker.
|
||||
// A small badge on the input bar showing local AI status: loading / ready / error.
|
||||
// Appears immediately when warmup() starts so users know the worker is initialising.
|
||||
|
||||
let $readyBadge = null;
|
||||
|
||||
export function setEdgeWorkerReady() {
|
||||
if (!$readyBadge) {
|
||||
$readyBadge = document.createElement('span');
|
||||
$readyBadge.id = 'edge-ready-badge';
|
||||
$readyBadge.title = 'Local AI active — trivial queries answered without Lightning payment';
|
||||
$readyBadge.style.cssText = [
|
||||
'font-size:10px;color:#44cc88;border:1px solid #226644',
|
||||
'border-radius:3px;padding:1px 5px;margin-left:6px',
|
||||
'vertical-align:middle;cursor:default',
|
||||
].join(';');
|
||||
$readyBadge.textContent = '⚡ local AI';
|
||||
const $input = document.getElementById('visitor-input');
|
||||
$input?.insertAdjacentElement('afterend', $readyBadge);
|
||||
// Fallback: append to send button area
|
||||
if (!$readyBadge.isConnected) {
|
||||
document.getElementById('send-btn')?.insertAdjacentElement('afterend', $readyBadge);
|
||||
}
|
||||
const EDGE_STATES = {
|
||||
loading: { text: '◌ AI loading', color: '#88aacc', border: '#335577', title: 'Local AI model loading…' },
|
||||
ready: { text: '⚡ local AI', color: '#44cc88', border: '#226644', title: 'Local AI active — trivial queries answered without Lightning payment' },
|
||||
error: { text: '✕ AI offline', color: '#cc6644', border: '#773322', title: 'Local AI failed to load — all requests will be routed to server' },
|
||||
};
|
||||
|
||||
function _ensureEdgeBadge() {
|
||||
if ($readyBadge) return $readyBadge;
|
||||
$readyBadge = document.createElement('span');
|
||||
$readyBadge.id = 'edge-ready-badge';
|
||||
$readyBadge.style.cssText = [
|
||||
'font-size:10px;border-radius:3px;padding:1px 5px;margin-left:6px',
|
||||
'vertical-align:middle;cursor:default;transition:color .3s,border-color .3s',
|
||||
].join(';');
|
||||
const $input = document.getElementById('visitor-input');
|
||||
$input?.insertAdjacentElement('afterend', $readyBadge);
|
||||
if (!$readyBadge.isConnected) {
|
||||
document.getElementById('send-btn')?.insertAdjacentElement('afterend', $readyBadge);
|
||||
}
|
||||
$readyBadge.style.display = '';
|
||||
return $readyBadge;
|
||||
}
|
||||
|
||||
export function setEdgeWorkerStatus(state) {
|
||||
const cfg = EDGE_STATES[state] ?? EDGE_STATES.loading;
|
||||
const el = _ensureEdgeBadge();
|
||||
el.textContent = cfg.text;
|
||||
el.title = cfg.title;
|
||||
el.style.color = cfg.color;
|
||||
el.style.border = `1px solid ${cfg.border}`;
|
||||
el.style.display = '';
|
||||
}
|
||||
|
||||
/** Convenience wrappers kept for backward-compat with main.js callers. */
|
||||
export function setEdgeWorkerReady() { setEdgeWorkerStatus('ready'); }
|
||||
export function setEdgeWorkerLoading() { setEdgeWorkerStatus('loading'); }
|
||||
export function setEdgeWorkerError() { setEdgeWorkerStatus('error'); }
|
||||
|
||||
// ── Cost preview badge ────────────────────────────────────────────────────────
|
||||
// Shown beneath the input bar: "~N sats" / "FREE" / "answered locally".
|
||||
// Fetched from GET /api/estimate once the user stops typing (300 ms debounce).
|
||||
|
||||
@@ -6,7 +6,6 @@ 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;
|
||||
@@ -191,15 +190,6 @@ 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':
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user