diff --git a/Dockerfile b/Dockerfile index 38f8b7c..483a241 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,20 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry,id=cargo-registry,sharin # Data dir owned by the non-root runtime user. RUN mkdir -p /out/data && chown 65532:65532 /out/data +# ---- 2b. Vantage generator (optional) ---------------------------------------- +# The live map renders with Vantage. Point VANTAGE_URL at a static Linux +# release archive (tar.gz or zip) for the target arch to bake it into the image; +# leave it empty to mount your own binary at /opt/vantage/vantage instead. +FROM --platform=$BUILDPLATFORM alpine:3 AS vantage +ARG VANTAGE_URL="" +RUN apk add --no-cache curl tar unzip && mkdir -p /out/vantage /out/assets \ + && if [ -n "$VANTAGE_URL" ]; then \ + curl -fsSL "$VANTAGE_URL" -o /tmp/vantage.pkg \ + && (tar -xzf /tmp/vantage.pkg -C /out/vantage 2>/dev/null || unzip -q /tmp/vantage.pkg -d /out/vantage) \ + && find /out/vantage -type f -name vantage -exec chmod 755 {} + \ + && (f=$(find /out/vantage -type f -name vantage | head -n1) && [ -n "$f" ] && [ "$f" != /out/vantage/vantage ] && mv "$f" /out/vantage/vantage || true); \ + fi + # ---- 3. Runtime -------------------------------------------------------------- FROM scratch LABEL org.opencontainers.image.title="SCOPENET Panel" \ @@ -44,9 +58,12 @@ LABEL org.opencontainers.image.title="SCOPENET Panel" \ COPY --from=build /scopenet-panel /scopenet-panel COPY --from=web /src/panel/web/dist /web COPY --from=build --chown=65532:65532 /out/data /data +COPY --from=vantage /out/vantage /opt/vantage ENV SCOPENET_BIND=0.0.0.0:8080 \ SCOPENET_DATA_DIR=/data \ SCOPENET_WEB_DIR=/web \ + SCOPENET_VANTAGE_BIN=/opt/vantage/vantage \ + SCOPENET_VANTAGE_ASSETS=/data/livemap/assets \ RUST_LOG=info USER 65532:65532 VOLUME ["/data"] diff --git a/docker-compose.yml b/docker-compose.yml index 4142ea9..208a2ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,11 @@ services: panel: # Tag the image built from this checkout so an older GHCR release is not used. image: scopenet-panel:local - build: . + build: + context: . + args: + # Optional: URL of a static Vantage Linux release to bundle. + VANTAGE_URL: ${VANTAGE_URL:-} container_name: scopenet-panel restart: unless-stopped ports: @@ -25,6 +29,10 @@ services: MAX_UPLOAD_MB: ${MAX_UPLOAD_MB:-2048} PUBLIC_URL: ${PUBLIC_URL:-} SCOPENET_TRUSTED_PROXIES: ${SCOPENET_TRUSTED_PROXIES:-} + # Live Map: Vantage generator + Minecraft client assets (see docs/live-map.md). + SCOPENET_VANTAGE_BIN: ${SCOPENET_VANTAGE_BIN:-/opt/vantage/vantage} + SCOPENET_VANTAGE_ASSETS: ${SCOPENET_VANTAGE_ASSETS:-/data/livemap/assets} + SCOPENET_VANTAGE_ARGS: ${SCOPENET_VANTAGE_ARGS:-} RUST_LOG: ${RUST_LOG:-info} volumes: - panel-data:/data @@ -32,7 +40,8 @@ services: deploy: resources: limits: - memory: 256M + # Raise this if you enable Live Map: Vantage bakes tiles in memory. + memory: ${PANEL_MEMORY:-256M} volumes: panel-data: diff --git a/launcher/src/components/ChunkMap.svelte b/launcher/src/components/ChunkMap.svelte index 23942e6..a47e595 100644 --- a/launcher/src/components/ChunkMap.svelte +++ b/launcher/src/components/ChunkMap.svelte @@ -2,10 +2,10 @@ import { onMount } from 'svelte'; import { Shield, Lock, Plus, Trash2, Compass, ArrowUp, ArrowDown, ArrowLeft, ArrowRight, - MapPin, Globe, LoaderCircle, CheckCircle2, AlertTriangle, RefreshCw + MapPin, Globe, LoaderCircle, RefreshCw, Server } from '@lucide/svelte'; import { invoke } from '../lib/tauri'; - import { toast } from '../lib/store.svelte'; + import { abs, toast } from '../lib/store.svelte'; import type { GuildClaim } from '../lib/types'; import VantageMap from './VantageMap.svelte'; @@ -23,7 +23,7 @@ onunclaim?: (claimId: number) => void; } = $props(); - let servers = $state>([]); + let servers = $state>([]); let serverId = $state(null); let dimension = $state<'minecraft:overworld' | 'minecraft:the_nether' | 'minecraft:the_end'>('minecraft:overworld'); let centerX = $state(0); @@ -37,8 +37,26 @@ let selectedChunk = $state<{ x: number; z: number } | null>(null); let mapDimensions = $state([]); let mapFailed = $state(false); - const mapUrl = $derived(servers.find((s) => s.id === serverId)?.map_url || ''); - $effect(() => { mapUrl; mapFailed = false; mapDimensions = []; }); + // The panel's central live map (if switched on for this server) wins over an external Vantage URL. + type LiveInfo = { ready: boolean; base: string; dimensions: { id: string; available: boolean }[] }; + let liveInfo = $state(null); + const instanceServers = $derived(servers.filter((s) => s.instance_id === instanceId)); + const selectedServer = $derived(servers.find((s) => s.id === serverId)); + $effect(() => { + const id = selectedServer?.live_map ? selectedServer.id : null; + liveInfo = null; + if (!id) return; + let alive = true; + invoke('get_livemap_info', { serverId: id }).then((i) => { if (alive) liveInfo = i; }).catch(() => {}); + return () => { alive = false; }; + }); + const central = $derived(!!liveInfo?.ready); + const dimSlug = $derived(dimension.replace('minecraft:', '')); + const mapUrl = $derived(central && liveInfo ? abs(`${liveInfo.base}/${dimSlug}/v1/worlds/default/manifest.json`) ?? '' : selectedServer?.map_url || ''); + const dimDisabled = (id: string) => central + ? !liveInfo?.dimensions.find((d) => d.id === id)?.available + : !!mapUrl && !mapFailed && mapDimensions.length > 0 && !mapDimensions.includes(id); + $effect(() => { mapUrl; mapFailed = false; if (!central) mapDimensions = []; }); const dimensions = [ { id: 'minecraft:overworld', label: 'Overworld', icon: Globe }, @@ -144,45 +162,53 @@
- - {#if !serverId}

Link a game server to this instance in the panel before claiming territory.

{/if} - -
-
- {#each dimensions as dim} - {@const DimIcon = dim.icon} - - {/each} +
+
+ {#if instanceServers.length > 1} + + {:else if instanceServers[0]} + {instanceServers[0].name} + {/if} +
+ {#each dimensions as dim} + {@const DimIcon = dim.icon} + + {/each} +
+ {#if central} Live map{/if}
-
- Center: [{centerX}, {centerZ}] -
- -
- - - -
- +
+ Chunk {centerX}, {centerZ} +
+ + + + +
-
+ {#if !serverId} +
Link a game server to this instance in the panel before claiming territory.
+ {/if} {#if mapUrl && !mapFailed} @@ -190,6 +216,7 @@ + import { onMount } from 'svelte'; + import { + Landmark, ArrowDownToLine, ArrowUpFromLine, Wallet, Lock, Server, History, Coins, LoaderCircle, RefreshCw, TrendingUp + } from '@lucide/svelte'; + import Avatar from './Avatar.svelte'; + import { invoke } from '../lib/tauri'; + import { toast } from '../lib/store.svelte'; + import type { Guild, GuildMember } from '../lib/types'; + + type Tx = { id: number; actor_uuid: string; kind: 'deposit' | 'withdraw'; amount: number; created_at: string }; + type WalletData = { balance: number; my_balance?: number; role?: string; currency_symbol?: string; transactions: Tx[] }; + + let { guild, members, servers, instanceId }: { + guild: Guild; + members: GuildMember[]; + servers: Array<{ id: number; name: string; instance_id: string }>; + instanceId: string; + } = $props(); + + let serverId = $state(null); + let wallet = $state(null); + let loading = $state(false); + let busy = $state(false); + let mode = $state<'deposit' | 'withdraw'>('deposit'); + let amount = $state(''); + let shown = $state(0); + + const instanceServers = $derived(servers.filter((s) => s.instance_id === instanceId)); + const symbol = $derived(wallet?.currency_symbol ?? '$'); + const role = $derived(wallet?.role ?? 'member'); + const canWithdraw = $derived(role === 'leader' || role === 'officer'); + const value = $derived(Number(amount)); + const validAmount = $derived(Number.isFinite(value) && value >= 0.01 && Math.abs(value * 100 - Math.round(value * 100)) < 1e-6); + const limit = $derived(mode === 'deposit' ? wallet?.my_balance : wallet?.balance); + const overLimit = $derived(validAmount && limit != null && value > limit + 1e-9); + const afterGuild = $derived(wallet && validAmount ? wallet.balance + (mode === 'deposit' ? value : -value) : null); + const afterMine = $derived(wallet?.my_balance != null && validAmount ? wallet.my_balance + (mode === 'deposit' ? -value : value) : null); + const totals = $derived({ + in: wallet?.transactions.filter((t) => t.kind === 'deposit').reduce((n, t) => n + t.amount, 0) ?? 0, + out: wallet?.transactions.filter((t) => t.kind === 'withdraw').reduce((n, t) => n + t.amount, 0) ?? 0 + }); + const quick = [10, 50, 100, 500, 1000]; + + const money = (n: number) => `${symbol}${n.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`; + const who = (uuid: string) => members.find((m) => m.uuid === uuid); + function ago(iso: string): string { + const s = (Date.now() - new Date(iso).getTime()) / 1000; + if (s < 60) return 'just now'; + if (s < 3600) return `${Math.floor(s / 60)}m ago`; + if (s < 86400) return `${Math.floor(s / 3600)}h ago`; + if (s < 86400 * 7) return `${Math.floor(s / 86400)}d ago`; + return new Date(iso).toLocaleDateString(); + } + + // Count the balance up (or down) smoothly whenever it changes. + let frame = 0; + $effect(() => { + const target = wallet?.balance ?? 0; + const from = shown; + const start = performance.now(); + cancelAnimationFrame(frame); + const step = (now: number) => { + const t = Math.min(1, (now - start) / 550); + shown = from + (target - from) * (1 - Math.pow(1 - t, 3)); + if (t < 1) frame = requestAnimationFrame(step); + }; + frame = requestAnimationFrame(step); + return () => cancelAnimationFrame(frame); + }); + + async function load() { + if (!serverId) { wallet = null; return; } + loading = true; + try { + wallet = await invoke('get_guild_wallet', { guildId: guild.id, serverId }); + if (!canWithdraw) mode = 'deposit'; + } catch (e: any) { + toast(typeof e === 'string' ? e : e?.message ?? 'Unable to load the guild wallet', 'error'); + } finally { + loading = false; + } + } + + async function submit() { + if (!serverId || busy || !validAmount || overLimit) return; + busy = true; + try { + await invoke('transfer_guild_wallet', { guildId: guild.id, serverId, amount: value, withdraw: mode === 'withdraw' }); + toast(mode === 'withdraw' ? `Withdrew ${money(value)} from the treasury` : `Deposited ${money(value)} into the treasury`, 'ok'); + amount = ''; + await load(); + } catch (e: any) { + toast(typeof e === 'string' ? e : e?.message ?? 'Transfer failed', 'error'); + } finally { + busy = false; + } + } + + $effect(() => { + if (!instanceServers.some((s) => s.id === serverId)) serverId = instanceServers[0]?.id ?? null; + }); + $effect(() => { void serverId; void guild.id; load(); }); + onMount(() => () => cancelAnimationFrame(frame)); + + +
+ {#if instanceServers.length === 0} +
+ +

No game server linked

+

The guild treasury lives on a game server's economy. Ask an admin to link a server to this instance in the panel.

+
+ {:else} + {#if instanceServers.length > 1} +
+ {#each instanceServers as s (s.id)} + + {/each} +
+ {/if} + + {#if !wallet && loading} +
+ {:else if wallet} +
+
+
+ +
+ Guild treasury + [{guild.tag}] + +
+
{money(shown)}
+
+
Deposited{money(totals.in)}
+
Withdrawn{money(totals.out)}
+
Your wallet{wallet.my_balance != null ? money(wallet.my_balance) : '—'}
+
+

Totals cover the last {wallet.transactions.length} transfers.

+
+ +
+
+ + +
+ + +
+ {#each quick as q}{/each} +
+ + {#if afterGuild != null && !overLimit} +
+ Treasury {money(wallet.balance)} → {money(afterGuild)} + {#if afterMine != null}You {money(wallet.my_balance!)} → {money(afterMine)}{/if} +
+ {:else if overLimit} +

{mode === 'deposit' ? "That's more than your wallet holds." : "That's more than the treasury holds."}

+ {:else} +

Use up to two decimals. Transfers are instant and recorded for the whole guild.

+ {/if} + + +
+
+ +
+

Recent activity

{wallet.transactions.length}
+ {#if wallet.transactions.length === 0} +
+ +

No transfers yet.

+

Be the first to fund the guild treasury.

+
+ {:else} +
    + {#each wallet.transactions as tx (tx.id)} + {@const m = who(tx.actor_uuid)} +
  • + + {#if tx.kind === 'withdraw'}{:else}{/if} + + +
    + {m?.name ?? 'Former member'} + {tx.kind === 'withdraw' ? 'withdrew' : 'deposited'} · {ago(tx.created_at)} +
    + {tx.kind === 'withdraw' ? '−' : '+'}{money(tx.amount)} +
    • + {/each} +
+ {/if} +
+
+ {/if} + {/if} +
+ + diff --git a/launcher/src/components/LiveMapModal.svelte b/launcher/src/components/LiveMapModal.svelte new file mode 100644 index 0000000..5d74c9c --- /dev/null +++ b/launcher/src/components/LiveMapModal.svelte @@ -0,0 +1,131 @@ + + + e.key === 'Escape' && onclose()} /> + + + + diff --git a/launcher/src/components/VantageMap.svelte b/launcher/src/components/VantageMap.svelte index 2964343..250cba4 100644 --- a/launcher/src/components/VantageMap.svelte +++ b/launcher/src/components/VantageMap.svelte @@ -5,16 +5,21 @@ import type { GuildClaim } from '../lib/types'; import { invoke, inTauri } from '../lib/tauri'; - let { world, serverId, claims, dimension, myGuildId, onselect, ondimension, ondimensions, oncenterchange, onerror }: { + let { world, serverId, claims = [], dimension = 'minecraft:overworld', myGuildId = null, central = false, fill = false, onselect = () => {}, ondimension = () => {}, ondimensions = () => {}, oncenterchange = () => {}, onready = () => {}, onerror }: { world: string; serverId: number; - claims: GuildClaim[]; - dimension: string; - myGuildId: string | null; - onselect: (x: number, z: number) => void; - ondimension: (dimension: 'minecraft:overworld' | 'minecraft:the_nether' | 'minecraft:the_end') => void; - ondimensions: (dimensions: string[]) => void; - oncenterchange: (x: number, z: number) => void; + claims?: GuildClaim[]; + dimension?: string; + myGuildId?: string | null; + /** Served by the panel's central live map (session-authenticated) rather than an external Vantage host. */ + central?: boolean; + /** Fill the parent's height instead of using the compact territory size. */ + fill?: boolean; + onselect?: (x: number, z: number) => void; + ondimension?: (dimension: 'minecraft:overworld' | 'minecraft:the_nether' | 'minecraft:the_end') => void; + ondimensions?: (dimensions: string[]) => void; + oncenterchange?: (x: number, z: number) => void; + onready?: () => void; onerror: (message: string) => void; } = $props(); @@ -117,7 +122,7 @@ const source = inTauri ? core.worldFromHttp(world, { fetch: async (url, init) => { if (init?.signal?.aborted) throw new DOMException('Aborted', 'AbortError'); const headers = new Headers(init?.headers); - const result = await invoke<{ status: number; data: string | null; etag: string | null }>('fetch_vantage_resource', { + const result = await invoke<{ status: number; data: string | null; etag: string | null }>(central ? 'fetch_livemap_resource' : 'fetch_vantage_resource', { serverId, url, etag: headers.get('if-none-match') }); if (init?.signal?.aborted) throw new DOMException('Aborted', 'AbortError'); @@ -139,13 +144,18 @@ if (cancelled) { v.dispose(); return; } viewer = v; ready = true; - ondimensions(v.dimensions.map((d) => d.id).length ? v.dimensions.map((d) => d.id) : [v.dimension?.id || 'minecraft:overworld']); - const initialId = v.dimension?.id; - if (initialId === 'minecraft:overworld' || initialId === 'minecraft:the_nether' || initialId === 'minecraft:the_end') ondimension(initialId); + onready(); + // A central map serves one manifest per dimension, so the dimension is chosen by URL, not by the viewer. + if (!central) { + ondimensions(v.dimensions.map((d) => d.id).length ? v.dimensions.map((d) => d.id) : [v.dimension?.id || 'minecraft:overworld']); + const initialId = v.dimension?.id; + if (initialId === 'minecraft:overworld' || initialId === 'minecraft:the_nether' || initialId === 'minecraft:the_end') ondimension(initialId); + } const canvas = v.renderer.domElement; canvas.addEventListener('pointerdown', downHandler); canvas.addEventListener('pointerup', upHandler); v.on('dimension', ({ current }) => { + if (central) return; ondimensions(v.dimensions.map((d) => d.id).length ? v.dimensions.map((d) => d.id) : [current?.id || 'minecraft:overworld']); const id = current?.id; if (id === 'minecraft:overworld' || id === 'minecraft:the_nether' || id === 'minecraft:the_end') ondimension(id); @@ -178,19 +188,20 @@ }); $effect(() => { - if (viewer && ready && viewer.dimension && viewer.dimension.id !== dimension && viewer.dimensions.some((d) => d.id === dimension)) { + if (!central && viewer && ready && viewer.dimension && viewer.dimension.id !== dimension && viewer.dimensions.some((d) => d.id === dimension)) { void viewer.setDimension(dimension).catch((e) => { error = String(e); }); } }); -
+
{#if !ready && !error}
Loading live terrain map…
{/if} {#if error}
Map unavailable: {error}
{/if}