Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
697a7e614d | ||
|
|
d07342e97e | ||
|
|
f425e0bb8e | ||
|
|
bf4009558d | ||
|
|
d09aa2b219 | ||
|
|
437deca6a0 | ||
|
|
851cfdc7e9 | ||
|
|
4a7a95fe9d | ||
|
|
32a6f46481 | ||
|
|
1d9c9d1524 | ||
|
|
f5fb0862ff | ||
|
|
dab5387cbd | ||
|
|
1d9827beb0 | ||
|
|
fcbd84f873 | ||
|
|
cef9374416 | ||
|
|
9ad3c96d43 | ||
|
|
48400440dd | ||
|
|
0e812a2479 | ||
|
|
f319721e01 | ||
|
|
9de625d617 | ||
|
|
15306dc0c2 | ||
|
|
7c3cedc549 | ||
|
|
1c73f1b1ef |
@@ -20,7 +20,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: '24'
|
||||||
|
|
||||||
- name: Install Wails CLI
|
- name: Install Wails CLI
|
||||||
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
|
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
|
||||||
@@ -61,14 +61,15 @@ jobs:
|
|||||||
- name: Build frontend
|
- name: Build frontend
|
||||||
run: |
|
run: |
|
||||||
cd web
|
cd web
|
||||||
npm ci
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
cp -r dist ../cmd/app/frontend/dist
|
cp -r dist ../cmd/app/frontend/dist
|
||||||
|
|
||||||
- name: Build desktop app
|
- name: Build desktop app
|
||||||
run: |
|
run: |
|
||||||
cd cmd/app
|
cd cmd/app
|
||||||
wails build -trimpath -ldflags="-s -w" -tags webkit2_41 -o ../../dist/waste-linux-amd64
|
wails build -trimpath -ldflags="-s -w" -tags webkit2_41
|
||||||
|
cp build/bin/waste ../../dist/waste-linux-amd64
|
||||||
|
|
||||||
# ── Publish release (tags only) ─────────────────────────────────────────
|
# ── Publish release (tags only) ─────────────────────────────────────────
|
||||||
|
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -21,6 +21,7 @@ build-daemon.sh
|
|||||||
deploy-web.sh
|
deploy-web.sh
|
||||||
deploy-daemon.sh
|
deploy-daemon.sh
|
||||||
serve-web.sh
|
serve-web.sh
|
||||||
|
push.sh
|
||||||
web/public/config.js
|
web/public/config.js
|
||||||
cmd/app/frontend/dist/*
|
cmd/app/frontend/dist/*
|
||||||
!cmd/app/frontend/dist/.gitkeep
|
!cmd/app/frontend/dist/.gitkeep
|
||||||
|
|||||||
161
EXTENSIONS.md
161
EXTENSIONS.md
@@ -151,9 +151,13 @@ entries from all applicable share roots, with relative `path` fields
|
|||||||
**Status:** implemented (browser mode + daemon mode)
|
**Status:** implemented (browser mode + daemon mode)
|
||||||
**Affects:** ICE server configuration only, no wire changes
|
**Affects:** ICE server configuration only, no wire changes
|
||||||
|
|
||||||
The browser adapter reads `WASTE_CONFIG.turnURL` and `WASTE_CONFIG.turnSecret`
|
The browser adapter reads `WASTE_CONFIG.turnURL` and fetches short-lived
|
||||||
and adds a TURN server to the WebRTC `ICEServers` list. Credentials are
|
credentials from the anchor's `GET /turn-credentials` endpoint (derived from
|
||||||
generated using HMAC-SHA1 of the username (coturn `use-auth-secret` scheme).
|
`WASTE_CONFIG.signalURL`, or overridden via `WASTE_CONFIG.turnCredentialsURL`).
|
||||||
|
The anchor computes the credential using HMAC-SHA1 of the username (coturn
|
||||||
|
`use-auth-secret` scheme) — the shared secret itself is never sent to the
|
||||||
|
browser. Daemon mode does the equivalent computation locally, since the
|
||||||
|
daemon already holds `-turn-secret` server-side.
|
||||||
|
|
||||||
YAW/2 §0 explicitly declines TURN ("No relay (TURN)"). This extension is
|
YAW/2 §0 explicitly declines TURN ("No relay (TURN)"). This extension is
|
||||||
opt-in via server configuration and does not affect peers that omit it.
|
opt-in via server configuration and does not affect peers that omit it.
|
||||||
@@ -224,3 +228,154 @@ Each in-progress `.tmp` file has a corresponding `.tmp.meta` JSON sidecar:
|
|||||||
|
|
||||||
The sidecar is written when the transfer starts and removed on completion or
|
The sidecar is written when the transfer starts and removed on completion or
|
||||||
corruption. Interrupted transfers keep the sidecar indefinitely.
|
corruption. Interrupted transfers keep the sidecar indefinitely.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## EXT-007 — P2P Message History Gossip
|
||||||
|
|
||||||
|
**Status:** implemented (daemon mode)
|
||||||
|
**Affects:** peer-to-peer wire (two new message types); IPC (new event)
|
||||||
|
|
||||||
|
### Motivation
|
||||||
|
|
||||||
|
When a peer joins a network for the first time (or reconnects after an
|
||||||
|
absence), they have no history. This extension lets them request recent
|
||||||
|
messages from an existing peer over the already-established encrypted
|
||||||
|
DataChannel, without involving the anchor.
|
||||||
|
|
||||||
|
### Wire messages
|
||||||
|
|
||||||
|
#### `history_request`
|
||||||
|
|
||||||
|
Sent by the newly-connected peer to the first peer whose hello is verified.
|
||||||
|
One request per room.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "history_request",
|
||||||
|
"room": "general",
|
||||||
|
"since": 1700000000000,
|
||||||
|
"limit": 200
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Description |
|
||||||
|
|---------|---------------|-------------|
|
||||||
|
| `room` | string | Room to request history for. |
|
||||||
|
| `since` | int64 (ms) | Only return messages with `ts > since`. 0 = return up to `limit` most recent. |
|
||||||
|
| `limit` | int (max 500) | Maximum messages to return. Responder may return fewer. |
|
||||||
|
|
||||||
|
#### `history_chunk`
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "history_chunk",
|
||||||
|
"room": "general",
|
||||||
|
"history": [
|
||||||
|
{ "mid": "...", "from": "<peer-id>", "from_alias": "alice", "text": "hello", "ts": 1700000001000 }
|
||||||
|
],
|
||||||
|
"history_done": true
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Description |
|
||||||
|
|----------------|--------|-------------|
|
||||||
|
| `history` | array | Messages, oldest-first. |
|
||||||
|
| `history_done` | bool | Always `true` (single-chunk response). |
|
||||||
|
|
||||||
|
### Deduplication
|
||||||
|
|
||||||
|
`mid` is the deduplication key. The store uses `INSERT OR IGNORE` on `mid`,
|
||||||
|
so receiving a message twice (live or via gossip) is a no-op. Messages
|
||||||
|
without a `mid` are assigned one at receive time and are not gossipped.
|
||||||
|
|
||||||
|
### Behaviour
|
||||||
|
|
||||||
|
- The **receiver** sends one `history_request` per known room immediately
|
||||||
|
after hello verification with the **first** peer it connects to. Requesting
|
||||||
|
only the first peer avoids fan-out amplification.
|
||||||
|
- The **responder** queries its SQLite store and replies with a single
|
||||||
|
`history_chunk`. `limit` is capped at 500 server-side. Rate-limited to one
|
||||||
|
request per (peer, room) per 60 seconds.
|
||||||
|
- Received history messages are saved to the local store (`INSERT OR IGNORE`)
|
||||||
|
and emitted as `history_loaded` IPC events so the UI can display them.
|
||||||
|
|
||||||
|
### IPC event
|
||||||
|
|
||||||
|
```json
|
||||||
|
{ "type": "history_loaded", "room": "general", "messages": [...] }
|
||||||
|
```
|
||||||
|
|
||||||
|
Emitted once per room after a `history_chunk` is fully processed. The UI
|
||||||
|
should render these messages with a visual separator from live messages.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## EXT-008 — Message Reactions
|
||||||
|
|
||||||
|
### Wire message (`PeerMessage`)
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "reaction",
|
||||||
|
"reaction_mid": "<32-hex mid of the target message>",
|
||||||
|
"reaction_emoji": "👍"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Sent on the normal mesh DataChannel (same as `chat`). No signing beyond
|
||||||
|
the existing channel-level encryption.
|
||||||
|
|
||||||
|
### Semantics
|
||||||
|
|
||||||
|
- A reaction is idempotent: the same `(mid, emoji, from_peer)` triple is
|
||||||
|
stored with `INSERT OR IGNORE` — receiving a duplicate is a no-op.
|
||||||
|
- There is no "un-react" wire message. Toggling off a reaction in the UI
|
||||||
|
is a local-only operation in the current implementation.
|
||||||
|
- `reaction_mid` must reference a message that exists in the local store;
|
||||||
|
unknown mids are silently ignored.
|
||||||
|
|
||||||
|
### Storage
|
||||||
|
|
||||||
|
SQLite table added as a migration:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE IF NOT EXISTS reactions (
|
||||||
|
mid TEXT NOT NULL,
|
||||||
|
emoji TEXT NOT NULL,
|
||||||
|
from_peer TEXT NOT NULL,
|
||||||
|
reacted_at DATETIME NOT NULL,
|
||||||
|
PRIMARY KEY (mid, emoji, from_peer)
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
### IPC
|
||||||
|
|
||||||
|
**Command** — send a reaction (daemon and browser mode):
|
||||||
|
```json
|
||||||
|
{ "type": "send_reaction", "network_id": "...", "reaction_mid": "<hex>", "reaction_emoji": "👍" }
|
||||||
|
```
|
||||||
|
|
||||||
|
**Event** — reaction received or replayed from history:
|
||||||
|
```json
|
||||||
|
{ "type": "reaction", "network_id": "...", "peer_id": "<64-hex>", "reaction_mid": "<hex>", "reaction_emoji": "👍" }
|
||||||
|
```
|
||||||
|
|
||||||
|
Stored reactions are replayed as `reaction` IPC events when history is
|
||||||
|
loaded (`sendStoredHistory`), so the UI always sees reactions alongside
|
||||||
|
their messages.
|
||||||
|
|
||||||
|
### History replay
|
||||||
|
|
||||||
|
When `sendStoredHistory` sends a `history_chunk`, it also queries
|
||||||
|
`ReactionsForRoom` and emits one `reaction` event per stored reaction so
|
||||||
|
clients receive the full reaction state on reconnect.
|
||||||
|
|
||||||
|
### Browser mode
|
||||||
|
|
||||||
|
`browser.ts` mirrors the daemon behaviour independently:
|
||||||
|
|
||||||
|
- `PeerConn.sendReaction(mid, emoji)` broadcasts `{ type: "reaction", reaction_mid, reaction_emoji }` over the DataChannel.
|
||||||
|
- Incoming `reaction` wire frames are dispatched as `reaction` IPC events.
|
||||||
|
- `BrowserAdapter.send()` handles `send_reaction` commands and both broadcasts to all peers and emits a local `reaction` event.
|
||||||
|
- `sendChat` includes the `mid` in the wire frame so reactions can reference it correctly across peers.
|
||||||
|
|||||||
41
FUTURE.md
41
FUTURE.md
@@ -41,7 +41,9 @@ Solved by using WebRTC DataChannels via pion. ICE gathers host + server-reflexiv
|
|||||||
### TURN relay ✅ (shipped)
|
### TURN relay ✅ (shipped)
|
||||||
Both browser and daemon modes support TURN relay.
|
Both browser and daemon modes support TURN relay.
|
||||||
|
|
||||||
**Browser mode:** `iceServers()` in `browser.ts` reads `WASTE_CONFIG.turnURL` and `WASTE_CONFIG.turnSecret`, generates time-limited HMAC-SHA1 credentials (compatible with coturn `use-auth-secret`), and adds the TURN server to the ICE candidate list. The peer dot turns yellow for relayed connections (`candidate_type: relay`).
|
**Browser mode:** `iceServers()` in `browser.ts` reads `WASTE_CONFIG.turnURL` and fetches a time-limited credential from the anchor's `GET /turn-credentials` endpoint (HMAC-SHA1, compatible with coturn `use-auth-secret`) rather than holding the shared secret client-side. The peer dot turns yellow for relayed connections (`candidate_type: relay`).
|
||||||
|
|
||||||
|
> **Security fix:** earlier this previously embedded `turnSecret` directly in `WASTE_CONFIG`, which let anyone reading the PWA's JS mint unlimited long-lived TURN credentials. The secret now lives only on the anchor (`-turn-secret` flag); the anchor mints short-lived credentials per-request instead.
|
||||||
|
|
||||||
**Daemon mode:** `-turn-url` and `-turn-secret` flags on `cmd/daemon`. `turnICEServers()` in `internal/netmgr/manager.go` generates HMAC-SHA1 credentials and injects them into the ICE server list for every new peer connection.
|
**Daemon mode:** `-turn-url` and `-turn-secret` flags on `cmd/daemon`. `turnICEServers()` in `internal/netmgr/manager.go` generates HMAC-SHA1 credentials and injects them into the ICE server list for every new peer connection.
|
||||||
|
|
||||||
@@ -91,10 +93,10 @@ DM rooms (`dm:<peerId>`) appear automatically in both interfaces when messages a
|
|||||||
- Live progress bar per active transfer
|
- Live progress bar per active transfer
|
||||||
- Push (📎) sends directly to a peer without them needing to share a folder
|
- Push (📎) sends directly to a peer without them needing to share a folder
|
||||||
|
|
||||||
**Not yet done:** daemon-side resume UX (IPC event to surface resumable transfers to the UI on reconnect).
|
On daemon start, the download directory is scanned for `.tmp.meta` sidecars and a `resumable_transfers` IPC event is emitted so the UI can show pending transfers with a progress bar.
|
||||||
|
|
||||||
### Native UI
|
### Native UI
|
||||||
Web frontend (React, already built) + [Wails v2](https://wails.io) shell for native packaging. Wails is Go-native — no Rust toolchain required. The daemon runs embedded in the same process; the webview connects to the existing WebSocket IPC at `ws://127.0.0.1:17338`. Scaffolded in `cmd/app/`; build with `./build-app.sh`. Remaining work: system tray, OS notifications.
|
Web frontend (React, already built) + [Wails v2](https://wails.io) shell for native packaging. Wails is Go-native — no Rust toolchain required. The daemon runs embedded in the same process; the webview connects to the existing WebSocket IPC at `ws://127.0.0.1:17338`. Built in `cmd/app/` via `./build-app.sh`. System tray (Linux/Windows) and OS notifications are implemented. macOS menu-bar tray requires Cocoa main-thread integration — currently a stub.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -133,6 +135,39 @@ Web frontend (React, already built) + [Wails v2](https://wails.io) shell for nat
|
|||||||
| ✅ shipped | PWA manifest — installable via "Add to Home Screen" on iOS and Android |
|
| ✅ shipped | PWA manifest — installable via "Add to Home Screen" on iOS and Android |
|
||||||
| ✅ shipped | Native desktop app (Wails 2) — system tray (Linux/Windows), OS notifications, single binary |
|
| ✅ shipped | Native desktop app (Wails 2) — system tray (Linux/Windows), OS notifications, single binary |
|
||||||
| ✅ shipped | Gitea Actions CI — server binaries (all platforms via cross-compile) + desktop app (Linux amd64) |
|
| ✅ shipped | Gitea Actions CI — server binaries (all platforms via cross-compile) + desktop app (Linux amd64) |
|
||||||
|
| ✅ shipped | File transfer resume UX — resumable transfers surfaced in Transfers panel on reconnect |
|
||||||
|
| ✅ shipped | P2P message history gossip (EXT-007) — new peers receive recent history from first connected peer |
|
||||||
|
| ✅ shipped | Date-aware timestamps in TUI and web UI |
|
||||||
|
| ✅ shipped | Historical peer alias resolution in web UI |
|
||||||
|
| ✅ shipped | Message reactions (emoji picker, full-stack: wire protocol, SQLite, IPC, web UI, TUI) |
|
||||||
|
| ✅ shipped | Link rendering + image preview in web UI messages |
|
||||||
|
| ✅ shipped | Responsive mobile layout (slide-over sidebar, hamburger button) |
|
||||||
|
| ✅ shipped | TUI multi-network (join/switch networks at runtime, `ctrl+n`, `/join`, `/net`) |
|
||||||
|
| ✅ shipped | TUI message reactions (`/react <emoji>` or `/react <n> <emoji>`) |
|
||||||
|
| 🔜 planned | Push notifications (PWA Web Push + service worker) |
|
||||||
|
|
||||||
|
### Message Reactions ✅ (shipped)
|
||||||
|
Full-stack emoji reactions. The web UI shows a `+` button on hover that opens a six-emoji picker (👍 ❤️ 😂 😮 😢 🙏). Reactions render as chips below each message; clicking an existing chip toggles your own reaction. Reactions are stored in SQLite (`reactions` table), gossiped over the mesh as `reaction` wire messages (EXT-008), and replayed via IPC on reconnect.
|
||||||
|
|
||||||
|
Browser mode: `browser.ts` independently mirrors the daemon — reactions flow over the DataChannel and are broadcast to all connected peers.
|
||||||
|
|
||||||
|
TUI: messages show `[n]` line numbers. Use `/react <emoji>` (reacts to last message) or `/react <n> <emoji>` (reacts to message `n`). Reactions render inline below the target message.
|
||||||
|
|
||||||
|
### Link Rendering + Image Preview ✅ (shipped)
|
||||||
|
URLs in messages are auto-linked. URLs ending in a recognized image extension (`.jpg`, `.png`, `.gif`, `.webp`, `.svg`) render an inline `<img>` preview (max 320×200px). `blob:` and `data:image` URLs are also treated as images.
|
||||||
|
|
||||||
|
### Responsive Mobile Layout ✅ (shipped)
|
||||||
|
At viewport width ≤ 600px the sidebar becomes a fixed-position slide-over drawer, hidden off-screen by default (`transform: translateX(-100%)`). A `☰` hamburger button in the message pane header toggles it open. Clicking any room or network in the sidebar closes it automatically. The layout is dimmed while the sidebar is open via a `::before` overlay.
|
||||||
|
|
||||||
|
### Push Notifications (planned)
|
||||||
|
The web UI is already a PWA (installable, has manifest). The missing half is a service worker + Web Push subscription:
|
||||||
|
|
||||||
|
1. **Service worker** — intercepts `push` events and shows OS notifications via `showNotification()`.
|
||||||
|
2. **VAPID key pair** — generated once by the daemon (`-vapid-key` flag); the public key is served to the browser so it can subscribe.
|
||||||
|
3. **Subscription persistence** — the browser's `PushSubscription` JSON is sent to the daemon over IPC (`register_push` command). The daemon stores it per-network-per-peer.
|
||||||
|
4. **Daemon relay** — when a `message_received` event fires with no active IPC WebSocket connection, the daemon POSTs a Web Push notification to the stored subscription endpoint.
|
||||||
|
|
||||||
|
This keeps the architecture clean: the daemon already runs in the background; it becomes the notification relay. No third-party push server is required for self-hosted setups (coturn already in use for TURN; a lightweight Web Push POST is similar).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -41,13 +41,33 @@ On Linux and Windows a tray icon appears — closing the window hides to tray ra
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Option 3 — Run the daemon manually (headless / power users)
|
## Option 3 — Run the daemon + TUI or web UI locally (power users / dev)
|
||||||
|
|
||||||
|
Example scripts are provided for the common local workflows. Copy them and fill in your anchor URL:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# TUI (terminal UI):
|
||||||
|
cp launch-tui.sh.example launch-tui.sh
|
||||||
|
$EDITOR launch-tui.sh # set ANCHOR=wss://your-anchor/ws
|
||||||
|
./launch-tui.sh
|
||||||
|
|
||||||
|
# Web UI in daemon mode (Vite dev server + daemon):
|
||||||
|
cp launch-web.sh.example launch-web.sh
|
||||||
|
$EDITOR launch-web.sh # set ANCHOR=wss://your-anchor/ws
|
||||||
|
./launch-web.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
The real script files are gitignored so your local edits (anchor URL, alias, network) are never accidentally committed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Option 4 — Run the daemon manually (headless)
|
||||||
|
|
||||||
If you want the daemon running in the background without the desktop UI — on a server, over SSH, or with the web UI in a browser pointed at your local machine:
|
If you want the daemon running in the background without the desktop UI — on a server, over SSH, or with the web UI in a browser pointed at your local machine:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Download waste-daemon from the releases page, then:
|
# Download waste-daemon from the releases page, then:
|
||||||
./waste-daemon -alias yourname -anchor wss://your-anchor-server/ws
|
./waste-daemon -alias yourname -anchor wss://YOUR_ANCHOR_DOMAIN/ws
|
||||||
```
|
```
|
||||||
|
|
||||||
Then open the web UI in a browser at the anchor URL, or point the web UI's daemon mode at `ws://127.0.0.1:17338`.
|
Then open the web UI in a browser at the anchor URL, or point the web UI's daemon mode at `ws://127.0.0.1:17338`.
|
||||||
@@ -83,7 +103,7 @@ The anchor is a tiny signaling server that helps peers find each other — it ne
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# On your VPS:
|
# On your VPS:
|
||||||
./waste-anchor -bind 127.0.0.1:8080
|
./waste-anchor -bind 127.0.0.1:8080 -turn-secret YOUR_COTURN_SECRET
|
||||||
```
|
```
|
||||||
|
|
||||||
Put it behind nginx with a `/ws` WebSocket proxy and serve the web UI static files at `/`. See [README.md](README.md#hosting-on-a-vps) for the full nginx setup.
|
Put it behind nginx with `/ws` and `/turn-credentials` proxied to the anchor, and the web UI static files at `/`. See [README.md](README.md#hosting-on-a-vps) for the full nginx setup.
|
||||||
|
|||||||
88
README.md
88
README.md
@@ -21,6 +21,51 @@ waste-go/
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Prebuilt binaries
|
||||||
|
|
||||||
|
Every tagged release publishes cross-compiled binaries — no Go toolchain required. Grab them from the repo's **Releases** page:
|
||||||
|
|
||||||
|
```
|
||||||
|
https://repo.explewd.com/explewd/waste-go/releases
|
||||||
|
```
|
||||||
|
|
||||||
|
| File | What it is | Run it on |
|
||||||
|
|---|---|---|
|
||||||
|
| `waste-daemon-<os>-<arch>` | The peer process — your identity, mesh connections, file shares | Each friend's own machine |
|
||||||
|
| `waste-anchor-<os>-<arch>` | The signaling relay (no message content ever passes through it) | One server you control (VPS) |
|
||||||
|
|
||||||
|
`<os>` is `linux`, `darwin` (macOS), or `windows`; `<arch>` is `amd64` or `arm64` (Windows builds are amd64 only). Windows binaries have a `.exe` suffix.
|
||||||
|
|
||||||
|
**Linux / macOS:**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -LO https://repo.explewd.com/explewd/waste-go/releases/download/<tag>/waste-daemon-linux-amd64
|
||||||
|
chmod +x waste-daemon-linux-amd64
|
||||||
|
./waste-daemon-linux-amd64 -alias yourname -data-dir ~/.waste --join 'waste:eyJ...'
|
||||||
|
```
|
||||||
|
|
||||||
|
> **macOS Gatekeeper:** unsigned binaries downloaded from a browser get a quarantine flag and macOS will refuse to run them ("cannot be opened because the developer cannot be verified"). Clear it once after downloading: `xattr -d com.apple.quarantine waste-daemon-darwin-arm64` (or right-click → Open the first time, which prompts for an override).
|
||||||
|
|
||||||
|
**Windows:** download the `.exe`, then run it from PowerShell or `cmd.exe`:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
.\waste-daemon-windows-amd64.exe -alias yourname -data-dir C:\waste --join "waste:eyJ..."
|
||||||
|
```
|
||||||
|
|
||||||
|
SmartScreen may warn about an unrecognized publisher on first run — these binaries aren't code-signed. Click "More info" → "Run anyway".
|
||||||
|
|
||||||
|
Once the daemon is running, drive it with the [TUI](#terminal-ui) (`./cmd/tui` built locally, or the web UI in [daemon mode](#daemon-mode-for-users-running-the-daemon-locally)) — the daemon itself has no UI of its own, it just exposes the local IPC API on port 17337.
|
||||||
|
|
||||||
|
The `waste-anchor` binary is for whoever is hosting a network — see [Hosting on a VPS](#hosting-on-a-vps) below for the full anchor + web UI setup. For a quick local anchor (e.g. testing on a LAN), just run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./waste-anchor-linux-amd64 -bind 0.0.0.0:8080
|
||||||
|
```
|
||||||
|
|
||||||
|
> **No desktop app build in the current release.** A native Wails desktop app (`cmd/app/`) exists in the source tree, but the CI step that packages it for releases was broken (wrong output path) until this fix — earlier tagged releases only have daemon/anchor binaries. The next tag will include `waste-linux-amd64`. Until then, build it yourself with `./build-app.sh` (see [Desktop app (Wails)](#desktop-app-wails) below).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Hosting on a VPS
|
## Hosting on a VPS
|
||||||
|
|
||||||
You need two things on the server: the **anchor** (signaling process) and the **web UI** (static files). Both are served through the same domain via Nginx Proxy Manager.
|
You need two things on the server: the **anchor** (signaling process) and the **web UI** (static files). Both are served through the same domain via Nginx Proxy Manager.
|
||||||
@@ -89,7 +134,7 @@ This tells the browser where to connect for signaling. Without it the join form
|
|||||||
|
|
||||||
### 3. Nginx Proxy Manager setup
|
### 3. Nginx Proxy Manager setup
|
||||||
|
|
||||||
Create one **Proxy Host** for your domain (e.g. `waste.example.com`) with TLS enabled. You need two locations:
|
Create one **Proxy Host** for your domain (e.g. `waste.example.com`) with TLS enabled. You need these locations:
|
||||||
|
|
||||||
**Location 1 — WebSocket signaling (`/ws`)**
|
**Location 1 — WebSocket signaling (`/ws`)**
|
||||||
- Location: `/ws`
|
- Location: `/ws`
|
||||||
@@ -97,6 +142,12 @@ Create one **Proxy Host** for your domain (e.g. `waste.example.com`) with TLS en
|
|||||||
- Forward port: `8080`
|
- Forward port: `8080`
|
||||||
- Enable: WebSockets Support
|
- Enable: WebSockets Support
|
||||||
|
|
||||||
|
**Location 1b — TURN credentials (`/turn-credentials`, only if using TURN — see [step 4](#4-turn-relay-optional-fixes-mobile--cgnat))**
|
||||||
|
- Location: `/turn-credentials`
|
||||||
|
- Forward hostname/IP: `127.0.0.1`
|
||||||
|
- Forward port: `8080`
|
||||||
|
- Plain HTTP, no WebSockets toggle needed
|
||||||
|
|
||||||
**Location 2 — Web UI (catch-all)**
|
**Location 2 — Web UI (catch-all)**
|
||||||
- Location: `/`
|
- Location: `/`
|
||||||
- Choose "Serve Static Files" (or point to a local HTTP server serving `/var/www/waste-web`)
|
- Choose "Serve Static Files" (or point to a local HTTP server serving `/var/www/waste-web`)
|
||||||
@@ -117,6 +168,7 @@ Or use `serve-web.sh` which handles PID tracking and restart:
|
|||||||
The key requirements:
|
The key requirements:
|
||||||
|
|
||||||
- `/ws` → anchor process (WebSocket, keep-alive)
|
- `/ws` → anchor process (WebSocket, keep-alive)
|
||||||
|
- `/turn-credentials` → anchor process (plain HTTP; only needed if using TURN)
|
||||||
- `/*` → static file server (SPA fallback: return `index.html` for unknown paths)
|
- `/*` → static file server (SPA fallback: return `index.html` for unknown paths)
|
||||||
|
|
||||||
### 4. TURN relay (optional, fixes mobile / CGNAT)
|
### 4. TURN relay (optional, fixes mobile / CGNAT)
|
||||||
@@ -155,21 +207,32 @@ systemctl enable coturn
|
|||||||
systemctl start coturn
|
systemctl start coturn
|
||||||
```
|
```
|
||||||
|
|
||||||
**Update `config.js`** to tell browsers about the TURN server:
|
**Start the anchor with the same secret**, so it can mint short-lived credentials on your behalf:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./waste-anchor -bind 0.0.0.0:8080 -turn-secret YOUR_SECRET_HERE
|
||||||
|
```
|
||||||
|
|
||||||
|
This enables `GET /turn-credentials` on the anchor, which returns a fresh `{username, credential}` pair (1-hour TTL) computed from the shared secret — the secret itself never leaves the server.
|
||||||
|
|
||||||
|
**Update `config.js`** to tell browsers about the TURN server (no secret here — only the public relay address):
|
||||||
|
|
||||||
```js
|
```js
|
||||||
window.WASTE_CONFIG = {
|
window.WASTE_CONFIG = {
|
||||||
signalURL: 'wss://your-domain.com/ws',
|
signalURL: 'wss://your-domain.com/ws',
|
||||||
turnURL: 'turn:your-domain.com:3478',
|
turnURL: 'turn:your-domain.com:3478',
|
||||||
turnSecret: 'YOUR_SECRET_HERE',
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
The `use-auth-secret` mode generates short-lived TURN credentials from the shared secret — no user database required. The relay only sees opaque DTLS-encrypted blobs.
|
> **Security note:** earlier versions of this doc had you put `turnSecret` directly in `config.js`. Don't — anyone reading the PWA's JS bundle could read it and mint unlimited, long-lived TURN credentials, turning your relay into an open proxy for anyone. The browser now calls the anchor's `/turn-credentials` endpoint instead and only ever sees a credential that expires in an hour. If you have an old `config.js` with `turnSecret` set, remove it and rotate the coturn secret (`static-auth-secret` in `turnserver.conf` and the anchor's `-turn-secret` flag) since the old one was exposed.
|
||||||
|
|
||||||
> The browser adapter reads `turnURL` and `turnSecret` from `WASTE_CONFIG` and adds the TURN server to the WebRTC `ICEServers` list automatically. If not configured, STUN-only is used (works for most desktop/home NAT situations).
|
The browser adapter calls `signalURL` with `/ws` swapped for `/turn-credentials` to find the anchor's endpoint by default; set `turnCredentialsURL` explicitly in `WASTE_CONFIG` if the anchor is reachable at a different path. If `turnURL` is set but the credentials endpoint is unreachable, the browser falls back to STUN-only.
|
||||||
|
|
||||||
**Daemon mode TURN:** pass `-turn-url turn:your-domain.com:3478 -turn-secret YOUR_SECRET_HERE` when starting the daemon. The same coturn `use-auth-secret` HMAC-SHA1 scheme is used — no extra config required beyond what you set up for browser mode.
|
You'll also need nginx to route the new path to the anchor, alongside `/ws` (see [step 3](#3-nginx-proxy-manager-setup)):
|
||||||
|
|
||||||
|
- `/turn-credentials` → anchor process (plain HTTP, no WebSocket upgrade needed)
|
||||||
|
|
||||||
|
**Daemon mode TURN:** pass `-turn-url turn:your-domain.com:3478 -turn-secret YOUR_SECRET_HERE` when starting the daemon. This is unaffected by the above — the daemon computes credentials itself server-side and never exposes the secret, same as the anchor now does for browser mode.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -392,9 +455,16 @@ go run ./cmd/tui -network friends
|
|||||||
| `-join` | — | `waste:` invite string |
|
| `-join` | — | `waste:` invite string |
|
||||||
| `-ipc` | `17337` | Daemon IPC port |
|
| `-ipc` | `17337` | Daemon IPC port |
|
||||||
|
|
||||||
**Key bindings:** `Tab`/`Shift+Tab` — switch rooms · `PgUp`/`PgDn` — scroll · `Enter` — send · `Ctrl+I` — generate invite · `Esc` — close overlay · `Ctrl+C` — quit
|
**Key bindings:** `Tab`/`Shift+Tab` — switch rooms · `Ctrl+N` — cycle networks · `PgUp`/`PgDn` — scroll · `Enter` — send · `Ctrl+I` — generate invite · `Esc` — close overlay · `Ctrl+C` — quit
|
||||||
|
|
||||||
**Slash commands:** `/room <name>` — create a new room (persisted in SQLite, restored on reconnect). Rooms with unread messages show a `*` prefix in the sidebar.
|
**Slash commands:**
|
||||||
|
- `/room <name>` — create a new room (persisted in SQLite, restored on reconnect)
|
||||||
|
- `/join <name>` — join a new network at runtime (the `-network` flag is optional; start idle and `/join` to connect)
|
||||||
|
- `/net <n|name>` — switch active network by index or name
|
||||||
|
- `/react <emoji>` — react to the last message (use actual emoji characters, e.g. `/react 👍`)
|
||||||
|
- `/react <n> <emoji>` — react to message `[n]` (line numbers shown next to each message)
|
||||||
|
|
||||||
|
Rooms with unread messages show a `*` prefix in the sidebar.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -419,6 +489,7 @@ Newline-delimited JSON on TCP port 17337 (or WebSocket on 17338).
|
|||||||
{"type":"create_room","room":"dev"}
|
{"type":"create_room","room":"dev"}
|
||||||
{"type":"set_download_dir","path":"/home/alice/Downloads"} // change download base for current network
|
{"type":"set_download_dir","path":"/home/alice/Downloads"} // change download base for current network
|
||||||
{"type":"set_download_dir","network_id":"<16-hex>","path":"/home/alice/Downloads/friends"}
|
{"type":"set_download_dir","network_id":"<16-hex>","path":"/home/alice/Downloads/friends"}
|
||||||
|
{"type":"send_reaction","network_id":"...","reaction_mid":"<32-hex>","reaction_emoji":"👍"}
|
||||||
{"type":"export_identity","passphrase":"..."}
|
{"type":"export_identity","passphrase":"..."}
|
||||||
{"type":"import_identity","passphrase":"...","backup":"..."}
|
{"type":"import_identity","passphrase":"...","backup":"..."}
|
||||||
```
|
```
|
||||||
@@ -435,6 +506,7 @@ Newline-delimited JSON on TCP port 17337 (or WebSocket on 17338).
|
|||||||
{"type":"incoming_file","peer_id":"<64-hex>","offer":{"xid":"...","name":"notes.txt","size":1024,"sha256":"..."}}
|
{"type":"incoming_file","peer_id":"<64-hex>","offer":{"xid":"...","name":"notes.txt","size":1024,"sha256":"..."}}
|
||||||
{"type":"file_complete","transfer_id":"...","path":"/downloads/notes.txt"}
|
{"type":"file_complete","transfer_id":"...","path":"/downloads/notes.txt"}
|
||||||
{"type":"room_created","network_id":"...","room":"dev"}
|
{"type":"room_created","network_id":"...","room":"dev"}
|
||||||
|
{"type":"reaction","network_id":"...","peer_id":"<64-hex>","reaction_mid":"<32-hex>","reaction_emoji":"👍"}
|
||||||
{"type":"identity_exported","backup":"..."}
|
{"type":"identity_exported","backup":"..."}
|
||||||
{"type":"error","error_message":"..."}
|
{"type":"error","error_message":"..."}
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -6,12 +6,17 @@ package main
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/ed25519"
|
"crypto/ed25519"
|
||||||
|
"crypto/hmac"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"crypto/sha1"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
|
"encoding/base64"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
"flag"
|
"flag"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -23,16 +28,40 @@ import (
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
bind := flag.String("bind", "0.0.0.0:17339", "address to listen on")
|
bind := flag.String("bind", "0.0.0.0:17339", "address to listen on")
|
||||||
|
turnSecret := flag.String("turn-secret", "", "coturn use-auth-secret shared secret; enables GET /turn-credentials")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
a := newAnchor()
|
a := newAnchor()
|
||||||
http.HandleFunc("/ws", a.handleWS)
|
http.HandleFunc("/ws", a.handleWS)
|
||||||
|
if *turnSecret != "" {
|
||||||
|
http.HandleFunc("/turn-credentials", turnCredentialsHandler(*turnSecret))
|
||||||
|
log.Printf("anchor: /turn-credentials enabled")
|
||||||
|
}
|
||||||
log.Printf("anchor: listening on %s", *bind)
|
log.Printf("anchor: listening on %s", *bind)
|
||||||
if err := http.ListenAndServe(*bind, nil); err != nil {
|
if err := http.ListenAndServe(*bind, nil); err != nil {
|
||||||
log.Fatalf("anchor: %v", err)
|
log.Fatalf("anchor: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// turnCredentialsHandler mints short-lived coturn use-auth-secret credentials
|
||||||
|
// server-side, so the shared secret never reaches the browser. Mirrors the
|
||||||
|
// scheme in internal/netmgr.Manager.turnICEServers (daemon mode).
|
||||||
|
func turnCredentialsHandler(secret string) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
expiry := strconv.FormatInt(time.Now().Add(time.Hour).Unix(), 10)
|
||||||
|
mac := hmac.New(sha1.New, []byte(secret))
|
||||||
|
mac.Write([]byte(expiry))
|
||||||
|
credential := base64.StdEncoding.EncodeToString(mac.Sum(nil))
|
||||||
|
json.NewEncoder(w).Encode(struct {
|
||||||
|
Username string `json:"username"`
|
||||||
|
Credential string `json:"credential"`
|
||||||
|
TTL int `json:"ttl"`
|
||||||
|
}{Username: expiry, Credential: credential, TTL: 3600})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ── Anchor ────────────────────────────────────────────────────────────────────
|
// ── Anchor ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
type client struct {
|
type client struct {
|
||||||
@@ -126,8 +155,8 @@ func (a *anchor) handleWS(w http.ResponseWriter, r *http.Request) {
|
|||||||
ctx, cancel := context.WithCancel(r.Context())
|
ctx, cancel := context.WithCancel(r.Context())
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Send a challenge nonce immediately.
|
// Send a challenge nonce immediately. §5.1 requires 32 bytes.
|
||||||
nonce := make([]byte, 16)
|
nonce := make([]byte, 32)
|
||||||
rand.Read(nonce)
|
rand.Read(nonce)
|
||||||
nonceHex := hex.EncodeToString(nonce)
|
nonceHex := hex.EncodeToString(nonce)
|
||||||
if err := wsjson.Write(ctx, conn, proto.AnchorMessage{
|
if err := wsjson.Write(ctx, conn, proto.AnchorMessage{
|
||||||
|
|||||||
641
cmd/tui/main.go
641
cmd/tui/main.go
@@ -1,6 +1,7 @@
|
|||||||
// Package main is the waste-go terminal UI.
|
// Package main is the waste-go terminal UI.
|
||||||
// It connects to a running daemon's IPC port, joins a named network, and
|
// It connects to a running daemon's IPC port and renders a three-pane layout:
|
||||||
// renders a three-pane layout: rooms (left), messages (centre), peers (right).
|
// rooms/networks (left), messages with line numbers (centre), peers (right).
|
||||||
|
// Multiple networks are supported at runtime via /join; switch with ctrl+n.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -10,6 +11,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -28,18 +30,22 @@ var (
|
|||||||
styleHeader = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
styleHeader = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
||||||
styleActive = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("86"))
|
styleActive = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("86"))
|
||||||
styleRoom = lipgloss.NewStyle().Foreground(lipgloss.Color("250"))
|
styleRoom = lipgloss.NewStyle().Foreground(lipgloss.Color("250"))
|
||||||
|
styleNet = lipgloss.NewStyle().Foreground(lipgloss.Color("39"))
|
||||||
|
styleNetActive = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("51"))
|
||||||
stylePeer = lipgloss.NewStyle().Foreground(lipgloss.Color("72"))
|
stylePeer = lipgloss.NewStyle().Foreground(lipgloss.Color("72"))
|
||||||
styleSelf = lipgloss.NewStyle().Foreground(lipgloss.Color("86"))
|
styleSelf = lipgloss.NewStyle().Foreground(lipgloss.Color("86"))
|
||||||
styleMsgFrom = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
styleMsgFrom = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
||||||
styleMsgMe = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("86"))
|
styleMsgMe = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("86"))
|
||||||
styleMsgTime = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
|
styleMsgTime = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
|
||||||
|
styleLineNum = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
|
||||||
|
styleReaction = lipgloss.NewStyle().Foreground(lipgloss.Color("246"))
|
||||||
styleTitle = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
styleTitle = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("33"))
|
||||||
styleBorder = lipgloss.Color("238")
|
styleBorder = lipgloss.Color("238")
|
||||||
styleStatus = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
|
styleStatus = lipgloss.NewStyle().Foreground(lipgloss.Color("238"))
|
||||||
styleErr = lipgloss.NewStyle().Foreground(lipgloss.Color("196")).Bold(true)
|
styleErr = lipgloss.NewStyle().Foreground(lipgloss.Color("196")).Bold(true)
|
||||||
)
|
)
|
||||||
|
|
||||||
const sideW = 22 // total width of each sidebar box (inner = sideW-2)
|
const sideW = 22
|
||||||
|
|
||||||
// ── tea messages ──────────────────────────────────────────────────────────────
|
// ── tea messages ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -51,9 +57,6 @@ type ipcLineMsg struct{ line []byte }
|
|||||||
type connectErrMsg struct{ err error }
|
type connectErrMsg struct{ err error }
|
||||||
type readErrMsg struct{ err error }
|
type readErrMsg struct{ err error }
|
||||||
|
|
||||||
// lineReader pumps a TCP connection through a channel so a single bufio.Scanner
|
|
||||||
// is alive for the lifetime of the connection (avoids read-ahead data loss when
|
|
||||||
// a new scanner is created on each call).
|
|
||||||
type lineReader struct {
|
type lineReader struct {
|
||||||
ch chan []byte
|
ch chan []byte
|
||||||
}
|
}
|
||||||
@@ -84,7 +87,42 @@ func (lr *lineReader) next() tea.Cmd {
|
|||||||
|
|
||||||
// ── model ─────────────────────────────────────────────────────────────────────
|
// ── model ─────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
// netData holds per-network state.
|
||||||
|
type netData struct {
|
||||||
|
id string
|
||||||
|
name string
|
||||||
|
localID proto.PeerID
|
||||||
|
localAlias string
|
||||||
|
rooms []string
|
||||||
|
activeRoom int
|
||||||
|
peers map[proto.PeerID]string
|
||||||
|
peerOrder []proto.PeerID
|
||||||
|
knownPeers map[proto.PeerID]string // historical peers (from store)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newNetData(id, name string) *netData {
|
||||||
|
return &netData{
|
||||||
|
id: id,
|
||||||
|
name: name,
|
||||||
|
rooms: []string{"general"},
|
||||||
|
peers: make(map[proto.PeerID]string),
|
||||||
|
knownPeers: make(map[proto.PeerID]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *netData) addRoom(room string) bool {
|
||||||
|
for _, r := range n.rooms {
|
||||||
|
if r == room {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
n.rooms = append(n.rooms, room)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// entry is a single chat message in the viewport.
|
||||||
type entry struct {
|
type entry struct {
|
||||||
|
mid string
|
||||||
from string
|
from string
|
||||||
body string
|
body string
|
||||||
at time.Time
|
at time.Time
|
||||||
@@ -93,7 +131,7 @@ type entry struct {
|
|||||||
|
|
||||||
type model struct {
|
type model struct {
|
||||||
ipcPort int
|
ipcPort int
|
||||||
networkName string
|
initialNetwork string // from -network flag; joined on first connect
|
||||||
|
|
||||||
width, height int
|
width, height int
|
||||||
|
|
||||||
@@ -101,16 +139,15 @@ type model struct {
|
|||||||
enc *json.Encoder
|
enc *json.Encoder
|
||||||
reader *lineReader
|
reader *lineReader
|
||||||
|
|
||||||
localID proto.PeerID
|
nets []*netData
|
||||||
localAlias string
|
activeNet int
|
||||||
|
|
||||||
rooms []string // "general" always first; DM rooms appended
|
// keyed by "netId:room"
|
||||||
activeRoom int
|
|
||||||
messages map[string][]entry
|
messages map[string][]entry
|
||||||
unread map[string]bool // rooms with messages since last viewed
|
unread map[string]bool
|
||||||
|
|
||||||
peers map[proto.PeerID]string // connected peers: id → alias
|
// mid → emoji → []alias
|
||||||
peerOrder []proto.PeerID
|
reactions map[string]map[string][]string
|
||||||
|
|
||||||
input textinput.Model
|
input textinput.Model
|
||||||
viewport viewport.Model
|
viewport viewport.Model
|
||||||
@@ -118,27 +155,89 @@ type model struct {
|
|||||||
|
|
||||||
status string
|
status string
|
||||||
errMsg string
|
errMsg string
|
||||||
invitePopup string // non-empty = show invite overlay
|
invitePopup string
|
||||||
}
|
}
|
||||||
|
|
||||||
func newModel(ipcPort int, network string) model {
|
func newModel(ipcPort int, network string) model {
|
||||||
ti := textinput.New()
|
ti := textinput.New()
|
||||||
ti.Placeholder = "Type a message…"
|
ti.Placeholder = "Type a message, or /join /net /room /react…"
|
||||||
ti.Focus()
|
ti.Focus()
|
||||||
ti.CharLimit = 2000
|
ti.CharLimit = 2000
|
||||||
|
|
||||||
return model{
|
return model{
|
||||||
ipcPort: ipcPort,
|
ipcPort: ipcPort,
|
||||||
networkName: network,
|
initialNetwork: network,
|
||||||
rooms: []string{"general"},
|
|
||||||
messages: make(map[string][]entry),
|
messages: make(map[string][]entry),
|
||||||
unread: make(map[string]bool),
|
unread: make(map[string]bool),
|
||||||
peers: make(map[proto.PeerID]string),
|
reactions: make(map[string]map[string][]string),
|
||||||
input: ti,
|
input: ti,
|
||||||
status: "connecting…",
|
status: "connecting…",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── accessors ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
func (m model) activeNetData() *netData {
|
||||||
|
if m.activeNet < len(m.nets) {
|
||||||
|
return m.nets[m.activeNet]
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) activeNetworkID() string {
|
||||||
|
if n := m.activeNetData(); n != nil {
|
||||||
|
return n.id
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) activeRoomName() string {
|
||||||
|
n := m.activeNetData()
|
||||||
|
if n == nil {
|
||||||
|
return "general"
|
||||||
|
}
|
||||||
|
if n.activeRoom < len(n.rooms) {
|
||||||
|
return n.rooms[n.activeRoom]
|
||||||
|
}
|
||||||
|
return "general"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) msgKey() string {
|
||||||
|
n := m.activeNetData()
|
||||||
|
if n == nil {
|
||||||
|
return ":general"
|
||||||
|
}
|
||||||
|
return n.id + ":" + n.rooms[n.activeRoom]
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) netByID(id string) *netData {
|
||||||
|
for _, n := range m.nets {
|
||||||
|
if n.id == id {
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) aliasOf(netID string, id proto.PeerID) string {
|
||||||
|
n := m.netByID(netID)
|
||||||
|
if n == nil {
|
||||||
|
return shortID(id)
|
||||||
|
}
|
||||||
|
if id == n.localID && n.localAlias != "" {
|
||||||
|
return n.localAlias
|
||||||
|
}
|
||||||
|
if a, ok := n.peers[id]; ok && a != "" {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
if a, ok := n.knownPeers[id]; ok && a != "" {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return shortID(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Init ──────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
func (m model) Init() tea.Cmd {
|
func (m model) Init() tea.Cmd {
|
||||||
return tea.Batch(connectCmd(m.ipcPort), textinput.Blink)
|
return tea.Batch(connectCmd(m.ipcPort), textinput.Blink)
|
||||||
}
|
}
|
||||||
@@ -162,7 +261,7 @@ func sendIPC(enc *json.Encoder, msg proto.IpcMessage) tea.Cmd {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── update ────────────────────────────────────────────────────────────────────
|
// ── Update ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
var cmds []tea.Cmd
|
var cmds []tea.Cmd
|
||||||
@@ -181,12 +280,13 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
m.conn = msg.conn
|
m.conn = msg.conn
|
||||||
m.enc = json.NewEncoder(msg.conn)
|
m.enc = json.NewEncoder(msg.conn)
|
||||||
m.reader = msg.reader
|
m.reader = msg.reader
|
||||||
m.status = "joining " + m.networkName + "…"
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdGetState}), m.reader.next())
|
||||||
cmds = append(cmds,
|
if m.initialNetwork != "" {
|
||||||
sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdJoinNetwork, NetworkName: m.networkName}),
|
m.status = "joining " + m.initialNetwork + "…"
|
||||||
sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdGetState}),
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdJoinNetwork, NetworkName: m.initialNetwork}))
|
||||||
m.reader.next(),
|
} else {
|
||||||
)
|
m.status = "connected — /join <network> to start"
|
||||||
|
}
|
||||||
|
|
||||||
case ipcLineMsg:
|
case ipcLineMsg:
|
||||||
var evt proto.IpcMessage
|
var evt proto.IpcMessage
|
||||||
@@ -211,18 +311,30 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
return m, tea.Quit
|
return m, tea.Quit
|
||||||
case msg.String() == "ctrl+i":
|
case msg.String() == "ctrl+i":
|
||||||
if m.enc != nil {
|
if m.enc != nil {
|
||||||
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdGenerateInvite}))
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{
|
||||||
|
Type: proto.CmdGenerateInvite,
|
||||||
|
NetworkID: m.activeNetworkID(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
case msg.String() == "ctrl+n":
|
||||||
|
if len(m.nets) > 1 {
|
||||||
|
m.activeNet = (m.activeNet + 1) % len(m.nets)
|
||||||
|
m = m.refreshViewport()
|
||||||
}
|
}
|
||||||
case msg.Type == tea.KeyEnter:
|
case msg.Type == tea.KeyEnter:
|
||||||
m, cmds = m.doSend(cmds)
|
m, cmds = m.doSend(cmds)
|
||||||
case msg.Type == tea.KeyTab:
|
case msg.Type == tea.KeyTab:
|
||||||
m.activeRoom = (m.activeRoom + 1) % len(m.rooms)
|
if n := m.activeNetData(); n != nil {
|
||||||
delete(m.unread, m.activeRoomName())
|
n.activeRoom = (n.activeRoom + 1) % len(n.rooms)
|
||||||
|
delete(m.unread, m.msgKey())
|
||||||
m = m.refreshViewport()
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
case msg.Type == tea.KeyShiftTab:
|
case msg.Type == tea.KeyShiftTab:
|
||||||
m.activeRoom = (m.activeRoom - 1 + len(m.rooms)) % len(m.rooms)
|
if n := m.activeNetData(); n != nil {
|
||||||
delete(m.unread, m.activeRoomName())
|
n.activeRoom = (n.activeRoom - 1 + len(n.rooms)) % len(n.rooms)
|
||||||
|
delete(m.unread, m.msgKey())
|
||||||
m = m.refreshViewport()
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
var tiCmd tea.Cmd
|
var tiCmd tea.Cmd
|
||||||
m.input, tiCmd = m.input.Update(msg)
|
m.input, tiCmd = m.input.Update(msg)
|
||||||
@@ -230,7 +342,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// Let viewport handle scroll events.
|
|
||||||
if m.vpReady {
|
if m.vpReady {
|
||||||
var vpCmd tea.Cmd
|
var vpCmd tea.Cmd
|
||||||
m.viewport, vpCmd = m.viewport.Update(msg)
|
m.viewport, vpCmd = m.viewport.Update(msg)
|
||||||
@@ -241,56 +352,106 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
return m, tea.Batch(cmds...)
|
return m, tea.Batch(cmds...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── applyEvent ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
func (m model) applyEvent(evt proto.IpcMessage) model {
|
func (m model) applyEvent(evt proto.IpcMessage) model {
|
||||||
switch evt.Type {
|
switch evt.Type {
|
||||||
|
|
||||||
case proto.EvtStateSnapshot:
|
case proto.EvtStateSnapshot:
|
||||||
if evt.LocalPeer != nil {
|
// Populate nets from snapshot.
|
||||||
m.localID = evt.LocalPeer.ID
|
for _, ni := range evt.Networks {
|
||||||
m.localAlias = evt.LocalPeer.Alias
|
n := m.netByID(ni.NetworkID)
|
||||||
|
if n == nil {
|
||||||
|
n = newNetData(ni.NetworkID, ni.NetworkName)
|
||||||
|
m.nets = append(m.nets, n)
|
||||||
}
|
}
|
||||||
m.peers = make(map[proto.PeerID]string)
|
if ni.LocalPeer != nil {
|
||||||
m.peerOrder = nil
|
n.localID = ni.LocalPeer.ID
|
||||||
|
n.localAlias = ni.LocalPeer.Alias
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Backward-compat: connected_peers and rooms are from first network.
|
||||||
|
if len(evt.Networks) > 0 && len(m.nets) > 0 {
|
||||||
|
n := m.nets[0]
|
||||||
for _, p := range evt.ConnectedPeers {
|
for _, p := range evt.ConnectedPeers {
|
||||||
m.peers[p.ID] = p.Alias
|
if _, ok := n.peers[p.ID]; !ok {
|
||||||
m.peerOrder = append(m.peerOrder, p.ID)
|
n.peerOrder = append(n.peerOrder, p.ID)
|
||||||
|
}
|
||||||
|
n.peers[p.ID] = p.Alias
|
||||||
}
|
}
|
||||||
for _, r := range evt.Rooms {
|
for _, r := range evt.Rooms {
|
||||||
m = m.addRoom(r)
|
n.addRoom(r)
|
||||||
}
|
}
|
||||||
m.status = fmt.Sprintf("● %s · %s", m.localAlias, m.networkName)
|
for _, p := range evt.KnownPeers {
|
||||||
|
n.knownPeers[p.ID] = p.Alias
|
||||||
case proto.EvtRoomCreated:
|
}
|
||||||
m = m.addRoom(evt.Room)
|
}
|
||||||
|
m = m.updateStatus()
|
||||||
m = m.refreshViewport()
|
m = m.refreshViewport()
|
||||||
|
|
||||||
|
case proto.EvtNetworkJoined:
|
||||||
|
n := m.netByID(evt.NetworkID)
|
||||||
|
if n == nil {
|
||||||
|
name := evt.NetworkName
|
||||||
|
if name == "" {
|
||||||
|
name = evt.NetworkID
|
||||||
|
}
|
||||||
|
n = newNetData(evt.NetworkID, name)
|
||||||
|
m.nets = append(m.nets, n)
|
||||||
|
m.activeNet = len(m.nets) - 1
|
||||||
|
}
|
||||||
|
if evt.LocalPeer != nil {
|
||||||
|
n.localID = evt.LocalPeer.ID
|
||||||
|
n.localAlias = evt.LocalPeer.Alias
|
||||||
|
}
|
||||||
|
m = m.updateStatus()
|
||||||
|
m = m.refreshViewport()
|
||||||
|
|
||||||
|
case proto.EvtRoomCreated:
|
||||||
|
if n := m.netByID(evt.NetworkID); n != nil {
|
||||||
|
n.addRoom(evt.Room)
|
||||||
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
|
|
||||||
case proto.EvtSessionReady:
|
case proto.EvtSessionReady:
|
||||||
if evt.PeerID != nil {
|
netID := evt.NetworkID
|
||||||
|
if netID == "" && len(m.nets) > 0 {
|
||||||
|
netID = m.nets[0].id
|
||||||
|
}
|
||||||
|
if n := m.netByID(netID); n != nil && evt.PeerID != nil {
|
||||||
pid := *evt.PeerID
|
pid := *evt.PeerID
|
||||||
if _, ok := m.peers[pid]; !ok {
|
if _, ok := n.peers[pid]; !ok {
|
||||||
m.peerOrder = append(m.peerOrder, pid)
|
n.peerOrder = append(n.peerOrder, pid)
|
||||||
}
|
}
|
||||||
alias := evt.Nick
|
alias := evt.Nick
|
||||||
if alias == "" {
|
if alias == "" {
|
||||||
alias = shortID(pid)
|
alias = shortID(pid)
|
||||||
}
|
}
|
||||||
m.peers[pid] = alias
|
n.peers[pid] = alias
|
||||||
}
|
}
|
||||||
|
|
||||||
case proto.EvtPeerConnected:
|
case proto.EvtPeerConnected:
|
||||||
if evt.Peer != nil {
|
netID := evt.NetworkID
|
||||||
pid := evt.Peer.ID
|
if netID == "" && len(m.nets) > 0 {
|
||||||
if _, ok := m.peers[pid]; !ok {
|
netID = m.nets[0].id
|
||||||
m.peerOrder = append(m.peerOrder, pid)
|
|
||||||
}
|
}
|
||||||
m.peers[pid] = evt.Peer.Alias
|
if n := m.netByID(netID); n != nil && evt.Peer != nil {
|
||||||
|
pid := evt.Peer.ID
|
||||||
|
if _, ok := n.peers[pid]; !ok {
|
||||||
|
n.peerOrder = append(n.peerOrder, pid)
|
||||||
|
}
|
||||||
|
n.peers[pid] = evt.Peer.Alias
|
||||||
}
|
}
|
||||||
|
|
||||||
case proto.EvtPeerDisconnected:
|
case proto.EvtPeerDisconnected:
|
||||||
if evt.PeerID != nil {
|
netID := evt.NetworkID
|
||||||
|
if netID == "" && len(m.nets) > 0 {
|
||||||
|
netID = m.nets[0].id
|
||||||
|
}
|
||||||
|
if n := m.netByID(netID); n != nil && evt.PeerID != nil {
|
||||||
pid := *evt.PeerID
|
pid := *evt.PeerID
|
||||||
delete(m.peers, pid)
|
delete(n.peers, pid)
|
||||||
m.peerOrder = filterIDs(m.peerOrder, pid)
|
n.peerOrder = filterIDs(n.peerOrder, pid)
|
||||||
}
|
}
|
||||||
|
|
||||||
case proto.EvtInviteGenerated:
|
case proto.EvtInviteGenerated:
|
||||||
@@ -299,23 +460,111 @@ func (m model) applyEvent(evt proto.IpcMessage) model {
|
|||||||
case proto.EvtMessageReceived:
|
case proto.EvtMessageReceived:
|
||||||
if evt.Message != nil {
|
if evt.Message != nil {
|
||||||
msg := evt.Message
|
msg := evt.Message
|
||||||
|
netID := evt.NetworkID
|
||||||
|
if netID == "" && len(m.nets) > 0 {
|
||||||
|
netID = m.nets[0].id
|
||||||
|
}
|
||||||
|
n := m.netByID(netID)
|
||||||
|
if n != nil {
|
||||||
|
n.addRoom(msg.Room)
|
||||||
|
}
|
||||||
e := entry{
|
e := entry{
|
||||||
from: m.aliasOf(msg.From),
|
mid: msg.Mid,
|
||||||
|
from: m.aliasOf(netID, msg.From),
|
||||||
body: msg.Text,
|
body: msg.Text,
|
||||||
at: time.UnixMilli(msg.Ts),
|
at: time.UnixMilli(msg.Ts),
|
||||||
fromMe: msg.From == m.localID,
|
fromMe: n != nil && msg.From == n.localID,
|
||||||
}
|
}
|
||||||
m.messages[msg.Room] = append(m.messages[msg.Room], e)
|
key := netID + ":" + msg.Room
|
||||||
m = m.addRoom(msg.Room)
|
m.messages[key] = append(m.messages[key], e)
|
||||||
if msg.Room != m.activeRoomName() {
|
if key != m.msgKey() {
|
||||||
m.unread[msg.Room] = true
|
m.unread[key] = true
|
||||||
}
|
}
|
||||||
m = m.refreshViewport()
|
m = m.refreshViewport()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case proto.EvtHistoryLoaded:
|
||||||
|
netID := evt.NetworkID
|
||||||
|
if netID == "" && len(m.nets) > 0 {
|
||||||
|
netID = m.nets[0].id
|
||||||
}
|
}
|
||||||
|
n := m.netByID(netID)
|
||||||
|
key := netID + ":" + evt.Room
|
||||||
|
existing := m.messages[key]
|
||||||
|
existingMids := make(map[string]bool, len(existing))
|
||||||
|
for _, e := range existing {
|
||||||
|
if e.mid != "" {
|
||||||
|
existingMids[e.mid] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var fresh []entry
|
||||||
|
for _, msg := range evt.Messages {
|
||||||
|
if msg.Mid != "" && existingMids[msg.Mid] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
fromMe := n != nil && msg.From == n.localID
|
||||||
|
fresh = append(fresh, entry{
|
||||||
|
mid: msg.Mid,
|
||||||
|
from: m.aliasOf(netID, msg.From),
|
||||||
|
body: msg.Text,
|
||||||
|
at: time.UnixMilli(msg.Ts),
|
||||||
|
fromMe: fromMe,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if len(fresh) > 0 {
|
||||||
|
// Prepend history, then existing live messages; sort by time.
|
||||||
|
merged := append(fresh, existing...)
|
||||||
|
// Simple insertion sort (lists are already mostly sorted).
|
||||||
|
for i := 1; i < len(merged); i++ {
|
||||||
|
for j := i; j > 0 && merged[j].at.Before(merged[j-1].at); j-- {
|
||||||
|
merged[j], merged[j-1] = merged[j-1], merged[j]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.messages[key] = merged
|
||||||
|
if n != nil {
|
||||||
|
n.addRoom(evt.Room)
|
||||||
|
}
|
||||||
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
|
|
||||||
|
case proto.EvtReaction:
|
||||||
|
mid := evt.ReactionMID
|
||||||
|
emoji := evt.ReactionEmoji
|
||||||
|
if mid == "" || emoji == "" || evt.PeerID == nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
netID := evt.NetworkID
|
||||||
|
if netID == "" && len(m.nets) > 0 {
|
||||||
|
netID = m.nets[0].id
|
||||||
|
}
|
||||||
|
alias := m.aliasOf(netID, *evt.PeerID)
|
||||||
|
if m.reactions[mid] == nil {
|
||||||
|
m.reactions[mid] = make(map[string][]string)
|
||||||
|
}
|
||||||
|
for _, a := range m.reactions[mid][emoji] {
|
||||||
|
if a == alias {
|
||||||
|
return m // already recorded
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.reactions[mid][emoji] = append(m.reactions[mid][emoji], alias)
|
||||||
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
|
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m model) updateStatus() model {
|
||||||
|
n := m.activeNetData()
|
||||||
|
if n == nil {
|
||||||
|
m.status = "connected — /join <network> to start"
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
m.status = fmt.Sprintf("● %s · %s", n.localAlias, n.name)
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── doSend ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
func (m model) doSend(cmds []tea.Cmd) (model, []tea.Cmd) {
|
func (m model) doSend(cmds []tea.Cmd) (model, []tea.Cmd) {
|
||||||
body := strings.TrimSpace(m.input.Value())
|
body := strings.TrimSpace(m.input.Value())
|
||||||
if body == "" || m.enc == nil {
|
if body == "" || m.enc == nil {
|
||||||
@@ -323,16 +572,106 @@ func (m model) doSend(cmds []tea.Cmd) (model, []tea.Cmd) {
|
|||||||
}
|
}
|
||||||
m.input.SetValue("")
|
m.input.SetValue("")
|
||||||
|
|
||||||
if strings.HasPrefix(body, "/room ") {
|
// /join <network-name>
|
||||||
name := strings.TrimSpace(strings.TrimPrefix(body, "/room "))
|
if strings.HasPrefix(body, "/join ") {
|
||||||
|
name := strings.TrimSpace(strings.TrimPrefix(body, "/join "))
|
||||||
if name != "" {
|
if name != "" {
|
||||||
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdCreateRoom, Room: name}))
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{Type: proto.CmdJoinNetwork, NetworkName: name}))
|
||||||
}
|
}
|
||||||
return m, cmds
|
return m, cmds
|
||||||
}
|
}
|
||||||
|
|
||||||
room := m.rooms[m.activeRoom]
|
// /net <number|name> — switch active network
|
||||||
ipcMsg := proto.IpcMessage{Type: proto.CmdSendMessage, Room: room, Body: body}
|
if strings.HasPrefix(body, "/net ") {
|
||||||
|
arg := strings.TrimSpace(strings.TrimPrefix(body, "/net "))
|
||||||
|
if n, err := strconv.Atoi(arg); err == nil {
|
||||||
|
idx := n - 1
|
||||||
|
if idx >= 0 && idx < len(m.nets) {
|
||||||
|
m.activeNet = idx
|
||||||
|
m = m.updateStatus()
|
||||||
|
m = m.refreshViewport()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for i, net := range m.nets {
|
||||||
|
if strings.EqualFold(net.name, arg) {
|
||||||
|
m.activeNet = i
|
||||||
|
m = m.updateStatus()
|
||||||
|
m = m.refreshViewport()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
|
||||||
|
// /room <name>
|
||||||
|
if strings.HasPrefix(body, "/room ") {
|
||||||
|
name := strings.TrimSpace(strings.TrimPrefix(body, "/room "))
|
||||||
|
if name != "" {
|
||||||
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{
|
||||||
|
Type: proto.CmdCreateRoom,
|
||||||
|
NetworkID: m.activeNetworkID(),
|
||||||
|
Room: name,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
|
||||||
|
// /react [<n>] <emoji>
|
||||||
|
if strings.HasPrefix(body, "/react ") {
|
||||||
|
rest := strings.TrimSpace(strings.TrimPrefix(body, "/react "))
|
||||||
|
parts := strings.Fields(rest)
|
||||||
|
var targetIdx int = -1 // -1 = last message
|
||||||
|
var emoji string
|
||||||
|
switch len(parts) {
|
||||||
|
case 1:
|
||||||
|
emoji = parts[0]
|
||||||
|
case 2:
|
||||||
|
if n, err := strconv.Atoi(parts[0]); err == nil {
|
||||||
|
targetIdx = n - 1
|
||||||
|
} else {
|
||||||
|
emoji = parts[0] // fallback: treat first token as emoji
|
||||||
|
}
|
||||||
|
if emoji == "" {
|
||||||
|
emoji = parts[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if emoji == "" {
|
||||||
|
m.errMsg = "usage: /react <emoji> or /react <n> <emoji> (e.g. /react 👍 or /react 3 ❤️)"
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
msgs := m.messages[m.msgKey()]
|
||||||
|
var targetMid string
|
||||||
|
if targetIdx == -1 && len(msgs) > 0 {
|
||||||
|
targetMid = msgs[len(msgs)-1].mid
|
||||||
|
} else if targetIdx >= 0 && targetIdx < len(msgs) {
|
||||||
|
targetMid = msgs[targetIdx].mid
|
||||||
|
}
|
||||||
|
if targetMid == "" {
|
||||||
|
m.errMsg = "usage: /react <emoji> or /react <n> <emoji> (e.g. /react 👍 or /react 3 ❤️)"
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
cmds = append(cmds, sendIPC(m.enc, proto.IpcMessage{
|
||||||
|
Type: proto.CmdSendReaction,
|
||||||
|
NetworkID: m.activeNetworkID(),
|
||||||
|
ReactionMID: targetMid,
|
||||||
|
ReactionEmoji: emoji,
|
||||||
|
}))
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regular message
|
||||||
|
n := m.activeNetData()
|
||||||
|
if n == nil {
|
||||||
|
return m, cmds
|
||||||
|
}
|
||||||
|
room := n.rooms[n.activeRoom]
|
||||||
|
ipcMsg := proto.IpcMessage{
|
||||||
|
Type: proto.CmdSendMessage,
|
||||||
|
NetworkID: n.id,
|
||||||
|
Room: room,
|
||||||
|
Body: body,
|
||||||
|
}
|
||||||
if strings.HasPrefix(room, "dm:") {
|
if strings.HasPrefix(room, "dm:") {
|
||||||
recipID := proto.PeerID(strings.TrimPrefix(room, "dm:"))
|
recipID := proto.PeerID(strings.TrimPrefix(room, "dm:"))
|
||||||
ipcMsg.To = &recipID
|
ipcMsg.To = &recipID
|
||||||
@@ -343,9 +682,7 @@ func (m model) doSend(cmds []tea.Cmd) (model, []tea.Cmd) {
|
|||||||
|
|
||||||
// ── layout helpers ────────────────────────────────────────────────────────────
|
// ── layout helpers ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
// vpContentWidth returns the inner width of the centre pane (available to the viewport).
|
|
||||||
func (m model) vpContentWidth() int {
|
func (m model) vpContentWidth() int {
|
||||||
// Two sidebar boxes (sideW total each) + centre box (borders 2 = -2 from inner).
|
|
||||||
w := m.width - sideW*2 - 2
|
w := m.width - sideW*2 - 2
|
||||||
if w < 10 {
|
if w < 10 {
|
||||||
w = 10
|
w = 10
|
||||||
@@ -353,10 +690,7 @@ func (m model) vpContentWidth() int {
|
|||||||
return w
|
return w
|
||||||
}
|
}
|
||||||
|
|
||||||
// vpHeight returns the viewport height (lines of messages shown).
|
|
||||||
func (m model) vpHeight() int {
|
func (m model) vpHeight() int {
|
||||||
// Full height minus: top border(1) + title(1) + divider(1) + bottom border(1) +
|
|
||||||
// input box (3 lines incl borders) + status bar(1) = 8 total overhead.
|
|
||||||
h := m.height - 8
|
h := m.height - 8
|
||||||
if h < 1 {
|
if h < 1 {
|
||||||
h = 1
|
h = 1
|
||||||
@@ -379,42 +713,39 @@ func (m model) refreshViewport() model {
|
|||||||
if !m.vpReady {
|
if !m.vpReady {
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
room := m.activeRoomName()
|
key := m.msgKey()
|
||||||
w := m.vpContentWidth()
|
|
||||||
var sb strings.Builder
|
var sb strings.Builder
|
||||||
for _, e := range m.messages[room] {
|
for i, e := range m.messages[key] {
|
||||||
ts := styleMsgTime.Render(e.at.Format("15:04"))
|
lineNum := styleLineNum.Render(fmt.Sprintf("[%d]", i+1))
|
||||||
|
ts := styleMsgTime.Render(formatMsgTime(e.at))
|
||||||
var from string
|
var from string
|
||||||
if e.fromMe {
|
if e.fromMe {
|
||||||
from = styleMsgMe.Render(e.from)
|
from = styleMsgMe.Render(e.from)
|
||||||
} else {
|
} else {
|
||||||
from = styleMsgFrom.Render(e.from)
|
from = styleMsgFrom.Render(e.from)
|
||||||
}
|
}
|
||||||
line := fmt.Sprintf("%s %s %s", ts, from, e.body)
|
sb.WriteString(fmt.Sprintf("%s %s %s %s\n", lineNum, ts, from, e.body))
|
||||||
// Crude wrap: if line > w, just truncate (viewport handles horizontal scroll).
|
if e.mid != "" {
|
||||||
_ = w
|
if rxn := m.renderReactions(e.mid); rxn != "" {
|
||||||
sb.WriteString(line + "\n")
|
sb.WriteString(rxn + "\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
m.viewport.SetContent(sb.String())
|
m.viewport.SetContent(sb.String())
|
||||||
m.viewport.GotoBottom()
|
m.viewport.GotoBottom()
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m model) activeRoomName() string {
|
func (m model) renderReactions(mid string) string {
|
||||||
if m.activeRoom < len(m.rooms) {
|
byEmoji := m.reactions[mid]
|
||||||
return m.rooms[m.activeRoom]
|
if len(byEmoji) == 0 {
|
||||||
}
|
|
||||||
return ""
|
return ""
|
||||||
}
|
|
||||||
|
|
||||||
func (m model) addRoom(room string) model {
|
|
||||||
for _, r := range m.rooms {
|
|
||||||
if r == room {
|
|
||||||
return m
|
|
||||||
}
|
}
|
||||||
|
var parts []string
|
||||||
|
for emoji, froms := range byEmoji {
|
||||||
|
parts = append(parts, fmt.Sprintf("%s %d", emoji, len(froms)))
|
||||||
}
|
}
|
||||||
m.rooms = append(m.rooms, room)
|
return styleReaction.Render(" " + strings.Join(parts, " "))
|
||||||
return m
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── view ──────────────────────────────────────────────────────────────────────
|
// ── view ──────────────────────────────────────────────────────────────────────
|
||||||
@@ -424,41 +755,33 @@ func (m model) View() string {
|
|||||||
return "loading…\n"
|
return "loading…\n"
|
||||||
}
|
}
|
||||||
|
|
||||||
innerH := m.height - 3 - 1 // 3 = input box, 1 = status bar
|
innerH := m.height - 3 - 1
|
||||||
if innerH < 4 {
|
if innerH < 4 {
|
||||||
innerH = 4
|
innerH = 4
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── left: rooms ───────────────────────────────────────────────────────────
|
leftBox := m.renderLeft(innerH)
|
||||||
leftBox := m.renderRooms(innerH)
|
|
||||||
|
|
||||||
// ── right: peers ──────────────────────────────────────────────────────────
|
|
||||||
rightBox := m.renderPeers(innerH)
|
rightBox := m.renderPeers(innerH)
|
||||||
|
|
||||||
// ── centre: title + messages ──────────────────────────────────────────────
|
|
||||||
centreBox := m.renderCentre(innerH)
|
centreBox := m.renderCentre(innerH)
|
||||||
|
|
||||||
mainRow := lipgloss.JoinHorizontal(lipgloss.Top, leftBox, centreBox, rightBox)
|
mainRow := lipgloss.JoinHorizontal(lipgloss.Top, leftBox, centreBox, rightBox)
|
||||||
|
|
||||||
// ── input ─────────────────────────────────────────────────────────────────
|
|
||||||
inputBox := lipgloss.NewStyle().
|
inputBox := lipgloss.NewStyle().
|
||||||
Width(m.width - 2).
|
Width(m.width - 2).
|
||||||
Border(lipgloss.RoundedBorder()).
|
Border(lipgloss.RoundedBorder()).
|
||||||
BorderForeground(styleBorder).
|
BorderForeground(styleBorder).
|
||||||
Render(m.input.View())
|
Render(m.input.View())
|
||||||
|
|
||||||
// ── status bar ────────────────────────────────────────────────────────────
|
|
||||||
var statusLine string
|
var statusLine string
|
||||||
if m.errMsg != "" {
|
if m.errMsg != "" {
|
||||||
statusLine = styleErr.Render(" ✗ " + m.errMsg)
|
statusLine = styleErr.Render(" ✗ " + m.errMsg)
|
||||||
} else {
|
} else {
|
||||||
hint := " tab: rooms · /room <name>: new room · ctrl+i: invite · ctrl+c: quit"
|
hint := " tab: rooms · ctrl+n: nets · /join /net /room /react · ctrl+i: invite · ctrl+c: quit"
|
||||||
statusLine = styleStatus.Width(m.width).Render(" " + m.status + hint)
|
statusLine = styleStatus.Width(m.width).Render(" " + m.status + hint)
|
||||||
}
|
}
|
||||||
|
|
||||||
view := lipgloss.JoinVertical(lipgloss.Left, mainRow, inputBox, statusLine)
|
view := lipgloss.JoinVertical(lipgloss.Left, mainRow, inputBox, statusLine)
|
||||||
|
|
||||||
// ── invite popup (full-screen overlay) ───────────────────────────────────
|
|
||||||
if m.invitePopup != "" {
|
if m.invitePopup != "" {
|
||||||
label := styleActive.Render("Invite — share this with anyone you want to add:")
|
label := styleActive.Render("Invite — share this with anyone you want to add:")
|
||||||
code := lipgloss.NewStyle().
|
code := lipgloss.NewStyle().
|
||||||
@@ -479,24 +802,51 @@ func (m model) View() string {
|
|||||||
return view
|
return view
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m model) renderRooms(boxH int) string {
|
func (m model) renderLeft(boxH int) string {
|
||||||
innerW := sideW - 2
|
innerW := sideW - 2
|
||||||
contentH := boxH - 2 // subtract top+bottom border
|
contentH := boxH - 2
|
||||||
|
sep := lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW))
|
||||||
var lines []string
|
var lines []string
|
||||||
|
|
||||||
|
// Networks section
|
||||||
|
lines = append(lines, styleHeader.Width(innerW).Render("Networks"))
|
||||||
|
lines = append(lines, sep)
|
||||||
|
if len(m.nets) == 0 {
|
||||||
|
lines = append(lines, styleRoom.Width(innerW).Render(" (none)"))
|
||||||
|
}
|
||||||
|
for i, n := range m.nets {
|
||||||
|
label := n.name
|
||||||
|
if i == m.activeNet {
|
||||||
|
lines = append(lines, styleNetActive.Width(innerW).Render("▶ "+label))
|
||||||
|
} else {
|
||||||
|
lines = append(lines, styleNet.Width(innerW).Render(fmt.Sprintf(" [%d] %s", i+1, label)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lines = append(lines, sep)
|
||||||
|
|
||||||
|
// Rooms section
|
||||||
lines = append(lines, styleHeader.Width(innerW).Render("Rooms"))
|
lines = append(lines, styleHeader.Width(innerW).Render("Rooms"))
|
||||||
lines = append(lines, lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW)))
|
lines = append(lines, sep)
|
||||||
for i, room := range m.rooms {
|
n := m.activeNetData()
|
||||||
label := roomLabel(room, m.peers)
|
if n == nil {
|
||||||
if i == m.activeRoom {
|
lines = append(lines, styleRoom.Width(innerW).Render(" (no network)"))
|
||||||
|
} else {
|
||||||
|
for i, room := range n.rooms {
|
||||||
|
label := roomLabel(room, n.peers)
|
||||||
|
key := n.id + ":" + room
|
||||||
|
if i == n.activeRoom {
|
||||||
lines = append(lines, styleActive.Width(innerW).Render("▶ "+label))
|
lines = append(lines, styleActive.Width(innerW).Render("▶ "+label))
|
||||||
} else {
|
} else {
|
||||||
prefix := " "
|
prefix := " "
|
||||||
if m.unread[room] {
|
if m.unread[key] {
|
||||||
prefix = "* "
|
prefix = "* "
|
||||||
}
|
}
|
||||||
lines = append(lines, styleRoom.Width(innerW).Render(prefix+label))
|
lines = append(lines, styleRoom.Width(innerW).Render(prefix+label))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for len(lines) < contentH {
|
for len(lines) < contentH {
|
||||||
lines = append(lines, strings.Repeat(" ", innerW))
|
lines = append(lines, strings.Repeat(" ", innerW))
|
||||||
}
|
}
|
||||||
@@ -513,17 +863,19 @@ func (m model) renderPeers(boxH int) string {
|
|||||||
var lines []string
|
var lines []string
|
||||||
lines = append(lines, styleHeader.Width(innerW).Render("Peers"))
|
lines = append(lines, styleHeader.Width(innerW).Render("Peers"))
|
||||||
lines = append(lines, lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW)))
|
lines = append(lines, lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW)))
|
||||||
// Local peer first
|
n := m.activeNetData()
|
||||||
if m.localAlias != "" {
|
if n != nil {
|
||||||
lines = append(lines, styleSelf.Width(innerW).Render("◉ "+m.localAlias+" (me)"))
|
if n.localAlias != "" {
|
||||||
|
lines = append(lines, styleSelf.Width(innerW).Render("◉ "+n.localAlias+" (me)"))
|
||||||
}
|
}
|
||||||
for _, pid := range m.peerOrder {
|
for _, pid := range n.peerOrder {
|
||||||
alias := m.peers[pid]
|
alias := n.peers[pid]
|
||||||
if alias == "" {
|
if alias == "" {
|
||||||
alias = shortID(pid)
|
alias = shortID(pid)
|
||||||
}
|
}
|
||||||
lines = append(lines, stylePeer.Width(innerW).Render("● "+alias))
|
lines = append(lines, stylePeer.Width(innerW).Render("● "+alias))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
for len(lines) < contentH {
|
for len(lines) < contentH {
|
||||||
lines = append(lines, strings.Repeat(" ", innerW))
|
lines = append(lines, strings.Repeat(" ", innerW))
|
||||||
}
|
}
|
||||||
@@ -536,8 +888,18 @@ func (m model) renderPeers(boxH int) string {
|
|||||||
|
|
||||||
func (m model) renderCentre(boxH int) string {
|
func (m model) renderCentre(boxH int) string {
|
||||||
innerW := m.vpContentWidth()
|
innerW := m.vpContentWidth()
|
||||||
room := m.activeRoomName()
|
n := m.activeNetData()
|
||||||
title := styleTitle.Width(innerW).Render(" " + roomTitle(room, m.peers))
|
var roomName string
|
||||||
|
if n != nil {
|
||||||
|
roomName = n.rooms[n.activeRoom]
|
||||||
|
} else {
|
||||||
|
roomName = "general"
|
||||||
|
}
|
||||||
|
var peerMap map[proto.PeerID]string
|
||||||
|
if n != nil {
|
||||||
|
peerMap = n.peers
|
||||||
|
}
|
||||||
|
title := styleTitle.Width(innerW).Render(" " + roomTitle(roomName, peerMap))
|
||||||
divider := lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW))
|
divider := lipgloss.NewStyle().Foreground(styleBorder).Render(strings.Repeat("─", innerW))
|
||||||
|
|
||||||
vpView := ""
|
vpView := ""
|
||||||
@@ -546,7 +908,6 @@ func (m model) renderCentre(boxH int) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
content := lipgloss.JoinVertical(lipgloss.Left, title, divider, vpView)
|
content := lipgloss.JoinVertical(lipgloss.Left, title, divider, vpView)
|
||||||
|
|
||||||
return lipgloss.NewStyle().
|
return lipgloss.NewStyle().
|
||||||
Width(innerW).Height(boxH - 2).
|
Width(innerW).Height(boxH - 2).
|
||||||
Border(lipgloss.RoundedBorder()).BorderForeground(styleBorder).
|
Border(lipgloss.RoundedBorder()).BorderForeground(styleBorder).
|
||||||
@@ -555,19 +916,6 @@ func (m model) renderCentre(boxH int) string {
|
|||||||
|
|
||||||
// ── helpers ───────────────────────────────────────────────────────────────────
|
// ── helpers ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
func (m model) aliasOf(id proto.PeerID) string {
|
|
||||||
if id == m.localID {
|
|
||||||
if m.localAlias != "" {
|
|
||||||
return m.localAlias
|
|
||||||
}
|
|
||||||
return "me"
|
|
||||||
}
|
|
||||||
if a, ok := m.peers[id]; ok && a != "" {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return shortID(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
func shortID(id proto.PeerID) string {
|
func shortID(id proto.PeerID) string {
|
||||||
s := string(id)
|
s := string(id)
|
||||||
if len(s) > 8 {
|
if len(s) > 8 {
|
||||||
@@ -582,26 +930,18 @@ func roomLabel(room string, peers map[proto.PeerID]string) string {
|
|||||||
}
|
}
|
||||||
if strings.HasPrefix(room, "dm:") {
|
if strings.HasPrefix(room, "dm:") {
|
||||||
pid := proto.PeerID(strings.TrimPrefix(room, "dm:"))
|
pid := proto.PeerID(strings.TrimPrefix(room, "dm:"))
|
||||||
|
if peers != nil {
|
||||||
if a, ok := peers[pid]; ok && a != "" {
|
if a, ok := peers[pid]; ok && a != "" {
|
||||||
return "@ " + a
|
return "@ " + a
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return "@ " + shortID(pid)
|
return "@ " + shortID(pid)
|
||||||
}
|
}
|
||||||
return "#" + room
|
return "#" + room
|
||||||
}
|
}
|
||||||
|
|
||||||
func roomTitle(room string, peers map[proto.PeerID]string) string {
|
func roomTitle(room string, peers map[proto.PeerID]string) string {
|
||||||
if room == "general" {
|
return roomLabel(room, peers)
|
||||||
return "#general"
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(room, "dm:") {
|
|
||||||
pid := proto.PeerID(strings.TrimPrefix(room, "dm:"))
|
|
||||||
if a, ok := peers[pid]; ok && a != "" {
|
|
||||||
return "@ " + a
|
|
||||||
}
|
|
||||||
return "@ " + shortID(pid)
|
|
||||||
}
|
|
||||||
return "#" + room
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func filterIDs(ids []proto.PeerID, remove proto.PeerID) []proto.PeerID {
|
func filterIDs(ids []proto.PeerID, remove proto.PeerID) []proto.PeerID {
|
||||||
@@ -614,6 +954,14 @@ func filterIDs(ids []proto.PeerID, remove proto.PeerID) []proto.PeerID {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func formatMsgTime(t time.Time) string {
|
||||||
|
now := time.Now()
|
||||||
|
if t.Year() == now.Year() && t.YearDay() == now.YearDay() {
|
||||||
|
return t.Format("15:04")
|
||||||
|
}
|
||||||
|
return t.Format("Jan 2 15:04")
|
||||||
|
}
|
||||||
|
|
||||||
func min(a, b int) int {
|
func min(a, b int) int {
|
||||||
if a < b {
|
if a < b {
|
||||||
return a
|
return a
|
||||||
@@ -625,11 +973,10 @@ func min(a, b int) int {
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
ipcPort := flag.Int("ipc", 17337, "daemon IPC port")
|
ipcPort := flag.Int("ipc", 17337, "daemon IPC port")
|
||||||
network := flag.String("network", "", "network name to join on startup")
|
network := flag.String("network", "", "network name to join on startup (optional)")
|
||||||
joinInvite := flag.String("join", "", "waste: invite string — auto-sets the network name")
|
joinInvite := flag.String("join", "", "waste: invite string — auto-sets the network name")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
// --join overrides --network.
|
|
||||||
if *joinInvite != "" {
|
if *joinInvite != "" {
|
||||||
inv, err := invite.Decode(*joinInvite)
|
inv, err := invite.Decode(*joinInvite)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -639,12 +986,6 @@ func main() {
|
|||||||
*network = inv.Network
|
*network = inv.Network
|
||||||
}
|
}
|
||||||
|
|
||||||
if *network == "" {
|
|
||||||
fmt.Fprintln(os.Stderr, "error: -network or -join is required")
|
|
||||||
flag.Usage()
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
p := tea.NewProgram(
|
p := tea.NewProgram(
|
||||||
newModel(*ipcPort, *network),
|
newModel(*ipcPort, *network),
|
||||||
tea.WithAltScreen(),
|
tea.WithAltScreen(),
|
||||||
|
|||||||
32
deploy-web.sh.example
Normal file
32
deploy-web.sh.example
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# deploy-web.sh — build and push the web UI to the VPS.
|
||||||
|
# Assumes SSH agent forwarding is set up.
|
||||||
|
#
|
||||||
|
# SETUP: copy this file to deploy-web.sh (gitignored) and set HOST below.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./deploy-web.sh
|
||||||
|
#
|
||||||
|
# Optional env vars:
|
||||||
|
# HOST SSH target (user@host) (required — edit below)
|
||||||
|
# REMOTE_DIR path on VPS (default: ~/waste-www)
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
HOST="${HOST:-user@YOUR_VPS_IP}" # ← edit this
|
||||||
|
REMOTE_DIR="${REMOTE_DIR:-~/waste-www}"
|
||||||
|
|
||||||
|
if [[ "$HOST" == *YOUR_VPS_IP* ]]; then
|
||||||
|
echo "error: edit HOST in this script (or export HOST=user@your-vps before running)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "→ building web UI…"
|
||||||
|
"$(dirname "$0")/build-web.sh"
|
||||||
|
|
||||||
|
echo "→ syncing to $HOST:$REMOTE_DIR"
|
||||||
|
rsync -azv --delete \
|
||||||
|
--exclude='config.js' \
|
||||||
|
web/dist/ "$HOST:$REMOTE_DIR/"
|
||||||
|
|
||||||
|
echo "✓ done"
|
||||||
@@ -127,6 +127,8 @@ func handleClient(conn net.Conn, mgr *netmgr.Manager) {
|
|||||||
|
|
||||||
// Send initial state snapshot.
|
// Send initial state snapshot.
|
||||||
send(stateSnapshot(mgr))
|
send(stateSnapshot(mgr))
|
||||||
|
// Send stored history for each room so the UI is populated on connect.
|
||||||
|
sendStoredHistory(mgr, send)
|
||||||
|
|
||||||
scanner := bufio.NewScanner(conn)
|
scanner := bufio.NewScanner(conn)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
@@ -214,6 +216,7 @@ func handleClient(conn net.Conn, mgr *netmgr.Manager) {
|
|||||||
} else {
|
} else {
|
||||||
// Group chat → spec "chat" type: flat {type, mid, room, text, ts}
|
// Group chat → spec "chat" type: flat {type, mid, room, text, ts}
|
||||||
mid := randomHex(16)
|
mid := randomHex(16)
|
||||||
|
msgID := proto.ComputeMsgID(n.Identity.PeerID(), cmd.Room, ts, cmd.Body)
|
||||||
wire, err := json.Marshal(proto.PeerMessage{
|
wire, err := json.Marshal(proto.PeerMessage{
|
||||||
Type: proto.MsgChat,
|
Type: proto.MsgChat,
|
||||||
Mid: mid,
|
Mid: mid,
|
||||||
@@ -227,6 +230,7 @@ func handleClient(conn net.Conn, mgr *netmgr.Manager) {
|
|||||||
n.Mesh.Broadcast(wire)
|
n.Mesh.Broadcast(wire)
|
||||||
local := &proto.ChatMessage{
|
local := &proto.ChatMessage{
|
||||||
Mid: mid,
|
Mid: mid,
|
||||||
|
MsgID: msgID,
|
||||||
From: n.Identity.PeerID(),
|
From: n.Identity.PeerID(),
|
||||||
Room: cmd.Room,
|
Room: cmd.Room,
|
||||||
Text: cmd.Body,
|
Text: cmd.Body,
|
||||||
@@ -240,6 +244,34 @@ func handleClient(conn net.Conn, mgr *netmgr.Manager) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case proto.CmdSendReaction:
|
||||||
|
n := mgr.Resolve(cmd.NetworkID)
|
||||||
|
if n == nil {
|
||||||
|
send(errMsg("send_reaction: not joined to any network"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if cmd.ReactionMID == "" || cmd.ReactionEmoji == "" {
|
||||||
|
send(errMsg("send_reaction: reaction_mid and reaction_emoji are required"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
wire, err := json.Marshal(proto.PeerMessage{
|
||||||
|
Type: proto.MsgReaction,
|
||||||
|
ReactionMID: cmd.ReactionMID,
|
||||||
|
ReactionEmoji: cmd.ReactionEmoji,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
n.Mesh.Broadcast(wire)
|
||||||
|
n.Mesh.SaveReaction(cmd.ReactionMID, cmd.ReactionEmoji, string(n.Identity.PeerID()))
|
||||||
|
n.Mesh.Emit(proto.IpcMessage{
|
||||||
|
Type: proto.EvtReaction,
|
||||||
|
NetworkID: n.ID,
|
||||||
|
PeerID: ptr(n.Identity.PeerID()),
|
||||||
|
ReactionMID: cmd.ReactionMID,
|
||||||
|
ReactionEmoji: cmd.ReactionEmoji,
|
||||||
|
})
|
||||||
|
|
||||||
case proto.CmdCreateRoom:
|
case proto.CmdCreateRoom:
|
||||||
n := mgr.Resolve(cmd.NetworkID)
|
n := mgr.Resolve(cmd.NetworkID)
|
||||||
if n == nil {
|
if n == nil {
|
||||||
@@ -455,11 +487,74 @@ func stateSnapshot(mgr *netmgr.Manager) proto.IpcMessage {
|
|||||||
msg.Rooms = append(msg.Rooms, r)
|
msg.Rooms = append(msg.Rooms, r)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Include all historically-known peers so the UI can resolve aliases in history.
|
||||||
|
if known, err := all[0].Store.KnownPeers(); err == nil {
|
||||||
|
connected := map[proto.PeerID]bool{}
|
||||||
|
for _, p := range msg.ConnectedPeers {
|
||||||
|
connected[p.ID] = true
|
||||||
|
}
|
||||||
|
for id, alias := range known {
|
||||||
|
if connected[id] {
|
||||||
|
continue // already in ConnectedPeers
|
||||||
|
}
|
||||||
|
msg.KnownPeers = append(msg.KnownPeers, proto.PeerInfo{
|
||||||
|
ID: id,
|
||||||
|
Alias: alias,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sendStoredHistory pushes recent messages for all known rooms to a newly-connected IPC client.
|
||||||
|
func sendStoredHistory(mgr *netmgr.Manager, send func(proto.IpcMessage)) {
|
||||||
|
all := mgr.All()
|
||||||
|
if len(all) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
n := all[0] // use first network; multi-network history follows same pattern
|
||||||
|
if n.Store == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rooms := []string{"general"}
|
||||||
|
if extra, err := n.Store.Rooms(); err == nil {
|
||||||
|
rooms = append(rooms, extra...)
|
||||||
|
}
|
||||||
|
for _, room := range rooms {
|
||||||
|
msgs, err := n.Store.RecentMessagesSince(room, 0, 200)
|
||||||
|
if err != nil || len(msgs) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
send(proto.IpcMessage{
|
||||||
|
Type: proto.EvtHistoryLoaded,
|
||||||
|
NetworkID: n.ID,
|
||||||
|
Room: room,
|
||||||
|
Messages: msgs,
|
||||||
|
})
|
||||||
|
// Send stored reactions for this room's messages.
|
||||||
|
rxns, err := n.Store.ReactionsForRoom(room)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for mid, byEmoji := range rxns {
|
||||||
|
for emoji, fromPeers := range byEmoji {
|
||||||
|
for _, fromPeer := range fromPeers {
|
||||||
|
pid := proto.PeerID(fromPeer)
|
||||||
|
send(proto.IpcMessage{
|
||||||
|
Type: proto.EvtReaction,
|
||||||
|
NetworkID: n.ID,
|
||||||
|
PeerID: &pid,
|
||||||
|
ReactionMID: mid,
|
||||||
|
ReactionEmoji: emoji,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func errMsg(s string) proto.IpcMessage {
|
func errMsg(s string) proto.IpcMessage {
|
||||||
return proto.IpcMessage{Type: proto.EvtError, ErrorMessage: s}
|
return proto.IpcMessage{Type: proto.EvtError, ErrorMessage: s}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
package mesh
|
package mesh
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -51,6 +52,12 @@ type Mesh struct {
|
|||||||
// attempt to connect to. Drained by the anchor client's runOnce loop.
|
// attempt to connect to. Drained by the anchor client's runOnce loop.
|
||||||
PendingConnect chan proto.PeerID
|
PendingConnect chan proto.PeerID
|
||||||
|
|
||||||
|
// historyRequested tracks rooms for which we have already sent a history_request
|
||||||
|
// this session. Reset on reconnect is intentional (new peers may have newer history).
|
||||||
|
historyMu sync.Mutex
|
||||||
|
historyRequested map[string]bool // room → true
|
||||||
|
historyFirstPeer proto.PeerID // ID of the peer we requested history from
|
||||||
|
|
||||||
// subscribers receive a copy of every event (fan-out to IPC clients)
|
// subscribers receive a copy of every event (fan-out to IPC clients)
|
||||||
subMu sync.Mutex
|
subMu sync.Mutex
|
||||||
subs []chan proto.IpcMessage
|
subs []chan proto.IpcMessage
|
||||||
@@ -66,6 +73,7 @@ func New(id *crypto.Identity, st *store.Store) *Mesh {
|
|||||||
outbound: make(map[string]*outboundTransfer),
|
outbound: make(map[string]*outboundTransfer),
|
||||||
inbound: make(map[string]*inboundTransfer),
|
inbound: make(map[string]*inboundTransfer),
|
||||||
PendingConnect: make(chan proto.PeerID, 32),
|
PendingConnect: make(chan proto.PeerID, 32),
|
||||||
|
historyRequested: make(map[string]bool),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,6 +146,17 @@ func (m *Mesh) AddPeer(conn *PeerConn) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SaveReaction persists a reaction if a store is configured.
|
||||||
|
// Duplicate (mid, emoji, fromPeer) triples are silently dropped.
|
||||||
|
func (m *Mesh) SaveReaction(mid, emoji, fromPeer string) {
|
||||||
|
if m.Store == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := m.Store.SaveReaction(mid, emoji, fromPeer); err != nil {
|
||||||
|
log.Printf("mesh: store reaction %s/%s: %v", mid, emoji, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// SaveMessage persists a chat message if a store is configured.
|
// SaveMessage persists a chat message if a store is configured.
|
||||||
// Duplicate mids are silently dropped.
|
// Duplicate mids are silently dropped.
|
||||||
func (m *Mesh) SaveMessage(msg *proto.ChatMessage) {
|
func (m *Mesh) SaveMessage(msg *proto.ChatMessage) {
|
||||||
@@ -235,6 +254,122 @@ func (m *Mesh) Unsubscribe(ch <-chan proto.IpcMessage) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RequestHistoryFrom sends history_request messages to peerID for all rooms
|
||||||
|
// we know about but haven't yet requested this session. Only contacts the first
|
||||||
|
// peer we connect to, to avoid fan-out amplification.
|
||||||
|
func (m *Mesh) RequestHistoryFrom(peerID proto.PeerID) {
|
||||||
|
if m.Store == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.historyMu.Lock()
|
||||||
|
if m.historyFirstPeer != "" && m.historyFirstPeer != peerID {
|
||||||
|
m.historyMu.Unlock()
|
||||||
|
return // only request from the first peer
|
||||||
|
}
|
||||||
|
m.historyFirstPeer = peerID
|
||||||
|
m.historyMu.Unlock()
|
||||||
|
|
||||||
|
rooms, err := m.Store.Rooms()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Always include "general" even if not explicitly created.
|
||||||
|
roomSet := map[string]bool{"general": true}
|
||||||
|
for _, r := range rooms {
|
||||||
|
roomSet[r] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
m.historyMu.Lock()
|
||||||
|
var toRequest []string
|
||||||
|
for r := range roomSet {
|
||||||
|
if !m.historyRequested[r] {
|
||||||
|
m.historyRequested[r] = true
|
||||||
|
toRequest = append(toRequest, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.historyMu.Unlock()
|
||||||
|
|
||||||
|
for _, room := range toRequest {
|
||||||
|
req, err := json.Marshal(proto.PeerMessage{
|
||||||
|
Type: proto.MsgHistoryRequest,
|
||||||
|
Room: room,
|
||||||
|
Limit: 200,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
m.SendTo(peerID, req)
|
||||||
|
log.Printf("mesh: sent history_request room=%s to %s", room, peerID.Short())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleHistoryRequest responds to a history_request from a peer.
|
||||||
|
func (m *Mesh) HandleHistoryRequest(from proto.PeerID, room string, sinceMs int64, limit int) {
|
||||||
|
if m.Store == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
msgs, err := m.Store.RecentMessagesSince(room, sinceMs, limit)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("mesh: history_request from %s room=%s: %v", from.Short(), room, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Look up aliases for from_peer values.
|
||||||
|
entries := make([]proto.HistoryEntry, 0, len(msgs))
|
||||||
|
for _, msg := range msgs {
|
||||||
|
entries = append(entries, proto.HistoryEntry{
|
||||||
|
Mid: msg.Mid,
|
||||||
|
From: string(msg.From),
|
||||||
|
FromAlias: m.Store.PeerAlias(msg.From),
|
||||||
|
Text: msg.Text,
|
||||||
|
Ts: msg.Ts,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
chunk, err := json.Marshal(proto.PeerMessage{
|
||||||
|
Type: proto.MsgHistoryChunk,
|
||||||
|
Room: room,
|
||||||
|
History: entries,
|
||||||
|
HistoryDone: true,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.SendTo(from, chunk)
|
||||||
|
log.Printf("mesh: sent history_chunk room=%s to %s: %d msgs", room, from.Short(), len(entries))
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleHistoryChunk saves received history messages and emits history_loaded.
|
||||||
|
func (m *Mesh) HandleHistoryChunk(room string, entries []proto.HistoryEntry) {
|
||||||
|
if m.Store == nil || len(entries) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var saved []proto.ChatMessage
|
||||||
|
for _, e := range entries {
|
||||||
|
msg := &proto.ChatMessage{
|
||||||
|
Mid: e.Mid,
|
||||||
|
MsgID: e.Mid, // mid is already content-addressed for gossipped messages
|
||||||
|
From: proto.PeerID(e.From),
|
||||||
|
Room: room,
|
||||||
|
Text: e.Text,
|
||||||
|
Ts: e.Ts,
|
||||||
|
}
|
||||||
|
if err := m.Store.SaveMessage(msg); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
saved = append(saved, *msg)
|
||||||
|
}
|
||||||
|
if len(saved) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.emit(proto.IpcMessage{
|
||||||
|
Type: proto.EvtHistoryLoaded,
|
||||||
|
Room: room,
|
||||||
|
Messages: saved,
|
||||||
|
})
|
||||||
|
log.Printf("mesh: history_chunk room=%s: %d/%d new messages", room, len(saved), len(entries))
|
||||||
|
}
|
||||||
|
|
||||||
// Emit sends an event to all IPC subscribers (exported for ipc/nat packages).
|
// Emit sends an event to all IPC subscribers (exported for ipc/nat packages).
|
||||||
func (m *Mesh) Emit(msg proto.IpcMessage) {
|
func (m *Mesh) Emit(msg proto.IpcMessage) {
|
||||||
m.emit(msg)
|
m.emit(msg)
|
||||||
|
|||||||
@@ -197,6 +197,8 @@ func handleDCMessage(data []byte, from proto.PeerID, localID *crypto.Identity, m
|
|||||||
})
|
})
|
||||||
// Tell the new peer about everyone we can currently see.
|
// Tell the new peer about everyone we can currently see.
|
||||||
go m.sendGossipTo(from)
|
go m.sendGossipTo(from)
|
||||||
|
// Request message history from this peer (EXT-007).
|
||||||
|
go m.RequestHistoryFrom(from)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,6 +215,7 @@ func dispatchPeerMessage(msg proto.PeerMessage, from proto.PeerID, m *Mesh) {
|
|||||||
case proto.MsgChat:
|
case proto.MsgChat:
|
||||||
chat := &proto.ChatMessage{
|
chat := &proto.ChatMessage{
|
||||||
Mid: midOrRandom(msg.Mid),
|
Mid: midOrRandom(msg.Mid),
|
||||||
|
MsgID: proto.ComputeMsgID(from, msg.Room, msg.Ts, msg.Text),
|
||||||
From: from,
|
From: from,
|
||||||
Room: msg.Room,
|
Room: msg.Room,
|
||||||
Text: msg.Text,
|
Text: msg.Text,
|
||||||
@@ -298,6 +301,24 @@ func dispatchPeerMessage(msg proto.PeerMessage, from proto.PeerID, m *Mesh) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.Printf("mesh: gossip from %s: %d hints, %d new", from.Short(), len(msg.Gossip.Peers), newPeers)
|
log.Printf("mesh: gossip from %s: %d hints, %d new", from.Short(), len(msg.Gossip.Peers), newPeers)
|
||||||
|
case proto.MsgHistoryRequest:
|
||||||
|
go m.HandleHistoryRequest(from, msg.Room, msg.Since, msg.Limit)
|
||||||
|
|
||||||
|
case proto.MsgHistoryChunk:
|
||||||
|
go m.HandleHistoryChunk(msg.Room, msg.History)
|
||||||
|
|
||||||
|
case proto.MsgReaction:
|
||||||
|
if msg.ReactionMID == "" || msg.ReactionEmoji == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.SaveReaction(msg.ReactionMID, msg.ReactionEmoji, string(from))
|
||||||
|
m.emit(proto.IpcMessage{
|
||||||
|
Type: proto.EvtReaction,
|
||||||
|
PeerID: peerIDPtr(from),
|
||||||
|
ReactionMID: msg.ReactionMID,
|
||||||
|
ReactionEmoji: msg.ReactionEmoji,
|
||||||
|
})
|
||||||
|
|
||||||
case proto.MsgPing:
|
case proto.MsgPing:
|
||||||
log.Printf("mesh: ping from %s", from.Short())
|
log.Printf("mesh: ping from %s", from.Short())
|
||||||
case proto.MsgPong:
|
case proto.MsgPong:
|
||||||
|
|||||||
@@ -91,6 +91,47 @@ func writePartialMeta(path string, t *inboundTransfer) {
|
|||||||
os.WriteFile(path, data, 0o644) //nolint:errcheck
|
os.WriteFile(path, data, 0o644) //nolint:errcheck
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ScanResumable scans the download directory for .tmp.meta sidecars left by
|
||||||
|
// interrupted transfers and emits a resumable_transfers IPC event listing them.
|
||||||
|
// Called once after a network is joined so the UI can show pending transfers.
|
||||||
|
func (m *Mesh) ScanResumable() {
|
||||||
|
if m.DownloadDir == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
metas, _ := filepath.Glob(filepath.Join(m.DownloadDir, "*.tmp.meta"))
|
||||||
|
var files []proto.ResumableFile
|
||||||
|
for _, mp := range metas {
|
||||||
|
data, err := os.ReadFile(mp)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var meta partialMeta
|
||||||
|
if err := json.Unmarshal(data, &meta); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
tp := strings.TrimSuffix(mp, ".meta")
|
||||||
|
info, err := os.Stat(tp)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
files = append(files, proto.ResumableFile{
|
||||||
|
Name: meta.Name,
|
||||||
|
SHA256: meta.SHA256,
|
||||||
|
From: meta.From,
|
||||||
|
Size: meta.Size,
|
||||||
|
Offset: info.Size(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if len(files) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.emit(proto.IpcMessage{
|
||||||
|
Type: proto.EvtResumableTransfers,
|
||||||
|
ResumableFiles: files,
|
||||||
|
})
|
||||||
|
log.Printf("transfer: %d resumable transfer(s) found in %s", len(files), m.DownloadDir)
|
||||||
|
}
|
||||||
|
|
||||||
// OfferFile reads filename from ShareDir, computes its SHA-256, and sends a
|
// OfferFile reads filename from ShareDir, computes its SHA-256, and sends a
|
||||||
// file-offer to peerID over the existing "yaw" DataChannel.
|
// file-offer to peerID over the existing "yaw" DataChannel.
|
||||||
func (m *Mesh) OfferFile(peerID proto.PeerID, filename string) error {
|
func (m *Mesh) OfferFile(peerID proto.PeerID, filename string) error {
|
||||||
|
|||||||
@@ -162,6 +162,8 @@ func (mgr *Manager) Join(name, shareDir string) (string, error) {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
go m.ScanResumable()
|
||||||
|
|
||||||
mgr.emit(proto.IpcMessage{
|
mgr.emit(proto.IpcMessage{
|
||||||
Type: proto.EvtNetworkJoined,
|
Type: proto.EvtNetworkJoined,
|
||||||
NetworkID: netID,
|
NetworkID: netID,
|
||||||
@@ -249,6 +251,8 @@ func (mgr *Manager) JoinByHash(netHash64, shareDir string) (string, error) {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
go m.ScanResumable()
|
||||||
|
|
||||||
mgr.emit(proto.IpcMessage{
|
mgr.emit(proto.IpcMessage{
|
||||||
Type: proto.EvtNetworkJoined,
|
Type: proto.EvtNetworkJoined,
|
||||||
NetworkID: netID,
|
NetworkID: netID,
|
||||||
|
|||||||
@@ -3,7 +3,11 @@
|
|||||||
// Binary data (keys, signatures) is hex-encoded; signaling boxes are base64.
|
// Binary data (keys, signatures) is hex-encoded; signaling boxes are base64.
|
||||||
package proto
|
package proto
|
||||||
|
|
||||||
import "time"
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
// ── Identity ──────────────────────────────────────────────────────────────────
|
// ── Identity ──────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -45,6 +49,9 @@ const (
|
|||||||
MsgFileDone MsgType = "file-done"
|
MsgFileDone MsgType = "file-done"
|
||||||
MsgPing MsgType = "ping"
|
MsgPing MsgType = "ping"
|
||||||
MsgPong MsgType = "pong"
|
MsgPong MsgType = "pong"
|
||||||
|
MsgHistoryRequest MsgType = "history_request"
|
||||||
|
MsgHistoryChunk MsgType = "history_chunk"
|
||||||
|
MsgReaction MsgType = "reaction"
|
||||||
)
|
)
|
||||||
|
|
||||||
// PmMessage is a private message sent directly over a single peer link (§8 "pm").
|
// PmMessage is a private message sent directly over a single peer link (§8 "pm").
|
||||||
@@ -83,12 +90,43 @@ type PeerMessage struct {
|
|||||||
Reason string `json:"reason,omitempty"` // file-cancel
|
Reason string `json:"reason,omitempty"` // file-cancel
|
||||||
|
|
||||||
Seq *uint64 `json:"seq,omitempty"` // ping/pong
|
Seq *uint64 `json:"seq,omitempty"` // ping/pong
|
||||||
|
|
||||||
|
// history_request fields
|
||||||
|
Since int64 `json:"since,omitempty"` // Unix ms; 0 = no lower bound
|
||||||
|
Limit int `json:"limit,omitempty"`
|
||||||
|
|
||||||
|
// history_chunk fields
|
||||||
|
History []HistoryEntry `json:"history,omitempty"`
|
||||||
|
HistoryDone bool `json:"history_done,omitempty"`
|
||||||
|
|
||||||
|
// reaction fields
|
||||||
|
ReactionMID string `json:"reaction_mid,omitempty"`
|
||||||
|
ReactionEmoji string `json:"reaction_emoji,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResumableFile describes a partially-downloaded file found on daemon startup.
|
||||||
|
type ResumableFile struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
SHA256 string `json:"sha256"`
|
||||||
|
From string `json:"from"` // peer ID hex
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
Offset int64 `json:"offset"` // bytes already received
|
||||||
|
}
|
||||||
|
|
||||||
|
// HistoryEntry is one message in a history_chunk response.
|
||||||
|
type HistoryEntry struct {
|
||||||
|
Mid string `json:"mid"`
|
||||||
|
From string `json:"from"` // peer ID hex
|
||||||
|
FromAlias string `json:"from_alias"` // advisory
|
||||||
|
Text string `json:"text"`
|
||||||
|
Ts int64 `json:"ts"` // Unix ms
|
||||||
}
|
}
|
||||||
|
|
||||||
// ChatMessage is a group chat message (wire type "chat", §8).
|
// ChatMessage is a group chat message (wire type "chat", §8).
|
||||||
// Also used internally for persisting PMs after they are received.
|
// Also used internally for persisting PMs after they are received.
|
||||||
type ChatMessage struct {
|
type ChatMessage struct {
|
||||||
Mid string `json:"mid,omitempty"` // optional dedup id (required when relay hops > 0)
|
Mid string `json:"mid,omitempty"` // optional dedup id (required when relay hops > 0)
|
||||||
|
MsgID string `json:"msg_id,omitempty"` // EXT-007: content-addressed gossip ID
|
||||||
From PeerID `json:"from,omitempty"` // set by receiver from DC context; not on wire for pm
|
From PeerID `json:"from,omitempty"` // set by receiver from DC context; not on wire for pm
|
||||||
To *PeerID `json:"to,omitempty"` // internal only — not transmitted; set for DMs
|
To *PeerID `json:"to,omitempty"` // internal only — not transmitted; set for DMs
|
||||||
Room string `json:"room"`
|
Room string `json:"room"`
|
||||||
@@ -96,6 +134,14 @@ type ChatMessage struct {
|
|||||||
Ts int64 `json:"ts"` // Unix milliseconds
|
Ts int64 `json:"ts"` // Unix milliseconds
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ComputeMsgID returns the EXT-007 content-addressed ID for a message.
|
||||||
|
// sha256(fromID \x00 room \x00 ts_decimal \x00 text)
|
||||||
|
func ComputeMsgID(fromID PeerID, room string, ts int64, text string) string {
|
||||||
|
h := sha256.New()
|
||||||
|
fmt.Fprintf(h, "%s\x00%s\x00%d\x00%s", string(fromID), room, ts, text)
|
||||||
|
return fmt.Sprintf("sha256:%x", h.Sum(nil))
|
||||||
|
}
|
||||||
|
|
||||||
// PeerGossip shares known peer addresses.
|
// PeerGossip shares known peer addresses.
|
||||||
type PeerGossip struct {
|
type PeerGossip struct {
|
||||||
Peers []GossipEntry `json:"peers"`
|
Peers []GossipEntry `json:"peers"`
|
||||||
@@ -239,6 +285,7 @@ const (
|
|||||||
CmdListShares IpcMsgType = "list_shares" // returns shares_list event
|
CmdListShares IpcMsgType = "list_shares" // returns shares_list event
|
||||||
CmdCreateRoom IpcMsgType = "create_room" // field: room (name)
|
CmdCreateRoom IpcMsgType = "create_room" // field: room (name)
|
||||||
CmdSetDownloadDir IpcMsgType = "set_download_dir" // set per-network download directory at runtime; fields: network_id, path
|
CmdSetDownloadDir IpcMsgType = "set_download_dir" // set per-network download directory at runtime; fields: network_id, path
|
||||||
|
CmdSendReaction IpcMsgType = "send_reaction" // fields: network_id, reaction_mid, reaction_emoji
|
||||||
|
|
||||||
// Events (daemon → UI)
|
// Events (daemon → UI)
|
||||||
EvtMessageReceived IpcMsgType = "message_received"
|
EvtMessageReceived IpcMsgType = "message_received"
|
||||||
@@ -259,6 +306,9 @@ const (
|
|||||||
EvtIdentityImported IpcMsgType = "identity_imported"
|
EvtIdentityImported IpcMsgType = "identity_imported"
|
||||||
EvtSharesList IpcMsgType = "shares_list"
|
EvtSharesList IpcMsgType = "shares_list"
|
||||||
EvtRoomCreated IpcMsgType = "room_created" // field: room (name)
|
EvtRoomCreated IpcMsgType = "room_created" // field: room (name)
|
||||||
|
EvtHistoryLoaded IpcMsgType = "history_loaded" // fields: room, messages
|
||||||
|
EvtResumableTransfers IpcMsgType = "resumable_transfers" // field: resumable_files
|
||||||
|
EvtReaction IpcMsgType = "reaction" // fields: reaction_mid, reaction_emoji, peer_id
|
||||||
)
|
)
|
||||||
|
|
||||||
// NetworkInfo summarises one joined network for state_snapshot and network_joined events.
|
// NetworkInfo summarises one joined network for state_snapshot and network_joined events.
|
||||||
@@ -307,12 +357,17 @@ type IpcMessage struct {
|
|||||||
MasterID string `json:"master_id,omitempty"` // daemon's master public key hex
|
MasterID string `json:"master_id,omitempty"` // daemon's master public key hex
|
||||||
LocalPeer *PeerInfo `json:"local_peer,omitempty"`
|
LocalPeer *PeerInfo `json:"local_peer,omitempty"`
|
||||||
ConnectedPeers []PeerInfo `json:"connected_peers,omitempty"`
|
ConnectedPeers []PeerInfo `json:"connected_peers,omitempty"`
|
||||||
|
KnownPeers []PeerInfo `json:"known_peers,omitempty"` // historically seen, not currently connected
|
||||||
Rooms []string `json:"rooms,omitempty"`
|
Rooms []string `json:"rooms,omitempty"`
|
||||||
// multi-network: all joined networks (additive)
|
// multi-network: all joined networks (additive)
|
||||||
Networks []NetworkInfo `json:"networks,omitempty"`
|
Networks []NetworkInfo `json:"networks,omitempty"`
|
||||||
ErrorMessage string `json:"error_message,omitempty"`
|
ErrorMessage string `json:"error_message,omitempty"`
|
||||||
InviteGenerated string `json:"invite,omitempty"`
|
InviteGenerated string `json:"invite,omitempty"`
|
||||||
Files []FileEntry `json:"files,omitempty"`
|
Files []FileEntry `json:"files,omitempty"`
|
||||||
|
Messages []ChatMessage `json:"messages,omitempty"` // history_loaded
|
||||||
|
ResumableFiles []ResumableFile `json:"resumable_files,omitempty"` // resumable_transfers
|
||||||
|
ReactionMID string `json:"reaction_mid,omitempty"` // reaction
|
||||||
|
ReactionEmoji string `json:"reaction_emoji,omitempty"` // reaction
|
||||||
Shares []ShareEntry `json:"shares,omitempty"`
|
Shares []ShareEntry `json:"shares,omitempty"`
|
||||||
ShareNetworks []string `json:"network_ids,omitempty"` // for add_share command: scope to specific network IDs, or ["*"] for global
|
ShareNetworks []string `json:"network_ids,omitempty"` // for add_share command: scope to specific network IDs, or ["*"] for global
|
||||||
// export_identity / import_identity
|
// export_identity / import_identity
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ package store
|
|||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
@@ -35,6 +36,23 @@ CREATE TABLE IF NOT EXISTS rooms (
|
|||||||
);
|
);
|
||||||
`
|
`
|
||||||
|
|
||||||
|
// migrations run after the base schema. ALTER TABLE ADD COLUMN fails with
|
||||||
|
// "duplicate column name" on subsequent opens — we swallow that error.
|
||||||
|
// CREATE TABLE IF NOT EXISTS and CREATE INDEX IF NOT EXISTS are idempotent.
|
||||||
|
var migrations = []string{
|
||||||
|
// EXT-007: canonical message ID for history dedup (NULL for pre-feature messages).
|
||||||
|
`ALTER TABLE messages ADD COLUMN msg_id TEXT`,
|
||||||
|
`CREATE UNIQUE INDEX IF NOT EXISTS idx_messages_msg_id ON messages (msg_id) WHERE msg_id IS NOT NULL`,
|
||||||
|
// Reactions: (mid, emoji, from_peer) triple is the unique dedup key.
|
||||||
|
`CREATE TABLE IF NOT EXISTS reactions (
|
||||||
|
mid TEXT NOT NULL,
|
||||||
|
emoji TEXT NOT NULL,
|
||||||
|
from_peer TEXT NOT NULL,
|
||||||
|
reacted_at DATETIME NOT NULL,
|
||||||
|
PRIMARY KEY (mid, emoji, from_peer)
|
||||||
|
)`,
|
||||||
|
}
|
||||||
|
|
||||||
// Store is a local SQLite-backed message and peer store.
|
// Store is a local SQLite-backed message and peer store.
|
||||||
type Store struct {
|
type Store struct {
|
||||||
db *sql.DB
|
db *sql.DB
|
||||||
@@ -51,6 +69,12 @@ func Open(path string) (*Store, error) {
|
|||||||
db.Close()
|
db.Close()
|
||||||
return nil, fmt.Errorf("migrate db: %w", err)
|
return nil, fmt.Errorf("migrate db: %w", err)
|
||||||
}
|
}
|
||||||
|
for _, m := range migrations {
|
||||||
|
if _, err := db.Exec(m); err != nil && !strings.Contains(err.Error(), "duplicate column") {
|
||||||
|
db.Close()
|
||||||
|
return nil, fmt.Errorf("migration %q: %w", m, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
return &Store{db: db}, nil
|
return &Store{db: db}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,9 +88,9 @@ func (s *Store) Close() error {
|
|||||||
func (s *Store) SaveMessage(msg *proto.ChatMessage) error {
|
func (s *Store) SaveMessage(msg *proto.ChatMessage) error {
|
||||||
sentAt := time.UnixMilli(msg.Ts).UTC()
|
sentAt := time.UnixMilli(msg.Ts).UTC()
|
||||||
_, err := s.db.Exec(
|
_, err := s.db.Exec(
|
||||||
`INSERT OR IGNORE INTO messages (mid, room, from_peer, body, sent_at)
|
`INSERT OR IGNORE INTO messages (mid, msg_id, room, from_peer, body, sent_at)
|
||||||
VALUES (?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
msg.Mid, msg.Room, string(msg.From), msg.Text, sentAt,
|
msg.Mid, nullableString(msg.MsgID), msg.Room, string(msg.From), msg.Text, sentAt,
|
||||||
)
|
)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -91,14 +115,39 @@ func (s *Store) PeerAlias(peerID proto.PeerID) string {
|
|||||||
|
|
||||||
// RecentMessages returns up to limit messages for a room, oldest first.
|
// RecentMessages returns up to limit messages for a room, oldest first.
|
||||||
func (s *Store) RecentMessages(room string, limit int) ([]proto.ChatMessage, error) {
|
func (s *Store) RecentMessages(room string, limit int) ([]proto.ChatMessage, error) {
|
||||||
rows, err := s.db.Query(
|
return s.queryMessages(
|
||||||
`SELECT mid, from_peer, body, sent_at
|
`SELECT mid, from_peer, room, body, sent_at FROM messages
|
||||||
FROM messages
|
|
||||||
WHERE room = ?
|
WHERE room = ?
|
||||||
ORDER BY sent_at DESC
|
ORDER BY sent_at DESC LIMIT ?`,
|
||||||
LIMIT ?`,
|
|
||||||
room, limit,
|
room, limit,
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecentMessagesSince returns up to limit messages for a room with ts > sinceMs, oldest first.
|
||||||
|
// sinceMs == 0 returns the most recent messages regardless of timestamp.
|
||||||
|
func (s *Store) RecentMessagesSince(room string, sinceMs int64, limit int) ([]proto.ChatMessage, error) {
|
||||||
|
if limit <= 0 || limit > 500 {
|
||||||
|
limit = 500
|
||||||
|
}
|
||||||
|
if sinceMs == 0 {
|
||||||
|
return s.queryMessages(
|
||||||
|
`SELECT mid, from_peer, room, body, sent_at FROM messages
|
||||||
|
WHERE room = ?
|
||||||
|
ORDER BY sent_at DESC LIMIT ?`,
|
||||||
|
room, limit,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
since := time.UnixMilli(sinceMs).UTC()
|
||||||
|
return s.queryMessages(
|
||||||
|
`SELECT mid, from_peer, room, body, sent_at FROM messages
|
||||||
|
WHERE room = ? AND sent_at > ?
|
||||||
|
ORDER BY sent_at DESC LIMIT ?`,
|
||||||
|
room, since, limit,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) queryMessages(q string, args ...any) ([]proto.ChatMessage, error) {
|
||||||
|
rows, err := s.db.Query(q, args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -109,11 +158,10 @@ func (s *Store) RecentMessages(room string, limit int) ([]proto.ChatMessage, err
|
|||||||
var m proto.ChatMessage
|
var m proto.ChatMessage
|
||||||
var from string
|
var from string
|
||||||
var sentAt time.Time
|
var sentAt time.Time
|
||||||
if err := rows.Scan(&m.Mid, &from, &m.Text, &sentAt); err != nil {
|
if err := rows.Scan(&m.Mid, &from, &m.Room, &m.Text, &sentAt); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
m.From = proto.PeerID(from)
|
m.From = proto.PeerID(from)
|
||||||
m.Room = room
|
|
||||||
m.Ts = sentAt.UnixMilli()
|
m.Ts = sentAt.UnixMilli()
|
||||||
msgs = append(msgs, m)
|
msgs = append(msgs, m)
|
||||||
}
|
}
|
||||||
@@ -168,3 +216,47 @@ func (s *Store) KnownPeers() (map[proto.PeerID]string, error) {
|
|||||||
}
|
}
|
||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SaveReaction persists a reaction. Duplicate (mid, emoji, from_peer) triples are silently ignored.
|
||||||
|
func (s *Store) SaveReaction(mid, emoji, fromPeer string) error {
|
||||||
|
_, err := s.db.Exec(
|
||||||
|
`INSERT OR IGNORE INTO reactions (mid, emoji, from_peer, reacted_at) VALUES (?, ?, ?, ?)`,
|
||||||
|
mid, emoji, fromPeer, time.Now().UTC(),
|
||||||
|
)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReactionsForRoom returns all reactions for messages in a given room.
|
||||||
|
// Result: mid → emoji → []fromPeer (ordered by reaction time).
|
||||||
|
func (s *Store) ReactionsForRoom(room string) (map[string]map[string][]string, error) {
|
||||||
|
rows, err := s.db.Query(`
|
||||||
|
SELECT r.mid, r.emoji, r.from_peer
|
||||||
|
FROM reactions r
|
||||||
|
JOIN messages m ON m.mid = r.mid
|
||||||
|
WHERE m.room = ?
|
||||||
|
ORDER BY r.reacted_at
|
||||||
|
`, room)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]map[string][]string)
|
||||||
|
for rows.Next() {
|
||||||
|
var mid, emoji, from string
|
||||||
|
if err := rows.Scan(&mid, &emoji, &from); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out[mid] == nil {
|
||||||
|
out[mid] = make(map[string][]string)
|
||||||
|
}
|
||||||
|
out[mid][emoji] = append(out[mid][emoji], from)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func nullableString(s string) any {
|
||||||
|
if s == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|||||||
96
launch-tui.sh.example
Normal file
96
launch-tui.sh.example
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# launch-tui.sh — build and launch the TUI against a remote anchor.
|
||||||
|
# Starts a local daemon then opens the Bubble Tea terminal UI.
|
||||||
|
#
|
||||||
|
# SETUP: copy this file to launch-tui.sh (gitignored) and set ANCHOR below.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./launch-tui.sh
|
||||||
|
# ALIAS=alice NETWORK=friends ./launch-tui.sh
|
||||||
|
#
|
||||||
|
# Optional env vars (all have defaults):
|
||||||
|
# ANCHOR anchor WebSocket URL (required — edit below)
|
||||||
|
# NETWORK network name to join (default: "friends")
|
||||||
|
# ALIAS display name (default: $USER)
|
||||||
|
# DATA_DIR identity + message store dir (default: ~/.waste-$ALIAS)
|
||||||
|
# IPC_PORT local daemon IPC port (default: 17337)
|
||||||
|
# SHARE_DIR directory to share with peers (optional)
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ANCHOR="${ANCHOR:-wss://YOUR_ANCHOR_DOMAIN/ws}" # ← edit this
|
||||||
|
|
||||||
|
NETWORK="${NETWORK:-friends}"
|
||||||
|
ALIAS="${ALIAS:-${USER:-anon}}"
|
||||||
|
DATA_DIR="${DATA_DIR:-${HOME}/.waste-${ALIAS}}"
|
||||||
|
|
||||||
|
_DEFAULT_ALIAS="${USER:-anon}"
|
||||||
|
if [ "${ALIAS}" = "${_DEFAULT_ALIAS}" ]; then
|
||||||
|
IPC_PORT="${IPC_PORT:-17337}"
|
||||||
|
else
|
||||||
|
_HASH=$(printf '%d' "0x$(printf '%s' "$ALIAS" | md5sum | cut -c1-4)")
|
||||||
|
IPC_PORT="${IPC_PORT:-$(( 17400 + _HASH % 1000 ))}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
SHARE_DIR="${SHARE_DIR:-}"
|
||||||
|
|
||||||
|
RED='\033[0;31m'; GREEN='\033[0;32m'; DIM='\033[2m'; BOLD='\033[1m'; RESET='\033[0m'
|
||||||
|
|
||||||
|
if [[ "$ANCHOR" == *YOUR_ANCHOR_DOMAIN* ]]; then
|
||||||
|
echo -e "${RED}error: edit ANCHOR in this script (or export ANCHOR=wss://... before running)${RESET}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$DATA_DIR"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo -e "${BOLD}waste TUI${RESET}"
|
||||||
|
echo -e "${DIM}anchor : ${BOLD}${ANCHOR}${RESET}"
|
||||||
|
echo -e "${DIM}network : ${BOLD}${NETWORK}${RESET}"
|
||||||
|
echo -e "${DIM}alias : ${BOLD}${ALIAS}${RESET}"
|
||||||
|
echo -e "${DIM}data : ${DATA_DIR}${RESET}"
|
||||||
|
[ -n "$SHARE_DIR" ] && echo -e "${DIM}share : ${SHARE_DIR}${RESET}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo -e "${DIM}building binaries…${RESET}"
|
||||||
|
go build -o /tmp/waste-daemon-run ./cmd/daemon
|
||||||
|
go build -o /tmp/waste-tui-run ./cmd/tui
|
||||||
|
echo -e "${GREEN}✓ built${RESET}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
existing=$(lsof -ti tcp:"$IPC_PORT" 2>/dev/null || true)
|
||||||
|
[ -n "$existing" ] && kill "$existing" 2>/dev/null && sleep 0.3 || true
|
||||||
|
|
||||||
|
echo -e "${DIM}starting daemon on :${IPC_PORT}…${RESET}"
|
||||||
|
WS_PORT=$(( IPC_PORT + 1 ))
|
||||||
|
/tmp/waste-daemon-run \
|
||||||
|
-alias "$ALIAS" -data-dir "$DATA_DIR" \
|
||||||
|
-ipc-port "$IPC_PORT" -ws-port "$WS_PORT" \
|
||||||
|
-anchor "$ANCHOR" \
|
||||||
|
2>/tmp/waste-daemon.log &
|
||||||
|
DAEMON_PID=$!
|
||||||
|
|
||||||
|
n=0
|
||||||
|
while ! nc -z 127.0.0.1 "$IPC_PORT" 2>/dev/null; do
|
||||||
|
sleep 0.1; n=$(( n + 1 ))
|
||||||
|
[ "$n" -gt 80 ] && echo -e "${RED}daemon failed — check /tmp/waste-daemon.log${RESET}" >&2 && exit 1
|
||||||
|
done
|
||||||
|
echo -e "${GREEN}✓ daemon started (pid ${DAEMON_PID})${RESET}"
|
||||||
|
|
||||||
|
sleep 0.3
|
||||||
|
if [ -n "$SHARE_DIR" ]; then
|
||||||
|
JOIN=$(jq -cn --arg net "$NETWORK" --arg dir "$SHARE_DIR" \
|
||||||
|
'{"type":"join_network","network_name":$net,"share_dir":$dir}')
|
||||||
|
else
|
||||||
|
JOIN=$(jq -cn --arg net "$NETWORK" '{"type":"join_network","network_name":$net}')
|
||||||
|
fi
|
||||||
|
echo "$JOIN" | nc -q 0 127.0.0.1 "$IPC_PORT" >/dev/null 2>&1 || true
|
||||||
|
echo -e "${DIM}joined network: ${BOLD}${NETWORK}${RESET}"
|
||||||
|
|
||||||
|
cleanup() { kill "$DAEMON_PID" 2>/dev/null || true; }
|
||||||
|
trap cleanup EXIT INT TERM
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo -e "${BOLD}launching TUI${RESET} — ${DIM}ctrl+c to quit${RESET}"
|
||||||
|
echo ""
|
||||||
|
exec /tmp/waste-tui-run -ipc "$IPC_PORT" -network "$NETWORK"
|
||||||
74
launch-web.sh.example
Normal file
74
launch-web.sh.example
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# launch-web.sh — start the daemon and open the web UI Vite dev server.
|
||||||
|
# For local development / daemon-mode browsing.
|
||||||
|
#
|
||||||
|
# SETUP: copy this file to launch-web.sh (gitignored) and set ANCHOR below.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./launch-web.sh
|
||||||
|
# ALIAS=alice NETWORK=friends ./launch-web.sh
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ANCHOR="${ANCHOR:-wss://YOUR_ANCHOR_DOMAIN/ws}" # ← edit this
|
||||||
|
|
||||||
|
NETWORK="${NETWORK:-friends}"
|
||||||
|
ALIAS="${ALIAS:-${USER:-anon}}"
|
||||||
|
DATA_DIR="${DATA_DIR:-${HOME}/.waste-${ALIAS}}"
|
||||||
|
IPC_PORT="${IPC_PORT:-17337}"
|
||||||
|
WS_PORT=$(( IPC_PORT + 1 ))
|
||||||
|
|
||||||
|
if [[ "$ANCHOR" == *YOUR_ANCHOR_DOMAIN* ]]; then
|
||||||
|
echo "error: edit ANCHOR in this script (or export ANCHOR=wss://... before running)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PIDS=()
|
||||||
|
cleanup() {
|
||||||
|
for pid in "${PIDS[@]:-}"; do kill "$pid" 2>/dev/null || true; done
|
||||||
|
wait 2>/dev/null || true
|
||||||
|
}
|
||||||
|
trap cleanup EXIT INT TERM
|
||||||
|
|
||||||
|
for port in "$IPC_PORT" "$WS_PORT"; do
|
||||||
|
existing=$(lsof -ti tcp:"$port" 2>/dev/null || true)
|
||||||
|
[ -n "$existing" ] && kill "$existing" 2>/dev/null || true
|
||||||
|
done
|
||||||
|
for port in "$IPC_PORT" "$WS_PORT"; do
|
||||||
|
n=0
|
||||||
|
while lsof -ti tcp:"$port" >/dev/null 2>&1; do
|
||||||
|
sleep 0.1; n=$(( n + 1 )); [ "$n" -gt 30 ] && break
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
mkdir -p "$DATA_DIR"
|
||||||
|
|
||||||
|
echo "alias : $ALIAS"
|
||||||
|
echo "network : $NETWORK"
|
||||||
|
echo "anchor : $ANCHOR"
|
||||||
|
echo "ws-port : $WS_PORT"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo "building daemon…"
|
||||||
|
go build -o /tmp/waste-daemon-web ./cmd/daemon
|
||||||
|
|
||||||
|
/tmp/waste-daemon-web \
|
||||||
|
-alias "$ALIAS" -data-dir "$DATA_DIR" \
|
||||||
|
-ipc-port "$IPC_PORT" -ws-port "$WS_PORT" \
|
||||||
|
-anchor "$ANCHOR" \
|
||||||
|
2>/tmp/waste-daemon-web.log &
|
||||||
|
PIDS+=($!)
|
||||||
|
|
||||||
|
n=0
|
||||||
|
while ! nc -z 127.0.0.1 "$IPC_PORT" 2>/dev/null; do
|
||||||
|
sleep 0.1; n=$(( n + 1 ))
|
||||||
|
[ "$n" -gt 80 ] && echo "daemon failed to start — check /tmp/waste-daemon-web.log" >&2 && exit 1
|
||||||
|
done
|
||||||
|
|
||||||
|
sleep 0.2
|
||||||
|
jq -cn --arg net "$NETWORK" '{"type":"join_network","network_name":$net}' \
|
||||||
|
| nc -q0 127.0.0.1 "$IPC_PORT" >/dev/null 2>&1 || true
|
||||||
|
echo "daemon ready — joined $NETWORK"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
npm run dev --prefix "$(dirname "$0")/web"
|
||||||
38
serve-web.sh.example
Normal file
38
serve-web.sh.example
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# serve-web.sh — start (or restart) the static file server on the VPS.
|
||||||
|
# Runs `npx serve` in the background, logs to ~/waste-www.log.
|
||||||
|
#
|
||||||
|
# SETUP: copy this file to serve-web.sh (gitignored) and set HOST below.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./serve-web.sh
|
||||||
|
#
|
||||||
|
# Optional env vars:
|
||||||
|
# HOST SSH target (user@host) (required — edit below)
|
||||||
|
# REMOTE_DIR path on VPS (default: ~/waste-www)
|
||||||
|
# PORT local port on VPS (default: 1337)
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
HOST="${HOST:-user@YOUR_VPS_IP}" # ← edit this
|
||||||
|
REMOTE_DIR="${REMOTE_DIR:-~/waste-www}"
|
||||||
|
REMOTE_LOG="~/waste-www.log"
|
||||||
|
REMOTE_PID="~/waste-www.pid"
|
||||||
|
PORT="${PORT:-1337}"
|
||||||
|
|
||||||
|
if [[ "$HOST" == *YOUR_VPS_IP* ]]; then
|
||||||
|
echo "error: edit HOST in this script (or export HOST=user@your-vps before running)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
ssh "$HOST" bash <<EOF
|
||||||
|
if [ -f $REMOTE_PID ]; then
|
||||||
|
kill \$(cat $REMOTE_PID) 2>/dev/null || true
|
||||||
|
rm -f $REMOTE_PID
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[\$(date)] starting npx serve on port $PORT" >> $REMOTE_LOG
|
||||||
|
nohup npx serve -s $REMOTE_DIR -l $PORT >> $REMOTE_LOG 2>&1 &
|
||||||
|
echo \$! > $REMOTE_PID
|
||||||
|
echo "→ started (pid \$(cat $REMOTE_PID)), logging to $REMOTE_LOG"
|
||||||
|
EOF
|
||||||
@@ -33,6 +33,10 @@ input:focus { border-color: var(--accent); }
|
|||||||
.onboarding-section { width: 100%; border-top: 1px solid var(--border); padding-top: 12px; }
|
.onboarding-section { width: 100%; border-top: 1px solid var(--border); padding-top: 12px; }
|
||||||
.join-form { display: flex; flex-direction: column; gap: 8px; width: 100%; }
|
.join-form { display: flex; flex-direction: column; gap: 8px; width: 100%; }
|
||||||
.join-label { font-size: 11px; text-transform: uppercase; letter-spacing: 0.08em; color: var(--muted); }
|
.join-label { font-size: 11px; text-transform: uppercase; letter-spacing: 0.08em; color: var(--muted); }
|
||||||
|
.saved-networks { display: flex; flex-direction: column; gap: 6px; width: 100%; }
|
||||||
|
.saved-network-chips { display: flex; flex-wrap: wrap; gap: 6px; }
|
||||||
|
.network-chip { background: var(--surface); border: 1px solid var(--border); color: var(--text); border-radius: 20px; padding: 4px 14px; font-size: 13px; }
|
||||||
|
.network-chip:hover { border-color: var(--accent); color: var(--accent); background: var(--surface); }
|
||||||
button.primary { background: var(--accent); width: 100%; padding: 8px; font-size: 14px; }
|
button.primary { background: var(--accent); width: 100%; padding: 8px; font-size: 14px; }
|
||||||
.toggle-link { background: none; color: var(--muted); font-size: 12px; padding: 4px 0; text-align: left; }
|
.toggle-link { background: none; color: var(--muted); font-size: 12px; padding: 4px 0; text-align: left; }
|
||||||
.toggle-link:hover { color: var(--text); }
|
.toggle-link:hover { color: var(--text); }
|
||||||
@@ -88,7 +92,7 @@ details summary { color: var(--muted); font-size: 12px; cursor: pointer; }
|
|||||||
.messages { flex: 1; overflow-y: auto; padding: 8px 0; display: flex; flex-direction: column; }
|
.messages { flex: 1; overflow-y: auto; padding: 8px 0; display: flex; flex-direction: column; }
|
||||||
.message { display: flex; align-items: baseline; gap: 0; padding: 2px 16px; line-height: 1.5; }
|
.message { display: flex; align-items: baseline; gap: 0; padding: 2px 16px; line-height: 1.5; }
|
||||||
.message:hover { background: rgba(255,255,255,0.02); }
|
.message:hover { background: rgba(255,255,255,0.02); }
|
||||||
.message-ts { color: var(--muted); font-size: 11px; white-space: nowrap; flex-shrink: 0; width: 52px; }
|
.message-ts { color: var(--muted); font-size: 11px; white-space: nowrap; flex-shrink: 0; width: 72px; }
|
||||||
.message-alias { font-weight: 600; font-size: 13px; text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex-shrink: 0; width: 90px; padding-right: 10px; }
|
.message-alias { font-weight: 600; font-size: 13px; text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex-shrink: 0; width: 90px; padding-right: 10px; }
|
||||||
.message.mine .message-alias { color: var(--accent); }
|
.message.mine .message-alias { color: var(--accent); }
|
||||||
.message-text { word-break: break-word; font-size: 14px; color: var(--text); }
|
.message-text { word-break: break-word; font-size: 14px; color: var(--text); }
|
||||||
@@ -158,3 +162,86 @@ details summary { color: var(--muted); font-size: 12px; cursor: pointer; }
|
|||||||
.file-entry-dir { cursor: pointer; }
|
.file-entry-dir { cursor: pointer; }
|
||||||
.file-entry-dir:hover { background: rgba(255,255,255,0.04); }
|
.file-entry-dir:hover { background: rgba(255,255,255,0.04); }
|
||||||
.file-entry-icon { font-size: 12px; flex-shrink: 0; }
|
.file-entry-icon { font-size: 12px; flex-shrink: 0; }
|
||||||
|
.history-divider { display: flex; align-items: center; gap: 8px; margin: 10px 0 6px; color: var(--muted); font-size: 11px; }
|
||||||
|
.history-divider::before, .history-divider::after { content: ''; flex: 1; height: 1px; background: var(--border); }
|
||||||
|
|
||||||
|
/* ── message links + image preview ── */
|
||||||
|
.msg-link { color: var(--accent); text-decoration: underline; word-break: break-all; }
|
||||||
|
.msg-link:hover { opacity: 0.8; }
|
||||||
|
.message-text { display: flex; flex-direction: column; gap: 4px; }
|
||||||
|
.msg-image-preview { max-width: 320px; max-height: 200px; border-radius: 6px; border: 1px solid var(--border); margin-top: 4px; object-fit: contain; display: block; }
|
||||||
|
|
||||||
|
/* ── reactions ── */
|
||||||
|
.message-wrapper { display: flex; flex-direction: column; padding: 0; }
|
||||||
|
.message-wrapper .message { padding: 2px 16px; }
|
||||||
|
.reaction-add { background: none; color: var(--muted); font-size: 13px; padding: 0 4px; line-height: 1; opacity: 0; transition: opacity 0.1s; margin-left: 4px; flex-shrink: 0; }
|
||||||
|
.message-wrapper:hover .reaction-add { opacity: 1; }
|
||||||
|
.reaction-add:hover { color: var(--accent); background: none; }
|
||||||
|
.reaction-picker { display: flex; gap: 4px; padding: 4px 16px 2px; }
|
||||||
|
.reaction-picker-btn { background: var(--surface); border: 1px solid var(--border); border-radius: 6px; font-size: 18px; padding: 2px 6px; line-height: 1.4; cursor: pointer; }
|
||||||
|
.reaction-picker-btn:hover { border-color: var(--accent); background: rgba(124,106,247,0.12); }
|
||||||
|
.reaction-bar { display: flex; flex-wrap: wrap; gap: 4px; padding: 2px 16px 4px; }
|
||||||
|
.reaction-chip { background: var(--surface); border: 1px solid var(--border); border-radius: 12px; font-size: 13px; padding: 1px 8px; cursor: pointer; color: var(--text); }
|
||||||
|
.reaction-chip:hover { border-color: var(--accent); background: rgba(124,106,247,0.1); }
|
||||||
|
.reaction-chip.mine { border-color: var(--accent); background: rgba(124,106,247,0.18); }
|
||||||
|
|
||||||
|
/* ── mobile hamburger / close buttons ── */
|
||||||
|
.menu-btn-mobile { display: none; background: none; color: var(--muted); font-size: 18px; padding: 0 8px 0 0; line-height: 1; }
|
||||||
|
.menu-btn-mobile:hover { color: var(--text); background: none; }
|
||||||
|
.sidebar-close-mobile { display: none; background: none; color: var(--muted); font-size: 14px; padding: 2px 4px; }
|
||||||
|
.sidebar-close-mobile:hover { color: var(--text); background: none; }
|
||||||
|
|
||||||
|
/* ── responsive layout ── */
|
||||||
|
@media (max-width: 600px) {
|
||||||
|
:root { --sidebar-w: 80vw; }
|
||||||
|
|
||||||
|
.chat-layout {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* sidebar slides in over the top */
|
||||||
|
.sidebar {
|
||||||
|
position: fixed;
|
||||||
|
top: 0; left: 0;
|
||||||
|
width: var(--sidebar-w);
|
||||||
|
height: 100%;
|
||||||
|
z-index: 100;
|
||||||
|
transform: translateX(-100%);
|
||||||
|
transition: transform 0.22s ease;
|
||||||
|
box-shadow: 4px 0 24px rgba(0,0,0,0.5);
|
||||||
|
}
|
||||||
|
.chat-layout.sidebar-open .sidebar {
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* dim overlay behind open sidebar */
|
||||||
|
.chat-layout.sidebar-open::before {
|
||||||
|
content: '';
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
background: rgba(0,0,0,0.45);
|
||||||
|
z-index: 99;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-btn-mobile { display: inline-block; }
|
||||||
|
.sidebar-close-mobile { display: inline-block; }
|
||||||
|
|
||||||
|
/* message pane fills full width */
|
||||||
|
.chat-layout > .message-pane { grid-column: 1; }
|
||||||
|
|
||||||
|
/* file browser stacks below on mobile */
|
||||||
|
.chat-layout.has-file-browser { grid-template-columns: 1fr; }
|
||||||
|
.chat-layout.has-file-browser > .file-browser { border-left: none; border-top: 1px solid var(--border); max-height: 40vh; overflow-y: auto; }
|
||||||
|
|
||||||
|
/* slightly larger tap targets */
|
||||||
|
.sidebar-item { padding: 8px 12px; font-size: 14px; }
|
||||||
|
.peer-row { padding: 6px 12px; }
|
||||||
|
.peer-row-actions { opacity: 1; }
|
||||||
|
.peer-action { font-size: 18px; padding: 2px 6px; }
|
||||||
|
|
||||||
|
/* message layout: stack alias above text on very narrow screens */
|
||||||
|
.message { flex-wrap: wrap; }
|
||||||
|
.message-ts { width: auto; min-width: 56px; }
|
||||||
|
.message-alias { width: auto; }
|
||||||
|
}
|
||||||
|
|||||||
@@ -16,23 +16,31 @@ const EKEY_PREFIX = 'yaw/2.1 ekey'
|
|||||||
const FS_TIMEOUT = 2000
|
const FS_TIMEOUT = 2000
|
||||||
const STUN = 'stun:stun.l.google.com:19302'
|
const STUN = 'stun:stun.l.google.com:19302'
|
||||||
|
|
||||||
async function turnCredential(secret: string, username: string): Promise<string> {
|
// TURN credentials are short-lived and minted server-side by the anchor's
|
||||||
const key = await crypto.subtle.importKey(
|
// GET /turn-credentials endpoint (see cmd/anchor). The shared coturn secret
|
||||||
'raw', new TextEncoder().encode(secret),
|
// never reaches the browser — only a time-limited username/credential pair.
|
||||||
{ name: 'HMAC', hash: 'SHA-1' },
|
async function fetchTurnCredentials(credentialsURL: string): Promise<{ username: string; credential: string } | null> {
|
||||||
false, ['sign']
|
try {
|
||||||
)
|
const res = await fetch(credentialsURL)
|
||||||
const sig = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(username))
|
if (!res.ok) return null
|
||||||
return btoa(String.fromCharCode(...new Uint8Array(sig)))
|
const data = await res.json()
|
||||||
|
if (!data.username || !data.credential) return null
|
||||||
|
return { username: data.username, credential: data.credential }
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function iceServers(): Promise<RTCIceServer[]> {
|
async function iceServers(): Promise<RTCIceServer[]> {
|
||||||
const cfg = (window as unknown as { WASTE_CONFIG?: { turnURL?: string; turnSecret?: string } }).WASTE_CONFIG
|
const cfg = (window as unknown as { WASTE_CONFIG?: { turnURL?: string; turnCredentialsURL?: string; signalURL?: string } }).WASTE_CONFIG
|
||||||
const servers: RTCIceServer[] = [{ urls: STUN }]
|
const servers: RTCIceServer[] = [{ urls: STUN }]
|
||||||
if (cfg?.turnURL && cfg?.turnSecret) {
|
if (cfg?.turnURL) {
|
||||||
const user = Math.floor(Date.now() / 1000) + 3600 + ':waste'
|
const credentialsURL = cfg.turnCredentialsURL
|
||||||
const credential = await turnCredential(cfg.turnSecret, user)
|
?? cfg.signalURL?.replace(/^ws/, 'http').replace(/\/ws\/?$/, '/turn-credentials')
|
||||||
servers.push({ urls: cfg.turnURL, username: user, credential })
|
if (credentialsURL) {
|
||||||
|
const creds = await fetchTurnCredentials(credentialsURL)
|
||||||
|
if (creds) servers.push({ urls: cfg.turnURL, username: creds.username, credential: creds.credential })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return servers
|
return servers
|
||||||
}
|
}
|
||||||
@@ -433,9 +441,17 @@ class PeerConn {
|
|||||||
nick: m['nick'] as string || '', caps: m['caps'] || []
|
nick: m['nick'] as string || '', caps: m['caps'] || []
|
||||||
})
|
})
|
||||||
} else if (m['type'] === 'chat') {
|
} else if (m['type'] === 'chat') {
|
||||||
|
const ts = (m['ts'] as number) || Date.now()
|
||||||
this.on('chat', {
|
this.on('chat', {
|
||||||
peer: this.peerId, room: m['room'] as string || 'general',
|
peer: this.peerId, room: m['room'] as string || 'general',
|
||||||
text: m['text'] as string, ts: m['ts'] as number || Date.now()
|
text: m['text'] as string, ts,
|
||||||
|
mid: (m['mid'] as string) || `${this.peerId}-${ts}`,
|
||||||
|
})
|
||||||
|
} else if (m['type'] === 'reaction') {
|
||||||
|
this.on('reaction', {
|
||||||
|
peer: this.peerId,
|
||||||
|
mid: m['reaction_mid'] as string,
|
||||||
|
emoji: m['reaction_emoji'] as string,
|
||||||
})
|
})
|
||||||
} else if (m['type'] === 'pm') {
|
} else if (m['type'] === 'pm') {
|
||||||
this.on('pm', { peer: this.peerId, text: m['text'] as string, ts: m['ts'] as number || Date.now() })
|
this.on('pm', { peer: this.peerId, text: m['text'] as string, ts: m['ts'] as number || Date.now() })
|
||||||
@@ -556,14 +572,18 @@ class PeerConn {
|
|||||||
} catch { /* ignore */ }
|
} catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
sendChat(room: string, text: string) {
|
sendChat(room: string, text: string, mid: string) {
|
||||||
this._dc({ type: 'chat', room, text, ts: Date.now() })
|
this._dc({ type: 'chat', room, text, ts: Date.now(), mid })
|
||||||
}
|
}
|
||||||
|
|
||||||
sendPm(text: string) {
|
sendPm(text: string) {
|
||||||
this._dc({ type: 'pm', text, ts: Date.now() })
|
this._dc({ type: 'pm', text, ts: Date.now() })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sendReaction(mid: string, emoji: string) {
|
||||||
|
this._dc({ type: 'reaction', reaction_mid: mid, reaction_emoji: emoji })
|
||||||
|
}
|
||||||
|
|
||||||
private _dc(obj: object) {
|
private _dc(obj: object) {
|
||||||
if (this.dc?.readyState === 'open') this.dc.send(JSON.stringify(obj))
|
if (this.dc?.readyState === 'open') this.dc.send(JSON.stringify(obj))
|
||||||
}
|
}
|
||||||
@@ -755,9 +775,17 @@ export class BrowserAdapter {
|
|||||||
public_key: data['peer'] as string, created_at: new Date().toISOString()
|
public_key: data['peer'] as string, created_at: new Date().toISOString()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
} else if (event === 'reaction') {
|
||||||
|
this.emit({
|
||||||
|
type: 'reaction',
|
||||||
|
network_id: this.networkId,
|
||||||
|
peer_id: data['peer'] as unknown as import('../types').PeerID,
|
||||||
|
reaction_mid: data['mid'] as string,
|
||||||
|
reaction_emoji: data['emoji'] as string,
|
||||||
|
})
|
||||||
} else if (event === 'chat') {
|
} else if (event === 'chat') {
|
||||||
const ts = (data['ts'] as number) || Date.now()
|
const ts = (data['ts'] as number) || Date.now()
|
||||||
const mid = `${data['peer']}-${ts}`
|
const mid = (data['mid'] as string) || `${data['peer']}-${ts}`
|
||||||
this.emit({
|
this.emit({
|
||||||
type: 'message_received',
|
type: 'message_received',
|
||||||
network_id: this.networkId,
|
network_id: this.networkId,
|
||||||
@@ -910,8 +938,8 @@ export class BrowserAdapter {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
// Broadcast
|
// Broadcast — include mid on the wire so recipients can reference it in reactions
|
||||||
this.peers.forEach(p => p.sendChat(room, text))
|
this.peers.forEach(p => p.sendChat(room, text, mid))
|
||||||
this.emit({
|
this.emit({
|
||||||
type: 'message_received',
|
type: 'message_received',
|
||||||
network_id: this.networkId,
|
network_id: this.networkId,
|
||||||
@@ -924,6 +952,22 @@ export class BrowserAdapter {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (msg.type === 'send_reaction') {
|
||||||
|
const mid = msg.reaction_mid
|
||||||
|
const emoji = msg.reaction_emoji
|
||||||
|
if (!mid || !emoji) return
|
||||||
|
this.peers.forEach(p => p.sendReaction(mid, emoji))
|
||||||
|
// Emit locally so the sender sees their own reaction immediately
|
||||||
|
this.emit({
|
||||||
|
type: 'reaction',
|
||||||
|
network_id: this.networkId,
|
||||||
|
peer_id: this.identity.id as unknown as import('../types').PeerID,
|
||||||
|
reaction_mid: mid,
|
||||||
|
reaction_emoji: emoji,
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (msg.type === 'export_identity') {
|
if (msg.type === 'export_identity') {
|
||||||
if (!msg.passphrase) return
|
if (!msg.passphrase) return
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,16 +1,75 @@
|
|||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { useWaste } from '../store'
|
import { useWaste } from '../store'
|
||||||
|
|
||||||
export function MessagePane() {
|
const today = new Date()
|
||||||
const { messages, activeRoom, activeNetworkId, localPeer, connectedPeers, send } = useWaste()
|
today.setHours(0, 0, 0, 0)
|
||||||
|
const todayMs = today.getTime()
|
||||||
|
|
||||||
|
function formatTs(ts: number): string {
|
||||||
|
const d = new Date(ts)
|
||||||
|
const time = d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false })
|
||||||
|
if (ts >= todayMs) return time
|
||||||
|
return d.toLocaleDateString([], { month: 'short', day: 'numeric' }) + ' ' + time
|
||||||
|
}
|
||||||
|
|
||||||
|
const URL_RE = /https?:\/\/[^\s<>"']+/g
|
||||||
|
const IMAGE_EXT_RE = /\.(jpe?g|png|gif|webp|svg)(\?[^\s]*)?$/i
|
||||||
|
|
||||||
|
function renderText(text: string): React.ReactNode {
|
||||||
|
const parts: React.ReactNode[] = []
|
||||||
|
let last = 0
|
||||||
|
let m: RegExpExecArray | null
|
||||||
|
URL_RE.lastIndex = 0
|
||||||
|
while ((m = URL_RE.exec(text)) !== null) {
|
||||||
|
if (m.index > last) parts.push(text.slice(last, m.index))
|
||||||
|
const url = m[0]
|
||||||
|
const isImage = IMAGE_EXT_RE.test(url) || url.startsWith('blob:') || url.startsWith('data:image')
|
||||||
|
parts.push(
|
||||||
|
<a key={m.index} href={url} target="_blank" rel="noopener noreferrer" className="msg-link">
|
||||||
|
{url}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
if (isImage) {
|
||||||
|
parts.push(
|
||||||
|
<img key={`img-${m.index}`} src={url} alt="" className="msg-image-preview" loading="lazy" />
|
||||||
|
)
|
||||||
|
}
|
||||||
|
last = m.index + url.length
|
||||||
|
}
|
||||||
|
if (last < text.length) parts.push(text.slice(last))
|
||||||
|
return parts.length > 1 ? <>{parts}</> : text
|
||||||
|
}
|
||||||
|
|
||||||
|
const EMOJI_SET = ['👍', '❤️', '😂', '😮', '😢', '🙏']
|
||||||
|
|
||||||
|
export function MessagePane({ onMenuClick }: { onMenuClick: () => void }) {
|
||||||
|
const { messages, historyCutoff, activeRoom, activeNetworkId, localPeer, connectedPeers, knownPeers, reactions, sendReaction, send } = useWaste()
|
||||||
const [draft, setDraft] = useState('')
|
const [draft, setDraft] = useState('')
|
||||||
|
const [pickerMid, setPickerMid] = useState<string | null>(null)
|
||||||
const bottomRef = useRef<HTMLDivElement>(null)
|
const bottomRef = useRef<HTMLDivElement>(null)
|
||||||
const roomMessages = messages[activeRoom] ?? []
|
const msgKey = activeNetworkId ? `${activeNetworkId}:${activeRoom}` : activeRoom
|
||||||
|
const roomMessages = messages[msgKey] ?? []
|
||||||
|
const cutoff = historyCutoff[msgKey] ?? 0
|
||||||
|
|
||||||
|
const firstLiveIdx = cutoff > 0
|
||||||
|
? roomMessages.findIndex(m => m.ts > cutoff)
|
||||||
|
: -1
|
||||||
|
const dividerIdx = cutoff > 0
|
||||||
|
? (firstLiveIdx === -1 ? 0 : firstLiveIdx)
|
||||||
|
: -1
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
bottomRef.current?.scrollIntoView({ behavior: 'smooth' })
|
bottomRef.current?.scrollIntoView({ behavior: 'smooth' })
|
||||||
}, [roomMessages.length])
|
}, [roomMessages.length])
|
||||||
|
|
||||||
|
// Close picker when clicking outside
|
||||||
|
useEffect(() => {
|
||||||
|
if (!pickerMid) return
|
||||||
|
const handler = () => setPickerMid(null)
|
||||||
|
document.addEventListener('click', handler)
|
||||||
|
return () => document.removeEventListener('click', handler)
|
||||||
|
}, [pickerMid])
|
||||||
|
|
||||||
function submit(e: React.FormEvent) {
|
function submit(e: React.FormEvent) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
const text = draft.trim()
|
const text = draft.trim()
|
||||||
@@ -30,7 +89,21 @@ export function MessagePane() {
|
|||||||
|
|
||||||
function aliasFor(fromId: string) {
|
function aliasFor(fromId: string) {
|
||||||
if (fromId === localPeer?.id) return localPeer.alias
|
if (fromId === localPeer?.id) return localPeer.alias
|
||||||
return connectedPeers.find(p => p.id === fromId)?.alias ?? fromId.slice(0, 8)
|
return connectedPeers.find(p => p.id === fromId)?.alias
|
||||||
|
?? knownPeers[fromId]
|
||||||
|
?? fromId.slice(0, 8)
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleReaction(mid: string, emoji: string, e: React.MouseEvent) {
|
||||||
|
e.stopPropagation()
|
||||||
|
if (!activeNetworkId || !mid) return
|
||||||
|
sendReaction(activeNetworkId, mid, emoji)
|
||||||
|
setPickerMid(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
function openPicker(mid: string, e: React.MouseEvent) {
|
||||||
|
e.stopPropagation()
|
||||||
|
setPickerMid(prev => prev === mid ? null : mid)
|
||||||
}
|
}
|
||||||
|
|
||||||
const roomLabel = activeRoom.startsWith('dm:')
|
const roomLabel = activeRoom.startsWith('dm:')
|
||||||
@@ -39,18 +112,67 @@ export function MessagePane() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="message-pane">
|
<main className="message-pane">
|
||||||
<div className="message-pane-header">{roomLabel}</div>
|
<div className="message-pane-header">
|
||||||
|
<button className="menu-btn-mobile" onClick={onMenuClick} aria-label="Menu">☰</button>
|
||||||
|
{roomLabel}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="messages">
|
<div className="messages">
|
||||||
|
{dividerIdx === 0 && (
|
||||||
|
<div className="history-divider"><span>earlier messages</span></div>
|
||||||
|
)}
|
||||||
{roomMessages.map((msg, i) => {
|
{roomMessages.map((msg, i) => {
|
||||||
const mine = msg.from === localPeer?.id
|
const mine = msg.from === localPeer?.id
|
||||||
const alias = aliasFor(msg.from)
|
const alias = aliasFor(String(msg.from))
|
||||||
const time = new Date(msg.ts).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false })
|
const ts = formatTs(msg.ts)
|
||||||
|
const mid = msg.mid ?? ''
|
||||||
|
const msgReactions = mid ? reactions[mid] : undefined
|
||||||
|
const hasReactions = msgReactions && Object.keys(msgReactions).length > 0
|
||||||
return (
|
return (
|
||||||
<div key={msg.mid ?? i} className={`message ${mine ? 'mine' : ''}`}>
|
<div key={mid || i} className="message-wrapper">
|
||||||
<span className="message-ts">{time}</span>
|
{i === dividerIdx && dividerIdx > 0 && (
|
||||||
|
<div className="history-divider"><span>earlier messages</span></div>
|
||||||
|
)}
|
||||||
|
<div className={`message ${mine ? 'mine' : ''}`}>
|
||||||
|
<span className="message-ts">{ts}</span>
|
||||||
<span className="message-alias">{alias}</span>
|
<span className="message-alias">{alias}</span>
|
||||||
<span className="message-text">{msg.text}</span>
|
<span className="message-text">
|
||||||
|
{renderText(msg.text)}
|
||||||
|
</span>
|
||||||
|
{mid && (
|
||||||
|
<button
|
||||||
|
className="reaction-add"
|
||||||
|
onClick={e => openPicker(mid, e)}
|
||||||
|
title="React"
|
||||||
|
>+</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{pickerMid === mid && (
|
||||||
|
<div className="reaction-picker" onClick={e => e.stopPropagation()}>
|
||||||
|
{EMOJI_SET.map(emoji => (
|
||||||
|
<button key={emoji} className="reaction-picker-btn" onClick={e => toggleReaction(mid, emoji, e)}>
|
||||||
|
{emoji}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{hasReactions && (
|
||||||
|
<div className="reaction-bar">
|
||||||
|
{Object.entries(msgReactions!).map(([emoji, fromIds]) => {
|
||||||
|
const iMine = fromIds.includes(localPeer?.id ?? '')
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={emoji}
|
||||||
|
className={`reaction-chip ${iMine ? 'mine' : ''}`}
|
||||||
|
onClick={e => toggleReaction(mid, emoji, e)}
|
||||||
|
title={fromIds.map(aliasFor).join(', ')}
|
||||||
|
>
|
||||||
|
{emoji} {fromIds.length}
|
||||||
|
</button>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -26,22 +26,31 @@ function formatTs(ts: number | undefined): string {
|
|||||||
return new Date(ts).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' })
|
return new Date(ts).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' })
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Sidebar() {
|
export function Sidebar({ onClose }: { onClose: () => void }) {
|
||||||
const {
|
const {
|
||||||
localPeer, masterId, masterAlias,
|
localPeer, masterId, masterAlias,
|
||||||
networks, activeNetworkId, activeRoom,
|
networks, activeNetworkId, activeRoom,
|
||||||
connectedPeers, peerStatus,
|
connectedPeers, peerStatus,
|
||||||
setActiveRoom, setActiveNetwork, messages, browseFiles, sendFileTo, adapterMode,
|
setActiveRoom, setActiveNetwork, messages, browseFiles, sendFileTo, adapterMode,
|
||||||
customRooms, createRoom, logout,
|
customRooms, createRoom, logout, send,
|
||||||
} = useWaste()
|
} = useWaste()
|
||||||
const [addingRoom, setAddingRoom] = useState(false)
|
const [addingRoom, setAddingRoom] = useState(false)
|
||||||
const [newRoomName, setNewRoomName] = useState('')
|
const [newRoomName, setNewRoomName] = useState('')
|
||||||
|
const [addingNetwork, setAddingNetwork] = useState(false)
|
||||||
|
const [newNetName, setNewNetName] = useState('')
|
||||||
|
const [newNetAnchor, setNewNetAnchor] = useState('')
|
||||||
|
|
||||||
const netCustomRooms = activeNetworkId ? (customRooms[activeNetworkId] ?? []) : []
|
const netCustomRooms = activeNetworkId ? (customRooms[activeNetworkId] ?? []) : []
|
||||||
const rooms = ['general', ...netCustomRooms]
|
const rooms = ['general', ...netCustomRooms]
|
||||||
Object.keys(messages).forEach(r => {
|
if (activeNetworkId) {
|
||||||
if (r.startsWith('dm:') && !rooms.includes(r)) rooms.push(r)
|
const prefix = `${activeNetworkId}:dm:`
|
||||||
|
Object.keys(messages).forEach(k => {
|
||||||
|
if (k.startsWith(prefix)) {
|
||||||
|
const r = k.slice(activeNetworkId.length + 1)
|
||||||
|
if (!rooms.includes(r)) rooms.push(r)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function submitNewRoom(e: React.FormEvent) {
|
function submitNewRoom(e: React.FormEvent) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
@@ -50,6 +59,25 @@ export function Sidebar() {
|
|||||||
setAddingRoom(false)
|
setAddingRoom(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function submitNewNetwork(e: React.FormEvent) {
|
||||||
|
e.preventDefault()
|
||||||
|
const name = newNetName.trim()
|
||||||
|
if (!name) return
|
||||||
|
if (adapterMode === 'browser') {
|
||||||
|
// Persist to saved networks list in localStorage.
|
||||||
|
const anchor = newNetAnchor.trim() || localStorage.getItem('waste_anchor_url') || ''
|
||||||
|
const saved: Array<{name: string; anchor: string}> = JSON.parse(localStorage.getItem('waste_saved_networks') ?? '[]')
|
||||||
|
if (!saved.some(n => n.name === name && n.anchor === anchor)) {
|
||||||
|
saved.push({ name, anchor })
|
||||||
|
localStorage.setItem('waste_saved_networks', JSON.stringify(saved))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send({ type: 'join_network', network_name: name })
|
||||||
|
setNewNetName('')
|
||||||
|
setNewNetAnchor('')
|
||||||
|
setAddingNetwork(false)
|
||||||
|
}
|
||||||
|
|
||||||
const displayAlias = localPeer?.alias ?? masterAlias ?? ''
|
const displayAlias = localPeer?.alias ?? masterAlias ?? ''
|
||||||
const displayId = localPeer?.id ?? masterId ?? ''
|
const displayId = localPeer?.id ?? masterId ?? ''
|
||||||
const card = displayId ? makeYawCard(displayId, displayAlias) : null
|
const card = displayId ? makeYawCard(displayId, displayAlias) : null
|
||||||
@@ -90,24 +118,51 @@ export function Sidebar() {
|
|||||||
<span className="peer-id">{displayId.slice(0, 16).replace(/(.{4})/g, '$1 ').trim()}</span>
|
<span className="peer-id">{displayId.slice(0, 16).replace(/(.{4})/g, '$1 ').trim()}</span>
|
||||||
</div>
|
</div>
|
||||||
<button className="sidebar-logout" onClick={handleLogout} title="Leave network">⏻</button>
|
<button className="sidebar-logout" onClick={handleLogout} title="Leave network">⏻</button>
|
||||||
|
<button className="sidebar-close-mobile" onClick={onClose} title="Close">✕</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="sidebar-section">
|
<div className="sidebar-section">
|
||||||
<div className="sidebar-label-row">
|
<div className="sidebar-label-row">
|
||||||
<span className="sidebar-label">Networks</span>
|
<span className="sidebar-label">Networks</span>
|
||||||
|
<span style={{ display: 'flex', gap: 2 }}>
|
||||||
{activeNetworkId && (
|
{activeNetworkId && (
|
||||||
<button className="sidebar-add" onClick={copyHangLink} title="Copy hang link (pre-fills join form, no invite required)">🔗</button>
|
<button className="sidebar-add" onClick={copyHangLink} title="Copy hang link">🔗</button>
|
||||||
)}
|
)}
|
||||||
|
<button className="sidebar-add" onClick={() => setAddingNetwork(v => !v)} title="Join network">+</button>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{networks.map(n => (
|
{networks.map(n => (
|
||||||
<button
|
<button
|
||||||
key={n.network_id}
|
key={n.network_id}
|
||||||
className={`sidebar-item ${n.network_id === activeNetworkId ? 'active' : ''}`}
|
className={`sidebar-item ${n.network_id === activeNetworkId ? 'active' : ''}`}
|
||||||
onClick={() => setActiveNetwork(n.network_id)}
|
onClick={() => { setActiveNetwork(n.network_id); onClose() }}
|
||||||
>
|
>
|
||||||
{n.network_name}
|
{n.network_name}
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
|
{addingNetwork && (
|
||||||
|
<form className="sidebar-new-room" onSubmit={submitNewNetwork}>
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={newNetName}
|
||||||
|
onChange={e => setNewNetName(e.target.value)}
|
||||||
|
placeholder="network name"
|
||||||
|
onKeyDown={e => e.key === 'Escape' && (setAddingNetwork(false), setNewNetName(''))}
|
||||||
|
/>
|
||||||
|
{adapterMode === 'browser' && (
|
||||||
|
<input
|
||||||
|
value={newNetAnchor}
|
||||||
|
onChange={e => setNewNetAnchor(e.target.value)}
|
||||||
|
placeholder="anchor URL (blank = current)"
|
||||||
|
className="mono"
|
||||||
|
style={{ fontSize: '0.75rem', marginTop: 4 }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<button type="submit" disabled={!newNetName.trim()} style={{ marginTop: 4, width: '100%', fontSize: '12px', padding: '3px 8px' }}>
|
||||||
|
Join
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="sidebar-section">
|
<div className="sidebar-section">
|
||||||
@@ -119,7 +174,7 @@ export function Sidebar() {
|
|||||||
<button
|
<button
|
||||||
key={r}
|
key={r}
|
||||||
className={`sidebar-item ${r === activeRoom ? 'active' : ''}`}
|
className={`sidebar-item ${r === activeRoom ? 'active' : ''}`}
|
||||||
onClick={() => setActiveRoom(r)}
|
onClick={() => { setActiveRoom(r); onClose() }}
|
||||||
>
|
>
|
||||||
{r.startsWith('dm:') ? `@ ${r.slice(3, 11)}…` : `# ${r}`}
|
{r.startsWith('dm:') ? `@ ${r.slice(3, 11)}…` : `# ${r}`}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -7,12 +7,13 @@ function fmt(bytes: number): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function Transfers() {
|
export function Transfers() {
|
||||||
const { pendingOffers, fileProgress, acceptOffer, rejectOffer, cancelTransfer, connectedPeers } = useWaste()
|
const { pendingOffers, fileProgress, resumableFiles, acceptOffer, rejectOffer, cancelTransfer, connectedPeers } = useWaste()
|
||||||
|
|
||||||
const hasPending = Object.keys(pendingOffers).length > 0
|
const hasPending = Object.keys(pendingOffers).length > 0
|
||||||
const hasActive = Object.keys(fileProgress).length > 0
|
const hasActive = Object.keys(fileProgress).length > 0
|
||||||
|
const hasResumable = Object.keys(resumableFiles).length > 0
|
||||||
|
|
||||||
if (!hasPending && !hasActive) return null
|
if (!hasPending && !hasActive && !hasResumable) return null
|
||||||
|
|
||||||
function alias(peerId: string) {
|
function alias(peerId: string) {
|
||||||
return connectedPeers.find(p => p.id === peerId)?.alias ?? peerId.slice(0, 8)
|
return connectedPeers.find(p => p.id === peerId)?.alias ?? peerId.slice(0, 8)
|
||||||
@@ -22,6 +23,24 @@ export function Transfers() {
|
|||||||
<div className="sidebar-section">
|
<div className="sidebar-section">
|
||||||
<span className="sidebar-label">Transfers</span>
|
<span className="sidebar-label">Transfers</span>
|
||||||
|
|
||||||
|
{hasResumable && (
|
||||||
|
<>
|
||||||
|
<span className="sidebar-label" style={{ fontSize: 10, opacity: 0.6 }}>resumable</span>
|
||||||
|
{Object.entries(resumableFiles).map(([sha256, f]) => {
|
||||||
|
const pct = f.size > 0 ? Math.round((f.offset / f.size) * 100) : 0
|
||||||
|
return (
|
||||||
|
<div key={sha256} className="transfer-row">
|
||||||
|
<span className="transfer-name" title={f.name}>{f.name}</span>
|
||||||
|
<span className="transfer-meta">{fmt(f.offset)} / {fmt(f.size)} · {alias(f.from)} · will resume on reconnect</span>
|
||||||
|
<div className="transfer-progress">
|
||||||
|
<div className="transfer-progress-bar" style={{ width: `${pct}%`, opacity: 0.5 }} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
{Object.entries(pendingOffers).map(([xid, offer]) => (
|
{Object.entries(pendingOffers).map(([xid, offer]) => (
|
||||||
<div key={xid} className="transfer-row">
|
<div key={xid} className="transfer-row">
|
||||||
<span className="transfer-name" title={offer.name}>{offer.name}</span>
|
<span className="transfer-name" title={offer.name}>{offer.name}</span>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { useState } from 'react'
|
||||||
import { Sidebar } from '../components/Sidebar'
|
import { Sidebar } from '../components/Sidebar'
|
||||||
import { MessagePane } from '../components/MessagePane'
|
import { MessagePane } from '../components/MessagePane'
|
||||||
import { FileBrowser } from '../components/FileBrowser'
|
import { FileBrowser } from '../components/FileBrowser'
|
||||||
@@ -5,10 +6,11 @@ import { useWaste } from '../store'
|
|||||||
|
|
||||||
export function Chat() {
|
export function Chat() {
|
||||||
const { activeFilePeer } = useWaste()
|
const { activeFilePeer } = useWaste()
|
||||||
|
const [sidebarOpen, setSidebarOpen] = useState(false)
|
||||||
return (
|
return (
|
||||||
<div className={`chat-layout${activeFilePeer ? ' has-file-browser' : ''}`}>
|
<div className={`chat-layout${activeFilePeer ? ' has-file-browser' : ''}${sidebarOpen ? ' sidebar-open' : ''}`}>
|
||||||
<Sidebar />
|
<Sidebar onClose={() => setSidebarOpen(false)} />
|
||||||
<MessagePane />
|
<MessagePane onMenuClick={() => setSidebarOpen(v => !v)} />
|
||||||
{activeFilePeer && <FileBrowser />}
|
{activeFilePeer && <FileBrowser />}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -72,8 +72,15 @@ export function Onboarding({ status }: Props) {
|
|||||||
if (adapterMode !== 'browser' || status !== 'connected') return
|
if (adapterMode !== 'browser' || status !== 'connected') return
|
||||||
const { network: n, netHash: nh } = parseInviteParams()
|
const { network: n, netHash: nh } = parseInviteParams()
|
||||||
if (n || nh) return // explicit invite — don't auto-join, show form
|
if (n || nh) return // explicit invite — don't auto-join, show form
|
||||||
|
// Rejoin all saved networks.
|
||||||
|
const saved: Array<{name: string; anchor: string}> = JSON.parse(localStorage.getItem('waste_saved_networks') ?? '[]')
|
||||||
|
if (saved.length > 0) {
|
||||||
|
saved.forEach(s => doJoin(s.name, ''))
|
||||||
|
} else {
|
||||||
|
// Legacy single-network fallback.
|
||||||
const savedNetwork = localStorage.getItem('waste_last_network')
|
const savedNetwork = localStorage.getItem('waste_last_network')
|
||||||
if (savedNetwork) doJoin(savedNetwork, '')
|
if (savedNetwork) doJoin(savedNetwork, '')
|
||||||
|
}
|
||||||
}, [adapterMode, status]) // eslint-disable-line react-hooks/exhaustive-deps
|
}, [adapterMode, status]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
function joinNetwork(e: React.FormEvent) {
|
function joinNetwork(e: React.FormEvent) {
|
||||||
@@ -87,8 +94,16 @@ export function Onboarding({ status }: Props) {
|
|||||||
if (adapterMode === 'browser') {
|
if (adapterMode === 'browser') {
|
||||||
localStorage.setItem('waste_anchor_url', anchorUrl)
|
localStorage.setItem('waste_anchor_url', anchorUrl)
|
||||||
if (nick.trim()) localStorage.setItem('waste_nick', nick.trim())
|
if (nick.trim()) localStorage.setItem('waste_nick', nick.trim())
|
||||||
if (name) localStorage.setItem('waste_last_network', name)
|
if (name) {
|
||||||
else localStorage.removeItem('waste_last_network')
|
// Persist to saved networks list.
|
||||||
|
const saved: Array<{name: string; anchor: string}> = JSON.parse(localStorage.getItem('waste_saved_networks') ?? '[]')
|
||||||
|
if (!saved.some(n => n.name === name)) {
|
||||||
|
saved.push({ name, anchor: anchorUrl })
|
||||||
|
localStorage.setItem('waste_saved_networks', JSON.stringify(saved))
|
||||||
|
}
|
||||||
|
// Keep legacy key for backward compat.
|
||||||
|
localStorage.setItem('waste_last_network', name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hash.length === 64 && !name) {
|
if (hash.length === 64 && !name) {
|
||||||
@@ -121,6 +136,7 @@ export function Onboarding({ status }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const shortId = masterId ? masterId.slice(0, 16).replace(/(.{4})/g, '$1 ').trim() : null
|
const shortId = masterId ? masterId.slice(0, 16).replace(/(.{4})/g, '$1 ').trim() : null
|
||||||
|
const savedNetworks: Array<{name: string; anchor: string}> = JSON.parse(localStorage.getItem('waste_saved_networks') ?? '[]')
|
||||||
|
|
||||||
// ── disconnected / connecting ────────────────────────────────────────────────
|
// ── disconnected / connecting ────────────────────────────────────────────────
|
||||||
if (status !== 'connected') {
|
if (status !== 'connected') {
|
||||||
@@ -159,8 +175,21 @@ export function Onboarding({ status }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{adapterMode === 'browser' && savedNetworks.length > 0 && (
|
||||||
|
<div className="saved-networks">
|
||||||
|
<span className="join-label">Saved networks</span>
|
||||||
|
<div className="saved-network-chips">
|
||||||
|
{savedNetworks.map(n => (
|
||||||
|
<button key={n.name} className="network-chip" type="button" onClick={() => doJoin(n.name, '')}>
|
||||||
|
{n.name}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<form onSubmit={joinNetwork} className="join-form">
|
<form onSubmit={joinNetwork} className="join-form">
|
||||||
<label className="join-label">Join a network</label>
|
<label className="join-label">{savedNetworks.length > 0 ? 'Join another network' : 'Join a network'}</label>
|
||||||
|
|
||||||
{adapterMode === 'browser' && (
|
{adapterMode === 'browser' && (
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -29,9 +29,12 @@ interface WasteState {
|
|||||||
|
|
||||||
// peers
|
// peers
|
||||||
connectedPeers: PeerInfo[]
|
connectedPeers: PeerInfo[]
|
||||||
|
knownPeers: Record<string, string> // id → alias for historical peers
|
||||||
|
|
||||||
// chat — keyed by room
|
// chat — keyed by room
|
||||||
messages: Record<string, ChatMessage[]>
|
messages: Record<string, ChatMessage[]>
|
||||||
|
// rooms for which we have received history: room → ts of last history message
|
||||||
|
historyCutoff: Record<string, number>
|
||||||
activeRoom: string
|
activeRoom: string
|
||||||
// user-created rooms, keyed by networkId
|
// user-created rooms, keyed by networkId
|
||||||
customRooms: Record<string, string[]>
|
customRooms: Record<string, string[]>
|
||||||
@@ -53,6 +56,10 @@ interface WasteState {
|
|||||||
pendingOffers: Record<string, { peerId: string; name: string; size: number }>
|
pendingOffers: Record<string, { peerId: string; name: string; size: number }>
|
||||||
// active in-progress transfers: xid → progress
|
// active in-progress transfers: xid → progress
|
||||||
fileProgress: Record<string, { peerId: string; name: string; received: number; total: number }>
|
fileProgress: Record<string, { peerId: string; name: string; received: number; total: number }>
|
||||||
|
// partial downloads found on daemon startup: sha256 → info
|
||||||
|
resumableFiles: Record<string, { name: string; from: string; size: number; offset: number }>
|
||||||
|
// reactions: mid → emoji → [fromId, ...]
|
||||||
|
reactions: Record<string, Record<string, string[]>>
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
connect: (url: string) => void
|
connect: (url: string) => void
|
||||||
@@ -69,6 +76,7 @@ interface WasteState {
|
|||||||
rejectOffer: (peerId: string, xid: string) => void
|
rejectOffer: (peerId: string, xid: string) => void
|
||||||
cancelTransfer: (peerId: string, xid: string, direction: 'recv' | 'send') => void
|
cancelTransfer: (peerId: string, xid: string, direction: 'recv' | 'send') => void
|
||||||
createRoom: (name: string) => void
|
createRoom: (name: string) => void
|
||||||
|
sendReaction: (networkId: string, mid: string, emoji: string) => void
|
||||||
logout: (clearIdentity: boolean) => void
|
logout: (clearIdentity: boolean) => void
|
||||||
handleEvent: (msg: IpcMessage) => void
|
handleEvent: (msg: IpcMessage) => void
|
||||||
}
|
}
|
||||||
@@ -83,7 +91,9 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
networks: [],
|
networks: [],
|
||||||
activeNetworkId: null,
|
activeNetworkId: null,
|
||||||
connectedPeers: [],
|
connectedPeers: [],
|
||||||
|
knownPeers: {},
|
||||||
messages: {},
|
messages: {},
|
||||||
|
historyCutoff: {},
|
||||||
activeRoom: 'general',
|
activeRoom: 'general',
|
||||||
customRooms: {},
|
customRooms: {},
|
||||||
fileLists: {},
|
fileLists: {},
|
||||||
@@ -93,6 +103,8 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
sharedFilesByNetwork: {},
|
sharedFilesByNetwork: {},
|
||||||
pendingOffers: {},
|
pendingOffers: {},
|
||||||
fileProgress: {},
|
fileProgress: {},
|
||||||
|
resumableFiles: {},
|
||||||
|
reactions: {},
|
||||||
|
|
||||||
connect(url: string) {
|
connect(url: string) {
|
||||||
const adapter = new DaemonAdapter(url)
|
const adapter = new DaemonAdapter(url)
|
||||||
@@ -181,6 +193,10 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
window.location.reload()
|
window.location.reload()
|
||||||
},
|
},
|
||||||
|
|
||||||
|
sendReaction(networkId, mid, emoji) {
|
||||||
|
get().send({ type: 'send_reaction', network_id: networkId, reaction_mid: mid, reaction_emoji: emoji })
|
||||||
|
},
|
||||||
|
|
||||||
createRoom(name) {
|
createRoom(name) {
|
||||||
const netId = get().activeNetworkId
|
const netId = get().activeNetworkId
|
||||||
if (!netId || !name.trim()) return
|
if (!netId || !name.trim()) return
|
||||||
@@ -209,6 +225,8 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
switch (msg.type) {
|
switch (msg.type) {
|
||||||
case 'state_snapshot': {
|
case 'state_snapshot': {
|
||||||
const networks = msg.networks ?? []
|
const networks = msg.networks ?? []
|
||||||
|
const knownPeers: Record<string, string> = {}
|
||||||
|
for (const p of msg.known_peers ?? []) knownPeers[p.id] = p.alias
|
||||||
set({
|
set({
|
||||||
masterAlias: msg.master_alias ?? null,
|
masterAlias: msg.master_alias ?? null,
|
||||||
masterId: msg.master_id ?? null,
|
masterId: msg.master_id ?? null,
|
||||||
@@ -216,6 +234,7 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
networks,
|
networks,
|
||||||
connectedPeers: msg.connected_peers ?? [],
|
connectedPeers: msg.connected_peers ?? [],
|
||||||
activeNetworkId: networks[0]?.network_id ?? null,
|
activeNetworkId: networks[0]?.network_id ?? null,
|
||||||
|
knownPeers,
|
||||||
})
|
})
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -272,14 +291,14 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
case 'message_received': {
|
case 'message_received': {
|
||||||
if (msg.message) {
|
if (msg.message) {
|
||||||
const m = msg.message
|
const m = msg.message
|
||||||
const room = m.room
|
const key = `${msg.network_id}:${m.room}`
|
||||||
const fromId = String(m.from)
|
const fromId = String(m.from)
|
||||||
set(s => {
|
set(s => {
|
||||||
const existing = s.messages[room] ?? []
|
const existing = s.messages[key] ?? []
|
||||||
if (m.mid && existing.some(e => e.mid === m.mid)) return s
|
if (m.mid && existing.some(e => e.mid === m.mid)) return s
|
||||||
const prev = s.peerStatus[fromId] ?? {}
|
const prev = s.peerStatus[fromId] ?? {}
|
||||||
return {
|
return {
|
||||||
messages: { ...s.messages, [room]: [...existing, m] },
|
messages: { ...s.messages, [key]: [...existing, m] },
|
||||||
peerStatus: { ...s.peerStatus, [fromId]: { ...prev, lastSeen: m.ts } },
|
peerStatus: { ...s.peerStatus, [fromId]: { ...prev, lastSeen: m.ts } },
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -341,10 +360,13 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
case 'file_complete': {
|
case 'file_complete': {
|
||||||
if (msg.path && msg.offer?.name) {
|
// Always clear progress — transfer_id is the xid in daemon mode; offer.xid in browser mode.
|
||||||
// clear progress entry
|
const xid = msg.transfer_id ?? msg.offer?.xid
|
||||||
const xid = msg.offer.xid
|
if (xid) {
|
||||||
set(s => { const fp = { ...s.fileProgress }; delete fp[xid]; return { fileProgress: fp } })
|
set(s => { const fp = { ...s.fileProgress }; delete fp[xid]; return { fileProgress: fp } })
|
||||||
|
}
|
||||||
|
// Browser mode: trigger download via anchor click.
|
||||||
|
if (msg.path && msg.offer?.name) {
|
||||||
const a = document.createElement('a')
|
const a = document.createElement('a')
|
||||||
a.href = msg.path
|
a.href = msg.path
|
||||||
a.download = msg.offer.name
|
a.download = msg.offer.name
|
||||||
@@ -352,6 +374,46 @@ export const useWaste = create<WasteState>((set, get) => ({
|
|||||||
}
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
case 'resumable_transfers': {
|
||||||
|
const files = (msg.resumable_files ?? []) as Array<{ name: string; sha256: string; from: string; size: number; offset: number }>
|
||||||
|
if (files.length === 0) break
|
||||||
|
const byHash: Record<string, { name: string; from: string; size: number; offset: number }> = {}
|
||||||
|
for (const f of files) byHash[f.sha256] = { name: f.name, from: f.from, size: f.size, offset: f.offset }
|
||||||
|
set(s => ({ resumableFiles: { ...s.resumableFiles, ...byHash } }))
|
||||||
|
break
|
||||||
|
}
|
||||||
|
case 'reaction': {
|
||||||
|
const mid = msg.reaction_mid
|
||||||
|
const emoji = msg.reaction_emoji
|
||||||
|
const from = msg.peer_id
|
||||||
|
if (!mid || !emoji || !from) break
|
||||||
|
set(s => {
|
||||||
|
const byEmoji = { ...(s.reactions[mid] ?? {}) }
|
||||||
|
const existing = byEmoji[emoji] ?? []
|
||||||
|
if (existing.includes(from)) return s
|
||||||
|
return { reactions: { ...s.reactions, [mid]: { ...byEmoji, [emoji]: [...existing, from] } } }
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
case 'history_loaded': {
|
||||||
|
const room = msg.room
|
||||||
|
const incoming = (msg.messages ?? []) as ChatMessage[]
|
||||||
|
if (!room || incoming.length === 0) break
|
||||||
|
const key = `${msg.network_id}:${room}`
|
||||||
|
set(s => {
|
||||||
|
const existing = s.messages[key] ?? []
|
||||||
|
const existingMids = new Set(existing.map(m => m.mid).filter(Boolean))
|
||||||
|
const fresh = incoming.filter(m => !m.mid || !existingMids.has(m.mid))
|
||||||
|
if (fresh.length === 0) return s
|
||||||
|
const merged = [...fresh, ...existing].sort((a, b) => a.ts - b.ts)
|
||||||
|
const cutoff = fresh[fresh.length - 1]?.ts ?? 0
|
||||||
|
return {
|
||||||
|
messages: { ...s.messages, [key]: merged },
|
||||||
|
historyCutoff: { ...s.historyCutoff, [key]: cutoff },
|
||||||
|
}
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -82,6 +82,12 @@ export type IpcMsgType =
|
|||||||
| 'shares_list'
|
| 'shares_list'
|
||||||
| 'peer_status'
|
| 'peer_status'
|
||||||
| 'error'
|
| 'error'
|
||||||
|
| 'history_loaded'
|
||||||
|
| 'room_created'
|
||||||
|
| 'create_room'
|
||||||
|
| 'resumable_transfers'
|
||||||
|
| 'send_reaction'
|
||||||
|
| 'reaction'
|
||||||
|
|
||||||
export interface IpcMessage {
|
export interface IpcMessage {
|
||||||
type: IpcMsgType
|
type: IpcMsgType
|
||||||
@@ -113,6 +119,7 @@ export interface IpcMessage {
|
|||||||
master_id?: string
|
master_id?: string
|
||||||
local_peer?: PeerInfo
|
local_peer?: PeerInfo
|
||||||
connected_peers?: PeerInfo[]
|
connected_peers?: PeerInfo[]
|
||||||
|
known_peers?: PeerInfo[]
|
||||||
rooms?: string[]
|
rooms?: string[]
|
||||||
networks?: NetworkInfo[]
|
networks?: NetworkInfo[]
|
||||||
error_message?: string
|
error_message?: string
|
||||||
@@ -124,4 +131,11 @@ export interface IpcMessage {
|
|||||||
conn_state?: PeerConnState
|
conn_state?: PeerConnState
|
||||||
candidate_type?: CandidateType
|
candidate_type?: CandidateType
|
||||||
remote_address?: string
|
remote_address?: string
|
||||||
|
// history_loaded
|
||||||
|
messages?: ChatMessage[]
|
||||||
|
// resumable_transfers
|
||||||
|
resumable_files?: Array<{ name: string; sha256: string; from: string; size: number; offset: number }>
|
||||||
|
// reaction
|
||||||
|
reaction_mid?: string
|
||||||
|
reaction_emoji?: string
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user