Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38558cad1c |
@@ -741,7 +741,16 @@ private fun buildAutoLoginScript(password: String): String {
|
|||||||
var setter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set;
|
var setter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set;
|
||||||
setter.call(el, pw);
|
setter.call(el, pw);
|
||||||
el.dispatchEvent(new Event('input', { bubbles: true }));
|
el.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
// Let Vue re-render before submitting: a synchronous Enter arrives
|
||||||
|
// while the login button is still disabled, and the web UI's
|
||||||
|
// controller-nav "Enter in input clicks the next enabled button"
|
||||||
|
// pattern then hits Replay Intro instead — restarting the intro
|
||||||
|
// cinematic on every connect (two frames = value flush + render).
|
||||||
|
requestAnimationFrame(function () {
|
||||||
|
requestAnimationFrame(function () {
|
||||||
el.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
|
el.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
|
||||||
|
});
|
||||||
|
});
|
||||||
}, 1500);
|
}, 1500);
|
||||||
})();
|
})();
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v1.7.102-alpha (2026-07-17)
|
||||||
|
|
||||||
|
- The password you choose during setup is now truly your node's password: it also becomes the system login for console and SSH access, instead of leaving the factory default in place. If you ever renamed your node and the TV screen went black on the next boot, that's fixed too — renaming no longer breaks the kiosk display.
|
||||||
|
- Setting up Lightning is now a guided journey: a fund-your-wallet step that shows a live countdown while Bitcoin syncs, suggested channels you can open straight into the Zeus mobile wallet with one tap, and a "finish setup" prompt that walks you to the end — goals now complete when you've actually done the steps, not just when apps happen to be running.
|
||||||
|
- Pair your phone by pointing it at the screen: the companion app now connects by scanning a QR code — scan, and it fills in your node's address and logs you in. The App Store has a banner to grab the Android app, and the pairing flow can now also set up secure remote access so your phone reaches home from anywhere.
|
||||||
|
- First installs are far more dependable: app downloads that stall now retry instead of hanging forever (the old "first install fails, the second works" pattern), big multi-part apps show their real download progress instead of sitting at "Preparing", Lightning no longer fails its first install over temporary hiccups, and a brand-new node now comes up with its core apps — file cloud and ecash wallet — even with no internet connection.
|
||||||
|
- The installer image is about 160MB smaller and gets to a working screen faster, because the apps bundled for offline setup are now compressed.
|
||||||
|
- The first-run experience keeps its magic: the typing intro is back on fresh installs and can no longer be cut short by a mid-play refresh — updates now politely wait for the cinematic to finish — and dark backgrounds stay dark instead of flashing black or white.
|
||||||
|
- Your backups now include your secrets — including the key that protects your Lightning wallet's recovery seed — and there's a Download button to take a copy off the node; the seed-backup reminder now actually opens the backup flow when you tap it.
|
||||||
|
- Networking Profits grew into a full dashboard, network cards keep their action buttons in reach on every screen size, "Connect to Mesh" goes to the right page instead of a dead end, and the identity pages got a round of mobile polish.
|
||||||
|
- Behind the scenes: apps that report their own health are no longer second-guessed by a port probe (fewer false "restarting" states), and pressing arrow keys or a gamepad is once again the only thing that shows the controller focus ring.
|
||||||
|
|
||||||
## v1.7.101-alpha (2026-07-15)
|
## v1.7.101-alpha (2026-07-15)
|
||||||
|
|
||||||
- The wallet speaks Ark: a new Ark tab shows your Ark balance and history, you can send and receive over the Ark protocol, pay Lightning invoices from your Ark balance, and Ark payments appear in the transactions view with their own filter chip.
|
- The wallet speaks Ark: a new Ark tab shows your Ark balance and history, you can send and receive over the Ark protocol, pay Lightning invoices from your Ark balance, and Ark payments appear in the transactions view with their own filter chip.
|
||||||
|
|||||||
Generated
+1
-1
@@ -95,7 +95,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "archipelago"
|
name = "archipelago"
|
||||||
version = "1.7.101-alpha"
|
version = "1.7.102-alpha"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"archipelago-container",
|
"archipelago-container",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "archipelago"
|
name = "archipelago"
|
||||||
version = "1.7.101-alpha"
|
version = "1.7.102-alpha"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "Archipelago Bitcoin Node OS - Native backend"
|
description = "Archipelago Bitcoin Node OS - Native backend"
|
||||||
authors = ["Archipelago Team"]
|
authors = ["Archipelago Team"]
|
||||||
|
|||||||
@@ -207,7 +207,11 @@ impl ApiHandler {
|
|||||||
hyper::Body::from(r#"{"error":"invalid backup id"}"#),
|
hyper::Body::from(r#"{"error":"invalid backup id"}"#),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
let file = self.config.data_dir.join("backups").join(format!("{id}.bak"));
|
let file = self
|
||||||
|
.config
|
||||||
|
.data_dir
|
||||||
|
.join("backups")
|
||||||
|
.join(format!("{id}.bak"));
|
||||||
match tokio::fs::read(&file).await {
|
match tokio::fs::read(&file).await {
|
||||||
Ok(bytes) => Ok(Response::builder()
|
Ok(bytes) => Ok(Response::builder()
|
||||||
.status(StatusCode::OK)
|
.status(StatusCode::OK)
|
||||||
|
|||||||
@@ -147,6 +147,15 @@ impl RpcHandler {
|
|||||||
self.auth_manager.setup_user(password).await?;
|
self.auth_manager.setup_user(password).await?;
|
||||||
tracing::info!("[onboarding] user setup complete");
|
tracing::info!("[onboarding] user setup complete");
|
||||||
|
|
||||||
|
// The install-time password must also become the OS login for the
|
||||||
|
// archipelago user — otherwise the console/SSH keeps the image default
|
||||||
|
// ("archipelago") after the user has picked a real password (#97).
|
||||||
|
// Best-effort: a failure here must not break onboarding.
|
||||||
|
match crate::auth::change_ssh_password(password).await {
|
||||||
|
Ok(()) => tracing::info!("[onboarding] system login password synced"),
|
||||||
|
Err(e) => tracing::warn!("[onboarding] system login password sync failed: {e}"),
|
||||||
|
}
|
||||||
|
|
||||||
// Persist the pending onboarding seed as the encrypted backup now that
|
// Persist the pending onboarding seed as the encrypted backup now that
|
||||||
// a passphrase (the login password) finally exists — otherwise "Reveal
|
// a passphrase (the login password) finally exists — otherwise "Reveal
|
||||||
// recovery phrase" has nothing to decrypt on this node, ever.
|
// recovery phrase" has nothing to decrypt on this node, ever.
|
||||||
|
|||||||
@@ -95,11 +95,19 @@ impl RpcHandler {
|
|||||||
.get("addr")
|
.get("addr")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.ok_or_else(|| anyhow::anyhow!("Missing 'addr' parameter"))?;
|
.ok_or_else(|| anyhow::anyhow!("Missing 'addr' parameter"))?;
|
||||||
|
// send_all sweeps the entire confirmed on-chain balance (LND computes
|
||||||
|
// the amount after fees); amount is required otherwise.
|
||||||
|
let send_all = params
|
||||||
|
.get("send_all")
|
||||||
|
.and_then(|v| v.as_bool())
|
||||||
|
.unwrap_or(false);
|
||||||
|
let amount = if send_all {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
let amount = params
|
let amount = params
|
||||||
.get("amount")
|
.get("amount")
|
||||||
.and_then(|v| v.as_i64())
|
.and_then(|v| v.as_i64())
|
||||||
.ok_or_else(|| anyhow::anyhow!("Missing 'amount' parameter (sats)"))?;
|
.ok_or_else(|| anyhow::anyhow!("Missing 'amount' parameter (sats)"))?;
|
||||||
|
|
||||||
if amount < 546 {
|
if amount < 546 {
|
||||||
return Err(anyhow::anyhow!(
|
return Err(anyhow::anyhow!(
|
||||||
"Amount must be at least 546 sats (dust limit)"
|
"Amount must be at least 546 sats (dust limit)"
|
||||||
@@ -108,20 +116,33 @@ impl RpcHandler {
|
|||||||
if amount > 21_000_000 * 100_000_000 {
|
if amount > 21_000_000 * 100_000_000 {
|
||||||
return Err(anyhow::anyhow!("Amount exceeds maximum Bitcoin supply"));
|
return Err(anyhow::anyhow!("Amount exceeds maximum Bitcoin supply"));
|
||||||
}
|
}
|
||||||
|
Some(amount)
|
||||||
|
};
|
||||||
|
|
||||||
// Validate Bitcoin address format (basic: length and allowed chars)
|
// Validate Bitcoin address format (basic: length and allowed chars)
|
||||||
if addr.len() < 14 || addr.len() > 90 || !addr.chars().all(|c| c.is_ascii_alphanumeric()) {
|
if addr.len() < 14 || addr.len() > 90 || !addr.chars().all(|c| c.is_ascii_alphanumeric()) {
|
||||||
return Err(anyhow::anyhow!("Invalid Bitcoin address format"));
|
return Err(anyhow::anyhow!("Invalid Bitcoin address format"));
|
||||||
}
|
}
|
||||||
|
|
||||||
info!(addr = addr, amount = amount, "Sending on-chain Bitcoin");
|
info!(
|
||||||
|
addr = addr,
|
||||||
|
amount = amount,
|
||||||
|
send_all = send_all,
|
||||||
|
"Sending on-chain Bitcoin"
|
||||||
|
);
|
||||||
|
|
||||||
let (client, macaroon_hex) = self.lnd_client().await?;
|
let (client, macaroon_hex) = self.lnd_client().await?;
|
||||||
|
|
||||||
let send_body = serde_json::json!({
|
let send_body = match amount {
|
||||||
|
Some(amount) => serde_json::json!({
|
||||||
"addr": addr,
|
"addr": addr,
|
||||||
"amount": amount.to_string(),
|
"amount": amount.to_string(),
|
||||||
});
|
}),
|
||||||
|
None => serde_json::json!({
|
||||||
|
"addr": addr,
|
||||||
|
"send_all": true,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
let resp = client
|
let resp = client
|
||||||
.post(format!("{LND_REST_BASE_URL}/v1/transactions"))
|
.post(format!("{LND_REST_BASE_URL}/v1/transactions"))
|
||||||
|
|||||||
@@ -394,9 +394,9 @@ where
|
|||||||
// under any name variant AND no install in flight — waiting cannot
|
// under any name variant AND no install in flight — waiting cannot
|
||||||
// satisfy it.
|
// satisfy it.
|
||||||
let some_dep_not_installed = missing.iter().any(|dep| {
|
let some_dep_not_installed = missing.iter().any(|dep| {
|
||||||
!dep.containers.iter().any(|c| {
|
!dep.containers
|
||||||
existing.iter().any(|e| e == c) || installing.iter().any(|i| i == c)
|
.iter()
|
||||||
})
|
.any(|c| existing.iter().any(|e| e == c) || installing.iter().any(|i| i == c))
|
||||||
});
|
});
|
||||||
if some_dep_not_installed {
|
if some_dep_not_installed {
|
||||||
let msg = match check_install_deps(package_id, &running) {
|
let msg = match check_install_deps(package_id, &running) {
|
||||||
|
|||||||
@@ -1140,8 +1140,7 @@ impl RpcHandler {
|
|||||||
std::sync::atomic::Ordering::Relaxed,
|
std::sync::atomic::Ordering::Relaxed,
|
||||||
);
|
);
|
||||||
if let Some((downloaded, total)) = parse_pull_progress(&line) {
|
if let Some((downloaded, total)) = parse_pull_progress(&line) {
|
||||||
Self::update_install_progress(&state_mgr, &pkg_id, downloaded, total)
|
Self::update_install_progress(&state_mgr, &pkg_id, downloaded, total).await;
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -700,9 +700,7 @@ async fn install_stack_via_orchestrator(
|
|||||||
// Truthful end-of-install signal, mirroring the legacy stack installers:
|
// Truthful end-of-install signal, mirroring the legacy stack installers:
|
||||||
// the real readiness gate is the scanner's next sweep, this just settles
|
// the real readiness gate is the scanner's next sweep, this just settles
|
||||||
// the bar at 95→100→done instead of leaving it mid-band.
|
// the bar at 95→100→done instead of leaving it mid-band.
|
||||||
handler
|
handler.set_install_progress(stack_name, total, total).await;
|
||||||
.set_install_progress(stack_name, total, total)
|
|
||||||
.await;
|
|
||||||
handler
|
handler
|
||||||
.set_install_phase(stack_name, InstallPhase::PostInstall)
|
.set_install_phase(stack_name, InstallPhase::PostInstall)
|
||||||
.await;
|
.await;
|
||||||
|
|||||||
@@ -402,6 +402,16 @@ async fn sync_hostname_side_effects(hostname: &str) {
|
|||||||
Err(e) => warn!("/etc/hosts hostname sync failed: {}", e),
|
Err(e) => warn!("/etc/hosts hostname sync failed: {}", e),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The kiosk Chromium's profile lock is a symlink encoding <hostname>-<pid>;
|
||||||
|
// after a rename the stale lock reads as "another computer" holding the
|
||||||
|
// profile, Chromium refuses to start (--noerrdialogs hides the dialog), and
|
||||||
|
// the kiosk black-screens on the next boot (#98). Clear it here — Chromium
|
||||||
|
// recreates the files on launch, and the kiosk launcher pkills any running
|
||||||
|
// instance before starting a new one.
|
||||||
|
for f in ["SingletonLock", "SingletonCookie", "SingletonSocket"] {
|
||||||
|
let _ = tokio::fs::remove_file(format!("/var/lib/archipelago/chromium-kiosk/{f}")).await;
|
||||||
|
}
|
||||||
|
|
||||||
let republished = tokio::process::Command::new("/usr/bin/sudo")
|
let republished = tokio::process::Command::new("/usr/bin/sudo")
|
||||||
.args(["-n", "/usr/bin/avahi-set-host-name", hostname])
|
.args(["-n", "/usr/bin/avahi-set-host-name", hostname])
|
||||||
.output()
|
.output()
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ fn validate_password_strength(password: &str) -> Result<()> {
|
|||||||
/// Change the archipelago user's SSH/login password.
|
/// Change the archipelago user's SSH/login password.
|
||||||
/// Uses usermod + openssl to bypass PAM (avoids "Authentication token manipulation" errors).
|
/// Uses usermod + openssl to bypass PAM (avoids "Authentication token manipulation" errors).
|
||||||
/// Uses absolute paths (/usr/bin/openssl, /usr/sbin/usermod) for systemd's minimal PATH.
|
/// Uses absolute paths (/usr/bin/openssl, /usr/sbin/usermod) for systemd's minimal PATH.
|
||||||
async fn change_ssh_password(new_password: &str) -> Result<()> {
|
pub(crate) async fn change_ssh_password(new_password: &str) -> Result<()> {
|
||||||
let ssh_user =
|
let ssh_user =
|
||||||
std::env::var("ARCHIPELAGO_SSH_USER").unwrap_or_else(|_| "archipelago".to_string());
|
std::env::var("ARCHIPELAGO_SSH_USER").unwrap_or_else(|_| "archipelago".to_string());
|
||||||
|
|
||||||
|
|||||||
@@ -763,7 +763,9 @@ mod tests {
|
|||||||
let meta = create_full_backup(dir.path(), "pass", None).await.unwrap();
|
let meta = create_full_backup(dir.path(), "pass", None).await.unwrap();
|
||||||
|
|
||||||
std::fs::remove_dir_all(dir.path().join("secrets")).unwrap();
|
std::fs::remove_dir_all(dir.path().join("secrets")).unwrap();
|
||||||
restore_full_backup(dir.path(), &meta.id, "pass").await.unwrap();
|
restore_full_backup(dir.path(), &meta.id, "pass")
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let pw = std::fs::read_to_string(dir.path().join("secrets/lnd-wallet-password")).unwrap();
|
let pw = std::fs::read_to_string(dir.path().join("secrets/lnd-wallet-password")).unwrap();
|
||||||
assert_eq!(pw, "s3cret");
|
assert_eq!(pw, "s3cret");
|
||||||
@@ -784,7 +786,9 @@ mod tests {
|
|||||||
std::fs::create_dir_all(dir.path().join("secrets")).unwrap();
|
std::fs::create_dir_all(dir.path().join("secrets")).unwrap();
|
||||||
std::fs::write(dir.path().join("secrets/lnd-wallet-password"), "keep-me").unwrap();
|
std::fs::write(dir.path().join("secrets/lnd-wallet-password"), "keep-me").unwrap();
|
||||||
|
|
||||||
restore_full_backup(dir.path(), &meta.id, "pass").await.unwrap();
|
restore_full_backup(dir.path(), &meta.id, "pass")
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let pw = std::fs::read_to_string(dir.path().join("secrets/lnd-wallet-password")).unwrap();
|
let pw = std::fs::read_to_string(dir.path().join("secrets/lnd-wallet-password")).unwrap();
|
||||||
assert_eq!(pw, "keep-me");
|
assert_eq!(pw, "keep-me");
|
||||||
|
|||||||
@@ -301,6 +301,33 @@ fn unrepairable_ownership() -> &'static std::sync::Mutex<std::collections::HashS
|
|||||||
SET.get_or_init(|| std::sync::Mutex::new(std::collections::HashSet::new()))
|
SET.get_or_init(|| std::sync::Mutex::new(std::collections::HashSet::new()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Per-container timestamp of the last volume-ownership sweep. The sweep's
|
||||||
|
/// write-probes are `podman exec`s into EVERY running container; running them
|
||||||
|
/// on every 30s reconcile tick meant six-plus cross-context exec attempts per
|
||||||
|
/// tick forever — a permanent conmon "Failed to create container" storm on
|
||||||
|
/// hosts where exec from the backend's cgroup context fails (Debian 13 first
|
||||||
|
/// boot, 2026-07-19). Ownership drift is an install/OTA-time event, not a
|
||||||
|
/// steady-state one: sweep each container on the first pass after it appears,
|
||||||
|
/// then at most once per hour.
|
||||||
|
fn ownership_sweep_due(name: &str) -> bool {
|
||||||
|
const SWEEP_INTERVAL: std::time::Duration = std::time::Duration::from_secs(60 * 60);
|
||||||
|
static LAST: std::sync::OnceLock<
|
||||||
|
std::sync::Mutex<std::collections::HashMap<String, std::time::Instant>>,
|
||||||
|
> = std::sync::OnceLock::new();
|
||||||
|
let map = LAST.get_or_init(|| std::sync::Mutex::new(std::collections::HashMap::new()));
|
||||||
|
let Ok(mut map) = map.lock() else {
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
let now = std::time::Instant::now();
|
||||||
|
match map.get(name) {
|
||||||
|
Some(last) if now.duration_since(*last) < SWEEP_INTERVAL => false,
|
||||||
|
_ => {
|
||||||
|
map.insert(name.to_string(), now);
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// App-agnostic, userns-mapping-proof volume-ownership repair for a RUNNING
|
/// App-agnostic, userns-mapping-proof volume-ownership repair for a RUNNING
|
||||||
/// container.
|
/// container.
|
||||||
///
|
///
|
||||||
@@ -1739,6 +1766,11 @@ impl ProdContainerOrchestrator {
|
|||||||
if crate::app_ops::lifecycle_op_in_flight(&c.name) {
|
if crate::app_ops::lifecycle_op_in_flight(&c.name) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
// Throttled: first pass after the container appears, then
|
||||||
|
// hourly — not on every 30s tick (see ownership_sweep_due).
|
||||||
|
if !ownership_sweep_due(&c.name) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if ensure_running_container_ownership(&c.name).await {
|
if ensure_running_container_ownership(&c.name).await {
|
||||||
tracing::info!(container = %c.name, "volume ownership repaired during reconcile — restarting to recover");
|
tracing::info!(container = %c.name, "volume ownership repaired during reconcile — restarting to recover");
|
||||||
let _ = tokio::process::Command::new("podman")
|
let _ = tokio::process::Command::new("podman")
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
# Add an existing Nostr identity to the node — UX & implementation plan
|
||||||
|
|
||||||
|
**Status:** plan only (2026-07-16), no code. Companion research: `docs/nostr-signer-login-research.md`.
|
||||||
|
|
||||||
|
## Where it lives
|
||||||
|
|
||||||
|
The **Nostr Identities** screen (`Web5Identities.vue`, backed by `identity.list` /
|
||||||
|
`identity.create`). Today every identity is **seed-derived** (`identity_manager.rs`
|
||||||
|
derives ed25519 + nostr keys from the BIP-39 master seed at an index). "Add existing"
|
||||||
|
introduces a second class of identity: one whose key material comes from *outside* the
|
||||||
|
seed.
|
||||||
|
|
||||||
|
## Two import kinds (both needed, different guarantees)
|
||||||
|
|
||||||
|
1. **Full import (nsec)** — the node holds the secret key. The identity behaves exactly
|
||||||
|
like a seed-derived one (can sign in embedded apps, publish, encrypt). NOT covered by
|
||||||
|
seed backup — flag it visibly and include it in the encrypted node backup.
|
||||||
|
2. **Linked signer (npub only)** — the node stores just the public key; signing is
|
||||||
|
delegated to the user's own signer (browser extension NIP-07, or a NIP-46 remote
|
||||||
|
signer later). Zero key custody; some features (background publishing) unavailable —
|
||||||
|
the UI should badge what works.
|
||||||
|
|
||||||
|
## The UX (matching the house style)
|
||||||
|
|
||||||
|
**Entry point:** next to "Create identity" on Nostr Identities, an **"Add existing"**
|
||||||
|
glass-button. Opens a modal with three tabs (same tab pattern as the send/receive
|
||||||
|
modals):
|
||||||
|
|
||||||
|
1. **Browser extension** (default when `window.nostr` exists)
|
||||||
|
- One button: "Connect with extension". Flow: `getPublicKey()` → show the npub +
|
||||||
|
resolved profile (kind-0 fetched via the node's relays: avatar, name — instant
|
||||||
|
recognition) → "Add this identity".
|
||||||
|
- Creates a **linked signer** identity. A challenge signature
|
||||||
|
(`signEvent` on a throwaway event) proves key possession before adding — never add
|
||||||
|
an unverified npub as "yours".
|
||||||
|
2. **Secret key (nsec)**
|
||||||
|
- Paste field (masked, `nsec1…` or hex), inline validation + derived npub preview
|
||||||
|
with the same kind-0 profile card before confirming.
|
||||||
|
- Scary-clear copy: "Your key will be stored on this node, encrypted at rest. It is
|
||||||
|
NOT part of your seed backup — back it up separately." Confirm step requires the
|
||||||
|
profile card to load or an explicit "add anyway".
|
||||||
|
- Creates a **full** identity.
|
||||||
|
3. **Public key (npub)** — watch-only
|
||||||
|
- Paste an npub for a linked identity without any signer attached yet (useful to
|
||||||
|
reserve the profile, upgrade to extension/NIP-46 signing later).
|
||||||
|
|
||||||
|
**After adding:** the identity appears in the same grid with a small origin badge —
|
||||||
|
`seed` / `imported` / `linked` — and the imported profile picture/name pulled from
|
||||||
|
relays. Everything else (picker in apps, rename, avatar) behaves uniformly.
|
||||||
|
|
||||||
|
**Removal:** existing delete flow; for `imported` identities the confirm dialog warns
|
||||||
|
the key is destroyed unless exported first (offer "Export nsec" in the identity's detail
|
||||||
|
sheet, gated behind password re-entry).
|
||||||
|
|
||||||
|
## Backend work
|
||||||
|
|
||||||
|
- `identity_manager.rs`: identity records gain `origin: Seed { index } | Imported |
|
||||||
|
Linked`, optional `nostr_secret_hex` absent for Linked. Storage: reuse the existing
|
||||||
|
encrypted identity file; imported secrets included in node backup.
|
||||||
|
- New RPCs:
|
||||||
|
- `identity.import-nostr` `{ nsec | npub, name?, verify_sig? }` → validates, derives
|
||||||
|
npub, rejects duplicates (same pubkey as any existing identity), returns the new
|
||||||
|
identity.
|
||||||
|
- `identity.fetch-profile` `{ pubkey }` → kind-0 lookup via `nostr_relays.rs` for the
|
||||||
|
preview card (frontend could also do this, but the node already has relay plumbing
|
||||||
|
and avoids CORS).
|
||||||
|
- `identity.nostr-sign` (used by the iframe NIP-07 bridge): for `Linked` identities
|
||||||
|
return a typed error the bridge translates into "ask the user's extension instead" —
|
||||||
|
phase 2; phase 1 simply hides linked identities from the in-app signer picker.
|
||||||
|
|
||||||
|
## Demo mode
|
||||||
|
|
||||||
|
Mock `identity.import-nostr` + `identity.fetch-profile` in mock-backend.js (canned
|
||||||
|
profile: picture + name for any pasted npub) so the whole add-existing flow is
|
||||||
|
demoable without real relays.
|
||||||
|
|
||||||
|
## Phasing
|
||||||
|
|
||||||
|
1. **Phase 1 (small):** nsec + npub tabs, origin badges, backup inclusion, mock.
|
||||||
|
2. **Phase 2:** extension tab with possession-proof + kind-0 preview cards everywhere.
|
||||||
|
3. **Phase 3:** NIP-46 remote-signer identities + login integration (shares the QR
|
||||||
|
plumbing from the signer-login work).
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
# Sign in to the node with a Nostr signer — research & recommendation
|
||||||
|
|
||||||
|
**Status:** research only (2026-07-16), no code. Companion plan: `docs/nostr-identity-import-plan.md`.
|
||||||
|
|
||||||
|
## What's already in the tree (and what it isn't)
|
||||||
|
|
||||||
|
The IndeeHub "sign in with signer" work is the *inverse* of this feature: the node acts
|
||||||
|
as a NIP-07 **provider** for embedded iframe apps, signing with node-held keys
|
||||||
|
(`useNostrBridge.ts` postMessage bridge → `identity.nostr-sign` etc., picker UI in
|
||||||
|
`NostrIdentityPicker.vue`). It never verifies an external signer — but the UI patterns
|
||||||
|
(picker modal, QR rendering) and the backend crypto are reusable:
|
||||||
|
|
||||||
|
- **`nostr-sdk 0.44` is already a core dependency** (`nostr_handshake.rs` runs a real
|
||||||
|
relay client) — schnorr event verification and NIP-46 client support are essentially
|
||||||
|
free on the Rust side.
|
||||||
|
- Auth today is single-password + optional TOTP, and TOTP already uses a **two-step
|
||||||
|
login** (`auth.login` → `auth.login.totp`) — the exact slot where a parallel
|
||||||
|
`auth.login.nostr.*` path fits.
|
||||||
|
- The node can host its own relay (strfry app), and the frontend already bundles `qrcode`.
|
||||||
|
|
||||||
|
## Candidate flows, ranked by friction
|
||||||
|
|
||||||
|
### A. Browser extension (NIP-07) — lowest friction on desktop (2 clicks)
|
||||||
|
Login page shows "Sign in with extension" when `window.nostr` exists. Server issues a
|
||||||
|
random challenge → extension signs a **kind 22242** auth event carrying the challenge →
|
||||||
|
server verifies signature + challenge + `created_at` freshness + that the pubkey is
|
||||||
|
enrolled → normal session cookie. ~50 lines of frontend, ~80 lines of Rust. No relay
|
||||||
|
involved at all.
|
||||||
|
|
||||||
|
### B. QR scan with a mobile signer (NIP-46 `nostrconnect://`) — the headline UX (scan + 1 tap)
|
||||||
|
1. Backend generates an ephemeral client keypair and renders a
|
||||||
|
`nostrconnect://<pubkey>?relay=<url>&secret=<rand>&perms=sign_event:22242&name=Archipelago` QR.
|
||||||
|
2. User scans with **Amber** (Android reference signer; Aegis/Nowser also scan;
|
||||||
|
nsec.app is paste-based; Alby is *not* a NIP-46 signer).
|
||||||
|
3. Phone connects to the relay, acks the secret; backend requests one
|
||||||
|
`sign_event:22242` over the encrypted NIP-46 channel, verifies, issues the session.
|
||||||
|
|
||||||
|
**Key architectural choice:** make the **Rust backend the NIP-46 client** (rust-nostr's
|
||||||
|
`nostr-connect` crate), talking to the relay over localhost — the browser only polls our
|
||||||
|
own RPC for "signer connected". No websocket/mixed-content issues in the Vue app.
|
||||||
|
|
||||||
|
**Relay topology:** no public relay is required by the spec — and public relays often
|
||||||
|
rate-limit ephemeral NIP-46 traffic. The node's own strfry is the ideal relay (private,
|
||||||
|
LAN-fast); the QR should carry a relay URL derived from the Host the browser used
|
||||||
|
(LAN IP / Tailscale IP — not `.local`, which Android often can't resolve).
|
||||||
|
**One empirical blocker to test first: does Amber accept plain `ws://` LAN relays?**
|
||||||
|
(Self-signed `wss://` will likely fail cert validation.) If not, route `wss://` through
|
||||||
|
the existing nginx/HTTPS cert story.
|
||||||
|
|
||||||
|
### C. Remembered NIP-46 session (persisted bunker pointer) — zero-tap repeat logins
|
||||||
|
Same as B but persists the pairing so future logins auto-approve. Adds state,
|
||||||
|
revocation surface, and "bunker offline = silent hang" failure modes. **Defer** — B
|
||||||
|
re-scans in ~5 seconds anyway.
|
||||||
|
|
||||||
|
## Recommendation
|
||||||
|
|
||||||
|
Ship **A + B behind one "Sign in with Nostr" button**; skip C for now. Password (+TOTP)
|
||||||
|
stays the permanent fallback — exactly as the user proposed, the signer is enrolled in a
|
||||||
|
step *after* password creation, never instead of it. The verification core is one shared
|
||||||
|
Rust function (sig + challenge + freshness + enrolled-pubkey → session).
|
||||||
|
|
||||||
|
- **Onboarding:** after the password (and seed) steps, an optional "Connect a signer"
|
||||||
|
card: QR (nostrconnect) + "Use browser extension" + Skip. Success enrolls the npub as
|
||||||
|
a login key.
|
||||||
|
- **Settings (next to TOTP):** list enrolled npubs (added date + method), "Add npub"
|
||||||
|
(paste, becomes usable after a challenge-verify), "Connect another signer" (same
|
||||||
|
QR/extension modal), "Remove" (requires password confirm; removing the last npub never
|
||||||
|
locks the account — password always works).
|
||||||
|
- **Libraries:** hand-roll the 22242 event for NIP-07 (window.nostr is a browser global);
|
||||||
|
rust-nostr `nostr-connect` for NIP-46. Avoid the 2.4 MB `nostr-login` JS bundle —
|
||||||
|
wrong fit for a self-hosted box (defaults to public bunkers); it's UX prior art only.
|
||||||
|
|
||||||
|
## Security notes
|
||||||
|
|
||||||
|
- Only pubkeys enrolled **while authenticated** (or during onboarding) may log in —
|
||||||
|
a simple `login_npubs` list next to the TOTP data in `auth.rs`.
|
||||||
|
- Challenge: 32-byte random, single-use, 2–5 min TTL, `created_at` ±60 s, deleted on
|
||||||
|
first verify attempt; pin an origin/host tag. Rate-limit like password attempts.
|
||||||
|
- The `secret` in the nostrconnect URI is a bearer token — one QR per attempt, expires
|
||||||
|
with the challenge.
|
||||||
|
- Policy call: signer approval should count as the second factor for TOTP accounts
|
||||||
|
(possession of phone/extension key), so nostr login doesn't silently bypass TOTP.
|
||||||
|
|
||||||
|
## Open questions
|
||||||
|
|
||||||
|
1. Amber + `ws://` LAN relay — needs a 10-minute on-device test before committing.
|
||||||
|
2. Which relay URL to embed (LAN vs Tailscale vs onion) — derive from browser Host.
|
||||||
|
3. NIP-46 encryption: spec says NIP-44, some signers still NIP-04 — rust-nostr handles
|
||||||
|
both; verify against current Amber.
|
||||||
|
4. Track draft **NIP-97 "Login with Nostr"** (matches this UX exactly, unmerged) —
|
||||||
|
align, don't depend.
|
||||||
|
|
||||||
|
**Prior art:** no mainstream self-hosted node OS (Umbrel, Start9, Alby Hub) ships Nostr
|
||||||
|
QR login for its own UI — this would be genuinely differentiating, and every building
|
||||||
|
block is already in the tree.
|
||||||
@@ -254,8 +254,17 @@ container_pull() {
|
|||||||
echo "📦 Step 1: Building root filesystem..."
|
echo "📦 Step 1: Building root filesystem..."
|
||||||
|
|
||||||
ROOTFS_TAR="$WORK_DIR/archipelago-rootfs.tar"
|
ROOTFS_TAR="$WORK_DIR/archipelago-rootfs.tar"
|
||||||
|
ROOTFS_STAMP="$WORK_DIR/archipelago-rootfs.recipe.sha256"
|
||||||
|
|
||||||
if [ ! -f "$ROOTFS_TAR" ] || [ "$1" == "--rebuild" ]; then
|
# The cached rootfs must be invalidated when its recipe changes: a stale
|
||||||
|
# archipelago-rootfs.tar on the build machine shipped ISOs with NO
|
||||||
|
# wpasupplicant/iw/rfkill (WiFi dead on laptops) long after those packages
|
||||||
|
# were added to the Dockerfile below — the cache condition never looked at
|
||||||
|
# the recipe. Hash the rootfs-defining region of this script; any edit to it
|
||||||
|
# forces a rebuild. `--rebuild` still forces one unconditionally.
|
||||||
|
RECIPE_HASH=$(sed -n '/^# STEP 1: Build complete root filesystem/,/^# STEP 2: Build minimal installer/p' "$0" | sha256sum | cut -d' ' -f1)
|
||||||
|
|
||||||
|
if [ ! -f "$ROOTFS_TAR" ] || [ "${1:-}" == "--rebuild" ] || [ "$(cat "$ROOTFS_STAMP" 2>/dev/null)" != "$RECIPE_HASH" ]; then
|
||||||
echo " Using Docker to create Debian root filesystem..."
|
echo " Using Docker to create Debian root filesystem..."
|
||||||
|
|
||||||
# Create a Dockerfile for building the rootfs
|
# Create a Dockerfile for building the rootfs
|
||||||
@@ -694,6 +703,7 @@ SYSTEMDSERVICE
|
|||||||
$CONTAINER_CMD export archipelago-rootfs-tmp > "$ROOTFS_TAR"
|
$CONTAINER_CMD export archipelago-rootfs-tmp > "$ROOTFS_TAR"
|
||||||
$CONTAINER_CMD rm archipelago-rootfs-tmp
|
$CONTAINER_CMD rm archipelago-rootfs-tmp
|
||||||
|
|
||||||
|
echo "$RECIPE_HASH" > "$ROOTFS_STAMP"
|
||||||
echo "✅ Root filesystem created: $(du -h "$ROOTFS_TAR" | cut -f1)"
|
echo "✅ Root filesystem created: $(du -h "$ROOTFS_TAR" | cut -f1)"
|
||||||
else
|
else
|
||||||
echo "✅ Using cached root filesystem: $(du -h "$ROOTFS_TAR" | cut -f1)"
|
echo "✅ Using cached root filesystem: $(du -h "$ROOTFS_TAR" | cut -f1)"
|
||||||
@@ -1218,6 +1228,23 @@ else
|
|||||||
echo " ⚠ nostr-rs-relay image not available — relay binary will be missing"
|
echo " ⚠ nostr-rs-relay image not available — relay binary will be missing"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# A missing nvpn/nostr-rs-relay used to be a warning, and the resulting ISO
|
||||||
|
# shipped units that crash-looped (or silently lacked VPN signaling) on every
|
||||||
|
# install. Refuse to produce that ISO unless explicitly overridden.
|
||||||
|
MISSING_VPN_BINARIES=""
|
||||||
|
[ -f "$ARCH_DIR/bin/nvpn" ] || MISSING_VPN_BINARIES="$MISSING_VPN_BINARIES nvpn"
|
||||||
|
[ -f "$ARCH_DIR/bin/nostr-rs-relay" ] || MISSING_VPN_BINARIES="$MISSING_VPN_BINARIES nostr-rs-relay"
|
||||||
|
if [ -n "$MISSING_VPN_BINARIES" ]; then
|
||||||
|
if [ "${ALLOW_MISSING_VPN_BINARIES:-0}" = "1" ]; then
|
||||||
|
echo " ⚠ Building WITHOUT:$MISSING_VPN_BINARIES (ALLOW_MISSING_VPN_BINARIES=1)"
|
||||||
|
else
|
||||||
|
echo " ❌ Required binaries not extracted:$MISSING_VPN_BINARIES"
|
||||||
|
echo " The registry (146.59.87.168:3000) must be reachable and hold the images,"
|
||||||
|
echo " or set ALLOW_MISSING_VPN_BINARIES=1 to ship without VPN signaling."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Copy WireGuard helper script
|
# Copy WireGuard helper script
|
||||||
if [ -f "$WORK_DIR/archipelago-wg" ]; then
|
if [ -f "$WORK_DIR/archipelago-wg" ]; then
|
||||||
cp "$WORK_DIR/archipelago-wg" "$ARCH_DIR/bin/archipelago-wg"
|
cp "$WORK_DIR/archipelago-wg" "$ARCH_DIR/bin/archipelago-wg"
|
||||||
@@ -1353,9 +1380,11 @@ if [ "$UNBUNDLED" = "1" ]; then
|
|||||||
# unbundled mode — their images must ride on the ISO so a fresh install
|
# unbundled mode — their images must ride on the ISO so a fresh install
|
||||||
# works with no internet: FileBrowser (Cloud file manager) and fmcd
|
# works with no internet: FileBrowser (Cloud file manager) and fmcd
|
||||||
# (fedimint-clientd, ecash/sats out of the box).
|
# (fedimint-clientd, ecash/sats out of the box).
|
||||||
|
# Shipped zstd-compressed: podman load auto-detects compression, and an
|
||||||
|
# uncompressed fmcd.tar alone added ~220MB to the ISO (RC9 size regression).
|
||||||
CORE_BUNDLE="
|
CORE_BUNDLE="
|
||||||
${FILEBROWSER_IMAGE} filebrowser.tar
|
${FILEBROWSER_IMAGE} filebrowser.tar.zst
|
||||||
${FMCD_IMAGE} fmcd.tar
|
${FMCD_IMAGE} fmcd.tar.zst
|
||||||
"
|
"
|
||||||
echo "$CORE_BUNDLE" | while read -r CORE_IMAGE CORE_FILE; do
|
echo "$CORE_BUNDLE" | while read -r CORE_IMAGE CORE_FILE; do
|
||||||
[ -n "$CORE_IMAGE" ] || continue
|
[ -n "$CORE_IMAGE" ] || continue
|
||||||
@@ -1364,9 +1393,14 @@ ${FMCD_IMAGE} fmcd.tar
|
|||||||
else
|
else
|
||||||
echo " Pulling $CORE_IMAGE ($CONTAINER_PLATFORM)..."
|
echo " Pulling $CORE_IMAGE ($CONTAINER_PLATFORM)..."
|
||||||
if container_pull "$CORE_IMAGE"; then
|
if container_pull "$CORE_IMAGE"; then
|
||||||
$CONTAINER_CMD save "$CORE_IMAGE" -o "$IMAGES_DIR/$CORE_FILE" 2>/dev/null && \
|
RAW_TAR="$IMAGES_DIR/${CORE_FILE%.zst}"
|
||||||
echo " ✅ Saved core: $CORE_FILE ($(du -h "$IMAGES_DIR/$CORE_FILE" | cut -f1))" || \
|
if $CONTAINER_CMD save "$CORE_IMAGE" -o "$RAW_TAR" 2>/dev/null && \
|
||||||
|
zstd -q -T0 -15 --rm "$RAW_TAR" -o "$IMAGES_DIR/$CORE_FILE"; then
|
||||||
|
echo " ✅ Saved core: $CORE_FILE ($(du -h "$IMAGES_DIR/$CORE_FILE" | cut -f1))"
|
||||||
|
else
|
||||||
|
rm -f "$RAW_TAR" "$IMAGES_DIR/$CORE_FILE"
|
||||||
echo " ⚠️ Failed to save $CORE_IMAGE"
|
echo " ⚠️ Failed to save $CORE_IMAGE"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo " ⚠️ Failed to pull $CORE_IMAGE — baseline app won't work offline"
|
echo " ⚠️ Failed to pull $CORE_IMAGE — baseline app won't work offline"
|
||||||
fi
|
fi
|
||||||
@@ -1509,7 +1543,7 @@ done
|
|||||||
PODMAN="runuser -u archipelago -- env XDG_RUNTIME_DIR=/run/user/$ARCH_UID podman"
|
PODMAN="runuser -u archipelago -- env XDG_RUNTIME_DIR=/run/user/$ARCH_UID podman"
|
||||||
$PODMAN system migrate >> "$LOG_FILE" 2>&1 || true
|
$PODMAN system migrate >> "$LOG_FILE" 2>&1 || true
|
||||||
|
|
||||||
for tarfile in "$IMAGES_DIR"/*.tar; do
|
for tarfile in "$IMAGES_DIR"/*.tar "$IMAGES_DIR"/*.tar.zst; do
|
||||||
if [ -f "$tarfile" ]; then
|
if [ -f "$tarfile" ]; then
|
||||||
echo "$(date): Loading $(basename "$tarfile")..." >> "$LOG_FILE"
|
echo "$(date): Loading $(basename "$tarfile")..." >> "$LOG_FILE"
|
||||||
$PODMAN load -i "$tarfile" >> "$LOG_FILE" 2>&1 && \
|
$PODMAN load -i "$tarfile" >> "$LOG_FILE" 2>&1 && \
|
||||||
@@ -2520,7 +2554,7 @@ fi
|
|||||||
if [ -d "$BOOT_MEDIA/archipelago/container-images" ]; then
|
if [ -d "$BOOT_MEDIA/archipelago/container-images" ]; then
|
||||||
echo " Copying container images (this may take a moment)..."
|
echo " Copying container images (this may take a moment)..."
|
||||||
mkdir -p /mnt/target/opt/archipelago/container-images
|
mkdir -p /mnt/target/opt/archipelago/container-images
|
||||||
cp -r "$BOOT_MEDIA/archipelago/container-images/"*.tar /mnt/target/opt/archipelago/container-images/ 2>/dev/null || true
|
cp -r "$BOOT_MEDIA/archipelago/container-images/"*.tar* /mnt/target/opt/archipelago/container-images/ 2>/dev/null || true
|
||||||
|
|
||||||
# Copy first-boot loader script and service
|
# Copy first-boot loader script and service
|
||||||
mkdir -p /mnt/target/opt/archipelago/scripts
|
mkdir -p /mnt/target/opt/archipelago/scripts
|
||||||
@@ -3338,6 +3372,11 @@ echo ""
|
|||||||
echo "=== Done ==="
|
echo "=== Done ==="
|
||||||
DIAGSCRIPT
|
DIAGSCRIPT
|
||||||
chmod +x /mnt/target/opt/archipelago/scripts/first-boot-diag.sh
|
chmod +x /mnt/target/opt/archipelago/scripts/first-boot-diag.sh
|
||||||
|
# v1.7.104 shipped installs where this script was missing while its unit was
|
||||||
|
# enabled (203/EXEC forever). Verify the write actually landed, loudly.
|
||||||
|
if [ ! -x /mnt/target/opt/archipelago/scripts/first-boot-diag.sh ]; then
|
||||||
|
echo "ERROR: first-boot-diag.sh was not written to the target" >&2
|
||||||
|
fi
|
||||||
|
|
||||||
# Systemd oneshot service for first-boot diagnostics
|
# Systemd oneshot service for first-boot diagnostics
|
||||||
cat > /mnt/target/etc/systemd/system/archipelago-diag.service <<'DIAGSVC'
|
cat > /mnt/target/etc/systemd/system/archipelago-diag.service <<'DIAGSVC'
|
||||||
@@ -3345,6 +3384,8 @@ cat > /mnt/target/etc/systemd/system/archipelago-diag.service <<'DIAGSVC'
|
|||||||
Description=Archipelago First Boot Diagnostics
|
Description=Archipelago First Boot Diagnostics
|
||||||
After=multi-user.target archipelago.service nginx.service
|
After=multi-user.target archipelago.service nginx.service
|
||||||
ConditionPathExists=!/var/log/archipelago-first-boot-diag.log
|
ConditionPathExists=!/var/log/archipelago-first-boot-diag.log
|
||||||
|
# Skip cleanly (instead of failing 203/EXEC) if the script is missing.
|
||||||
|
ConditionPathExists=/opt/archipelago/scripts/first-boot-diag.sh
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
|
|||||||
@@ -106,6 +106,12 @@ fi
|
|||||||
ARCHIPELAGO_UID=$(id -u archipelago)
|
ARCHIPELAGO_UID=$(id -u archipelago)
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
|
# A profile lock left by a previous boot encodes <hostname>-<pid>; after a
|
||||||
|
# hostname change (node rename) Chromium reads it as another computer
|
||||||
|
# holding the profile and refuses to start — with --noerrdialogs that is an
|
||||||
|
# invisible failure and the kiosk black-screens forever. Any Chromium that
|
||||||
|
# owned the lock is dead by now (pkill above / previous loop iteration).
|
||||||
|
rm -f /var/lib/archipelago/chromium-kiosk/Singleton{Lock,Cookie,Socket}
|
||||||
# XDG_RUNTIME_DIR must be passed explicitly — without it Chromium's audio
|
# XDG_RUNTIME_DIR must be passed explicitly — without it Chromium's audio
|
||||||
# backend can't find PipeWire-Pulse's socket at /run/user/<uid>/pulse/native,
|
# backend can't find PipeWire-Pulse's socket at /run/user/<uid>/pulse/native,
|
||||||
# falls back to raw ALSA "default", fails to connect, and produces no audio
|
# falls back to raw ALSA "default", fails to connect, and produces no audio
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ Description=Archipelago Private Nostr Relay
|
|||||||
After=network-online.target
|
After=network-online.target
|
||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
Before=nostr-vpn.service
|
Before=nostr-vpn.service
|
||||||
|
# An ISO built without the relay binary (registry unreachable at build time)
|
||||||
|
# must not crash-loop every 3s forever — skip cleanly instead.
|
||||||
|
ConditionPathExists=/usr/local/bin/nostr-rs-relay
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ After=network-online.target tor.service archipelago.service
|
|||||||
Wants=network-online.target
|
Wants=network-online.target
|
||||||
StartLimitIntervalSec=300
|
StartLimitIntervalSec=300
|
||||||
StartLimitBurst=10
|
StartLimitBurst=10
|
||||||
|
# An ISO built without the nvpn binary (registry unreachable at build time)
|
||||||
|
# must not restart-loop — skip cleanly instead.
|
||||||
|
ConditionPathExists=/usr/local/bin/nvpn
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|||||||
@@ -103,27 +103,10 @@ http {
|
|||||||
proxy_request_buffering off;
|
proxy_request_buffering off;
|
||||||
}
|
}
|
||||||
|
|
||||||
# IndeeHub: reverse-proxy the real site same-origin, strip framing headers,
|
# IndeeHub is no longer proxied same-origin — the sub_filter rewrite
|
||||||
# and rewrite its absolute asset paths (/assets, /, src, href) to the
|
# approach broke the SPA's runtime-built asset URLs. The demo now opens
|
||||||
# /app/indeedhub/ prefix so the SPA loads inside the iframe.
|
# the real site (https://indee.tx1138.com/) externally instead, via
|
||||||
location ^~ /app/indeedhub/ {
|
# DEMO_EXTERNAL_URLS in useDemoIntro.ts.
|
||||||
proxy_pass https://indee.tx1138.com/;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host indee.tx1138.com;
|
|
||||||
proxy_set_header Accept-Encoding "";
|
|
||||||
proxy_ssl_server_name on;
|
|
||||||
proxy_hide_header X-Frame-Options;
|
|
||||||
proxy_hide_header Content-Security-Policy;
|
|
||||||
proxy_hide_header Content-Security-Policy-Report-Only;
|
|
||||||
sub_filter_types text/html text/css application/javascript application/json;
|
|
||||||
sub_filter_once off;
|
|
||||||
sub_filter 'href="/' 'href="/app/indeedhub/';
|
|
||||||
sub_filter 'src="/' 'src="/app/indeedhub/';
|
|
||||||
sub_filter "href='/" "href='/app/indeedhub/";
|
|
||||||
sub_filter "src='/" "src='/app/indeedhub/";
|
|
||||||
sub_filter 'from"/' 'from"/app/indeedhub/';
|
|
||||||
sub_filter 'url(/' 'url(/app/indeedhub/';
|
|
||||||
}
|
|
||||||
|
|
||||||
# Mempool is NOT proxied upstream anymore — the mock backend serves a
|
# Mempool is NOT proxied upstream anymore — the mock backend serves a
|
||||||
# branded placeholder page for it (see DEMO_APP_PAGES in mock-backend.js),
|
# branded placeholder page for it (see DEMO_APP_PAGES in mock-backend.js),
|
||||||
|
|||||||
+69
-11
@@ -2382,6 +2382,23 @@ app.post('/rpc/v1', (req, res) => {
|
|||||||
case 'streaming.list-services': {
|
case 'streaming.list-services': {
|
||||||
return res.json({ result: { services: mockState.streamingServices || [] } })
|
return res.json({ result: { services: mockState.streamingServices || [] } })
|
||||||
}
|
}
|
||||||
|
case 'streaming.list-sessions': {
|
||||||
|
const mkTime = (minsAgo) => new Date(Date.now() - minsAgo * 60_000).toISOString()
|
||||||
|
return res.json({ result: {
|
||||||
|
sessions: [
|
||||||
|
{ id: 'sess-demo-1', peer_id: 'npub1walker…k3u9', service_id: 'content-download', metric: 'bytes', allotment: 524_288_000, used: 231_211_008, paid_sats: 500, created_at: mkTime(134), last_topup_at: mkTime(22), expires_at: '', active: true },
|
||||||
|
{ id: 'sess-demo-2', peer_id: 'npub1sailor…m2xq', service_id: 'nostr-relay', metric: 'milliseconds', allotment: 10_800_000, used: 4_920_000, paid_sats: 30, created_at: mkTime(82), last_topup_at: mkTime(82), expires_at: mkTime(-98), active: true },
|
||||||
|
{ id: 'sess-demo-3', peer_id: 'npub1nomad…t7rd', service_id: 'content-download', metric: 'bytes', allotment: 104_857_600, used: 88_080_384, paid_sats: 100, created_at: mkTime(9), last_topup_at: mkTime(9), expires_at: '', active: true },
|
||||||
|
],
|
||||||
|
total_active: 3,
|
||||||
|
total_revenue_sats: 770_000,
|
||||||
|
revenue_by_service: {
|
||||||
|
'content-download': 512_400,
|
||||||
|
'nostr-relay': 201_600,
|
||||||
|
'api-access': 56_000,
|
||||||
|
},
|
||||||
|
} })
|
||||||
|
}
|
||||||
case 'streaming.configure-service': {
|
case 'streaming.configure-service': {
|
||||||
const p = params || {}
|
const p = params || {}
|
||||||
const list = mockState.streamingServices || []
|
const list = mockState.streamingServices || []
|
||||||
@@ -3394,14 +3411,19 @@ app.post('/rpc/v1', (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 'lnd.listchannels': {
|
case 'lnd.listchannels': {
|
||||||
|
// Shape matches the real backend: status + channel_point are required
|
||||||
|
// by the channels panel; totals feed the liquidity summary tiles.
|
||||||
|
const channels = [
|
||||||
|
{ chan_id: '840921088114688', remote_pubkey: '031b301307574bbe9b9ac7b79cbe1700e31e544513eae0b5d7497483083f99e581', capacity: 1500000, local_balance: 950000, remote_balance: 550000, active: true, status: 'active', channel_point: randomHex(32) + ':0', peer_alias: 'Olympus by ZEUS' },
|
||||||
|
{ chan_id: '840921088114689', remote_pubkey: '03abcdef12345678901234567890123456789012345678901234567890abcdef12', capacity: 2000000, local_balance: 1200000, remote_balance: 800000, active: true, status: 'active', channel_point: randomHex(32) + ':1', peer_alias: 'WalletOfSatoshi' },
|
||||||
|
{ chan_id: '840921088114690', remote_pubkey: '02fedcba98765432109876543210987654321098765432109876543210fedcba98', capacity: 10000000, local_balance: 4500000, remote_balance: 5500000, active: true, status: 'active', channel_point: randomHex(32) + ':0', peer_alias: 'Voltage' },
|
||||||
|
{ chan_id: '840921088114691', remote_pubkey: '03456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123', capacity: 3000000, local_balance: 100000, remote_balance: 2900000, active: false, status: 'inactive', channel_point: randomHex(32) + ':0', peer_alias: 'Kraken' },
|
||||||
|
]
|
||||||
return res.json({
|
return res.json({
|
||||||
result: {
|
result: {
|
||||||
channels: [
|
channels,
|
||||||
{ chan_id: '840921088114688', remote_pubkey: '02778f4a', capacity: 5000000, local_balance: 2450000, remote_balance: 2550000, active: true, peer_alias: 'ACINQ Signet' },
|
total_outbound: channels.reduce((s, c) => s + c.local_balance, 0),
|
||||||
{ chan_id: '840921088114689', remote_pubkey: '03abcdef', capacity: 2000000, local_balance: 1200000, remote_balance: 800000, active: true, peer_alias: 'WalletOfSatoshi' },
|
total_inbound: channels.reduce((s, c) => s + c.remote_balance, 0),
|
||||||
{ chan_id: '840921088114690', remote_pubkey: '02fedcba', capacity: 10000000, local_balance: 4500000, remote_balance: 5500000, active: true, peer_alias: 'Voltage' },
|
|
||||||
{ chan_id: '840921088114691', remote_pubkey: '03456789', capacity: 3000000, local_balance: 100000, remote_balance: 2900000, active: true, peer_alias: 'Kraken' },
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -3445,7 +3467,10 @@ app.post('/rpc/v1', (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 'lnd.sendcoins': {
|
case 'lnd.sendcoins': {
|
||||||
const amt = params?.amount || params?.amt || 50000
|
// send_all sweeps the entire on-chain balance (minus a mock fee)
|
||||||
|
const amt = params?.send_all
|
||||||
|
? Math.max(0, walletState.onchain_sats - 250)
|
||||||
|
: (params?.amount || params?.amt || 50000)
|
||||||
walletState.onchain_sats = Math.max(0, walletState.onchain_sats - amt)
|
walletState.onchain_sats = Math.max(0, walletState.onchain_sats - amt)
|
||||||
const txid = randomHex(32)
|
const txid = randomHex(32)
|
||||||
walletState.transactions.unshift({
|
walletState.transactions.unshift({
|
||||||
@@ -3566,13 +3591,32 @@ app.post('/rpc/v1', (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 'wallet.networking-profits': {
|
case 'wallet.networking-profits': {
|
||||||
|
// Deterministic-but-varied week of profit events for the dashboard
|
||||||
|
// chart (source/timestamp/sats mirror wallet::profits::ProfitEntry).
|
||||||
|
const profitSources = ['streaming_revenue', 'content_sale', 'routing_fee']
|
||||||
|
const profitNotes = ['Paid streaming session', 'Ecash content sale', 'Lightning routing fees']
|
||||||
|
const recent = []
|
||||||
|
const nowMs = Date.now()
|
||||||
|
for (let i = 0; i < 42; i++) {
|
||||||
|
const daysAgo = (i * 3) % 7
|
||||||
|
const hour = (i * 5) % 24
|
||||||
|
recent.push({
|
||||||
|
source: profitSources[i % 3],
|
||||||
|
amount_sats: 800 + ((i * 7919) % 14000),
|
||||||
|
timestamp: new Date(nowMs - daysAgo * 86_400_000 - hour * 3_600_000).toISOString(),
|
||||||
|
description: profitNotes[i % 3],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
recent.sort((a, b) => b.timestamp.localeCompare(a.timestamp))
|
||||||
return res.json({
|
return res.json({
|
||||||
result: {
|
result: {
|
||||||
total_sats: 5_231_978,
|
total_sats: 5_231_978,
|
||||||
content_sales_sats: 3_180_000,
|
content_sales_sats: 3_180_000,
|
||||||
routing_fees_sats: 1_281_978,
|
routing_fees_sats: 1_281_978,
|
||||||
relay_sats: 770_000,
|
streaming_revenue_sats: 770_000,
|
||||||
|
recent,
|
||||||
// legacy aliases kept for older UI builds
|
// legacy aliases kept for older UI builds
|
||||||
|
relay_sats: 770_000,
|
||||||
total_earned_sats: 5_231_978,
|
total_earned_sats: 5_231_978,
|
||||||
total_forwarded_sats: 1_281_978,
|
total_forwarded_sats: 1_281_978,
|
||||||
forward_count: 1284,
|
forward_count: 1284,
|
||||||
@@ -3607,15 +3651,29 @@ app.post('/rpc/v1', (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 'bitcoin.getinfo': {
|
case 'bitcoin.getinfo': {
|
||||||
|
// Demo IBD simulation: the first call of a session arms a ~90s ramp
|
||||||
|
// from 98.2% → 100% so the setup wizard can demo the live sync timer
|
||||||
|
// and the "finish setup" toast that fires when IBD completes.
|
||||||
|
// (The real backend returns { block_height, sync_progress } — a 0–1
|
||||||
|
// fraction — which is what the frontend reads; the bitcoin-core-style
|
||||||
|
// fields are kept for any legacy consumers.)
|
||||||
|
if (!walletState.ibd_started_at) walletState.ibd_started_at = Date.now()
|
||||||
|
const IBD_RAMP_MS = 90_000
|
||||||
|
const elapsed = Date.now() - walletState.ibd_started_at
|
||||||
|
const syncProgress = Math.min(1, 0.982 + 0.018 * (elapsed / IBD_RAMP_MS))
|
||||||
|
const tipHeight = 892451
|
||||||
|
const height = Math.round(tipHeight * syncProgress)
|
||||||
return res.json({
|
return res.json({
|
||||||
result: {
|
result: {
|
||||||
chain: 'signet',
|
chain: 'signet',
|
||||||
blocks: 892451,
|
block_height: height,
|
||||||
headers: 892451,
|
sync_progress: syncProgress,
|
||||||
|
blocks: height,
|
||||||
|
headers: tipHeight,
|
||||||
bestblockhash: 'a1b2c3d4e5f6' + '0'.repeat(58),
|
bestblockhash: 'a1b2c3d4e5f6' + '0'.repeat(58),
|
||||||
difficulty: 0.001126515290698186,
|
difficulty: 0.001126515290698186,
|
||||||
mediantime: Math.floor(Date.now() / 1000) - 300,
|
mediantime: Math.floor(Date.now() / 1000) - 300,
|
||||||
verificationprogress: 1.0,
|
verificationprogress: syncProgress,
|
||||||
chainwork: '000000000000000000000000000000000000000000000000000000000001a2b3',
|
chainwork: '000000000000000000000000000000000000000000000000000000000001a2b3',
|
||||||
size_on_disk: 210_000_000,
|
size_on_disk: 210_000_000,
|
||||||
pruned: false,
|
pruned: false,
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "neode-ui",
|
"name": "neode-ui",
|
||||||
"version": "1.7.101-alpha",
|
"version": "1.7.102-alpha",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "neode-ui",
|
"name": "neode-ui",
|
||||||
"version": "1.7.101-alpha",
|
"version": "1.7.102-alpha",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/dompurify": "^3.0.5",
|
"@types/dompurify": "^3.0.5",
|
||||||
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "neode-ui",
|
"name": "neode-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.7.101-alpha",
|
"version": "1.7.102-alpha",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "./start-dev.sh",
|
"start": "./start-dev.sh",
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 72 KiB |
+15
-4
@@ -424,10 +424,14 @@ onMounted(async () => {
|
|||||||
const { IS_DEMO } = await import('@/composables/useDemoIntro')
|
const { IS_DEMO } = await import('@/composables/useDemoIntro')
|
||||||
if (IS_DEMO && bootPath === '/') replayRequested = true
|
if (IS_DEMO && bootPath === '/') replayRequested = true
|
||||||
let onboardingComplete: boolean | null = localStorage.getItem('neode_onboarding_complete') === '1' ? true : null
|
let onboardingComplete: boolean | null = localStorage.getItem('neode_onboarding_complete') === '1' ? true : null
|
||||||
const splashCandidate = !seenIntro
|
// Root boots always ask the backend — even when this browser thinks it has
|
||||||
&& (fromBoot || (bootPath === '/' && import.meta.env.VITE_DEV_MODE !== 'boot'))
|
// seen the intro. Both `neode_intro_seen` and `neode_onboarding_complete`
|
||||||
|
// are per-origin browser state: after a reinstall (or another node coming
|
||||||
|
// up on a DHCP-recycled IP) they describe the PREVIOUS node and would mute
|
||||||
|
// a fresh install's intro / misroute it to login.
|
||||||
|
const splashCandidate = fromBoot || (bootPath === '/' && import.meta.env.VITE_DEV_MODE !== 'boot')
|
||||||
|
|
||||||
if (splashCandidate && onboardingComplete !== true) {
|
if (splashCandidate) {
|
||||||
try {
|
try {
|
||||||
const { checkOnboardingStatus } = await import('@/composables/useOnboarding')
|
const { checkOnboardingStatus } = await import('@/composables/useOnboarding')
|
||||||
// Bound the pre-splash status check: its retry ladder can spend ~30s
|
// Bound the pre-splash status check: its retry ladder can spend ~30s
|
||||||
@@ -437,10 +441,17 @@ onMounted(async () => {
|
|||||||
// the splash play (a fresh install IS the slow-backend case; onboarded
|
// the splash play (a fresh install IS the slow-backend case; onboarded
|
||||||
// nodes answer in milliseconds, so their suppression path is intact).
|
// nodes answer in milliseconds, so their suppression path is intact).
|
||||||
// handleSplashComplete re-checks with full retries after the intro.
|
// handleSplashComplete re-checks with full retries after the intro.
|
||||||
onboardingComplete = await Promise.race([
|
const live = await Promise.race([
|
||||||
checkOnboardingStatus(),
|
checkOnboardingStatus(),
|
||||||
new Promise<null>((resolve) => setTimeout(() => resolve(null), 2500)),
|
new Promise<null>((resolve) => setTimeout(() => resolve(null), 2500)),
|
||||||
])
|
])
|
||||||
|
if (live !== null) onboardingComplete = live
|
||||||
|
if (live === false && seenIntro) {
|
||||||
|
// Backend-confirmed fresh node behind a browser with a stale flag —
|
||||||
|
// drop it so this boot (and every later one) plays the intro.
|
||||||
|
try { localStorage.removeItem('neode_intro_seen') } catch { /* noop */ }
|
||||||
|
seenIntro = false
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
onboardingComplete = localStorage.getItem('neode_onboarding_complete') === '1' ? true : null
|
onboardingComplete = localStorage.getItem('neode_onboarding_complete') === '1' ? true : null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,6 +161,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p v-if="wgError" class="text-xs text-red-400 text-center mb-3">{{ wgError }}</p>
|
<p v-if="wgError" class="text-xs text-red-400 text-center mb-3">{{ wgError }}</p>
|
||||||
|
<button
|
||||||
|
v-if="wgError && !wgLoading"
|
||||||
|
type="button"
|
||||||
|
class="inline-flex w-full items-center justify-center rounded-lg bg-white/5 border border-white/15 px-4 py-2.5 text-sm font-medium text-white/80 hover:bg-white/10 hover:text-white transition-colors mb-3"
|
||||||
|
@click="retryWgPeer"
|
||||||
|
>
|
||||||
|
Try again
|
||||||
|
</button>
|
||||||
|
|
||||||
<!-- Same-device path: a phone can't scan its own screen, so offer
|
<!-- Same-device path: a phone can't scan its own screen, so offer
|
||||||
the config as a file WireGuard can import. -->
|
the config as a file WireGuard can import. -->
|
||||||
@@ -318,7 +326,15 @@ const POST_INTRO_GRACE_MS = 2000
|
|||||||
|
|
||||||
let calmTicker: ReturnType<typeof setInterval> | null = null
|
let calmTicker: ReturnType<typeof setInterval> | null = null
|
||||||
|
|
||||||
|
// Running inside the companion app's own WebView (it injects this JS bridge).
|
||||||
|
// The "get the companion app" pitch is nonsense there — the user is already in
|
||||||
|
// it — and the WG steps mid-pairing race the phone's changing network (the
|
||||||
|
// "Failed to fetch" dead-end QR). Server/tunnel management for connected
|
||||||
|
// companions lives in the NESMenu instead.
|
||||||
|
const IN_COMPANION_APP = typeof (window as { ArchipelagoNative?: unknown }).ArchipelagoNative !== 'undefined'
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
if (IN_COMPANION_APP) return
|
||||||
try {
|
try {
|
||||||
if (localStorage.getItem(STORAGE_KEY) !== '1') {
|
if (localStorage.getItem(STORAGE_KEY) !== '1') {
|
||||||
setTimeout(maybeShow, BASE_DELAY_MS)
|
setTimeout(maybeShow, BASE_DELAY_MS)
|
||||||
@@ -471,6 +487,19 @@ function backFromPair() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Network-class failures: the node itself was unreachable (as opposed to the
|
||||||
|
// backend answering with an RPC error). Includes the client's own timeout.
|
||||||
|
const WG_NETWORK_ERR = /failed to fetch|networkerror|load failed|abort|request timeout/i
|
||||||
|
|
||||||
|
// Auto-retry ladder for network-class failures. On a first install this step
|
||||||
|
// is often reached while the backend is still settling (services starting,
|
||||||
|
// backend restarting during container orchestration) — a single failed fetch
|
||||||
|
// left a permanently blank QR unless the user spotted the retry button.
|
||||||
|
const WG_RETRY_DELAYS_MS = [2000, 4000, 8000]
|
||||||
|
|
||||||
|
const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms))
|
||||||
|
const stillOnWgStep = () => visible.value && step.value === 'wgqr'
|
||||||
|
|
||||||
// Create (or fetch) the phone's VPN peer and render its config as a QR.
|
// Create (or fetch) the phone's VPN peer and render its config as a QR.
|
||||||
// Reuses the same RPCs as the Server page's Add Device modal; the peer is
|
// Reuses the same RPCs as the Server page's Add Device modal; the peer is
|
||||||
// looked up first so reopening the modal never duplicates it.
|
// looked up first so reopening the modal never duplicates it.
|
||||||
@@ -478,15 +507,55 @@ async function loadWgPeer() {
|
|||||||
if (wgQrDataUrl.value || wgLoading.value) return
|
if (wgQrDataUrl.value || wgLoading.value) return
|
||||||
wgLoading.value = true
|
wgLoading.value = true
|
||||||
wgError.value = ''
|
wgError.value = ''
|
||||||
|
for (let attempt = 0; ; attempt++) {
|
||||||
try {
|
try {
|
||||||
|
await provisionWgPeer()
|
||||||
|
break
|
||||||
|
} catch (e) {
|
||||||
|
const raw = e instanceof Error ? e.message : ''
|
||||||
|
const isNetworkErr = WG_NETWORK_ERR.test(raw)
|
||||||
|
if (isNetworkErr && attempt < WG_RETRY_DELAYS_MS.length && stillOnWgStep()) {
|
||||||
|
await sleep(WG_RETRY_DELAYS_MS[attempt])
|
||||||
|
if (stillOnWgStep()) continue
|
||||||
|
}
|
||||||
|
// fetch()'s raw "Failed to fetch" means the node itself was unreachable —
|
||||||
|
// after the retry ladder that's usually the phone's network mid-change
|
||||||
|
// (WiFi drop, or a half-configured tunnel already routing 10.44.0.0/16).
|
||||||
|
// Say so, and leave a Retry path instead of a dead end.
|
||||||
|
wgError.value = isNetworkErr
|
||||||
|
? "Can't reach your node. Check the phone is on the same network as the node (and any half-set-up tunnel is switched off), then tap Try again."
|
||||||
|
: raw || 'Failed to generate the tunnel config'
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
wgLoading.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
async function provisionWgPeer() {
|
||||||
const listed = await rpcClient
|
const listed = await rpcClient
|
||||||
.call<{ peers: { name: string }[] }>({ method: 'vpn.list-peers' })
|
.call<{ peers: { name: string }[] }>({ method: 'vpn.list-peers' })
|
||||||
.catch(() => ({ peers: [] as { name: string }[] }))
|
.catch(() => null)
|
||||||
const exists = (listed.peers || []).some((p) => p.name === WG_PEER_NAME)
|
// list-peers unreachable → don't guess "doesn't exist": create-peer on an
|
||||||
const res = await rpcClient.call<{ config: string; peer_ip: string }>({
|
// existing name would fail. Try create first, fall back to peer-config.
|
||||||
method: exists ? 'vpn.peer-config' : 'vpn.create-peer',
|
const exists = listed === null
|
||||||
params: { name: WG_PEER_NAME },
|
? null
|
||||||
})
|
: (listed.peers || []).some((p) => p.name === WG_PEER_NAME)
|
||||||
|
let res: { config: string; peer_ip: string }
|
||||||
|
if (exists === true) {
|
||||||
|
res = await rpcClient.call({ method: 'vpn.peer-config', params: { name: WG_PEER_NAME } })
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
res = await rpcClient.call({ method: 'vpn.create-peer', params: { name: WG_PEER_NAME } })
|
||||||
|
} catch (e) {
|
||||||
|
// Peer already provisioned on a previous visit (list failed or raced).
|
||||||
|
const msg = e instanceof Error ? e.message : ''
|
||||||
|
if (/exist|duplicate/i.test(msg)) {
|
||||||
|
res = await rpcClient.call({ method: 'vpn.peer-config', params: { name: WG_PEER_NAME } })
|
||||||
|
} else {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
wgConfig.value = res.config
|
wgConfig.value = res.config
|
||||||
wgQrDataUrl.value = await QRCode.toDataURL(res.config, {
|
wgQrDataUrl.value = await QRCode.toDataURL(res.config, {
|
||||||
width: 512,
|
width: 512,
|
||||||
@@ -497,11 +566,11 @@ async function loadWgPeer() {
|
|||||||
light: '#ffffff',
|
light: '#ffffff',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
} catch (e) {
|
}
|
||||||
wgError.value = e instanceof Error ? e.message : 'Failed to generate the tunnel config'
|
|
||||||
} finally {
|
function retryWgPeer() {
|
||||||
wgLoading.value = false
|
wgError.value = ''
|
||||||
}
|
void loadWgPeer()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Same-device path: hand the config to the WireGuard app as an importable
|
// Same-device path: hand the config to the WireGuard app as an importable
|
||||||
|
|||||||
@@ -16,6 +16,39 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Zeus channel suggestion -->
|
||||||
|
<div class="glass-card p-4 mb-4 border border-orange-500/25">
|
||||||
|
<div class="flex flex-col sm:flex-row sm:items-center gap-4">
|
||||||
|
<img
|
||||||
|
src="/assets/img/app-icons/zeus.webp"
|
||||||
|
alt="Zeus"
|
||||||
|
class="w-12 h-12 rounded-xl shrink-0 border border-white/10"
|
||||||
|
/>
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<p class="text-white/90 text-sm font-semibold mb-0.5">Open a channel with Zeus</p>
|
||||||
|
<p class="text-white/55 text-xs leading-relaxed">
|
||||||
|
Pair your node with the Zeus mobile wallet — open a channel to their Olympus node and
|
||||||
|
start sending and receiving Lightning payments from your phone.
|
||||||
|
Minimum 150,000 · maximum 1,500,000 sats.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex sm:flex-col items-center gap-2 shrink-0">
|
||||||
|
<button
|
||||||
|
@click="openZeusChannel"
|
||||||
|
class="glass-button glass-button-warning px-4 py-2 rounded-lg text-sm font-medium whitespace-nowrap"
|
||||||
|
>
|
||||||
|
Open Channel
|
||||||
|
</button>
|
||||||
|
<a
|
||||||
|
href="https://zeusln.com"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="text-xs text-orange-400/80 hover:text-orange-300 whitespace-nowrap"
|
||||||
|
>Get Zeus →</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Open Channel Button -->
|
<!-- Open Channel Button -->
|
||||||
<div class="flex justify-end mb-4">
|
<div class="flex justify-end mb-4">
|
||||||
<button @click="showOpenModal = true" class="glass-button px-4 py-2 rounded-lg text-sm font-medium flex items-center gap-2">
|
<button @click="showOpenModal = true" class="glass-button px-4 py-2 rounded-lg text-sm font-medium flex items-center gap-2">
|
||||||
@@ -74,15 +107,15 @@
|
|||||||
<span
|
<span
|
||||||
class="w-2 h-2 rounded-full"
|
class="w-2 h-2 rounded-full"
|
||||||
:class="{
|
:class="{
|
||||||
'bg-green-400': ch.status === 'active',
|
'bg-green-400': channelStatus(ch) === 'active',
|
||||||
'bg-yellow-400': ch.status === 'pending_open',
|
'bg-yellow-400': channelStatus(ch) === 'pending_open',
|
||||||
'bg-red-400': ch.status === 'inactive',
|
'bg-red-400': channelStatus(ch) === 'inactive',
|
||||||
}"
|
}"
|
||||||
></span>
|
></span>
|
||||||
<span class="text-white/80 text-sm font-medium capitalize">{{ ch.status.replace('_', ' ') }}</span>
|
<span class="text-white/80 text-sm font-medium capitalize">{{ channelStatus(ch).replace('_', ' ') }}</span>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
v-if="ch.status !== 'pending_open'"
|
v-if="channelStatus(ch) !== 'pending_open'"
|
||||||
@click="confirmClose(ch)"
|
@click="confirmClose(ch)"
|
||||||
class="text-red-400/70 hover:text-red-400 text-xs transition-colors"
|
class="text-red-400/70 hover:text-red-400 text-xs transition-colors"
|
||||||
>
|
>
|
||||||
@@ -270,8 +303,13 @@ interface Channel {
|
|||||||
local_balance: number
|
local_balance: number
|
||||||
remote_balance: number
|
remote_balance: number
|
||||||
active: boolean
|
active: boolean
|
||||||
status: string
|
status?: string
|
||||||
channel_point: string
|
channel_point?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Status with a fallback derived from `active` for backends that omit it */
|
||||||
|
function channelStatus(ch: Channel): string {
|
||||||
|
return ch.status ?? (ch.active ? 'active' : 'inactive')
|
||||||
}
|
}
|
||||||
|
|
||||||
type FeePreset = 'standard' | 'medium' | 'fast' | 'custom'
|
type FeePreset = 'standard' | 'medium' | 'fast' | 'custom'
|
||||||
@@ -288,6 +326,11 @@ const error = ref<string | null>(null)
|
|||||||
const channels = ref<Channel[]>([])
|
const channels = ref<Channel[]>([])
|
||||||
const summary = ref({ total_inbound: 0, total_outbound: 0 })
|
const summary = ref({ total_inbound: 0, total_outbound: 0 })
|
||||||
|
|
||||||
|
// Olympus by ZEUS — the LSP node behind the Zeus mobile wallet.
|
||||||
|
// Channel limits: min 150,000 / max 1,500,000 sats.
|
||||||
|
const OLYMPUS_PEER_URI =
|
||||||
|
'031b301307574bbe9b9ac7b79cbe1700e31e544513eae0b5d7497483083f99e581@45.79.192.236:9735'
|
||||||
|
|
||||||
const showOpenModal = ref(false)
|
const showOpenModal = ref(false)
|
||||||
const defaultOpenForm = () => ({
|
const defaultOpenForm = () => ({
|
||||||
peerUri: '',
|
peerUri: '',
|
||||||
@@ -297,6 +340,19 @@ const defaultOpenForm = () => ({
|
|||||||
customConfTarget: null as number | null,
|
customConfTarget: null as number | null,
|
||||||
customSatPerVbyte: null as number | null,
|
customSatPerVbyte: null as number | null,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Prefill the open-channel modal for a Zeus (Olympus) channel */
|
||||||
|
function openZeusChannel() {
|
||||||
|
openForm.value = {
|
||||||
|
...defaultOpenForm(),
|
||||||
|
peerUri: OLYMPUS_PEER_URI,
|
||||||
|
amount: 150000,
|
||||||
|
// Olympus only accepts unannounced channels
|
||||||
|
private: true,
|
||||||
|
}
|
||||||
|
openError.value = null
|
||||||
|
showOpenModal.value = true
|
||||||
|
}
|
||||||
const openForm = ref(defaultOpenForm())
|
const openForm = ref(defaultOpenForm())
|
||||||
const openingChannel = ref(false)
|
const openingChannel = ref(false)
|
||||||
const openError = ref<string | null>(null)
|
const openError = ref<string | null>(null)
|
||||||
@@ -313,7 +369,7 @@ function formatSats(sats: number): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function fundingTxid(ch: Channel): string {
|
function fundingTxid(ch: Channel): string {
|
||||||
const txid = ch.channel_point.split(':')[0] || ''
|
const txid = ch.channel_point?.split(':')[0] || ''
|
||||||
return /^[0-9a-fA-F]{64}$/.test(txid) ? txid : ''
|
return /^[0-9a-fA-F]{64}$/.test(txid) ? txid : ''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,9 @@
|
|||||||
|
|
||||||
<!-- On-chain -->
|
<!-- On-chain -->
|
||||||
<div v-if="receiveMethod === 'onchain'">
|
<div v-if="receiveMethod === 'onchain'">
|
||||||
|
<div v-if="note" class="mb-3 p-3 rounded-lg bg-orange-500/10 border border-orange-500/20 text-sm text-white/80 leading-relaxed">
|
||||||
|
{{ note }}
|
||||||
|
</div>
|
||||||
<div v-if="onchainAddress" class="mb-3 p-3 bg-white/5 rounded-lg text-center">
|
<div v-if="onchainAddress" class="mb-3 p-3 bg-white/5 rounded-lg text-center">
|
||||||
<canvas ref="onchainQrCanvas" class="mx-auto mb-3 rounded-lg" style="image-rendering: pixelated;"></canvas>
|
<canvas ref="onchainQrCanvas" class="mx-auto mb-3 rounded-lg" style="image-rendering: pixelated;"></canvas>
|
||||||
<p class="text-white/50 text-xs mb-2">{{ t('receiveBitcoin.yourBitcoinAddress') }}</p>
|
<p class="text-white/50 text-xs mb-2">{{ t('receiveBitcoin.yourBitcoinAddress') }}</p>
|
||||||
@@ -77,7 +80,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, nextTick } from 'vue'
|
import { ref, nextTick, watch } from 'vue'
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import { rpcClient } from '@/api/rpc-client'
|
import { rpcClient } from '@/api/rpc-client'
|
||||||
import BaseModal from '@/components/BaseModal.vue'
|
import BaseModal from '@/components/BaseModal.vue'
|
||||||
@@ -85,9 +88,21 @@ import { explainReceiveAddressFailure } from '@/utils/bitcoinReceive'
|
|||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
|
||||||
defineProps<{ show: boolean }>()
|
const props = defineProps<{
|
||||||
|
show: boolean
|
||||||
|
/** Optional info banner shown on the on-chain tab (e.g. Zeus channel limits) */
|
||||||
|
note?: string
|
||||||
|
/** Generate an on-chain address immediately when the modal opens */
|
||||||
|
autoGenerate?: boolean
|
||||||
|
}>()
|
||||||
const emit = defineEmits<{ close: []; received: [] }>()
|
const emit = defineEmits<{ close: []; received: [] }>()
|
||||||
|
|
||||||
|
watch(() => props.show, (open) => {
|
||||||
|
if (open && props.autoGenerate && receiveMethod.value === 'onchain' && !onchainAddress.value) {
|
||||||
|
void receive()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
const receiveMethod = ref<'lightning' | 'onchain' | 'ecash' | 'ark'>('onchain')
|
const receiveMethod = ref<'lightning' | 'onchain' | 'ecash' | 'ark'>('onchain')
|
||||||
const invoiceAmount = ref<number>(0)
|
const invoiceAmount = ref<number>(0)
|
||||||
const invoiceMemo = ref('')
|
const invoiceMemo = ref('')
|
||||||
|
|||||||
@@ -16,8 +16,30 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="text-white/60 text-sm block mb-1">{{ t('sendBitcoin.amountSats') }}</label>
|
<div class="flex items-center justify-between mb-1">
|
||||||
<input v-model.number="amount" type="number" min="1" placeholder="1000" class="w-full input-glass" />
|
<label class="text-white/60 text-sm">{{ t('sendBitcoin.amountSats') }}</label>
|
||||||
|
<button
|
||||||
|
v-if="sendMethod === 'onchain'"
|
||||||
|
@click="toggleSendAll"
|
||||||
|
class="text-xs px-2 py-0.5 rounded border transition-colors"
|
||||||
|
:class="sendAll
|
||||||
|
? 'bg-orange-500/20 border-orange-500/40 text-orange-300'
|
||||||
|
: 'bg-white/5 border-white/15 text-white/60 hover:text-white/90'"
|
||||||
|
>
|
||||||
|
Send all funds
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
v-model.number="amount"
|
||||||
|
type="number"
|
||||||
|
min="1"
|
||||||
|
:placeholder="sendAll ? '' : '1000'"
|
||||||
|
:disabled="sendAll"
|
||||||
|
class="w-full input-glass disabled:opacity-50"
|
||||||
|
/>
|
||||||
|
<p v-if="sendAll" class="text-xs text-white/50 mt-1">
|
||||||
|
Sweeps your entire on-chain balance{{ onchainBalance !== null ? ` (~${onchainBalance.toLocaleString()} sats)` : '' }} minus network fees.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="effectiveMethod !== 'ecash'" class="mb-3">
|
<div v-if="effectiveMethod !== 'ecash'" class="mb-3">
|
||||||
@@ -47,7 +69,7 @@
|
|||||||
|
|
||||||
<div class="flex gap-3">
|
<div class="flex gap-3">
|
||||||
<button @click="close" class="flex-1 glass-button px-4 py-2 rounded-lg text-sm">{{ t('common.close') }}</button>
|
<button @click="close" class="flex-1 glass-button px-4 py-2 rounded-lg text-sm">{{ t('common.close') }}</button>
|
||||||
<button @click="send" :disabled="processing || !amount" class="flex-1 glass-button glass-button-warning px-4 py-2 rounded-lg text-sm font-medium disabled:opacity-50">
|
<button @click="send" :disabled="processing || (!amount && !isSweep)" class="flex-1 glass-button glass-button-warning px-4 py-2 rounded-lg text-sm font-medium disabled:opacity-50">
|
||||||
{{ processing ? t('common.sending') : t('common.send') }}
|
{{ processing ? t('common.sending') : t('common.send') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -55,7 +77,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed } from 'vue'
|
import { ref, computed, watch } from 'vue'
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import { rpcClient } from '@/api/rpc-client'
|
import { rpcClient } from '@/api/rpc-client'
|
||||||
import BaseModal from '@/components/BaseModal.vue'
|
import BaseModal from '@/components/BaseModal.vue'
|
||||||
@@ -75,6 +97,23 @@ const resultHash = ref('')
|
|||||||
const resultArk = ref('')
|
const resultArk = ref('')
|
||||||
const ecashToken = ref('')
|
const ecashToken = ref('')
|
||||||
|
|
||||||
|
// "Send all funds" — sweeps the whole on-chain balance (explicit on-chain tab only)
|
||||||
|
const sendAll = ref(false)
|
||||||
|
const onchainBalance = ref<number | null>(null)
|
||||||
|
const isSweep = computed(() => sendMethod.value === 'onchain' && sendAll.value)
|
||||||
|
|
||||||
|
function toggleSendAll() {
|
||||||
|
sendAll.value = !sendAll.value
|
||||||
|
if (sendAll.value && onchainBalance.value === null) {
|
||||||
|
rpcClient.call<{ balance_sats: number }>({ method: 'lnd.getinfo', timeout: 5000 })
|
||||||
|
.then((res) => { onchainBalance.value = res.balance_sats || 0 })
|
||||||
|
.catch(() => { /* balance hint is best-effort */ })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Leaving the on-chain tab disarms the sweep so it can never apply elsewhere
|
||||||
|
watch(sendMethod, (m) => { if (m !== 'onchain') sendAll.value = false })
|
||||||
|
|
||||||
const effectiveMethod = computed(() => {
|
const effectiveMethod = computed(() => {
|
||||||
if (sendMethod.value !== 'auto') return sendMethod.value
|
if (sendMethod.value !== 'auto') return sendMethod.value
|
||||||
const amt = amount.value || 0
|
const amt = amount.value || 0
|
||||||
@@ -98,7 +137,8 @@ function copyText(text: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function send() {
|
async function send() {
|
||||||
if (!amount.value || processing.value) return
|
if (processing.value) return
|
||||||
|
if (!amount.value && !isSweep.value) return
|
||||||
processing.value = true
|
processing.value = true
|
||||||
error.value = ''
|
error.value = ''
|
||||||
ecashToken.value = ''
|
ecashToken.value = ''
|
||||||
@@ -134,7 +174,9 @@ async function send() {
|
|||||||
if (!dest.value.trim()) { error.value = t('web5.enterBitcoinAddress'); return }
|
if (!dest.value.trim()) { error.value = t('web5.enterBitcoinAddress'); return }
|
||||||
const res = await rpcClient.call<{ txid: string }>({
|
const res = await rpcClient.call<{ txid: string }>({
|
||||||
method: 'lnd.sendcoins',
|
method: 'lnd.sendcoins',
|
||||||
params: { addr: dest.value.trim(), amount: amount.value },
|
params: isSweep.value
|
||||||
|
? { addr: dest.value.trim(), send_all: true }
|
||||||
|
: { addr: dest.value.trim(), amount: amount.value },
|
||||||
})
|
})
|
||||||
resultTxid.value = res.txid
|
resultTxid.value = res.txid
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,14 @@
|
|||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-sm text-white/90 flex-1">{{ toast.message }}</span>
|
<div class="flex-1 min-w-0">
|
||||||
|
<span class="text-sm text-white/90">{{ toast.message }}</span>
|
||||||
|
<button
|
||||||
|
v-if="toast.action"
|
||||||
|
@click.stop="runAction(toast)"
|
||||||
|
class="block mt-1 text-sm font-semibold text-orange-400 hover:text-orange-300 transition-colors"
|
||||||
|
>{{ toast.action.label }} →</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TransitionGroup>
|
</TransitionGroup>
|
||||||
</div>
|
</div>
|
||||||
@@ -32,10 +39,15 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useToast } from '@/composables/useToast'
|
import { useToast } from '@/composables/useToast'
|
||||||
import type { ToastVariant } from '@/composables/useToast'
|
import type { ToastItem, ToastVariant } from '@/composables/useToast'
|
||||||
|
|
||||||
const { toasts, dismiss } = useToast()
|
const { toasts, dismiss } = useToast()
|
||||||
|
|
||||||
|
function runAction(toast: ToastItem | Readonly<ToastItem>) {
|
||||||
|
toast.action?.onClick()
|
||||||
|
dismiss(toast.id)
|
||||||
|
}
|
||||||
|
|
||||||
function variantClass(variant: ToastVariant): string {
|
function variantClass(variant: ToastVariant): string {
|
||||||
switch (variant) {
|
switch (variant) {
|
||||||
case 'success': return 'bg-black/70 border-green-500/30 backdrop-blur-md'
|
case 'success': return 'bg-black/70 border-green-500/30 backdrop-blur-md'
|
||||||
|
|||||||
@@ -216,7 +216,8 @@ async function connect() {
|
|||||||
device_kind: form.value.deviceKind,
|
device_kind: form.value.deviceKind,
|
||||||
})
|
})
|
||||||
mesh.dismissDetectedDevice(path)
|
mesh.dismissDetectedDevice(path)
|
||||||
void router.push('/mesh')
|
// The Mesh view lives under the dashboard shell — a bare /mesh 404s.
|
||||||
|
void router.push('/dashboard/mesh')
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error.value = e instanceof Error ? e.message : 'Failed to configure the mesh radio'
|
error.value = e instanceof Error ? e.message : 'Failed to configure the mesh radio'
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
import { ref, computed } from 'vue'
|
||||||
|
import { rpcClient } from '@/api/rpc-client'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared bitcoin sync (IBD) tracker with a live time-remaining estimate.
|
||||||
|
*
|
||||||
|
* Polls `bitcoin.getinfo` while at least one consumer holds an acquire()
|
||||||
|
* lease, samples the sync rate, and exposes a ticking countdown so setup
|
||||||
|
* screens can show "~2h 14m remaining" that visibly counts down between
|
||||||
|
* polls. Module-level singleton — every consumer sees the same state.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Sync fraction (as percent) at which we consider IBD done, matching the Home tile */
|
||||||
|
export const IBD_SYNCED_AT = 99.9
|
||||||
|
|
||||||
|
const POLL_MS = 15_000
|
||||||
|
const TICK_MS = 1_000
|
||||||
|
/** Ignore rate samples older than this when estimating */
|
||||||
|
const SAMPLE_WINDOW_MS = 10 * 60_000
|
||||||
|
|
||||||
|
export const bitcoinSyncPercent = ref(0)
|
||||||
|
export const bitcoinBlockHeight = ref(0)
|
||||||
|
export const bitcoinSyncAvailable = ref(false)
|
||||||
|
export const bitcoinSyncLoaded = ref(false)
|
||||||
|
export const bitcoinSynced = computed(() => bitcoinSyncLoaded.value && bitcoinSyncPercent.value >= IBD_SYNCED_AT)
|
||||||
|
|
||||||
|
const etaSeconds = ref<number | null>(null)
|
||||||
|
|
||||||
|
/** Human countdown like "2h 14m" / "5m 12s" / "less than a minute", or '' while estimating */
|
||||||
|
export const bitcoinSyncEtaText = computed(() => {
|
||||||
|
const s = etaSeconds.value
|
||||||
|
if (s === null) return ''
|
||||||
|
if (s < 60) return 'less than a minute'
|
||||||
|
const h = Math.floor(s / 3600)
|
||||||
|
const m = Math.floor((s % 3600) / 60)
|
||||||
|
if (h > 0) return `${h}h ${m}m`
|
||||||
|
const sec = Math.floor(s % 60)
|
||||||
|
return `${m}m ${sec}s`
|
||||||
|
})
|
||||||
|
|
||||||
|
let samples: { t: number; p: number }[] = []
|
||||||
|
let etaBase: { at: number; secs: number } | null = null
|
||||||
|
let pollTimer: ReturnType<typeof setInterval> | null = null
|
||||||
|
let tickTimer: ReturnType<typeof setInterval> | null = null
|
||||||
|
let leases = 0
|
||||||
|
|
||||||
|
async function poll() {
|
||||||
|
try {
|
||||||
|
const btc = await rpcClient.call<{ block_height: number; sync_progress: number }>({
|
||||||
|
method: 'bitcoin.getinfo',
|
||||||
|
timeout: 8000,
|
||||||
|
})
|
||||||
|
const pct = (btc.sync_progress ?? 0) * 100
|
||||||
|
bitcoinSyncPercent.value = pct
|
||||||
|
bitcoinBlockHeight.value = btc.block_height ?? 0
|
||||||
|
bitcoinSyncAvailable.value = true
|
||||||
|
bitcoinSyncLoaded.value = true
|
||||||
|
|
||||||
|
const now = Date.now()
|
||||||
|
samples.push({ t: now, p: pct })
|
||||||
|
samples = samples.filter((s) => now - s.t <= SAMPLE_WINDOW_MS).slice(-50)
|
||||||
|
|
||||||
|
if (pct >= IBD_SYNCED_AT) {
|
||||||
|
etaBase = null
|
||||||
|
etaSeconds.value = 0
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const first = samples[0]
|
||||||
|
if (first && now - first.t >= 10_000 && pct > first.p) {
|
||||||
|
const ratePerSec = (pct - first.p) / ((now - first.t) / 1000)
|
||||||
|
etaBase = { at: now, secs: (IBD_SYNCED_AT - pct) / ratePerSec }
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
bitcoinSyncAvailable.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function tick() {
|
||||||
|
if (!etaBase) {
|
||||||
|
if (!bitcoinSynced.value) etaSeconds.value = null
|
||||||
|
return
|
||||||
|
}
|
||||||
|
etaSeconds.value = Math.max(0, etaBase.secs - (Date.now() - etaBase.at) / 1000)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hold a polling lease. Returns a release function — call it on unmount.
|
||||||
|
* Polling only runs while at least one lease is held.
|
||||||
|
*/
|
||||||
|
export function acquireBitcoinSync(): () => void {
|
||||||
|
leases++
|
||||||
|
if (leases === 1) {
|
||||||
|
void poll()
|
||||||
|
pollTimer = setInterval(() => void poll(), POLL_MS)
|
||||||
|
tickTimer = setInterval(tick, TICK_MS)
|
||||||
|
}
|
||||||
|
let released = false
|
||||||
|
return () => {
|
||||||
|
if (released) return
|
||||||
|
released = true
|
||||||
|
leases = Math.max(0, leases - 1)
|
||||||
|
if (leases === 0) {
|
||||||
|
if (pollTimer) clearInterval(pollTimer)
|
||||||
|
if (tickTimer) clearInterval(tickTimer)
|
||||||
|
pollTimer = null
|
||||||
|
tickTimer = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,13 +26,17 @@ export function clearDemoIntroSeen(): void {
|
|||||||
// Only these apps actually do something in the demo (a mock UI or a real
|
// Only these apps actually do something in the demo (a mock UI or a real
|
||||||
// external site). Everything else shows "No demo" on a disabled install button
|
// external site). Everything else shows "No demo" on a disabled install button
|
||||||
// and is not launchable.
|
// and is not launchable.
|
||||||
const DEMO_EXTERNAL_URLS: Record<string, string> = {}
|
// IndeeHub's real site sends X-Frame-Options: SAMEORIGIN, and the old
|
||||||
|
// same-origin nginx sub_filter proxy broke its runtime-built asset URLs —
|
||||||
|
// so the demo opens the real site directly instead.
|
||||||
|
const DEMO_EXTERNAL_URLS: Record<string, string> = {
|
||||||
|
indeedhub: 'https://indee.tx1138.com/',
|
||||||
|
}
|
||||||
|
|
||||||
// Apps loaded in the in-app iframe via a same-origin path. IndeeHub and Mempool
|
// Apps loaded in the in-app iframe via a same-origin path. IndeeHub and Mempool
|
||||||
// are reverse-proxied by nginx (X-Frame-Options/CSP stripped + asset paths
|
// are reverse-proxied by nginx (X-Frame-Options/CSP stripped + asset paths
|
||||||
// rewritten) so the frame-busting real sites can be embedded.
|
// rewritten) so the frame-busting real sites can be embedded.
|
||||||
const DEMO_MOCK_UI: Record<string, string> = {
|
const DEMO_MOCK_UI: Record<string, string> = {
|
||||||
indeedhub: '/app/indeedhub/',
|
|
||||||
mempool: '/app/mempool/',
|
mempool: '/app/mempool/',
|
||||||
'mempool-web': '/app/mempool/',
|
'mempool-web': '/app/mempool/',
|
||||||
'bitcoin-knots': '/app/bitcoin-knots/',
|
'bitcoin-knots': '/app/bitcoin-knots/',
|
||||||
@@ -61,11 +65,11 @@ const DEMO_MOCK_UI: Record<string, string> = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether a demo app opens in a new tab. Nothing does — IndeeHub and Mempool
|
* Whether a demo app opens externally (new tab / in-app browser) because its
|
||||||
* both load their real site directly in the in-app iframe.
|
* real site blocks iframing (X-Frame-Options).
|
||||||
*/
|
*/
|
||||||
export function isDemoExternal(_appId: string): boolean {
|
export function isDemoExternal(appId: string): boolean {
|
||||||
return false
|
return appId in DEMO_EXTERNAL_URLS
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Can this app be launched/installed in the demo? */
|
/** Can this app be launched/installed in the demo? */
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import { computed, watch, watchEffect, onUnmounted } from 'vue'
|
||||||
|
import { useRouter } from 'vue-router'
|
||||||
|
import { GOALS } from '@/data/goals'
|
||||||
|
import { useGoalStore } from '@/stores/goals'
|
||||||
|
import { useToast } from '@/composables/useToast'
|
||||||
|
import {
|
||||||
|
acquireBitcoinSync,
|
||||||
|
bitcoinSynced,
|
||||||
|
bitcoinSyncLoaded,
|
||||||
|
} from '@/composables/useBitcoinSync'
|
||||||
|
|
||||||
|
// Session-level guard: the "finish setup" toast fires at most once per page load.
|
||||||
|
let firedThisSession = false
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watches for Bitcoin IBD completing while a Lightning setup goal is mid-flight
|
||||||
|
* and pops a "Finish setup" toast linking back to that goal's wizard (which is
|
||||||
|
* sitting on the fund-wallet / open-channel steps). Mount once in the
|
||||||
|
* dashboard layout.
|
||||||
|
*/
|
||||||
|
export function useIbdFinishWatcher() {
|
||||||
|
const goalStore = useGoalStore()
|
||||||
|
const router = useRouter()
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
|
// A goal qualifies while it's in progress and its manual fund/channel steps
|
||||||
|
// aren't done yet. If several qualify, the first wins — finishing the shared
|
||||||
|
// fund + channel steps completes the lightning part of any of them.
|
||||||
|
const pendingLightningGoalId = computed<string | null>(() => {
|
||||||
|
if (firedThisSession) return null
|
||||||
|
for (const goal of GOALS) {
|
||||||
|
const hasFundStep = goal.steps.some((s) => s.action === 'fund')
|
||||||
|
if (!hasFundStep) continue
|
||||||
|
if (goalStore.getGoalStatus(goal.id) !== 'in-progress') continue
|
||||||
|
const done = goalStore.progress[goal.id]?.completedSteps ?? []
|
||||||
|
const manualPending = goal.steps.some(
|
||||||
|
(s) => s.action !== 'install' && !done.includes(s.id),
|
||||||
|
)
|
||||||
|
if (manualPending) return goal.id
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
})
|
||||||
|
|
||||||
|
// Only poll the chain while there's actually a goal waiting on it.
|
||||||
|
let release: (() => void) | null = null
|
||||||
|
watchEffect(() => {
|
||||||
|
const shouldWatch = pendingLightningGoalId.value !== null && !bitcoinSynced.value
|
||||||
|
if (shouldWatch && !release) {
|
||||||
|
release = acquireBitcoinSync()
|
||||||
|
} else if (!shouldWatch && release) {
|
||||||
|
// Goal finished/reset or the chain synced — stop polling.
|
||||||
|
release()
|
||||||
|
release = null
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Fire only on a REAL transition: we must have observed the chain unsynced
|
||||||
|
// at least once this session, so a node that's already synced at page load
|
||||||
|
// doesn't toast.
|
||||||
|
let sawUnsynced = false
|
||||||
|
watch([bitcoinSynced, bitcoinSyncLoaded], ([synced, loaded]) => {
|
||||||
|
if (!loaded) return
|
||||||
|
if (!synced) {
|
||||||
|
sawUnsynced = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!sawUnsynced || firedThisSession) return
|
||||||
|
const goalId = pendingLightningGoalId.value
|
||||||
|
if (!goalId) return
|
||||||
|
firedThisSession = true
|
||||||
|
toast.action(
|
||||||
|
'Bitcoin is fully synced — you can now fund your wallet and open your Lightning channel.',
|
||||||
|
{
|
||||||
|
label: 'Finish setup',
|
||||||
|
onClick: () => { router.push(`/dashboard/goals/${goalId}`) },
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if (release) {
|
||||||
|
release()
|
||||||
|
release = null
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (release) {
|
||||||
|
release()
|
||||||
|
release = null
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -2,19 +2,25 @@ import { ref, readonly } from 'vue'
|
|||||||
|
|
||||||
export type ToastVariant = 'success' | 'error' | 'info'
|
export type ToastVariant = 'success' | 'error' | 'info'
|
||||||
|
|
||||||
|
export interface ToastAction {
|
||||||
|
label: string
|
||||||
|
onClick: () => void
|
||||||
|
}
|
||||||
|
|
||||||
export interface ToastItem {
|
export interface ToastItem {
|
||||||
id: number
|
id: number
|
||||||
message: string
|
message: string
|
||||||
variant: ToastVariant
|
variant: ToastVariant
|
||||||
dismissing: boolean
|
dismissing: boolean
|
||||||
|
action?: ToastAction
|
||||||
}
|
}
|
||||||
|
|
||||||
const toasts = ref<ToastItem[]>([])
|
const toasts = ref<ToastItem[]>([])
|
||||||
let nextId = 0
|
let nextId = 0
|
||||||
|
|
||||||
function addToast(message: string, variant: ToastVariant = 'info', duration = 3000) {
|
function addToast(message: string, variant: ToastVariant = 'info', duration = 3000, action?: ToastAction) {
|
||||||
const id = nextId++
|
const id = nextId++
|
||||||
toasts.value.push({ id, message, variant, dismissing: false })
|
toasts.value.push({ id, message, variant, dismissing: false, action })
|
||||||
|
|
||||||
// Auto-dismiss
|
// Auto-dismiss
|
||||||
if (duration > 0) {
|
if (duration > 0) {
|
||||||
@@ -42,6 +48,9 @@ export function useToast() {
|
|||||||
success: (msg: string) => addToast(msg, 'success'),
|
success: (msg: string) => addToast(msg, 'success'),
|
||||||
error: (msg: string) => addToast(msg, 'error'),
|
error: (msg: string) => addToast(msg, 'error'),
|
||||||
info: (msg: string) => addToast(msg, 'info'),
|
info: (msg: string) => addToast(msg, 'info'),
|
||||||
|
/** Toast with an action link (e.g. "Finish setup"). Sticks around longer. */
|
||||||
|
action: (msg: string, action: ToastAction, opts?: { variant?: ToastVariant; duration?: number }) =>
|
||||||
|
addToast(msg, opts?.variant ?? 'success', opts?.duration ?? 15000, action),
|
||||||
dismiss: dismissToast,
|
dismiss: dismissToast,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,25 @@
|
|||||||
import type { GoalDefinition } from '@/types/goals'
|
import type { GoalDefinition, GoalStep } from '@/types/goals'
|
||||||
|
|
||||||
|
/** Zeus (Olympus LSP) channel size limits, in sats */
|
||||||
|
export const ZEUS_CHANNEL_MIN_SATS = 150_000
|
||||||
|
export const ZEUS_CHANNEL_MAX_SATS = 1_500_000
|
||||||
|
|
||||||
|
export const ZEUS_ICON = '/assets/img/app-icons/zeus.webp'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared "fund the bitcoin wallet" step used by every Lightning goal. Gated on
|
||||||
|
* the blockchain being fully synced (IBD) — the wizard shows a live sync timer
|
||||||
|
* until then, and a "Fund Wallet" receive flow after.
|
||||||
|
*/
|
||||||
|
const FUND_WALLET_STEP: GoalStep = {
|
||||||
|
id: 'fund-wallet',
|
||||||
|
title: 'Fund Your Bitcoin Wallet',
|
||||||
|
description:
|
||||||
|
"Send bitcoin to your node's on-chain wallet so it can open a Lightning channel. Zeus channels need between 150,000 and 1,500,000 sats. Funding unlocks once your node finishes syncing the blockchain.",
|
||||||
|
action: 'fund',
|
||||||
|
isAutomatic: false,
|
||||||
|
icon: '/assets/img/app-icons/bitcoin-knots.webp',
|
||||||
|
}
|
||||||
|
|
||||||
export const GOALS: GoalDefinition[] = [
|
export const GOALS: GoalDefinition[] = [
|
||||||
{
|
{
|
||||||
@@ -25,6 +46,17 @@ export const GOALS: GoalDefinition[] = [
|
|||||||
action: 'install',
|
action: 'install',
|
||||||
isAutomatic: true,
|
isAutomatic: true,
|
||||||
},
|
},
|
||||||
|
{ ...FUND_WALLET_STEP },
|
||||||
|
{
|
||||||
|
id: 'open-zeus-channel',
|
||||||
|
title: 'Open a Channel with Zeus',
|
||||||
|
description:
|
||||||
|
'Open a Lightning channel to Zeus, the mobile wallet that pairs perfectly with your node. Fund it with 150,000–1,500,000 sats and your shop can accept instant Lightning payments.',
|
||||||
|
action: 'configure',
|
||||||
|
isAutomatic: false,
|
||||||
|
icon: ZEUS_ICON,
|
||||||
|
ctaLabel: 'Open a channel',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: 'install-btcpay',
|
id: 'install-btcpay',
|
||||||
title: 'Install BTCPay Server',
|
title: 'Install BTCPay Server',
|
||||||
@@ -69,13 +101,16 @@ export const GOALS: GoalDefinition[] = [
|
|||||||
action: 'install',
|
action: 'install',
|
||||||
isAutomatic: true,
|
isAutomatic: true,
|
||||||
},
|
},
|
||||||
|
{ ...FUND_WALLET_STEP },
|
||||||
{
|
{
|
||||||
id: 'open-channel',
|
id: 'open-channel',
|
||||||
title: 'Open a Lightning Channel',
|
title: 'Open a Channel with Zeus',
|
||||||
description: 'Open your first payment channel to start sending and receiving Lightning payments. LND will guide you through it.',
|
description:
|
||||||
appId: 'lnd',
|
'Open your first payment channel to Zeus, the mobile wallet built for nodes like yours (150,000–1,500,000 sats). You can then send and receive Lightning payments from your phone.',
|
||||||
action: 'configure',
|
action: 'configure',
|
||||||
isAutomatic: false,
|
isAutomatic: false,
|
||||||
|
icon: ZEUS_ICON,
|
||||||
|
ctaLabel: 'Open a channel',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
estimatedTime: '~30 min + sync time',
|
estimatedTime: '~30 min + sync time',
|
||||||
@@ -168,13 +203,16 @@ export const GOALS: GoalDefinition[] = [
|
|||||||
action: 'install',
|
action: 'install',
|
||||||
isAutomatic: true,
|
isAutomatic: true,
|
||||||
},
|
},
|
||||||
|
{ ...FUND_WALLET_STEP },
|
||||||
{
|
{
|
||||||
id: 'open-channels',
|
id: 'open-channels',
|
||||||
title: 'Open Payment Channels',
|
title: 'Open Payment Channels',
|
||||||
description: 'Open channels with well-connected nodes to start routing payments. More channels means more routing opportunities.',
|
description:
|
||||||
appId: 'lnd',
|
'Open channels with well-connected nodes to start routing payments. A great first channel is Zeus (150,000–1,500,000 sats) — it also puts your node in your pocket. More channels means more routing opportunities.',
|
||||||
action: 'configure',
|
action: 'configure',
|
||||||
isAutomatic: false,
|
isAutomatic: false,
|
||||||
|
icon: ZEUS_ICON,
|
||||||
|
ctaLabel: 'Open a channel',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'verify-routing',
|
id: 'verify-routing',
|
||||||
|
|||||||
@@ -169,11 +169,16 @@ describe('useGoalStore', () => {
|
|||||||
expect(store.getGoalStatus('accept-payments')).toBe('not-started')
|
expect(store.getGoalStatus('accept-payments')).toBe('not-started')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('returns completed when all required apps are running', () => {
|
it('returns completed when all required apps run AND manual steps are done', () => {
|
||||||
mockPackages['bitcoin-knots'] = { state: 'running' }
|
mockPackages['bitcoin-knots'] = { state: 'running' }
|
||||||
mockPackages['lnd'] = { state: 'running' }
|
mockPackages['lnd'] = { state: 'running' }
|
||||||
|
|
||||||
const store = useGoalStore()
|
const store = useGoalStore()
|
||||||
|
// Running apps alone no longer finish a goal — manual steps must be walked
|
||||||
|
expect(store.getGoalStatus('accept-payments')).toBe('in-progress')
|
||||||
|
|
||||||
|
store.startGoal('accept-payments')
|
||||||
|
store.completeStep('accept-payments', 'open-channel')
|
||||||
expect(store.getGoalStatus('accept-payments')).toBe('completed')
|
expect(store.getGoalStatus('accept-payments')).toBe('completed')
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -198,6 +203,8 @@ describe('useGoalStore', () => {
|
|||||||
mockPackages['immich-server'] = { state: 'running' }
|
mockPackages['immich-server'] = { state: 'running' }
|
||||||
|
|
||||||
const store = useGoalStore()
|
const store = useGoalStore()
|
||||||
|
store.startGoal('store-photos')
|
||||||
|
store.completeStep('store-photos', 'configure-immich')
|
||||||
expect(store.getGoalStatus('store-photos')).toBe('completed')
|
expect(store.getGoalStatus('store-photos')).toBe('completed')
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -218,6 +225,8 @@ describe('useGoalStore', () => {
|
|||||||
mockPackages['lnd'] = { state: 'running' }
|
mockPackages['lnd'] = { state: 'running' }
|
||||||
|
|
||||||
const store = useGoalStore()
|
const store = useGoalStore()
|
||||||
|
store.startGoal('accept-payments')
|
||||||
|
store.completeStep('accept-payments', 'open-channel')
|
||||||
const statuses = store.goalStatuses
|
const statuses = store.goalStatuses
|
||||||
|
|
||||||
expect(statuses['accept-payments']).toBe('completed')
|
expect(statuses['accept-payments']).toBe('completed')
|
||||||
|
|||||||
@@ -88,12 +88,19 @@ export const useGoalStore = defineStore('goals', () => {
|
|||||||
([pkgId, pkg]) => matchesAppId(pkgId, appId) && pkg.state === 'running',
|
([pkgId, pkg]) => matchesAppId(pkgId, appId) && pkg.state === 'running',
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if (allRunning) return 'completed'
|
|
||||||
|
// Manual steps (fund the wallet, open a channel, configure the store…)
|
||||||
|
// must be walked through too — running apps alone don't finish a goal.
|
||||||
|
const done = progress.value[goalId]?.completedSteps ?? []
|
||||||
|
const allManualDone = goal.steps
|
||||||
|
.filter((s) => s.action !== 'install')
|
||||||
|
.every((s) => done.includes(s.id))
|
||||||
|
if (allRunning && allManualDone) return 'completed'
|
||||||
|
|
||||||
const anyInstalled = goal.requiredApps.some((appId) =>
|
const anyInstalled = goal.requiredApps.some((appId) =>
|
||||||
Object.keys(packages).some((pkgId) => matchesAppId(pkgId, appId)),
|
Object.keys(packages).some((pkgId) => matchesAppId(pkgId, appId)),
|
||||||
)
|
)
|
||||||
if (anyInstalled || progress.value[goalId]) return 'in-progress'
|
if (allRunning || anyInstalled || progress.value[goalId]) return 'in-progress'
|
||||||
|
|
||||||
return 'not-started'
|
return 'not-started'
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-15
@@ -79,7 +79,9 @@ select:focus-visible {
|
|||||||
border-color: rgba(251, 146, 60, 0.4);
|
border-color: rgba(251, 146, 60, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Card action placement: keep compact header buttons for genuinely wide layouts. */
|
/* Card action placement: actions always live at the bottom of the card as
|
||||||
|
full-width buttons — same layout on every screen size. The compact header
|
||||||
|
variants are permanently retired for consistency (desktop == mobile). */
|
||||||
.responsive-card-actions-top,
|
.responsive-card-actions-top,
|
||||||
.web5-card-actions-top {
|
.web5-card-actions-top {
|
||||||
display: none;
|
display: none;
|
||||||
@@ -109,20 +111,6 @@ select:focus-visible {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 1800px) {
|
|
||||||
.responsive-card-actions-top,
|
|
||||||
.web5-card-actions-top {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.responsive-card-actions-bottom,
|
|
||||||
.responsive-card-actions-bottom-grid,
|
|
||||||
.web5-card-actions-bottom,
|
|
||||||
.web5-card-actions-bottom-grid {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Mobile touch targets — ensure tappable elements meet 44px minimum */
|
/* Mobile touch targets — ensure tappable elements meet 44px minimum */
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
button:not(.mode-switcher-btn):not(.sidebar-nav-item):not([class*="w-9"]):not([class*="w-8"]):not([class*="w-7"]):not([class*="w-10"]):not([class*="w-11"]):not([class*="w-12"]) {
|
button:not(.mode-switcher-btn):not(.sidebar-nav-item):not([class*="w-9"]):not([class*="w-8"]):not([class*="w-7"]):not([class*="w-10"]):not([class*="w-11"]):not([class*="w-12"]) {
|
||||||
|
|||||||
@@ -17,8 +17,16 @@ export interface GoalStep {
|
|||||||
title: string
|
title: string
|
||||||
description: string
|
description: string
|
||||||
appId?: string
|
appId?: string
|
||||||
action: 'install' | 'configure' | 'verify' | 'info'
|
/**
|
||||||
|
* 'fund' renders the bitcoin-wallet funding UI: gated on IBD completion
|
||||||
|
* (with a live sync timer), then a "Fund Wallet" receive flow.
|
||||||
|
*/
|
||||||
|
action: 'install' | 'configure' | 'verify' | 'info' | 'fund'
|
||||||
isAutomatic: boolean
|
isAutomatic: boolean
|
||||||
|
/** Custom step icon (e.g. the Zeus logo) — overrides the appId-derived icon */
|
||||||
|
icon?: string
|
||||||
|
/** Custom label for the step's CTA button (configure steps) */
|
||||||
|
ctaLabel?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type GoalStatus = 'not-started' | 'in-progress' | 'completed' | 'error'
|
export type GoalStatus = 'not-started' | 'in-progress' | 'completed' | 'error'
|
||||||
|
|||||||
@@ -38,4 +38,50 @@ describe('shouldShowIntroSplash', () => {
|
|||||||
replayRequested: true,
|
replayRequested: true,
|
||||||
})).toBe(true)
|
})).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('a confirmed-fresh node plays the intro despite a stale per-origin seenIntro flag (reinstall / DHCP-recycled IP)', () => {
|
||||||
|
expect(shouldShowIntroSplash({
|
||||||
|
seenIntro: true,
|
||||||
|
routePath: '/',
|
||||||
|
fromBoot: false,
|
||||||
|
onboardingComplete: false,
|
||||||
|
})).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('a confirmed-fresh node plays the intro on the boot-screen handoff too', () => {
|
||||||
|
expect(shouldShowIntroSplash({
|
||||||
|
seenIntro: true,
|
||||||
|
routePath: '/login',
|
||||||
|
fromBoot: true,
|
||||||
|
onboardingComplete: false,
|
||||||
|
})).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('stale seenIntro still suppresses when the backend answer is unknown', () => {
|
||||||
|
expect(shouldShowIntroSplash({
|
||||||
|
seenIntro: true,
|
||||||
|
routePath: '/',
|
||||||
|
fromBoot: false,
|
||||||
|
onboardingComplete: null,
|
||||||
|
})).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('fresh node on a deep route without boot handoff stays suppressed', () => {
|
||||||
|
expect(shouldShowIntroSplash({
|
||||||
|
seenIntro: false,
|
||||||
|
routePath: '/onboarding/seed',
|
||||||
|
fromBoot: false,
|
||||||
|
onboardingComplete: false,
|
||||||
|
})).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('boot dev mode never root-boots into the intro', () => {
|
||||||
|
expect(shouldShowIntroSplash({
|
||||||
|
seenIntro: false,
|
||||||
|
routePath: '/',
|
||||||
|
fromBoot: false,
|
||||||
|
devMode: 'boot',
|
||||||
|
onboardingComplete: false,
|
||||||
|
})).toBe(false)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -10,10 +10,19 @@ export interface IntroSplashDecisionInput {
|
|||||||
|
|
||||||
export function shouldShowIntroSplash(input: IntroSplashDecisionInput): boolean {
|
export function shouldShowIntroSplash(input: IntroSplashDecisionInput): boolean {
|
||||||
if (input.replayRequested) return true
|
if (input.replayRequested) return true
|
||||||
|
|
||||||
|
const isDirectRoute = input.routePath !== '/'
|
||||||
|
// A node the backend CONFIRMS has never completed onboarding always gets
|
||||||
|
// the full intro on a root boot. `seenIntro` is per-origin browser state —
|
||||||
|
// after a reinstall (or a DHCP-recycled IP), the browser still carries the
|
||||||
|
// previous node's flag at the same origin, which silently muted the intro
|
||||||
|
// on genuinely fresh installs.
|
||||||
|
if (input.onboardingComplete === false && (input.fromBoot || (!isDirectRoute && input.devMode !== 'boot'))) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
if (input.seenIntro) return false
|
if (input.seenIntro) return false
|
||||||
if (input.onboardingComplete === true) return false
|
if (input.onboardingComplete === true) return false
|
||||||
|
|
||||||
const isDirectRoute = input.routePath !== '/'
|
|
||||||
if (input.fromBoot) return true
|
if (input.fromBoot) return true
|
||||||
if (input.devMode === 'boot') return false
|
if (input.devMode === 'boot') return false
|
||||||
return !isDirectRoute
|
return !isDirectRoute
|
||||||
|
|||||||
@@ -52,9 +52,11 @@
|
|||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- Background overlay - uniform 0.2 opacity -->
|
<!-- Background overlay. The web5/server backdrop is a much lighter image
|
||||||
|
than the others, so it gets a heavier scrim for text contrast. -->
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 pointer-events-none bg-black/20"
|
class="fixed inset-0 pointer-events-none bg-black transition-opacity duration-500"
|
||||||
|
:class="isWeb5Bg ? 'opacity-[0.45]' : 'opacity-20'"
|
||||||
style="z-index: -5;"
|
style="z-index: -5;"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -155,8 +157,12 @@ import ConnectionBanner from '@/views/dashboard/ConnectionBanner.vue'
|
|||||||
import HealthNotifications from '@/views/dashboard/HealthNotifications.vue'
|
import HealthNotifications from '@/views/dashboard/HealthNotifications.vue'
|
||||||
import CompanionIntroOverlay from '@/components/CompanionIntroOverlay.vue'
|
import CompanionIntroOverlay from '@/components/CompanionIntroOverlay.vue'
|
||||||
import { useRouteTransitions, isDetailRoute, ROUTE_BACKGROUNDS } from '@/views/dashboard/useRouteTransitions'
|
import { useRouteTransitions, isDetailRoute, ROUTE_BACKGROUNDS } from '@/views/dashboard/useRouteTransitions'
|
||||||
|
import { useIbdFinishWatcher } from '@/composables/useIbdFinishWatcher'
|
||||||
import '@/views/dashboard/dashboard-styles.css'
|
import '@/views/dashboard/dashboard-styles.css'
|
||||||
|
|
||||||
|
// Pops a "Finish setup" toast when Bitcoin IBD completes mid-Lightning-setup.
|
||||||
|
useIbdFinishWatcher()
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const store = useAppStore()
|
const store = useAppStore()
|
||||||
@@ -190,6 +196,10 @@ const backgroundImage = computed(() => {
|
|||||||
return 'bg-home.webp'
|
return 'bg-home.webp'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// bg-web5.jpg (web5 + server sections) is bright — the scrim overlay deepens
|
||||||
|
// while it's showing so light text keeps its contrast.
|
||||||
|
const isWeb5Bg = computed(() => backgroundImage.value === 'bg-web5.jpg')
|
||||||
|
|
||||||
const isDarkRoute = computed(() => {
|
const isDarkRoute = computed(() => {
|
||||||
const p = route.path
|
const p = route.path
|
||||||
return p.includes('/dashboard/web5') ||
|
return p.includes('/dashboard/web5') ||
|
||||||
|
|||||||
@@ -98,12 +98,59 @@
|
|||||||
>
|
>
|
||||||
{{ isInstalling ? t('common.installing') : t('goalDetail.installApp', { name: step.title.replace('Install ', '') }) }}
|
{{ isInstalling ? t('common.installing') : t('goalDetail.installApp', { name: step.title.replace('Install ', '') }) }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<!-- Fund the bitcoin wallet: IBD-gated, with live sync timer -->
|
||||||
|
<div v-else-if="step.action === 'fund'" class="space-y-3">
|
||||||
|
<div v-if="!bitcoinSynced" class="p-3 rounded-lg bg-orange-500/10 border border-orange-500/20">
|
||||||
|
<div class="flex items-center justify-between gap-3 mb-1.5">
|
||||||
|
<span class="text-xs text-white/75">Bitcoin is syncing — funding unlocks when it finishes</span>
|
||||||
|
<span class="text-xs font-mono text-orange-300 shrink-0">{{ bitcoinSyncLoaded ? bitcoinSyncPercent.toFixed(1) + '%' : '…' }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="h-1.5 bg-white/10 rounded-full overflow-hidden mb-1.5">
|
||||||
|
<div class="h-full bg-orange-400 rounded-full transition-all duration-700" :style="{ width: `${Math.min(100, bitcoinSyncPercent)}%` }" />
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-white/50">
|
||||||
|
<span v-if="bitcoinSyncEtaText" class="text-white/70 font-medium">~{{ bitcoinSyncEtaText }} remaining</span>
|
||||||
|
<span v-else>Estimating time remaining…</span>
|
||||||
|
<span v-if="bitcoinBlockHeight"> · Block {{ bitcoinBlockHeight.toLocaleString() }}</span>
|
||||||
|
</p>
|
||||||
|
<p class="text-xs text-white/45 mt-1.5">We'll pop a notification here the moment it's done.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<template v-else>
|
||||||
|
<div class="p-3 rounded-lg bg-white/5 border border-white/10">
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
|
<span class="text-xs text-white/60">On-chain wallet balance</span>
|
||||||
|
<span class="text-sm font-mono" :class="walletOnchainSats >= ZEUS_CHANNEL_MIN_SATS ? 'text-green-400' : 'text-white/85'">
|
||||||
|
{{ walletOnchainSats.toLocaleString() }} sats
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-white/45 mt-1">Zeus channels need 150,000–1,500,000 sats.</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-wrap gap-2">
|
||||||
|
<button
|
||||||
|
@click="showFundModal = true"
|
||||||
|
class="glass-button glass-button-warning glass-button-sm rounded-lg px-5 py-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Fund Wallet
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
@click="completeFundStep(step)"
|
||||||
|
:disabled="walletOnchainSats <= 0"
|
||||||
|
class="glass-button glass-button-sm rounded-lg px-5 py-2 text-sm font-medium disabled:opacity-40"
|
||||||
|
>
|
||||||
|
{{ walletOnchainSats > 0 ? 'Continue' : 'Waiting for funds…' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-else-if="step.action === 'configure'"
|
v-else-if="step.action === 'configure'"
|
||||||
@click="openConfigureStep(step)"
|
@click="openConfigureStep(step)"
|
||||||
class="glass-button glass-button-sm rounded-lg px-5 py-2 text-sm font-medium"
|
class="glass-button glass-button-sm rounded-lg px-5 py-2 text-sm font-medium"
|
||||||
>
|
>
|
||||||
{{ t('goalDetail.openAndConfigure') }}
|
{{ step.ctaLabel ?? t('goalDetail.openAndConfigure') }}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-else-if="step.action === 'verify'"
|
v-else-if="step.action === 'verify'"
|
||||||
@@ -142,12 +189,27 @@
|
|||||||
</div>
|
</div>
|
||||||
<h2 class="text-xl font-semibold text-white mb-2">{{ t('goalDetail.allSet') }}</h2>
|
<h2 class="text-xl font-semibold text-white mb-2">{{ t('goalDetail.allSet') }}</h2>
|
||||||
<p class="text-white/60 mb-6">{{ t('goalDetail.goalReady', { title: goal.title }) }}</p>
|
<p class="text-white/60 mb-6">{{ t('goalDetail.goalReady', { title: goal.title }) }}</p>
|
||||||
<RouterLink to="/dashboard/apps" class="glass-button rounded-lg px-6 py-3 font-medium">
|
<button
|
||||||
|
v-if="completionCta"
|
||||||
|
@click="openCompletionTarget"
|
||||||
|
class="glass-button rounded-lg px-6 py-3 font-medium"
|
||||||
|
>
|
||||||
|
{{ completionCta.label }}
|
||||||
|
</button>
|
||||||
|
<RouterLink v-else to="/dashboard/apps" class="glass-button rounded-lg px-6 py-3 font-medium">
|
||||||
{{ t('goalDetail.viewMyServices') }}
|
{{ t('goalDetail.viewMyServices') }}
|
||||||
</RouterLink>
|
</RouterLink>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<!-- Fund-wallet receive modal (on-chain address + QR, Zeus limits noted) -->
|
||||||
|
<ReceiveBitcoinModal
|
||||||
|
:show="showFundModal"
|
||||||
|
note="Fund your Lightning channel: Zeus channels need a minimum of 150,000 and a maximum of 1,500,000 sats."
|
||||||
|
auto-generate
|
||||||
|
@close="showFundModal = false"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Action error toast -->
|
<!-- Action error toast -->
|
||||||
<Transition name="fade">
|
<Transition name="fade">
|
||||||
<div v-if="actionError" class="fixed bottom-20 left-1/2 -translate-x-1/2 z-50 max-w-md w-full px-4" role="alert" aria-live="assertive">
|
<div v-if="actionError" class="fixed bottom-20 left-1/2 -translate-x-1/2 z-50 max-w-md w-full px-4" role="alert" aria-live="assertive">
|
||||||
@@ -161,15 +223,26 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, onUnmounted, ref, watch } from 'vue'
|
||||||
import { useRoute, useRouter, RouterLink } from 'vue-router'
|
import { useRoute, useRouter, RouterLink } from 'vue-router'
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import { useAppStore } from '@/stores/app'
|
import { useAppStore } from '@/stores/app'
|
||||||
import { useGoalStore } from '@/stores/goals'
|
import { useGoalStore } from '@/stores/goals'
|
||||||
import { getGoalById } from '@/data/goals'
|
import { useAppLauncherStore } from '@/stores/appLauncher'
|
||||||
|
import { getGoalById, ZEUS_CHANNEL_MIN_SATS } from '@/data/goals'
|
||||||
import type { GoalStep } from '@/types/goals'
|
import type { GoalStep } from '@/types/goals'
|
||||||
import { goalStepTargetPath } from './goals/goalStepActions'
|
import { goalStepRouteOverride } from './goals/goalStepActions'
|
||||||
import BackButton from '@/components/BackButton.vue'
|
import BackButton from '@/components/BackButton.vue'
|
||||||
|
import ReceiveBitcoinModal from '@/components/ReceiveBitcoinModal.vue'
|
||||||
|
import { rpcClient } from '@/api/rpc-client'
|
||||||
|
import {
|
||||||
|
acquireBitcoinSync,
|
||||||
|
bitcoinSynced,
|
||||||
|
bitcoinSyncLoaded,
|
||||||
|
bitcoinSyncPercent,
|
||||||
|
bitcoinBlockHeight,
|
||||||
|
bitcoinSyncEtaText,
|
||||||
|
} from '@/composables/useBitcoinSync'
|
||||||
|
|
||||||
/** Map appId to its icon file path under /assets/img/app-icons/ */
|
/** Map appId to its icon file path under /assets/img/app-icons/ */
|
||||||
const APP_ICON_MAP: Record<string, string> = {
|
const APP_ICON_MAP: Record<string, string> = {
|
||||||
@@ -185,10 +258,27 @@ const APP_ICON_MAP: Record<string, string> = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function stepIconUrl(step: GoalStep): string | undefined {
|
function stepIconUrl(step: GoalStep): string | undefined {
|
||||||
|
if (step.icon) return step.icon
|
||||||
if (!step.appId) return undefined
|
if (!step.appId) return undefined
|
||||||
return APP_ICON_MAP[step.appId]
|
return APP_ICON_MAP[step.appId]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where the completion card sends the user: the app they just set up, not the
|
||||||
|
* generic services list. `launchAppId` opens via the app launcher (iframe apps
|
||||||
|
* overlay on top of the current screen; X-Frame-Options apps open a tab).
|
||||||
|
*/
|
||||||
|
const GOAL_COMPLETION_CTA: Record<string, { label: string; route?: string; launchAppId?: string }> = {
|
||||||
|
'open-a-shop': { label: 'Go to my shop (BTCPay)', launchAppId: 'btcpay-server' },
|
||||||
|
'accept-payments': { label: 'Go to Lightning (LND)', route: '/dashboard/apps/lnd' },
|
||||||
|
'run-lightning-node': { label: 'View my channels', route: '/dashboard/apps/lnd/channels' },
|
||||||
|
'setup-fedimint': { label: 'Open Fedimint', launchAppId: 'fedimint' },
|
||||||
|
'file-browser': { label: 'Open File Browser', launchAppId: 'filebrowser' },
|
||||||
|
'store-files': { label: 'Open my cloud (Nextcloud)', launchAppId: 'nextcloud' },
|
||||||
|
'create-identity': { label: 'Go to my identity', route: '/dashboard/web5' },
|
||||||
|
'back-up-everything': { label: 'Go to backups', route: '/dashboard/settings' },
|
||||||
|
}
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -214,7 +304,9 @@ const completedSteps = computed(() => {
|
|||||||
if (!goal.value) return new Set<string>()
|
if (!goal.value) return new Set<string>()
|
||||||
const completed = new Set<string>()
|
const completed = new Set<string>()
|
||||||
for (const step of goal.value.steps) {
|
for (const step of goal.value.steps) {
|
||||||
if (step.appId && isAppInstalled(step.appId)) {
|
// Only install steps auto-tick from package state — manual steps (fund the
|
||||||
|
// wallet, open a channel, configure) must be walked through.
|
||||||
|
if (step.action === 'install' && step.appId && isAppInstalled(step.appId)) {
|
||||||
completed.add(step.id)
|
completed.add(step.id)
|
||||||
}
|
}
|
||||||
if (goalStore.progress[goalId.value]?.completedSteps.includes(step.id)) {
|
if (goalStore.progress[goalId.value]?.completedSteps.includes(step.id)) {
|
||||||
@@ -306,9 +398,16 @@ async function installApp(step: GoalStep) {
|
|||||||
function openConfigureStep(step: GoalStep) {
|
function openConfigureStep(step: GoalStep) {
|
||||||
ensureGoalStarted()
|
ensureGoalStarted()
|
||||||
goalStore.completeStep(goalId.value, step.id)
|
goalStore.completeStep(goalId.value, step.id)
|
||||||
const targetPath = goalStepTargetPath(step)
|
const override = goalStepRouteOverride(step)
|
||||||
if (targetPath) {
|
if (override) {
|
||||||
router.push(targetPath)
|
// Internal screens (channels, web5, settings) — tag where we came from so
|
||||||
|
// their back button returns to this wizard.
|
||||||
|
router.push({ path: override, query: { from: 'goal', goal: goalId.value } })
|
||||||
|
} else if (step.appId) {
|
||||||
|
// Launch the app itself: iframe apps overlay on top of the wizard,
|
||||||
|
// tab-only apps open a tab (mobile: the in-app browser) — the app
|
||||||
|
// launcher handles every case.
|
||||||
|
useAppLauncherStore().openSession(step.appId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -329,7 +428,71 @@ function ensureGoalStarted() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function goBack() {
|
function goBack() {
|
||||||
router.push('/dashboard')
|
// The goal cards live on Home's Setup tab — return there, not the dashboard.
|
||||||
|
router.push({ path: '/dashboard', query: { tab: 'setup' } })
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Fund-wallet step: live sync status + on-chain balance ───────────────────
|
||||||
|
|
||||||
|
const showFundModal = ref(false)
|
||||||
|
const walletOnchainSats = ref(0)
|
||||||
|
|
||||||
|
const hasFundStep = computed(() => goal.value?.steps.some((s) => s.action === 'fund') ?? false)
|
||||||
|
const fundStepActive = computed(() => {
|
||||||
|
if (!goal.value || !hasFundStep.value) return false
|
||||||
|
const active = goal.value.steps[activeStepIndex.value]
|
||||||
|
return active?.action === 'fund' && overallStatus.value !== 'completed'
|
||||||
|
})
|
||||||
|
|
||||||
|
let releaseSync: (() => void) | null = null
|
||||||
|
let balanceTimer: ReturnType<typeof setInterval> | null = null
|
||||||
|
|
||||||
|
async function refreshWalletBalance() {
|
||||||
|
try {
|
||||||
|
const res = await rpcClient.call<{ balance_sats: number }>({ method: 'lnd.getinfo', timeout: 8000 })
|
||||||
|
walletOnchainSats.value = res.balance_sats || 0
|
||||||
|
} catch { /* LND not up yet — balance stays at last known value */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(fundStepActive, (active) => {
|
||||||
|
if (active) {
|
||||||
|
if (!releaseSync) releaseSync = acquireBitcoinSync()
|
||||||
|
void refreshWalletBalance()
|
||||||
|
if (!balanceTimer) balanceTimer = setInterval(() => void refreshWalletBalance(), 15000)
|
||||||
|
} else {
|
||||||
|
if (releaseSync) { releaseSync(); releaseSync = null }
|
||||||
|
if (balanceTimer) { clearInterval(balanceTimer); balanceTimer = null }
|
||||||
|
}
|
||||||
|
}, { immediate: true })
|
||||||
|
|
||||||
|
// Refresh the balance right after the receive modal closes — the user may
|
||||||
|
// have just sent funds.
|
||||||
|
watch(showFundModal, (open) => { if (!open) void refreshWalletBalance() })
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (releaseSync) { releaseSync(); releaseSync = null }
|
||||||
|
if (balanceTimer) { clearInterval(balanceTimer); balanceTimer = null }
|
||||||
|
})
|
||||||
|
|
||||||
|
function completeFundStep(step: GoalStep) {
|
||||||
|
ensureGoalStarted()
|
||||||
|
goalStore.completeStep(goalId.value, step.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Completion CTA: go to the app you just set up ────────────────────────────
|
||||||
|
|
||||||
|
const completionCta = computed(() => (goal.value ? GOAL_COMPLETION_CTA[goal.value.id] : undefined))
|
||||||
|
|
||||||
|
function openCompletionTarget() {
|
||||||
|
const cta = completionCta.value
|
||||||
|
if (!cta) return
|
||||||
|
if (cta.launchAppId) {
|
||||||
|
// Iframe apps overlay on top of the current screen; X-Frame-Options apps
|
||||||
|
// (BTCPay, Nextcloud…) open in a new tab.
|
||||||
|
useAppLauncherStore().openSession(cta.launchAppId)
|
||||||
|
} else if (cta.route) {
|
||||||
|
router.push(cta.route)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -287,7 +287,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref, watch, onBeforeUnmount, onMounted } from 'vue'
|
import { computed, ref, watch, onBeforeUnmount, onMounted } from 'vue'
|
||||||
import { RouterLink, useRouter } from 'vue-router'
|
import { RouterLink, useRoute, useRouter } from 'vue-router'
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import SendBitcoinModal from '@/components/SendBitcoinModal.vue'
|
import SendBitcoinModal from '@/components/SendBitcoinModal.vue'
|
||||||
import ReceiveBitcoinModal from '@/components/ReceiveBitcoinModal.vue'
|
import ReceiveBitcoinModal from '@/components/ReceiveBitcoinModal.vue'
|
||||||
@@ -315,9 +315,15 @@ import type { WalletTransaction } from './home/HomeWalletCard.vue'
|
|||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
const route = useRoute()
|
||||||
const uiMode = useUIModeStore()
|
const uiMode = useUIModeStore()
|
||||||
const isDev = import.meta.env.DEV
|
const isDev = import.meta.env.DEV
|
||||||
const homeTab = ref<'dashboard' | 'setup'>('dashboard')
|
// ?tab=setup lands on the Setup tab (e.g. "Back to Goals" from a goal wizard)
|
||||||
|
const homeTab = ref<'dashboard' | 'setup'>(route.query.tab === 'setup' ? 'setup' : 'dashboard')
|
||||||
|
watch(() => route.query.tab, (tab) => {
|
||||||
|
if (tab === 'setup') homeTab.value = 'setup'
|
||||||
|
else if (tab === 'dashboard') homeTab.value = 'dashboard'
|
||||||
|
})
|
||||||
const topGoals = GOALS.slice(0, 3)
|
const topGoals = GOALS.slice(0, 3)
|
||||||
|
|
||||||
const QUICK_START_APPS = [...new Set(topGoals.flatMap((g) => g.requiredApps))]
|
const QUICK_START_APPS = [...new Set(topGoals.flatMap((g) => g.requiredApps))]
|
||||||
|
|||||||
@@ -64,6 +64,7 @@
|
|||||||
type="password"
|
type="password"
|
||||||
autocomplete="new-password"
|
autocomplete="new-password"
|
||||||
data-form-type="other"
|
data-form-type="other"
|
||||||
|
data-controller-no-submit
|
||||||
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
||||||
:placeholder="t('login.enterPasswordSetup')"
|
:placeholder="t('login.enterPasswordSetup')"
|
||||||
@keydown.enter="confirmPasswordInputRef?.focus()"
|
@keydown.enter="confirmPasswordInputRef?.focus()"
|
||||||
@@ -83,6 +84,7 @@
|
|||||||
type="password"
|
type="password"
|
||||||
autocomplete="new-password"
|
autocomplete="new-password"
|
||||||
data-form-type="other"
|
data-form-type="other"
|
||||||
|
data-controller-no-submit
|
||||||
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
||||||
:placeholder="t('login.confirmPasswordPlaceholder')"
|
:placeholder="t('login.confirmPasswordPlaceholder')"
|
||||||
@keydown.enter="handleSetupWithSound"
|
@keydown.enter="handleSetupWithSound"
|
||||||
@@ -127,6 +129,7 @@
|
|||||||
pattern="[0-9]*"
|
pattern="[0-9]*"
|
||||||
maxlength="8"
|
maxlength="8"
|
||||||
autocomplete="one-time-code"
|
autocomplete="one-time-code"
|
||||||
|
data-controller-no-submit
|
||||||
:aria-label="t('login.totpLabel')"
|
:aria-label="t('login.totpLabel')"
|
||||||
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white text-center text-2xl tracking-[0.5em] placeholder-white/40 focus:outline-none focus:border-orange-400/60 focus:ring-1 focus:ring-orange-400/30 transition-colors"
|
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white text-center text-2xl tracking-[0.5em] placeholder-white/40 focus:outline-none focus:border-orange-400/60 focus:ring-1 focus:ring-orange-400/30 transition-colors"
|
||||||
:placeholder="useBackupCode ? 'XXXX-XXXX' : '000000'"
|
:placeholder="useBackupCode ? 'XXXX-XXXX' : '000000'"
|
||||||
@@ -165,6 +168,12 @@
|
|||||||
🎮 Demo mode — Password: <span class="font-mono font-semibold">{{ DEMO_PASSWORD }}</span>
|
🎮 Demo mode — Password: <span class="font-mono font-semibold">{{ DEMO_PASSWORD }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- All auth inputs opt out of controller-nav's Enter→click-next-button
|
||||||
|
pattern (data-controller-no-submit): they submit via their own Enter
|
||||||
|
handlers, and while the submit button is still disabled the "next
|
||||||
|
focusable" is Replay Intro — the companion's auto-login injects
|
||||||
|
Enter before Vue re-enables the button, which replayed the intro
|
||||||
|
in a loop on every app connect. -->
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
<label for="login-password" class="block text-sm font-medium text-white/80 mb-2">
|
<label for="login-password" class="block text-sm font-medium text-white/80 mb-2">
|
||||||
{{ t('login.password') }}
|
{{ t('login.password') }}
|
||||||
@@ -175,6 +184,7 @@
|
|||||||
type="password"
|
type="password"
|
||||||
autocomplete="current-password"
|
autocomplete="current-password"
|
||||||
data-form-type="other"
|
data-form-type="other"
|
||||||
|
data-controller-no-submit
|
||||||
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
class="w-full px-4 py-3 bg-transparent border border-white/20 rounded-lg text-white placeholder-white/40 focus:outline-none focus:border-white/40 focus:ring-1 focus:ring-white/20 transition-colors"
|
||||||
:placeholder="t('login.enterPasswordPlaceholder')"
|
:placeholder="t('login.enterPasswordPlaceholder')"
|
||||||
@keydown.enter="handleLoginWithSound"
|
@keydown.enter="handleLoginWithSound"
|
||||||
|
|||||||
@@ -691,20 +691,24 @@ video.bg-layer {
|
|||||||
why the kiosk login/onboarding background still went black. Keep 2D
|
why the kiosk login/onboarding background still went black. Keep 2D
|
||||||
opacity crossfades; drop 3D transforms, blur filters, and blend-mode
|
opacity crossfades; drop 3D transforms, blur filters, and blend-mode
|
||||||
glitch overlays. */
|
glitch overlays. */
|
||||||
:global(html.kiosk-mode) .bg-perspective-container,
|
/* The full selector must live inside :global() — with `:global(html.kiosk-mode)
|
||||||
:global(html.kiosk-mode) .perspective-container {
|
.bg-layer` the SFC compiler drops the descendant part, emitting bare
|
||||||
|
`html.kiosk-mode { display: none !important }` rules that blank the whole
|
||||||
|
document on kiosk (the v1.7.104 white-screen). */
|
||||||
|
:global(html.kiosk-mode .bg-perspective-container),
|
||||||
|
:global(html.kiosk-mode .perspective-container) {
|
||||||
perspective: none !important;
|
perspective: none !important;
|
||||||
}
|
}
|
||||||
:global(html.kiosk-mode) .bg-layer,
|
:global(html.kiosk-mode .bg-layer),
|
||||||
:global(html.kiosk-mode) .view-wrapper {
|
:global(html.kiosk-mode .view-wrapper) {
|
||||||
transform: none !important;
|
transform: none !important;
|
||||||
transform-style: flat !important;
|
transform-style: flat !important;
|
||||||
backface-visibility: visible !important;
|
backface-visibility: visible !important;
|
||||||
will-change: auto !important;
|
will-change: auto !important;
|
||||||
filter: none !important;
|
filter: none !important;
|
||||||
}
|
}
|
||||||
:global(html.kiosk-mode) .login-glitch-layer,
|
:global(html.kiosk-mode .login-glitch-layer),
|
||||||
:global(html.kiosk-mode) .login-glitch-scan {
|
:global(html.kiosk-mode .login-glitch-scan) {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -207,10 +207,14 @@
|
|||||||
<div v-else class="text-xs text-white/30 py-2">No devices added yet</div>
|
<div v-else class="text-xs text-white/30 py-2">No devices added yet</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button @click="showAddDeviceModal = true; showingNewDevice = true" class="responsive-card-actions-bottom mt-4 mobile-card-action glass-button rounded-lg text-sm font-medium">
|
<!-- mt-auto pins the action to the card bottom so buttons align across
|
||||||
|
equal-height grid cards -->
|
||||||
|
<div class="responsive-card-actions-bottom mt-auto pt-4">
|
||||||
|
<button @click="showAddDeviceModal = true; showingNewDevice = true" class="mobile-card-action glass-button rounded-lg text-sm font-medium">
|
||||||
Add Device
|
Add Device
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Network Interfaces (second column on desktop) -->
|
<!-- Network Interfaces (second column on desktop) -->
|
||||||
<div data-controller-container tabindex="0" class="glass-card p-6 flex flex-col transition-all hover:-translate-y-1">
|
<div data-controller-container tabindex="0" class="glass-card p-6 flex flex-col transition-all hover:-translate-y-1">
|
||||||
@@ -273,14 +277,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<div v-if="wifiAvailable" class="responsive-card-actions-bottom mt-auto pt-4">
|
||||||
<button
|
<button
|
||||||
v-if="wifiAvailable"
|
|
||||||
@click="showWifiModal = true"
|
@click="showWifiModal = true"
|
||||||
class="responsive-card-actions-bottom mt-4 mobile-card-action glass-button rounded-lg text-sm font-medium text-white/90 hover:text-white transition-colors"
|
class="mobile-card-action glass-button rounded-lg text-sm font-medium text-white/90 hover:text-white transition-colors"
|
||||||
>
|
>
|
||||||
Scan WiFi
|
Scan WiFi
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div><!-- close VPN+Network 2-col grid -->
|
</div><!-- close VPN+Network 2-col grid -->
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="pb-16 md:pb-4">
|
<div class="pb-16 md:pb-4">
|
||||||
<!-- Back Button -->
|
<BackButton :label="backLabel" desktop-margin="mb-6" @click="goBack" />
|
||||||
<button @click="router.replace('/dashboard/apps/lnd')" class="mb-6 flex items-center gap-2 text-white/70 hover:text-white transition-colors">
|
|
||||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
|
|
||||||
</svg>
|
|
||||||
Back to LND
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<h1 class="text-2xl font-bold text-white mb-6">Lightning Channels</h1>
|
<h1 class="text-2xl font-bold text-white mb-6">Lightning Channels</h1>
|
||||||
|
|
||||||
@@ -15,8 +9,25 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useRouter } from 'vue-router'
|
import { computed } from 'vue'
|
||||||
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
|
import BackButton from '@/components/BackButton.vue'
|
||||||
import LightningChannelsPanel from '@/components/LightningChannelsPanel.vue'
|
import LightningChannelsPanel from '@/components/LightningChannelsPanel.vue'
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
// When a setup wizard sent us here (?from=goal&goal=<id>), back returns to it.
|
||||||
|
const fromGoalId = computed(() =>
|
||||||
|
route.query.from === 'goal' && typeof route.query.goal === 'string' ? route.query.goal : null,
|
||||||
|
)
|
||||||
|
const backLabel = computed(() => (fromGoalId.value ? 'Back to Setup' : 'Back to LND'))
|
||||||
|
|
||||||
|
function goBack() {
|
||||||
|
if (fromGoalId.value) {
|
||||||
|
router.push(`/dashboard/goals/${fromGoalId.value}`)
|
||||||
|
} else {
|
||||||
|
router.replace('/dashboard/apps/lnd')
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
@click="openCompanionIntro()"
|
@click="openCompanionIntro()"
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
src="/assets/img/bg-intro-4.webp"
|
src="/assets/img/companion-banner-bg.webp"
|
||||||
alt=""
|
alt=""
|
||||||
class="featured-banner-img"
|
class="featured-banner-img"
|
||||||
@error="(e: Event) => ((e.target as HTMLImageElement).style.display = 'none')"
|
@error="(e: Event) => ((e.target as HTMLImageElement).style.display = 'none')"
|
||||||
|
|||||||
@@ -1,29 +1,37 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
import { describe, expect, it } from 'vitest'
|
||||||
import { GOALS } from '@/data/goals'
|
import { GOALS } from '@/data/goals'
|
||||||
import { goalStepTargetPath } from '../goalStepActions'
|
import { goalStepRouteOverride } from '../goalStepActions'
|
||||||
import type { GoalStep } from '@/types/goals'
|
import type { GoalStep } from '@/types/goals'
|
||||||
|
|
||||||
describe('goalStepActions', () => {
|
describe('goalStepActions', () => {
|
||||||
it('routes app-backed steps to their app details page', () => {
|
it('app-backed configure steps have no route override — they launch the app itself', () => {
|
||||||
expect(goalStepTargetPath(step({ id: 'configure-filebrowser', appId: 'filebrowser' }))).toBe('/dashboard/apps/filebrowser')
|
expect(goalStepRouteOverride(step({ id: 'configure-filebrowser', appId: 'filebrowser' }))).toBeNull()
|
||||||
|
expect(goalStepRouteOverride(step({ id: 'configure-store', appId: 'btcpay-server' }))).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('routes built-in identity and backup steps to their owning screens', () => {
|
it('routes built-in identity and backup steps to their owning screens', () => {
|
||||||
expect(goalStepTargetPath(step({ id: 'setup-nostr' }))).toBe('/dashboard/web5')
|
expect(goalStepRouteOverride(step({ id: 'setup-nostr' }))).toBe('/dashboard/web5')
|
||||||
expect(goalStepTargetPath(step({ id: 'export-identity' }))).toBe('/dashboard/web5/credentials')
|
expect(goalStepRouteOverride(step({ id: 'export-identity' }))).toBe('/dashboard/web5/credentials')
|
||||||
expect(goalStepTargetPath(step({ id: 'create-passphrase' }))).toBe('/dashboard/settings')
|
expect(goalStepRouteOverride(step({ id: 'create-passphrase' }))).toBe('/dashboard/settings')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('routes channel steps to the Lightning channels screen', () => {
|
||||||
|
expect(goalStepRouteOverride(step({ id: 'open-channel' }))).toBe('/dashboard/apps/lnd/channels')
|
||||||
|
expect(goalStepRouteOverride(step({ id: 'open-channels' }))).toBe('/dashboard/apps/lnd/channels')
|
||||||
|
expect(goalStepRouteOverride(step({ id: 'open-zeus-channel' }))).toBe('/dashboard/apps/lnd/channels')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('keeps passive info steps without a target route', () => {
|
it('keeps passive info steps without a target route', () => {
|
||||||
expect(goalStepTargetPath(step({ id: 'sync-setup' }))).toBeNull()
|
expect(goalStepRouteOverride(step({ id: 'sync-setup' }))).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('gives every configure step in the shipped goals a destination', () => {
|
it('gives every shipped configure step a destination — a route override or an app to launch', () => {
|
||||||
const configureSteps = GOALS.flatMap((goal) => goal.steps.filter((candidate) => candidate.action === 'configure'))
|
const configureSteps = GOALS.flatMap((goal) => goal.steps.filter((candidate) => candidate.action === 'configure'))
|
||||||
|
|
||||||
expect(configureSteps.map((candidate) => [candidate.id, goalStepTargetPath(candidate)])).toEqual(
|
for (const candidate of configureSteps) {
|
||||||
configureSteps.map((candidate) => [candidate.id, expect.any(String)]),
|
const destination = goalStepRouteOverride(candidate) ?? candidate.appId ?? null
|
||||||
)
|
expect(destination, `configure step ${candidate.id} has no destination`).not.toBeNull()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,24 @@
|
|||||||
import type { GoalStep } from '@/types/goals'
|
import type { GoalStep } from '@/types/goals'
|
||||||
|
|
||||||
|
// Steps that land on an internal screen rather than launching an app UI.
|
||||||
const STEP_ROUTE_OVERRIDES: Record<string, string> = {
|
const STEP_ROUTE_OVERRIDES: Record<string, string> = {
|
||||||
'setup-nostr': '/dashboard/web5',
|
'setup-nostr': '/dashboard/web5',
|
||||||
'export-identity': '/dashboard/web5/credentials',
|
'export-identity': '/dashboard/web5/credentials',
|
||||||
'create-passphrase': '/dashboard/settings',
|
'create-passphrase': '/dashboard/settings',
|
||||||
'create-backup': '/dashboard/settings',
|
'create-backup': '/dashboard/settings',
|
||||||
'save-backup': '/dashboard/settings',
|
'save-backup': '/dashboard/settings',
|
||||||
|
// Channel steps land directly on the Lightning channels screen (which
|
||||||
|
// carries the "open a channel with Zeus" suggestion).
|
||||||
|
'open-channel': '/dashboard/apps/lnd/channels',
|
||||||
|
'open-channels': '/dashboard/apps/lnd/channels',
|
||||||
|
'open-zeus-channel': '/dashboard/apps/lnd/channels',
|
||||||
}
|
}
|
||||||
|
|
||||||
export function goalStepTargetPath(step: GoalStep): string | null {
|
/**
|
||||||
if (step.appId) return `/dashboard/apps/${step.appId}`
|
* Internal route a step navigates to, or null when the step should launch its
|
||||||
|
* app instead (via the app launcher — iframe apps overlay on top, tab-only
|
||||||
|
* apps open a tab / the mobile in-app browser).
|
||||||
|
*/
|
||||||
|
export function goalStepRouteOverride(step: GoalStep): string | null {
|
||||||
return STEP_ROUTE_OVERRIDES[step.id] ?? null
|
return STEP_ROUTE_OVERRIDES[step.id] ?? null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,8 @@
|
|||||||
</svg>
|
</svg>
|
||||||
Refreshing Tor services...
|
Refreshing Tor services...
|
||||||
</div>
|
</div>
|
||||||
<div v-for="svc in torServices" :key="svc.name" class="bg-black/20 rounded-xl border border-white/10 p-3 flex items-center justify-between gap-3">
|
<div v-for="svc in torServices" :key="svc.name" class="bg-black/20 rounded-xl border border-white/10 p-3">
|
||||||
|
<div class="flex items-center justify-between gap-3">
|
||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<p class="text-white text-sm font-medium">{{ svc.name }}</p>
|
<p class="text-white text-sm font-medium">{{ svc.name }}</p>
|
||||||
@@ -43,7 +44,8 @@
|
|||||||
<p v-else-if="svc.enabled" class="text-white/30 text-xs">Waiting for .onion address...</p>
|
<p v-else-if="svc.enabled" class="text-white/30 text-xs">Waiting for .onion address...</p>
|
||||||
<p v-else class="text-white/30 text-xs">Disabled</p>
|
<p v-else class="text-white/30 text-xs">Disabled</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2 shrink-0">
|
<!-- Desktop: compact inline actions next to the toggle -->
|
||||||
|
<div class="hidden md:flex items-center gap-2 shrink-0">
|
||||||
<button
|
<button
|
||||||
v-if="svc.onion_address && svc.enabled"
|
v-if="svc.onion_address && svc.enabled"
|
||||||
@click="$emit('rotateService', svc.name)"
|
@click="$emit('rotateService', svc.name)"
|
||||||
@@ -65,9 +67,37 @@
|
|||||||
</button>
|
</button>
|
||||||
<ToggleSwitch :model-value="svc.enabled" @update:model-value="$emit('toggleApp', svc.name, $event)" />
|
<ToggleSwitch :model-value="svc.enabled" @update:model-value="$emit('toggleApp', svc.name, $event)" />
|
||||||
</div>
|
</div>
|
||||||
|
<ToggleSwitch class="shrink-0 md:hidden" :model-value="svc.enabled" @update:model-value="$emit('toggleApp', svc.name, $event)" />
|
||||||
|
</div>
|
||||||
|
<!-- Mobile: actions in their own 50/50 row — Delete on the LEFT, far
|
||||||
|
from the toggle above, so a rushed thumb can't hit the wrong control. -->
|
||||||
|
<div
|
||||||
|
v-if="svc.name !== 'archipelago' || (svc.onion_address && svc.enabled)"
|
||||||
|
class="grid md:hidden grid-cols-2 gap-2 mt-3"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
v-if="svc.name !== 'archipelago'"
|
||||||
|
@click="$emit('deleteService', svc.name)"
|
||||||
|
:disabled="torDeleting === svc.name"
|
||||||
|
class="glass-button py-2 rounded-lg text-xs text-red-400 hover:text-red-300 disabled:opacity-50"
|
||||||
|
:class="{ 'col-span-2': !(svc.onion_address && svc.enabled) }"
|
||||||
|
:title="'Delete ' + svc.name + ' hidden service'"
|
||||||
|
>
|
||||||
|
{{ torDeleting === svc.name ? 'Deleting...' : 'Delete' }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
v-if="svc.onion_address && svc.enabled"
|
||||||
|
@click="$emit('rotateService', svc.name)"
|
||||||
|
:disabled="torRotating === svc.name"
|
||||||
|
class="glass-button py-2 rounded-lg text-xs disabled:opacity-50"
|
||||||
|
:class="{ 'col-span-2': svc.name === 'archipelago' }"
|
||||||
|
>
|
||||||
|
{{ torRotating === svc.name ? 'Rotating...' : 'Rotate' }}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="responsive-card-actions-bottom-grid mt-4 grid-cols-2 gap-3">
|
</div>
|
||||||
|
<div class="responsive-card-actions-bottom-grid mt-auto pt-4 grid-cols-2 gap-3">
|
||||||
<button @click="$emit('restartTor')" :disabled="torRestarting" class="mobile-card-action glass-button rounded-lg text-sm font-medium disabled:opacity-50">
|
<button @click="$emit('restartTor')" :disabled="torRestarting" class="mobile-card-action glass-button rounded-lg text-sm font-medium disabled:opacity-50">
|
||||||
{{ torRestarting ? 'Restarting...' : 'Restart Tor' }}
|
{{ torRestarting ? 'Restarting...' : 'Restart Tor' }}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -362,6 +362,24 @@ init()
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="overflow-y-auto flex-1 min-h-0 space-y-6 pr-1">
|
<div class="overflow-y-auto flex-1 min-h-0 space-y-6 pr-1">
|
||||||
|
<!-- v1.7.102-alpha -->
|
||||||
|
<div>
|
||||||
|
<div class="flex items-center gap-2 mb-3">
|
||||||
|
<span class="text-xs font-mono px-2 py-0.5 rounded bg-orange-500/20 text-orange-300">v1.7.102-alpha</span>
|
||||||
|
<span class="text-xs text-white/40">July 17, 2026</span>
|
||||||
|
</div>
|
||||||
|
<div class="space-y-3 text-sm text-white/80 pl-3 border-l border-white/10">
|
||||||
|
<p>The password you choose during setup is now truly your node's password: it also becomes the system login for console and SSH access, instead of leaving the factory default in place. If you ever renamed your node and the TV screen went black on the next boot, that's fixed too — renaming no longer breaks the kiosk display.</p>
|
||||||
|
<p>Setting up Lightning is now a guided journey: a fund-your-wallet step that shows a live countdown while Bitcoin syncs, suggested channels you can open straight into the Zeus mobile wallet with one tap, and a "finish setup" prompt that walks you to the end — goals now complete when you've actually done the steps, not just when apps happen to be running.</p>
|
||||||
|
<p>Pair your phone by pointing it at the screen: the companion app now connects by scanning a QR code — scan, and it fills in your node's address and logs you in. The App Store has a banner to grab the Android app, and the pairing flow can now also set up secure remote access so your phone reaches home from anywhere.</p>
|
||||||
|
<p>First installs are far more dependable: app downloads that stall now retry instead of hanging forever (the old "first install fails, the second works" pattern), big multi-part apps show their real download progress instead of sitting at "Preparing", Lightning no longer fails its first install over temporary hiccups, and a brand-new node now comes up with its core apps — file cloud and ecash wallet — even with no internet connection.</p>
|
||||||
|
<p>The installer image is about 160MB smaller and gets to a working screen faster, because the apps bundled for offline setup are now compressed.</p>
|
||||||
|
<p>The first-run experience keeps its magic: the typing intro is back on fresh installs and can no longer be cut short by a mid-play refresh — updates now politely wait for the cinematic to finish — and dark backgrounds stay dark instead of flashing black or white.</p>
|
||||||
|
<p>Your backups now include your secrets — including the key that protects your Lightning wallet's recovery seed — and there's a Download button to take a copy off the node; the seed-backup reminder now actually opens the backup flow when you tap it.</p>
|
||||||
|
<p>Networking Profits grew into a full dashboard, network cards keep their action buttons in reach on every screen size, "Connect to Mesh" goes to the right page instead of a dead end, and the identity pages got a round of mobile polish.</p>
|
||||||
|
<p>Behind the scenes: apps that report their own health are no longer second-guessed by a port probe (fewer false "restarting" states), and pressing arrow keys or a gamepad is once again the only thing that shows the controller focus ring.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<!-- v1.7.101-alpha -->
|
<!-- v1.7.101-alpha -->
|
||||||
<div>
|
<div>
|
||||||
<div class="flex items-center gap-2 mb-3">
|
<div class="flex items-center gap-2 mb-3">
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref } from 'vue'
|
import { computed, onMounted, onUnmounted, ref } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { rpcClient } from '@/api/rpc-client'
|
import { rpcClient } from '@/api/rpc-client'
|
||||||
import ToggleSwitch from '@/components/ToggleSwitch.vue'
|
import ToggleSwitch from '@/components/ToggleSwitch.vue'
|
||||||
import BackButton from '@/components/BackButton.vue'
|
import BackButton from '@/components/BackButton.vue'
|
||||||
|
import LineChart from '@/components/LineChart.vue'
|
||||||
|
import type { ChartDataset } from '@/components/LineChart.vue'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
@@ -23,6 +25,10 @@ interface ServicePricing {
|
|||||||
accepted_mints: string[]
|
accepted_mints: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Tabs ──
|
||||||
|
const tab = ref<'dashboard' | 'configure'>('dashboard')
|
||||||
|
|
||||||
|
// ── Configure state ──
|
||||||
const services = ref<ServicePricing[]>([])
|
const services = ref<ServicePricing[]>([])
|
||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const loadError = ref('')
|
const loadError = ref('')
|
||||||
@@ -32,7 +38,7 @@ const statusIsError = ref(false)
|
|||||||
|
|
||||||
// "Free everything" is the default — every service ships disabled. The banner
|
// "Free everything" is the default — every service ships disabled. The banner
|
||||||
// reassures the user nothing is being charged for until they opt in.
|
// reassures the user nothing is being charged for until they opt in.
|
||||||
const allFree = computed(() => services.value.every((s) => !s.enabled))
|
const allFree = computed(() => services.value.every((s) => !s.enabled) && !tollgate.value?.enabled)
|
||||||
|
|
||||||
function showStatus(msg: string, isError: boolean) {
|
function showStatus(msg: string, isError: boolean) {
|
||||||
statusMsg.value = msg
|
statusMsg.value = msg
|
||||||
@@ -113,16 +119,308 @@ async function saveService(svc: ServicePricing) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(load)
|
// ── TollGate (paid WiFi on the OpenWrt gateway) ──
|
||||||
|
interface TollGateStatus {
|
||||||
|
installed: boolean
|
||||||
|
enabled?: boolean
|
||||||
|
step_size_ms?: number
|
||||||
|
price_per_step?: number
|
||||||
|
min_steps?: number
|
||||||
|
mint_url?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const tollgate = ref<TollGateStatus | null>(null)
|
||||||
|
const tollgateChecked = ref(false)
|
||||||
|
const tollgateSaving = ref(false)
|
||||||
|
const tollgatePrice = ref(10)
|
||||||
|
const tollgateEnabled = ref(false)
|
||||||
|
|
||||||
|
const tollgateUnit = computed(() => {
|
||||||
|
const ms = tollgate.value?.step_size_ms || 60_000
|
||||||
|
if (ms === 3_600_000) return 'hour'
|
||||||
|
if (ms === 60_000) return 'minute'
|
||||||
|
if (ms === 1000) return 'second'
|
||||||
|
return `${ms.toLocaleString()} ms`
|
||||||
|
})
|
||||||
|
|
||||||
|
async function loadTollgate() {
|
||||||
|
try {
|
||||||
|
const res = await rpcClient.call<{ tollgate?: TollGateStatus }>({ method: 'openwrt.get-status' })
|
||||||
|
tollgate.value = res.tollgate || null
|
||||||
|
tollgateEnabled.value = !!res.tollgate?.enabled
|
||||||
|
tollgatePrice.value = Math.max(1, res.tollgate?.price_per_step || 10)
|
||||||
|
} catch {
|
||||||
|
// No gateway configured (or unreachable) — the card shows the setup hint.
|
||||||
|
tollgate.value = null
|
||||||
|
} finally {
|
||||||
|
tollgateChecked.value = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveTollgate() {
|
||||||
|
if (tollgatePrice.value < 1) tollgatePrice.value = 1
|
||||||
|
tollgateSaving.value = true
|
||||||
|
try {
|
||||||
|
await rpcClient.call({
|
||||||
|
method: 'openwrt.provision-tollgate',
|
||||||
|
params: {
|
||||||
|
enabled: tollgateEnabled.value,
|
||||||
|
// Real backend reads price_sats; the mock reads price_per_step —
|
||||||
|
// send both so the same call works against either.
|
||||||
|
price_sats: tollgatePrice.value,
|
||||||
|
price_per_step: tollgatePrice.value,
|
||||||
|
step_size_ms: tollgate.value?.step_size_ms || 60_000,
|
||||||
|
min_steps: tollgate.value?.min_steps || 1,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
showStatus(
|
||||||
|
tollgateEnabled.value
|
||||||
|
? `TollGate WiFi is charging ${tollgatePrice.value} sats per ${tollgateUnit.value}.`
|
||||||
|
: 'TollGate WiFi is now free.',
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
void loadTollgate()
|
||||||
|
} catch (e) {
|
||||||
|
showStatus(e instanceof Error ? e.message : 'Failed to save TollGate settings', true)
|
||||||
|
} finally {
|
||||||
|
tollgateSaving.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Dashboard state ──
|
||||||
|
type ProfitSource = 'content_sale' | 'routing_fee' | 'streaming_revenue'
|
||||||
|
|
||||||
|
interface ProfitEntry {
|
||||||
|
source: ProfitSource
|
||||||
|
amount_sats: number
|
||||||
|
timestamp: string
|
||||||
|
description?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ProfitsSummary {
|
||||||
|
total_sats: number
|
||||||
|
content_sales_sats: number
|
||||||
|
routing_fees_sats: number
|
||||||
|
streaming_revenue_sats?: number
|
||||||
|
recent?: ProfitEntry[]
|
||||||
|
}
|
||||||
|
|
||||||
|
interface SessionsSummary {
|
||||||
|
total_active: number
|
||||||
|
total_revenue_sats: number
|
||||||
|
revenue_by_service: Record<string, number>
|
||||||
|
}
|
||||||
|
|
||||||
|
const profits = ref<ProfitsSummary | null>(null)
|
||||||
|
const sessionsSummary = ref<SessionsSummary | null>(null)
|
||||||
|
const dashboardLoading = ref(true)
|
||||||
|
|
||||||
|
async function loadDashboard() {
|
||||||
|
dashboardLoading.value = true
|
||||||
|
try {
|
||||||
|
const [p, s] = await Promise.all([
|
||||||
|
rpcClient.call<ProfitsSummary>({ method: 'wallet.networking-profits' }).catch(() => null),
|
||||||
|
rpcClient.call<SessionsSummary>({ method: 'streaming.list-sessions' }).catch(() => null),
|
||||||
|
])
|
||||||
|
profits.value = p
|
||||||
|
sessionsSummary.value = s
|
||||||
|
} finally {
|
||||||
|
dashboardLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatSats(n: number | undefined | null): string {
|
||||||
|
return (n ?? 0).toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7 daily buckets, oldest → newest, one series per earning source. A week of
|
||||||
|
// daily totals is the sweet spot here: earnings are sparse events (unlike the
|
||||||
|
// second-by-second system metrics on Monitoring), so finer buckets would just
|
||||||
|
// draw noise, and a longer window would flatten a new node's first sats.
|
||||||
|
const DAY_MS = 86_400_000
|
||||||
|
const WINDOW_DAYS = 7
|
||||||
|
|
||||||
|
const dayLabels = computed(() => {
|
||||||
|
const names = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
|
||||||
|
const labels: string[] = []
|
||||||
|
for (let i = WINDOW_DAYS - 1; i >= 0; i--) {
|
||||||
|
labels.push(names[new Date(Date.now() - i * DAY_MS).getDay()] as string)
|
||||||
|
}
|
||||||
|
return labels
|
||||||
|
})
|
||||||
|
|
||||||
|
function bucketize(source: ProfitSource): number[] {
|
||||||
|
const buckets = new Array(WINDOW_DAYS).fill(0)
|
||||||
|
const now = Date.now()
|
||||||
|
for (const e of profits.value?.recent || []) {
|
||||||
|
if (e.source !== source) continue
|
||||||
|
const t = Date.parse(e.timestamp)
|
||||||
|
if (Number.isNaN(t)) continue
|
||||||
|
const age = Math.floor((now - t) / DAY_MS)
|
||||||
|
if (age < 0 || age >= WINDOW_DAYS) continue
|
||||||
|
buckets[WINDOW_DAYS - 1 - age] += e.amount_sats
|
||||||
|
}
|
||||||
|
return buckets
|
||||||
|
}
|
||||||
|
|
||||||
|
const earningsDatasets = computed<ChartDataset[]>(() => [
|
||||||
|
{ label: 'Streaming', data: bucketize('streaming_revenue'), color: '#f97316' },
|
||||||
|
{ label: 'Content sales', data: bucketize('content_sale'), color: '#3b82f6' },
|
||||||
|
{ label: 'Routing fees', data: bucketize('routing_fee'), color: '#a78bfa' },
|
||||||
|
])
|
||||||
|
|
||||||
|
const hasRecentEarnings = computed(() =>
|
||||||
|
earningsDatasets.value.some((d) => d.data.some((v) => v > 0)),
|
||||||
|
)
|
||||||
|
|
||||||
|
// Revenue-by-service bars, largest first, scaled to the biggest earner.
|
||||||
|
const serviceBars = computed(() => {
|
||||||
|
const by = sessionsSummary.value?.revenue_by_service || {}
|
||||||
|
const entries = Object.entries(by).sort((a, b) => b[1] - a[1])
|
||||||
|
const max = entries[0]?.[1] || 1
|
||||||
|
return entries.map(([id, sats]) => ({
|
||||||
|
id,
|
||||||
|
name: services.value.find((s) => s.service_id === id)?.name || id,
|
||||||
|
sats,
|
||||||
|
pct: Math.max(4, Math.round((sats / max) * 100)),
|
||||||
|
}))
|
||||||
|
})
|
||||||
|
|
||||||
|
// ── Chart sizing (same measure-the-card approach as Monitoring) ──
|
||||||
|
const chartCard = ref<HTMLElement | null>(null)
|
||||||
|
const chartWidth = ref(600)
|
||||||
|
|
||||||
|
function updateChartWidth() {
|
||||||
|
chartWidth.value = Math.max(280, (chartCard.value?.clientWidth || 640) - 40)
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
void load()
|
||||||
|
void loadTollgate()
|
||||||
|
void loadDashboard()
|
||||||
|
updateChartWidth()
|
||||||
|
window.addEventListener('resize', updateChartWidth)
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
window.removeEventListener('resize', updateChartWidth)
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="pb-6">
|
<div class="pb-6">
|
||||||
<BackButton label="Back to Web5" @click="router.push('/dashboard/web5')" />
|
<BackButton label="Back to Web5" @click="router.push('/dashboard/web5')" />
|
||||||
|
|
||||||
<div class="mb-6">
|
<div class="mb-4">
|
||||||
<h1 class="text-3xl font-bold text-white mb-2">Networking Profits — Settings</h1>
|
<h1 class="text-3xl font-bold text-white">Networking Profits</h1>
|
||||||
<p class="text-white/70">
|
</div>
|
||||||
|
|
||||||
|
<!-- Tabs: Dashboard | Configure -->
|
||||||
|
<div class="flex gap-1 mb-6 border-b border-white/10">
|
||||||
|
<button
|
||||||
|
@click="tab = 'dashboard'"
|
||||||
|
class="px-4 py-2 text-sm font-medium rounded-t-lg transition-colors"
|
||||||
|
:class="tab === 'dashboard' ? 'bg-white/10 text-white' : 'text-white/60 hover:text-white/80 hover:bg-white/5'"
|
||||||
|
>
|
||||||
|
Dashboard
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
@click="tab = 'configure'"
|
||||||
|
class="px-4 py-2 text-sm font-medium rounded-t-lg transition-colors"
|
||||||
|
:class="tab === 'configure' ? 'bg-white/10 text-white' : 'text-white/60 hover:text-white/80 hover:bg-white/5'"
|
||||||
|
>
|
||||||
|
Configure
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ============ DASHBOARD ============ -->
|
||||||
|
<div v-show="tab === 'dashboard'">
|
||||||
|
<div v-if="dashboardLoading" class="glass-card p-6 text-white/60 text-sm">Loading earnings…</div>
|
||||||
|
<template v-else>
|
||||||
|
<!-- Stat tiles -->
|
||||||
|
<div class="grid grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
|
||||||
|
<div class="glass-card p-5">
|
||||||
|
<p class="text-xs text-white/50 uppercase tracking-wide">Total earned</p>
|
||||||
|
<p class="text-2xl font-bold text-white">{{ formatSats(profits?.total_sats) }}</p>
|
||||||
|
<p class="text-xs text-white/40">sats, all time</p>
|
||||||
|
</div>
|
||||||
|
<div class="glass-card p-5">
|
||||||
|
<p class="text-xs text-white/50 uppercase tracking-wide">Streaming</p>
|
||||||
|
<p class="text-2xl font-bold text-orange-400">{{ formatSats(profits?.streaming_revenue_sats) }}</p>
|
||||||
|
<p class="text-xs text-white/40">sats from paid services</p>
|
||||||
|
</div>
|
||||||
|
<div class="glass-card p-5">
|
||||||
|
<p class="text-xs text-white/50 uppercase tracking-wide">Content sales</p>
|
||||||
|
<p class="text-2xl font-bold text-blue-400">{{ formatSats(profits?.content_sales_sats) }}</p>
|
||||||
|
<p class="text-xs text-white/40">sats from ecash sales</p>
|
||||||
|
</div>
|
||||||
|
<div class="glass-card p-5">
|
||||||
|
<p class="text-xs text-white/50 uppercase tracking-wide">Routing fees</p>
|
||||||
|
<p class="text-2xl font-bold text-violet-400">{{ formatSats(profits?.routing_fees_sats) }}</p>
|
||||||
|
<p class="text-xs text-white/40">sats from Lightning</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Earnings chart -->
|
||||||
|
<div ref="chartCard" class="glass-card p-5 mb-6">
|
||||||
|
<div class="flex items-center justify-between mb-3 flex-wrap gap-2">
|
||||||
|
<h3 class="text-sm font-medium text-white/80">Earnings — last 7 days</h3>
|
||||||
|
<div class="flex items-center gap-4">
|
||||||
|
<span v-for="d in earningsDatasets" :key="d.label" class="flex items-center gap-1.5 text-xs text-white/60">
|
||||||
|
<span class="w-2.5 h-2.5 rounded-full" :style="{ backgroundColor: d.color }"></span>
|
||||||
|
{{ d.label }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<LineChart
|
||||||
|
v-if="hasRecentEarnings"
|
||||||
|
:datasets="earningsDatasets"
|
||||||
|
:labels="dayLabels"
|
||||||
|
:width="chartWidth"
|
||||||
|
:height="200"
|
||||||
|
/>
|
||||||
|
<div v-else class="py-10 text-center text-white/40 text-sm">
|
||||||
|
No earnings in the last 7 days — enable a paid service under Configure to start earning.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Sessions + revenue by service -->
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||||
|
<div class="glass-card p-5">
|
||||||
|
<p class="text-xs text-white/50 uppercase tracking-wide mb-1">Active sessions</p>
|
||||||
|
<p class="text-4xl font-bold text-white mb-1">{{ sessionsSummary?.total_active ?? 0 }}</p>
|
||||||
|
<p class="text-xs text-white/40">peers currently paying for services</p>
|
||||||
|
<p class="text-sm text-white/70 mt-4">
|
||||||
|
Session revenue:
|
||||||
|
<span class="text-white font-medium">{{ formatSats(sessionsSummary?.total_revenue_sats) }} sats</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="glass-card p-5 lg:col-span-2">
|
||||||
|
<h3 class="text-sm font-medium text-white/80 mb-4">Revenue by service</h3>
|
||||||
|
<div v-if="serviceBars.length === 0" class="py-6 text-center text-white/40 text-sm">
|
||||||
|
No service revenue yet.
|
||||||
|
</div>
|
||||||
|
<div v-else class="space-y-3">
|
||||||
|
<div v-for="bar in serviceBars" :key="bar.id">
|
||||||
|
<div class="flex items-center justify-between text-xs mb-1">
|
||||||
|
<span class="text-white/80">{{ bar.name }}</span>
|
||||||
|
<span class="text-white/50">{{ formatSats(bar.sats) }} sats</span>
|
||||||
|
</div>
|
||||||
|
<div class="h-2 rounded-full bg-white/5 overflow-hidden">
|
||||||
|
<div class="h-full rounded-full bg-orange-500/70" :style="{ width: bar.pct + '%' }"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ============ CONFIGURE ============ -->
|
||||||
|
<div v-show="tab === 'configure'">
|
||||||
|
<!-- Intro copy, boxed so it reads as its own thing rather than page dressing -->
|
||||||
|
<div class="glass-card p-4 mb-6">
|
||||||
|
<p class="text-sm text-white/70 leading-relaxed">
|
||||||
Control what your node charges other peers for. By default everything is shared for
|
Control what your node charges other peers for. By default everything is shared for
|
||||||
free — turn a service on to start earning sats (ecash) for it. Payments are collected
|
free — turn a service on to start earning sats (ecash) for it. Payments are collected
|
||||||
as Cashu tokens through your node's wallet.
|
as Cashu tokens through your node's wallet.
|
||||||
@@ -195,6 +493,60 @@ onMounted(load)
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- TollGate: paid WiFi on the OpenWrt gateway -->
|
||||||
|
<div v-if="tollgateChecked" class="glass-card p-6">
|
||||||
|
<div class="flex items-start justify-between gap-4 mb-3">
|
||||||
|
<div class="min-w-0">
|
||||||
|
<h2 class="text-lg font-semibold text-white">TollGate WiFi</h2>
|
||||||
|
<p class="text-sm text-white/60 mt-0.5">
|
||||||
|
Sell WiFi access on your OpenWrt gateway — visitors pay per {{ tollgateUnit }} in ecash.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div v-if="tollgate?.installed" class="flex items-center gap-2 shrink-0">
|
||||||
|
<span class="text-xs" :class="tollgateEnabled ? 'text-orange-400' : 'text-white/40'">
|
||||||
|
{{ tollgateEnabled ? 'Paid' : 'Free' }}
|
||||||
|
</span>
|
||||||
|
<ToggleSwitch :model-value="tollgateEnabled" @update:model-value="(v) => (tollgateEnabled = v)" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="tollgate?.installed" class="flex flex-col sm:flex-row sm:items-end gap-3">
|
||||||
|
<div class="flex-1" :class="{ 'opacity-40 pointer-events-none': !tollgateEnabled }">
|
||||||
|
<label class="text-xs text-white/50 block mb-1">Price</label>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<input
|
||||||
|
v-model.number="tollgatePrice"
|
||||||
|
type="number"
|
||||||
|
min="1"
|
||||||
|
step="1"
|
||||||
|
:disabled="!tollgateEnabled"
|
||||||
|
class="w-28 bg-black/30 border border-white/10 rounded-lg px-3 py-2 text-sm text-white focus:outline-none focus:border-orange-500/50"
|
||||||
|
/>
|
||||||
|
<span class="text-sm text-white/70">sats per {{ tollgateUnit }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
@click="saveTollgate"
|
||||||
|
:disabled="tollgateSaving"
|
||||||
|
class="glass-button glass-button-warning px-4 py-2 rounded-lg text-sm disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{{ tollgateSaving ? 'Saving…' : 'Save' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div v-else class="flex flex-col sm:flex-row sm:items-center gap-3">
|
||||||
|
<p class="text-sm text-white/50 flex-1">
|
||||||
|
TollGate isn't set up yet — it needs an OpenWrt gateway paired with this node.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
@click="router.push('/dashboard/server/openwrt')"
|
||||||
|
class="glass-button px-4 py-2 rounded-lg text-sm shrink-0"
|
||||||
|
>
|
||||||
|
Set up gateway
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
+23
-24
@@ -1,36 +1,35 @@
|
|||||||
{
|
{
|
||||||
"changelog": [
|
"changelog": [
|
||||||
"The wallet speaks Ark: a new Ark tab shows your Ark balance and history, you can send and receive over the Ark protocol, pay Lightning invoices from your Ark balance, and Ark payments appear in the transactions view with their own filter chip.",
|
"The password you choose during setup is now truly your node's password: it also becomes the system login for console and SSH access, instead of leaving the factory default in place. If you ever renamed your node and the TV screen went black on the next boot, that's fixed too — renaming no longer breaks the kiosk display.",
|
||||||
"Every app you install now automatically gets its own private .onion address — your apps are reachable over Tor a few seconds after install, with no manual \"Add Service\" step.",
|
"Setting up Lightning is now a guided journey: a fund-your-wallet step that shows a live countdown while Bitcoin syncs, suggested channels you can open straight into the Zeus mobile wallet with one tap, and a \"finish setup\" prompt that walks you to the end — goals now complete when you've actually done the steps, not just when apps happen to be running.",
|
||||||
"\"Add Service\" in the Tor panel now works for every app, not just a fixed list — the node reads the app's actual web port, so apps like Gitea, Jellyfin, Nextcloud, and Uptime Kuma no longer fail with \"see server logs\".",
|
"Pair your phone by pointing it at the screen: the companion app now connects by scanning a QR code — scan, and it fills in your node's address and logs you in. The App Store has a banner to grab the Android app, and the pairing flow can now also set up secure remote access so your phone reaches home from anywhere.",
|
||||||
"Renaming your node now genuinely renames it everywhere: the machine's hostname, its .local network name (re-announced immediately), the local hosts file, and the HTTPS certificate all follow — so http and https links using your node's name keep working right after a rename.",
|
"First installs are far more dependable: app downloads that stall now retry instead of hanging forever (the old \"first install fails, the second works\" pattern), big multi-part apps show their real download progress instead of sitting at \"Preparing\", Lightning no longer fails its first install over temporary hiccups, and a brand-new node now comes up with its core apps — file cloud and ecash wallet — even with no internet connection.",
|
||||||
"The node no longer mistakes a VPN tunnel for its own address. On fresh installs with NetBird, apps could launch on an internal 10.x address instead of your LAN IP; the node now reads its address from the actual network route, fixing app launch links, generated app configs, and VPN setup.",
|
"The installer image is about 160MB smaller and gets to a working screen faster, because the apps bundled for offline setup are now compressed.",
|
||||||
"Your cloud got a real layout: Apps-style tabs with categories for Folders, My Files, and Peer Files, readable file rows, a search that also finds files shared by your federated peer nodes — and music now opens in the bottom-bar player instead of a broken preview window.",
|
"The first-run experience keeps its magic: the typing intro is back on fresh installs and can no longer be cut short by a mid-play refresh — updates now politely wait for the cinematic to finish — and dark backgrounds stay dark instead of flashing black or white.",
|
||||||
"The first-login experience flows again: the dashboard entrance animation is back — and you can actually hear it now (its sound was silently swallowed before, including on replays) — \"Replay Intro\" in Settings actually replays it, opening a direct link to an inner page no longer detours through the splash screen, the login screen keeps the intro video until your first login (switching to rotating backgrounds after), and the intro video streams three times lighter so it starts instantly.",
|
"Your backups now include your secrets — including the key that protects your Lightning wallet's recovery seed — and there's a Download button to take a copy off the node; the seed-backup reminder now actually opens the backup flow when you tap it.",
|
||||||
"Changing DNS settings no longer blanks the page, and the DNS and WiFi dialogs now cover the whole app instead of only the right panel.",
|
"Networking Profits grew into a full dashboard, network cards keep their action buttons in reach on every screen size, \"Connect to Mesh\" goes to the right page instead of a dead end, and the identity pages got a round of mobile polish.",
|
||||||
"The public demo is richer and truer: the intro plays on every fresh visit, Ark wallet flows, working DNS and Tor service management, and a library of peer content with previews that never break.",
|
"Behind the scenes: apps that report their own health are no longer second-guessed by a port probe (fewer false \"restarting\" states), and pressing arrow keys or a gamepad is once again the only thing that shows the controller focus ring."
|
||||||
"Assorted fixes: failed installs clean up after themselves properly, and the transactions view fits mobile screens (capped at 60% of the visible viewport)."
|
|
||||||
],
|
],
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
"current_version": "1.7.101-alpha",
|
"current_version": "1.7.102-alpha",
|
||||||
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.101-alpha/archipelago",
|
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.102-alpha/archipelago",
|
||||||
"name": "archipelago",
|
"name": "archipelago",
|
||||||
"new_version": "1.7.101-alpha",
|
"new_version": "1.7.102-alpha",
|
||||||
"sha256": "4e9d66f583a6b6119e381782bbc378bfc26e20dc710bfda7b57b6569b4efbb48",
|
"sha256": "13218bfac5f3e1b641edebac0fcccb483fb4500d764369da4947a467762f2e5a",
|
||||||
"size_bytes": 50100808
|
"size_bytes": 49951520
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"current_version": "1.7.101-alpha",
|
"current_version": "1.7.102-alpha",
|
||||||
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.101-alpha/archipelago-frontend-1.7.101-alpha.tar.gz",
|
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.102-alpha/archipelago-frontend-1.7.102-alpha.tar.gz",
|
||||||
"name": "archipelago-frontend-1.7.101-alpha.tar.gz",
|
"name": "archipelago-frontend-1.7.102-alpha.tar.gz",
|
||||||
"new_version": "1.7.101-alpha",
|
"new_version": "1.7.102-alpha",
|
||||||
"sha256": "67c19515f39d193089d3c73994b6d30571f12f840f1051bc2bdd61ff57b327d4",
|
"sha256": "663cf9a35d98fa6dad2d7fb2906e4a939a906382f2e9729156c3630e282cdc94",
|
||||||
"size_bytes": 164830686
|
"size_bytes": 174594796
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"release_date": "2026-07-15",
|
"release_date": "2026-07-17",
|
||||||
"signature": "9b70df9dcac2d83989dab6092a1fad3587a641d6db0484a515462009431cff68c3b1ea625280a4cd3dc8d9f145bab1602a3404e7efd71ad7ff2d7e91089f3701",
|
"signature": "999e50b9aff22f544677986ca8c686614d8c3d4cbe501c2d5de86d2a1ea56fc731bb9434d722c41c7a124932f98e629706b41a64f57551e69529be59fe671d04",
|
||||||
"signed_by": "did:key:z6MkkidEnEpo6qHMCNSZoNKWtvQvxq3whnaME9wGgEFhq7ur",
|
"signed_by": "did:key:z6MkkidEnEpo6qHMCNSZoNKWtvQvxq3whnaME9wGgEFhq7ur",
|
||||||
"version": "1.7.101-alpha"
|
"version": "1.7.102-alpha"
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-24
@@ -1,36 +1,35 @@
|
|||||||
{
|
{
|
||||||
"changelog": [
|
"changelog": [
|
||||||
"The wallet speaks Ark: a new Ark tab shows your Ark balance and history, you can send and receive over the Ark protocol, pay Lightning invoices from your Ark balance, and Ark payments appear in the transactions view with their own filter chip.",
|
"The password you choose during setup is now truly your node's password: it also becomes the system login for console and SSH access, instead of leaving the factory default in place. If you ever renamed your node and the TV screen went black on the next boot, that's fixed too — renaming no longer breaks the kiosk display.",
|
||||||
"Every app you install now automatically gets its own private .onion address — your apps are reachable over Tor a few seconds after install, with no manual \"Add Service\" step.",
|
"Setting up Lightning is now a guided journey: a fund-your-wallet step that shows a live countdown while Bitcoin syncs, suggested channels you can open straight into the Zeus mobile wallet with one tap, and a \"finish setup\" prompt that walks you to the end — goals now complete when you've actually done the steps, not just when apps happen to be running.",
|
||||||
"\"Add Service\" in the Tor panel now works for every app, not just a fixed list — the node reads the app's actual web port, so apps like Gitea, Jellyfin, Nextcloud, and Uptime Kuma no longer fail with \"see server logs\".",
|
"Pair your phone by pointing it at the screen: the companion app now connects by scanning a QR code — scan, and it fills in your node's address and logs you in. The App Store has a banner to grab the Android app, and the pairing flow can now also set up secure remote access so your phone reaches home from anywhere.",
|
||||||
"Renaming your node now genuinely renames it everywhere: the machine's hostname, its .local network name (re-announced immediately), the local hosts file, and the HTTPS certificate all follow — so http and https links using your node's name keep working right after a rename.",
|
"First installs are far more dependable: app downloads that stall now retry instead of hanging forever (the old \"first install fails, the second works\" pattern), big multi-part apps show their real download progress instead of sitting at \"Preparing\", Lightning no longer fails its first install over temporary hiccups, and a brand-new node now comes up with its core apps — file cloud and ecash wallet — even with no internet connection.",
|
||||||
"The node no longer mistakes a VPN tunnel for its own address. On fresh installs with NetBird, apps could launch on an internal 10.x address instead of your LAN IP; the node now reads its address from the actual network route, fixing app launch links, generated app configs, and VPN setup.",
|
"The installer image is about 160MB smaller and gets to a working screen faster, because the apps bundled for offline setup are now compressed.",
|
||||||
"Your cloud got a real layout: Apps-style tabs with categories for Folders, My Files, and Peer Files, readable file rows, a search that also finds files shared by your federated peer nodes — and music now opens in the bottom-bar player instead of a broken preview window.",
|
"The first-run experience keeps its magic: the typing intro is back on fresh installs and can no longer be cut short by a mid-play refresh — updates now politely wait for the cinematic to finish — and dark backgrounds stay dark instead of flashing black or white.",
|
||||||
"The first-login experience flows again: the dashboard entrance animation is back — and you can actually hear it now (its sound was silently swallowed before, including on replays) — \"Replay Intro\" in Settings actually replays it, opening a direct link to an inner page no longer detours through the splash screen, the login screen keeps the intro video until your first login (switching to rotating backgrounds after), and the intro video streams three times lighter so it starts instantly.",
|
"Your backups now include your secrets — including the key that protects your Lightning wallet's recovery seed — and there's a Download button to take a copy off the node; the seed-backup reminder now actually opens the backup flow when you tap it.",
|
||||||
"Changing DNS settings no longer blanks the page, and the DNS and WiFi dialogs now cover the whole app instead of only the right panel.",
|
"Networking Profits grew into a full dashboard, network cards keep their action buttons in reach on every screen size, \"Connect to Mesh\" goes to the right page instead of a dead end, and the identity pages got a round of mobile polish.",
|
||||||
"The public demo is richer and truer: the intro plays on every fresh visit, Ark wallet flows, working DNS and Tor service management, and a library of peer content with previews that never break.",
|
"Behind the scenes: apps that report their own health are no longer second-guessed by a port probe (fewer false \"restarting\" states), and pressing arrow keys or a gamepad is once again the only thing that shows the controller focus ring."
|
||||||
"Assorted fixes: failed installs clean up after themselves properly, and the transactions view fits mobile screens (capped at 60% of the visible viewport)."
|
|
||||||
],
|
],
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
"current_version": "1.7.101-alpha",
|
"current_version": "1.7.102-alpha",
|
||||||
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.101-alpha/archipelago",
|
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.102-alpha/archipelago",
|
||||||
"name": "archipelago",
|
"name": "archipelago",
|
||||||
"new_version": "1.7.101-alpha",
|
"new_version": "1.7.102-alpha",
|
||||||
"sha256": "4e9d66f583a6b6119e381782bbc378bfc26e20dc710bfda7b57b6569b4efbb48",
|
"sha256": "13218bfac5f3e1b641edebac0fcccb483fb4500d764369da4947a467762f2e5a",
|
||||||
"size_bytes": 50100808
|
"size_bytes": 49951520
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"current_version": "1.7.101-alpha",
|
"current_version": "1.7.102-alpha",
|
||||||
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.101-alpha/archipelago-frontend-1.7.101-alpha.tar.gz",
|
"download_url": "http://146.59.87.168:3000/lfg2025/archy/releases/download/v1.7.102-alpha/archipelago-frontend-1.7.102-alpha.tar.gz",
|
||||||
"name": "archipelago-frontend-1.7.101-alpha.tar.gz",
|
"name": "archipelago-frontend-1.7.102-alpha.tar.gz",
|
||||||
"new_version": "1.7.101-alpha",
|
"new_version": "1.7.102-alpha",
|
||||||
"sha256": "67c19515f39d193089d3c73994b6d30571f12f840f1051bc2bdd61ff57b327d4",
|
"sha256": "663cf9a35d98fa6dad2d7fb2906e4a939a906382f2e9729156c3630e282cdc94",
|
||||||
"size_bytes": 164830686
|
"size_bytes": 174594796
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"release_date": "2026-07-15",
|
"release_date": "2026-07-17",
|
||||||
"signature": "9b70df9dcac2d83989dab6092a1fad3587a641d6db0484a515462009431cff68c3b1ea625280a4cd3dc8d9f145bab1602a3404e7efd71ad7ff2d7e91089f3701",
|
"signature": "999e50b9aff22f544677986ca8c686614d8c3d4cbe501c2d5de86d2a1ea56fc731bb9434d722c41c7a124932f98e629706b41a64f57551e69529be59fe671d04",
|
||||||
"signed_by": "did:key:z6MkkidEnEpo6qHMCNSZoNKWtvQvxq3whnaME9wGgEFhq7ur",
|
"signed_by": "did:key:z6MkkidEnEpo6qHMCNSZoNKWtvQvxq3whnaME9wGgEFhq7ur",
|
||||||
"version": "1.7.101-alpha"
|
"version": "1.7.102-alpha"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,6 +103,23 @@ for f in /usr/local/bin/archipelago \
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# 1.1b — Every enabled archipelago/nostr unit must have an existing ExecStart
|
||||||
|
# payload. v1.7.104 shipped nostr-relay.service without its binary (3s
|
||||||
|
# crash-loop forever) and archipelago-diag.service without its script
|
||||||
|
# (203/EXEC) — catch that class of ISO defect on first boot, by generic rule.
|
||||||
|
for unit in /etc/systemd/system/archipelago*.service /etc/systemd/system/nostr*.service; do
|
||||||
|
[ -f "$unit" ] || continue
|
||||||
|
systemctl is-enabled "$(basename "$unit")" >/dev/null 2>&1 || continue
|
||||||
|
exec_bin=$(grep -m1 '^ExecStart=' "$unit" | sed 's/^ExecStart=[-+@!:]*//' | awk '{print $1}')
|
||||||
|
case "$exec_bin" in
|
||||||
|
/*) if [ -e "$exec_bin" ]; then
|
||||||
|
pass "Unit payload exists: $(basename "$unit") → $exec_bin"
|
||||||
|
else
|
||||||
|
fail "Unit payload missing" "$(basename "$unit") → $exec_bin"
|
||||||
|
fi ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
# 1.2 — Critical services active
|
# 1.2 — Critical services active
|
||||||
for svc in archipelago nginx; do
|
for svc in archipelago nginx; do
|
||||||
if systemctl is-active "$svc" >/dev/null 2>&1; then
|
if systemctl is-active "$svc" >/dev/null 2>&1; then
|
||||||
|
|||||||
Reference in New Issue
Block a user